From 814374b5e7c95d3173385851b95f8272613cb83e Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 11 Sep 2023 15:49:46 +0800
Subject: [PATCH 001/288] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js | 210 +++++++++++++++---------------
 jero-web/src/common/lang/zh-cn.js |   6 +-
 2 files changed, 108 insertions(+), 108 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index cea607c6f..cfa34b6e2 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -13,7 +13,7 @@ module.exports = {
   userStatues: 'User Status',
   normal: 'Normal',
   frozen: 'Frozen',
-  reset: 'Reset',
+  reset: 'Clear',
   putAway: 'Less',
   open: 'More',
   addUser: 'Add User',
@@ -26,7 +26,7 @@ module.exports = {
   batchOperation: 'Batch Operation',
   selected: 'Selected',
   term: 'Item',
-  empty: 'Empty',
+  empty: 'Clear',
   edit: 'Edit',
   more: 'More',
   areYouSure: 'Confirm to delete?',
@@ -91,7 +91,7 @@ module.exports = {
   roleName: 'Role Name',
   newRole: 'Create New Role',
   RoleManagement: 'Role Management',
-  toGrantAuthorization: 'Authorized',
+  toGrantAuthorization: 'Authorize',
   newUser: 'New User',
   ExistingUsers: 'Existing Users',
   total: 'Total',
@@ -124,10 +124,10 @@ module.exports = {
   TreeOperation: 'Tree Operation',
   essentialInformation: 'General Information',
   DetailsPhasedImplementation: 'Phased Implementation',
-  Statutenumberclause: 'Statute number/clause',
+  Statutenumberclause: 'Regulation Number/Clause',
   OrganizationName: 'Organization Name',
   EnterOrganizationDepartment: 'Please enter organization / department name',
-  Typeofimplementation: 'Type of implementation',
+  Typeofimplementation: 'Implementation Type',
   ImplementationDate: 'Implementation date',
   SuperiorDepartment: 'Superior Department',
   enterOrganizationCode: 'Please enter organization code',
@@ -181,7 +181,7 @@ module.exports = {
   MenuType: 'Menu Type',
   menu: 'Menu',
   ButtonsPermissions: 'Buttons / Permissions',
-  ConventionalExport: 'Conventional Export',
+  ConventionalExport: 'Normal Export',
   CustomExport: 'Custom Export',
   CustomTemplateName: 'Custom template name',
   assembly: 'Component',
@@ -310,9 +310,9 @@ module.exports = {
   ConfirmPassword: 'Confirm Password',
   reenterLoginPassword: 'Please re-enter your login password',
   enterUserName: 'Please enter user name',
-  RoleAssignment: 'Role Assignment',
+  RoleAssignment: 'Role Config',
   selectUserRole: 'Please select user role',
-  DepartmentAllocation: 'Department Allocation',
+  DepartmentAllocation: 'Department Assignment',
   ClickSelectDepartment: 'Click to select a Department',
   choice: 'Select',
   identity: 'Identity',
@@ -365,7 +365,7 @@ module.exports = {
   exportWithFile: 'Export With File',
   Push: 'Push',
   templateDownload: 'Download Template',
-  textInformation: 'Document Files',
+  textInformation: 'Document Information',
   relatedInformation: 'Relevant Information',
   RetrieveFiles: 'Select Stored File',
   SplitText: 'Split Library File',
@@ -374,9 +374,9 @@ module.exports = {
   TemplateDownload: 'Download Template',
   MergerClause: 'Merge Item',
   BatchSetting: 'Batch Set',
-  BatchCancel: 'Batch Cancel Collection',
+  BatchCancel: 'Batch Delete Collection',
   SubscriptionManagement: 'Select Tech Fields',
-  BatchCancellation: 'Batch Cancellation',
+  BatchCancellation: 'Batch Delete',
   clickUpload: 'Click To Upload',
   viewUploadedFiles: 'View Uploaded Files',
   standardSelection: 'Standard Selection',
@@ -385,12 +385,12 @@ module.exports = {
   deleteLib: 'Delete',
   subscribe: 'Subscribe',
   CancelSubscribe: 'Unsubscribe',
-  ConfirmCollection: 'Confirm Collection ?',
-  cancelConfirmCollection: 'Are you sure you want to cancel the collection',
-  ConfirmSubscribe: 'Confirm Subscribe ?',
-  cancelConfirmSubscribe: 'Are you sure you want to cancel the subscribe',
-  ConfirmDelete: 'Confirm Delete ?',
-  ConfirmBatchDeletion: 'Confirm Batch Deletion ? ',
+  ConfirmCollection: 'Confirm to collect？',
+  cancelConfirmCollection: 'Confirm to delete collection?',
+  ConfirmSubscribe: 'Confirm to subscribe？ ',
+  cancelConfirmSubscribe: 'Confirm to cancel subscription？',
+  ConfirmDelete: 'Confirm to delete？',
+  ConfirmBatchDeletion: 'Confirm to delete in batch? ',
   download: 'Download',
   UpdateLog: 'Change Log',
   DocumentSplitting: 'Doc Splitting',
@@ -417,13 +417,13 @@ module.exports = {
   InputBoxType: 'Input Box Type',
   DropDownType: 'Drop Down Type',
   ExhibitionAreaManagement: 'Display Management',
-  NewLabelItem: 'Newly Added Tag Item',
+  NewLabelItem: 'Add Tag Item',
   editLabelItem: 'Edit Tag Item',
   NodeQuickLookup: 'Node Quick Find',
   AreAllLabelsRead: 'Are All Mark as Read',
   AllLabelsRead: 'Mark as Read',
   SubscriptionNotification: 'Subscription Notification',
-  warningInformation: 'Warning Information',
+  warningInformation: 'Early Warning Information',
   ForwardPush: 'Forward Push',
   PleaseSelectData: 'Please select data first',
   MessageContent: 'Message Content',
@@ -470,7 +470,7 @@ module.exports = {
   Search: 'Search',
   SelectWhetherToSearch: 'Please select whether to search',
   DisplayOtherModules: 'Display Of Other Modules',
-  RegulationsListDisplay: 'Regulations List Display',
+  RegulationsListDisplay: 'Regulation List Display',
   selectDisplayListRegulations: 'Please select whether to display the list of regulations',
   SearchCenterDisplay: 'Search Center Display',
   selectSearchCenterDisplayed: 'Please select whether the search center is displayed',
@@ -525,14 +525,14 @@ module.exports = {
   CannotExceed100characters: 'Cannot Exceed 100 characters',
   cantExeed: 'Cannot Exceed ',
   characters: 'Characters',
-  Processing: 'Processing',
+  Processing: 'Handling',
   See: 'View',
   labelNameCannotDuplicate: 'Label name cannot be duplicate',
   list: 'List',
   paragraph: 'Paragraph',
   enterNumber: 'Please enter No.',
   enterTitle: 'Please enter title',
-  backDocument: 'Back To Document Library',
+  backDocument: 'Postback to Document Library',
   fileName: 'File Name',
   splitTime: 'Split Time',
   splitResult: 'Split Result',
@@ -547,8 +547,8 @@ module.exports = {
   technicalField: 'Technical Field',
   informationCategory: 'Info Type',
   contentValidity: 'Content Validity',
-  TechnicalfieldSupplementCn:'Tech Field Supplement (Cn)',
-  TechnicalfieldSupplementEn:'Tech Field Supplement (En)',
+  TechnicalfieldSupplementCn:'Tech Field Supplement (CN)',
+  TechnicalfieldSupplementEn:'Tech Field Supplement (EN)',
   content: 'Content',
   Add: 'Add',
   subscriptionTime: 'Subscription Time',
@@ -574,15 +574,15 @@ module.exports = {
   text: 'Text',
   picture: 'Picture',
   searchScope: 'Search Scope',
-  newNode: 'New node',
+  newNode: 'Add Node',
   modifyNode: 'Modify Node',
-  deleteNode: 'Delete Node',
+  deleteNode: 'If there is file information, it will be deleted synchronously, confirm to delete the data？',
   ImplementationDate: 'New Type Execution Date',
   ImplementationDateOne: 'New Type Execution Date',
   vehicleInProductionDate: 'New Vehicle Execution Date',
   deleteNodes: 'If there are child nodes under this node, they will be deleted synchronously. Are you sure to delete this data?',
   leastTwo: 'Please Select at Least two pieces of data',
-  mergeTerms: 'Determine Merger Terms',
+  mergeTerms: 'Corfirm to Merger Terms? ',
   documentSplitTemplate: 'Document Split Template',
   batSetting: 'Batch Set',
   batchSettingInformation:'Batch Setting Information',
@@ -647,8 +647,8 @@ module.exports = {
   CertificationProgress: 'Homologation Progress',
   CurrentProjectStatusEvaluation: 'Project Status Evaluation',
   NiONumber: 'NIO Number',
-  ParameterName: 'Parameter Name',
-  ParameterDescription: 'Parameter Description',
+  ParameterName: 'Para Name',
+  ParameterDescription: 'Para Description',
   Version: 'Version',
   certificationProgramTime: 'Planned Homo Date',
   ArchitecturePlatform: 'Architecture Platform',
@@ -679,7 +679,7 @@ module.exports = {
   addATable: 'Please add a table',
   pleaseUploadSplitFile: 'Please Upload Split File',
   release: 'Release',
-  confirmRelease: 'Confirm Release ?',
+  confirmRelease: 'Confirm to Release',
   UploadMost: 'You can only upload 20 at most',
   FileUploadFailed: 'File upload failed',
   FileUploadedSuccessfully: 'File uploaded Successfully',
@@ -775,7 +775,7 @@ module.exports = {
   Correspondingstandarddeleted: 'Correspondingstandarddeleted',
   changeTheTitle: 'Title already exists, please change the title',
   resetPassword: 'Reset Password',
-  DepartmentAllocation: 'Department Allocation',
+  DepartmentAllocation: 'Department Assignment',
   ListTitle: 'List Title',
   CopyProjectCollectionparameters: 'Copy Project Collection parameters',
   from: 'From',
@@ -802,11 +802,11 @@ module.exports = {
   Model: 'Model',
   configurationName: 'Configuration Name',
   historicalVersion: 'History Version',
-  configure: 'Configuration',
+  configure: 'Delete Configuration',
   parameter: 'Parameter',
   changeExtension: 'Extension',
   addDetailList: 'Add List',
-  editDetailList:'Edit DetailList',
+  editDetailList:'Edit List',
   detailedList: 'DetailedList',
   copyParamDetailList: 'Copy Parameter List',
   collectionCompletionTime: 'Collection Completion Time',
@@ -820,14 +820,14 @@ module.exports = {
   controlAlternatives: 'Control Component',
   controlVerification: 'Validate Component',
   controlType: 'Control Component',
-  certificationCategory: 'Certification Category',
-  parameterBatch: 'Parameter Batch',
+  certificationCategory: 'Cert Category',
+  parameterBatch: 'Para Batch',
   releaseVersion: 'Release Version',
   parameterTemplate: 'Parameter Template',
   contentDescription: 'Description',
-  WhetherMergeParameters: 'Whether to merge parameters',
-  merge: 'Merge',
-  nonjoinder: 'Nonjoinder',
+  WhetherMergeParameters: 'Merge Parameters',
+  merge: 'Yes',
+  nonjoinder: 'No',
   MergeSeparator: 'Merge separator',
   parameterTemplateExportName: 'Parameter List',
   parameterDataExport: 'Parameter Export Data',
@@ -882,8 +882,8 @@ module.exports = {
   experimentPassed: 'Test Passed',
   experimentFailed: 'Test Failed',
   toBeStarted: 'To Be Started',
-  inProgress: 'Ongoing',
-  Underway: 'Ongoing',
+  inProgress: 'In progress',
+  Underway: 'In progress',
   green: 'Green',
   red: 'Red',
   blue: 'Blue',
@@ -905,7 +905,7 @@ module.exports = {
   virtualAuthenticationListDetails: 'Virtual Homo List Details',
   VirtualAuthenticationList: 'Virtual Homo List',
   maintainVirtualList: 'Maintain Market List',
-  certificationListMaintenance: 'Homo List Maintenance',
+  certificationListMaintenance: 'Market Homologation List Maintenance',
   reasonsForRejection: 'Reason for Rejection',
   inconformity: 'Non-compliance',
   toTrack: 'To be tracked',
@@ -1027,20 +1027,20 @@ module.exports = {
   viewContent: 'View Content',
   fillInTheMonth: 'Filled in (Month)',
   monthSelection: 'Select Month',
-  bringInStandardInformation: 'Bring in standard Information',
+  bringInStandardInformation: 'Involve Standard Information',
   contentTemplate: 'Content Template',
   moveUp: 'Move Up',
   moveDown: 'Move Down',
   vehicleType: 'Vehicle Type',
   usage: 'Usage',
   implementationModel: 'Implementation Model',
-  primaryCoverageCn: 'Description (Cn)',
-  primaryCoverageEn: 'Description (En)',
-  workProgressCn: 'NIO Work Progress (Cn)',
-  workProgressEn: 'NIO Work Progress (En)',
+  primaryCoverageCn: 'Description (CN)',
+  primaryCoverageEn: 'Description (EN)',
+  workProgressCn: 'NIO Work Progress (CN)',
+  workProgressEn: 'NIO Work Progress (EN)',
   initiatingProcess: 'Process Initiation',
   collectResults: 'Collect Results',
-  dateOfInitiation: 'Date Of Initiation',
+  dateOfInitiation: 'Initiation Date',
   closingDate: 'Due Date',
   viewProcess: 'View Process',
   evaluationResults: 'Evaluation Result',
@@ -1061,9 +1061,9 @@ module.exports = {
   standardNo: 'Standard No.',
   implemenDate: 'Implementation Date',
 //  上报库
-  Enable: 'Enable',
+  Enable: 'Active',
   Latestupdatetime: 'Latest Update Time',
-  Exporthistory: 'Exporthistory',
+  Exporthistory: 'Export History',
   Exporttype: 'Export Type',
   Exporttime: 'Export Time',
   file: 'File',
@@ -1077,14 +1077,14 @@ module.exports = {
   NNiONumber: 'NIO Number',
   ParameterNo: 'No.',
   NRequired: 'Required',
-  NParameterName: 'Parameter Name',
+  NParameterName: 'Para Name',
   NtechnicalField: 'Technical Field',
-  NparameterBatch: 'Params Batch',
+  NparameterBatch: 'Para Batch',
   NareaOfResponsibility: 'Responsible Field',
-  NParameterDescription: 'Parameter Description',
+  NParameterDescription: 'Para Description',
   NcertificationCategory: 'Cert Category',
-  NcontrolType: 'Control Componet',
-  NcontrolVerification: 'Validate Componet',
+  NcontrolType: 'Control Component',
+  NcontrolVerification: 'Validate Component',
   NcontrolAlternatives: 'Componet Value',
   DefaultValue: 'Default Value',
   NattachmentTemplate: 'File Template',
@@ -1145,15 +1145,15 @@ module.exports = {
   uploadRelevantMaterials: 'Upload relevant materials',
   processBackground: 'Process Background',
   selectedStandard: 'Selected Standard',
-  standardDecompositionDocument: 'Standard decomposition document',
+  standardDecompositionDocument: 'Involve Checklist',
   pleaseSelectStandardFirst: 'Please select a standard first',
-  RelevantMaterials: 'RelevantMaterials',
+  RelevantMaterials: 'Supporting Doc.',
   evaluatorFeedback: 'Evaluator Feedback',
   nameTechnicalDocument: 'Technical Document',
   chapter: 'Chapter',
   problemDescription: 'Problem Description',
-  filingExternalOpinions: 'Filing of external opinions',
-  regulatoryTechnicalEvaluationResults: 'Regulatory technical evaluation results',
+  filingExternalOpinions: 'Comments Archive',
+  regulatoryTechnicalEvaluationResults: 'Technical Evaluation Result',
   initiateProcessForCurrentStandard: 'Initiate process for current standard',
   engineerFeedbackResults: 'Engineer Feedback',
   fileExport: 'File Export',
@@ -1170,9 +1170,9 @@ module.exports = {
   processName: 'Process Name',
   feedbackResults: 'Feedback results',
   theDoesNotSupportPreview: 'The current file format does not support Preview',
-  releaseSituation: 'Release situation',
-  comparisonResults: 'Comparison results',
-  Published: 'Published',
+  releaseSituation: 'Release Status',
+  comparisonResults: 'Comparison Results',
+  Published: 'Released',
   initiateComparison: 'Initiate Comparison',
   translationLanguage: 'Translation language',
   translationResults: 'Translation results',
@@ -1184,31 +1184,31 @@ module.exports = {
   TechnicalEvaluationResultsForReference: 'Technical Evaluation Result',
   ComplianceConfirmationRecord: 'Compliance Confirmation Record',
   complianceConfirmation: 'Compliance Confirmation',
-  noComparisonDocumentSelected: 'No comparison document selected',
-  RemarkInfo: 'Remarks Info',
+  noComparisonDocumentSelected: 'No document selected for comparison',
+  RemarkInfo: 'Remarks',
   initiateDocumentComparison: 'Initiate Document Comparison',
   comparativeComments: 'Comparative Comments',
-  Comparisonofarticles:'Comparison Of Articles',
+  Comparisonofarticles:'Item Comparison Comment',
   viewTheComparisonResults: 'View Results',
   addFullTextComment: 'Full Text Comment',
-  turnOffAutomaticMatching: 'Turn Off Auto Match',
+  turnOffAutomaticMatching: 'Close Automatic Matching',
   Deriveconformanceresults: 'Export Compliance Results',
   Regulatorycompliancekanban: 'Regulatory Compliance Kanban',
   exportComparisonReport: 'Export Comparison Report',
   comparisonDifferenceComment: 'Comparison Difference Comment',
   fullTextComments: 'Full Text Comment',
   pleaseEnterfullTextComments:'Please enter Full Text Comment',
-  fileDeclaration: 'File Declaration',
+  fileDeclaration: 'File Description',
   FileForDetails: 'File For Details',
   Converting: 'Converting',
   convertNetwork: 'Convert Network',
   convertFailed: 'Convert Failed',
   standardData: 'Standard Data',
   Theorganization: 'The Organization',
-  Addingfolder: 'Create New Folder',
-  Addingsubfolders: 'Adding Subfolders',
+  Addingfolder: 'Add Folder',
+  Addingsubfolders: 'Add Subfolder',
   Editfolder: 'Edit Folder',
-  Deletefolders: 'Delete Folders',
+  Deletefolders: 'Delete Folder',
   Foldername: 'Folder Name',
   Folderpermissions: 'Folder Permissions',
   Folderorder: 'Folder Order',
@@ -1228,7 +1228,7 @@ module.exports = {
   Collectlist: 'Collection List',
   Statisticalmodels: 'Statistical Model',
   Inthecollection: 'Collecting',
-  Notatthe: 'Not started',
+  Notatthe: 'Not start',
   Thepercentage: 'Percentage',
   problemKnowledgeBase: 'Knowledge Sharing',
   recentHotSpots: 'Recent Hot Spots',
@@ -1247,16 +1247,16 @@ module.exports = {
   documentNumber: 'Document Number',
   documentTitle: 'Document Title',
   bringInDocumentInformation: 'Bring in document information',
-  addStandardInformation:'Add standard information',
+  addStandardInformation:'Add Standard Information',
   thereWhichCannotDeleted: 'There are sub headings under this title, which cannot be deleted',
   sdt: 'Eng. Interface',
   dre: 'Filled by',
   applicableInstructionsMarketList: 'Applicable instructions of market list',
   pleaseSelectTheDataCompared: 'Please select the data to be compared',
-  problemLabel: 'classification',
-  personCharge: 'Person in charge',
+  problemLabel: 'Classification',
+  personCharge: 'Owner',
   addLabel: 'New Classification',
-  editLabel: 'Edit Label',
+  editLabel: 'Edit Tag',
   applicableMarket: 'Applicable Market',
   templateMaintenance: 'Template Maintenance',
   associatedWebsite: 'Associated website',
@@ -1269,22 +1269,22 @@ module.exports = {
   share: 'Share',
   simplifiedChinese:'Simplified Chinese',
   uploadOnly:'Upload only',
-  turnOnAutoMatch:'Turn On Auto Match',
+  turnOnAutoMatch:'Open Automatic Matching',
   Adjustareasofresponsibility:'Adjust areas of responsibility',
   regulatoryTechnicalAssessment:'Regulatory Technical Assessment',
   punctuationmark:'You can only enter English punctuation marks except the # sign',
   created: 'Time of Creation',
   updated:'Last Updated',
-  OpenOne:'Open',
-  Privacy:'Privacy',
-  Paraname: 'Parameter Name',
+  OpenOne:'Public',
+  Privacy:'Private',
+  Paraname: 'Para Name',
   Parabatch: 'Para Batch',
   freeze:'Please select the configuration you want to freeze',
   optionDropDownBox:'Option drop - down box',
   attachmentUpload:'File',
   textInput:'Text Input',
   deleteNode:'If there is any file information, the file will be deleted. Are you sure to delete this data?',
-  HaveReleased:'Have released',
+  HaveReleased:'Released',
   forward:'Forward',
   areResponsibilityAreaInformationBatch:'Are you sure you want to modify the responsibility area information in batch',
   issuedBy:'Issued by',
@@ -1329,14 +1329,14 @@ module.exports = {
   processNodesAreInconsistentPleaseSelectConsistentData:'Process nodes are inconsistent; Please select consistent data',
   exportFileName:'Export file name',
   initiateSupplementaryProcess:'Initiate supplementary process',
-  whetherTheDisassemblySheetIncluded:'Whether the disassembly sheet is included',
+  whetherTheDisassemblySheetIncluded:'Checklist Included',
   inRecentMonths3:'In recent 3 months',
   inRecentMonths6:'In recent 6 months',
   inRecentYear1:'In recent 1 year',
   inRecentYear2:'In recent 2 year',
   inRecentYear3:'In recent 3 year',
   selectAll:'Select All',
-  importLocalDisassemblyOrder:'Import local disassembly order',
+  importLocalDisassemblyOrder:'Import Checklist',
   notExport:'Not exported',
   hasBeenExport:'Exported',
   firstLevelDirectory:'Primary Directory',
@@ -1344,7 +1344,7 @@ module.exports = {
   classification:'Classification',
   consistentAssessment:'Consistent',
   viewConsistentAssessment:'View Consistent',
-  viewVarianceAssessment:'View Variance',
+  viewVarianceAssessment:'View Differences',
   viewAll:'View All',
   endProcess:'End Process',
   thereForTheCurrentlySelectedData:'There is no standard breakdown for the currently selected data',
@@ -1420,7 +1420,7 @@ module.exports = {
   missionRejection:'Reject',
   turnToDo:'Forward',
   initiateTask:'Initiate Task',
-  compliancereport:'Generate Compliance report',
+  compliancereport:'Generate Compliance Report',
   todocenter:'To-Do Center',
   areYouReturnToStudio:'Confirm to return to studio?',
   confirmLaunchTask:'Confirm to initiate a task ?',
@@ -1438,7 +1438,7 @@ module.exports = {
   onlyDataStatusResultReviewedCanBeSelected:'Only data with process status of Result to Be Reviewed can be selected',
   confirmResetProcess:'Confirm to reset the process?',
   confirmUrging:'Confirm to remind?',
-  confirmWithdrawal:'Confirm to withdraw?',
+  confirmWithdrawal:'Confirm to Withdraw？',
   onlyListCheckedCanRecalled:'Only data with process status of List to Be Checked can be withdrawed',
   statusthetasistobeconfirmed:'Withdrawal can only be performed when the list status is To Be Checked or the task status is To Be Confirmed',
   confirmreturn:'Confirm to return ?',
@@ -1456,8 +1456,8 @@ module.exports = {
   getStarted:'Pre-Homo Starts',
   certificationStartOne:'Homo Starts',
   verificationAndVerification:'Validation Check',
-  projectInterfacePersonRegulationEngineerSetting:'Project Interface Person - Regulation Engineer Setting',
-  projectInterfacePersonCertificationEngineerSetting:'Project Interface Person - Certification Engineer Setting',
+  projectInterfacePersonRegulationEngineerSetting:'Eng. Interface - Regulation Engineer Setting',
+  projectInterfacePersonCertificationEngineerSetting:'Eng. Interface - Homo Engineer Setting',
   registrationnumber:'Product registration number',
   noticebatch:'Notice batch',
   producttrademark:'Product Trademark',
@@ -1506,7 +1506,7 @@ module.exports = {
   addcontroller:'Add controller',
   addsystem:'Add system',
   functionname:'Function name',
-  configuration:'configuration',
+  configuration:'Delete Configuration',
   drivingautomationlevel:'Driving automation level',
   functiondescription:'Function description',
   applicationconditions:'Application conditions',
@@ -1669,7 +1669,7 @@ module.exports = {
   Listoftreatableregulations:'List of treatable regulations',
   Listofuntractableregulations:'List of untractable regulations',
   project:'Project',
-  Categoryofdeliverables:'Type of deliverables',
+  Categoryofdeliverables:'Deliverable Type',
   Taskconfirmationresult:'Task confirmation result',
   Compliancetaskhandling:'Compliance task handling',
   theDataYouSelectedContainsSkip:'The data selected contains empty deliverable; please confirm whether to skip',
@@ -1690,7 +1690,7 @@ module.exports = {
   next:'Next',
   last:'Last',
   designComplianceReviewAdmin:'Design Compliance Review',
-  missionAccomplished:'Mission Accomplished',
+  missionAccomplished:'Task Completed',
   yesisselected:'If Yes is selected, enter',
   forwardXquantity:'For example, forward X quantity, backward X quantity, right X quantity, etc',
   upgraderecordnumber:'Upgrade record number',
@@ -1742,9 +1742,9 @@ module.exports = {
   verifyConformanceConfirmation:'Validation Compliance Confirmation',
   designConformanceVerification:'Design Compliance Check',
   nomorethan:'No more than 10',
-  marketCertificationList:'Market Certification List',
+  marketCertificationList:'Market Homologation List',
   uploadedfilelarger:'The uploaded file is larger than',
-  marketCertificationListDetails:'Market Certification List Details',
+  marketCertificationListDetails:'Market Homologation List Details',
   andTheProcessStatusTheList:'And the process status cannot be the data to be checked in the list',
   pleasefillintherange:'Please fill in the range',
   databasereportingtime:'Synchronize the database reporting time',
@@ -1768,7 +1768,7 @@ module.exports = {
   andProcessStatusIsTaskPendingConfirmation:'And the process status is Task Pending Confirmation',
   andPendingSubmissionReviewReturned:'And the process status is result pending submission, review returned',
   deliverablesFor:'Deliverables for',
-  dutyPersonRejected:'Duty Person Rejected',
+  dutyPersonRejected:'Rejected by the responsible person',
   theCurrentlySelectedDataContainsReviewed:'The currently selected data contains reviewed data. Are you sure to return it?',
   reviewTheReasonForReturn:'Review the reason for return',
   reasonForTaskRejection:'Reason for task rejection',
@@ -1777,13 +1777,13 @@ module.exports = {
   theVerificationComplianceProcessCannotBeEmpty:'The delivery type of the verification compliance process cannot be empty',
   deadlineForConfirmationDesignComplianceResponsibility:'Deadline for Confirmation of Design Compliance Responsibility',
   deadlineForVerifyingComplianceResponsibilityConfirmation:'Deadline for verifying compliance responsibility confirmation',
-  batchTaskResponsibilityConfirmation:'Batch task responsibility confirmation',
-  batchComplianceConfirmation:'Batch compliance confirmation',
+  batchTaskResponsibilityConfirmation:'Responsibilty Confirmation in Batch',
+  batchComplianceConfirmation:'Compliance Confirmation in Batch',
   onlyDataWithApprovedCanCeSelected:'Only data with a process status of result pending review or approved can be selected',
   deadlineForResponsibilityConfirmation:'Deadline for Responsibility Confirmation',
   checkRegulatoryCompletedBefore: "Check the implementation of regulatory requirements before product design freezes. Task delivery requirements will first be input and confirmed with the engineering team in G1, and compliance confirmation and review will be completed before G3.",
   checkVerificationResultsBeforeMP:'Check the verification results required by regulations before mass production of the product. Task delivery requirements will first be input and confirmed with the engineering team in G1, and compliance confirmation and review will be completed before MP.',
-  modifyOperator:'Modify Operator',
+  modifyOperator:'Change Operator',
   onlyDesignComplianceConfirmationSelected:'Only data with a design compliance confirmation process status of task to be confirmed, result to be submitted, or verification compliance confirmation process status of task to be confirmed, result to be submitted can be selected',
   oneThePersonnelMustBeSelected:'One of the personnel must be selected',
   pleaseSelectRegulatoryCurrentLogin:'Please select Regulatory Engineer as the data for the current login',
@@ -1795,7 +1795,7 @@ module.exports = {
   designProcessStatus:'Design Process Status',
   verifyProcessStatus:'Verify Process Status',
   design:'Design',
-  verify:'Verify',
+  verify:'Validation',
   inventoryVerifyEndTime:'Inventory Verify End Time',
   taskConfirmEndTime:'Task Confirm End Time',
   responsiblepersonfordesigncompliance:'Responsible person for design compliance',
@@ -1810,15 +1810,15 @@ module.exports = {
   andTheOperatorCurrentData:' And the operator is the responsible person for the current data',
   upgradeInstructions:'Upgrade Instructions',
   upgradeOrNot:'Upgrade or not',
-  operationRecords:'Operation Records',
+  operationRecords:'Operation Record',
   versionUpdatedRecord:'Version Updated Record',
-  regulatoryComplianceManagement:'Regulatory Compliance Management',
-  certificationActivityManagement:'Certification Activity Management',
+  regulatoryComplianceManagement:'Regulation Compliance Management',
+  certificationActivityManagement:'Homologation Activity Management',
   parameterCollectionProgressManagement:'Parameter Collection Progress Management',
-  certificationTaskConfirmation:'Certification Task Confirmation',
+  certificationTaskConfirmation:'Homo Task Confirmation',
   selectTime:'Select Time',
   designCompliance:'Design Compliance',
-  verifyCompliance:'Verify Compliance',
+  verifyCompliance:'Validation Compliance',
   stateExport:'State Export',
   completeVehicle:'Complete Vehicle',
   components:'Components',
@@ -1830,7 +1830,7 @@ module.exports = {
   projectProgressStatistics:'Project Progress Statistics',
   GRPSystemProjectProgressStatistics:'GRP system project progress statistics',
   statisticalNodes:'Duty Department',
-  proportionWithInTheAreaOfResponsibility:'Proportion within the area of responsibility',
+  proportionWithInTheAreaOfResponsibility:'Proportion within the Responsible Field',
   contentsearch:'Content Search',
   masterProject:'Master Project',
   deliveryTime:'Delivery Time',
@@ -1842,7 +1842,7 @@ module.exports = {
   selectDesignConformanceAsConformance:'Select Design Conformance verification process state as Conformance or Verify conformance verification process state as conformance obtained data',
   submissionProcess:'Submission Process',
   localapproval1:'Local Approval1',
-  localapproval2:'Local Approval2',
+  localapproval2:'LoLocal Approved2',
   averageapprovalperiod:'Average approval period',
   day:'day',
   passreturntime:'Pass/return time',
@@ -1872,7 +1872,7 @@ module.exports = {
   legalOpinionCollection:'Opinion Collection on Regulation',
   authenticationParameterCollectionData:'Homo Parameter Collection Data',
   phoneRelatedItems:'Project',
-  listHeading:'List Name',
+  listHeading:'List Title',
   phoneVersionNumber:'Version',
   node:'Node',
   goToCheck:'View',
@@ -1888,7 +1888,7 @@ module.exports = {
   send:'Send',
   pleaseProcessThePC:'Please handle it on the PC side',
   clickAndSelect:'Click and Select',
-  phoneCreationTime:'Create Time',
+  phoneCreationTime:'Time of Creation',
   theCurrentFormatSupportPreview:'The current format does not support preview',
   nearlyMonth:'In a month',
   nearlyThreeMonths:'In three months',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 4385f38cd..e5c490bdf 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -591,7 +591,7 @@ module.exports = {
   vehicleInProductionDate: '在产车实施日期',
   deleteNodes: '该节点下若有子节点将同步删除，确认删除该条数据？',
   leastTwo: '请选择至少两条数据',
-  mergeTerms: '确定合并条款',
+  mergeTerms: '确定合并条款？',
   documentSplitTemplate: '文档拆分模板',
   batSetting: '批量设置',
   batchSettingInformation: '批量设置信息',
@@ -1153,7 +1153,7 @@ module.exports = {
   RelevantMaterials: '相关资料',
   processBackground: '流程背景',
   selectedStandard: '所选标准',
-  standardDecompositionDocument: '带入标准分解单',
+  standardDecompositionDocument: '带入标准拆解单',
   pleaseSelectStandardFirst: '请先选择标准',
   evaluatorFeedback: '评估人反馈',
   nameTechnicalDocument: '技术文件名称',
@@ -2961,7 +2961,7 @@ module.exports = {
   closingDate: '截止日期',
   viewProcess: '查看流程',
   evaluationResults: '评估结果',
-  regulatoryTechnicalEvaluationResults: '法规技术评估结果',
+  regulatoryTechnicalEvaluationResults: '技术评估结果',
   Assessor: '评估人',
   collectionOfRegulatoryOpinions: '法规意见收集',
   collectionOfRegulatoryOpinionsProcess: '法规意见收集流程',

From ded54ebe7e7bd7a233f1227dbece53a6513b6002 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 12 Sep 2023 16:35:18 +0800
Subject: [PATCH 002/288] =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectLibraryBaseServiceImpl.java    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 00b571f64..f99bd3606 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -1393,10 +1393,12 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 
 	public String getMarket(Map<String, Object> params, List<DictModel> targetMarketList, ProjectLibraryBase projectLibraryBase) {
 		List<DictModel> dictModelList = new ArrayList<>();
-		for (String s : projectLibraryBase.getTargetMarket().split(",")) {
-			List<DictModel> dictModelListTemp = targetMarketList.stream()
-					.filter(e -> s.equals(e.getValue())).collect(Collectors.toList());
-			dictModelList.addAll(dictModelListTemp);
+		if(StringUtils.isNotBlank(projectLibraryBase.getTargetMarket())){
+			for (String s : projectLibraryBase.getTargetMarket().split(",")) {
+				List<DictModel> dictModelListTemp = targetMarketList.stream()
+						.filter(e -> s.equals(e.getValue())).collect(Collectors.toList());
+				dictModelList.addAll(dictModelListTemp);
+			}
 		}
 		String targetMarket = "";
 		if(dictModelList.size() != 0){

From 9f4600a74c788066b6e114f31a2cdec21985120e Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 12 Sep 2023 17:03:16 +0800
Subject: [PATCH 003/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |    3 +
 jero-web/src/common/lang/zh-cn.js             |    3 +
 jero-web/src/config/router.config.js          |    5 +
 .../platformItemLibrary/index.vue             |  470 ++
 .../ParameterItemCollectionList.vue           | 2981 +++++++++++++
 .../components/ProjectDetails.vue             |  386 ++
 .../components/TaskList.vue                   |  960 +++++
 .../components/TaskListModel.vue              |  340 ++
 .../components/TaskParameterCollection.vue    |  663 +++
 .../components/addModel.vue                   |  630 +++
 .../components/addModelconformance.vue        |  778 ++++
 .../components/batSetting.vue                 |  667 +++
 .../components/batchChangeModel.vue           |  216 +
 .../components/batchModel.vue                 |  182 +
 .../components/batchSettingPersonnel.vue      |  418 ++
 .../components/batchUpdateDeadline.vue        |  196 +
 .../components/certificationActivity.vue      |  401 ++
 .../components/certificationDirectory.vue     |  321 ++
 .../components/certificationDirectoryAdd.vue  |  318 ++
 .../components/addCodeNumber.vue              |  289 ++
 .../components/addConfiguration.vue           |  140 +
 .../certificationList/components/addModel.vue | 1238 ++++++
 .../components/batSetting.vue                 |  474 +++
 .../components/deadlineForm.vue               |  143 +
 .../components/modifyHistoryList.vue          |  179 +
 .../components/reasonForReturn.vue            |  139 +
 .../components/referenceDeliverablesList.vue  |  266 ++
 .../components/transferList.vue               |  290 ++
 .../components/transferListvirtal.vue         |  329 ++
 .../components/certificationList/index.vue    | 2724 ++++++++++++
 .../components/commentList.vue                |  402 ++
 .../complianceCertificationForm.vue           |  302 ++
 .../components/cuibanModel.vue                |  189 +
 .../components/customizeList.vue              |  280 ++
 .../components/detilModel.vue                 |  507 +++
 .../components/fixedPlateForm.vue             |  138 +
 .../components/historicalVersionList.vue      |  105 +
 .../components/listAddModel.vue               |  346 ++
 .../components/listEditModel.vue              | 1211 ++++++
 .../components/listOfRegulations.vue          | 3776 +++++++++++++++++
 .../components/listOfRegulationsView.vue      |  623 +++
 .../components/modifyOperator.vue             |  165 +
 .../components/nonConformance.vue             |  701 +++
 .../components/projectStatus.vue              |   74 +
 .../components/regulatoryCompliance.vue       |  397 ++
 .../components/responsibilityList.vue         |  157 +
 .../components/resultReportedUpload.vue       |  245 ++
 .../components/settingList.vue                |  267 ++
 .../components/taskBatSetting.vue             |  251 ++
 .../components/toResubmitForm.vue             |  452 ++
 .../components/transferList.vue               |  268 ++
 .../components/transferListRxswin.vue         |  233 +
 .../components/transferListvirtal.vue         |  411 ++
 .../components/transferListvirtalRxswin.vue   |  370 ++
 .../components/versionStatistics.vue          |  195 +
 .../platformItemLibraryDetails/index.vue      |  701 +++
 56 files changed, 28915 insertions(+)
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibrary/index.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ParameterItemCollectionList.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/TaskList.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/TaskListModel.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/TaskParameterCollection.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batSetting.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batchChangeModel.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batchModel.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batchSettingPersonnel.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batchUpdateDeadline.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationDirectory.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationDirectoryAdd.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addCodeNumber.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addConfiguration.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/deadlineForm.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/modifyHistoryList.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/reasonForReturn.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/referenceDeliverablesList.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/transferList.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/transferListvirtal.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/commentList.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/complianceCertificationForm.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/cuibanModel.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/customizeList.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/detilModel.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/fixedPlateForm.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/historicalVersionList.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listAddModel.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulationsView.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/modifyOperator.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/projectStatus.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/regulatoryCompliance.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/responsibilityList.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/resultReportedUpload.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/taskBatSetting.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/toResubmitForm.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferList.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferListRxswin.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferListvirtal.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferListvirtalRxswin.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/versionStatistics.vue
 create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index cea607c6f..31619136c 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1969,4 +1969,7 @@ module.exports = {
   Listcreationtime:'List creation time',
   Chinesecharacters:'The role code cannot enter Chinese characters',
   alreadyexistssystem:'The role encoding already exists',
+  maximum:'A maximum of 20 nodes can be added',
+  Nodename:'Node Name',
+  Nodedate:'Node Time',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 4385f38cd..6134024bc 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -3925,4 +3925,7 @@ module.exports = {
   Fileupload:'文件上传',
   Addresslink:'地址链接',
   Problemanagement:'问题管理',
+  maximum:'最多添加20个节点',
+  Nodename:'节点名称',
+  Nodedate:'节点时间',
 }
\ No newline at end of file
diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js
index 5f5916571..73a763b95 100644
--- a/jero-web/src/config/router.config.js
+++ b/jero-web/src/config/router.config.js
@@ -338,6 +338,11 @@ export const constantRouterMap = [
     name: 'certificationListMaintenance',
     component: () => import(/* webpackChunkName: "user" */ '@/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance')
   },
+  {
+    path: '/platformItemLibraryDetails',
+    name: 'platformItemLibraryDetails',
+    component: () => import(/* webpackChunkName: "user" */ '@/views/projectManagement/platformItemLibraryDetails/index')
+  },
   {
     path: '/ProjectDetails',
     name: 'ProjectDetails',
diff --git a/jero-web/src/views/projectManagement/platformItemLibrary/index.vue b/jero-web/src/views/projectManagement/platformItemLibrary/index.vue
new file mode 100644
index 000000000..88622b8ce
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibrary/index.vue
@@ -0,0 +1,470 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('entryName')">
+                <span>{{$t('entryName')}}</span>
+              </div>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('entryName')"
+                       v-model="queryParam.projectName"></a-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('brand')">
+                <span>{{$t('brand')}}</span>
+              </div>
+              <j-dict-select-tag class="box-input" v-model="queryParam.targetMarket"
+                                 :placeholder="$t('PleaseSelect')+$t('brand')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'brand'"/>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('configurationItem')">
+                <span>{{$t('configurationItem')}}</span>
+              </div>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('configurationItem')"
+                       v-model="queryParam.configurationItem"></a-input>
+            </div>
+          </a-col>
+          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+               </a-col>
+      </span>
+        </a-row>
+      </a-form>
+    </div>
+    <div class="table-operator">
+      <div @click="handleAdd" class="operator-text" v-has="'projectLibraryBase:add'">
+        <a-icon type="plus"/>
+        {{$t('newlyAdded')}}
+      </div>
+      <!--      <div @click="handleDel" class="operator-text" v-has="'projectLibraryBase:deleteBatch'">-->
+      <!--        <a-icon type="delete"/>-->
+      <!--        {{$t('BatchDelete')}}-->
+      <!--      </div>-->
+    </div>
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        :components="drag(columns,'columns')"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: '100%'}"
+        rowKey="id"
+        @change="tableOnChange"
+        :data-source="dataSource"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :columns="columns"
+      >
+        <span slot="projectName" slot-scope="text,record">
+          <a @click="entryNameClick(record)" :title="text">{{text}}</a>
+        </span>
+        <span slot="operation" slot-scope="text,record">
+<!--            <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>-->
+            <a class="text-operation"
+               @click="toppingClick(record)">
+              {{record.flag == '1'?$t('cancelTopping'):$t('Topping')}}
+            </a>
+            <a class="text-operation"
+               v-has="'projectLibraryBase:delete'"
+               v-if="record.createBy == userInfoQuery.username || record.studioEngineerName == userInfoQuery.username || administrators"
+               @click="deleteLib(record)">{{$t('deleteLib')}}</a>
+          <!--          <a class="text-operation" @click="entryNameClick(record)">{{$t('see')}}</a>-->
+        </span>
+      </a-table>
+    </div>
+    <div class="page">
+      <a-pagination
+        :show-total="total => $t('total')+` ${total} `+$t('strip')"
+        show-quick-jumper
+        show-size-changer
+        :page-size.sync="pageSize"
+        :total="total"
+        :current="pageNo"
+        @change="pageOnChange"
+        @showSizeChange="SizeChange"
+      />
+    </div>
+    <addModel :url="url" ref="addModelRef" @addModelList="addModelList"/>
+  </a-card>
+</template>
+
+<script>
+  import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
+  import addModel from '../platformItemLibraryDetails/components/addModel'
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
+  import { mapGetters } from 'vuex'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+  export default {
+    name: 'index',
+    components: {
+      addModel,
+      PersonnelSelection,
+    },
+    mixins:[ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        loading: false,
+        toggleSearchStatus: false,
+        selectedRowKeys: [],
+        formInline: {},
+        rules: {},
+        visible: false,
+        isPersonnelSelection:true,
+        dataSource: [],
+        confirmLoading: false,
+        url: {
+          list: 'project/projectLibraryBase/page',
+          add: 'project/projectLibraryBase/add',
+          edit: 'project/projectLibraryBase/edit',
+          deleteBatch: 'project/projectLibraryBase/delete',
+          deleteAll: 'project/projectLibraryBase/deleteBatch'
+        },
+        total: 0,
+        pageSize: 10,
+        pageNo: 1,
+        title: '新增',
+        columns: [
+          {
+            title: this.$t('entryName'),
+            align: 'left',
+            dataIndex: 'projectName',
+            width: 300,
+            sorter:true,
+            ellipsis: true,
+            scopedSlots: { customRender: 'projectName' }
+          },
+          {
+            title: this.$t('regulatoryEngineer'),
+            align: 'left',
+            width: 120,
+            sorter:true,
+            ellipsis: true,
+            dataIndex: 'studioEngineerName'
+          },
+          {
+            title: this.$t('brand'),
+            align: 'left',
+            width: 120,
+            sorter:true,
+            ellipsis: true,
+            dataIndex: 'brandText'
+          },
+          {
+            title: this.$t('configurationItem'),
+            align: 'left',
+            width: 180,
+            sorter:true,
+            ellipsis: true,
+            dataIndex: 'explanation'
+          },
+          {
+            title: this.$t('explain'),
+            align: 'left',
+            width: 360,
+            ellipsis: true,
+            sorter:true,
+            dataIndex: 'explain'
+          },
+          {
+            title: this.$t('operation'),
+            align: 'left',
+            fixed: 'right',
+            width: 160,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
+        userInfoQuery: {},
+        queryParam: {},
+        orderBy: '1',
+        orderByField: '',
+        cut: '',
+        administrators: false
+      }
+    },
+    mounted() {
+      this.getList()
+      this.userInfoQuery = this.userInfo()
+      this.administrators = false
+      if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+        this.userInfo().userRoleList.forEach(res => {
+          if (res.roleCode == 'admin') {
+            this.administrators = true
+          }
+        })
+      }
+    },
+    methods: {
+      ...mapGetters(['userInfo']),
+      handleToggleSearch() {
+        this.toggleSearchStatus = !this.toggleSearchStatus
+      },
+      toppingClick(row) {
+        let flag = ''
+        if (row.flag == '1') {
+          flag = '0'
+        } else {
+          flag = '1'
+        }
+        let query = {
+          flag: flag,
+          id: row.id
+        }
+        getAction('/project/projectLibraryBase/top', query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.getList()
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
+      },
+      changeExtensionForm() {
+        this.getList()
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+      },
+      //添加
+      handleAdd() {
+        this.$refs.addModelRef.addModel()
+      },
+      //批量删除
+      handleDel() {
+        if (this.selectedRowKeys.length > 0) {
+          let _this = this
+          this.$confirm({
+            content: _this.$t('ConfirmBatchDeletion'),
+            onOk() {
+              let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+              deleteAction(_this.url.deleteAll, { ids: idList.join(',') }).then((res) => {
+                if (res.success) {
+                  _this.$message.success(_this.$t('OperationSuccessful'))
+                  _this.selectedRowKeys = []
+                  _this.getList()
+                } else {
+                  _this.$message.warning(_this.$t('operationFailed'))
+                }
+              })
+            }
+          })
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      //编辑
+      edit(item) {
+        this.$refs.addModelRef.editModel(JSON.parse(JSON.stringify(item)))
+      },
+      //删除
+      deleteLib(val) {
+        let _this = this
+        this.$confirm({
+          content: _this.$t(val.children ? 'allsubitemsitem' : 'ConfirmDelete'),
+          onOk() {
+            deleteAction(_this.url.deleteBatch, { id: val.id }).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.getList()
+              } else {
+                _this.$message.warning(res.message)
+              }
+            })
+          }
+        })
+      },
+      //虚拟清单名称事件
+      entryNameClick(item) {
+        let newUrl = this.$router.resolve({
+          path: '/platformItemLibraryDetails',
+          query: item
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.isPersonnelSelection = false
+        this.$nextTick(()=>{
+          this.isPersonnelSelection = true
+        })
+        this.pageNo = 1
+        this.queryParam = {}
+        this.getList()
+      },
+      pageOnChange(page, pageSize) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      addModelList() {
+        this.pageNo = 1
+        this.getList()
+      },
+      PersonnelSelectionChange(value, id) {
+        this.queryParam[value] = id
+        this.queryParam = { ...this.queryParam }
+      },
+      tableOnChange(pagination, filters, sorter) {
+        this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+        this.orderByField = sorter.columnKey
+        this.getList()
+      },
+      getList() {
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          orderBy: this.orderBy,
+          orderByField: this.orderByField,
+          ...this.queryParam
+        }
+        this.loading = true
+        postAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            this.total = res.result.total
+            this.cut = res.cut
+            this.dataSource = res.result.records || []
+            this.dataSource.forEach((item) => {
+              if(this.cut == 'en'){
+                item.brandText = item.brandTextEn
+              }else{
+                item.brandText = item.brandText
+              }
+            })
+
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  @import '~@assets/less/common.less';
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+    /*margin-top: 2px;*/
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .box-title-text-add {
+    line-height: 1.4;
+    display: flex;
+  }
+
+  .title-text-add {
+    width: 114px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 42px;
+    margin-top: 3px;
+  }
+
+  .box-input-add {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .formAdd {
+    margin-bottom: 40px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    z-index: 100;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ParameterItemCollectionList.vue
new file mode 100644
index 000000000..2bed0caca
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ParameterItemCollectionList.vue
@@ -0,0 +1,2981 @@
+<template>
+  <div class="doc-detail">
+    <div class="Virtual-detail-header" style="position: fixed;top: 0">
+      <div class="Virtual-detail-title">
+        <span>
+          {{$t('ParameteItemCollectionList')}}({{$t(this.$route.query.projectName)}}) — {{$t(this.$route.query.title)}}
+        </span>
+      </div>
+      <div class="Virtual-detail-title-right">
+        <a-popconfirm overlayClassName="popconfirmDetailsText"
+                      :visible="visible"
+                      @visibleChange="handleVisibleChange"
+                      placement="bottomRight">
+          <template slot="title" id="popconfirmDetails">
+            <div @click="roleSwitchingClick(item.value)"
+                 v-for="(item,index) in RoleType"
+                 class="operator-text-title"
+                 :class="{'operator-text-title-color':item.label == rolename ? true : false}"
+                 :title="item.label">
+              {{ item.label }}
+            </div>
+            <JLoading :loading="JTextLoading"></JLoading>
+          </template>
+          <div class="operator-text" style="position: relative;margin-right: 0">
+            <a-icon type="select"/>
+            {{rolename}}
+          </div>
+        </a-popconfirm>
+      </div>
+    </div>
+    <div style="padding-top: 54px;background: #fff;height: 100%">
+      <div class="detail-content" style="height: 100%">
+        <a-card :bordered="false" class="card">
+          <div class="table-page-search-wrapper">
+            <!--      认证参数收集-参数项收集清单-10控件-->
+            <div class='Virtual-detail-content' style='margin-top: 15px'>
+              <a-form layout="inline" @keyup.enter.native="searchQuery">
+                <a-row :gutter="24" style='margin-left: -90px;'>
+                  <a-col :md="6" :sm="8">
+                    <div class="box-title-text">
+                      <div class="title-text" :title="$t('ParameterNo')">
+                        <span>{{$t('ParameterNo')}}</span>
+                      </div>
+                      <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ParameterNo')"
+                               v-model="formInline.allNumber"></a-input>
+                    </div>
+                  </a-col>
+                  <a-col :md="6" :sm="8">
+                    <div class="box-title-text">
+                      <div class="title-text" :title="$t('NParameterName')">
+                        <span>{{$t('NParameterName')}}</span>
+                      </div>
+                      <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('NParameterName')"
+                               v-model="formInline.paramsName"></a-input>
+                    </div>
+                  </a-col>
+                  <!--                  <a-col :md="6" :sm="8">-->
+                  <!--                    <div class="box-title-text">-->
+                  <!--                      <div class="title-text" :title="$t('NareaOfResponsibility')">-->
+                  <!--                        <span>{{$t('NareaOfResponsibility')}}</span>-->
+                  <!--                      </div>-->
+                  <!--                      <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"-->
+                  <!--                                          :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"-->
+                  <!--                                          :type="'select'"-->
+                  <!--                                          :triggerChange="false" :dictCode="'duty_territory'"/>-->
+                  <!--                    </div>-->
+                  <!--                  </a-col>-->
+                  <a-col :md="6" :sm="8">
+                    <div class="box-title-text">
+                      <div class="title-text" :title="$t('NareaOfResponsibility')">
+                        <span>{{$t('NareaOfResponsibility')}}</span>
+                      </div>
+                      <a-select
+                        class="box-input"
+                        mode="multiple"
+                        v-model="formInline.dutyTerritory"
+                        :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')">
+                        <a-select-option
+                          v-for="(item,index) in dutyTerritoryList"
+                          :key="index"
+                          :value="item.key">
+                    <span class="itemOption" :title="item.value">
+                     {{ item.value}}
+                    </span>
+                        </a-select-option>
+                      </a-select>
+                      <!--                      <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"-->
+                      <!--                                          :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"-->
+                      <!--                                          :type="'select'"-->
+                      <!--                                          :triggerChange="false" :dictCode="'duty_territory'"/>-->
+                    </div>
+                  </a-col>
+                  <template v-if="toggleSearchStatus">
+                    <a-col :md="6" :sm="8">
+                      <div class="box-title-text">
+                        <div class="title-text" :title="$t('certificationCategory')">
+                          <span>{{$t('certificationCategory')}}</span>
+                        </div>
+                        <j-dict-select-tag class="box-input" v-model="formInline.certCategory"
+                                           :placeholder="$t('PleaseSelect')+$t('certificationCategory')"
+                                           :type="'select'"
+                                           :triggerChange="false" :dictCode="'cert_category'"/>
+                      </div>
+                    </a-col>
+                    <a-col :md="6" :sm="8">
+                      <div class="box-title-text">
+                        <div class="title-text" :title="$t('dre')">
+                          <span>{{$t('dre')}}</span>
+                        </div>
+                        <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('dre')"
+                                 v-model="formInline.dre"></a-input>
+                      </div>
+                    </a-col>
+                    <a-col :md="6" :sm="8">
+                      <div class="box-title-text">
+                        <div class="title-text" :title="$t('sdt')">
+                          <span>{{$t('sdt')}}</span>
+                        </div>
+                        <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('sdt')"
+                                 v-model="formInline.sdt"></a-input>
+                      </div>
+                    </a-col>
+                    <a-col :md="6" :sm="8">
+                      <div class="box-title-text">
+                        <div class="title-text" :title="$t('status')">
+                          <span>{{$t('status')}}</span>
+                        </div>
+                        <a-select :placeholder="$t('PleaseSelect')+$t('status')"
+                                  class="box-input"
+                                  allowClear
+                                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                                  v-model="formInline.state">
+                          <a-select-option v-for="(item, key) in statusList"
+                                           :key="key"
+                                           :value="item.value">
+                            <span style="display: inline-block;width: 100%" :title=" item.name ">
+                              {{ item.text}}
+                            </span>
+                          </a-select-option>
+                        </a-select>
+                      </div>
+                    </a-col>
+                  </template>
+                  <span style="float: right;overflow: hidden;margin-right: -2px"
+                        class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+<!--                 v-if="this.$route.query.it === undefined"-->
+                  <a @click="handleToggleSearch">
+                          {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                           <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                  </a>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <globalAdvancedQuery ref="globalAdvancedQueryRef"
+                                       @handleSuperQuery="handleSuperQuery"
+                                       :fieldList="fieldList"/>
+               </a-col>
+            </span>
+                </a-row>
+              </a-form>
+            </div>
+          </div>
+          <div class="table-operator" v-if="!this.$route.query.it">
+            <!--      // 认证工程师 homo-->
+            <!--      // 工程接口人 sdt-->
+            <!--      // 填写人 dre-->
+            <!--      // R&H Studio studio-->
+            <!--      // R&H Manager manager-->
+            <!--      // 系统管理员 admin-->
+            <!--      // 游客 guest-->
+            <a-popconfirm overlayClassName='popconfirmIndex' placement="bottomRight" v-if='currentPersonRole == "homo"'>
+              <template slot="title" id="popconfirm">
+                <!--      添加-->
+                <div @click="handleAdd" class="operator-text-title" v-if='currentPersonRole == "homo"'>
+                  <a-icon type="plus"/>
+                  {{$t('addTo')}}
+                </div>
+                <!--                &lt;!&ndash;     下发收集 &ndash;&gt;-->
+                <!--                <div @click="distributionAndCollectionJurisdiction" class="operator-text-title">-->
+                <!--                  <a-icon type="solution"/>-->
+                <!--                  {{$t('distributionAndCollection')}}-->
+                <!--                </div>-->
+                <!--      导出-->
+                <div @click="handleExport" class="operator-text-title" v-if='currentPersonRole == "homo"'>
+                  <a-icon type="export" :rotate="-90"/>
+                  {{$t('dataExport')}}
+                </div>
+                <!--     一键下发收集 -->
+                <div @click="defOneclickCollection" class="operator-text-title" v-if='currentPersonRole == "homo"'>
+                  <a-icon type="solution"/>
+                  {{$t('OneclickCollection')}}
+                </div>
+                <!--      冻结配置-->
+                <div @click="freezeConfiguration" class="operator-text-title" v-if='currentPersonRole == "homo"'>
+                  <a-icon type="lock"/>
+                  {{$t('FreezeConfiguration')}}
+                </div>
+                <!--      引用参数列-->
+                <div @click="Referenceparametercolumn" class="operator-text-title" v-if='currentPersonRole == "homo" '>
+                  <a-icon type="plus"/>
+                  {{$t('Referenceparametercolumn')}}
+                </div>
+                <!--      更新参数列-->
+                <div @click="Updateparametercolumn" class="operator-text-title" v-if='currentPersonRole == "homo" '>
+                  <a-icon type="check-circle"/>
+                  {{$t('Updateparametercolumn')}}
+                </div>
+                <!--   同步上报库   -->
+                <div @click="handleSynchronousReportLibraryJurisdiction" class="operator-text-title"
+                     v-if='currentPersonRole == "homo"'>
+                  <a-icon type="sync"/>
+                  {{$t('SynchronousReportLibrary')}}
+                </div>
+                <!--      截止时间-->
+                <!--                <div @click="TaskCutOffTimeLibrary" class="operator-text-title">-->
+                <!--                  <a-icon type="bulb"/>-->
+                <!--                  {{$t('TaskCutOffTime')}}-->
+                <!--                </div>-->
+                <!--      批量删除-->
+                <div @click="handleDelJurisdiction" class="operator-text-title" v-if='currentPersonRole == "homo"'>
+                  <a-icon type="delete"/>
+                  {{$t('BatchDelete')}}
+                </div>
+                <div @click="bringInTheProjectInterfaceClick" class="operator-text-title"
+                     v-if='currentPersonRole == "homo"'>
+                  <a-icon type="user"/>
+                  {{$t('bringInTheProjectInterface')}}
+                </div>
+                <div @click="AdjustareasofresponsibilityClick" class="operator-text-title"
+                     v-if='currentPersonRole == "homo"'>
+                  <a-icon type="setting"/>
+                  {{$t('Adjustareasofresponsibility')}}
+                </div>
+                <!--      认证工程师分配填写人-->
+                <div @click="assignedByHomo" class="operator-text-title" v-if='currentPersonRole == "homo" '>
+                  <a-icon type="copy"/>
+                  {{$t('Assignedby')}}
+                </div>
+                <!--      批量更新截止时间-->
+                <div @click="batchUpdateDeadlineClick" class="operator-text-title" v-if='currentPersonRole == "homo" '>
+                  <a-icon type="profile"/>
+                  {{$t('batchUpdateDeadline')}}
+                </div>
+              </template>
+              <!--              @click='morepop'-->
+              <div class="operator-text" style="position: relative "
+                   v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
+                <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
+              </div>
+            </a-popconfirm>
+            <!--     下发收集 -->
+            <div @click="distributionAndCollectionJurisdiction" class="operator-text"
+                 v-if='currentPersonRole == "homo"'>
+              <a-icon type="solution"/>
+              {{$t('distributionAndCollection')}}
+            </div>
+
+            <!--      分配填写人-->
+            <div @click="assignedBy" class="operator-text" v-if='currentPersonRole == "sdt" '>
+              <a-icon type="copy"/>
+              {{$t('Assignedby')}}
+            </div>
+            <!--      导出-->
+            <div @click="handleExport" class="operator-text"
+                 v-if='currentPersonRole == "sdt" || currentPersonRole == "admin" || currentPersonRole == "studio"'>
+              <a-icon type="export"/>
+              {{$t('dataExport')}}
+            </div>
+            <!--      引用参数-->
+            <div @click="referenceparameter" class="operator-text" v-if='currentPersonRole == "dre" || currentPersonRole == "homo"'>
+              <a-icon type="plus"/>
+              {{$t('referenceparameter')}}
+            </div>
+            <!--            保存-->
+            <div @click="handlePreservation(1)" class="operator-text" v-if='currentPersonRole == "dre" || currentPersonRole == "homo"'>
+              <a-icon type="check-circle"/>
+              {{$t('tempSave')}}
+            </div>
+            <!--      提交-->
+            <div @click="handleSubmit" class="operator-text" v-if='currentPersonRole == "dre"'>
+              <a-icon type="check-circle"/>
+              {{$t('submit')}}
+            </div>
+            <!--      退回-->
+            <div @click="returnDataJurisdiction" class="operator-text"
+                 v-if='currentPersonRole == "sdt" || currentPersonRole == "homo" || currentPersonRole == "dre"'>
+              <a-icon type="rollback"/>
+              {{$t('sendBack')}}
+            </div>
+            <!--      导入-->
+            <div class="operator-text" v-if='currentPersonRole == "dre"'>
+              <ImportFileOnlyList :url="url" :isTrue="false" :accept="'.zip'" :paramsManifestId='this.$route.query.id'
+                                  @getList='getList'/>
+            </div>
+            <!--      填写人导出-->
+            <div @click="handleExportDre" class="operator-text"
+                 v-if='currentPersonRole == "dre"'>
+              <a-icon type="export"/>
+              {{$t('export')}}
+            </div>
+            <!--      强制撤回-->
+            <div @click="compulsoryWithdrawaljurisdiction" class="operator-text"
+                 v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
+              <a-icon type="undo" :rotate="90"/>
+              {{$t('CompulsoryWithdrawal')}}
+            </div>
+            <!--        列表设置-->
+            <!--            v-if="!this.$route.query.it"-->
+            <a-popconfirm :visible="customizevisible" overlayClassName="popconfirmIndex"
+                          placement="bottomRight">
+              <template slot="title" id="popconfirmmize">
+                <div style="max-height:360px;overflow:scroll;overflow-x: auto;width: 211px">
+                  <a-checkbox
+                    style="margin-bottom: 22px;"
+                    v-if="customizeList && customizeList.length"
+                    v-model="checkAll"
+                    :indeterminate="indeterminate"
+                    @change="onCheckAllChange"
+                  >{{ $t('selectAll') }}
+                  </a-checkbox>
+                  <a-checkbox-group @change="onChange" v-model="checkedList" class="customize-text">
+                    <a-checkbox class="customize-text-title" :disabled="item.disabled"
+                                v-for="(item, key) in customizeList"
+                                :key="key" :value="item.field">{{ item.db_field_txt }}
+                    </a-checkbox>
+                  </a-checkbox-group>
+                  <div class="drawer-bootom-button">
+                    <a-button @click="cancel" style="margin-right: 16px">{{ $t('cancel') }}</a-button>
+                    <a-button @click="handleSubmitcustomize" type="primary" :loading="confirmLoading">{{ $t('determine')
+                      }}
+                    </a-button>
+                  </div>
+                </div>
+              </template>
+              <div class="operator-text" style="position: relative" @click="getcustomize">
+                <a-icon type="setting"/>
+                {{ $t('customize') }}
+              </div>
+            </a-popconfirm>
+            <!--       角色切换   -->
+            <!--            <div class="operator-text"-->
+            <!--                 v-if="!this.$route.query.it"-->
+            <!--                 @click="roleSwitchingClick">-->
+            <!--              <a-icon type="select"/>-->
+            <!--              {{ $t('roleSwitching') }} ({{ $t(this.rolename)}})-->
+            <!--            </div>-->
+
+          </div>
+          <div style="width: 100%">
+            <!-- 表格-10控件-->
+            <!--            :queryParamQuery='queryParamQuery'-->
+            <table-collection ref="CollectionTabel" :url='url' :paramsManifest='paramsManifest' @rowValue='rowValue'
+                              :formInline='formInline' :currentPersonRole='currentPersonRole'
+                              @getDataSource="getDataSource"
+                              @handlePreservation="handlePreservation"
+                              @value='value'
+                              @getcustomizeList="getcustomizeList"
+                              @listReset='listReset' @LoginUserType='LoginUserType'/>
+          </div>
+        </a-card>
+      </div>
+    </div>
+    <!--  添加--->
+    <a-modal v-model="areaVisible" :title="$t('ParameterLibrary')" width='850px' :footer="null">
+      <parameter-library-add v-if='areaVisible' :paramsManifest='paramsManifest' @areaVisible='areaVisible = false'
+                             @GetgetTableList='GetgetTableList'/>
+    </a-modal>
+    <!--  冻结配置--->
+    <a-modal v-model="areaVisibleFreeze" :title="$t('FreezeConfiguration')" width='600px' :footer="null">
+      <a-spin :spinning="confirmLoading">
+        <a-form-model
+          class='tag-module'
+          ref='ruleForm'
+          :model='Dateline'
+          :rules='rules'
+          :label-col='labelCol'
+          :wrapper-col='wrapperCol'
+        >
+          <a-row :gutter='24'>
+            <a-col :span='24'>
+              <a-form-model-item ref='region' :label="$t('FreezeConfiguration')" prop='region'>
+                <a-select :placeholder="$t('freeze')" v-model="Dateline.paramsConfig"
+                          allowClear mode="multiple">
+                  <a-select-option v-for="(item, key) in FreezeList" :key="key" :value="item.value">
+                    <span style="display: inline-block;width: 100%" :title=" item.label ">
+                      {{ item.label }}
+                    </span>
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+        </a-form-model>
+      </a-spin>
+      <div style='padding-left: 60px;color: red'>
+        {{$t('Attentionfreeze')}}
+      </div>
+      <div class="imports-footer">
+        <div class="imports-footer-wrap">
+
+          <a-button class="imports-btn imports-sub" type="primary" @click="handleSubmitFreeze">{{$t('preservation')}}
+          </a-button>
+          <a-button class="imports-btn" type="primary" @click="cancleImportsFreeze">{{$t('cancel')}}</a-button>
+        </div>
+      </div>
+    </a-modal>
+    <!--  分配填写人--->
+    <a-modal v-model="areaVisibleAssignedby" :title="$t('Assignedby')" width='950px' :footer="null">
+      <assigned-by v-if='areaVisibleAssignedby' :selectedRowKeysArray='selectedRowKeysArray'
+                   @GetgetTableList='GetgetTableList'
+                   @GetgetLoginUserType='GetgetLoginUserType'
+                   @areaVisibleAssignedbyflag='areaVisibleAssignedbyflag' @areaVisible='areaVisibleAssignedby = false'/>
+    </a-modal>
+    <!--  认证分配填写人--->
+    <a-modal v-model="areaVisibleAssignedbyhomo" :title="$t('Assignedby')" width='950px' :footer="null">
+      <assigned-by-homo v-if='areaVisibleAssignedbyhomo' :selectedRowKeysArray='selectedRowKeysArray'
+                        @GetgetTableList='GetgetTableList'
+                        @GetgetLoginUserType='GetgetLoginUserType'
+                        @areaVisibleAssignedbyflaghomo='areaVisibleAssignedbyflaghomo'
+                        @areaVisible='areaVisibleAssignedbyhomo = false'/>
+    </a-modal>
+    <!--  下发收集--->
+    <!--    <a-modal v-model="areaVisibleTaskCutOffTime" :title="$t('distributionAndCollection')" width='400px' :footer="null">-->
+    <task-cut-off-time ref='areaVisibleTaskCutOffTime' :selectedRowKeysArray='selectedRowKeysArray'
+                       @GetgetTableList='GetgetTableList'
+                       @areaVisibleTaskCutOffTimeflag='areaVisibleTaskCutOffTimeflag'/>
+    <!--    </a-modal>-->
+    <!--  一键下发收集--->
+    <!--    <a-modal v-model="OneclickCollection" :title="$t('OneclickCollection')" width='400px' :footer="null">-->
+    <task-time ref='OneclickCollection' :selectedRowKeysArray='selectedRowKeysArray'
+               @GetgetTableList='GetgetTableList'
+               @areaVisibleTaskCutOffTimeAll='areaVisibleTaskCutOffTimeAll'/>
+    <!--    </a-modal>-->
+    <!--    调整责任领域-->
+    <a-modal v-model="Adjustareasofrespon" :title="$t('Adjustareasofresponsibility')" width='620px' :footer="null">
+      <adjustarea-sofrespon v-if='Adjustareasofrespon' :selectedRowKeysArray='selectedRowKeysArray'
+                            @GetgetTableList='GetgetTableList'
+                            @AdjustareasofresponAll='AdjustareasofresponAll'/>
+    </a-modal>
+    <!--  引用参数--->
+    <a-modal v-model="areaVisiblereferenceparameter" :title="$t('referenceparameter')" width='650px' :footer="null">
+      <reference-parameter v-if='areaVisiblereferenceparameter' :paramsManifest='paramsManifest'
+                           @GetgetTableList='GetgetTableList'
+                           @areaVisibleAssignedbyflag='areaVisiblereferenceparameter = false'
+                           :selectedRowKeysArray='selectedRowKeysArray'/>
+    </a-modal>
+    <!--  同步上报库--->
+    <a-modal v-model="areaVisibsynchronous" :title="$t('SynchronousReportLibrary')" width='650px' :footer="null">
+      <synchronous-submission-library v-if='areaVisibsynchronous' :paramsManifest='paramsManifest'
+                                      @GetgetTableList='GetgetTableList'
+                                      :selectedRowKeysArray='selectedRowKeysArray'
+                                      @areaVisibsynchronous='areaVisibsynchronous = false'/>
+    </a-modal>
+    <!--     引用参数列-->
+    <a-drawer
+      class="show-drawer"
+      :maskClosable="false"
+      :visible="parametercolumn"
+      style="height: 100%;overflow: auto;padding-bottom: 53px;"
+      placement="right"
+      @close="drawerhandleCancel"
+      :title="$t('Referenceparametercolumn')"
+      width="850px"
+      :footer="null">
+      <parameter-column v-if='parametercolumn' @drawerhandleCancel='drawerhandleCancel'
+                        @GetgetTableList='GetgetTableList'
+                        @GetgetHeader='GetgetHeader'
+                        :templateTitle='templatetitle'
+                        :selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version' :url='url'
+                        :projectId='this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id'>
+
+      </parameter-column>
+    </a-drawer>
+    <!--    切换角色-->
+    <a-modal
+      :title="$t('roleSwitching')"
+      :width="500"
+      :visible="visibleRoleSwitching"
+      :confirm-loading="confirmLoadingRoleSwitching"
+      :maskClosable="false"
+      @ok="handleOkRoleSwitching"
+      @cancel="handleCancelRoleSwitching"
+    >
+      <a-form-model :model="formInlineRoleSwitching" class="formAdd" :rules="rulesRoleSwitching"
+                    ref="ruleFormRoleSwitching">
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text-index">
+              <div class="title-text-Comment">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('roleSwitching')">{{$t('roleSwitching')}}</span>
+              </div>
+              <a-form-model-item class="itemModelComment itemitem" :prop="'roleSwitchingCode'">
+                <a-select allowClear :placeholder="$t('pleaseSelect')+$t('roleSwitching')"
+                          v-model="formInlineRoleSwitching.roleSwitchingCode">
+                  <a-select-option v-for="(item, key) in RoleType" :key="key" :value="item.value">
+                    <span style="display: inline-block;width: 100%" :title=" item.label ">
+                      {{ item.label }}
+                    </span>
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-modal>
+    <!--    错误数据提示-->
+    <a-modal
+      :title="$t('operationFailed')"
+      :width="860"
+      v-model="visibleoperationFailed"
+      :maskClosable="false"
+      :footer="null"
+    >
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <!--          没有工程接口人，导致下发收集失败提示-->
+          <span v-if='NoEngineer === 0'>
+            {{$t('NiOnumberis')}}
+          </span>
+          <span style='font-size: 16px;margin-bottom: 20px;' v-for='(item,key) in NotSelectedNoEngineerValue'
+                v-if='NoEngineer === 0'>
+            <span style='color: red'>{{ item.nioNumber }}、</span>
+          </span>
+          <span v-if='NoEngineer === 0'>
+             {{$t('Filledperson')}}
+          </span>
+          <!--          状态不符合，导致不能操作按钮，没有权限-->
+          <div style='font-size: 18px;margin-bottom: 20px;display: flex;justify-content: center'
+               class="box-title-text-index" v-for='(item,key) in NotSelectedRowKeysValue' v-if='NoEngineer === 1'>
+            <div>{{$t('NiOnumberis')}}{{ item.nioNumber }},{{$t('Statusis')}}<span
+              style='color: red'>{{ item.state }}</span>,{{$t('NoOperationPermissionForthisbutton')}}。
+            </div>
+          </div>
+          <!--          认证工程师-提示-->
+          <div style='font-size: 18px;text-align: center' v-if='NoEngineer === 1'>
+            {{ currentPersonRole =='homo'? $t('certifiedEngineer'): (currentPersonRole =='sdt'?
+            $t('engineeringInterfacePerson'): $t('completedBy')) }}{{jurisdiction === 'homoQZTH'? $t('Datastateexcept')
+            : $t('Datastatusis')}}
+            <!--            下发收集时-->
+            <span v-if='jurisdiction === "HOMOZFSJ"' class="text-wraning">
+              '{{$t('CollectionInitiated')}}'、'{{$t('ReturnedPerson')}}'{{$t('or')}}'{{$t('alteration')}}'
+            </span>
+            <!--            同步上报库-->
+            <span v-else-if='jurisdiction === "HOMOTBSBK"' class="text-wraning">
+              '{{$t('Submitted')}}'{{$t('or')}}'{{$t('alteration')}}'
+            </span>
+            <!--            截止时间-->
+            <span v-else-if='jurisdiction === "HOMOJZSJ"' class="text-wraning">
+              '{{$t('CollectionInitiated')}}'
+            </span>
+            <!--        分配填写人  -->
+            <span v-else-if='jurisdiction === "SDTFPTXR"' class="text-wraning">
+              '{{$t('handledInterface')}}'{{$t('or')}}'{{$t('Filledreturn')}}'
+            </span>
+            <!--        分配填写人  -->
+            <span v-else-if='jurisdiction === "SDTFPTXRHOMO"' class="text-wraning">
+              '{{$t('completed')}}''{{$t('or')}}'{{$t('Filledreturn')}}''{{$t('or')}}'{{$t('ReturnedEngineer')}}'
+            </span>
+            <!--            引用参数-->
+            <span v-else-if='jurisdiction === "DREYYCS"' class="text-wraning">
+              '{{$t('completed')}}'{{$t('or')}}'{{$t('ReturnedEngineer')}}'{{$t('or')}}'{{$t('alteration')}}'
+            </span>
+            <!--            退回-->
+            <span v-else-if='jurisdiction === "homoTH"' class="text-wraning" style='color: red'>
+              {{$t('Submitted')}}
+            </span>
+            <span v-else-if='jurisdiction === "sdtTH"' class="text-wraning">
+              <p style='display: inline; color: red'>'{{$t('handledInterface')}}'</p>
+              {{$t('or')}}
+              <p style='display: inline; color: red'>'{{$t('Filledreturn')}}'</p>
+            </span>
+            <span v-else-if='jurisdiction === "dreTH"' class="text-wraning">
+              <p style='display: inline; color: red'>'{{$t('completed')}}'</p>
+              {{$t('or')}}
+              <p style='display: inline; color: red'>'{{$t('ReturnedEngineer')}}'</p>
+            </span>
+            <!--            强制撤回-->
+            <span v-else-if='jurisdiction === "homoQZTH"' class="text-wraning">
+              <p style='display: inline; color: red'>'{{$t('SynchronizedLibrary')}}'</p>
+              {{$t('or')}}
+              <p style='display: inline; color: red'>'{{$t('CollectionInitiated')}}'</p>
+            </span>
+            <span v-else-if='jurisdiction === "sdtQZTH"' class="text-wraning" style='color: red'>
+              {{$t('completed')}}
+            </span>
+            <span v-else-if='jurisdiction === "dreQZTH"' class="text-wraning" style='color: red'>
+              {{$t('Submitted')}}
+            </span>
+            {{$t('timeoperation')}}
+          </div>
+        </a-col>
+      </a-row>
+      <div class="imports-footer">
+        <div class="imports-footer-wrap">
+          <a-button class="imports-btn" type="primary" @click="cancleoperationFailed">{{$t('cancel')}}</a-button>
+        </div>
+      </div>
+    </a-modal>
+    <!--    数据导出弹框-->
+    <a-modal
+      :title="$t('dataExport')"
+      :width="500"
+      :visible="dataExportFailed"
+      :maskClosable="false"
+      @ok="handleExportSubmit"
+      @cancel="handleCancel"
+    >
+      <a-form-model
+        class='formAdd'
+        ref='dataExportruleForm'
+        :model='dataExportformInline'
+        :rules='dataExportrules'
+        :label-col='labelCol'
+        :wrapper-col='wrapperCol'
+      >
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('exportOption')" style='margin-top: -17px;'>
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('exportOption')">
+                {{$t('exportOption')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="exportOption">
+                <a-select class="box-input" allowClear v-model="dataExportformInline.exportOption"
+                          :placeholder="$t('PleaseSelect')+$t('exportOption')">
+                  <a-select-option :value="'1'">
+                    {{$t('includeTitle')}}
+                  </a-select-option>
+                  <a-select-option :value="'0'">
+                    {{$t('Notitleincluded')}}
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-modal>
+    <JLoading :loading="textLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
+    <batchUpdateDeadline ref="batchUpdateDeadlineRef" @batchUpdateDeadlineForm="batchUpdateDeadlineForm"/>
+
+  </div>
+</template>
+
+<script>
+  import TableCollection from '@/components/tableCollection/index'
+  import parameterColumn from '../../dialog/parametercolumn'
+  import { getAction, postAction, downloadFile } from '@/api/manage'
+  import eventBUs from '@/common/event'
+  import customizeList from './customizeList'
+  import ParameterLibraryAdd from '@/components/ParameterLibraryAdd/index'
+  import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
+  import SynchronousSubmissionLibrary from '@/components/SynchronousSubmissionLibrary/index'
+  import TaskCutOffTime from '@/components/TaskCutOffTime/index'
+  import TaskTime from '@/components/TaskCutOffTime/indexonekey'
+  import AdjustareaSofrespon from '@/components/AdjustareaSofrespon/index'
+  import ReferenceParameter from '@/components/ReferenceParameter/index'
+  import AssignedBy from '@/components/AssignedBy/index'
+  import AssignedByHomo from '@/components/AssignedByHomo/index'
+  import ImportFileOnlyList from '@/components/ImportFileOnlyListtag/index'
+  import batchUpdateDeadline from './batchUpdateDeadline'
+  import axios from 'axios'
+  import { ACCESS_TOKEN } from '@/store/mutation-types'
+  import Vue from 'vue'
+  import { mapGetters } from 'vuex'
+
+  export default {
+    name: 'ParameterItemCollectionList',
+    components: {
+      TableCollection,
+      ParameterLibraryAdd,
+      customizeList,
+      parameterColumn,
+      AssignedBy,
+      AssignedByHomo,
+      AdjustareaSofrespon,
+      ImportFileOnlyList,
+      TaskCutOffTime,
+      ReferenceParameter,
+      SynchronousSubmissionLibrary,
+      TaskTime,
+      globalAdvancedQuery,
+      batchUpdateDeadline
+    },
+    data() {
+      this.statusList = [
+        {
+          value: '1',
+          text: this.$t('CollectionInitiated'),
+          key: '1'
+        },
+        {
+          value: '2',
+          text: this.$t('handledInterface'),
+          key: '2'
+        },
+        {
+          value: '3',
+          text: this.$t('ReturnedPerson'),
+          key: '3'
+        },
+        {
+          value: '4',
+          text: this.$t('completed'),
+          key: '4'
+        },
+        {
+          value: '5',
+          text: this.$t('Filledreturn'),
+          key: '5'
+        },
+        {
+          value: '6',
+          text: this.$t('Submitted'),
+          key: '6'
+        },
+        {
+          value: '7',
+          text: this.$t('ReturnedEngineer'),
+          key: '7'
+        },
+        {
+          value: '8',
+          text: this.$t('SynchronizedLibrary'),
+          key: '8'
+        },
+        {
+          value: '9',
+          text: this.$t('alteration'),
+          key: '9'
+        }
+      ]
+      return {
+        // 认证工程师 homo
+        // 工程接口人 sdt
+        // 填写人 dre
+        // R&H Studio studio
+        // R&H Manager manager
+        // 系统管理员 admin
+        // 游客 guest
+        toggleSearchStatus: false,
+        columns: [
+          {
+            title: this.$t('title'),
+            align: 'center',
+            dataIndex: 'title',
+            scopedSlots: { customRender: 'paramsManifestClick' }
+          },
+          {
+            title: this.$t('status'),
+            align: 'center',
+            dataIndex: 'state'
+          },
+          {
+            title: this.$t('parameterTemplateName'),
+            align: 'center',
+            dataIndex: 'paramsTemplateName'
+          },
+          {
+            title: this.$t('collectionCompletionTime'),
+            align: 'center',
+            dataIndex: 'finishTime'
+          },
+          {
+            title: this.$t('Version'),
+            align: 'center',
+            dataIndex: 'version'
+          },
+          {
+            title: this.$t('creator'),
+            align: 'center',
+            dataIndex: 'createBy'
+          },
+          {
+            title: this.$t('createTime'),
+            align: 'center',
+            dataIndex: 'createTime'
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 200,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
+        fieldList: [
+          {
+            type: '',
+            value: 'certCategory',
+            text: this.$t('certificationCategory'),
+            dictCode: 'cert_category'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          },
+          {
+            type: 'input',
+            value: 'paramsNumber',
+            text: this.$t('certificationCategoryNumber')
+          },
+          // {
+          //   type: '',
+          //   value: 'state',
+          //   text: this.$t('status'),
+          //   options: this.statusList//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          // },
+          {
+            type: 'string',
+            value: 'params_batch',
+            text: this.$t('parameterBatch'),
+            dictCode: 'params_batch'
+          },
+          {
+            type: '',
+            value: 'sdt',
+            text: this.$t('sdt'),
+            dictCode: 'sdt'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          },
+          {
+            type: '',
+            value: 'dre',
+            text: this.$t('dre'),
+            dictCode: 'dre'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          }
+        ],
+        customizevisible: false,
+        indeterminate: false,
+        checkAll: false,
+        visible: false,
+        selectedValue: [],
+        checkedList: ['nio_number', 'params_name', 'operation'],
+        // customizeList: [
+        //   {
+        //     sort: '1',
+        //     name: this.$t('NiONumber'),
+        //     disabled: true,
+        //     headFieldCn: 'NIO编号',
+        //     headFieldEn: 'NiONumber',
+        //     field: 'nioNumber',
+        //     key: 1,
+        //     moduleFlag: '参数收集',
+        //     status: 1
+        //   },
+        //   {
+        //     sort: '2',
+        //     disabled: true,
+        //     name: this.$t('ParameterName'),
+        //     headFieldCn: '参数名称',
+        //     headFieldEn: 'Parameter Name',
+        //     field: 'paramsName',
+        //     key: 2,
+        //     moduleFlag: '参数收集',
+        //     status: 2
+        //   },
+        //   {
+        //     sort: '3',
+        //     name: this.$t('ParameterDescription'),
+        //     headFieldCn: '参数说明',
+        //     headFieldEn: 'Parameter Description',
+        //     field: 'description',
+        //     key: 3,
+        //     moduleFlag: '参数收集'
+        //   },
+        //   {
+        //     sort: '',
+        //     name: this.$t('status'),
+        //     headFieldCn: '状态',
+        //     headFieldEn: 'status',
+        //     field: 'state',
+        //     key: 4,
+        //     moduleFlag: '参数收集'
+        //   },
+        //   {
+        //     sort: '',
+        //     name: this.$t('areaOfResponsibility'),
+        //     headFieldCn: '责任领域',
+        //     headFieldEn: 'Responsible Field',
+        //     field: 'dutyTerritory',
+        //     key: 5,
+        //     moduleFlag: '参数收集'
+        //   },
+        //   {
+        //     sort: '',
+        //     name: this.$t('engineeringInterfacePerson'),
+        //     headFieldCn: '工程接口人',
+        //     headFieldEn: 'Eng. Interface',
+        //     field: 'sdt',
+        //     key: 6,
+        //     moduleFlag: '参数收集'
+        //   },
+        //   {
+        //     sort: '',
+        //     name: this.$t('completedBy'),
+        //     headFieldCn: '填写人',
+        //     headFieldEn: 'Filled by',
+        //     field: 'dre',
+        //     key: 15,
+        //     moduleFlag: '参数收集'
+        //   },
+        //   {
+        //     sort: '',
+        //     name: this.$t('Deadline'),
+        //     headFieldCn: '截止时间',
+        //     headFieldEn: 'Due Date',
+        //     field: 'deadline',
+        //     key: 23,
+        //     moduleFlag: '参数收集'
+        //   },
+        //   {
+        //     sort: '',
+        //     name: this.$t('databasereportingtime'),
+        //     headFieldCn: '同步上报库时间',
+        //     headFieldEn: 'database reporting time',
+        //     field: 'reportTime',
+        //     key: 23,
+        //     moduleFlag: '参数收集'
+        //   },
+        //
+        //   {
+        //     sort: '',
+        //     disabled: true,
+        //     name: this.$t('operation'),
+        //     headFieldCn: '操作',
+        //     headFieldEn: 'Operation',
+        //     key: 35,
+        //     field: 'operation',
+        //     moduleFlag: '参数收集',
+        //     status: 2
+        //   }
+        // ],
+        customizeList: [],
+        selectedRowKeys: [],
+        textLoading: false,
+        formInline: {},
+        dataExportformInline: {},
+        queryParamQuery: {},
+        url: {
+          tableHeader: 'params/collectManifest/getHeader',
+          tableList: 'params/collectManifest/list',
+          add: 'params/collectManifest/submit',
+          getLoginUserType: 'params/collectManifest/getLoginUserType', // 获取当前登陆人
+          getquerySdtList: 'params/collectManifest/querySdtList', // 获取工程接口人的列表
+          updateSdt: 'params/collectManifest/updateSdt', // 提交工程接口人
+          importZipUrl: 'params/collectManifest/importDre', // 导入
+          deleteBatch: 'params/collectManifest/deleteBatch'
+        },
+        loading: false,
+        dataSource: [],
+        statuList: [],
+        areaVisible: false, // 弹框的控制
+        configureareaVisible: false, // 配置的彈框
+        pageNo: 1,
+        pageSize: 10,
+        rolename: '',
+        total: 0,
+        selectedRowKeysArray: '',
+        templatetitle: '',
+        templatetitleId: '',
+        roleSwitchName: '',
+        rowId: '',
+        version: 0,
+        confirmLoading: false,
+        importsVisible: false,
+        itemId: '',
+        selectedRowKeysValue: [], // table列表所选得数据
+        token: Vue.ls.get(ACCESS_TOKEN),
+        Dateline: {},
+        areaVisibleFreeze: false, // 冻结配置
+        areaVisibleAssignedby: false, // 分配填写人弹框
+        areaVisibleAssignedbyhomo: false, // 认证分配填写人弹框
+        areaVisibleTaskCutOffTime: false, // 截至时间弹框
+        OneclickCollection: false,
+        parametercolumn: false,
+        Adjustareasofrespon: false,
+        areaVisiblereferenceparameter: false, // 引用参数弹框
+        areaVisibsynchronous: false, // 同步上报库弹框
+        visibleoperationFailed: false, // 数据失败的弹框
+        dataExportFailed: false, // 数据失败的弹框
+        currentPersonRole: '', // 当前人角色
+        jurisdiction: '',
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 14 }
+        },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 7 }
+        },
+        rules: {},
+        dataExportrules: {
+          exportOption: [
+            { required: true, message: this.$t('PleaseSelect') + this.$t('exportOption'), trigger: 'change' }
+          ]
+        },
+        FreezeList: [], // 冻结字段
+        roleSwitchingList: [],
+        JTextLoading: false,
+        visibleRoleSwitching: false, // 角色切换
+        confirmLoadingRoleSwitching: false,
+        formInlineRoleSwitching: {},
+        rulesRoleSwitching: {
+          roleSwitchingCode: [
+            {
+              required: true,
+              message: this.$t('roleSwitching') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ]
+        },
+        RoleType: [],// 控件类型
+        NotSelectedRowKeysValue: [],
+        NoEngineer: 1, // 下发收集的权限,0为没有接口人 1为由接口人 默认有
+        NotSelectedNoEngineerValue: [],
+        paramsManifest: {},
+        timeBatch: '',
+        timer: '',
+        dutyTerritoryList: []
+      }
+    },
+    props: {
+      // paramsManifest: {
+      //   type: Object,
+      //   default: {},
+      //   require: true
+      // }
+    },
+    mounted() {
+      this.handleClick()
+      this.getcustomizeList()
+      window.addEventListener('keyup', this.handleKeyup)
+      window.addEventListener('click', this.handleClick)
+      this.GetgetLoginUserType()
+      this.getQueryDutyTerritory()
+      console.log(this.currentPersonRole)
+      if (this.$route.query.type == '1') {
+        this.handleOkRoleSwitching()
+      }
+      if (this.$route.query.statusFlag == '1') {
+        this.formInline.state = '1'
+      } else if(this.$route.query.statusFlag == '2'){
+        this.formInline.state = '2'
+      }else if(this.$route.query.statusFlag == '4'){
+        this.formInline.state = '4'
+      }
+      // clearTimeout(this.timeBatch)
+      // this.timeBatch = setTimeout(() => {
+      //   if (this.currentPersonRole == 'dre') {
+      //     this.handlePreservation()
+      //   }
+      // }, 10000)
+      // if (this.currentPersonRole == 'dre') {
+      //   this.timeBatch = setInterval(() => {
+      //     this.handlePreservation();
+      //   }, 10000);
+      // this.$nextTick(() => {
+      //   var  interval = setInterval(this.handlePreservation(),10000);
+      //   /* if 5 minutes no operation then logout */
+      //   var maxTime = 120; // seconds
+      //   var time = maxTime;
+      //   $('body').on('keydown mousemove mousedown', function(e) {
+      //     time = maxTime; // reset
+      //   });
+      //   var intervalId = setInterval(function() {
+      //     time--;
+      //     if (time <= 0) {
+      //       ShowInvalidLoginMessage();
+      //       clearInterval(intervalId);
+      //     }
+      //   }, 10000)
+      //   function ShowInvalidLoginMessage() {
+      //     // 停止定时器
+      //     clearInterval(interval);
+      //   }
+      // })
+      // }
+      // this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest'))
+      this.paramsManifest = this.$route.query
+      // document.title = `${this.paramsManifest.title}-` + this.$t('ParameteItemCollectionList')
+      document.title = `${this.paramsManifest.title}-` + this.$t('ParameteItemCollectionList')
+    },
+    methods: {
+      ...mapGetters(['userInfo']),
+      getQueryDutyTerritory() {
+        getAction('/params/collectManifest/queryDutyTerritory', { id: this.$route.query.id }).then((res) => {
+          if (res.success) {
+            // res.result.push(
+            //   {
+            //   value:'aaa',
+            //   key:'aaa'
+            //   },
+            //   {
+            //     value:'bbb',
+            //     key:'bbb'
+            //   },
+            //   {
+            //     value:'ccc',
+            //     key:'ccc'
+            //   },
+            //   {
+            //     value:'ddd',
+            //     key:'ddd'
+            //   },
+            // )
+            this.dutyTerritoryList = res.result || []
+          } else {
+            this.dutyTerritoryList = []
+          }
+        })
+      },
+      handleKeyup() {
+        clearTimeout(this.timer)
+        clearTimeout(this.timeBatch)
+        clearTimeout(this.timerOne)
+        this.timer = setTimeout(() => {
+          if (this.currentPersonRole == 'dre') {
+            this.handlePreservation()
+          }
+        }, 10000)
+        this.timerOne = setTimeout(() => {
+          clearTimeout(this.timer)
+          clearTimeout(this.timeBatch)
+          clearTimeout(this.timerOne)
+        }, 300000)
+      },
+      handleClick() {
+        clearTimeout(this.timer)
+        clearTimeout(this.timeBatch)
+        clearTimeout(this.timerOne)
+        this.timer = setTimeout(() => {
+          if (this.currentPersonRole == 'dre') {
+            this.handlePreservation()
+          }
+        }, 10000)
+        this.timerOne = setTimeout(() => {
+          clearTimeout(this.timer)
+          clearTimeout(this.timeBatch)
+          clearTimeout(this.timerOne)
+        }, 300000)
+      },
+      handleVisibleChange(visible) {
+        this.visible = visible
+      },
+      handleToggleSearch() {
+        this.toggleSearchStatus = !this.toggleSearchStatus
+      },
+      handleCancelRoleSwitching() {
+        this.visibleRoleSwitching = false
+      },
+      bringInTheProjectInterfaceClick() {
+        let query = {
+          paramsManifestId: this.paramsManifest.id,
+          projectId: this.$route.query.projectId
+        }
+        this.textLoading = true
+        getAction('/params/collectManifest/bringSdtInto', query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+          }
+          this.textLoading = false
+        })
+      },
+      handleOkRoleSwitching() {
+        if (this.$route.query.type == '1') {
+          let query = {
+            userType: this.formInlineRoleSwitching.roleSwitchingCode ? this.formInlineRoleSwitching.roleSwitchingCode : this.$route.query.userType,
+            paramsManifestId: this.$route.query.id,
+            projectId: this.$route.query.projectId,
+            userId: this.userInfo().id
+          }
+          this.confirmLoadingRoleSwitching = true
+          postAction('/params/userTypeLog/edit', query).then((res) => {
+            if (res.success) {
+              this.currentPersonRole = this.formInlineRoleSwitching.roleSwitchingCode ? this.formInlineRoleSwitching.roleSwitchingCode : this.$route.query.userType
+              this.visibleRoleSwitching = false
+              this.confirmLoadingRoleSwitching = false
+              localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode ? this.formInlineRoleSwitching.roleSwitchingCode : this.$route.query.userType))
+              this.RoleType.forEach((item, index) => {
+                if (item.value == this.currentPersonRole) {
+                  this.rolename = item.label
+                }
+              })
+              this.selectedRowKeysValue = []
+            } else {
+              this.confirmLoadingRoleSwitching = false
+              this.$message.warning(this.$t('operationFailed'))
+            }
+          })
+        } else {
+          this.$refs.ruleFormRoleSwitching.validate(valid => {
+            if (valid) {
+              let query = {
+                userType: this.formInlineRoleSwitching.roleSwitchingCode,
+                paramsManifestId: this.$route.query.id,
+                projectId: this.$route.query.projectId,
+                userId: this.userInfo().id
+              }
+              this.confirmLoadingRoleSwitching = true
+              postAction('/params/userTypeLog/edit', query).then((res) => {
+                if (res.success) {
+                  this.currentPersonRole = this.formInlineRoleSwitching.roleSwitchingCode
+                  this.$message.success(this.$t('OperationSuccessful'))
+                  this.visibleRoleSwitching = false
+                  this.confirmLoadingRoleSwitching = false
+                  localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode))
+                  this.RoleType.forEach((item, index) => {
+                    if (item.value == this.currentPersonRole) {
+                      this.rolename = item.label
+                    }
+                  })
+                  this.selectedRowKeysValue = []
+                } else {
+                  this.confirmLoadingRoleSwitching = false
+                  this.$message.warning(this.$t('operationFailed'))
+                }
+              })
+            }
+          })
+        }
+      },
+      roleSwitchingClick(roleCode) {
+        console.log(roleCode, 1111)
+        this.JTextLoading = true
+        // this.visibleRoleSwitching = true
+        this.$nextTick(() => {
+          this.formInlineRoleSwitching.roleSwitchingCode = this.currentPersonRole
+          // this.$refs.ruleFormRoleSwitching.clearValidate()
+          clearTimeout(this.timeBatch)
+          this.timeBatch = setTimeout(() => {
+            if (this.currentPersonRole == 'dre') {
+              this.handlePreservation()
+            }
+          }, 10000)
+          // }
+        })
+        if (this.$route.query.type == '1') {
+          let query = {
+            userType: roleCode ? roleCode : this.$route.query.userType,
+            paramsManifestId: this.$route.query.id,
+            projectId: this.$route.query.projectId,
+            userId: this.userInfo().id
+          }
+          this.confirmLoadingRoleSwitching = true
+          postAction('/params/userTypeLog/edit', query).then((res) => {
+            if (res.success) {
+              this.currentPersonRole = roleCode ? roleCode : this.$route.query.userType
+              this.visibleRoleSwitching = false
+              this.confirmLoadingRoleSwitching = false
+              this.JTextLoading = false
+              this.visible = false
+              localStorage.setItem('currentPersonRole', JSON.stringify(roleCode ? roleCode : this.$route.query.userType))
+              this.RoleType.forEach((item, index) => {
+                if (item.value == this.currentPersonRole) {
+                  this.rolename = item.label
+                }
+              })
+              this.selectedRowKeysValue = []
+            } else {
+              this.confirmLoadingRoleSwitching = false
+              this.JTextLoading = false
+              this.$message.warning(this.$t('operationFailed'))
+            }
+          })
+        } else {
+          // this.$refs.ruleFormRoleSwitching.validate(valid => {
+          //   if (valid) {
+          let query = {
+            userType: roleCode,
+            paramsManifestId: this.$route.query.id,
+            projectId: this.$route.query.projectId,
+            userId: this.userInfo().id
+          }
+          this.confirmLoadingRoleSwitching = true
+          postAction('/params/userTypeLog/edit', query).then((res) => {
+            if (res.success) {
+              this.currentPersonRole = roleCode
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.visibleRoleSwitching = false
+              this.confirmLoadingRoleSwitching = false
+              this.JTextLoading = false
+              this.visible = false
+              localStorage.setItem('currentPersonRole', JSON.stringify(roleCode))
+              this.RoleType.forEach((item, index) => {
+                if (item.value == this.currentPersonRole) {
+                  this.rolename = item.label
+                }
+              })
+              this.selectedRowKeysValue = []
+            } else {
+              this.confirmLoadingRoleSwitching = false
+              this.JTextLoading = false
+              this.$message.warning(this.$t('operationFailed'))
+            }
+          })
+          //   }
+          // })
+        }
+        // let query = {
+        //   roleCode: roleSwitchingCode,
+        //   id: this.AndUserId,
+        //   projectLibraryId: this.$route.query.id,
+        //   modelType: 'Laws inventory'
+        // }
+        // // this.confirmLoadingRoleSwitching = true
+        // postAction(this.url.AndUserIdEdit, query).then((res) => {
+        //   if (res.success) {
+        //     this.roleSwitchingCode = roleSwitchingCode
+        //     this.$message.success(this.$t('OperationSuccessful'))
+        //     // this.visibleRoleSwitching = false
+        //     // this.confirmLoadingRoleSwitching = false
+        //     this.$emit('getRoleSwitch', roleSwitchingCode)
+        //     this.selectedRowKeys = []
+        //     this.getList()
+        //   } else {
+        //     this.confirmLoadingRoleSwitching = false
+        //     this.$message.warning(this.$t('operationFailed'))
+        //   }
+        // })
+      },
+      GetgetLoginUserType() {
+        this.$refs.CollectionTabel.getLoginUserType()
+      },
+      GetgetTableList() {
+        this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
+      },
+      GetgetHeader() {
+        this.$refs.CollectionTabel.getHeader()
+      },
+      // 错误数据的弹框
+      cancleoperationFailed() {
+        this.selectedRowKeysValue = []
+        this.visibleoperationFailed = false
+        this.$refs.CollectionTabel.cancleoperationFailed()
+        // this.GetgetTableList()
+      },
+      // 一下为认证工程师
+      // 认证工程师 下发收集 权限
+      // 仅仅状态为 待发起收集 工程接口人退回 变更 可以下发收集
+      homodistributionAndCollection() {
+        this.NoEngineer = 1
+        this.NotSelectedRowKeysValue = []
+        this.NotSelectedNoEngineerValue = []
+        // 定义开关 0为没有权限  1为有权限
+        let flag = 1
+        if (this.selectedRowKeysValue.length == 0) {
+          flag = 2
+          this.$message.warning(this.$t('selectLeastOne'))
+        } else {
+          this.selectedRowKeysValue.forEach((item, index) => {
+            //  状态不符合，不能下发收集
+            if (item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更' && item.state !== 'To be collected' && item.state !== 'Rejected by eng. interface' && item.state !== 'Modify') {
+              this.NotSelectedRowKeysValue.push(item)
+              flag = 0
+            }
+            //  状态符合，但是没有工程接口人 不能下发收集
+            if ((item.sdt.dataValue === null || item.sdt.dataValue === 'undefined') && (flag == 1 || flag == 3)) {
+              this.NotSelectedNoEngineerValue.push(item)
+              flag = 3
+            }
+          })
+        }
+        return flag
+      },
+      // 认证工程师的权限
+      // 认证工程师 退回 权限
+      // 仅仅状态为 已提交 可以退回
+      homoJurisdictionReturn() {
+        console.log(this.selectedRowKeysValue)
+        // 认证工程师 已提交
+        if (this.currentPersonRole == 'homo') {
+          this.NotSelectedRowKeysValue = []
+          // 定义开关 0为没有权限  1为有权限
+          let flag = 1
+          if (this.selectedRowKeysValue.length == 0) {
+            flag = 2
+            this.$message.warning(this.$t('selectLeastOne'))
+          } else {
+            this.selectedRowKeysValue.forEach((item, index) => {
+              if (item.state !== '已提交' && item.state !== 'Submitted') {
+                this.NotSelectedRowKeysValue.push(item)
+                this.jurisdiction = 'homoTH'
+                flag = 0
+              }
+            })
+          }
+          return flag
+          //工程接口人 待工程接口人处理 填写人退回
+        } else if (this.currentPersonRole == 'sdt') {
+          this.NotSelectedRowKeysValue = []
+          // 定义开关 0为没有权限  1为有权限
+          let flag = 1
+          if (this.selectedRowKeysValue.length == 0) {
+            flag = 2
+            this.$message.warning(this.$t('selectLeastOne'))
+          } else {
+            this.selectedRowKeysValue.forEach((item, index) => {
+              if (item.state !== '待工程接口人处理' && item.state !== '填写人退回' && item.state !== 'To be processed by eng. interface' && item.state !== 'Rejected by the applicant') {
+                this.NotSelectedRowKeysValue.push(item)
+                this.jurisdiction = 'sdtTH'
+                flag = 0
+              }
+            })
+          }
+          return flag
+          //填写人 待填写 认证工程师退回
+        } else if (this.currentPersonRole == 'dre') {
+          this.NotSelectedRowKeysValue = []
+          // 定义开关 0为没有权限  1为有权限
+          let flag = 1
+          if (this.selectedRowKeysValue.length == 0) {
+            flag = 2
+            this.$message.warning(this.$t('selectLeastOne'))
+          } else {
+            this.selectedRowKeysValue.forEach((item, index) => {
+              if (item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'To be filled' && item.state !== 'Rejected by homo engineer') {
+                this.NotSelectedRowKeysValue.push(item)
+                this.jurisdiction = 'dreTH'
+                flag = 0
+              }
+            })
+          }
+          console.log(flag)
+          return flag
+        }
+      },
+      //导出
+      handleExport() {
+        this.dataExportFailed = true
+        // this.$message.success(this.$t('Intheexport'))
+        // let long = localStorage.getItem('language')
+        // this.cut = ''
+        // if (long && long === 'zh-cn') {
+        //   this.cut = 'cn'
+        // } else if (long && long === 'en-us') {
+        //   this.cut = 'en'
+        // }
+        // let query = {
+        //   paramsManifestId: this.paramsManifest.id,
+        //   paramsTemplateId: this.$route.query.paramsTemplateId,
+        //   paramsTemplatePublishVersion: 1,
+        //   cut: this.cut,
+        //   userTypes: this.currentPersonRole,
+        //   exportName: this.$route.query.projectName + '(' + this.$route.query.title + ')'
+        // }
+        // let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip'
+        // downloadFile('/params/collectManifest/exportAll', name, query, this.selectClear)
+      },
+      // 导出确定
+      handleExportSubmit() {
+        this.$refs.dataExportruleForm.validate(valid => {
+          if (valid) {
+            this.$message.success(this.$t('Intheexport'))
+            let long = localStorage.getItem('language')
+            this.cut = ''
+            if (long && long === 'zh-cn') {
+              this.cut = 'cn'
+            } else if (long && long === 'en-us') {
+              this.cut = 'en'
+            }
+            let query = {
+              paramsManifestId: this.paramsManifest.id,
+              paramsTemplateId: this.$route.query.paramsTemplateId,
+              exportOption: this.dataExportformInline.exportOption,
+              paramsTemplatePublishVersion: 1,
+              cut: this.cut,
+              userTypes: this.currentPersonRole,
+              exportName: this.$route.query.projectName + '(' + this.$route.query.title + ')'
+            }
+            let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip'
+            downloadFile('/params/collectManifest/exportAll', name, query, this.selectClear)
+          }
+        })
+      },
+      handleCancel() {
+        this.dataExportformInline = {}
+        this.$refs.dataExportruleForm.clearValidate()
+        this.dataExportFailed = false
+      },
+      //填写人导出
+      handleExportDre() {
+        let long = localStorage.getItem('language')
+        this.cut = ''
+        if (long && long === 'zh-cn') {
+          this.cut = 'cn'
+        } else if (long && long === 'en-us') {
+          this.cut = 'en'
+        }
+        console.log(this.formInline)
+        let query = {
+          paramsManifestId: this.paramsManifest.id,
+          cut: this.cut,
+          ...this.formInline,
+          ...this.queryParamQuery,
+          ids: this.selectedRowKeys.join(','),
+          exportName: this.$route.query.projectName + '(' + this.$route.query.title + ')'
+        }
+        let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip'
+        downloadFile('/params/collectManifest/exportDre', name, query, this.selectClear)
+      },
+      getList() {
+        this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
+      },
+      iVisible(val, num) {
+        this.importsVisible = val
+        if (num == 1) {
+          eventBUs.$emit('searchGetData')
+        }
+      },
+      // 高级搜索
+      handleSuperQuery(params, matchType) {
+        let sqp = {}
+        if (!params || (params && params.length == 0)) {
+          sqp['superQueryParams'] = ''
+          this.$refs.globalAdvancedQueryRef.superQueryFlag = false
+        } else {
+          this.$refs.globalAdvancedQueryRef.superQueryFlag = true
+          // sqp['superQueryParams'] = encodeURI(JSON.stringify(params))
+          params.forEach((item) => {
+            item.type = matchType
+          })
+          sqp['queryConditionVOListStr'] = JSON.stringify(params)
+          sqp['superQueryMatchType'] = matchType
+        }
+        console.log(sqp)
+        this.queryParamQuery = sqp
+        this.$refs.CollectionTabel.pageNo = 1
+        // this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
+        eventBUs.$emit('getTableList', this.queryParamQuery)
+      },
+      // 认证工程师 批量删除 权限
+      // 仅仅状态为 待发起收集 工程接口人退回 变更 可以批量删除
+      homoJurisdictionBatchdelete() {
+        this.NotSelectedRowKeysValue = []
+        // 定义开关 0为没有权限  1为有权限
+        let flag = 1
+        if (this.selectedRowKeysValue.length == 0) {
+          flag = 2
+          this.$message.warning(this.$t('selectLeastOne'))
+        } else {
+          this.selectedRowKeysValue.forEach((item, index) => {
+            if (item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更' && item.state !== 'To be collected' && item.state !== 'Rejected by eng. interface' && item.state !== 'Modify') {
+              this.NotSelectedRowKeysValue.push(item)
+              flag = 0
+            }
+          })
+        }
+        return flag
+      },
+      // 认证工程师 同步上报库 权限
+      // 仅仅状态为 已提交 变更 可以同步上报库
+      homoJurisdictionSynchronousLibrary() {
+        // 定义开关 0为没有权限  1为有权限
+        this.NotSelectedRowKeysValue = []
+        let flag = 1
+        if (this.selectedRowKeysValue.length == 0) {
+          flag = 2
+          this.$message.warning(this.$t('selectLeastOne'))
+        } else {
+          this.selectedRowKeysValue.forEach((item, index) => {
+            if (item.state !== '已提交' && item.state !== '变更' && item.state !== 'Submitted' && item.state !== 'Modify') {
+              this.NotSelectedRowKeysValue.push(item)
+              flag = 0
+            }
+          })
+        }
+        return flag
+      },
+      // 填写人 截至时间 权限
+      // 仅仅状态为  可以截至时间
+      dreTaskCutOffTimeLibrary() {
+        // 定义开关 0为没有权限  1为有权限
+        this.NotSelectedRowKeysValue = []
+        let flag = 1
+        if (this.selectedRowKeysValue.length == 0) {
+          flag = 2
+          this.$message.warning(this.$t('selectLeastOne'))
+        } else {
+          this.selectedRowKeysValue.forEach((item, index) => {
+            if (item.state !== '待发起收集' && item.state !== 'To be collected') {
+              this.NotSelectedRowKeysValue.push(item)
+              flag = 0
+            }
+          })
+        }
+        return flag
+      },
+      // 认证工程师 强制撤回 权限
+      // 仅仅状态为 待工程接口人处理 填写人退回 可以强制撤回
+      homoJurisdictionCompulsoryWithdrawal() {
+        // 认证工程师 已提交
+        if (this.currentPersonRole == 'homo') {
+          this.NotSelectedRowKeysValue = []
+          // 定义开关 0为没有权限  1为有权限
+          let flag = 1
+          if (this.selectedRowKeysValue.length == 0) {
+            flag = 2
+            this.$message.warning(this.$t('selectLeastOne'))
+          } else {
+            this.selectedRowKeysValue.forEach((item, index) => {
+              console.log(item)
+              if (item.state == '已同步至上报库' || item.state == 'Synced to library' || item.state == '待发起收集' || item.state == 'To be collected') {
+                this.NotSelectedRowKeysValue.push(item)
+                this.jurisdiction = 'homoQZTH'
+                flag = 0
+              }
+            })
+          }
+          return flag
+          // 工程接口人 强制撤回 权限
+          // 仅仅状态为 待填写 可以强制撤回
+        } else if (this.currentPersonRole == 'sdt') {
+          this.NotSelectedRowKeysValue = []
+          // 定义开关 0为没有权限  1为有权限
+          let flag = 1
+          if (this.selectedRowKeysValue.length == 0) {
+            flag = 2
+            this.$message.warning(this.$t('selectLeastOne'))
+          } else {
+            this.selectedRowKeysValue.forEach((item, index) => {
+              if (item.state !== '待填写' && item.state !== 'To be filled') {
+                this.NotSelectedRowKeysValue.push(item)
+                this.jurisdiction = 'sdtQZTH'
+                flag = 0
+              }
+            })
+          }
+          return flag
+          //填写人 已提交
+        } else if (this.currentPersonRole == 'dre') {
+          this.NotSelectedRowKeysValue = []
+          // 定义开关 0为没有权限  1为有权限
+          let flag = 1
+          if (this.selectedRowKeysValue.length == 0) {
+            flag = 2
+            this.$message.warning(this.$t('selectLeastOne'))
+          } else {
+            this.selectedRowKeysValue.forEach((item, index) => {
+              if (item.state !== '已提交' && item.state !== 'Submitted') {
+                this.NotSelectedRowKeysValue.push(item)
+                this.jurisdiction = 'dreQZTH'
+                flag = 0
+              }
+            })
+          }
+          return flag
+        }
+      },
+      // 工程接口人 分配填写人 权限
+      // 仅仅状态为 待工程接口人处理 填写人退回 可以分配填写人
+      sdtJurisdictionAssigned() {
+        // 定义开关 0为没有权限  1为有权限
+        this.NotSelectedRowKeysValue = []
+        let flag = 1
+        if (this.selectedRowKeysValue.length == 0) {
+          flag = 2
+          this.$message.warning(this.$t('selectLeastOne'))
+        } else {
+          this.selectedRowKeysValue.forEach((item, index) => {
+            if (item.state !== '待工程接口人处理' && item.state !== '填写人退回' && item.state !== 'To be processed by eng. interface' && item.state !== 'Rejected by the applicant') {
+              this.NotSelectedRowKeysValue.push(item)
+              flag = 0
+            }
+          })
+        }
+        return flag
+      },
+      // 认证工程师 分配填写人 权限
+      // 仅仅状态为 待填写 可以分配填写人
+      sdtJurisdictionAssignedhomo() {
+        // 定义开关 0为没有权限  1为有权限
+        this.NotSelectedRowKeysValue = []
+        let flag = 1
+        if (this.selectedRowKeysValue.length == 0) {
+          flag = 2
+          this.$message.warning(this.$t('selectLeastOne'))
+        } else {
+          this.selectedRowKeysValue.forEach((item, index) => {
+            console.log(item.state)
+            if (item.state !== '待填写' && item.state !== 'To be filled' && item.state !== '填写人退回' && item.state !== 'Rejected by the applicant' && item.state !== '认证工程师退回' && item.state !== 'Rejected by homo engineer') {
+              this.NotSelectedRowKeysValue.push(item)
+              flag = 0
+            }
+          })
+        }
+        console.log(flag)
+        return flag
+      },
+      // 填写人 提交 权限
+      // 仅仅状态为 待填写 认证工程师退回 可以提交
+      dreJurisdictionSubmit() {
+        // 定义开关 0为没有权限  1为有权限
+        this.NotSelectedRowKeysValue = []
+        let flag = 1
+        if (this.selectedRowKeysValue.length == 0) {
+          flag = 2
+          this.$message.warning(this.$t('selectLeastOne'))
+        } else {
+          this.selectedRowKeysValue.forEach((item, index) => {
+            if (item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'To be filled' && item.state !== 'Rejected by homo engineer') {
+              this.NotSelectedRowKeysValue.push(item)
+              flag = 0
+            }
+          })
+        }
+        return flag
+      },
+      // 填写人 引用参数 权限
+      // 仅仅状态为 待填写 认证工程师退回 可以引用参数
+      dreJurisdictionreferenceParameter() {
+        console.log(123)
+        this.NotSelectedRowKeysValue = []
+        let flag = 1
+        if (this.selectedRowKeysValue.length == 0) {
+          flag = 2
+          this.$message.warning(this.$t('selectLeastOne'))
+        } else {
+          this.selectedRowKeysValue.forEach((item, index) => {
+            if (item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'To be filled'
+              && item.state !== 'Rejected by homo engineer' && item.state !== '变更' && item.state !== 'Modify') {
+              this.NotSelectedRowKeysValue.push(item)
+              flag = 0
+            }
+          })
+        }
+        return flag
+      },
+      LoginUserType(val, currentPersonRole, userType) {
+        this.RoleType = []
+        if (this.currentPersonRole == '') {
+          this.currentPersonRole = currentPersonRole || userType || val[0].value
+        }
+        this.RoleType = val
+        this.RoleType.forEach((item, index) => {
+          if (item.value == this.currentPersonRole) {
+            this.rolename = item.label
+          }
+        })
+        this.formInlineRoleSwitching.roleSwitchingCode = currentPersonRole || userType || val[0].value
+        this.formInlineRoleSwitching = { ...this.formInlineRoleSwitching }
+      },
+      // 表格所选中得行内容
+      rowValue(val) {
+        this.selectedRowKeysValue = val
+      },
+      // 表格所选中得id
+      value(val) {
+        this.selectedRowKeys = val,
+          this.selectedRowKeysArray = val.join(',')
+      },
+      // 冻结配置
+      freezeConfiguration() {
+        // 认证工程师 任意状态 都有此权限
+        this.areaVisibleFreeze = true
+        this.Dateline = {}
+        //  获取冻结配置数据
+        this.confirmLoading = true
+        this.getFreeze(() => {
+          this.getLockedConfigIdList()
+        })
+      },
+      getLockedConfigIdList() {
+        getAction('/params/collectManifest/getLockedConfigIdList',
+          { paramsManifestId: this.paramsManifest.id }).then((res) => {
+          if (res.success) {
+            this.Dateline.paramsConfig = res.result
+            this.Dateline = { ...this.Dateline }
+          } else {
+            this.Dateline.paramsConfig = []
+          }
+          this.confirmLoading = false
+        })
+      },
+      // 冻结配置提交
+      handleSubmitFreeze() {
+        let _this = this
+        let paramsConfig = this.Dateline.paramsConfig === undefined ? '' : this.Dateline.paramsConfig.join(',')
+        let param = { paramsManifestId: this.paramsManifest.id, paramsConfigIds: paramsConfig }
+        this.textLoading = true
+        axios({
+          url: '/jero-boot/params/collectManifest/lockConfigColumn',
+          method: 'post',
+          data: param,
+          transformRequest: [function(data) {
+            let ret = ''
+            for (let it in data) {
+              ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
+            }
+            return ret
+          }],
+          headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            'X-Access-Token': _this.token
+          }
+        })
+          .then((res) => {
+            if (res.data.success) {
+              this.textLoading = false
+              _this.$message.success(this.$t('OperationSuccessful'))
+              this.areaVisibleFreeze = false
+              this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
+              this.$refs.CollectionTabel.getHeader()
+            } else {
+              this.textLoading = false
+              _this.$message.warning(this.$t('operationFailed'))
+            }
+          })
+          .catch((error) => {
+            this.textLoading = false
+          })
+      },
+      // 冻结配置取消
+      cancleImportsFreeze() {
+        this.areaVisibleFreeze = false
+      },
+      getFreeze(callback) {
+        let _this = this
+        let param = { paramsManifestId: this.$route.query.id, configFlag: 1 }
+        axios({
+          url: '/jero-boot/params/collectManifest/getConfigLableList',
+          method: 'post',
+          data: param,
+          transformRequest: [function(data) {
+            let ret = ''
+            for (let it in data) {
+              ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
+            }
+            return ret
+          }],
+          headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            'X-Access-Token': _this.token
+          }
+        })
+          .then((res) => {
+            if (res.data.success) {
+              this.FreezeList = res.data.result
+              callback && callback()
+            } else {
+              _this.$message.warning(res.data.message)
+              _this.confirmLoading = false
+            }
+
+          })
+          .catch((error) => {
+            _this.confirmLoading = false
+          })
+      },
+      // 调整责任领域
+      AdjustareasofresponsibilityClick() {
+        if (this.selectedRowKeysValue.length == 0) {
+          this.$message.warning(this.$t('selectLeastOne'))
+        } else {
+          this.Adjustareasofrespon = true
+        }
+      },
+      // 下发收集的权限
+      distributionAndCollectionJurisdiction() {
+        if (this.selectedRowKeysValue.length == 0) {
+          this.$message.warning(this.$t('selectLeastOne'))
+        } else {
+          this.$refs.areaVisibleTaskCutOffTime.searchData()
+        }
+        // let homodistributionAndCollection = this.homodistributionAndCollection()
+        // if (homodistributionAndCollection == 1) {
+        //   this.areaVisibleTaskCutOffTime = true
+        //   // this.distributionAndCollection()
+        // } else if (homodistributionAndCollection == 0) {
+        //   this.visibleoperationFailed = true
+        //   this.jurisdiction = 'HOMOZFSJ'
+        // } else if (homodistributionAndCollection == 3) {
+        //   this.visibleoperationFailed = true
+        //   this.NoEngineer = 0
+        // }
+      },
+      // 一键下发收集
+      defOneclickCollection() {
+        this.$refs.OneclickCollection.searchData()
+        // this.OneclickCollection = true
+      },
+      // 引用参数列
+      Referenceparametercolumn() {
+        this.parametercolumn = true
+      },
+      Updateparametercolumn() {
+        let data = JSON.parse(JSON.stringify(this.$refs.CollectionTabel.dataSource))
+        let referencesCol = []
+        let postDate = []
+        let colunmnFlag = ''
+        this.colunmnFlag = false
+        data.forEach((item, index) => {
+          if (!item.referencesCol) {
+            this.colunmnFlag = true
+          }
+          referencesCol.push({
+            referencesCol: item.referencesCol,
+            id: item.id
+          })
+        })
+        if (this.colunmnFlag) {
+          this.$message.warning(this.$t('columnfirst'))
+          return
+        }
+        console.log(referencesCol)
+        // for (let i = 0; i < referencesCol.length; i++) {
+        //   let postDateobj = {}
+        //   let itemIn = Object.keys(referencesCol[i])
+        //   for (let j = 0; j < itemIn.length; j++) {
+        //     if (itemIn[j] !== 'sdt' && referencesCol[i][itemIn[j]].list) {
+        //       if (referencesCol[i][itemIn[j]] instanceof Object && !(referencesCol[i][itemIn[j]] instanceof Array)) {
+        //         postDateobj[itemIn[j]] = referencesCol[i][itemIn[j]]
+        //         for (let k = 0; k < referencesCol[i][itemIn[j]].list.length; k++) {
+        //           if (referencesCol[i][itemIn[j]].list[k].type == 'pull_more' && referencesCol[i][itemIn[j]].list[k].dataValue instanceof Array) {
+        //             referencesCol[i][itemIn[j]].list[k].dataValue = referencesCol[i][itemIn[j]].list[k].dataValue.join(',')
+        //           }
+        //           if (referencesCol[i][itemIn[j]].list[k].type == 'text' && referencesCol[i][itemIn[j]].list[k].dataValue !== null) {
+        //             referencesCol[i][itemIn[j]].list[k].dataValue = referencesCol[i][itemIn[j]].list[k].dataValue.toString()
+        //           }
+        //         }
+        //       }
+        //     }
+        //   }
+        //   postDateobj.id = referencesCol[i].id
+        //   postDate.push(postDateobj)
+        // }
+        let configDataList = []
+        for (let i = 0; i < referencesCol.length; i++) {
+          configDataList.push({
+            id: referencesCol[i].id
+          })
+          let key = Object.keys(referencesCol[i].referencesCol.paramsConfigData)
+          let value = referencesCol[i].referencesCol.paramsConfigData
+          for (let j = 0; j < key.length; j++) {
+            let keyName = key[j]
+            for (let k = 0; k < value[keyName].length; k++) {
+              if (value[keyName][k].type == 'pull_more') {
+                value[keyName][k].dataValue = value[keyName][k].dataValue.join(',')
+              }
+            }
+            configDataList[i][keyName] = value[keyName]
+          }
+        }
+        let query = {
+          configDataList: configDataList,
+          paramsManifestId: this.paramsManifest.id
+        }
+        postAction('/params/collectManifest/updateReferencesCol', query).then((res) => {
+          if (res.success) {
+            this.GetgetTableList()
+            this.$message.success(this.$t('OperationSuccessful'))
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
+      },
+      onCheckAllChange(e) {
+        let selectedValue = ['nio_number', 'params_name', 'operation']
+        this.checkedList = e.target.checked ? this.customizeList.map(item => item.field) : selectedValue
+        this.selectedValue = this.checkedList
+        this.indeterminate = false
+      },
+      getcustomizeList(item) {
+        let params = {
+          paramsManifestId: this.$route.query.id,
+          projectName: this.$route.query.projectName,
+          flag: '7'
+        }
+        getAction('params/collectManifest/getHeader', params).then((res) => {
+          if (res.success) {
+            let List = []
+            let sList = []
+            res.result.forEach((item, index) => {
+              if (!item.isLock) {
+                if (item.headFieldCn == '操作') {
+                  item.field = 'operation'
+                  item.disabled = true
+                } else if (item.headFieldCn == 'NIO编号' || item.headFieldCn == '参数名称') {
+                  item.disabled = true
+                }
+                List.push(item)
+              }
+              if (item.isLock) {
+                sList.push(item)
+              }
+            })
+            this.customizeList = List
+            this.statuList = sList
+          }
+        })
+        if (item) {
+          console.log(item)
+          this.checkedList = item
+        }
+      },
+      onChange() {
+        this.selectedValue = this.checkedList
+      },
+      getcustomize() {
+        this.customizevisible = true
+      },
+      cancel() {
+        this.customizevisible = false
+      },
+      handleSubmitcustomize() {
+        let list = []
+        let uniqueArray = this.selectedValue.filter((item, index, array) => {
+          return array.indexOf(item) === index
+        })
+        uniqueArray.forEach(item => {
+          this.customizeList.forEach((val, index) => {
+            if (item == val.field) {
+              // val.sort = index + 1
+              val.dbFieldName = val.db_field_name
+              val.dbFieldTxt = val.db_field_txt
+              list.push(val)
+            }
+          })
+        })
+        this.confirmLoading = true
+        let headCustomEOList = JSON.parse(JSON.stringify(list)).concat(this.statuList)
+        let query = {
+          headCustomEOList: headCustomEOList
+        }
+        postAction('head/headCustomEO/add', query).then((res) => {
+          if (res.success) {
+            this.confirmLoading = false
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.customizevisible = false
+            this.$refs.CollectionTabel.getHeader()
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+            this.confirmLoading = false
+            this.customizevisible = false
+          }
+        })
+      },
+      // // 下发收集---请求接口
+      // distributionAndCollection() {
+      //
+      //   let _array = []
+      //   this.selectedRowKeysValue.forEach((item, index) => {
+      //     _array.push(item.id)
+      //   })
+      //   let _this = this
+      //   let param = {
+      //     paramsManifestId: this.$route.query.id,
+      //     projectId: this.$route.query.projectId,
+      //     ids: _array.join(',')
+      //   }
+      //   this.textLoading = true
+      //   axios({
+      //     url: '/jero-boot/params/collectManifest/issueCollection',
+      //     method: 'post',
+      //     data: param,
+      //     transformRequest: [function(data) {
+      //       let ret = ''
+      //       for (let it in data) {
+      //         ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
+      //       }
+      //       return ret
+      //     }],
+      //     headers: {
+      //       'Content-Type': 'application/x-www-form-urlencoded',
+      //       'X-Access-Token': _this.token
+      //     }
+      //   })
+      //     .then((res) => {
+      //       if (res.data.success) {
+      //         _this.$message.success(this.$t('OperationSuccessful'))
+      //         _this.areaVisible = false
+      //         this.textLoading = false
+      //         _this.GetgetTableList()
+      //       } else {
+      //         this.textLoading = false
+      //         _this.$message.warning(this.$t('operationFailed'))
+      //       }
+      //     })
+      //     .catch((error) => {
+      //       this.textLoading = false
+      //     })
+      // },
+      // 同步上报库 权限
+      handleSynchronousReportLibraryJurisdiction() {
+        let homoJurisdictionSynchronousLibrary = this.homoJurisdictionSynchronousLibrary()
+        if (homoJurisdictionSynchronousLibrary == 1) {
+          this.handleSynchronousReportLibrary()
+        } else if (homoJurisdictionSynchronousLibrary == 0) {
+          this.visibleoperationFailed = true
+          this.jurisdiction = 'HOMOTBSBK'
+          this.NoEngineer = 1
+        }
+      },
+      // 同步上报库
+      handleSynchronousReportLibrary() {
+        this.areaVisibsynchronous = true
+      },
+      // 添加
+      handleAdd() {
+        // 认证工程师 任意状态 都有此权限
+        this.areaVisible = true
+      },
+      // 提交
+      handleSubmit() {
+        // 填写人 权限
+        let dreJurisdictionSubmit = this.dreJurisdictionSubmit()
+        console.log(dreJurisdictionSubmit)
+        if (dreJurisdictionSubmit == 1) {
+          this.ishandleSubmit()
+        } else if (dreJurisdictionSubmit == 0) {
+          this.visibleoperationFailed = true
+          this.jurisdiction = 'DREYYCS'
+          this.NoEngineer = 1
+        }
+      },
+      getDataSource(data) {
+        this.dataSource = data
+      },
+      handlePreservation(num) {
+        let _this = this
+        let postDate = []
+        let data = JSON.parse(JSON.stringify(this.$refs.CollectionTabel.dataSource))
+        let selectedRowKeysValue = []
+        data.forEach(res => {
+          if (res.state == 'To be filled' || res.state == '待填写' || res.state == '认证工程师退回' ||
+            res.state == 'Rejected by homo engineer' ||res.state == 'Modify' || res.state == '变更') {
+            selectedRowKeysValue.push(res)
+          }
+        })
+        // for (let i = 0; i < selectedRowKeysValue.length; i++) {
+        //   let postDateobj = {}
+        //   let itemIn = Object.keys(selectedRowKeysValue[i])
+        //   for (let j = 0; j < itemIn.length; j++) {
+        //     if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) {
+        //       if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
+        //         postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
+        //         for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
+        //           if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') {
+        //             selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',')
+        //           }
+        //           if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) {
+        //             selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString()
+        //           }
+        //         }
+        //       }
+        //     }
+        //   }
+        //   postDateobj.id = selectedRowKeysValue[i].id
+        //   delete postDateobj.referencesCol
+        //   postDate.push(postDateobj)
+        // }
+        // console.log(postDate)
+        if (selectedRowKeysValue && selectedRowKeysValue.length > 0) {
+          if (num && num == 1) {
+            this.textLoading = true
+          }
+          let configDataList = []
+          for (let i = 0; i < selectedRowKeysValue.length; i++) {
+            configDataList.push({
+              id: selectedRowKeysValue[i].id
+            })
+            if (selectedRowKeysValue[i].configIds && selectedRowKeysValue[i].configIds.length > 0) {
+              for (let j = 0; j < selectedRowKeysValue[i].configIds.length; j++) {
+                let keyIndex = Object.keys(selectedRowKeysValue[i])
+                for (let k = 0; k < keyIndex.length; k++) {
+                  if (keyIndex[k] == selectedRowKeysValue[i].configIds[j]) {
+                    let keyName = keyIndex[k]
+                    configDataList[i][keyName] = selectedRowKeysValue[i][keyName]
+                  }
+                }
+              }
+            }
+          }
+          // return
+          if (configDataList && configDataList.length > 0) {
+            configDataList.forEach(res => {
+              Object.keys(res).forEach(val => {
+                if (res[val] && res[val].paramsConfigData) {
+                  let paramsConfigData = res[val].paramsConfigData
+                  Object.keys(paramsConfigData).forEach((ol, index) => {
+                    paramsConfigData[ol][0].orderNum = index
+                    paramsConfigData[ol].forEach(item => {
+                      if (item.type == 'pull_more') {
+                        item.dataValue = item.dataValue.join(',')
+                      }
+                    })
+                  })
+                }
+              })
+            })
+          }
+          let query = {
+            // ...configDataList,
+            configDataList: configDataList,
+            paramsManifestId: this.paramsManifest.id
+          }
+          postAction('/params/collectManifest/save', query).then((res) => {
+            if (res.success) {
+              if (num && num == 1) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                this.textLoading = false
+              }
+              clearTimeout(this.timeBatch)
+              this.timeBatch = setTimeout(() => {
+                if (this.currentPersonRole == 'dre') {
+                  this.handlePreservation()
+                }
+              }, 10000)
+              // if (this.currentPersonRole == 'dre') {
+              //   this.timeBatch = setTimeout(() => {
+              //     this.handlePreservation();
+              //   }, 10000);
+              // var  interval = setInterval(this.handlePreservation(),10000);
+              // /* if 5 minutes no operation then logout */
+              // var maxTime = 120; // seconds
+              // var time = maxTime;
+              // $('body').on('keydown mousemove mousedown', function(e) {
+              //   time = maxTime; // reset
+              // });
+              // var intervalId = setInterval(function() {
+              //   time--;
+              //   if (time <= 0) {
+              //     ShowInvalidLoginMessage();
+              //     clearInterval(intervalId);
+              //   }
+              // }, 10000)
+              // function ShowInvalidLoginMessage() {
+              //   // 停止定时器
+              //   clearInterval(interval);
+              // }
+              // }
+            } else {
+              if (num && num == 1) {
+                _this.$message.warning(_this.$t('operationFailed'))
+                this.textLoading = false
+              }
+            }
+          })
+        } else {
+          if (num && num == 1) {
+            this.$message.warning(this.$t('theCurrentListSaved'))
+          }
+        }
+      },
+      // 提交数据
+      ishandleSubmit() {
+        let _this = this
+        let postDate = []
+        let selectedRowKeysValue = JSON.parse(JSON.stringify(this.selectedRowKeysValue))
+        // for (let i = 0; i < selectedRowKeysValue.length; i++) {
+        //   let postDateobj = {}
+        //   let itemIn = Object.keys(selectedRowKeysValue[i])
+        //   for (let j = 0; j < itemIn.length; j++) {
+        //     if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) {
+        //       if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
+        //         postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
+        //         for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
+        //           if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') {
+        //             selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',')
+        //           }
+        //           if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) {
+        //             selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString()
+        //           }
+        //           if (!selectedRowKeysValue[i][itemIn[j]].list[k].dataValue && selectedRowKeysValue[i][itemIn[j]].list[k].isMust == '1'
+        //             && selectedRowKeysValue[i][itemIn[j]].list[k].isLock == '0') {
+        //             this.$message.warning(selectedRowKeysValue[i].nioNumber + ',' + this.$t('requiredParametersEmpty'))
+        //             return
+        //           }
+        //         }
+        //       }
+        //     }
+        //   }
+        //   postDateobj.id = selectedRowKeysValue[i].id
+        //   postDate.push(postDateobj)
+        // }
+        let configDataList = []
+        for (let i = 0; i < selectedRowKeysValue.length; i++) {
+          configDataList.push({
+            id: selectedRowKeysValue[i].id
+          })
+          if (selectedRowKeysValue[i].configIds && selectedRowKeysValue[i].configIds.length > 0) {
+            for (let j = 0; j < selectedRowKeysValue[i].configIds.length; j++) {
+              let keyIndex = Object.keys(selectedRowKeysValue[i])
+              for (let k = 0; k < keyIndex.length; k++) {
+                if (keyIndex[k] == selectedRowKeysValue[i].configIds[j]) {
+                  let keyName = keyIndex[k]
+                  configDataList[i][keyName] = selectedRowKeysValue[i][keyName]
+                }
+              }
+            }
+          }
+        }
+        // return
+        if (configDataList && configDataList.length > 0) {
+          for (let i = 0; i < configDataList.length; i++) {
+            let res = Object.keys(configDataList[i])
+            for (let j = 0; j < res.length; j++) {
+              let key = res[j]
+              if (configDataList[i][key] && configDataList[i][key].paramsConfigData) {
+                let paramsConfigData = configDataList[i][key].paramsConfigData
+                let paramsConfigDataQuery = Object.keys(paramsConfigData)
+                for (let k = 0; k < paramsConfigDataQuery.length; k++) {
+                  let keyName = paramsConfigDataQuery[k]
+                  paramsConfigData[keyName][0].orderNum = k
+                  let keyNameOne = paramsConfigData[keyName]
+                  for (let l = 0; l < keyNameOne.length; l++) {
+                    if (keyNameOne[l].type == 'pull_more') {
+                      keyNameOne[l].dataValue = keyNameOne[l].dataValue.join(',')
+                    }
+                    if ((keyNameOne[l].dataValue== undefined || keyNameOne[l].dataValue == null) && keyNameOne[l].isMust == '1' && keyNameOne[l].isLock == '0') {
+                      this.$message.warning(selectedRowKeysValue[i].nioNumber + ',' + this.$t('requiredParametersEmpty'))
+                      return
+                    }
+                  }
+                }
+              }
+            }
+          }
+          // configDataList.forEach(res => {
+          //   Object.keys(res).forEach(val => {
+          //     if (res[val] && res[val].paramsConfigData) {
+          //       let paramsConfigData = res[val].paramsConfigData
+          //       Object.keys(paramsConfigData).forEach((ol, index) => {
+          //         paramsConfigData[ol][0].orderNum = index
+          //         paramsConfigData[ol].forEach(item => {
+          //           if (item.type == 'pull_more') {
+          //             item.dataValue = item.dataValue.join(',')
+          //           }
+          //         })
+          //       })
+          //     }
+          //   })
+          // })
+        }
+        // let configDataList = { configDataList: postDate }
+        if (this.selectedRowKeys.length == 0) {
+          this.$message.warning(this.$t('selectLeastOne'))
+        } else {
+          let _configDataListNo = []
+          this.$confirm({
+            content: _this.$t('Areyousureparameteritems'),
+            onOk() {
+              let query = {
+                configDataList: configDataList,
+                paramsManifestId: _this.paramsManifest.id
+              }
+              postAction(_this.url.add, query).then((res) => {
+                if (res.success) {
+                  _this.$message.success(_this.$t('OperationSuccessful'))
+                  _this.GetgetTableList()
+                } else {
+                  _this.$message.warning(_this.$t('operationFailed'))
+                }
+              })
+            }
+          })
+        }
+      },
+      returnDataJurisdiction() {
+        // 退回的状态权限
+        let homoJurisdictionReturn = this.homoJurisdictionReturn()
+        console.log(homoJurisdictionReturn, 'homoJurisdictionReturn')
+        if (homoJurisdictionReturn == 1) {
+          this.returnData()
+        } else if (homoJurisdictionReturn == 0) {
+          this.visibleoperationFailed = true
+          this.returnData()
+        }
+      },
+      // 退回
+      returnData() {
+        // todo  退回没有选择数据
+        let _array = []
+        if (this.currentPersonRole == 'homo') {
+          this.selectedRowKeysValue = this.selectedRowKeysValue.filter(item => item.state == '已提交' || item.state == 'Submitted')
+        } else if (this.currentPersonRole == 'sdt') {
+          this.selectedRowKeysValue = this.selectedRowKeysValue.filter(item => item.state == '待工程接口人处理' || item.state == '填写人退回' || item.state == 'To be processed by eng. interface' || item.state == 'Rejected by the applicant')
+        } else if (this.currentPersonRole == 'dre') {
+          this.selectedRowKeysValue = this.selectedRowKeysValue.filter(item => item.state == '待填写' || item.state == '认证工程师退回' || item.state == 'To be filled' || item.state == 'Rejected by homo engineer')
+        }
+        this.selectedRowKeysValue.forEach((item, index) => {
+          _array.push(item.id)
+        })
+        if (_array.length == 0) {
+          return
+        }
+        let _this = this
+        let param = {
+          ids: _array.join(','),
+          currentPersonRole: this.currentPersonRole,
+          paramsManifestId: this.$route.query.id
+        }
+        this.textLoading = true
+        axios({
+          url: '/jero-boot/params/collectManifest/back',
+          method: 'post',
+          data: param,
+          transformRequest: [function(data) {
+            let ret = ''
+            for (let it in data) {
+              ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
+            }
+            return ret
+          }],
+          headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            'X-Access-Token': _this.token
+          }
+        })
+          .then((res) => {
+            if (res.data.success) {
+              this.textLoading = false
+              _this.$message.success(_this.$t('OperationSuccessful'))
+              _this.GetgetTableList()
+              _this.selectedRowKeysValue = []
+            } else {
+              this.textLoading = false
+              _this.$message.warning(_this.$t('operationFailed'))
+            }
+          })
+          .catch((error) => {
+            this.textLoading = false
+          })
+      },
+      // 强制撤回权限
+      compulsoryWithdrawaljurisdiction() {
+        let homoJurisdictionCompulsoryWithdrawal = this.homoJurisdictionCompulsoryWithdrawal()
+        if (homoJurisdictionCompulsoryWithdrawal === 1) {
+          this.compulsoryWithdrawal()
+        } else if (homoJurisdictionCompulsoryWithdrawal === 0) {
+          this.visibleoperationFailed = true
+        }
+      },
+      drawerhandleCancel(val) {
+        console.log(11131)
+        this.parametercolumn = false
+      },
+      // 强制撤回
+      compulsoryWithdrawal() {
+        let _array = []
+        this.selectedRowKeysValue.forEach((item, index) => {
+          _array.push(item.id)
+        })
+        let _this = this
+        let param = {
+          ids: _array.join(','),
+          paramsManifestId: this.$route.query.id,
+          projectId: this.$route.query.projectId
+
+        }
+        let url = ''
+        if (this.currentPersonRole == 'homo') {
+          url = '/jero-boot/params/collectManifest/mandatoryWithdraw'
+        } else {
+          url = '/jero-boot/params/collectManifest/withdraw'
+        }
+        this.$confirm({
+          title: this.$t('columnforced'),
+          content: '',
+          onOk:
+            async () => {
+              this.textLoading = true
+              axios({
+                url: url,
+                method: 'post',
+                data: param,
+                transformRequest: [function(data) {
+                  let ret = ''
+                  for (let it in data) {
+                    ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
+                  }
+                  return ret
+                }],
+                headers: {
+                  'Content-Type': 'application/x-www-form-urlencoded',
+                  'X-Access-Token': _this.token
+                }
+              })
+                .then((res) => {
+                  if (res.data.success) {
+                    this.textLoading = false
+                    _this.$message.success(_this.$t('OperationSuccessful'))
+                    _this.GetgetTableList()
+                    _this.selectedRowKeysValue = []
+                  } else {
+                    this.textLoading = false
+                    _this.$message.warning(_this.$t('operationFailed'))
+                  }
+                })
+                .catch((error) => {
+                  this.textLoading = false
+                })
+            }
+        })
+      },
+      // 分配填写人
+      assignedBy() {
+        let sdtJurisdictionAssigned = this.sdtJurisdictionAssigned()
+        // 工程接口人
+        if (sdtJurisdictionAssigned == 1) {
+          this.areaVisibleAssignedby = true
+        } else if (sdtJurisdictionAssigned == 0) {
+          this.visibleoperationFailed = true
+          this.jurisdiction = 'SDTFPTXR'
+        }
+      },
+      // 认证分配填写人
+      assignedByHomo() {
+        let sdtJurisdictionAssigned = this.sdtJurisdictionAssignedhomo()
+        // 工程接口人
+        if (sdtJurisdictionAssigned == 1) {
+          this.areaVisibleAssignedbyhomo = true
+        } else if (sdtJurisdictionAssigned == 0) {
+          this.visibleoperationFailed = true
+          this.jurisdiction = 'SDTFPTXRHOMO'
+        }
+      },
+      batchUpdateDeadlineClick() {
+        if (this.selectedRowKeysValue && this.selectedRowKeysValue.length > 0) {
+          this.$refs.batchUpdateDeadlineRef.getData(JSON.parse(JSON.stringify(this.selectedRowKeysValue)))
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      batchUpdateDeadlineForm() {
+        this.GetgetTableList()
+      },
+      // 分配填写人确定后弹框关闭
+      areaVisibleAssignedbyflag(val) {
+        this.areaVisibleAssignedby = val
+      },
+      // 认证分配填写人确定后弹框关闭
+      areaVisibleAssignedbyflaghomo(val) {
+        this.areaVisibleAssignedbyhomo = val
+      },
+      // 截止时间
+      // TaskCutOffTimeLibrary() {
+      //   let dreTaskCutOffTimeLibrary = this.dreTaskCutOffTimeLibrary()
+      //   if (dreTaskCutOffTimeLibrary == 1) {
+      //     this.areaVisibleTaskCutOffTime = true
+      //   } else if (dreTaskCutOffTimeLibrary == 0) {
+      //     this.visibleoperationFailed = true
+      //     this.jurisdiction = 'HOMOJZSJ'
+      //   }
+      // },
+      // 截至时间确定弹框关闭
+      areaVisibleTaskCutOffTimeflag(val) {
+        this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
+      },
+      areaVisibleTaskCutOffTimeAll(val) {
+        this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
+      },
+      AdjustareasofresponAll(val) {
+        console.log(val)
+        this.Adjustareasofrespon = val
+        this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
+      },
+      //引用参数
+      referenceparameter() {
+        let dreJurisdictionreferenceParameter = this.dreJurisdictionreferenceParameter()
+        if (dreJurisdictionreferenceParameter == 1) {
+          this.areaVisiblereferenceparameter = true
+        } else if (dreJurisdictionreferenceParameter == 0) {
+          this.visibleoperationFailed = true
+          this.jurisdiction = 'DREYYCS'
+        }
+      },
+      listReset() {
+        this.formInline = {}
+      },
+      handleModule() {
+
+      },
+      handleCody() {
+      },
+      searchQuery() {
+        this.$refs.CollectionTabel.pageNo = 1
+        this.$refs.CollectionTabel.getTableList()
+      },
+      searchReset() {
+        this.formInline = {}
+        this.queryParamQuery = {}
+        this.$refs.CollectionTabel.pageNo = 1
+        this.$refs.CollectionTabel.getTableListReset()
+        this.$refs.globalAdvancedQueryRef.handleReset()
+        // this.$refs.globalAdvancedQueryRef.emitCallback()
+      },
+      // 批量删除 -- 与下发收集一致
+      handleDelJurisdiction() {
+        let homoJurisdictionBatchdelete = this.homoJurisdictionBatchdelete()
+        if (homoJurisdictionBatchdelete == 1) {
+          this.handleDel()
+        } else if (homoJurisdictionBatchdelete == 0) {
+          this.visibleoperationFailed = true
+          this.jurisdiction = 'HOMOZFSJ'
+        }
+      },
+      handleDel() {
+        let param = {
+          ids: this.selectedRowKeysArray,
+          paramsManifestId: this.$route.query.id
+        }
+        if (this.selectedRowKeys.length > 0) {
+          let _this = this
+          this.$confirm({
+            content: this.$t('ConfirmBatchDeletion'),
+            onOk() {
+              _this.textLoading = true
+              postAction('/params/collectManifest/deleteBatch', param).then((res) => {
+                if (res.success) {
+                  _this.$message.success(_this.$t('OperationSuccessful'))
+                  _this.selectedRowKeys = []
+                  console.log(111)
+                  _this.$refs.CollectionTabel.getTableList(_this.queryParamQuery)
+                  _this.textLoading = false
+                } else {
+                  _this.textLoading = false
+                  _this.$message.warning(this.$t('operationFailed'))
+                }
+              })
+            }
+          })
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      pageOnChange() {
+
+      },
+      SizeChange() {
+
+      }
+    },
+    destroyed() {
+      // 离开页面结束定时器
+      clearTimeout(this.timeBatch)
+    }
+  }
+</script>
+<style lang="less">
+  .popconfirmIndex {
+    z-index: 999;
+  }
+
+  .popconfirmIndex .ant-popover-buttons {
+    display: none !important;
+  }
+
+  .popconfirmIndex .anticon-exclamation-circle {
+    display: none !important;
+  }
+
+  ::v-deep .ant-table-fixed-header .ant-table-body-inner {
+    overflow: visible;
+  }
+
+  popconfirmmize {
+    z-index: 999;
+  }
+
+  ::v-deep .popconfirmmize .ant-popover-buttons {
+    display: none !important;
+  }
+
+  .popconfirmmize .anticon-exclamation-circle {
+    display: none !important;
+  }
+
+  .popconfirmmize .ant-popover-message {
+    padding: 4px 0 36px !important;
+  }
+
+  ::v-deep .ant-popover-buttons {
+    display: none !important;
+  }
+</style>
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
+
+  .header-text {
+    font-size: 16px;
+    font-weight: 400;
+    height: 60px;
+    color: #000F16;
+    line-height: 40px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .operator-text-left {
+    font-size: 14px;
+    margin-right: 20px;
+    background: #eff1f3;
+    padding: 8px 8px;
+    cursor: pointer;
+    border-radius: 4px;
+  }
+
+  .operator-text-title {
+    cursor: pointer;
+    margin-right: 22px;
+    font-size: 14px;
+    font-weight: 400;
+    color: #040B29;
+    margin-bottom: 22px;
+  }
+
+  .box-title-text-index {
+    line-height: 1.4;
+    display: flex;
+  }
+
+  .title-text-Comment {
+    width: 74px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 36px;
+  }
+
+  .itemModel {
+    width: 100%;
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .box-input .ant-select-selection {
+    height: 38px !important;
+  }
+
+  .itemitem {
+    width: 250px;
+  }
+
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+  }
+
+  .Required {
+    color: red;
+  }
+
+  .customize-text {
+    /*height: 1533px;*/
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+  }
+
+  .customize-text-title {
+    margin-left: 0;
+    font-size: 14px;
+    font-weight: 400;
+    color: #040B29;
+    margin-bottom: 22px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    z-index: 100;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .ant-table-placeholder {
+    padding: 0;
+    border-top: none;
+  }
+
+  .itemModelComment .ant-form-item-control-wrapper {
+    width: 100% !important;
+  }
+
+  .second {
+    padding: 0 !important;
+  }
+
+  .doc-detail {
+    background: #fff;
+    height: 100%;
+
+    .Virtual-detail-header {
+      width: 100%;
+      height: 68px;
+      line-height: 68px;
+      padding: 0 32px 0 32px;
+      box-sizing: border-box;
+      display: flex;
+      justify-content: space-between;
+      border-bottom: 2px #eff1f3 solid;
+      background: #fff;
+
+      .Virtual-detail-title {
+        display: inline-block;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        font-size: 20px;
+        font-weight: 400;
+        color: #040B29;
+        line-height: 68px;
+      }
+
+      .doc-detail-right {
+        width: 800px;
+        line-height: 68px;
+        display: flex;
+      }
+    }
+
+    .Virtual-detail-content {
+      margin-top: 68px;
+      padding: 0 38px 0 38px;
+      box-sizing: border-box;
+      font-size: 16px;
+
+      .box-title-text-add {
+        line-height: 1.4;
+      }
+
+      .title-text-add {
+        display: inline-block;
+        font-weight: 500;
+        margin-right: 16px;
+        height: 42px;
+        line-height: 42px;
+      }
+    }
+
+    .Virtual-detail-header {
+      width: 100%;
+      height: 68px;
+      line-height: 68px;
+      padding: 0 32px 0 32px;
+      box-sizing: border-box;
+      display: flex;
+      justify-content: space-between;
+      border-bottom: 2px #eff1f3 solid;
+      background: #fff;
+      z-index: 1000;
+
+      .Virtual-detail-title {
+        display: inline-block;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        font-size: 20px;
+        font-weight: 400;
+        color: #040B29;
+        line-height: 68px;
+      }
+
+      .Virtual-detail-title-right {
+        float: right;
+      }
+
+      .doc-detail-right {
+        width: 800px;
+        line-height: 68px;
+        display: flex;
+      }
+    }
+
+    .Virtual-detail-content {
+      padding: 0 32px 0 32px;
+      box-sizing: border-box;
+      font-size: 16px;
+
+      .box-title-text-add {
+        line-height: 1.4;
+      }
+
+      .title-text-add {
+        display: inline-block;
+        width: 100%;
+        font-weight: 500;
+        margin-right: 16px;
+        height: 42px;
+        line-height: 42px;
+      }
+
+    }
+  }
+
+  .text-wraning {
+    word-break: break-word;
+  }
+
+  .operator-text-title-color {
+    color: #00B3BE;
+  }
+
+  .itemOption {
+    display: inline-block;
+    width: 100%;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+  }
+</style>
+<style lang='less'>
+  .popconfirmIndex .ant-popover-message-title {
+    margin-bottom: 50px;
+  }
+</style>
+<style>
+  .popconfirmDetailsText {
+    z-index: 1000;
+    top: 42px !important;
+  }
+
+  .popconfirmDetailsText .ant-popover-buttons {
+    display: none !important;
+  }
+
+  .popconfirmDetailsText .anticon-exclamation-circle {
+    display: none !important;
+  }
+
+  .ant-select-selection--multiple {
+    overflow: auto;
+  }
+
+  .ant-select-selection--multiple::-webkit-scrollbar {
+    display: none; /* Chrome Safari */
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
new file mode 100644
index 000000000..42cdbc327
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
@@ -0,0 +1,386 @@
+<!--平台件-->
+<template>
+  <div class="box">
+    <div class="box-text">
+      <div class="header-text">
+        {{$t('basicInformationOfParameters')}}
+      </div>
+      <div class="header-tight">
+        <a-button v-if="this.$route.query.studioEngineer == this.userInfo().id || administrators" class="box-button"
+                  style="line-height: 32px" @click="edit">
+          {{$t('edit')}}
+        </a-button>
+      </div>
+    </div>
+
+    <div class="content-text">
+      <div class="text-field">
+        <span class="text-field-left" :title="$t('entryName')">{{$t('entryName')}}</span>
+        <span class="text-field-right" :title="queryForm.projectName"
+        >{{queryForm.projectName}}</span>
+      </div>
+      <div class="text-field">
+        <span class="text-field-left" :title="$t('brand')">{{$t('brand')}}</span>
+        <span class="text-field-right" :title="queryForm.brandText"
+        >{{queryForm.brandText}}</span>
+      </div>
+      <div class="text-field">
+        <span class="text-field-left" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
+        <span class="text-field-right" :title="queryForm.configurationItem"
+        >{{queryForm.configurationItem}}</span>
+      </div>
+    </div>
+    <div class="content-text">
+      <div class="text-field">
+        <span class="text-field-left" :title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span>
+        <span class="text-field-right" :title="queryForm.regulatoryEngineer"
+        >{{queryForm.regulatoryEngineer}}</span>
+      </div>
+      <div class="text-field">
+        <span class="text-field-left" :title="$t('dehicleDevelopmentPlan')">{{$t('dehicleDevelopmentPlan')}}</span>
+        <span class="text-field-right text-field-right-color"
+              :title="queryForm.vehicleDevelopmentPlan"
+              @click="urlClick(queryForm.vehicleDevelopmentPlan)"
+        >{{queryForm.vehicleDevelopmentPlan}}</span>
+      </div>
+      <div class="text-field">
+        <span class="text-field-left" :title="$t('certificationProgram')">{{$t('certificationProgram')}}</span>
+        <span class="text-field-right text-field-right-color"
+              :title="queryForm.attestationPlan"
+              @click="urlClick(queryForm.attestationPlan)"
+        >{{queryForm.attestationPlan}}</span>
+      </div>
+    </div>
+    <div class="content-text">
+      <div class="text-field">
+        <span class="text-field-left" :title="$t('explain')">{{$t('explain')}}</span>
+        <span class="text-field-right" :title="queryForm.explanation"
+        >{{queryForm.explanation}}</span>
+      </div>
+    </div>
+    <div class="box-text" style="margin-top: 10px;margin-bottom: 10px">
+      <div class="header-text">
+        {{$t('complianceCertificationProgram')}}
+      </div>
+      <div class="header-tight">
+        <a-button class="box-button"
+                  v-if="this.$route.query.studioEngineer == this.userInfo().id || administrators"
+                  style="line-height: 32px"
+                  @click="settingClick">{{$t('setting')}}
+        </a-button>
+      </div>
+    </div>
+    <div class="process-content">
+      <complianceCertificationForm ref="complianceCertificationRef"/>
+    </div>
+    <div class="box-text" style="margin-top: 10px">
+      <div class="header-text">
+        {{$t('projectStatus')}}
+      </div>
+      <div class="header-tight">
+        <a-button class="box-button"
+                  style="line-height: 32px"
+                  @click="stateExportClick">{{$t('stateExport')}}
+        </a-button>
+        <a-button class="box-button"
+                  v-if="activeKey == $t('regulatoryComplianceManagement') || activeKey == $t('certificationActivityManagement')"
+                  style="line-height: 32px"
+                  @click="versionStatisticsClick">{{$t('versionStatistics')}}
+        </a-button>
+      </div>
+    </div>
+    <projectStatus ref="projectStatusRef"
+                   @currentStatus="currentStatus"
+                   @projectStatusForm="projectStatusForm"/>
+    <versionStatistics ref="versionStatisticsRef" @versionStatisticsForm="versionStatisticsForm"/>
+    <addModel :url="url" ref="addModelRef" @addModelList="addModelList"/>
+    <settingList :url="url" ref="settingListRef" @settingListForm="settingListForm"/>
+  </div>
+</template>
+
+<script>
+  import * as echarts from 'echarts'
+  import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
+  import addModel from './addModel'
+  import versionStatistics from './versionStatistics'
+  import complianceCertificationForm from './complianceCertificationForm'
+  import settingList from './settingList'
+  import projectStatus from './projectStatus'
+  import { mapGetters } from 'vuex'
+
+  export default {
+    name: 'ProjectDetails',
+    components: {
+      addModel,
+      settingList,
+      projectStatus,
+      versionStatistics,
+      complianceCertificationForm
+    },
+    data() {
+      return {
+        queryForm: {},
+        cut: '',
+        administrators: false,
+        activeKey: this.$t('regulatoryComplianceManagement'),
+        url: {
+          queryById: 'project/projectLibraryBase/queryById',
+          add: 'project/projectLibraryBase/add',
+          edit: 'project/projectLibraryBase/edit',
+          queryByProjectId: 'project/projectTaskPlanning/queryByProjectId',
+          addSettingUrl: 'project/projectTaskPlanning/add',
+          editSettingUrl: 'project/projectTaskPlanning/edit',
+          settingQueryForm: '/project/projectTaskPlanning/list'
+        },
+        selectedRowKeys: [],
+        idList: [],
+        regulatoryCertificationTaskPlanList: []
+      }
+    },
+    mounted() {
+      this.getForm()
+      this.administrators = false
+      this.activeKey = this.$t('regulatoryComplianceManagement')
+      if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+        this.userInfo().userRoleList.forEach(res => {
+          if (res.roleCode == 'admin') {
+            this.administrators = true
+          }
+        })
+      }
+    },
+    methods: {
+      ...mapGetters(['userInfo']),
+      getForm() {
+        getAction(this.url.queryById, { id: this.$route.query.id }).then((res) => {
+          if (res.success) {
+            this.cut = res.cut
+            this.queryForm = res.result[0] || {}
+            if (this.cut == 'en') {
+              this.queryForm.brandText = this.queryForm.brandTextEn
+            } else {
+              this.queryForm.brandText = this.queryForm.brandText
+            }
+          } else {
+            this.queryForm = {}
+          }
+        })
+      },
+      currentStatus(item) {
+        this.$emit('TaskListChange', item)
+      },
+      settingListForm() {
+        this.$refs.complianceCertificationRef.getSetting()
+      },
+      ListOfRelevantPersonnelClick() {
+        this.$refs.listOfRelevantPersonnelRef.getData()
+      },
+      rxswinClick(){
+        this.$refs.rxswinModelRef.getData()
+      },
+      urlClick(val) {
+        if (val) {
+          window.open(val)
+        }
+      },
+      edit() {
+        this.$refs.addModelRef.editModel(JSON.parse(JSON.stringify(this.queryForm)))
+      },
+      addModelList() {
+        this.getForm()
+      },
+      settingClick() {
+        this.$refs.settingListRef.edit()
+      },
+      stateExportClick() {
+        let query = {
+          projectLibraryId: this.$route.query.id
+        }
+        downloadFile('/project/projectLibraryBase/exportProjectProgressStatisticsXls',
+          this.queryForm.projectName+'-'+this.queryForm.projectVersion+'-'+this.$t('projectProgressStatistics') + '.xls', query)
+      },
+
+      versionStatisticsClick() {
+        this.$refs.versionStatisticsRef.addModel(JSON.parse(JSON.stringify(this.selectedRowKeys)))
+      },
+      versionStatisticsForm(value) {
+        this.$refs.projectStatusRef.versionStatisticsForm(value)
+        this.selectedRowKeys = JSON.parse(JSON.stringify(value))
+      },
+      projectStatusForm(activeKey) {
+        this.activeKey = activeKey
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  @import '~@assets/less/common.less';
+
+  .box {
+    padding: 0 24px 24px 24px;
+    box-sizing: border-box;
+  }
+
+  .header-text {
+    font-size: 16px;
+    font-weight: bold;
+    color: #000F16;
+  }
+
+  .content-text {
+    width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+
+    .text-field {
+      width: 33%;
+      margin-bottom: 8px;
+
+      .text-field-left {
+        width: 124px;
+        display: inline-block;
+        font-size: 14px;
+        font-weight: 400;
+        color: #6F7385;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        margin-right: 24px;
+      }
+
+      .text-field-right {
+        width: calc(100% - 200px);
+        display: inline-block;
+        font-size: 16px;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        word-break: break-word;
+        color: #040B29;
+        font-weight: 400;
+      }
+    }
+
+    .text-field-content {
+      width: 100%;
+      /*margin-bottom: 34px;*/
+
+      .text-field-left {
+        width: 124px;
+        display: inline-block;
+        font-size: 14px;
+        font-weight: 400;
+        color: #6F7385;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        float: left;
+        margin-right: 24px;
+        margin-top: 3px;
+      }
+
+      .text-field-right {
+        width: calc(100% - 200px);
+        display: inline-block;
+        font-size: 16px;
+        float: left;
+        word-break: break-word;
+        color: #040B29;
+        font-weight: 400;
+      }
+    }
+  }
+
+  .process-content {
+    margin-top: 4px;
+    position: relative;
+
+    .process-content-content {
+      background: #fff;
+      z-index: 1000;
+      padding: 0 20px;
+
+      .process-content-left {
+        float: left;
+      }
+
+      .process-content-right {
+        float: left;
+        margin-left: 7px;
+
+        .process-content-right-top {
+          font-size: 14px;
+          font-weight: 400;
+          color: #040B29;
+          max-width: 155px;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          overflow: hidden;
+        }
+
+        .process-content-right-button {
+          max-width: 155px;
+          font-size: 12px;
+          font-weight: 400;
+          color: #6F7385;
+          margin-top: -4px;
+        }
+      }
+    }
+
+
+    .process-content-content:first-child {
+      padding: 0 20px 0 0;
+    }
+
+    .process-content-content:last-child {
+      padding: 0 0 0 20px;
+    }
+
+    .process-content-right-xian {
+      height: 2px;
+      width: calc(100% - 27px);
+      background: #E6E6E9;
+      position: absolute;
+      top: 16px;
+    }
+  }
+
+  @media screen and (min-width: 600px) and (max-width: 1600px) {
+
+    .process-content-right-top {
+      max-width: 70px !important;
+      white-space: inherit !important;
+      overflow: hidden !important;
+    }
+
+    .process-content-right-button {
+      max-width: 70px !important;
+    }
+  }
+
+  .text-field-right-color {
+    color: #00B3BE !important;
+    cursor: pointer;
+  }
+
+  .box-text {
+    display: flex;
+    justify-content: space-between;
+    height: 72px;
+    line-height: 80px;
+  }
+
+  .header-tight {
+    line-height: 90px;
+  }
+
+  .button-text {
+    padding: 0 13px;
+  }
+
+  .box-button {
+    margin-left: 12px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/TaskList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/TaskList.vue
new file mode 100644
index 000000000..d4c6cbdc4
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/TaskList.vue
@@ -0,0 +1,960 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('standard')">
+                <span>{{$t('standard')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                       v-model="queryParam.serialNumber"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('areaOfResponsibility')">
+                <span>{{$t('areaOfResponsibility')}}</span>
+              </div>
+              <j-multi-select-tag class="box-input" v-model="queryParam.dutyTerritory"
+                                  :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                  :type="'select'"
+                                  :triggerChange="false" :dictCode="'duty_territory'"/>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('CertificationProgress')">
+                <span>{{$t('CertificationProgress')}}</span>
+              </div>
+              <j-dict-select-tag class="box-input" v-model="queryParam.certificationProgress"
+                                 :placeholder="$t('PleaseSelect')+$t('CertificationProgress')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'certification_progress'"/>
+            </div>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('CurrentStatus')">
+                <span>{{$t('CurrentStatus')}}</span>
+              </div>
+              <a-select
+                class="box-input"
+                v-model="queryParam.projectStatusAssess"
+                :placeholder="$t('PleaseSelect')+$t('CurrentStatus')">
+                <a-select-option :value="'1'">
+                             <span style="display: inline-block;width: 100%">
+                                    {{ $t('red') }}
+                             </span>
+                </a-select-option>
+                <a-select-option :value="'2'">
+                             <span style="display: inline-block;width: 100%">
+                                    {{ $t('yellow') }}
+                             </span>
+                </a-select-option>
+                <a-select-option :value="'3'">
+                             <span style="display: inline-block;width: 100%">
+                                    {{ $t('green') }}
+                             </span>
+                </a-select-option>
+                <a-select-option :value="'4'">
+                               <span style="display: inline-block;width: 100%">
+                                     {{ $t('blue') }}
+                                </span>
+                </a-select-option>
+              </a-select>
+            </div>
+          </a-col>
+          </template>
+          <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a @click="handleToggleSearch" style="margin-left: 8px">
+                              {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                              <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                  </a>
+               </a-col>
+            </span>
+        </a-row>
+      </a-form>
+    </div>
+    <div class="table-operator">
+      <div class="operator-text" @click="cuibanClick" v-if="isRoleSwitching">
+        <a-icon type="sound"/>
+        {{ $t('CuiBan') }}
+      </div>
+      <div @click="BatchMaintenanceProgress" class="operator-text" v-if="isRoleSwitching">
+        <a-icon type="setting"/>
+        {{$t('BatchMaintenanceProgress')}}
+      </div>
+      <div @click="BatchChangeStatus" class="operator-text" v-if="isRoleSwitching">
+        <a-icon type="setting"/>
+        {{$t('BatchChangeStatus')}}
+      </div>
+      <div @click="CertificationDirectory" class="operator-text" v-if="isRoleSwitching">
+        <a-icon type="bulb"/>
+        {{$t('CertificationDirectory')}}
+      </div>
+      <div @click="handleExport" class="operator-text" v-if="isRoleSwitching">
+        <a-icon type="export" :rotate="-90"/>
+        {{$t('export')}}
+      </div>
+    </div>
+    <div style="width: 100%">
+      <!--        rowKey="id"
+      :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"-->
+      <a-table
+        ref="table"
+        bordered
+        class="taskTable"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: '100%',y:'calc(100vh - 300px)'}"
+        :data-source="dataSource"
+        rowKey="id"
+        @change="tableOnChange"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :columns="columns" :components="drag(columns,'columns',JSON.parse(JSON.stringify([[columns[3],200],[columns[4],200],[columns[5],200]])))"
+      >
+        <div slot="standardInformation" slot-scope="text,result" class="box-left">
+          <div class="content">
+            <a class="box-content-a" @click="standardClick(result)"
+               :title="result.serialNumber">{{result.serialNumber}}</a>
+            <a class="box-content-buttom" :title="result.title">{{result.title}}</a>
+          </div>
+        </div>
+        <div slot="areaOfResponsibility" slot-scope="text,result" class="box-left">
+          <div class="content" v-if="result.dutyTerritory_dictText">
+            <span v-for="(item,index) in result.dutyTerritory_dictText.split(',')">
+            <span class="box-content-index">{{item}}</span><br/>
+            </span>
+          </div>
+        </div>
+        <div slot="confirmationOfDesignConformity" slot-scope="text,result" class="box-left">
+          <div class="content" v-if="result.designTaskStatus" @click="verifyTaskClick(result,1,false)">
+            <span class="box-content">{{$t('Deadline')}}: {{result.designDueDate}}</span><br/>
+            <span class="box-content">{{$t('ProcessStatus')}}: {{result.designStatus}}</span><br/>
+            <span class="box-content-color"
+                  :style="{'width':long=='zh-cn'?'78px' : '138px'}"
+                  :class="color[result.designFlowTaskStatus]">
+               {{statusText[result.designFlowTaskStatus]}}
+            </span>
+          </div>
+          <div class="content-box" v-if="result.designTaskStatus == 'NotDone'" @click="verifyTaskClick(result,1,true)">
+            <div class="content-box-jiao"></div>
+          </div>
+        </div>
+        <div slot="PrehomoConfirmation" slot-scope="text,result" class="box-left">
+          <div class="content" v-if="result.prehomoTaskStatus" @click="verifyTaskClick(result,2,false)">
+            <span class="box-content">{{$t('Deadline')}}: {{result.prehomoDueDate}}</span><br/>
+            <span class="box-content">{{$t('ProcessStatus')}}: {{result.prehomoStatus}}</span><br/>
+            <span class="box-content-color"
+                  :style="{'width':long=='zh-cn'?'78px' : '138px'}"
+                  :class="color[result.prehomoFlowTaskStatus]">
+              {{statusText[result.prehomoFlowTaskStatus]}}
+            </span>
+          </div>
+          <div class="content-box" v-if="result.prehomoTaskStatus == 'NotDone'" @click="verifyTaskClick(result,2,true)">
+            <div class="content-box-jiao"></div>
+          </div>
+        </div>
+        <div slot="verificationAndConformityconfirmation" slot-scope="text,result" class="box-left">
+          <div class="content" v-if="result.verifyTaskStatus" @click="verifyTaskClick(result,3,false)">
+            <span class="box-content">{{$t('Deadline')}}: {{result.verifyDueDate}}</span><br/>
+            <span class="box-content">{{$t('ProcessStatus')}}: {{result.verifyStatus}}</span><br/>
+            <span class="box-content-color"
+                  :style="{'width':long=='zh-cn'?'78px' : '138px'}"
+                  :class="color[result.verifyFlowTaskStatus]">
+                {{statusText[result.verifyFlowTaskStatus]}}
+            </span>
+          </div>
+          <div class="content-box" v-if="result.verifyTaskStatus == 'NotDone'" @click="verifyTaskClick(result,3,true)">
+            <div class="content-box-jiao"></div>
+          </div>
+        </div>
+        <div slot="CertificationProgress" slot-scope="text,result">
+             <span class="box-content-Progress box-content-cou"
+                   :style="{'width':long=='zh-cn'?'88px' : '108px'}"
+                   :class="CertificationColor[result.certificationProgress]"
+                   @click="CertificationProgressClick(result)"
+             >
+              {{result.certificationProgress_dictText ? result.certificationProgress_dictText : $t('maintainProgress')}}
+             </span>
+        </div>
+        <div slot="CurrentProjectStatusEvaluation" slot-scope="text,result">
+          <div class="Current-color box-content-cou" :style="{'background':CurrentColor[result.projectStatusAssess]}"
+               @click="CurrentProjectClick(result)">
+            <div class="Current-color-box" :style="{'background':CurrentColorBox[result.projectStatusAssess]}"></div>
+          </div>
+        </div>
+      </a-table>
+    </div>
+    <certificationDirectory :isDisplayNum="isDisplayNum" :url="url" ref="certificationDirectoryRef"/>
+    <TaskListModel @TaskListModelList="TaskListModelList" ref="TaskListModelRef"/>
+    <taskBatSetting @taskBatSettingForm="taskBatSettingForm" ref="taskBatSettingRef"></taskBatSetting>
+    <batchChangeModel @batchChangeModel="batchChangeModel" ref="batchChangeModelRef"/>
+    <cuibanModel @cibanModel="cibanModel" ref="cModelRef"/>
+    <batchModel @batchModel="batchModel" ref="batchModelRef"/>
+    <!--    错误数据提示-->
+    <a-modal
+      :title="$t('operationFailed')"
+      :width="860"
+      v-model="visibleoperationFailed"
+      :maskClosable="false"
+      @cancel='cancleoperationFailed'
+      :footer="null"
+    >
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <span style='font-size: 16px;margin-bottom: 20px;display: flex;justify-content: center'
+                v-for='(item,key) in NotSelectedNoEngineerValue'>
+            <span v-html='item'></span>
+          </span>
+        </a-col>
+      </a-row>
+      <div class="imports-footer">
+        <div class="imports-footer-wrap" style='text-align: center'>
+          <a-button class="imports-btn" type="primary" @click="cancleoperationFailed">{{$t('cancel')}}</a-button>
+        </div>
+      </div>
+    </a-modal>
+  </a-card>
+</template>
+
+<script>
+  import certificationDirectory from './certificationDirectory'
+  import batchChangeModel from './batchChangeModel'
+  import batchModel from './batchModel'
+  import TaskListModel from './TaskListModel'
+  import cuibanModel from './cuibanModel'
+  import taskBatSetting from './taskBatSetting'
+  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+  import { mapGetters } from 'vuex'
+  import store from '@/store/'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+  export default {
+    name: 'TaskList',
+    components: {
+      certificationDirectory,
+      TaskListModel,
+      batchChangeModel,
+      batchModel,
+      cuibanModel,
+      taskBatSetting
+    },
+    props: ['isDisplayNum', 'areaOfResponsibility'],
+    mixins:[ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        toggleSearchStatus: false,
+        columns: [
+          {
+            title: this.$t('number'),
+            align: 'left',
+            width: 70,
+            customRender: function(t, r, index) {
+              return parseInt(index) + 1
+            }
+          },
+          {
+            title: this.$t('standardInformation'),
+            align: 'left',
+            dataIndex: 'standard',
+            width: 202,
+            sorter:true,
+            scopedSlots: { customRender: 'standardInformation' }
+          },
+          {
+            title: this.$t('areaOfResponsibility'),
+            align: 'left',
+            width: 100,
+            sorter:true,
+            dataIndex: 'areaOfResponsibility',
+            scopedSlots: { customRender: 'areaOfResponsibility' }
+          },
+          {
+            title: this.$t('confirmationOfDesignConformity'),
+            align: 'left',
+            width: 240,
+            sorter:true,
+            dataIndex: 'confirmationOfDesignConformity',
+            scopedSlots: { customRender: 'confirmationOfDesignConformity' }
+          },
+          {
+            title: this.$t('PrehomoConfirmation'),
+            align: 'left',
+            width: 240,
+            sorter:true,
+            dataIndex: 'PrehomoConfirmation',
+            scopedSlots: { customRender: 'PrehomoConfirmation' }
+          },
+          {
+            title: this.$t('verificationAndConformityconfirmation'),
+            align: 'left',
+            width: 240,
+            sorter:true,
+            dataIndex: 'verificationAndConformityconfirmation',
+            scopedSlots: { customRender: 'verificationAndConformityconfirmation' }
+          },
+          {
+            title: this.$t('CertificationProgress'),
+            align: 'left',
+            width: 150,
+            sorter:true,
+            dataIndex: 'CertificationProgress',
+            scopedSlots: { customRender: 'CertificationProgress' }
+          },
+          {
+            title: this.$t('CurrentStatus'),
+            align: 'left',
+            width: 150,
+            sorter:true,
+            dataIndex: 'CurrentProjectStatusEvaluation',
+            scopedSlots: { customRender: 'CurrentProjectStatusEvaluation' }
+          }
+        ],
+        selectedRowKeys: [],
+        orderBy: '1',
+        orderByField: '',
+
+        status: {
+          'NotDone': '待办',
+          'haveDone': '已办',
+          'showData': '展示数据'
+        },
+        color: {
+          'Compliance': 'accordColor',
+          'Non-Compliance': 'nonConformityColor',
+          'To be tracked': 'TrackedColor',
+          'NA': 'notInvolvedColor',
+          'No rating': 'submittedColor',
+          'Termination of task': 'nonConformityColor'
+        },
+        statusText: {
+          'Compliance': this.$t('accord'),
+          'Non-Compliance': this.$t('nonConformity'),
+          'To be tracked': this.$t('Tracked'),
+          'NA': this.$t('notInvolved'),
+          'No rating': this.$t('toBeConfirmed'),
+          'Termination of task': this.$t('taskTermination')
+        },
+        CertificationColor: {
+          'Test passed': 'accordColor',
+          'Test failed': 'nonConformityColor',
+          'In progress': 'TrackedColor',
+          'NA': 'notInvolvedColor',
+          'Not start': 'submittedColor'
+        },
+        queryParam: {},
+        CurrentColor: {
+          '1': '#f3dddd',
+          '2': '#f6ebdb',
+          '3': '#dbf6e2',
+          '4': '#ddf3f4'
+        },
+        CurrentColorBox: {
+          '1': '#E83030',
+          '2': '#FDA71C',
+          '3': '#26BD4B',
+          '4': '#00B3BE'
+        },
+        url: {
+          list: '/project/projectTaskInventoryEO/list',
+          exportXls: '/project/projectTaskInventoryEO/exportXls'
+        },
+        isRoleSwitching:true,
+        loading: false,
+        visibleoperationFailed: false,
+        NotSelectedNoEngineerValue: [],
+        dataSource: [],
+        selectionRowsArray:[],
+        roleSwitchingList:[],
+        roleCodes:[],
+        long: ''
+      }
+    },
+    watch: {
+      '$socketPublic.state.msg': {
+        //处理接收到的消息
+        handler: function(res) {
+          let that = this
+          let data = JSON.parse(res.data)
+          if (data.msgId) {
+            this.getList()
+          }
+        }
+      }
+    },
+    created() {
+      if (store.getters.userInfo) {
+        this.$socketPublic.dispatch('webSocketInit')//初始化ws
+      }
+    },
+    mounted() {
+      if (this.areaOfResponsibility.dutyTerritory) {
+        this.queryParam.dutyTerritory = this.areaOfResponsibility.dutyTerritory
+        this.queryParam = { ...this.queryParam }
+      }
+      this.getList()
+      this.getRoleByUserId()
+      this.long = localStorage.getItem('language') || 'zh-cn'
+    },
+    methods: {
+      ...mapGetters(['userInfo']),
+      handleToggleSearch() {
+        this.toggleSearchStatus = !this.toggleSearchStatus
+      },
+      searchQuery() {
+        this.getList()
+      },
+      getRoleByUserId(callback) {
+        getAction('/project/projectLawsInventoryEO/getRoleByUserId', { projectLibraryId: this.$route.query.id }).then((res) => {
+          if (res.success) {
+            this.roleSwitchingList = res.result || []
+            if(this.roleSwitchingList.length == 1){
+              if(this.roleSwitchingList[0].roleCode == '13'){
+                this.isRoleSwitching = false
+              }
+            }
+
+          } else {
+            this.roleSwitchingList = []
+          }
+          callback && callback()
+        })
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.getList()
+      },
+      batSettingClick() {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.$refs.taskBatSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)))
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      taskBatSettingForm() {
+        this.getList()
+      },
+      batchChangeModel() {
+        this.getList()
+      },
+      batchModel() {
+        this.getList()
+      },
+      onSelectChange(value, selectionRows) {
+        this.selectedRowKeys = value
+        this.selectionRowsArray = selectionRows
+      },
+      handleExport() {
+        let query = {
+          ...this.queryParam,
+          projectLibraryId: this.$route.query.id
+        }
+        downloadFile(this.url.exportXls, this.$t('taskList') + '.xls', query, this.Deselect)
+      },
+      verifyTaskClick(val, num, isTrue) {
+        let query = {}
+        switch (num) {
+          case 1:
+            val.designTaskId = val.designTaskId + ''
+            if (val.designTaskId.length > 30) {
+              val.designTaskId = ''
+            }
+            query = {
+              taskIds: val.designTaskId,
+              actiProcInstId: val.designPId,
+              projectTaskInventoryId: val.projectLawsInventoryId,
+              projectLibraryId: this.$route.query.id,
+              id: this.$route.query.id,
+              studioEngineer: this.$route.query.studioEngineer,
+              serialNumber: val.serialNumber,
+              TaskKey: val.designTaskDefinitionKey,
+              isDisplay: isTrue,
+              flowType: 2,
+              Sponsor: 'designInitiatorName',
+              personLiable: 'designDutyName',
+              typeOfDeliverables: 'designDeliverableTypeName',
+              deliverableTemplate: 'designDeliverableTemplate',
+              DueDate: 'designDueDate',
+              remarks: 'designRemark',
+              projectName: this.$route.query.projectName,
+              targetMarket: this.$route.query.targetMarket,
+              projectNameId: this.$route.query.projectNameId,
+              primaryKeyId: val.designTaskDetailId,
+              PersonChargeFeedback: val.designPersonChargeFeedback
+            }
+            break
+          case 2:
+            val.prehomoTaskId = val.prehomoTaskId + ''
+            if (val.prehomoTaskId.length > 30) {
+              val.prehomoTaskId = ''
+            }
+            query = {
+              taskIds: val.prehomoTaskId,
+              actiProcInstId: val.prehomoPId,
+              projectTaskInventoryId: val.projectLawsInventoryId,
+              studioEngineer: this.$route.query.studioEngineer,
+              projectLibraryId: this.$route.query.id,
+              serialNumber: val.serialNumber,
+              TaskKey: val.prehomoTaskDefinitionKey,
+              flowType: 3,
+              isDisplay: isTrue,
+              id: this.$route.query.id,
+              Sponsor: 'prehomoInitiatorName',
+              personLiable: 'prehomoDutyName',
+              typeOfDeliverables: 'prehomoDeliverableTypeName',
+              deliverableTemplate: 'prehomoDeliverableTemplate',
+              DueDate: 'prehomoDueDate',
+              remarks: 'prehomoRemark',
+              projectName: this.$route.query.projectName,
+              targetMarket: this.$route.query.targetMarket,
+              projectNameId: this.$route.query.projectNameId,
+              primaryKeyId: val.prehomoTaskDetailId,
+              PersonChargeFeedback: val.prehomoPersonChargeFeedback
+            }
+            break
+          case 3:
+            val.verifyTaskId = val.verifyTaskId + ''
+            if (val.verifyTaskId.length > 30) {
+              val.verifyTaskId = ''
+            }
+            query = {
+              taskIds: val.verifyTaskId,
+              actiProcInstId: val.verifyPId,
+              id: this.$route.query.id,
+              projectLibraryId: this.$route.query.id,
+              studioEngineer: this.$route.query.studioEngineer,
+              serialNumber: val.serialNumber,
+              projectTaskInventoryId: val.projectLawsInventoryId,
+              TaskKey: val.verifyTaskDefinitionKey,
+              flowType: 4,
+              isDisplay: isTrue,
+              Sponsor: 'verifyInitiatorName',
+              personLiable: 'verifyDutyName',
+              typeOfDeliverables: 'verifyDeliverableTypeName',
+              deliverableTemplate: 'verifyDeliverableTemplate',
+              DueDate: 'verifyDueDate',
+              remarks: 'verifyRemark',
+              projectName: this.$route.query.projectName,
+              targetMarket: this.$route.query.targetMarket,
+              projectNameId: this.$route.query.projectNameId,
+              primaryKeyId: val.verifyTaskDetailId,
+              PersonChargeFeedback: val.verifyPersonChargeFeedback
+            }
+            break
+        }
+        let newUrl = this.$router.resolve({
+          path: '/taskListProcess',
+          query: query
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      CertificationDirectory() {
+        this.$refs.certificationDirectoryRef.addModel()
+      },
+      tableOnChange(pagination, filters, sorter) {
+        this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+        if(sorter.columnKey == 'standard'){
+          this.orderByField = 'serialNumber'
+        } else if(sorter.columnKey == 'areaOfResponsibility') {
+          this.orderByField = 'dutyTerritory'
+        } else if(sorter.columnKey == 'confirmationOfDesignConformity') {
+          this.orderByField = 'designFlowTaskStatus'
+        } else if(sorter.columnKey == 'PrehomoConfirmation') {
+          this.orderByField = 'prehomoFlowTaskStatus'
+        } else if(sorter.columnKey == 'verificationAndConformityconfirmation') {
+          this.orderByField = 'verifyFlowTaskStatus'
+        } else if(sorter.columnKey == 'CertificationProgress') {
+          this.orderByField = 'certificationProgressName'
+        } else if(sorter.columnKey == 'CurrentProjectStatusEvaluation') {
+          this.orderByField = 'projectStatusAssess'
+        } else{
+          this.orderByField = sorter.columnKey
+        }
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        if (queryParam.dutyTerritory) {
+          queryParam.dutyTerritory = '*' + queryParam.dutyTerritory + '*'
+        }
+        let query = {
+          projectLibraryId: this.$route.query.id,
+          orderBy: this.orderBy,
+          orderByField: this.orderByField,
+          ...queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result
+            this.loading = false
+            // this.dataSource = [{}]
+          } else {
+            this.dataSource = []
+            this.loading = false
+          }
+        })
+      },
+      CertificationProgressClick(val) {
+        let item = JSON.parse(JSON.stringify(val))
+        this.$refs.TaskListModelRef.getData(item, this.$t('CertificationProgress'))
+      },
+      CurrentProjectClick(val) {
+        let item = JSON.parse(JSON.stringify(val))
+        this.$refs.TaskListModelRef.getData(item, this.$t('CurrentStatus'))
+      },
+      // 催办
+      cuibanClick() {
+        if (this.selectionRowsArray.length < 1) {
+          this.$message.warning(this.$t('selectLeastOne'))
+        } else {
+          this.$refs.cModelRef.getData(this.selectionRowsArray)
+        }
+      },
+      cibanModel() {
+        this.getList()
+      },
+      //批量维护进度
+
+      BatchMaintenanceProgress() {
+        if (this.selectionRowsArray.length < 1) {
+          this.$message.warning(this.$t('selectLeastOne'))
+        } else {
+          let query = {}
+          let projectLawsInventoryIds = []
+          let roleCodes = []
+          this.selectionRowsArray.forEach((item, index) => {
+            projectLawsInventoryIds.push(item.projectLawsInventoryId)
+            roleCodes.push(item.roleCode)
+          })
+          query = {
+            roleCodes: roleCodes.join(','),
+            operation: '1',
+            projectLawsInventoryIds: projectLawsInventoryIds.join(',')
+          }
+          postAction('/project/projectTaskInventoryEO/verifyRoleCode', query).then((res) => {
+            if (res.success) {
+              if (res.result.length == 0) {
+                this.$refs.batchModelRef.getData(this.selectedRowKeys)
+              } else {
+                this.NotSelectedNoEngineerValue = res.result
+                this.visibleoperationFailed = true
+              }
+            } else {
+            }
+          })
+
+
+        }
+
+
+      },
+      //批量修改状态
+      BatchChangeStatus() {
+        if (this.selectionRowsArray.length < 1) {
+          this.$message.warning(this.$t('selectLeastOne'))
+        } else {
+          let query = {}
+          let projectLawsInventoryIds = []
+          let roleCodes = []
+          this.selectionRowsArray.forEach((item, index) => {
+            projectLawsInventoryIds.push(item.projectLawsInventoryId)
+            roleCodes.push(item.roleCode)
+          })
+          query = {
+            roleCodes: roleCodes.join(','),
+            operation: '2',
+            projectLawsInventoryIds: projectLawsInventoryIds.join(',')
+          }
+          postAction('/project/projectTaskInventoryEO/verifyRoleCode', query).then((res) => {
+            if (res.success) {
+              if (res.result.length == 0) {
+                this.$refs.batchChangeModelRef.getData(this.selectionRowsArray)
+              } else {
+                this.NotSelectedNoEngineerValue = res.result
+                this.visibleoperationFailed = true
+              }
+            } else {
+
+            }
+          })
+
+        }
+
+      },
+      // 催办
+      cuibanClick() {
+        if (this.selectionRowsArray.length < 1) {
+          this.$message.warning(this.$t('selectLeastOne'))
+        } else {
+          this.$refs.cModelRef.getData(this.selectionRowsArray)
+        }
+      },
+      cibanModel() {
+        this.getList()
+      },
+      cancleoperationFailed() {
+        this.visibleoperationFailed = false
+      },
+      TaskListModelList() {
+        this.getList()
+      },
+      standardClick(row) {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: row.standId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: calc(100% - 126px);
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .operator-text-left {
+    font-size: 14px;
+    margin-right: 20px;
+    background: #eff1f3;
+    padding: 8px 8px;
+    cursor: pointer;
+    border-radius: 4px;
+  }
+
+  .box-left {
+    position: relative;
+    display: block;
+    height: 100%;
+    text-align: left;
+  }
+
+  .content {
+    text-align: left;
+    margin: 0 auto;
+    display: inline-block;
+  }
+
+  .content-box {
+    position: absolute;
+    width: calc(100% + 32px);
+    height: calc(100% + 32px);
+    top: -16px;
+    left: -16px;
+    border: 1px #00B3BE solid;
+  }
+
+  .content-box-jiao {
+    position: absolute;
+    right: 0;
+    width: 0;
+    height: 0;
+    border-right: 14px solid #00B3BE;
+    border-bottom: 14px solid transparent
+  }
+
+  .box-content {
+    margin-bottom: 8px;
+    display: inline-block;
+    text-align: left;
+    font-weight: 400;
+    color: #040B29;
+  }
+
+  .box-content-a {
+    display: inline-block;
+    text-align: left;
+    margin-bottom: 8px;
+    font-weight: 400;
+    display: -webkit-box;
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    /*! autoprefixer: off */
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    /*! autoprefixer: on;*/
+    text-justify: inter-ideograph;
+    word-break: break-all
+  }
+
+  .box-content-index {
+    margin-bottom: 8px;
+    display: inline-block;
+    text-align: left;
+    font-weight: 400;
+    color: #040B29;
+  }
+
+  .box-content-index:last-child {
+    margin-bottom: 0;
+  }
+
+  .box-content-color {
+    width: 138px;
+    height: 32px;
+    display: inline-block;
+    border-radius: 4px;
+    text-align: center;
+    font-size: 14px;
+    line-height: 32px;
+  }
+
+  .box-content-Progress {
+    width: 88px;
+    height: 32px;
+    display: inline-block;
+    text-align: center;
+    line-height: 32px;
+    border-radius: 4px;
+    background: #f1f3f5;
+    color: #919399;
+  }
+
+  .accordColor {
+    background: #dbf6e2;
+    color: #26BD4B;
+  }
+
+  .nonConformityColor {
+    background: #f3dddd;
+    color: #E83030;
+  }
+
+  .TrackedColor {
+    background: #f6ebdb;
+    color: #FDA71C;
+  }
+
+  .notInvolvedColor {
+    background: #eef1f4;
+    color: #707486;
+  }
+
+  .submittedColor {
+    color: #00B3BE;
+    background: #ddf3f4;
+  }
+
+  .Current-color {
+    display: inline-block;
+    width: 28px;
+    height: 28px;
+    line-height: 32px;
+    text-align: center;
+    background: #ddf3f4;
+    border-radius: 50%;
+  }
+
+  .Current-color-box {
+    display: inline-block;
+    width: 14px;
+    height: 14px;
+    background: #00B3BE;
+    border-radius: 50%;
+  }
+
+  .box-content-cou {
+    cursor: pointer;
+  }
+
+  .box-content-buttom {
+    width: 100%;
+    overflow: hidden;
+    display: -webkit-box;
+    text-overflow: ellipsis;
+    /*! autoprefixer: off */
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    /*! autoprefixer: on;*/
+    text-justify: inter-ideograph;
+    word-break: break-all
+  }
+
+  ///deep/.taskTable .ant-table-thead > tr > th {
+  //  font-weight: bolder;
+  //}
+
+  /deep/ .ant-table-thead > tr > th {
+    background: #f3f6f6!important;
+    padding: 12px 16px!important;
+  }
+
+  /deep/ .ant-table-tbody > tr > td {
+    padding: 16px 16px!important;
+  }
+
+  ::v-deep .ant-table-placeholder {
+    margin-top: 8px !important;
+  }
+</style>
+<style>
+  .box-input .ant-select-selection {
+    height: 38px !important;
+  }
+
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+  }
+
+  .taskTable .ant-empty-normal {
+    padding: 32px 0 !important;
+    margin: 0 !important;
+  }
+
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/TaskListModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/TaskListModel.vue
new file mode 100644
index 000000000..7eac348a5
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/TaskListModel.vue
@@ -0,0 +1,340 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="700"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleOk"
+    @cancel="visible = false"
+  >
+    <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+      <a-row :gutter="24">
+        <div class="headerText" v-if="title == $t('CurrentStatus')">
+          {{this.$t('redSchedule')}}<br/>
+          {{this.$t('yellowSchedule')}}<br/>
+          {{this.$t('greenRequirements')}}<br/>
+          {{this.$t('blueUndeterminedState')}}
+        </div>
+        <a-col :span="24" v-if="title == $t('CertificationProgress')">
+          <div class="box-title-text">
+            <div class="title-text">
+                      <span class="title-text-text"
+                            :title="$t('CertificationProgress')">{{$t('CertificationProgress')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" :prop="!disabled?'certificationProgress':''">
+              <j-dict-select-tag class="box-input" v-model="formInline.certificationProgress"
+                                 :disabled="disabled"
+                                 @input="handleInput('certificationProgress')"
+                                 :placeholder="$t('PleaseSelect')+$t('CertificationProgress')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'certification_progress'"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="24" v-if="title == $t('CertificationProgress')">
+          <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" :prop="!disabled?'certificationProgressRemark':''">
+              <a-textarea
+                :placeholder="$t('PleaseEnter')+$t('remarks')"
+                :disabled="disabled"
+                v-model="formInline.certificationProgressRemark" :rows="4"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+
+        <a-col :span="24" v-if="title == $t('CurrentStatus') && this.formInline.roleCode != '0'">
+          <div class="box-title-text">
+            <div class="title-text">
+                      <span class="title-text-text"
+                            :title="$t('CurrentProjectStatusEvaluation')">{{$t('CurrentProjectStatusEvaluation')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" prop="conditionAssessment">
+              <a-select
+                :disabled="disabled"
+                v-model="formInline.conditionAssessment"
+                :placeholder="$t('PleaseSelect')+$t('CurrentProjectStatusEvaluation')">
+                <a-select-option :value="'1'">
+                             <span style="display: inline-block;width: 100%">
+                                    {{ $t('red') }}
+                             </span>
+                </a-select-option>
+                <a-select-option :value="'2'">
+                             <span style="display: inline-block;width: 100%">
+                                    {{ $t('yellow') }}
+                             </span>
+                </a-select-option>
+                <a-select-option :value="'3'">
+                             <span style="display: inline-block;width: 100%">
+                                    {{ $t('green') }}
+                             </span>
+                </a-select-option>
+
+                <a-select-option :value="'4'" disabled>
+                               <span style="display: inline-block;width: 100%">
+                                     {{ $t('blue') }}
+                                </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+
+        <a-col :span="24" v-if="title == $t('CurrentStatus') && this.formInline.roleCode != '0'">
+          <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" prop="remark">
+              <a-textarea
+                :placeholder="$t('remarks')"
+                :disabled="disabled"
+                v-model="formInline.remark" :rows="4"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <div v-for="item in studioList"
+             v-if="title == $t('CurrentStatus') && formInline.roleCode == '0'">
+          <div class="headerText"
+               v-if="item.roleCode == 1"
+               style="margin-top: 10px">
+            {{$t('regulatoryEngineer')+$t('judge')}}
+          </div>
+          <div class="headerText"
+               v-else-if="item.roleCode == 2"
+               style="margin-top: 10px">
+            {{$t('certifiedEngineer')+$t('judge')}}
+          </div>
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+              <span class="title-text-text"
+                    :title="$t('CurrentStatus')">{{$t('CurrentStatus')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="conditionAssessment">
+                <a-select
+                  :disabled="disabled"
+                  v-model="item.conditionAssessment"
+                  :placeholder="$t('PleaseSelect')+$t('CurrentStatus')">
+                  <a-select-option :value="'1'">
+                     <span style="display: inline-block;width: 100%">
+                            {{ $t('red') }}
+                     </span>
+                  </a-select-option>
+                  <a-select-option :value="'2'">
+                     <span style="display: inline-block;width: 100%">
+                            {{ $t('yellow') }}
+                     </span>
+                  </a-select-option>
+                  <a-select-option :value="'3'">
+                     <span style="display: inline-block;width: 100%">
+                            {{ $t('green') }}
+                     </span>
+                  </a-select-option>
+
+                  <a-select-option :value="'4'" disabled>
+                       <span style="display: inline-block;width: 100%">
+                             {{ $t('blue') }}
+                        </span>
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </div>
+          </a-col>
+
+          <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" prop="remark">
+                <a-textarea
+                  :placeholder="$t('remarks')"
+                  :disabled="disabled"
+                  v-model="item.remark" :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </div>
+
+      </a-row>
+    </a-form-model>
+  </a-modal>
+</template>
+
+<script>
+  import { postAction, putAction, getAction } from '@/api/manage'
+
+  export default {
+    name: 'TaskListModel',
+    data() {
+      return {
+        formInline: {},
+        rules: {
+          certificationProgressRemark:[
+            {
+              max: 500,
+              message: this.$t('remarks') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+        },
+        title: this.$t('CertificationProgress'),
+        visible: false,
+        confirmLoading: false,
+        studioList: [],
+        disabled: false,
+        url: {
+          // edit: '/project/projectTaskInventoryEO/edit',
+          edit: '/project/projectCertificationInventoryEO/edit',
+          addOrUpdate: '/project/projectTaskInventoryConditionAssessmentEO/addOrUpdate',
+          list: '/project/projectTaskInventoryConditionAssessmentEO/list'
+        }
+      }
+    },
+    mounted() {
+
+    },
+    methods: {
+      getData(val, title) {
+        this.visible = true
+        this.title = title
+        if (title == this.$t('CurrentStatus')) {
+          val.remark = val.projectStatusAssessRemark || ''
+          val.conditionAssessment = val.projectStatusAssess || ''
+          if (val.roleCode == '2' || val.roleCode == '4' || val.roleCode == '1') {
+            this.disabled = false
+          } else {
+            if (val.roleCode == '0') {
+              this.getList(val)
+            }
+            this.disabled = true
+          }
+        } else {
+          if (val.roleCode == '2') {
+            this.disabled = false
+          } else {
+            this.disabled = true
+          }
+        }
+        this.formInline = val
+        this.$nextTick(() => {
+          this.$refs.ruleForm.clearValidate()
+        })
+      },
+      getList(val) {
+        getAction(this.url.list, { projectLawsInventoryId: val.projectLawsInventoryId }).then((res) => {
+          if (res.success) {
+            this.studioList = res.result || []
+          } else {
+            this.studioList = []
+          }
+        })
+      },
+      handleInput(value) {
+        this.$nextTick(() => {
+          this.formInline = { ...this.formInline }
+          this.$refs.ruleForm.validateField([value])
+        })
+      },
+      handleOk() {
+        if (this.disabled) {
+          this.visible = false
+          return
+        }
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            let query = {}
+            let url = ''
+            let Action
+            if (this.title == this.$t('CertificationProgress')) {
+              query = {
+                ...this.formInline
+                // id: this.formInline.id,
+                // certificationProgress: this.formInline.certificationProgress,
+                // certificationProgressRemark: this.formInline.certificationProgressRemark
+              }
+              url = this.url.edit
+              Action = putAction
+            } else {
+              query = {
+                roleCode: this.formInline.roleCode,
+                remark: this.formInline.remark,
+                conditionAssessment: this.formInline.conditionAssessment,
+                projectLawsInventoryId: this.formInline.projectLawsInventoryId
+              }
+              url = this.url.addOrUpdate
+              Action = postAction
+            }
+            this.confirmLoading = true
+            Action(url, query).then((res) => {
+              if (res.success) {
+                this.visible = false
+                this.confirmLoading = false
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.$emit('TaskListModelList')
+              } else {
+                this.$message.warning(this.$t('operationFailed'))
+                this.confirmLoading = false
+              }
+            })
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .title-text {
+    width: 134px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 42px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .headerText {
+    margin-left: 30px;
+    color: #040B29;
+    font-weight: 400;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/TaskParameterCollection.vue
new file mode 100644
index 000000000..103769c3c
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/TaskParameterCollection.vue
@@ -0,0 +1,663 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24" class='add-padding'>
+          <a-col :md="7" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('title')">
+                <span>{{$t('title')}}</span>
+              </div>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                       v-model="queryParam.title"></a-input>
+            </div>
+          </a-col>
+          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                  <a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+               </a-col>
+            </span>
+        </a-row>
+      </a-form>
+    </div>
+    <div class="table-operator">
+      <div @click="handleAdd" class="operator-text" v-has="'params:manifest:add'">
+        <a-icon type="plus"/>
+        {{$t('addDetailList')}}
+      </div>
+      <div @click="handleModule" class="operator-text" v-has="'params:manifest:change'">
+        <a-icon type="file-sync"/>
+        {{$t('changeExtension')}}
+      </div>
+      <div @click="handleCody" class="operator-text" v-has="'params:manifest:copy'">
+        <a-icon type="copy"/>
+        {{$t('copyParamDetailList')}}
+      </div>
+      <div @click="handleDel" class="operator-text" v-has="'params:manifest:deleteBatch'">
+        <a-icon type="delete"/>
+        {{$t('BatchDelete')}}
+      </div>
+    </div>
+    <div style="width: 100%">
+      <a-table
+        class='table-area'
+        ref='table'
+        size='middle'
+        rowKey='id'
+        :components="drag(columns,'columns')"
+        :columns='columns'
+        :dataSource='dataSource'
+        :pagination='false'
+        :loading='loading'
+        :scroll="{x: '100%',y:'calc(100vh - 320px)'}"
+        :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
+        @change='handleTableChange'>
+        <span slot="paramsManifestClick" slot-scope="text,record">
+          <a class="textName" :title="text" @click="paramsManifestClick(record)">
+            {{ text && text.length > 50 ? text.slice(0, 49) + '...' : text }}
+          </a>
+        </span>
+        <span slot="collectionCompletionTime" slot-scope="text,record">
+            <span class="textName" :title="record.finishTime">
+              {{record.finishTime ? record.finishTime : '-'}}
+            </span>
+        </span>
+        <span slot="operation" slot-scope="text,record">
+            <a class="text-operation" @click="configure(record)"
+               :disabled="record.isHistory == '1' ? true : false"
+               v-has="'params:config:list'">{{$t('configure')}}</a>
+            <a class="text-operation" @click="edit(record)"
+               :disabled="record.isHistory == '1' ? true : false"
+               v-has="'params:manifest:edit'">{{$t('edit')}}</a>
+            <a class="text-operation" @click="deleteLib(record)"
+               :disabled="record.isHistory == '1' ? true : false"
+               v-has="'params:manifest:delete'">{{$t('deleteLib')}}</a>
+<!--            <a class="text-operation" @click="historicalVersion(record)" v-has="'params:manifest:history'">{{$t('historicalVersion')}}</a>-->
+        </span>
+      </a-table>
+    </div>
+<!--    <div class="page">-->
+<!--      <a-pagination-->
+<!--        :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
+<!--        show-quick-jumper-->
+<!--        show-size-changer-->
+<!--        :page-size.sync="pageSize"-->
+<!--        :total="total"-->
+<!--        :current="pageNo"-->
+<!--        @change="pageOnChange"-->
+<!--        @showSizeChange="SizeChange"-->
+<!--      />-->
+<!--    </div>-->
+    <!--    参数模板-->
+    <a-drawer
+      :visible="areaVisible"
+      :maskClosable="false"
+      @close="handleCancel"
+      :title="areaTitle"
+      width='850px'
+      style="height: 100%;overflow: auto;padding-bottom: 53px;"
+      placement="right"
+      :footer="null">
+      <parameter-template-add :url='url' ref='templateRef' v-if='areaVisible' @areaVisible='handleCancel'
+                              :version='version'
+                              :projectId='this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id'>
+
+      </parameter-template-add>
+    </a-drawer>
+    <!--    配置-->
+    <configure ref="configureRef" :url='url' :itemId='itemId' :itemRow='itemRow'/>
+    <!--    历史版本-->
+    <a-modal v-model="historicalVisible" :title="$t('historicalVersion')" width='750px' :footer="null">
+      <historical-version v-if='historicalVisible' :historicalRow='historicalRow'></historical-version>
+    </a-modal>
+    <!--     复制参数模板-->
+    <a-drawer
+      class="show-drawer"
+      :maskClosable="false"
+      :visible="drawerVisible"
+      style="height: 100%;overflow: auto;padding-bottom: 53px;"
+      placement="right"
+      @close="drawerhandleCancel"
+      :title="$t('Copyparameterlist')"
+      width="850px"
+      :footer="null">
+      <project-collection-parameters v-if='drawerVisible' @areaVisible='drawerhandleCancel'
+                                     :templateTitle='templatetitle' @copysubmit='copysubmit'
+                                     :selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version' :url='url'
+                                     :projectId='this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id'>
+
+      </project-collection-parameters>
+    </a-drawer>
+  </a-card>
+</template>
+
+<script>
+  import ImportFile from '@/components/ImportFile/index'
+  import ParameterTemplateAdd from '../../dialog/ParameterTemplateAdd'
+  import ProjectCollectionParameters from '../../dialog/ProjectCollectionParameters'
+  import HistoricalVersion from '../../dialog/historicalVersion'
+  import { getAction, postAction } from '@/api/manage'
+  import Configure from '../../dialog/configure'
+  import axios from 'axios'
+  import Vue from 'vue'
+  import { ACCESS_TOKEN } from '@/store/mutation-types'
+  import eventBUs from '@/common/event'
+  import store from '@/store/'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+  export default {
+    name: 'TaskParameterCollection',
+    components: {
+      ImportFile,
+      ParameterTemplateAdd,
+      Configure,
+      HistoricalVersion,
+      ProjectCollectionParameters
+    },
+    mixins:[ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        columns: [
+          {
+            title: this.$t('title'),
+            align: 'left',
+            dataIndex: 'title',
+            width: 280,
+            scopedSlots: { customRender: 'paramsManifestClick' }
+          },
+          {
+            title: this.$t('status'),
+            align: 'left',
+            width: 100,
+            ellipsis: true,
+            sorter:true,
+            dataIndex: 'state'
+          },
+          {
+            title: this.$t('parameterTemplateName'),
+            align: 'left',
+            width: 200,
+            ellipsis: true,
+            dataIndex: 'paramsTemplateName'
+          },
+          {
+            title: this.$t('relatedProjectVersion'),
+            align: 'left',
+            width: 150,
+            ellipsis: true,
+            sorter:true,
+            dataIndex: 'projectVersion'
+          },
+          {
+            title: this.$t('collectionCompletionTime'),
+            align: 'left',
+            dataIndex: 'finishTime',
+            width: 200,
+            ellipsis: true,
+            sorter:true,
+            scopedSlots: { customRender: 'collectionCompletionTime' }
+          },
+          {
+            title: this.$t('Version'),
+            align: 'left',
+            width: 100,
+            ellipsis: true,
+            sorter:true,
+            dataIndex: 'version'
+          },
+          {
+            title: this.$t('creator'),
+            align: 'left',
+            width: 110,
+            ellipsis: true,
+            dataIndex: 'createBy'
+          },
+          {
+            title: this.$t('created'),
+            align: 'left',
+            width: 200,
+            ellipsis: true,
+            sorter:true,
+            dataIndex: 'createTime'
+          },
+          {
+            title: this.$t('operation'),
+            align: 'left',
+            fixed: 'right',
+            width: localStorage.getItem('language') == 'zh-cn' ? 170:210,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
+        token: Vue.ls.get(ACCESS_TOKEN),
+        selectedRowKeys: [],
+        queryParam: {},
+        orderBy: '1',
+        orderByField: '',
+        url: {
+          list: 'params/manifest/page',
+          add: 'params/manifest/add',
+          edit: 'params/manifest/edit',
+          queryById: 'params/manifest/queryById',
+          deleteBatch: 'params/manifest/delete',
+          deleteAll: 'params/manifest/deleteBatch',
+          conAdd: 'params/config/addBatch',
+          conList: 'params/config/list',
+          changeExtension: 'params/manifest/changeExtension',
+          verifyConfig: 'params/manifest/verifyConfig',
+          configurelist: 'params/manifest/getConfigFlag'
+        },
+        loading: false,
+        dataSource: [],
+        areaVisible: false, // 弹框的控制
+        configureareaVisible: false, // 配置的彈框
+        pageNo: 1,
+        pageSize: 10,
+        total: 0,
+        selectedRowKeysArray: '',
+        templatetitle: '',
+        templatetitleId: '',
+        areaTitle:'',
+        rowId: '',
+        version: 0,
+        itemId: '', // 配置id
+        itemRow: {}, // 配置一行数据
+        configFlag: '',
+        historicalVisible: false,
+        historicalRow: {}, // 历史版本得数据
+        drawerVisible: false,
+        drawerVisibleitem: false,
+        titleTag: '',
+        selectedRowKeysvalArray: []
+      }
+    },
+    created() {
+      if (store.getters.userInfo) {
+        this.$socketPublicOne.dispatch('webSocketInit')//初始化ws
+      }
+    },
+    watch: {
+      '$socketPublicOne.state.msg': {
+        //处理接收到的消息
+        handler: function(res) {
+          let that = this
+          if (res.data == '1') {
+            this.getlist()
+          }
+        }
+      }
+    },
+    mounted() {
+      this.getlist()
+    },
+    methods: {
+      paramsManifestClick(item) {
+        let _this = this
+        // 先调取接口判断是否有配置信息
+        if (item.isHistory == '1'){
+          item.projectName = this.$route.query.projectName
+          let newUrl = _this.$router.resolve({
+            path: '/ParameterItemCollection',
+            query: {it: item.id,
+              ...item
+            }
+            // projectName:this.$route.query.projectName
+          })
+          window.open(newUrl.href, '_blank')
+        }else{
+          getAction(this.url.verifyConfig, { paramsManifestId: item.id }).then((res) => {
+            if (res.result) {
+              // localStorage.setItem('paramsManifest', JSON.stringify(item))
+              item.projectName = this.$route.query.projectName
+              let newUrl = _this.$router.resolve({
+                path: '/ParameterItemCollection',
+                query: item
+                // projectName:this.$route.query.projectName
+              })
+              window.open(newUrl.href, '_blank')
+            } else {
+              _this.$message.warning(_this.$t('NoConfigurationNotStart'))
+            }
+          })
+        }
+      },
+      deleteLib(val) {
+        if (val.state === '已完成' || val.state === 'Finished' || val.state === '未收集' || val.state === 'Uncollected') {
+          let _this = this
+          this.$confirm({
+            content: _this.$t('ConfirmDelete'),
+            onOk() {
+              getAction(_this.url.deleteBatch, { id: val.id }).then((res) => {
+                if (res.success) {
+                  _this.$message.success(_this.$t('OperationSuccessful'))
+                  _this.getlist()
+                } else {
+                  _this.$message.warning(_this.$t('operationFailed'))
+                }
+              })
+            }
+          })
+        } else {
+          this.$message.warning(this.$t('thisbuttonCompleted'))
+        }
+      },
+      // 历史版本
+      historicalVersion(historicalRow) {
+        this.historicalVisible = true
+        this.historicalRow = historicalRow
+      },
+      // 配置
+      configure(item) {
+        this.itemId = item.id
+        this.itemRow = item
+        this.$refs.configureRef.addModel(item.id, item)
+      },
+      handleCancel(val) {
+        this.areaVisible = false
+        this.getlist()
+      },
+      // 项目收集参数
+      drawerhandleCancel(val) {
+        this.drawerVisible = false
+      },
+      copysubmit() {
+        this.drawerVisible = false
+        this.getlist()
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.getlist()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.pageNo = 1
+        this.getlist()
+      },
+      onSelectChange(val, valArray) {
+        this.selectedRowKeys = val
+        this.selectedRowKeysArray = val.join(',')
+        this.selectedRowKeysvalArray = valArray
+      },
+      edit(edit) {
+        this.areaVisible = true
+        this.areaTitle = this.$t('editDetailList')
+        setTimeout(() => {
+          this.$refs.templateRef.editData(edit,1)
+        }, 50)
+      },
+      handleAdd() {
+        this.areaTitle = this.$t('addDetailList')
+        this.areaVisible = true
+      },
+      // 变更扩展
+      handleModule() {
+        let _this = this
+        if (this.selectedRowKeys.length == 0) {
+          this.$message.warning(_this.$t('pleaseSelectData'))
+        } else if (this.selectedRowKeys.length > 1) {
+          this.$message.warning(_this.$t('OnlyOneSelected'))
+        } else if (this.selectedRowKeysvalArray[0].state === '已完成' || this.selectedRowKeysvalArray[0].state === 'Finished') {
+          getAction(_this.url.changeExtension, { id: this.selectedRowKeys[0] }).then((res) => {
+            if (res.success) {
+              _this.$message.success(_this.$t('OperationSuccessful'))
+              _this.getlist()
+            } else {
+              _this.$message.warning(res.message)
+              this.selectedRowKeys = []
+            }
+          })
+        } else {
+          this.$message.warning(_this.$t('thisbuttonCompleted'))
+        }
+      },
+      handleDel() {
+        // 默认为0  可全部删除
+        let flag = 1
+        this.selectedRowKeysvalArray.forEach((item) => {
+          if (item.state !== '已完成' && item.state !== 'Finished' && item.state !== '未收集' && item.state !== 'Uncollected') {
+            flag = 0
+          }
+        })
+        if (flag) {
+          let param = {
+            ids: this.selectedRowKeys.join(',')
+          }
+          if (this.selectedRowKeys.length > 0) {
+            let _this = this
+            this.$confirm({
+              content: _this.$t('ConfirmBatchDeletion'),
+              onOk() {
+                postAction(_this.url.deleteAll, param).then((res) => {
+                  if (res.success) {
+                    _this.$message.success(_this.$t('OperationSuccessful'))
+                    _this.getlist()
+                  } else {
+                    _this.$message.warning(_this.$t('operationFailed'))
+                    this.selectedRowKeys = []
+                  }
+                })
+              }
+            })
+          } else {
+            this.$message.warning(this.$t('selectLeastOne'))
+          }
+        } else {
+          this.$message.warning(this.$t('thisbuttonCompleted'))
+        }
+      },
+      handleCody() {
+        this.drawerVisible = true
+      },
+      pageOnChange(page, pageSize) {
+        this.pageNo = page
+        this.getlist()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getlist()
+      },
+      handleTableChange(pagination, filters, sorter) {
+        this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+        if(sorter.columnKey == 'projectVersion'){
+          this.orderByField = 'project_version'
+        } else if(sorter.columnKey == 'finishTime') {
+          this.orderByField = 'finish_time'
+        } else if(sorter.columnKey == 'createTime') {
+          this.orderByField = 'create_time'
+        } else{
+          this.orderByField = sorter.columnKey
+        }
+        this.getlist()
+      },
+      getlist() {
+        this.selectedRowKeys = []
+        let query = {
+          projectId: this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id,
+          // pageSize: this.pageSize,
+          // pageNo: this.pageNo,
+          orderBy: this.orderBy,
+          orderByField: this.orderByField,
+          ...this.queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = res.result.current - 1
+              this.getlist()
+              return
+            }
+            this.total = res.result.total
+            this.dataSource = res.result.records || []
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
+
+  /*/deep/ .ant-table td {*/
+  /*  white-space: normal;*/
+  /*}*/
+
+  .doc-detail {
+    background: #fff;
+    height: 100%;
+
+    .Virtual-detail-header {
+      width: 100%;
+      height: 68px;
+      line-height: 68px;
+      padding: 0 32px 0 32px;
+      box-sizing: border-box;
+      display: flex;
+      justify-content: space-between;
+      border-bottom: 2px #eff1f3 solid;
+      background: #fff;
+
+      .Virtual-detail-title {
+        display: inline-block;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        font-size: 20px;
+        font-weight: 400;
+        color: #040B29;
+        line-height: 68px;
+      }
+
+      .doc-detail-right {
+        width: 800px;
+        line-height: 68px;
+        display: flex;
+      }
+    }
+
+    .Virtual-detail-content {
+      padding: 0 38px 0 38px;
+      box-sizing: border-box;
+      font-size: 16px;
+
+      .box-title-text-add {
+        line-height: 1.4;
+      }
+
+      .title-text-add {
+        display: inline-block;
+        font-weight: 500;
+        margin-right: 16px;
+        height: 42px;
+        line-height: 42px;
+      }
+    }
+  }
+
+  .header-text {
+    font-size: 16px;
+    font-weight: 400;
+    height: 60px;
+    color: #000F16;
+    line-height: 40px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .operator-text-left {
+    font-size: 14px;
+    margin-right: 20px;
+    background: #eff1f3;
+    padding: 8px 8px;
+    cursor: pointer;
+    border-radius: 4px;
+  }
+
+  ///deep/ .add-padding {
+  //  margin-left: -89px !important;
+  //}
+
+  .textName {
+    width: 100%;
+    overflow: hidden;
+    display: -webkit-box;
+    text-overflow: ellipsis;
+    /*! autoprefixer: off */
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    /*! autoprefixer: on;*/
+    text-justify: inter-ideograph;
+    word-break: break-all
+  }
+
+  ::v-deep .ant-table-row:first-child {
+    background: #fff !important;
+    opacity: 0.95;
+  }
+
+  ::v-deep .ant-table-body {
+    background: transparent !important;
+  }
+
+  ///deep/.ant-table-thead > tr > th {
+  //  font-weight: bolder;
+  //}
+
+  ///deep/.ant-table-tbody > tr > td {
+  //  color: #040B29 ;
+  //}
+</style>
+<style>
+  .box-input .ant-select-selection {
+    height: 38px !important;
+  }
+
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
new file mode 100644
index 000000000..daf5a259c
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
@@ -0,0 +1,630 @@
+<!--平台件-->
+<template>
+  <a-drawer
+    :title="title"
+    :maskClosable="false"
+    :width="1000"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <a-spin :spinning="confirmLoading">
+      <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('entryName')">{{$t('entryName')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="entryName">
+                <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('entryName')"
+                         v-model="formInline.projectName"></a-input>
+<!--                <a-select :placeholder="$t('PleaseSelect')+$t('modelName')"-->
+<!--                          @change="projectNameChange"-->
+<!--                          v-model="formInline.projectNameId">-->
+<!--                  <a-select-option v-for="(item, key) in projectNameList"-->
+<!--                                   :key="key"-->
+<!--                                   :value="item.id">-->
+<!--                     <span style="display: inline-block;width: 100%" :title=" item.projectName ">-->
+<!--                           {{ item.projectName}}-->
+<!--                     </span>-->
+<!--                  </a-select-option>-->
+<!--                </a-select>-->
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('brand')">{{$t('brand')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="brand">
+                <j-dict-select-tag class="box-input" v-model="formInline.targetMarket"
+                                   :placeholder="$t('PleaseSelect')+$t('brand')"
+                                   :type="'select'"
+                                   :triggerChange="false" :dictCode="'brand'"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
+              </div>
+              <a-form-model-item class="itemModel-multi" prop="configurationItem">
+                <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('configurationItem')"
+                         v-model="formInline.configurationItem"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('explain')">{{$t('explain')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="explanation">
+                <a-textarea :placeholder="$t('pleaseEnter')+$t('explain')"
+                            v-model="formInline.explanation"
+                            :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+<!--        <a-row :gutter="24">-->
+<!--          <a-col :span="12">-->
+<!--            <div class="box-title-text">-->
+<!--              <div class="title-text">-->
+<!--                <span class="Required">*</span>-->
+<!--                <span class="title-text-text" :title="$t('projectStatus')">{{$t('projectStatus')}}</span>-->
+<!--              </div>-->
+<!--              <a-form-model-item class="itemModel" prop="projectStatus">-->
+<!--                <j-dict-select-tag class="box-input" v-model="formInline.projectStatus"-->
+<!--                                   :disabled="disabled"-->
+<!--                                   @input="handleInput('projectStatus')"-->
+<!--                                   :placeholder="$t('PleaseSelect')+$t('projectStatus')"-->
+<!--                                   :type="'select'"-->
+<!--                                   :triggerChange="false" :dictCode="'project_status'"/>-->
+<!--              </a-form-model-item>-->
+<!--            </div>-->
+<!--          </a-col>-->
+<!--          <a-col :span="12">-->
+<!--            <div class="box-title-text">-->
+<!--              <div class="title-text">-->
+<!--                <span class="title-text-text"-->
+<!--                      :title="$t('brand')">{{$t('brand')}}</span>-->
+<!--              </div>-->
+<!--              <a-form-model-item class="itemModel" :prop="'brand'">-->
+<!--                <j-dict-select-tag v-model="formInline.brand"-->
+<!--                                   :placeholder="$t('PleaseSelect')+$t('brand')"-->
+<!--                                   :type="'select'"-->
+<!--                                   :triggerChange="false" :dictCode="'brand'"/>-->
+<!--              </a-form-model-item>-->
+<!--            </div>-->
+<!--          </a-col>-->
+<!--        </a-row>-->
+<!--        <a-row :gutter="24">-->
+<!--          <a-col :span="12">-->
+<!--            <div class="box-title-text">-->
+<!--              <div class="title-text">-->
+<!--                <span class="Required">*</span>-->
+<!--                <span class="title-text-text" :title="$t('StudioEngineer')">{{$t('StudioEngineer')}}</span>-->
+<!--              </div>-->
+<!--              <a-form-model-item class="itemModel-multi" :prop="'studioEngineerName'">-->
+<!--                <PersonnelSelection :query="{db_field_name:'studioEngineer',db_field_txt:$t('StudioEngineer')}"-->
+<!--                                    :isSingleChoice="true"-->
+<!--                                    :personneQuery="formInline"-->
+<!--                                    v-if="visible"-->
+<!--                                    @change="PersonnelSelectionChange"-->
+<!--                                    :disabled="disabled"-->
+<!--                                    v-model="formInline.studioEngineerName"/>-->
+<!--              </a-form-model-item>-->
+<!--            </div>-->
+<!--          </a-col>-->
+<!--          <a-col :span="12">-->
+<!--            <div class="box-title-text">-->
+<!--              <div class="title-text">-->
+<!--                <span class="title-text-text" :title="$t('certifiedEngineer')">{{$t('certifiedEngineer')}}</span>-->
+<!--              </div>-->
+<!--              <a-form-model-item class="itemModel-multi" :prop="'certificationEngineerName'">-->
+<!--                <PersonnelSelection-->
+<!--                  :query="{db_field_name:'certificationEngineer',db_field_txt:$t('certifiedEngineer')}"-->
+<!--                  :personneQuery="formInline"-->
+<!--                  v-if="visible"-->
+<!--                  @change="PersonnelSelectionChange"-->
+<!--                  :disabled="disabled"-->
+<!--                  v-model="formInline.certificationEngineerName"/>-->
+<!--              </a-form-model-item>-->
+<!--            </div>-->
+<!--          </a-col>-->
+<!--        </a-row>-->
+<!--        <a-row :gutter="24">-->
+<!--          <a-col :span="12">-->
+<!--            <div class="box-title-text">-->
+<!--              <div class="title-text">-->
+<!--                <span class="title-text-text" :title="$t('DigitalPlatform')">{{$t('DigitalPlatform')}}</span>-->
+<!--              </div>-->
+<!--              <a-form-model-item class="itemModel" :prop="'digitalPlatform'">-->
+<!--                <a-input class="box-input"-->
+<!--                         :disabled="disabled"-->
+<!--                         v-model="formInline.digitalPlatform"-->
+<!--                         :placeholder="$t('PleaseEnter')+$t('DigitalPlatform')"/>-->
+<!--              </a-form-model-item>-->
+<!--            </div>-->
+<!--          </a-col>-->
+<!--          <a-col :span="12">-->
+<!--            <div class="box-title-text">-->
+<!--              <div class="title-text">-->
+<!--                <span class="title-text-text" :title="$t('ModelPlatform')">{{$t('ModelPlatform')}}</span>-->
+<!--              </div>-->
+<!--              <a-form-model-item class="itemModel" prop="vehiclePlatform">-->
+<!--                <a-input class="box-input"-->
+<!--                         :disabled="disabled"-->
+<!--                         v-model="formInline.vehiclePlatform"-->
+<!--                         :placeholder="$t('PleaseEnter')+$t('ModelPlatform')"/>-->
+<!--              </a-form-model-item>-->
+<!--            </div>-->
+<!--          </a-col>-->
+<!--        </a-row>-->
+<!--        <a-row :gutter="24">-->
+<!--          <a-col :span="12">-->
+<!--            <div class="box-title-text">-->
+<!--              <div class="title-text">-->
+<!--                <span class="title-text-text"-->
+<!--                      :title="$t('softwareVersion')">{{$t('softwareVersion')}}</span>-->
+<!--              </div>-->
+<!--              <a-form-model-item class="itemModel" :prop="'softwareVersion'">-->
+<!--                <a-input class="box-input"-->
+<!--                         :disabled="disabled"-->
+<!--                         v-model="formInline.softwareVersion"-->
+<!--                         :placeholder="$t('PleaseEnter')+$t('softwareVersion')"/>-->
+<!--              </a-form-model-item>-->
+<!--            </div>-->
+<!--          </a-col>-->
+<!--          <a-col :span="12">-->
+<!--            <div class="box-title-text">-->
+<!--              <div class="title-text">-->
+<!--                <span class="title-text-text"-->
+<!--                      :title="$t('dehicleDevelopmentPlan')">{{$t('dehicleDevelopmentPlan')}}</span>-->
+<!--              </div>-->
+<!--              <a-form-model-item class="itemModel" :prop="'vehicleDevelopmentPlan'">-->
+<!--                <a-input class="box-input"-->
+<!--                         :disabled="disabled"-->
+<!--                         v-model="formInline.vehicleDevelopmentPlan"-->
+<!--                         :placeholder="$t('PleaseEnter')+$t('dehicleDevelopmentPlan')"/>-->
+<!--              </a-form-model-item>-->
+<!--            </div>-->
+<!--          </a-col>-->
+
+<!--        </a-row>-->
+<!--        <a-row :gutter="24">-->
+<!--          <a-col :span="12">-->
+<!--            <div class="box-title-text">-->
+<!--              <div class="title-text">-->
+<!--                <span class="title-text-text" :title="$t('certificationProgram')">{{$t('certificationProgram')}}</span>-->
+<!--              </div>-->
+<!--              <a-form-model-item class="itemModel" prop="attestationPlan">-->
+<!--                <a-input class="box-input"-->
+<!--                         :disabled="disabled"-->
+<!--                         v-model="formInline.attestationPlan"-->
+<!--                         :placeholder="$t('PleaseEnter')+$t('certificationProgram')"/>-->
+<!--              </a-form-model-item>-->
+<!--            </div>-->
+<!--          </a-col>-->
+<!--          <a-col :span="12">-->
+<!--            <div class="box-title-text">-->
+<!--              <div class="title-text">-->
+<!--                <span class="title-text-text"-->
+<!--                      :title="$t('configurationInformation')">{{$t('configurationInformation')}}</span>-->
+<!--              </div>-->
+<!--              <a-form-model-item class="itemModel" prop="ipdInfo">-->
+<!--                <a-input class="box-input"-->
+<!--                         :disabled="disabled"-->
+<!--                         v-model="formInline.ipdInfo"-->
+<!--                         :placeholder="$t('PleaseEnter')+$t('configurationInformation')"/>-->
+<!--              </a-form-model-item>-->
+<!--            </div>-->
+<!--            &lt;!&ndash;            ^(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&amp;%\$#_]*)?$-->
+<!--            &ndash;&gt;-->
+<!--          </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('explain')">{{$t('explain')}}</span>-->
+<!--              </div>-->
+<!--              <a-form-model-item class="itemModel" prop="explanation">-->
+<!--                <a-textarea :placeholder="$t('pleaseEnter')+$t('explain')"-->
+<!--                            v-model="formInline.explanation"-->
+<!--                            :rows="4"/>-->
+<!--              </a-form-model-item>-->
+<!--            </div>-->
+<!--          </a-col>-->
+<!--        </a-row>-->
+      </a-form-model>
+    </a-spin>
+    <div class="drawer-bootom-button">
+      <a-button style="margin-right: 8px" @click="handleCancel">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
+  import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
+  import { mapGetters } from 'vuex'
+
+  export default {
+    name: 'addModel',
+    components: {
+      PersonnelSelection
+    },
+    props: ['url'],
+    data() {
+      return {
+        formInline: {},
+        confirmLoading: false,
+        visible: false,
+        yearNameDataList: [],
+        rules: {
+          ipdInfo: [
+            {
+              pattern: /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&amp;%$#_]*)?/,
+              message: this.$t('pleaseEnterTheCorrectWebAddress')
+            },
+            {
+              max: 300,
+              message: this.$t('configurationInformation') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          vehicleDevelopmentPlan: [
+            {
+              pattern: /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&amp;%$#_]*)?/,
+              message: this.$t('pleaseEnterTheCorrectWebAddress')
+            },
+            {
+              max: 300,
+              message: this.$t('dehicleDevelopmentPlan') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          explanation: [
+            {
+              max: 500,
+              message: this.$t('explain') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          attestationPlan: [
+            {
+              pattern: /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&amp;%$#_]*)?/,
+              message: this.$t('pleaseEnterTheCorrectWebAddress')
+            },
+            {
+              max: 300,
+              message: this.$t('certificationProgram') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          vehiclePlatform: [
+            {
+              max: 100,
+              message: this.$t('ModelPlatform') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          projectVersion:[
+            {
+              required: true,
+              message: this.$t('projectVersion') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            }
+          ],
+          digitalPlatform: [
+            {
+              max: 100,
+              message: this.$t('DigitalPlatform') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          softwareVersion: [
+            {
+              max: 300,
+              message: this.$t('softwareVersion') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          projectNameId: [
+            {
+              required: true,
+              message: this.$t('entryName') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          yearNameId: [
+            {
+              required: true,
+              message: this.$t('modelYear') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          targetMarket: [
+            {
+              required: true,
+              message: this.$t('targetMarket') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          projectStatus: [
+            {
+              required: true,
+              message: this.$t('projectStatus') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          studioEngineerName: [
+            {
+              required: true,
+              message: this.$t('StudioEngineer') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            },
+            {
+              max: 100,
+              message: this.$t('StudioEngineer') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              trigger: 'change'
+            }
+          ],
+          certificationEngineerName: [
+            {
+              max: 100,
+              message: this.$t('certifiedEngineer') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              trigger: 'change'
+            }
+          ]
+        },
+        disabled: false,
+        projectNameList: [],
+        title: ''
+      }
+    },
+    mounted() {
+      this.getNameList()
+    },
+    methods: {
+      ...mapGetters(['userInfo']),
+      getNameList(value) {
+        getAction('project/projectNameInfoEO/list', {}).then((res) => {
+          if (res.success) {
+            this.projectNameList = res.result || []
+            if (this.title == this.$t('edit')) {
+              let content = this.projectNameList.filter(res => {
+                return res.id == value.projectNameId
+              })
+              this.yearNameDataList = content[0].yearNameDataList || []
+              this.formInline = value
+              this.formInline = { ...this.formInline }
+            }
+          } else {
+            this.projectNameList = []
+          }
+        })
+      },
+      addModel() {
+        this.visible = true
+        this.title = this.$t('add')
+        this.formInline = {}
+        this.getNameList()
+        this.formInline.studioEngineerName = this.userInfo().username
+        this.formInline.studioEngineer = this.userInfo().id
+        this.formInline.projectVersion = '00'
+        this.formInline = { ...this.formInline }
+        this.$nextTick(() => {
+          this.$refs.ruleForm.clearValidate()
+        })
+      },
+      editModel(value) {
+        this.visible = true
+        this.title = this.$t('edit')
+        this.getNameList(value)
+        this.$nextTick(() => {
+          this.$refs.ruleForm.clearValidate()
+        })
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      handleSubmit() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            let url = ''
+            let Action
+            if (this.formInline.id) {
+              url = this.url.edit
+              Action = putAction
+            } else {
+              url = this.url.add
+              Action = postAction
+            }
+            let query = JSON.parse(JSON.stringify(this.formInline))
+            Object.keys(query).forEach(res => {
+              if (query[res] && query[res] instanceof Array) {
+                query[res] = query[res].join(',')
+              }
+            })
+            this.confirmLoading = true
+            Action(url, query).then((res) => {
+              if (res.success) {
+                this.confirmLoading = false
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.visible = false
+                this.$emit('addModelList')
+                // this.vdrClick()
+              } else {
+                this.$message.warning(res.message)
+                this.confirmLoading = false
+              }
+            })
+          }
+        })
+      },
+      // 跳转vdr
+      // vdrClick(){
+      //   let _this = this
+      //   this.$confirm({
+      //     content: _this.$t('Rematchornot') + 'VDR',
+      //     onOk() {
+      //       let newUrl = _this.$router.resolve({
+      //         path:'otaAuthentication',
+      //       })
+      //       window.open(newUrl.href, '_blank')
+      //     }
+      //   })
+      // },
+      handleInput(value) {
+        this.$nextTick(() => {
+          this.formInline = { ...this.formInline }
+          this.$refs.ruleForm.validateField([value])
+        })
+      },
+      PersonnelSelectionChange(value, id) {
+        this.formInline[value] = id
+        this.formInline = { ...this.formInline }
+      },
+      projectNameChange(value) {
+        this.formInline.yearNameId = undefined
+        let content = this.projectNameList.filter(res => {
+          return res.id == value
+        })
+        this.formInline.vehiclePlatform = content[0].vehiclePlatform || ''
+        this.yearNameDataList = content[0].yearNameDataList || []
+        this.formInline.digitalPlatform = content[0].digitalPlatform || ''
+        this.formInline = { ...this.formInline }
+      }
+    }
+  }
+</script>
+<style>
+  .formAdd .ant-form-item-label {
+    width: 130px;
+  }
+
+  .formAdd .ant-form-item-control-wrapper {
+    display: inline-block;
+    width: 100%;
+  }
+
+  /*.formAdd .ant-form-item {*/
+  /*  margin-bottom: 20px;*/
+  /*}*/
+
+  .itemModel .ant-form-item-control-wrapper {
+    width: 100%;
+  }
+
+  .box-input .ant-select-selection--single {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple .ant-select-selection__rendered > ul > li {
+    margin-top: 6px;
+  }
+
+  .box-input .ant-calendar-picker {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-calendar-picker-input {
+    height: 38px;
+  }
+
+  .box-input .ant-input-number-input-wrap {
+    line-height: 38px;
+    height: 38px;
+  }
+</style>
+<style scoped>
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    /*align-items: center;*/
+  }
+
+  .title-text {
+    width: 114px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 48px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+    height: 40px;
+    margin-bottom: 24px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+
+  .formAdd {
+    margin-bottom: 40px;
+  }
+
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    z-index: 100;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
+<style>
+  .ant-input-disabled {
+    color: rgba(0, 0, 0, 0.65) !important;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue
new file mode 100644
index 000000000..0bdd14ac0
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue
@@ -0,0 +1,778 @@
+<template>
+  <div>
+    <a-drawer
+      :title="title"
+      :maskClosable="false"
+      :width="900"
+      placement="right"
+      :closable="true"
+      @close="handleCancel"
+      :visible="visible"
+      style="height: 100%;overflow: auto;padding-bottom: 53px;">
+      <a-spin :spinning="confirmLoading">
+        <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text"
+                        :title="$t('title')">{{$t('title')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="title">
+                  <a-input class="box-input"
+                           v-model='formInline.title'
+                           :disabled="disabled"
+                           :placeholder="$t('PleaseEnter')+$t('title')"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text"
+                        :title="$t('problemType')">{{$t('problemType')}}</span>
+                </div>
+                <a-form-model-item class="itemModel-multi" prop="problemType">
+                  <j-dict-select-tag class="box-input" v-model="formInline.problemType"
+                                     :placeholder="$t('PleaseSelect')+$t('problemType')"
+                                     :type="'select'"
+                                     :triggerChange="false" :dictCode="'wen4_ti2_lei4_xing2'"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <!--                  <span class="Required">*</span>-->
+                  <span class="title-text-text"
+                        :title="'PS-issue'">{{'PS-issue'}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="issue">
+                  <a-input class="box-input"
+                           v-model='formInline.psIssue'
+                           :disabled="disabled"
+                           :placeholder="$t('PleaseEnter')+'PS-issue'"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <!--                  <span class="Required">*</span>-->
+                  <span class="title-text-text"
+                        :title="$t('Relevantlawsregulations')">{{$t('Relevantlawsregulations')}}</span>
+                </div>
+                <a-form-model-item class="itemModel-multi" prop="creator">
+                  <Standardselection
+                    :query="{'db_field_txt':$t('Relevantlawsregulations')}"
+                    :standard="formInline"
+                    :disabled="false"
+                    @input="Standardselectioninput"
+                    @change="StandardselectionChange"
+                    v-model="formInline.lawsName"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <!--                  <span class="Required">*</span>-->
+                  <span class="title-text-text"
+                        :title="$t('RelatedItems')">{{$t('RelatedItems')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="contentTemplate">
+                  <a-select allowClear
+                            class="box-input"
+                            v-model="formInline.projectId"
+                            :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                            showSearch
+                            mode="multiple"
+                            optionFilterProp="label"
+                            :autoClearSearchValue="false"
+                            :placeholder="$t('PleaseSelect')+$t('RelatedItems')">
+                    <a-select-option v-for="(item, key) in projectNameList"
+                                     :key="key"
+                                     :label="item.projectName"
+                                     :value="item.id">
+                     <span style="display: inline-block;width: 100%" :title=" item.projectName ">
+                           {{ item.projectName}}
+                     </span>
+                    </a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <!--                  <span class="Required">*</span>-->
+                  <span class="title-text-text"
+                        :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
+                </div>
+                <a-form-model-item class="itemModel-multi" prop="creator">
+                  <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
+                            allowClear
+                            show-search
+                            mode="multiple"
+                            class="box-input-search"
+                            optionFilterProp="label"
+                            :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                            v-model="formInline.dutyTerritory">
+                    <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
+                                     :key="key"
+                                     :label="item.key"
+                                     :value="item.key">
+                               <span style="display: inline-block;width: 100%" :title=" item.key ">
+                                     {{ item.key }}
+                               </span>
+                    </a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <!--                  <span class="Required">*</span>-->
+                  <span class="title-text-text"
+                        :title="$t('Problemstate')">{{$t('Problemstate')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="contentTemplate">
+                  <a-select allowClear
+                            class="box-input"
+                            v-model="formInline.problemState"
+                            :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                            showSearch
+                            optionFilterProp="label"
+                            :autoClearSearchValue="false"
+                            :placeholder="$t('PleaseSelect')+$t('Problemstate')">
+                    <a-select-option v-for="(item, key) in ProblemstateList"
+                                     :label='item'
+                                     :key="key"
+                                     :value="item">
+                  <span style="display: inline-block;width: 100%" :title=" item">
+                    {{ item }}
+                  </span>
+                    </a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <!--                  <span class="Required">*</span>-->
+                  <span class="title-text-text"
+                        :title="$t('descriptions')">{{$t('descriptions')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="descriptions">
+                  <a-input class="box-input"
+                           v-model='formInline.description'
+                           :disabled="disabled"
+                           :placeholder="$t('PleaseEnter')+$t('descriptions')"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <!--                  <span class="Required">*</span>-->
+                  <span class="title-text-text"
+                        :title="$t('documents')">{{$t('documents')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="fileLink">
+                  <div v-for="(item,index) in formInline.fileLinkList" :key="index">
+                    <a-input class="box-input"
+                             style='width: 88%'
+                             v-model='item.fileLink'
+                             :disabled="disabled"
+                             :placeholder="$t('PleaseEnter')+$t('Addresslink')"/>
+                    <a-icon class="icon-text" @click="addClick(index)" style='margin-left: 10px;font-size: 18px;'
+                            v-if="formInline.fileLinkList.length - 1 == index"
+                            type="plus"/>
+                    <a-icon class="icon-text" v-if="formInline.fileLinkList.length > 1 && formInline.fileLinkList.length - 1 !== index" style='margin-left: 10px;font-size: 18px;'
+                            @click="deleteClick(index)"
+                            type="minus"/>
+                  </div>
+                  <a-button type="primary" class="button-text"
+                            @click="clickButtonToUpload('file')">
+                    {{ (formInline.file === 'null' || formInline.file === '' ||
+                    formInline.file == null) ? $t('Fileupload') : $t('viewUploadedFiles')
+                    }}
+                  </a-button>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <!--                  <span class="Required">*</span>-->
+                  <span class="title-text-text"
+                        :title="$t('progresstracking')">{{$t('progresstracking')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="progresstracking">
+                  <div v-for="(item,index) in formInline.progressTrackingList" :key="index">
+                    <!--                    <span>{{item}}</span>-->
+                    <a-input class="box-input"
+                             style='width: 88%'
+                             v-model='item.progressTracking'
+                             :disabled="true"
+                             :title='item.progressTracking'
+                             :placeholder="$t('PleaseEnter')+$t('progresstracking')"/>
+                    <a @click="addprogresstrackingClick(index)" style='margin-left: 10px' v-if="formInline.progressTrackingList.length - 1 == index">{{$t('newlyAdded')}}</a>
+                    <a @click="deleteprogresstrackingClick(index,item)" v-if="formInline.progressTrackingList.length > 0" :disabled="disabled" style='margin-left: 10px' >{{$t('delete')}}</a>
+                  </div>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <!--                  <span class="Required">*</span>-->
+                  <span class="title-text-text"
+                        :title="$t('conculsion')">{{$t('conculsion')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="conclusion">
+                  <a-input class="box-input"
+                           v-model='formInline.conclusion'
+                           :disabled="disabled"
+                           :placeholder="$t('PleaseEnter')+$t('conculsion')"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <!--                  <span class="Required">*</span>-->
+                  <span class="title-text-text"
+                        :title="$t('examineapproveevidence')">{{$t('examineapproveevidence')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="approvalEvidenceLink">
+                  <div v-for="(item,index) in formInline.approvalEvidenceLinkList" :key="index">
+                    <a-input class="box-input"
+                             style='width: 88%'
+                             v-model='item.approvalEvidenceLink'
+                             :disabled="disabled"
+                             :placeholder="$t('PleaseEnter')+$t('Addresslink')"/>
+                    <a-icon class="icon-text" @click="addvidenceClick(index)" style='margin-left: 10px;font-size: 18px;'
+                            v-if="formInline.approvalEvidenceLinkList.length - 1 == index"
+                            type="plus"/>
+                    <a-icon class="icon-text" v-if="formInline.approvalEvidenceLinkList.length > 1 && formInline.approvalEvidenceLinkList.length - 1 !== index"
+                            style='margin-left: 10px;font-size: 18px;' @click="deletevidenceClick(index)"
+                            type="minus"  :disabled="disabled"/>
+                  </div>
+                  <a-button type="primary" class="button-text"
+                            @click="clickButtonToUpload('approvalEvidence')">
+                    {{ (formInline.approvalEvidence === 'null' || formInline.approvalEvidence === '' ||
+                    formInline.approvalEvidence == null) ? $t('Fileupload') : $t('viewUploadedFiles')
+                    }}
+                  </a-button>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+        </a-form-model>
+      </a-spin>
+      <div class="drawer-bootom-button">
+        <a-button style="margin-right:  8px" @click="handleCancel">{{$t('cancel')}}</a-button>
+        <a-button @click="handleSubmit" v-if="!disabled" type="primary" :loading="confirmLoading">{{$t('submit')}}
+        </a-button>
+      </div>
+    </a-drawer>
+    <!--    <addModel ref="addModelRef" @addModelForm="addModelForm"/>-->
+    <a-modal
+      :title="$t('progresstracking')"
+      :width="600"
+      :visible="visibletrack"
+      :confirm-loading="confirmLoading"
+      :maskClosable="false"
+      @ok="handleOk"
+      @cancel="Cancel"
+    >
+      <a-form-model :model="formInlinetracking" class="formAdd" :rules="rulestracking" ref="ruleFormtracking">
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('progresstracking')">
+                {{$t('progresstracking')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="progressTracking">
+                <a-textarea :placeholder="$t('pleaseEnter')+$t('progresstracking')"
+                            v-model="formInlinetracking.progressTracking"
+                            style="width: 90%"
+                            :maxLength="500"
+                            :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-modal>
+    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
+  </div>
+</template>
+
+<script>
+// import defaultTemplate from './defaultTemplate'
+// import solicitOpinions from './solicitOpinions'
+// import releaseStandard from './releaseStandard'
+// import industryTemplate from './industryTemplate'
+// import addModel from './a/ddModel'
+import Standardselection from '@/components/Standardselection/index'
+import uploadFile from '@/components/uploadFile/file'
+import { getAction, postAction,putAction, downloadFile } from '@/api/manage'
+import moment from 'moment'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'fillAdd',
+  components: {
+    // defaultTemplate,
+    // solicitOpinions,
+    // releaseStandard,
+    // industryTemplate,
+    // addModel
+    Standardselection,
+    uploadFile,
+  },
+  data() {
+    return {
+      rules: {
+        title: [
+          {
+            required: true,
+            message: this.$t('title') + this.$t('cannotEmpty'),
+            trigger: 'blur'
+          }
+        ],
+        problemType: [
+          {
+            required: true,
+            message: this.$t('problemType') + this.$t('cannotEmpty'),
+            trigger: 'change'
+          }
+        ],
+      },
+      visible: false,
+      visibletrack: false,
+      rulestracking:{
+        progressTracking: [
+          {
+            required: true,
+            message: this.$t('text') + this.$t('cannotEmpty'),
+            trigger: 'blur'
+          }
+        ]
+      },
+      formInline: {
+        fileLinkList:[{}],
+        progressTrackingList:[{}],
+        approvalEvidenceLinkList:[{}],
+        dutyTerritory:undefined,
+        projectId:undefined,
+        problemState:undefined,
+      },
+      formInlinetracking:{},
+      confirmLoading: false,
+      title: '',
+      disabled: false,
+      isTrue: false,
+      chapterContentsList: [],
+      firstLevelDutyTerritoryList:[],
+      projectNameList: [],
+      ProblemstateList:[this.$t('red'),this.$t('yellow'),this.$t('green'),],
+      templateDisabled: false,
+      contentTemplateList: [
+        {
+          id: '1',
+          text: this.$t('defaultTemplate')
+        },
+        {
+          id: '2',
+          text: this.$t('newRequestCommentListTemplate')
+        },
+        {
+          id: '3',
+          text: this.$t('NewReleasedStandardTemplate')
+        },
+        {
+          id: '4',
+          text: this.$t('industryInformationDynamicTemplate')
+        }
+      ],
+      index:'',
+      url: {
+        add: '/project/problemManagementEO/add',
+        edit: '/project/problemManagementEO/edit',
+        queryById: '/report/lawsMonthlyReportWriteEO/queryById'
+      }
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    // bringInStandardInformationClick() {
+    //   this.$refs.addModelRef.addModel()
+    // },
+    getNameList() {
+      getAction('/project/projectNameInfoEO/queryProjectNameList', {}).then((res) => {
+        if (res.success) {
+          this.projectNameList = res.result || []
+        } else {
+          this.projectNameList = []
+        }
+      })
+    },
+    addModelForm(value) {
+      this.$refs.defaultTemplateRef.getStandData(value)
+    },
+    getFirstLevelDutyTerritory() {
+      getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
+        if (res.success) {
+          this.firstLevelDutyTerritoryList = res.result
+        } else {
+          this.firstLevelDutyTerritoryList = []
+        }
+      })
+    },
+    StandardselectionChange(value, id) {
+      this.formInline.lawsId = id
+      this.formInline = { ...this.formInline }
+    },
+    Standardselectioninput(val){
+      this.formInline.lawsName = val
+    },
+    clickButtonToUpload(item) {
+      this.$refs.uploadFile.perentHandleFunc()
+      this.$refs.uploadFile.visible = true
+      this.uploadName = item
+      getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
+        if (res.success) {
+          this.$refs.uploadFile.perentHandleFunc(res.result)
+        } else {
+          this.$refs.uploadFile.perentHandleFunc()
+        }
+      })
+    },
+    /** 上传文件的回调 */
+    uploadSuccess(data) {
+      let attIdList = []
+      if (data && data.length > 0) {
+        data.map(item => {
+          attIdList.push(item.id || data.name)
+        })
+      }
+      /** 赋值给当前对应的表单文件 */
+      this.formInline[this.uploadName] = attIdList.join(',')
+      this.formInline = { ...this.formInline }
+    },
+    ...mapGetters(['userInfo']),
+    add() {
+      this.templateDisabled = false
+      this.getNameList()
+      this.getFirstLevelDutyTerritory()
+      this.title = this.$t('newlyAdded')
+      this.visible = true
+      this.disabled = false
+      this.formInline = {
+        fileLinkList:[{}],
+        progressTrackingList:[{}],
+        approvalEvidenceLinkList:[{}]
+      }
+      this.$nextTick(() => {
+        this.formInline = { ...this.formInline }
+        this.$refs.ruleForm.clearValidate()
+      })
+    },
+    edit(row) {
+      console.log(row)
+      this.getNameList()
+      this.getFirstLevelDutyTerritory()
+      this.title = this.$t('edit')
+      this.formInline = row
+      if(this.formInline.dutyTerritory != null){
+        this.formInline.dutyTerritory = this.formInline.dutyTerritory.split(',')
+      }else{
+        this.formInline.dutyTerritory = undefined
+      }
+      if(this.formInline.problemState == null){
+        this.formInline.problemState = undefined
+      }
+      if(this.formInline.progressTrackingList == null){
+        this.formInline.progressTrackingList = [{}]
+      }
+      if(this.formInline.approvalEvidenceLinkList == null){
+        this.formInline.approvalEvidenceLinkList = [{}]
+      }
+      if(this.formInline.fileLinkList == null){
+        this.formInline.fileLinkList = [{}]
+      }
+      if(this.formInline.projectId != null){
+        this.formInline.projectId = this.formInline.projectId.split(',')
+      }else{
+        this.formInline.projectId = undefined
+      }
+      console.log(this.formInline)
+      this.visible = true
+      this.disabled = false
+      this.templateDisabled = true
+      this.$nextTick(() => {
+        this.$refs.ruleForm.clearValidate()
+      })
+    },
+    addClick(index){
+      this.formInline.fileLinkList.splice(index + 1, 0, {})
+      this.formInline = { ...this.formInline }
+    },
+    deleteClick(index) {
+      this.formInline.fileLinkList.splice(index, 1)
+      this.formInline = { ...this.formInline }
+    },
+    addvidenceClick(index){
+      this.formInline.approvalEvidenceLinkList.splice(index + 1, 0, {})
+      this.formInline = { ...this.formInline }
+    },
+    deletevidenceClick(index) {
+      this.formInline.approvalEvidenceLinkList.splice(index, 1)
+      this.formInline = { ...this.formInline }
+    },
+    addprogresstrackingClick(index){
+      this.index = index
+      this.formInlinetracking = {}
+      this.visibletrack = true
+      this.$nextTick(() => {
+        this.formInlinetracking = { ...this.formInlinetracking }
+        this.isTrue = true
+        this.$refs.ruleForm.clearValidate()
+      })
+    },
+    deleteprogresstrackingClick(index,item) {
+      if(item.progressTracking && item.progressTracking != ''){
+        if(index == 0){
+          item.progressTracking = ''
+        }else{
+          this.formInline.progressTrackingList.splice(index, 1)
+        }
+      }
+      this.formInline = { ...this.formInline }
+    },
+    handleCancel() {
+      this.visible = false
+    },
+    Cancel(){
+      this.visibletrack = false
+      this.formInlinetracking = {}
+      this.$refs.ruleFormtracking.clearValidate()
+    },
+    handleOk(){
+      console.log(this.formInlinetracking)
+      let time = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+      this.$refs.ruleFormtracking.validate(valid => {
+        if (valid) {
+          let text = this.userInfo().username + ' ' + time + ' ' + this.formInlinetracking.progressTracking
+          this.formInline.progressTrackingList.forEach((item,index) => {
+            console.log(item.progressTracking)
+            if(!item.progressTracking){
+              this.formInline.progressTrackingList.splice(0,1)
+            }
+          })
+          this.formInline.progressTrackingList.splice(this.index+1, 1, {progressTracking:text})
+          this.visibletrack = false
+        }
+      })
+    },
+    handleSubmit() {
+      console.log(this.formInline)
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          this.confirmLoading = true
+          let url = ''
+          let action = ''
+          if (this.title == this.$t('newlyAdded')) {
+            url = this.url.add
+            action = postAction
+          } else {
+            url = this.url.edit
+            action = putAction
+          }
+          // Object.keys(formInline).forEach(res => {
+          //   if (formInline[res] && formInline[res] instanceof Array) {
+          //     formInline[res] = formInline[res].join(',')
+          //   }
+          // })
+          let formInline = JSON.parse(JSON.stringify(this.formInline))
+          if(this.formInline.dutyTerritory && this.formInline.dutyTerritory instanceof Array){
+            this.formInline.dutyTerritory = this.formInline.dutyTerritory.join(',')
+          }
+          if(this.formInline.projectId && this.formInline.projectId instanceof Array){
+            this.formInline.projectId = this.formInline.projectId.join(',')
+          }
+          // let fileLinkList = []
+          // let approvalEvidenceLinkList = []
+          // let progressTrackingList = []
+          // if(this.formInline.fileLinkList){
+          //   this.formInline.fileLinkList.forEach(item => {
+          //     if(item.fileLink){
+          //       fileLinkList.push(item.fileLink)
+          //     }
+          //   })
+          //   this.formInline.fileLinkList = fileLinkList
+          // }
+          // if(this.formInline.approvalEvidenceLinkList){
+          //   this.formInline.approvalEvidenceLinkList.forEach(item => {
+          //     if(item.approvalEvidenceLink){
+          //       approvalEvidenceLinkList.push(item.approvalEvidenceLink)
+          //     }
+          //   })
+          //   this.formInline.approvalEvidenceLinkList = approvalEvidenceLinkList
+          // }
+          // if(this.formInline.progressTrackingList){
+          //   this.formInline.progressTrackingList.forEach(item => {
+          //     if(item.progressTracking){
+          //       progressTrackingList.push(item.progressTracking)
+          //     }
+          //   })
+          //   this.formInline.progressTrackingList = progressTrackingList
+          // }
+          delete this.formInline.lawsName
+          let query = {
+            // problemManagementEO:formInline
+            ...this.formInline
+          }
+          action(url, query).then((res) => {
+            if (res.success) {
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.visible = false
+              this.confirmLoading = false
+              this.$emit('addModelForm')
+            } else {
+              this.confirmLoading = false
+              this.$message.warning(this.$t('operationFailed'))
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+<style>
+.ant-select-disabled {
+  color: rgba(0, 0, 0, 0.65);
+}
+
+.ant-input-disabled {
+  color: rgba(0, 0, 0, 0.65) !important;
+}
+</style>
+<style scoped>
+
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+}
+
+.title-text {
+  width: 114px;
+  text-align: right;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 42px;
+  line-height: 42px;
+}
+
+.box-input {
+  display: inline-block;
+  height: 38px;
+  width: 100%;
+}
+
+.itemModel {
+  width: calc(100% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+}
+
+.title-text-text {
+  margin-top: 9px;
+}
+
+.formAdd {
+  margin-bottom: 40px;
+}
+
+.Required {
+  color: red;
+  margin-right: 4px;
+}
+
+.title-text-text {
+  margin-top: 9px;
+}
+
+.formAdd {
+  margin-bottom: 40px;
+}
+
+.drawer-bootom-button {
+  position: absolute;
+  bottom: 0;
+  z-index: 100;
+  width: 100%;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
+
+.button-text {
+  height: 38px;
+  margin-top: 4px;
+}
+
+::v-deep .ant-select-tree-treenode-switcher-close {
+  width: 255px;
+}
+
+::v-deep .ant-select-tree-node-content-wrapper {
+  float: right;
+  margin-top: -2px !important;
+}
+
+::v-deep .ant-select-tree-title {
+  width: 100%;
+  display: block;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  word-break: break-word;
+}
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batSetting.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batSetting.vue
new file mode 100644
index 000000000..41b4cde95
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batSetting.vue
@@ -0,0 +1,667 @@
+<template>
+  <a-modal
+    :title="$t('batchSettingInformation')"
+    :width="1200"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleOk"
+    @cancel="handleCancel"
+  >
+    <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('certificationType')">{{$t('certificationType')}}</span>
+            </div>
+            <a-form-model-item class="itemModel-multi">
+              <j-multi-select-tag class="box-input" v-model="formInline.attestationType"
+                                  :placeholder="$t('PleaseSelect')+$t('certificationType')"
+                                  :type="'select'"
+                                  :triggerChange="false" :dictCode="'attestation_type'"/>
+              <!--              <j-dict-select-tag class="box-input" v-model="formInline.attestationType"-->
+              <!--                                 @input="handleInput('attestationType')"-->
+              <!--                                 :placeholder="$t('PleaseSelect')+$t('certificationType')"-->
+              <!--                                 :type="'select'"-->
+              <!--                                 :triggerChange="false" dictCode="attestation_type"/>-->
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('certificationLevel')">{{$t('certificationLevel')}}</span>
+            </div>
+            <a-form-model-item class="itemModel-multi">
+              <j-multi-select-tag class="box-input" v-model="formInline.attestationRank"
+                                  :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
+                                  :type="'select'"
+                                  :triggerChange="false" :dictCode="'attestation_rank'"/>
+              <!--              <j-dict-select-tag class="box-input" v-model="formInline.attestationRank"-->
+              <!--                                 @input="handleInput('attestationRank')"-->
+              <!--                                 :placeholder="$t('PleaseSelect')+$t('certificationLevel')"-->
+              <!--                                 :type="'select'"-->
+              <!--                                 :triggerChange="false" dictCode="attestation_rank"/>-->
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24" v-if="this.code == '0'">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
+            </div>
+            <a-form-model-item class="itemModel-multi">
+              <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
+                        class="box-input"
+                        optionFilterProp="label"
+                        @change="DutyDepartChange"
+                        mode="multiple"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        v-model="formInline.dutyDepart">
+                <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
+                                 :key="key"
+                                 :label="item.key"
+                                 :value="item.key">
+                               <span style="display: inline-block;width: 100%" :title=" item.key ">
+                                     {{ item.key }}
+                               </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
+            </div>
+            <a-form-model-item class="itemModel-multi">
+              <a-select :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                        class="box-input"
+                        optionFilterProp="label"
+                        mode="multiple"
+                        @change="dutyTerritoryChange"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        v-model="formInline.dutyTerritory">
+                <a-select-option v-for="(item, key) in dutyTerritoryList"
+                                 :key="key"
+                                 :label="item.itemText"
+                                 :value="item.itemValue">
+                               <span style="display: inline-block;width: 100%" :title=" item.itemText ">
+                                     {{ item.itemText }}
+                               </span>
+                </a-select-option>
+              </a-select>
+              <!--              <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"-->
+              <!--                                  @change="dutyTerritoryChange"-->
+              <!--                                  :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
+              <!--                                  :type="'select'"-->
+              <!--                                  :triggerChange="false" :dictCode="'duty_territory'"/>-->
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24" v-if="this.code == '0'">
+        <a-col :span="12" v-if="this.code == '0'">
+          <div class="box-title-text">
+            <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" prop="regulationOwnerId">
+              <a-select :placeholder="$t('PleaseSelect')+$t('regulatoryEngineer')"
+                        class="box-input"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        allowClear
+                        v-model="formInline.regulationOwnerId">
+                <a-select-option v-for="(item, key) in regulatoryEngineerList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+              <!--                <j-dict-select-tag class="box-input" v-model="formInline.designDuty"-->
+              <!--                                   :disabled="formInline.roleCode == 0 ? false : true"-->
+              <!--                                   @input="handleInput('designDuty')"-->
+              <!--                                   :placeholder="$t('PleaseSelect')+$t('personLiable')"-->
+              <!--                                   :type="'select'"-->
+              <!--                                   :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>-->
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" prop="designDutyId">
+              <a-select :placeholder="$t('cannotSetResponsibilityAreas')"
+                        class="box-input"
+                        allowClear
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        v-model="formInline.engineeringInterfacePerson">
+                <a-select-option v-for="(item, key) in engineeringInterfacePersonList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+              <!--              <PersonnelSelection-->
+              <!--                :query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('engineeringInterfacePerson')}"-->
+              <!--                :isSingleChoice="true"-->
+              <!--                :personneQuery="formInline"-->
+              <!--                v-if="visible"-->
+              <!--                @change="PersonnelSelectionChange"-->
+              <!--                v-model="formInline.engineeringInterfacePersonName"/>-->
+              <!--                <j-dict-select-tag class="box-input" v-model="formInline.designDuty"-->
+              <!--                                   :disabled="formInline.roleCode == 0 ? false : true"-->
+              <!--                                   @input="handleInput('designDuty')"-->
+              <!--                                   :placeholder="$t('PleaseSelect')+$t('personLiable')"-->
+              <!--                                   :type="'select'"-->
+              <!--                                   :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>-->
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <div class="header-text">
+        &nbsp;{{$t('confirmationOfDesignConformity')}}
+      </div>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('personLiable')">{{$t('personLiable')}}</span>
+            </div>
+            <a-form-model-item class="itemModel-multi" prop="designDutyIdName">
+              <PersonnelSelection :query="{db_field_name:'designDutyId',db_field_txt:$t('personLiable')}"
+                                  :isSingleChoice="true"
+                                  :personneQuery="formInline"
+                                  v-if="visible"
+                                  @change="PersonnelSelectionChange"
+                                  v-model="formInline.designDutyIdName"/>
+              <!--                <j-dict-select-tag class="box-input" v-model="formInline.designDuty"-->
+              <!--                                   :disabled="formInline.roleCode == 0 ? false : true"-->
+              <!--                                   @input="handleInput('designDuty')"-->
+              <!--                                   :placeholder="$t('PleaseSelect')+$t('personLiable')"-->
+              <!--                                   :type="'select'"-->
+              <!--                                   :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>-->
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('cutoffTime')">{{$t('cutoffTime')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" :prop="'designDueDate'">
+              <a-date-picker class="box-input"
+                             :placeholder="$t('PleaseSelect')+$t('cutoffTime')"
+                             @change="dateChange({db_field_name:'designDueDate'})"
+                             format="YYYY-MM-DD"
+                             :getCalendarContainer="(trigger) => trigger.parentNode"
+                             v-model="formInline.designDueDate"
+                             style="width: 100%"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <!--          <a-col :span="12">-->
+        <!--            <div class="box-title-text">-->
+        <!--              <div class="title-text">-->
+        <!--                <span class="title-text-text"-->
+        <!--                      :title="$t('Sponsor')">{{$t('Sponsor')}}</span>-->
+        <!--              </div>-->
+        <!--              <a-form-model-item class="itemModel" prop="designInitiatorId">-->
+        <!--                <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"-->
+        <!--                          :disabled="formInline.roleCodeIndex == 0 ? false : true"-->
+        <!--                          :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+        <!--                          class="box-input"-->
+        <!--                          allowClear-->
+        <!--                          v-model="formInline.designInitiatorId">-->
+        <!--                  <a-select-option v-for="(item, key) in designInitiatorList"-->
+        <!--                                   :key="key"-->
+        <!--                                   :value="item.value">-->
+        <!--                     <span style="display: inline-block;width: 100%" :title=" item.name ">-->
+        <!--                           {{ item.name }}-->
+        <!--                     </span>-->
+        <!--                  </a-select-option>-->
+        <!--                </a-select>-->
+        <!--                &lt;!&ndash;                <j-dict-select-tag class="box-input" v-model="formInline.designInitiator"&ndash;&gt;-->
+        <!--                &lt;!&ndash;                                   :disabled="formInline.roleCode == 0 ? false : true"&ndash;&gt;-->
+        <!--                &lt;!&ndash;                                   @input="handleInput('designInitiator')"&ndash;&gt;-->
+        <!--                &lt;!&ndash;                                   :placeholder="$t('PleaseSelect')+$t('Sponsor')"&ndash;&gt;-->
+        <!--                &lt;!&ndash;                                   :type="'select'"&ndash;&gt;-->
+        <!--                &lt;!&ndash;                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>&ndash;&gt;-->
+        <!--              </a-form-model-item>-->
+        <!--            </div>-->
+        <!--          </a-col>-->
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
+            </div>
+            <a-form-model-item class="itemModel-multi" prop="typeOfDeliverables">
+              <a-tree-select
+                tree-node-filter-prop="title"
+                v-model="formInline.designDeliverableType"
+                :maxTagCount="1"
+                :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                class="box-input"
+                style="width: 100%"
+                :tree-data="DeliverableTreeList"
+                tree-checkable
+                :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
+              />
+              <!--                <j-dict-select-tag class="box-input" v-model="formInline.designDeliverableType"-->
+              <!--                                   @input="handleInput('designDeliverableType')"-->
+              <!--                                   :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
+              <!--                                   :type="'select'"-->
+              <!--                                   :triggerChange="false" :dictCode="'deliverable_template'"/>-->
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <div class="header-text">
+        &nbsp;{{$t('verificationAndConformityconfirmation')}}
+      </div>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('personLiable')">{{$t('personLiable')}}</span>
+            </div>
+            <a-form-model-item class="itemModel-multi" prop="verifyDutyIdName">
+              <PersonnelSelection :query="{db_field_name:'verifyDutyId',db_field_txt:$t('personLiable')}"
+                                  :isSingleChoice="true"
+                                  :personneQuery="formInline"
+                                  v-if="visible"
+                                  @change="PersonnelSelectionChange"
+                                  v-model="formInline.verifyDutyIdName"/>
+              <!--                <j-dict-select-tag class="box-input" v-model="formInline.verifyDuty"-->
+              <!--                                   :disabled="formInline.roleCode == 0 ? false : true"-->
+              <!--                                   @input="handleInput('verifyDuty')"-->
+              <!--                                   :placeholder="$t('PleaseSelect')+$t('personLiable')"-->
+              <!--                                   :type="'select'"-->
+              <!--                                   :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>-->
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('cutoffTime')">{{$t('cutoffTime')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" :prop="'verifyDueDate'">
+              <a-date-picker class="box-input"
+                             :placeholder="$t('PleaseSelect')+$t('cutoffTime')"
+                             @change="dateChange({db_field_name:'verifyDueDate'})"
+                             format="YYYY-MM-DD"
+                             :getCalendarContainer="(trigger) => trigger.parentNode"
+                             v-model="formInline.verifyDueDate"
+                             style="width: 100%"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <!--          <a-col :span="12">-->
+        <!--            <div class="box-title-text">-->
+        <!--              <div class="title-text">-->
+        <!--                <span class="title-text-text"-->
+        <!--                      :title="$t('Sponsor')">{{$t('Sponsor')}}</span>-->
+        <!--              </div>-->
+        <!--              <a-form-model-item class="itemModel" prop="verifyInitiatorId">-->
+        <!--                <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"-->
+        <!--                          class="box-input"-->
+        <!--                          allowClear-->
+        <!--                          :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+        <!--                          :disabled="formInline.roleCodeIndex == 0 ? false : true"-->
+        <!--                          v-model="formInline.verifyInitiatorId">-->
+        <!--                  <a-select-option v-for="(item, key) in verifyInitiatorList"-->
+        <!--                                   :key="key"-->
+        <!--                                   :value="item.value">-->
+        <!--                     <span style="display: inline-block;width: 100%" :title=" item.name ">-->
+        <!--                           {{ item.name }}-->
+        <!--                     </span>-->
+        <!--                  </a-select-option>-->
+        <!--                </a-select>-->
+        <!--                &lt;!&ndash;                <j-dict-select-tag class="box-input" v-model="formInline.verifyInitiator"&ndash;&gt;-->
+        <!--                &lt;!&ndash;                                   :disabled="formInline.roleCode == 0 ? false : true"&ndash;&gt;-->
+        <!--                &lt;!&ndash;                                   @input="handleInput('verifyInitiator')"&ndash;&gt;-->
+        <!--                &lt;!&ndash;                                   :placeholder="$t('PleaseSelect')+$t('Sponsor')"&ndash;&gt;-->
+        <!--                &lt;!&ndash;                                   :type="'select'"&ndash;&gt;-->
+        <!--                &lt;!&ndash;                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>&ndash;&gt;-->
+        <!--              </a-form-model-item>-->
+        <!--            </div>-->
+        <!--          </a-col>-->
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
+            </div>
+            <a-form-model-item class="itemModel-multi" prop="verifyDeliverableType">
+              <a-tree-select
+                tree-node-filter-prop="title"
+                v-model="formInline.verifyDeliverableType"
+                :maxTagCount="1"
+                :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                class="box-input"
+                style="width: 100%"
+                :tree-data="DeliverableTreeList"
+                tree-checkable
+                :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
+              />
+              <!--                <j-dict-select-tag class="box-input" v-model="formInline.verifyDeliverableType"-->
+              <!--                                   :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.verifyDeliverableType ? true : false"-->
+              <!--                                   @input="handleInput('verifyDeliverableType')"-->
+              <!--                                   :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
+              <!--                                   :type="'select'"-->
+              <!--                                   :triggerChange="false" :dictCode="'deliverable_template'"/>-->
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+    </a-form-model>
+  </a-modal>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
+  import moment from 'moment'
+
+  export default {
+    name: 'batSetting',
+    props: ['url'],
+    components: {
+      PersonnelSelection
+    },
+    data() {
+      return {
+        visible: false,
+        confirmLoading: false,
+        designDutyList: [],
+        DeliverableTreeList: [],
+        formInline: {},
+        rules: {},
+        ids: [],
+        code: '',
+        dutyTerritoryList: [],
+        regulatoryEngineerList: [],
+        engineeringInterfacePersonList: [],
+        firstLevelDutyTerritoryList: []
+      }
+    },
+    mounted() {
+    },
+    methods: {
+      getFirstLevelDutyTerritory() {
+        getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
+          if (res.success) {
+            this.firstLevelDutyTerritoryList = res.result
+          } else {
+            this.firstLevelDutyTerritoryList = []
+          }
+        })
+      },
+      DutyDepartChange(event) {
+        this.formInline.dutyTerritory = []
+        this.formInline = { ...this.formInline }
+        this.getDutyTerritory(event.join(','))
+      },
+      getDutyTerritory(row) {
+        let query = {
+          dutyDepart: row
+        }
+        getAction('/sys/dict/getDutyTeryByDD', query).then((res) => {
+          if (res.success) {
+            this.dutyTerritoryList = res.result || []
+          } else {
+            this.dutyTerritoryList = []
+          }
+        })
+      },
+      dutyTerritoryChange(event) {
+        this.formInline.regulationOwnerId = undefined
+        this.formInline.engineeringInterfacePerson = undefined
+        this.formInline = { ...this.formInline }
+        this.queryPersonByProject(event.join(','))
+      },
+      queryPersonByProject(row) {
+        let query = {
+          projectId: this.$route.query.id,
+          dutyTerritory: row.dutyTerritory || row
+        }
+        getAction('/project/projectRelatedPersonnel/queryPersonByProjectId', query).then((res) => {
+          if (res.success) {
+            this.regulatoryEngineerList = res.result.lawEngineerList || [] //法规工程师
+            this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || [] //工程接口人
+            // if (this.regulatoryEngineerList.length == 1) {
+            //   this.formInline.regulationOwnerId = this.regulatoryEngineerList[0].value
+            // }
+            // if (this.engineeringInterfacePersonList.length == 1) {
+            //   this.formInline.engineeringInterfacePerson = this.engineeringInterfacePersonList[0].value
+            // }
+            // this.formInline = {...this.formInline}
+          }
+        })
+      },
+      PersonnelSelectionChange(value, id) {
+        this.formInline[value] = id
+        this.formInline = { ...this.formInline }
+      },
+      edit(data, code, content) {
+        this.visible = true
+        this.regulatoryEngineerList = []
+        this.dutyTerritoryList = []
+        this.engineeringInterfacePersonList = []
+        this.getDeliverableTree()
+        this.getFirstLevelDutyTerritory()
+        this.code = code
+        this.$nextTick(() => {
+          this.ids = data || []
+          this.formInline = {}
+          if (content && code == '0') {
+            // this.formInline.dutyTerritory = content.dutyTerritory
+            // this.queryPersonByProject(content)
+          }
+          this.formInline = { ...this.formInline }
+        })
+      },
+      handleOk() {
+        if (this.formInline.dutyTerritory) {
+          this.handleOkTwo()
+        } else {
+          this.handleOkOne()
+        }
+      },
+      getDeliverableTree() {
+        getAction('/sys/category/getDeliverableTree', {}).then((res) => {
+          if (res.success) {
+            this.DeliverableTreeList = res.result
+          } else {
+            this.DeliverableTreeList = []
+          }
+        })
+      },
+      handleOkOne() {
+        let ids = JSON.parse(JSON.stringify(this.ids))
+        let formInline = JSON.parse(JSON.stringify(this.formInline))
+        Object.keys(formInline).forEach(res => {
+          if (formInline[res] && formInline[res] instanceof Array) {
+            formInline[res] = formInline[res].join(',')
+          }
+        })
+        let query = {
+          ids: ids.join(','),
+          ...formInline
+        }
+        this.confirmLoading = true
+        postAction(this.url.setBatch, query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.visible = false
+            this.confirmLoading = false
+            this.$emit('batSettingList')
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+            this.confirmLoading = false
+          }
+        })
+      },
+      handleOkTwo() {
+        let _this = this
+        this.$confirm({
+          content: _this.$t('batchmodify'),
+          onOk() {
+            let ids = JSON.parse(JSON.stringify(_this.ids))
+            let formInline = JSON.parse(JSON.stringify(_this.formInline))
+            Object.keys(formInline).forEach(res => {
+              if (formInline[res] && formInline[res] instanceof Array) {
+                formInline[res] = formInline[res].join(',')
+              }
+            })
+            let query = {
+              ids: ids.join(','),
+              ...formInline
+            }
+            _this.confirmLoading = true
+            postAction(_this.url.setBatch, query).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.visible = false
+                _this.confirmLoading = false
+                _this.$emit('batSettingList')
+              } else {
+                _this.$message.warning(_this.$t('operationFailed'))
+                _this.confirmLoading = false
+              }
+            })
+          }
+        })
+      },
+      handleCancel() {
+        this.formInline = {}
+        this.visible = false
+      },
+      handleInput(value) {
+        this.$nextTick(() => {
+          this.formInline = { ...this.formInline }
+          this.$refs.ruleForm.validateField([value])
+        })
+      },
+      dateChange(item) {
+        this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
+      }
+    }
+  }
+</script>
+
+<style>
+  .formAdd .ant-form-item-label {
+    width: 130px;
+  }
+
+  .formAdd .ant-form-item-control-wrapper {
+    display: inline-block;
+    width: 100%;
+  }
+
+  /*.formAdd .ant-form-item {*/
+  /*  margin-bottom: 20px;*/
+  /*}*/
+
+  .itemModel .ant-form-item-control-wrapper {
+    width: 100%;
+  }
+
+  .box-input .ant-select-selection--single {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple .ant-select-selection__rendered > ul > li {
+    margin-top: 6px;
+  }
+
+  .box-input .ant-calendar-picker {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-calendar-picker-input {
+    height: 38px;
+  }
+
+  .box-input .ant-input-number-input-wrap {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-calendar-picker-input {
+    padding: 4px 30px 4px 11px;
+  }
+</style>
+<style scoped>
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+  }
+
+  .title-text {
+    width: 174px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 42px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .formAdd {
+    margin-bottom: 40px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batchChangeModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batchChangeModel.vue
new file mode 100644
index 000000000..69dc2e078
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batchChangeModel.vue
@@ -0,0 +1,216 @@
+<!--批量当前状态-->
+<template>
+  <a-modal
+    :title="title"
+    :width="700"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleOk"
+    @cancel="visible = false"
+  >
+    <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+      <a-row :gutter="24">
+        <div class="headerText">
+          {{this.$t('redSchedule')}}<br/>
+          {{this.$t('yellowSchedule')}}<br/>
+          {{this.$t('greenRequirements')}}<br/>
+          {{this.$t('blueUndeterminedState')}}
+        </div>
+        <a-col :span="24">
+          <div class="box-title-text">
+            <div class="title-text">
+                      <span class="title-text-text"
+                            :title="$t('CurrentProjectStatusEvaluation')">{{$t('CurrentProjectStatusEvaluation')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" prop="conditionAssessment">
+              <a-select
+                :disabled="disabled"
+                v-model="formInline.conditionAssessment"
+                :placeholder="$t('PleaseSelect')+$t('CurrentProjectStatusEvaluation')">
+                <a-select-option :value="'1'">
+                             <span style="display: inline-block;width: 100%">
+                                    {{ $t('red') }}
+                             </span>
+                </a-select-option>
+                <a-select-option :value="'2'">
+                             <span style="display: inline-block;width: 100%">
+                                    {{ $t('yellow') }}
+                             </span>
+                </a-select-option>
+                <a-select-option :value="'3'">
+                             <span style="display: inline-block;width: 100%">
+                                    {{ $t('green') }}
+                             </span>
+                </a-select-option>
+
+                <a-select-option :value="'4'" disabled>
+                               <span style="display: inline-block;width: 100%">
+                                     {{ $t('blue') }}
+                                </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+
+        <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" prop="remark">
+              <a-textarea
+                :placeholder="$t('remarks')"
+                :disabled="disabled"
+                v-model="formInline.remark" :rows="4"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+
+      </a-row>
+    </a-form-model>
+  </a-modal>
+</template>
+
+<script>
+import { postAction, putAction, getAction } from '@/api/manage'
+
+export default {
+  name: 'TaskListModel',
+  data() {
+    return {
+      formInline: {},
+      rules: {},
+      selectionRowsArray:[],
+      projectLawsInventoryIds:[],
+      roleCodes:[],
+      visible: false,
+      title:'',
+      confirmLoading: false,
+      studioList: [],
+      disabled: false,
+      url: {
+        edit: '/project/projectTaskInventoryEO/edit',
+        addOrUpdate: '/project/projectTaskInventoryConditionAssessmentEO/addOrUpdate',
+        list: '/project/projectTaskInventoryConditionAssessmentEO/list'
+      }
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    getData(val) {
+      this.visible = true
+      this.title = this.$t('BatchChangeStatus')
+      this.selectionRowsArray = val
+      this.$nextTick(() => {
+        this.formInline = {}
+        this.$refs.ruleForm.clearValidate()
+      })
+    },
+    getList(val) {
+      getAction(this.url.list, { projectLawsInventoryId: val.projectLawsInventoryId }).then((res) => {
+        if (res.success) {
+          this.studioList = res.result || []
+        } else {
+          this.studioList = []
+        }
+      })
+    },
+    handleInput(value) {
+      this.$nextTick(() => {
+        this.formInline = { ...this.formInline }
+        this.$refs.ruleForm.validateField([value])
+      })
+    },
+    handleOk() {
+      if (this.disabled) {
+        this.visible = false
+        return
+      }
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          let query = {}
+          let projectLawsInventoryIds = []
+          let roleCodes = []
+          let Action
+          this.selectionRowsArray.forEach((item,index) => {
+            projectLawsInventoryIds.push(item.projectLawsInventoryId)
+            roleCodes.push(item.roleCode)
+          })
+            query = {
+              roleCodes: roleCodes.join(','),
+              remark: this.formInline.remark,
+              conditionAssessment: this.formInline.conditionAssessment,
+              projectLawsInventoryIds: projectLawsInventoryIds.join(',')
+            }
+            Action = postAction
+          this.confirmLoading = true
+          Action('/project/projectTaskInventoryConditionAssessmentEO/addOrUpdateBatch', query).then((res) => {
+            if (res.success) {
+              this.visible = false
+              this.confirmLoading = false
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.$emit('batchChangeModel')
+            } else {
+              this.$message.warning(this.$t('operationFailed'))
+              this.confirmLoading = false
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+}
+
+.Required {
+  color: red;
+  margin-right: 4px;
+}
+
+.title-text {
+  width: 134px;
+  text-align: right;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 42px;
+  line-height: 42px;
+}
+
+.box-input {
+  display: inline-block;
+  height: 38px;
+  width: 100%;
+}
+
+.itemModel {
+  width: calc(100% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+}
+
+.title-text-text {
+  margin-top: 9px;
+}
+
+.headerText {
+  margin-left: 30px;
+  color: #040B29;
+  font-weight: 400;
+}
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batchModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batchModel.vue
new file mode 100644
index 000000000..8d93615c4
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batchModel.vue
@@ -0,0 +1,182 @@
+<!--批量维护进度-->
+<template>
+  <a-modal
+    :title="title"
+    :width="700"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleOk"
+    @cancel="visible = false"
+  >
+    <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <div class="box-title-text">
+            <div class="title-text">
+                      <span class="title-text-text"
+                            :title="$t('CertificationProgress')">{{$t('CertificationProgress')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" :prop="!disabled?'certificationProgress':''">
+              <j-dict-select-tag class="box-input" v-model="formInline.certificationProgress"
+                                 :disabled="disabled"
+                                 @input="handleInput('certificationProgress')"
+                                 :placeholder="$t('PleaseSelect')+$t('CertificationProgress')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'certification_progress'"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <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 remarkbox" :prop="!disabled?'certificationProgressRemark':''">
+              <a-textarea
+                :placeholder="$t('PleaseEnter')+$t('remarks')"
+                :disabled="disabled"
+                v-model="formInline.certificationProgressRemark" :rows="4"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+
+      </a-row>
+    </a-form-model>
+  </a-modal>
+</template>
+
+<script>
+import { postAction, putAction, getAction } from '@/api/manage'
+
+export default {
+  name: 'TaskListModel',
+  data() {
+    return {
+      formInline: {},
+      selectionRowsArray:[],
+      rules: {},
+      title:'',
+      visible: false,
+      confirmLoading: false,
+      studioList: [],
+      ids:'',
+      disabled: false,
+      url: {
+        edit: '/project/projectTaskInventoryEO/edit',
+        addOrUpdate: '/project/projectTaskInventoryConditionAssessmentEO/addOrUpdate',
+        list: '/project/projectTaskInventoryConditionAssessmentEO/list'
+      }
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    getData(val) {
+      this.visible = true
+      this.title = this.$t('BatchMaintenanceProgress')
+      this.selectionRowsArray = val
+      this.$nextTick(() => {
+        this.formInline = {}
+        this.$refs.ruleForm.clearValidate()
+      })
+    },
+    getList(val) {
+      getAction(this.url.list, { projectLawsInventoryId: val.projectLawsInventoryId }).then((res) => {
+        if (res.success) {
+          this.studioList = res.result || []
+        } else {
+          this.studioList = []
+        }
+      })
+    },
+    handleInput(value) {
+      this.$nextTick(() => {
+        this.formInline = { ...this.formInline }
+        this.$refs.ruleForm.validateField([value])
+      })
+    },
+    handleOk() {
+      if (this.disabled) {
+        this.visible = false
+        return
+      }
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          let query = {}
+          this.ids = this.selectionRowsArray.join(',')
+            query = {
+              ids: this.ids,
+              certificationProgress: this.formInline.certificationProgress,
+              certificationProgressRemark: this.formInline.certificationProgressRemark
+            }
+          this.confirmLoading = true
+          postAction('/project/projectTaskInventoryEO/editBatch', query).then((res) => {
+            if (res.success) {
+              this.visible = false
+              this.confirmLoading = false
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.$emit('batchModel')
+            } else {
+              this.$message.warning(this.$t('operationFailed'))
+              this.confirmLoading = false
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+}
+
+.Required {
+  color: red;
+  margin-right: 4px;
+}
+
+.title-text {
+  width: 134px;
+  text-align: right;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 42px;
+  line-height: 42px;
+}
+
+.box-input {
+  display: inline-block;
+  height: 38px;
+  width: 128%;
+}
+
+.itemModel {
+  width: calc(80% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+}
+
+.title-text-text {
+  margin-top: 9px;
+}
+/deep/ .remarkbox .ant-form-item-control{
+  width: 128%;
+}
+.headerText {
+  margin-left: 30px;
+  color: #040B29;
+  font-weight: 400;
+}
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batchSettingPersonnel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batchSettingPersonnel.vue
new file mode 100644
index 000000000..4f35950e6
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batchSettingPersonnel.vue
@@ -0,0 +1,418 @@
+<template>
+  <a-modal
+    :title="$t('batchSettingPersonnel')"
+    :width="1000"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleOk"
+    @cancel="handleCancel"
+  >
+    <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text"
+                    :title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-select :placeholder="$t('PleaseSelect')+$t('regulatoryEngineer')"
+                        class="box-input"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        allowClear
+                        v-model="formInline.regulationOwnerId">
+                <a-select-option v-for="(item, key) in regulatoryEngineerList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('certifiedEngineer')">{{$t('certifiedEngineer')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-select :placeholder="$t('PleaseSelect')+$t('certifiedEngineer')"
+                        class="box-input"
+                        allowClear
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        v-model="formInline.homologationEngineerId">
+                <a-select-option v-for="(item, key) in certificationEngineerList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name}}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" :prop="'engineeringInterfacePerson'">
+              <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
+                        class="box-input"
+                        allowClear
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        v-model="formInline.engineeringInterfacePerson">
+                <a-select-option v-for="(item, key) in engineeringInterfacePersonList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <div class="header-text">
+        &nbsp;{{$t('confirmationOfDesignConformity')}}
+      </div>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        class="box-input"
+                        allowClear
+                        v-model="formInline.designInitiatorId">
+                <a-select-option v-for="(item, key) in designInitiatorList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('personLiable')">{{$t('personLiable')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-select :placeholder="$t('PleaseSelect')+$t('personLiable')"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        class="box-input"
+                        allowClear
+                        v-model="formInline.designDutyId">
+                <a-select-option v-for="(item, key) in designDutyList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <div class="header-text">
+        &nbsp;{{$t('PrehomoConfirmation')}}
+      </div>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        class="box-input"
+                        allowClear
+                        v-model="formInline.prehomoInitiatorId">
+                <a-select-option v-for="(item, key) in prehomoInitiatorList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('personLiable')">{{$t('personLiable')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-select :placeholder="$t('PleaseSelect')+$t('personLiable')"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        class="box-input"
+                        allowClear
+                        v-model="formInline.prehomoDutyId">
+                <a-select-option v-for="(item, key) in prehomoDutyList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <div class="header-text">
+        &nbsp;{{$t('verificationAndConformityconfirmation')}}
+      </div>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        class="box-input"
+                        allowClear
+                        v-model="formInline.verifyInitiatorId">
+                <a-select-option v-for="(item, key) in verifyInitiatorList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('personLiable')">{{$t('personLiable')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-select :placeholder="$t('PleaseSelect')+$t('personLiable')"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        class="box-input"
+                        allowClear
+                        v-model="formInline.verifyDutyId">
+                <a-select-option v-for="(item, key) in verifyDutyList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+    </a-form-model>
+  </a-modal>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import moment from 'moment'
+
+  export default {
+    name: 'batchSettingPersonnel',
+    props: ['url'],
+    data() {
+      return {
+        visible: false,
+        confirmLoading: false,
+        regulatoryEngineerList: [],
+        certificationEngineerList: [],
+        engineeringInterfacePersonList: [],
+        designInitiatorList: [],
+        designDutyList: [],
+        prehomoInitiatorList: [],
+        prehomoDutyList: [],
+        verifyInitiatorList: [],
+        verifyDutyList: [],
+        formInline: {},
+        rules: {},
+        ids: []
+      }
+    },
+    mounted() {
+    },
+    methods: {
+      edit(data, content) {
+        this.visible = true
+        this.$nextTick(() => {
+          this.ids = data || []
+          this.formInline = {}
+          this.queryPersonByProject(content[0].dutyTerritory)
+        })
+      },
+      queryPersonByProject(row) {
+        let query = {
+          projectId: this.$route.query.id,
+          dutyTerritory: row
+        }
+        getAction(this.url.queryPersonByProject, query).then((res) => {
+          if (res.success) {
+            this.regulatoryEngineerList = res.result.lawEngineerList //法规工程师
+            this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList //工程接口人
+            this.certificationEngineerList = res.result.certificationEngineerList //认证工程师
+            this.designInitiatorList = res.result.allPersonList || []
+            this.designDutyList = res.result.allPersonList || []
+            this.prehomoInitiatorList = res.result.allPersonList || []
+            this.prehomoDutyList = res.result.allPersonList || []
+            this.verifyInitiatorList = res.result.allPersonList || []
+            this.verifyDutyList = res.result.allPersonList || []
+          }
+        })
+      },
+      handleOk() {
+        let ids = JSON.parse(JSON.stringify(this.ids))
+        let query = {
+          ids: ids.join(','),
+          ...this.formInline
+        }
+        this.confirmLoading = true
+        postAction(this.url.setBatch, query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.visible = false
+            this.confirmLoading = false
+            this.$emit('batchSettingPersonnelForm')
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+            this.confirmLoading = false
+          }
+        })
+      },
+      handleCancel() {
+        this.formInline = {}
+        this.visible = false
+      }
+    }
+  }
+</script>
+
+<style>
+  .formAdd .ant-form-item-label {
+    width: 130px;
+  }
+
+  .formAdd .ant-form-item-control-wrapper {
+    display: inline-block;
+    width: 100%;
+  }
+
+  /*.formAdd .ant-form-item {*/
+  /*  margin-bottom: 20px;*/
+  /*}*/
+
+  .itemModel .ant-form-item-control-wrapper {
+    width: 100%;
+  }
+
+  .box-input .ant-select-selection--single {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple .ant-select-selection__rendered > ul > li {
+    margin-top: 6px;
+  }
+
+  .box-input .ant-calendar-picker {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-calendar-picker-input {
+    height: 38px;
+  }
+
+  .box-input .ant-input-number-input-wrap {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-calendar-picker-input {
+    padding: 4px 30px 4px 11px;
+  }
+</style>
+<style scoped>
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+  }
+
+  .title-text {
+    width: 104px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 42px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .formAdd {
+    margin-bottom: 40px;
+  }
+
+  .header-text {
+    font-size: 16px;
+    font-weight: bold;
+    margin-left: 15px;
+    /*border-bottom: 1px #d9d9d9 dashed;*/
+    height: 30px;
+    margin-bottom: 30px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batchUpdateDeadline.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batchUpdateDeadline.vue
new file mode 100644
index 000000000..df10263db
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batchUpdateDeadline.vue
@@ -0,0 +1,196 @@
+<template>
+  <a-modal
+    :title="$t('batchUpdateDeadline')"
+    :width="500"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleOk"
+    @cancel="visible = false"
+  >
+    <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="Required">*</span>
+              <span class="title-text-text"
+                    :title="$t('Deadline')">{{$t('Deadline')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" :prop="'deadline'">
+              <a-date-picker class="box-input"
+                             :placeholder="$t('PleaseSelect')+$t('Deadline')"
+                             :getCalendarContainer="(trigger) => trigger.parentNode"
+                             format="YYYY-MM-DD"
+                             v-model="formInline.deadline"
+                             style="width: 100%"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+
+      </a-row>
+    </a-form-model>
+  </a-modal>
+</template>
+
+<script>
+  import moment from 'moment'
+  import { postAction, putAction, getAction } from '@/api/manage'
+
+  export default {
+    name: 'batchUpdateDeadline',
+    data() {
+      return {
+        visible: false,
+        confirmLoading: false,
+        formInline: {},
+        rules: {
+          deadline: [
+            {
+              required: true,
+              message: this.$t('Deadline') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ]
+        },
+        idList: []
+      }
+    },
+    mounted() {
+    },
+    methods: {
+      handleOk() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            let query = {
+              ids: this.idList.join(','),
+              deadline: moment(this.formInline.deadline).format('YYYY-MM-DD HH:mm:ss')
+            }
+            this.confirmLoading = true
+            postAction('/params/collectManifest/batchEditDeadline', query).then((res) => {
+              if (res.success) {
+                this.visible = false
+                this.confirmLoading = false
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.$emit('batchUpdateDeadlineForm')
+              } else {
+                this.$message.warning(this.$t('operationFailed'))
+                this.confirmLoading = false
+              }
+            })
+          }
+        })
+      },
+      getData(data) {
+        this.idList = []
+        if (data && data.length > 0) {
+          data.forEach(res => {
+            this.idList.push(res.id)
+          })
+          this.visible = true
+          this.formInline = {}
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      }
+    }
+  }
+</script>
+
+
+<style>
+  .formAdd .ant-form-item-label {
+    width: 130px;
+  }
+
+  .formAdd .ant-form-item-control-wrapper {
+    display: inline-block;
+    width: 100%;
+  }
+
+  /*.formAdd .ant-form-item {*/
+  /*  margin-bottom: 20px;*/
+  /*}*/
+
+  .itemModel .ant-form-item-control-wrapper {
+    width: 100%;
+  }
+
+  .box-input .ant-select-selection--single {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple .ant-select-selection__rendered > ul > li {
+    margin-top: 6px;
+  }
+
+  .box-input .ant-calendar-picker {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-calendar-picker-input {
+    height: 38px;
+  }
+
+  .box-input .ant-input-number-input-wrap {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-calendar-picker-input {
+    padding: 4px 30px 4px 11px;
+  }
+</style>
+<style scoped>
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+  }
+
+  .title-text {
+    width: 104px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 42px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .formAdd {
+    margin-bottom: 40px;
+  }
+  .Required{
+     color: red;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue
new file mode 100644
index 000000000..b1deb6f1d
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue
@@ -0,0 +1,401 @@
+<!--平台件-->
+<template>
+  <div>
+    <div class="box-content">
+      <div class="box-content-left">
+        <div class="total-text">
+          <span>{{$t('totalTable')+' : '+mainLeftNum}}</span>
+        </div>
+        <div id="main-left"></div>
+      </div>
+      <div class="box-content-right">
+        <div class="total-text">
+          <span>{{$t('totalTable')+' : '+mainRightNum}}</span>
+        </div>
+        <div id="main-right"></div>
+      </div>
+    </div>
+<!--    <div class="box-content">-->
+<!--      <div class="box-content-bottom">-->
+<!--        <div class="total-text-text" :class="{'total-text-text-cntop':long == 'zh-cn' ? true:false,-->
+<!--        'total-text-text-entop':long == 'zh-cn' ? false:true}">-->
+<!--          <span>{{$t('totalTable')+' : '+mainBottomNum}}</span>-->
+<!--        </div>-->
+<!--        <div class="box-content-text">-->
+<!--          <div class="box-content-text-text" @click="boxContentClick(0)">-->
+<!--            {{$t('whole')}}-->
+<!--          </div>-->
+<!--          <div class="box-content-text-text" @click="boxContentClick(1)">-->
+<!--            {{$t('completeVehicle')}}-->
+<!--          </div>-->
+<!--          <div class="box-content-text-text" @click="boxContentClick(2)">-->
+<!--            {{$t('components')}}-->
+<!--          </div>-->
+<!--        </div>-->
+<!--        <div id="main-bottom"></div>-->
+<!--      </div>-->
+<!--    </div>-->
+    <responsibilityList @responsibility="responsibility" ref="responsibilityListRef"/>
+  </div>
+
+</template>
+
+<script>
+  import * as echarts from 'echarts'
+  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+  import responsibilityList from './responsibilityList'
+
+  export default {
+    name: 'certificationActivity',
+    components: {
+      responsibilityList
+    },
+    props: {
+      idList: {
+        type: Array,
+        default: []
+      }
+    },
+    data() {
+      return {
+        url: {
+          getProjectDetailsStatistics: '/project/projectLibraryBase/getProjectDetailsStatistics'
+        },
+        certificationProgressMap: {},
+        num: '0',
+        mainLeftNum: 0,
+        mainRightNum: 0,
+        mainBottomNum: 0,
+        long: localStorage.getItem('language') || 'zh-cn'
+      }
+    },
+    mounted() {
+      this.num = '0'
+      let boxContentTextColor = document.getElementsByClassName('box-content-text-color')
+      if (boxContentTextColor && boxContentTextColor.length > 0) {
+        boxContentTextColor[0].classList.remove('box-content-text-color')
+      }
+      let boxContentTextText = document.getElementsByClassName('box-content-text-text')
+      if (boxContentTextText && boxContentTextText.length > 0) {
+        boxContentTextText[0].classList.add('box-content-text-color')
+      }
+      this.getData()
+    },
+    methods: {
+      getData() {
+        let id = ''
+        if (this.idList && this.idList.length > 0) {
+          id = this.idList.join(',')
+        } else {
+          id = this.$route.query.id
+        }
+        getAction(this.url.getProjectDetailsStatistics, { id: id }).then((res) => {
+          if (res.success) {
+            if (res.result) {
+              let rzTaskToConfirmMapList = res.result.rzTaskToConfirmMap ? res.result.rzTaskToConfirmMap.rzTaskToConfirmMapList : []
+              let prehomoMapList = res.result.prehomoMap ? res.result.prehomoMap.prehomoMapList : []
+              this.certificationProgressMap = res.result.certificationProgressMap
+              let allMapList = res.result.certificationProgressMap ? res.result.certificationProgressMap.allMapList : []
+              this.dataEcharts(rzTaskToConfirmMapList)
+              this.mainRightEcharts(prehomoMapList)
+            }
+          }
+        })
+      },
+      dataEcharts(dataSource) {
+        let data = []
+        let color = []
+        this.mainLeftNum = 0
+        if (dataSource && dataSource.length > 0) {
+          this.dataSource = [{}]
+          dataSource.forEach(res => {
+            if (res.taskAffirmStatus == 'Not started') {
+              data.push({
+                value: res.taskAffirmStatusCount,
+                name: this.$t('notLaunch'),
+                color: '#00B3BE',
+                status: res.taskAffirmStatus
+              })
+              color.push('#00B3BE')
+            } else if (res.taskAffirmStatus == 'List to confirm') {
+              data.push({
+                value: res.taskAffirmStatusCount,
+                name: this.$t('listToConfirm'),
+                color: '#FDA71C',
+                status: res.taskAffirmStatus
+              })
+              color.push('#FDA71C')
+            } else if (res.taskAffirmStatus == 'Accepted') {
+              data.push({
+                value: res.taskAffirmStatusCount,
+                name: this.$t('accept'),
+                color: '#26BC4B',
+                status: res.taskAffirmStatus
+              })
+              color.push('#26BC4B')
+            } else if (res.taskAffirmStatus == 'Rejected') {
+              data.push({
+                value: res.taskAffirmStatusCount,
+                name: this.$t('refuse'),
+                color: '#E83030',
+                status: res.taskAffirmStatus
+              })
+              color.push('#E83030')
+            }
+            this.mainLeftNum += res.taskAffirmStatusCount
+          })
+        }
+        this.getEcharts('main-left', this.$t('certificationTaskConfirmation'), color, data)
+      },
+      mainRightEcharts(dataSource) {
+        let data = []
+        let color = []
+        this.mainRightNum = 0
+        if (dataSource && dataSource.length > 0) {
+          this.dataSource = [{}]
+          dataSource.forEach(res => {
+            if (res.taskAffirmStatus == 'Not started') {
+              data.push({
+                value: res.taskAffirmStatusCount,
+                name: this.$t('notLaunch'),
+                color: '#00B3BE',
+                status: res.taskAffirmStatus
+              })
+              color.push('#00B3BE')
+            } else if (res.taskAffirmStatus == 'List to confirm') {
+              data.push({
+                value: res.taskAffirmStatusCount,
+                name: this.$t('listToConfirm'),
+                color: '#FDA71C',
+                status: res.taskAffirmStatus
+              })
+              color.push('#FDA71C')
+            } else if (res.taskAffirmStatus == 'Review and pass') {
+              data.push({
+                value: res.taskAffirmStatusCount,
+                name: this.$t('reviewAndPass'),
+                color: '#26BC4B',
+                status: res.taskAffirmStatus
+              })
+              color.push('#26BC4B')
+            } else if (res.taskAffirmStatus == 'Review and return') {
+              data.push({
+                value: res.taskAffirmStatusCount,
+                name: this.$t('reviewAndReturn'),
+                color: '#E83030',
+                status: res.taskAffirmStatus
+              })
+              color.push('#E83030')
+            }
+            this.mainRightNum += res.taskAffirmStatusCount
+          })
+        }
+        this.getEcharts('main-right', this.$t('preHomoFlow'), color, data)
+      },
+      getEcharts(chart, title, color, data) {
+        var myChart = echarts.init(document.getElementById(chart))
+        myChart.setOption({
+          title: {
+            text: title
+          },
+          tooltip: {
+            trigger: 'item',
+            textStyle: {
+              fontWeight: 'normal',
+              fontSize: 14,
+              color: '#040B29',
+              fontFamily: 'BlueSkyNoto'
+            },
+            formatter: function(parms) {
+              let str = parms.marker + ' ' + parms.data.name + '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' + parms.data.value + ' (' + parms.percent + '%)'
+              return str
+            }
+          },
+          legend: {
+            itemWidth: 12,
+            itemHeight: 12,
+            bottom: '0',
+            left: 'center',
+            itemGap: 30,
+            icon: 'circle'
+          },
+          series: [
+            {
+              name: title,
+              type: 'pie',
+              radius: ['40%', '54%'],
+              avoidLabelOverlap: false,
+              label: {
+                show: false,
+                position: 'center'
+              },
+              labelLine: {
+                show: false
+              },
+              color: color,
+              data: data
+            }
+          ]
+        })
+        myChart.off('click') // 重点代码
+        myChart.on('click', (params) => {
+          console.log(params)
+          let query = {
+            title: params.seriesName+'-'+params.name,
+            projectLibraryId: this.$route.query.id
+          }
+          if (params.seriesName === this.$t('certificationTaskConfirmation')) {
+            query.operatorType = 'queryRZTaskToConfirmStatistics'
+            query.status = params.data.status
+          } else if (params.seriesName === this.$t('preHomoFlow')) {
+            query.operatorType = 'queryPrehomoStatistics'
+            query.status = params.data.status
+          } else if (params.seriesName === this.$t('CertificationProgress')) {
+            if (this.num == '0') {
+              query.operatorType = 'queryCertificationProgressStatisticsAll'
+            } else if (this.num == '1') {
+              query.operatorType = 'queryCertificationProgressStatisticsCar'
+            } else if (this.num == '2') {
+              query.operatorType = 'queryCertificationProgressStatisticsPart'
+            }
+            query.status = params.data.status
+          }
+          this.$refs.responsibilityListRef.getData(query)
+        })
+      },
+
+      responsibility(item) {
+        this.$emit('currentStatus', item)
+      },
+      boxContentClick(num) {
+
+        let boxContentTextColor = document.getElementsByClassName('box-content-text-color')
+        if (boxContentTextColor && boxContentTextColor.length > 0) {
+          boxContentTextColor[0].classList.remove('box-content-text-color')
+        }
+        let boxContentTextText = document.getElementsByClassName('box-content-text-text')
+        if (boxContentTextText && boxContentTextText.length > 0) {
+          boxContentTextText[num].classList.add('box-content-text-color')
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  .box-content {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+    /*margin-bottom: 20px;*/
+
+    .box-content-left {
+      width: calc(50% - 10px);
+      height: 346px;
+      position: relative;
+      border: 2px #eff1f3 solid;
+      border-radius: 6px;
+      margin-top: 4px;
+
+      #main-left {
+        width: 100%;
+        height: 100%;
+        padding: 20px 24px;
+        box-sizing: border-box;
+      }
+    }
+
+    .box-content-right {
+      width: calc(50% - 10px);
+      height: 346px;
+      position: relative;
+      border: 2px #eff1f3 solid;
+      border-radius: 6px;
+      margin-top: 4px;
+
+      #main-right {
+        width: 100%;
+        height: 100%;
+        padding: 20px 24px;
+        box-sizing: border-box;
+      }
+    }
+
+    .box-content-bottom {
+      width: 100%;
+      height: 346px;
+      border: 2px #eff1f3 solid;
+      position: relative;
+      border-radius: 6px;
+      margin-top: 20px;
+      overflow: hidden;
+
+      .box-content-text {
+        height: 30px;
+        background: #F5F6F7;
+        border-radius: 4px;
+        position: absolute;
+        right: 24px;
+        top: 20px;
+        display: flex;
+        z-index: 100;
+        justify-content: space-between;
+        padding: 0 2px 0 2px;
+
+        .box-content-text-text {
+          display: inline-block;
+          font-size: 12px;
+          color: #6F7385;
+          line-height: 30px;
+          margin-right: 10px;
+          cursor: pointer;
+          margin-left: 10px;
+        }
+
+        .box-content-text-color {
+          box-shadow: 0px 1px 2px rgba(0, 0, 60, 0.01), 0px 2px 4px rgba(0, 22, 60, 0.02), 0px 4px 6px rgba(0, 22, 60, 0.0229458);
+          border-radius: 4px;
+          padding: 4px 6px;
+          background: #FFFFFF;
+          border: 1px solid #E6E7EC;
+          color: #01A0AC;
+          line-height: normal;
+          margin-right: 0;
+          margin-left: 0;
+        }
+      }
+
+      #main-bottom {
+        width: 100%;
+        height: 100%;
+        padding: 20px 24px;
+        box-sizing: border-box;
+      }
+    }
+  }
+
+  .total-text {
+    position: absolute;
+    right: 28px;
+    top: 19px;
+    font-size: 18px;
+    font-weight: bold;
+  }
+
+  .total-text-text {
+    position: absolute;
+    right: 28px;
+    top: 21px;
+    font-size: 18px;
+    font-weight: bold;
+  }
+
+  .total-text-text-cntop {
+    right: 180px;
+  }
+
+  .total-text-text-entop {
+    right: 290px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationDirectory.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationDirectory.vue
new file mode 100644
index 000000000..e15fbb63f
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationDirectory.vue
@@ -0,0 +1,321 @@
+<template>
+  <div>
+    <a-drawer
+      :title="$t('CertificationDirectory')"
+      :maskClosable="false"
+      :width="1100"
+      placement="right"
+      :closable="true"
+      @close="handleCancel"
+      :visible="visible"
+      style="height: 100%;overflow: auto;padding-bottom: 53px;">
+      <div style="margin-bottom: 60px">
+        <div class="table-operator">
+          <div class="operator-text" v-if="isDisplayNum == 2 && roleSwitchingCode == 2"
+               @click="addData">
+            <a-icon type="plus"/>
+            {{$t('add')}}
+          </div>
+        </div>
+        <a-table
+          :components="drag(columns,'columnsAll')"
+          :columns="columns"
+          :scroll="{x: 900}"
+          :data-source="dataList"
+          :pagination="false"
+          :loading="loading">
+         <span slot="operation" slot-scope="text,record">
+          <a class="text" @click="edit(record)">
+                {{ $t('edit') }}
+          </a>
+           <a class="text" @click="deleteData(record)">
+                {{ $t('delete') }}
+          </a>
+         </span>
+          <span slot="operationFile" slot-scope="text,record">
+               <a @click="viewFileClick(text)" v-if="text">
+                 {{$t('viewFile')}}
+              </a>
+               <span v-else>--</span>
+          </span>
+        </a-table>
+        <div class="page" v-if="dataList.length > 0">
+          <a-pagination
+            :show-total="total => $t('total')+` ${total} `+$t('strip')"
+            show-quick-jumper
+            show-size-changer
+            :page-size.sync="pageSize"
+            :total="total"
+            :current="pageNo"
+            @change="onChange"
+            @showSizeChange="SizeChange"
+          />
+        </div>
+      </div>
+      <div class="drawer-bootom-button">
+        <!--        style="margin-right: 16px"-->
+        <a-button @click="handleCancel">{{$t('cancel')}}</a-button>
+        <!--        <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>-->
+      </div>
+    </a-drawer>
+    <certificationDirectoryAdd @certificationDirectoryList="certificationDirectoryList"
+                               ref="certificationDirectoryAddRef"/>
+    <viewFileModel ref="viewFileModelRef"/>
+  </div>
+
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+  import certificationDirectoryAdd from './certificationDirectoryAdd'
+  import viewFileModel from '@/components/viewFileModel/index'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+  export default {
+    name: 'certificationDirectory',
+    components: {
+      certificationDirectoryAdd,
+      viewFileModel
+    },
+    props: ['isDisplayNum','roleSwitchingCode'],
+    mixins:[ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        visible: false,
+        queryParam: {},
+        confirmLoading: false,
+        selectedRowKeys: [],
+        columnsAll: [
+          {
+            title: this.$t('directoryName'),
+            dataIndex: 'directoryName',
+            align: 'left',
+            ellipsis: true,
+            width: 132
+          },
+          {
+            title: this.$t('batch'),
+            dataIndex: 'lot',
+            align: 'left',
+            ellipsis: true,
+            width: 132
+          },
+          {
+            title: this.$t('catalogFile'),
+            dataIndex: 'directoryFile',
+            align: 'left',
+            ellipsis: true,
+            scopedSlots: { customRender: 'operationFile' },
+            width: 132
+          },
+          {
+            title: this.$t('testScheme'),
+            dataIndex: 'experimentFile',
+            align: 'left',
+            ellipsis: true,
+            scopedSlots: { customRender: 'operationFile' },
+            width: 132
+          },
+          {
+            title: this.$t('testReportLocation'),
+            dataIndex: 'detectionReportLocation',
+            align: 'left',
+            ellipsis: true,
+            width: 132
+          },
+          {
+            title: this.$t('explain'),
+            dataIndex: 'explainInfo',
+            align: 'left',
+            ellipsis: true,
+            width: 132
+          },
+          {
+            title: this.$t('uploadTime'),
+            dataIndex: 'uploadTime',
+            align: 'left',
+            ellipsis: true,
+            width: 130
+          },
+          {
+            title: this.$t('operation'),
+            align: 'left',
+            width: 130,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
+        dataList: [],
+        content: [],
+        loading: false,
+        pageNo: 1,
+        pageSize: 10,
+        total: 0,
+        url: {
+          page: '/project/projectCertificationDirectoryEO/page',
+          delete: '/project/projectCertificationDirectoryEO/delete'
+        }
+      }
+    },
+    computed: {
+      columns() {
+        let columnResult = JSON.parse(JSON.stringify(this.columnsAll))
+        if (this.roleSwitchingCode == 2 && this.isDisplayNum == 2){
+        }else{
+          for (var i = 0; i < columnResult.length; i++) {
+            if (columnResult[i].title === this.$t('operation')) {
+              columnResult.splice(i, 1)
+              i--
+            }
+          }
+        }
+        return columnResult
+      }
+    },
+    mounted() {
+
+    },
+    methods: {
+      addModel() {
+        this.visible = true
+        this.queryParam = {}
+        this.selectedRowKeys = []
+        this.replacePage()
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.replacePage()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.replacePage()
+      },
+      onChange(page, pageSize) {
+        this.pageNo = page
+        this.replacePage()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.replacePage()
+      },
+      replacePage() {
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          projectLibraryId: this.$route.query.id,
+          ...this.queryParam
+        }
+        this.loading = true
+        getAction(this.url.page, query).then((res) => {
+          if (res.success) {
+            this.dataList = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      handleSubmit() {
+        this.visible = false
+      },
+      edit(val) {
+        this.$refs.certificationDirectoryAddRef.edit(JSON.parse(JSON.stringify(val)))
+      },
+      deleteData(val) {
+        let _this = this
+        this.$confirm({
+          content: _this.$t('ConfirmDelete'),
+          onOk() {
+            deleteAction(_this.url.delete, { id: val.id }).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.replacePage()
+              } else {
+                _this.$message.warning(_this.$t('operationFailed'))
+              }
+            })
+          }
+        })
+      },
+      addData() {
+        this.$refs.certificationDirectoryAddRef.add()
+      },
+      certificationDirectoryList() {
+        this.pageNo = 1
+        this.replacePage()
+      },
+      viewFileClick(item) {
+        this.$refs.viewFileModelRef.clickButtonToUpload(item)
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  @import '~@assets/less/common.less';
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    z-index: 100;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+  }
+
+  .table-operator {
+    text-align: right;
+    margin-bottom: 20px;
+  }
+
+  .text {
+    margin-right: 8px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationDirectoryAdd.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationDirectoryAdd.vue
new file mode 100644
index 000000000..01505e1bf
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationDirectoryAdd.vue
@@ -0,0 +1,318 @@
+<template>
+  <div>
+    <a-drawer
+      :title="$t('add')"
+      :maskClosable="false"
+      :width="1000"
+      placement="right"
+      :closable="true"
+      @close="handleCancel"
+      :visible="visible"
+      style="height: 100%;overflow: auto;padding-bottom: 53px;">
+      <a-spin :spinning="confirmLoading">
+        <a-form-model :model="formInline"  :rules="rules" class="formAdd" ref="ruleForm">
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('directoryName')">{{$t('directoryName')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="directoryName">
+                  <a-input class="box-input"
+                           :disabled="disabled"
+                           v-model.trim="formInline.directoryName"
+                           :placeholder="$t('PleaseEnter')+$t('directoryName')"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('batch')">{{$t('batch')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="lot">
+                  <a-input class="box-input"
+                           :disabled="disabled"
+                           v-model.trim="formInline.lot"
+                           :placeholder="$t('PleaseEnter')+$t('batch')"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('catalogFile')">{{$t('catalogFile')}}</span>
+                </div>
+                <a-form-model-item class="itemModel">
+                  <a-button type="primary" class="button-text"
+                            @click="clickButtonToUpload('directoryFile')">
+                    {{ (formInline.directoryFile === 'null' || formInline.directoryFile === ''||
+                    formInline.directoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles') }}
+                  </a-button>
+                </a-form-model-item>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('testScheme')">{{$t('testScheme')}}</span>
+                </div>
+                <a-form-model-item class="itemModel">
+                  <a-button type="primary" class="button-text"
+                            @click="clickButtonToUpload('experimentFile')">
+                    {{ (formInline.experimentFile === 'null' || formInline.experimentFile === ''||
+                    formInline.experimentFile == null) ? $t('clickUpload') : $t('viewUploadedFiles') }}
+                  </a-button>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('testReportLocation')">{{$t('testReportLocation')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="detectionReportLocation">
+                  <a-input class="box-input"
+                           :disabled="disabled"
+                           v-model.trim="formInline.detectionReportLocation"
+                           :placeholder="$t('PleaseEnter')+$t('testReportLocation')"/>
+                </a-form-model-item>
+              </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('explain')">{{$t('explain')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="explainInfo">
+                  <a-textarea
+                    style="width: 100%"
+                    :placeholder="$t('PleaseEnter')+$t('explain')"
+                    v-model.trim="formInline.explainInfo" :rows="4"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+        </a-form-model>
+      </a-spin>
+      <div class="drawer-bootom-button">
+        <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+        <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+      </div>
+    </a-drawer>
+    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
+  </div>
+
+</template>
+
+<script>
+  import { getAction, postAction, putAction } from '@/api/manage'
+  import uploadFile from '@/components/uploadFile/file'
+
+  export default {
+    name: 'certificationDirectoryAdd',
+    components: {
+      uploadFile
+    },
+    data() {
+      return {
+        visible: false,
+        formInline: {},
+        rules:{
+          directoryName: [
+            {
+              max: 100,
+              message: this.$t('directoryName') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          lot: [
+            {
+              max: 100,
+              message: this.$t('batch') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          detectionReportLocation:[
+            {
+              max: 500,
+              message: this.$t('testReportLocation') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          explainInfo:[
+            {
+              max: 300,
+              message: this.$t('explain') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+        },
+        confirmLoading: false,
+        disabled: false,
+        url: {
+          add: '/project/projectCertificationDirectoryEO/add',
+          edit: '/project/projectCertificationDirectoryEO/edit'
+        }
+      }
+    },
+    mounted() {
+
+    },
+    methods: {
+      add() {
+        this.visible = true
+        this.formInline = {}
+        this.$nextTick(() => {
+          this.$refs.ruleForm.clearValidate()
+        })
+      },
+      edit(val) {
+        this.visible = true
+        this.$nextTick(() => {
+          this.formInline = val
+          this.$refs.ruleForm.clearValidate()
+        })
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      handleSubmit() {
+        this.$refs.ruleForm.validate(valid => {
+           if (valid){
+             if (!this.formInline.directoryName && !this.formInline.lot && !this.formInline.directoryFile &&
+               !this.formInline.experimentFile && !this.formInline.detectionReportLocation && !this.formInline.explainInfo) {
+               this.$message.warning(this.$t('dataCannotEmpty'))
+             } else {
+               let Action
+               let url = ''
+               if (this.formInline.id) {
+                 url = this.url.edit
+                 Action = putAction
+               } else {
+                 url = this.url.add
+                 Action = postAction
+               }
+               let query = {
+                 projectLibraryId: this.$route.query.id,
+                 ...this.formInline
+               }
+               this.confirmLoading = true
+               Action(url, query).then((res) => {
+                 if (res.success) {
+                   this.$message.success(this.$t('OperationSuccessful'))
+                   this.visible = false
+                   this.confirmLoading = false
+                   this.$emit('certificationDirectoryList')
+                 } else {
+                   this.confirmLoading = false
+                   this.$message.warning(res.message)
+                 }
+               })
+             }
+           }
+        })
+      },
+      clickButtonToUpload(item) {
+        this.$refs.uploadFile.perentHandleFunc()
+        this.$refs.uploadFile.visible = true
+        this.uploadName = item
+        getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
+          if (res.success) {
+            this.$refs.uploadFile.perentHandleFunc(res.result)
+          } else {
+            this.$refs.uploadFile.perentHandleFunc()
+          }
+        })
+      },
+      /** 上传文件的回调 */
+      uploadSuccess(data) {
+        let attIdList = []
+        if (data && data.length > 0) {
+          data.map(item => {
+            attIdList.push(item.id || data.name)
+          })
+        }
+        /** 赋值给当前对应的表单文件 */
+        this.formInline[this.uploadName] = attIdList.join(',')
+        this.formInline = { ...this.formInline }
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    z-index: 100;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    /*align-items: center;*/
+  }
+
+  .title-text {
+    width: 114px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 48px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+    height: 40px;
+    margin-bottom: 24px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+
+  .formAdd {
+    margin-bottom: 40px;
+  }
+
+  .button-text {
+    height: 38px;
+    width: calc(100% - 100px);
+    line-height: 38px;
+    background: #fff;
+    border: 1px #00B3BE solid;
+    color: #00B3BE;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addCodeNumber.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addCodeNumber.vue
new file mode 100644
index 000000000..dc711e17d
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addCodeNumber.vue
@@ -0,0 +1,289 @@
+<template>
+  <div>
+    <a-drawer
+      :title="$t('regulationNo')"
+      :width="1000"
+      :visible="visible"
+      placement="right"
+      :maskClosable="false"
+      :closable="true"
+      @close="handleCancel"
+      style="height: 100%;overflow: auto;padding-bottom: 53px;">
+      <div style="margin-bottom: 60px">
+        <div class="table-page-search-wrapper">
+          <a-form layout="inline" @keyup.enter.native="searchQuery">
+            <a-row :gutter="24">
+              <a-col :md="12" :sm="8">
+                <div class="box-title-text">
+                  <div class="title-text" :title="$t('standard')">
+                    <span>{{$t('standard')}}</span>
+                  </div>
+                  <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                           v-model="queryParam.serialNumber"></j-input>
+                </div>
+              </a-col>
+              <template v-if="toggleSearchStatus">
+                <a-col :md="12" :sm="8">
+                  <div class="box-title-text">
+                    <div class="title-text" :title="$t('title')">
+                      <span>{{$t('title')}}</span>
+                    </div>
+                    <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                             v-model="queryParam.title"></j-input>
+                  </div>
+                </a-col>
+                <a-col :md="12" :sm="8">
+                  <div class="box-title-text">
+                    <div class="title-text" :title="$t('areaOfResponsibility')">
+                      <span>{{$t('areaOfResponsibility')}}</span>
+                    </div>
+                    <j-dict-select-tag class="box-input"
+                                       v-model="queryParam.dutyTerritory"
+                                       :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                       :type="'select'"
+                                       :triggerChange="false" :dictCode="'duty_territory'"/>
+                  </div>
+                </a-col>
+              </template>
+              <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
+               <a-col :md="12" :sm="24">
+                  <a @click="handleToggleSearch">
+                            {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                            <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                  </a>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+               </a-col>
+            </span>
+            </a-row>
+          </a-form>
+        </div>
+
+        <div style="width: 100%">
+          <a-table
+            :columns="columns"
+            rowKey="id"
+            :scroll="{x: '100%',y:'calc(100vh - 300px)'}"
+            :data-source="dataList"
+            :pagination="false"
+            :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange ,columnTitle:' '}"
+            :loading="loading">
+          </a-table>
+        </div>
+        <!--        <div class="page" v-if="dataList.length > 0">
+                  <a-pagination
+                    :show-total="total => $t('total')+` ${total} `+$t('strip')"
+                    show-quick-jumper
+                    show-size-changer
+                    :page-size.sync="pageSize"
+                    :total="total"
+                    :current="pageNo"
+                    @change="onChange"
+                    @showSizeChange="SizeChange"
+                  />
+                </div>-->
+      </div>
+
+
+      <div class="drawer-bootom-button">
+        <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+        <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+      </div>
+    </a-drawer>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+  export default {
+    name: 'addCodeNumber',
+    mixins: [ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        url: {
+          addModelList: '/project/projectLawsInventoryEO/list'
+        },
+        visible: false,
+        toggleSearchStatus: false,
+        columns: [
+          {
+            title: this.$t('standard'),
+            dataIndex: 'serialNumber',
+            align: 'left',
+            ellipsis: true,
+            width: 250
+          },
+          {
+            title: this.$t('title'),
+            dataIndex: 'title',
+            align: 'left',
+            ellipsis: true,
+            width: 250
+          },
+          {
+            title: this.$t('certificationType'),
+            dataIndex: 'attestationType_dictText',
+            align: 'left',
+            ellipsis: true,
+            width: 190
+          },
+          {
+            title: this.$t('areaOfResponsibility'),
+            dataIndex: 'dutyTerritory_dictText',
+            align: 'left',
+            ellipsis: true,
+            width: 100
+          }
+        ],
+        dataList: [],
+        selectedRowKeys: [],
+        loading: false,
+        pageNo: 1,
+        pageSize: 10,
+        total: 0,
+        queryParam: {},
+        confirmLoading: false
+      }
+    },
+    mounted() {
+
+    },
+    methods: {
+      handleToggleSearch() {
+        this.toggleSearchStatus = !this.toggleSearchStatus
+      },
+      add() {
+        this.visible = true
+        this.queryParam = {}
+        this.selectedRowKeys = []
+        this.replacePage()
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.replacePage()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.replacePage()
+      },
+      onChange(page, pageSize) {
+        this.pageNo = page
+        this.replacePage()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.replacePage()
+      },
+      replacePage() {
+        let query = {
+          // pageNo: this.pageNo,
+          // pageSize: this.pageSize,
+          ...this.queryParam,
+          projectLibraryId: this.$route.query.id,
+          roleCode: 0
+        }
+        this.loading = true
+        getAction(this.url.addModelList, query).then((res) => {
+          if (res.success) {
+            this.dataList = res.result || []
+            // this.total = res.result.total
+            this.loading = false
+          } else {
+            this.dataList = []
+            this.total = 0
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value, row) {
+        this.selectedRowKeys = value
+        if (this.selectedRowKeys.length > 1) {
+          this.selectedRowKeys.shift()
+        }
+        this.selectedRowList = row
+        if (this.selectedRowList.length > 1) {
+          this.selectedRowList.shift()
+        }
+      },
+      handleSubmit() {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.confirmLoading = true
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          if (this.selectedRowKeys.length < 2) {
+            let fgid = this.selectedRowList[0].standId
+            let regulationIndex = this.selectedRowList[0].serialNumber
+            this.confirmLoading = false
+            this.visible = false
+            this.$emit('regulation', regulationIndex, fgid)
+          } else {
+            this.$message.warning(this.$t('OnlyOneSelected'))
+            this.confirmLoading = false
+          }
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+          this.confirmLoading = false
+        }
+      }
+    }
+  }
+</script>
+
+<style lang='less' scoped>
+  @import '~@assets/less/common.less';
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 100%;
+    height: 38px;
+  }
+
+  .box-button {
+    height: 38px;
+  }
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    z-index: 100;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addConfiguration.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addConfiguration.vue
new file mode 100644
index 000000000..50f854958
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addConfiguration.vue
@@ -0,0 +1,140 @@
+<template>
+  <a-modal
+    :title="$t('addConfiguration')"
+    :width="600"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleOk"
+    @cancel="handleCancel"
+  >
+    <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="Required">*</span>
+              <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" prop="configItem">
+              <a-input class="box-input"
+                       v-model.trim="formInline.configItem"
+                       :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+    </a-form-model>
+  </a-modal>
+</template>
+
+<script>
+  import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
+
+  export default {
+    name: 'addConfiguration',
+    data() {
+      return {
+        visible: false,
+        confirmLoading: false,
+        formInline: {},
+        ids: [],
+        rules: {
+          configItem: [
+            {
+              required: true,
+              message: this.$t('configurationItem') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
+            {
+              max: 100,
+              message: this.$t('configurationItem') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ]
+        }
+      }
+    },
+    methods: {
+      getData(ids) {
+        this.visible = true
+        this.ids = ids
+        this.formInline = {}
+        this.$nextTick(() => {
+          this.$refs.ruleForm.clearValidate()
+        })
+      },
+      handleOk() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            let query = {
+              ids: this.ids.join(','),
+              configItem: this.formInline.configItem
+            }
+            this.confirmLoading = true
+            postAction('/project/projectCertificationInventoryEO/addConfigByIds', query).then((res) => {
+              if (res.success) {
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.confirmLoading = false
+                this.visible = false
+                this.$emit('addConfigurationForm')
+              } else {
+                this.$message.warning(this.$t('operationFailed'))
+                this.confirmLoading = false
+              }
+            })
+          }
+        })
+      },
+      handleCancel() {
+        this.visible = false
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+  }
+
+  .title-text {
+    width: 104px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 42px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .formAdd {
+    margin-bottom: 40px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
new file mode 100644
index 000000000..b47e38a8d
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
@@ -0,0 +1,1238 @@
+<template>
+  <div>
+    <a-drawer
+      :title="title"
+      :maskClosable="false"
+      :width="1000"
+      placement="right"
+      :closable="true"
+      @close="handleCancel"
+      :visible="visible"
+      style="height: 100%;overflow: auto;padding-bottom: 53px;">
+      <a-spin :spinning="confirmLoading">
+        <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required" v-if="!this.formInline.id">*</span>
+                  <span class="title-text-text" :title="$t('regulationNo')">{{$t('regulationNo')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="serialNumber">
+                  <!--                  <a-select :placeholder="$t('PleaseSelect')+$t('regulationNo')"-->
+                  <!--                            optionFilterProp="label"-->
+                  <!--                            v-if="!this.formInline.id"-->
+                  <!--                            @change="serialNumberChange"-->
+                  <!--                            :disabled="this.formInline.id?true:false"-->
+                  <!--                            showSearch-->
+                  <!--                            v-model="formInline.bussDocumentLibraryId">-->
+                  <!--                    <a-select-option v-for="(item, key) in projectNameList"-->
+                  <!--                                     :label="item.serialNumber"-->
+                  <!--                                     :key="key"-->
+                  <!--                                     :value="item.standId">-->
+                  <!--                     <span style="display: inline-block;width: 100%"-->
+                  <!--                           :title=" item.serialNumber ">-->
+                  <!--                           {{ item.serialNumber}}-->
+                  <!--                     </span>-->
+                  <!--                    </a-select-option>-->
+                  <!--                  </a-select>-->
+                  <a-input @click.native="serialNumberClick"
+                           class="box-input"
+                           v-if="!this.formInline.id"
+                           :placeholder="$t('PleaseSelect')+$t('regulationNo')"
+                           v-model="formInline.serialNumber"></a-input>
+                  <a-input class="box-input"
+                           :disabled="true"
+                           v-else
+                           v-model.trim="formInline.serialNumber"
+                           :placeholder="$t('PleaseEnter')+this.$t('regulationNo')"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text" :title="'WVTA ID'">WVTA ID</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="wvtaId">
+                  <a-input class="box-input"
+                           v-model.trim="formInline.wvtaId"
+                           :placeholder="$t('PleaseEnter')+'WVTA ID'"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <div v-if="!formInline.id">
+            <div v-for="(item,index) in formInline.dataList" :key="index">
+              <div class="header-text">
+                {{$t('itemInformation')}}
+                <a-icon class="icon-text" @click="addClick(index)" type="plus-circle"/>
+                <a-icon class="icon-text" v-if="formInline.dataList.length > 1" @click="deleteClick(index)"
+                        type="minus-circle"/>
+              </div>
+              <a-row :gutter="24">
+                <a-col :span="12">
+                  <div class="box-title-text">
+                    <div class="title-text">
+                      <span class="Required">*</span>
+                      <span class="title-text-text" :title="$t('category')">{{$t('category')}}</span>
+                    </div>
+                    <a-form-model-item
+                      class="itemModel"
+                      :prop="'dataList.'+index+'.category'"
+                      :rules="[{ required: true, message: $t('category') + $t('cannotEmpty'), trigger: 'blur'},
+                             {max: 300,message: $t('category') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
+                            }]"
+                    >
+                      <a-input class="box-input"
+                               v-model.trim="item.category"
+                               :placeholder="$t('PleaseEnter')+$t('category')"/>
+                    </a-form-model-item>
+                  </div>
+                </a-col>
+                <a-col :span="12">
+                  <div class="box-title-text">
+                    <div class="title-text">
+                      <span class="Required">*</span>
+                      <span class="title-text-text" :title="$t('inspectionItems')">{{$t('inspectionItems')}}</span>
+                    </div>
+                    <a-form-model-item class="itemModel"
+                                       :prop="'dataList.'+index+'.inspectionItem'"
+                                       :rules="[{ required: true, message: $t('inspectionItems') + $t('cannotEmpty'), trigger: 'blur'},
+                             {max: 300,message: $t('inspectionItems') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
+                            }]">
+                      <a-input class="box-input"
+                               v-model.trim="item.inspectionItem"
+                               :placeholder="$t('PleaseEnter')+$t('inspectionItems')"/>
+                    </a-form-model-item>
+                  </div>
+                </a-col>
+              </a-row>
+              <a-row :gutter="24">
+                <a-col :span="12">
+                  <div class="box-title-text">
+                    <div class="title-text">
+                      <span class="Required">*</span>
+                      <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
+                    </div>
+                    <a-form-model-item
+                      class="itemModel"
+                      :prop="'dataList.'+index+'.configItem'"
+                      :rules="[{ required: true, message: $t('configurationItem') + $t('cannotEmpty'), trigger: 'blur'},
+                             {max: 300,message: $t('configurationItem') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
+                            }]"
+                    >
+                      <a-input class="box-input"
+                               v-model.trim="item.configItem"
+                               :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>
+                      <!--                      <j-dict-select-tag class="box-input" v-model="item.configItem"-->
+                      <!--                                         @input="handleInput('dataList.'+index+'.configItem')"-->
+                      <!--                                         :placeholder="$t('PleaseSelect')+$t('configurationItem')"-->
+                      <!--                                         :type="'select'"-->
+                      <!--                                         :triggerChange="false" :dictCode="'ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4'"/>-->
+                    </a-form-model-item>
+                  </div>
+                </a-col>
+                <a-col :span="12">
+                  <div class="box-title-text">
+                    <div class="title-text">
+                      <span class="Required">*</span>
+                      <span class="title-text-text"
+                            :title="$t('certificationType')">{{$t('certificationType')}}</span>
+                    </div>
+                    <a-form-model-item class="itemModel-multi"
+                                       :prop="'dataList.'+index+'.attestationType'"
+                                       :rules="[{ required: true, message: $t('certificationType') + $t('cannotEmpty'), trigger: 'change'},]"
+                    >
+                      <j-multi-select-tag class="box-input" v-model="item.attestationType"
+                                          :placeholder="$t('PleaseSelect')+$t('certificationType')"
+                                          :type="'select'"
+                                          :triggerChange="false"
+                                          :dictCode="'ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2'"/>
+                    </a-form-model-item>
+                  </div>
+                </a-col>
+              </a-row>
+              <a-row :gutter="24">
+                <a-col :span="12">
+                  <div class="box-title-text">
+                    <div class="title-text">
+                      <span class="Required">*</span>
+                      <span class="title-text-text"
+                            :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
+                    </div>
+                    <a-form-model-item class="itemModel-multi"
+                                       :prop="'dataList.'+index+'.dutyDepart'"
+                                       :rules="[{ required: true, message: $t('statisticalNodes') + $t('cannotEmpty'), trigger: 'change'},]"
+                    >
+                      <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
+                                class="box-input"
+                                optionFilterProp="label"
+                                mode="multiple"
+                                @change="DutyDepartChange(index)"
+                                :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                                v-model="item.dutyDepart">
+                        <a-select-option v-for="(val, key) in firstLevelDutyTerritoryList"
+                                         :key="key"
+                                         :label="val.key"
+                                         :value="val.key">
+                               <span style="display: inline-block;width: 100%" :title=" val.key ">
+                                     {{ val.key }}
+                               </span>
+                        </a-select-option>
+                      </a-select>
+                    </a-form-model-item>
+                  </div>
+                </a-col>
+                <a-col :span="12">
+                  <div class="box-title-text">
+                    <div class="title-text">
+                      <span class="Required">*</span>
+                      <span class="title-text-text"
+                            :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
+                    </div>
+                    <a-form-model-item class="itemModel"
+                                       :prop="'dataList.'+index+'.dutyTerritory'"
+                                       :rules="[{ required: true, message: $t('areaOfResponsibility') + $t('cannotEmpty'), trigger: 'change'},]"
+                    >
+                      <a-select :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                class="box-input"
+                                optionFilterProp="label"
+                                mode="multiple"
+                                @change="dutyHandleChange(index)"
+                                :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                                v-model="item.dutyTerritory">
+                        <a-select-option v-for="(val, key) in item.dutyTerritoryList"
+                                         :key="key"
+                                         :label="val.itemText"
+                                         :value="val.itemValue">
+                               <span style="display: inline-block;width: 100%" :title=" val.itemText ">
+                                     {{ val.itemText }}
+                               </span>
+                        </a-select-option>
+                      </a-select>
+                      <!--                      <j-dict-select-tag class="box-input" v-model="item.dutyTerritory"-->
+                      <!--                                         @input="handleInput('dataList.'+index+'.dutyTerritory')"-->
+                      <!--                                         @changeQuery="dutyHandleChange(index)"-->
+                      <!--                                         :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
+                      <!--                                         :type="'select'"-->
+                      <!--                                         :triggerChange="false" :dictCode="'duty_territory'"/>-->
+                    </a-form-model-item>
+                  </div>
+                </a-col>
+              </a-row>
+
+              <a-row :gutter="24">
+                <a-col :span="12">
+                  <div class="box-title-text">
+                    <div class="title-text">
+                      <span class="Required" v-if="item.deliverableType != '1635545748968783874'">*</span>
+                      <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
+                    </div>
+                    <a-form-model-item class="itemModel"
+                                       :prop="item.deliverableType == '1635545748968783874'?'':'dataList.'+index+'.sdt'"
+                                       :rules="[{ required: item.deliverableType == '1635545748968783874'?false:true, message: $t('engineeringInterfacePerson') + $t('cannotEmpty'), trigger: 'change'},]"
+                    >
+                      <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
+                                optionFilterProp="label"
+                                showSearch
+                                @change="handleInput('dataList.'+index+'.sdt',item.sdt,index,item.engineeringInterfacePersonList)"
+                                v-model="item.sdt">
+                        <a-select-option v-for="(val, key) in item.engineeringInterfacePersonList"
+                                         :label="val.name"
+                                         :key="key"
+                                         :value="val.value">
+                     <span style="display: inline-block;width: 100%"
+                           :title=" val.name ">
+                           {{ val.name}}
+                     </span>
+                        </a-select-option>
+                      </a-select>
+                    </a-form-model-item>
+                  </div>
+                </a-col>
+                <a-col :span="12">
+                  <div class="box-title-text">
+                    <div class="title-text">
+                      <span class="Required">*</span>
+                      <span class="title-text-text"
+                            :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
+                    </div>
+                    <a-form-model-item class="itemModel"
+                                       style="display: inline-block"
+                                       :prop="'dataList.'+index+'.deliverableType'"
+                                       :rules="[{ required: true, message: $t('typeOfDeliverables') + $t('cannotEmpty'), trigger: 'change'},]"
+                    >
+                      <!--
+                       :maxTagCount="1"
+                       tree-checkable-->
+                      <a-tree-select
+                        tree-node-filter-prop="title"
+                        v-model="item.deliverableType"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        class="box-input"
+                        style="width: 100%"
+                        :tree-data="DeliverableTreeList"
+                        :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
+                      />
+                    </a-form-model-item>
+                  </div>
+                </a-col>
+              </a-row>
+              <a-row :gutter="24">
+                <a-col :span="12">
+                  <div class="box-title-text">
+                    <div class="title-text">
+                    <span class="title-text-text"
+                          :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
+                    </div>
+                    <a-form-model-item class="itemModel" prop="deliverableTemplate">
+                      <a-button type="primary" class="button-text"
+                                @click="clickButtonToUpload('deliverableTemplate',index,true)">
+                        {{ (item.deliverableTemplate === 'null' || item.deliverableTemplate === ''
+                        ||
+                        item.deliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                        }}
+                      </a-button>
+                    </a-form-model-item>
+                  </div>
+                </a-col>
+                <a-col :span="12">
+                  <div class="box-title-text">
+                    <div class="title-text">
+                      <span class="Required" v-if="item.deliverableType != '1635545748968783874'">*</span>
+                      <span class="title-text-text" :title="$t('closingDate')">{{$t('closingDate')}}</span>
+                    </div>
+                    <a-form-model-item class="itemModel"
+                                       :prop="item.deliverableType == '1635545748968783874'?'':'dataList.'+index+'.endTime'"
+                                       :rules="[{ required: item.deliverableType == '1635545748968783874'?false:true, message: $t('closingDate') + $t('cannotEmpty'), trigger: 'change'},]"
+                    >
+                      <a-date-picker class="box-input"
+                                     :placeholder="$t('PleaseSelect')+$t('closingDate')"
+                                     @change="dateChange({db_field_name:'endTime'},index)"
+                                     format="YYYY-MM-DD"
+                                     :disabledDate="disabledDate"
+                                     :getCalendarContainer="(trigger) => trigger.parentNode"
+                                     v-model="item.endTime"
+                                     style="width: 100%"/>
+                    </a-form-model-item>
+                  </div>
+                </a-col>
+              </a-row>
+
+              <!--              <a-row :gutter="24">-->
+              <!--                <a-col :span="12">-->
+              <!--                  <div class="box-title-text">-->
+              <!--                    <div class="title-text">-->
+              <!--                      <span class="Required">*</span>-->
+              <!--                      <span class="title-text-text" :title="$t('personLiable')">{{$t('personLiable')}}</span>-->
+              <!--                    </div>-->
+              <!--                    <a-form-model-item class="itemModel-multi"-->
+              <!--                                       :prop="'dataList.'+index+'.dutyPersonName'"-->
+              <!--                                       :rules="[{ required: true, message: $t('personLiable') + $t('cannotEmpty'), trigger: 'change'},]"-->
+              <!--                    >-->
+              <!--                      <PersonnelSelection-->
+              <!--                        :query="{db_field_name:'dutyPerson',db_field_txt:$t('personLiable'),subscript:index}"-->
+              <!--                        :personneQuery="item"-->
+              <!--                        :isSingleChoice="true"-->
+              <!--                        @change="PersonnelSelectionChange"-->
+              <!--                        :disabled="disabled"-->
+              <!--                        v-model="item.dutyPersonName"/>-->
+              <!--                    </a-form-model-item>-->
+              <!--                  </div>-->
+              <!--                </a-col>-->
+              <!--              </a-row>-->
+            </div>
+          </div>
+
+          <div v-else>
+            <a-row :gutter="24">
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required">*</span>
+                    <span class="title-text-text" :title="$t('category')">{{$t('category')}}</span>
+                  </div>
+                  <a-form-model-item
+                    class="itemModel"
+                    prop="category"
+                  >
+                    <a-input class="box-input"
+                             v-model.trim="formInline.category"
+                             :placeholder="$t('PleaseEnter')+$t('category')"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required">*</span>
+                    <span class="title-text-text" :title="$t('inspectionItems')">{{$t('inspectionItems')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel"
+                                     :prop="'inspectionItem'">
+                    <a-input class="box-input"
+                             v-model.trim="formInline.inspectionItem"
+                             :placeholder="$t('PleaseEnter')+$t('inspectionItems')"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+            </a-row>
+            <a-row :gutter="24">
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required">*</span>
+                    <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
+                  </div>
+                  <a-form-model-item
+                    class="itemModel"
+                    :prop="'configItem'"
+                  >
+                    <a-input class="box-input"
+                             v-model.trim="formInline.configItem"
+                             :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>
+                    <!--                    <j-dict-select-tag class="box-input" v-model="formInline.configItem"-->
+                    <!--                                       @input="handleInput('configItem')"-->
+                    <!--                                       :placeholder="$t('PleaseSelect')+$t('configurationItem')"-->
+                    <!--                                       :type="'select'"-->
+                    <!--                                       :triggerChange="false" :dictCode="'ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4'"/>-->
+                  </a-form-model-item>
+                </div>
+              </a-col>
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required">*</span>
+                    <span class="title-text-text"
+                          :title="$t('certificationType')">{{$t('certificationType')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel-multi"
+                                     :prop="'attestationType'"
+                                     :rules="[{ required: true, message: $t('certificationType') + $t('cannotEmpty'), trigger: 'change'},]"
+                  >
+                    <j-multi-select-tag class="box-input" v-model="formInline.attestationType"
+                                        :placeholder="$t('PleaseSelect')+$t('certificationType')"
+                                        :type="'select'"
+                                        :triggerChange="false"
+                                        :dictCode="'ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2'"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+
+            </a-row>
+            <a-row :gutter="24">
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required">*</span>
+                    <span class="title-text-text"
+                          :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel-multi" prop="dutyDepart">
+                    <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
+                              class="box-input"
+                              optionFilterProp="label"
+                              @change="DutyDepartChangeOne"
+                              mode="multiple"
+                              :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                              v-model="formInline.dutyDepart">
+                      <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
+                                       :key="key"
+                                       :label="item.key"
+                                       :value="item.key">
+                               <span style="display: inline-block;width: 100%" :title=" item.key ">
+                                     {{ item.key }}
+                               </span>
+                      </a-select-option>
+                    </a-select>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required">*</span>
+                    <span class="title-text-text"
+                          :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel-multi"
+                                     :prop="'dutyTerritory'"
+                  >
+                    <a-select :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                              class="box-input"
+                              optionFilterProp="label"
+                              mode="multiple"
+                              @change="handleChange"
+                              :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                              v-model="formInline.dutyTerritory">
+                      <a-select-option v-for="(item, key) in dutyTerritoryList"
+                                       :key="key"
+                                       :label="item.itemText"
+                                       :value="item.itemValue">
+                               <span style="display: inline-block;width: 100%" :title=" item.itemText ">
+                                     {{ item.itemText }}
+                               </span>
+                      </a-select-option>
+                    </a-select>
+<!--                    <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"-->
+<!--                                       @input="handleInput('dutyTerritory')"-->
+<!--                                       @changeQuery="handleChange"-->
+<!--                                       :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
+<!--                                       :type="'select'"-->
+<!--                                       :triggerChange="false" :dictCode="'duty_territory'"/>-->
+                  </a-form-model-item>
+                </div>
+              </a-col>
+
+            </a-row>
+
+            <a-row :gutter="24">
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required" v-if="formInline.deliverableType != '1635545748968783874'">*</span>
+                    <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel"
+                                     :prop="formInline.deliverableType == '1635545748968783874'?'':'sdt'"
+                                     :rules="[{ required: formInline.deliverableType=='1635545748968783874'?false:true,
+                                 message: $t('engineeringInterfacePerson') + $t('cannotEmpty'), trigger: 'change'}]"
+                  >
+                    <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
+                              optionFilterProp="label"
+                              @change="handleInput('sdt',formInline.sdt)"
+                              showSearch
+                              v-model="formInline.sdt">
+                      <a-select-option v-for="(item, key) in engineeringInterfacePersonList"
+                                       :label="item.name"
+                                       :key="key"
+                                       :value="item.value">
+                     <span style="display: inline-block;width: 100%"
+                           :title=" item.name ">
+                           {{ item.name}}
+                     </span>
+                      </a-select-option>
+                    </a-select>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required">*</span>
+                    <span class="title-text-text" :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel"
+                                     style="display: inline-block"
+                                     :prop="'deliverableType'"
+                  >
+                    <a-tree-select
+                      tree-node-filter-prop="title"
+                      v-model="formInline.deliverableType"
+                      :maxTagCount="1"
+                      :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                      class="box-input"
+                      style="width: 100%"
+                      :tree-data="DeliverableTreeList"
+                      :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
+                    />
+                  </a-form-model-item>
+                </div>
+              </a-col>
+
+            </a-row>
+
+            <a-row :gutter="24">
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="title-text-text"
+                          :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel" prop="deliverableTemplate">
+                    <a-button type="primary" class="button-text"
+                              @click="clickButtonToUpload('deliverableTemplate')">
+                      {{ (formInline.deliverableTemplate === 'null' || formInline.deliverableTemplate === ''
+                      ||
+                      formInline.deliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                      }}
+                    </a-button>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required" v-if="formInline.deliverableType != '1635545748968783874'">*</span>
+                    <span class="title-text-text" :title="$t('personLiable')">{{$t('personLiable')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel-multi"
+                                     :prop="formInline.deliverableType == '1635545748968783874'?'':'dutyPersonName'"
+                                     :rules="[{ required: formInline.deliverableType=='1635545748968783874'?false:true,
+                                 message: $t('personLiable') + $t('cannotEmpty'), trigger: 'change'}]"
+                  >
+                    <PersonnelSelection
+                      :query="{db_field_name:'dutyPerson',db_field_txt:$t('personLiable')}"
+                      :personneQuery="formInline"
+                      :isSingleChoice="true"
+                      v-if="personnelVisible"
+                      @change="PersonnelSelectionChange"
+                      :disabled="disabled"
+                      v-model="formInline.dutyPersonName"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+            </a-row>
+            <a-row :gutter="24">
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required" v-if="formInline.deliverableType != '1635545748968783874'">*</span>
+                    <span class="title-text-text" :title="$t('closingDate')">{{$t('closingDate')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel"
+                                     :prop="formInline.deliverableType == '1635545748968783874'?'':'endTime'"
+                                     :rules="[{ required: formInline.deliverableType == '1635545748968783874'?false:true,
+                                 message: $t('closingDate') + $t('cannotEmpty'), trigger: 'change'}]"
+                  >
+                    <a-date-picker class="box-input"
+                                   :placeholder="$t('PleaseSelect')+$t('closingDate')"
+                                   @change="dateChange({db_field_name:'endTime'})"
+                                   format="YYYY-MM-DD"
+                                   :disabledDate="disabledDate"
+                                   :getCalendarContainer="(trigger) => trigger.parentNode"
+                                   v-model="formInline.endTime"
+                                   style="width: 100%"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+              <a-col :span="12" v-if="formInline.inventoryVerifyEndTime">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="title-text-text"
+                          :title="$t('inventoryVerifyEndTime')">{{$t('inventoryVerifyEndTime')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel">
+                    <a-date-picker class="box-input"
+                                   @change="dateChange({db_field_name:'inventoryVerifyEndTime'})"
+                                   format="YYYY-MM-DD"
+                                   :disabled="true"
+                                   :disabledDate="disabledDate"
+                                   :getCalendarContainer="(trigger) => trigger.parentNode"
+                                   v-model="formInline.inventoryVerifyEndTime"
+                                   style="width: 100%"/>
+                  </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">
+                  <div class="title-text">
+                    <span class="title-text-text" :title="$t('taskConfirmEndTime')">{{$t('taskConfirmEndTime')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel">
+                    <a-date-picker class="box-input"
+                                   @change="dateChange({db_field_name:'taskConfirmEndTime'})"
+                                   format="YYYY-MM-DD"
+                                   :disabled="true"
+                                   :disabledDate="disabledDate"
+                                   :getCalendarContainer="(trigger) => trigger.parentNode"
+                                   v-model="formInline.taskConfirmEndTime"
+                                   style="width: 100%"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+            </a-row>
+          </div>
+          <!--        <a-row :gutter="24">-->
+          <!--          <a-col :span="24">-->
+          <!--            <div class="box-title-text">-->
+          <!--              <div class="title-text">-->
+          <!--                <span class="title-text-text" :title="$t('explain')">{{$t('explain')}}</span>-->
+          <!--              </div>-->
+          <!--              <a-form-model-item class="itemModel" prop="explanation">-->
+          <!--                <a-textarea :placeholder="$t('pleaseEnter')+$t('explain')"-->
+          <!--                            v-model="formInline.explanation"-->
+          <!--                            :rows="4"/>-->
+          <!--              </a-form-model-item>-->
+          <!--            </div>-->
+          <!--          </a-col>-->
+          <!--        </a-row>-->
+        </a-form-model>
+      </a-spin>
+      <div class="drawer-bootom-button">
+        <a-button style="margin-right: 8px" @click="handleCancel">{{$t('cancel')}}</a-button>
+        <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+      </div>
+    </a-drawer>
+    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
+    <add-code-number ref="addCodeNumber" @regulation="regulation"></add-code-number>
+  </div>
+</template>
+
+<script>
+  import addCodeNumber from './addCodeNumber'
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
+  import uploadFile from '@/components/uploadFile/file'
+  import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
+  import { mapGetters } from 'vuex'
+  import moment from 'moment'
+
+  export default {
+    name: 'addModel',
+    components: {
+      PersonnelSelection,
+      uploadFile,
+      addCodeNumber
+    },
+    data() {
+      return {
+        formInline: {},
+        confirmLoading: false,
+        visible: false,
+        personnelVisible: false,
+        yearNameDataList: [],
+        firstLevelDutyTerritoryList: [],
+        dutyTerritoryList: [],
+        rules: {
+          serialNumber: [
+            {
+              required: true,
+              message: this.$t('entryName') + this.$t('regulationNo'),
+              trigger: 'change'
+            }
+          ],
+
+          wvtaId: [
+            {
+              required: true,
+              message: 'WVTA ID' + this.$t('regulationNo'),
+              trigger: 'change'
+            },
+            {
+              max: 300,
+              message: 'WVTA ID' + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          category: [
+            { required: true, message: this.$t('category') + this.$t('cannotEmpty'), trigger: 'blur' },
+            {
+              max: 300,
+              message: this.$t('category') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          inspectionItem: [
+            { required: true, message: this.$t('inspectionItems') + this.$t('cannotEmpty'), trigger: 'blur' },
+            {
+              max: 300,
+              message: this.$t('inspectionItems') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          deliverableType: [
+            { required: true, message: this.$t('typeOfDeliverables') + this.$t('cannotEmpty'), trigger: 'change' }
+          ],
+          dutyTerritory: [
+            {
+              required: true,
+              message: this.$t('areaOfResponsibility') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          dutyDepart: [
+            {
+              required: true,
+              message: this.$t('statisticalNodes') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          configItem: [
+            { required: true, message: this.$t('configurationItem') + this.$t('cannotEmpty'), trigger: 'blur' },
+            {
+              max: 300,
+              message: this.$t('configurationItem') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ]
+        },
+        disabled: false,
+        projectNameList: [],
+        title: '',
+        DeliverableTreeList: [],
+        uploadName: '',
+        numIndex: 0,
+        url: {
+          add: '/project/projectCertificationInventoryEO/batchAdd',
+          edit: '/project/projectCertificationInventoryEO/edit',
+          list: '/project/projectLawsInventoryEO/list'
+        },
+        engineeringInterfacePersonList: []
+      }
+    },
+    mounted() {
+      this.getDeliverableTree()
+      this.getRegulationNo()
+      this.getFirstLevelDutyTerritory()
+    },
+    methods: {
+      ...mapGetters(['userInfo']),
+      getFirstLevelDutyTerritory() {
+        getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
+          if (res.success) {
+            this.firstLevelDutyTerritoryList = res.result
+          } else {
+            this.firstLevelDutyTerritoryList = []
+          }
+        })
+      },
+      serialNumberClick() {
+        this.$refs.addCodeNumber.add()
+      },
+      regulation(item, data) {
+        this.formInline.serialNumber = item
+        this.formInline.bussDocumentLibraryId = data
+        this.$nextTick(() => {
+          this.formInline = { ...this.formInline }
+          this.$refs.ruleForm.clearValidate('serialNumber')
+        })
+      },
+      disabledDate(current) {
+        return current && current < moment().subtract(1, 'day')
+      },
+      dateChange(item, index) {
+        if (index) {
+          this.formInline.dataList[index][item.db_field_name] = this.formInline.dataList[index][item.db_field_name] ? moment(this.formInline.dataList[index][item.db_field_name]).format('YYYY-MM-DD') : ''
+
+        } else {
+          this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
+
+        }
+      },
+      getDeliverableTree() {
+        getAction('/sys/category/getCertificationDeliverableTree', {}).then((res) => {
+          if (res.success) {
+            this.DeliverableTreeList = res.result
+          } else {
+            this.DeliverableTreeList = []
+          }
+        })
+      },
+      DutyDepartChangeOne(event) {
+        this.formInline.dutyTerritory = []
+        this.formInline = {...this.formInline}
+        this.getDutyTerritoryOne(event.join(','))
+      },
+      getDutyTerritoryOne(row) {
+        let query = {
+          dutyDepart: row
+        }
+        getAction('/sys/dict/getDutyTeryByDD', query).then((res) => {
+          if (res.success) {
+            this.dutyTerritoryList = res.result || []
+          } else {
+            this.dutyTerritoryList = []
+          }
+        })
+      },
+      addModel() {
+        this.visible = true
+        this.personnelVisible = true
+        this.title = this.$t('add')
+        this.formInline = {}
+        this.getRegulationNo()
+        this.formInline.dataList = [{}]
+        this.formInline = { ...this.formInline }
+        this.$nextTick(() => {
+          this.$refs.ruleForm.clearValidate()
+        })
+      },
+      editModel(value) {
+        this.formInline = {}
+        this.dutyTerritoryList = []
+        this.visible = true
+        this.personnelVisible = true
+        value.dutyDepart = value.dutyDepart ? value.dutyDepart.split(',') : []
+        value.dutyTerritory = value.dutyTerritory ? value.dutyTerritory.split(',') : []
+        this.formInline = JSON.parse(JSON.stringify(value))
+        // if (this.formInline.deliverableType) {
+        //   this.formInline.deliverableType = this.formInline.deliverableType.split(',')
+        // }
+
+        if (value.dutyDepart && value.dutyDepart.length > 0) {
+          this.getDutyTerritoryOne(value.dutyDepart.join(','))
+        }
+        if (value.dutyTerritory && value.dutyTerritory.length > 0) {
+          this.queryPersonByProject(value.dutyTerritory.join(','))
+        }
+        this.getRegulationNo()
+        this.title = this.$t('edit')
+        this.$nextTick(() => {
+          this.formInline = { ...this.formInline }
+          this.$refs.ruleForm.clearValidate()
+        })
+      },
+      handleCancel() {
+        this.visible = false
+        this.personnelVisible = false
+      },
+      handleSubmit() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            let url = ''
+            let Action
+            let query = JSON.parse(JSON.stringify(this.formInline))
+            if (this.formInline.id) {
+              url = this.url.edit
+              Action = putAction
+              Object.keys(query).forEach(res => {
+                if (query[res] && query[res] instanceof Array) {
+                  query[res] = query[res].join(',')
+                }
+              })
+              query.projectLibraryId = this.$route.query.id
+            } else {
+              url = this.url.add
+              Action = postAction
+              query.dataList.forEach(val => {
+                delete val.engineeringInterfacePersonList
+                delete val.dutyTerritoryList
+                Object.keys(val).forEach(res => {
+                  if (val[res] && val[res] instanceof Array) {
+                    val[res] = val[res].join(',')
+                  }
+                })
+              })
+              query.projectLibraryId = this.$route.query.id
+            }
+            this.confirmLoading = true
+            Action(url, query).then((res) => {
+              if (res.success) {
+                this.confirmLoading = false
+                if (res.result && res.result.length > 0 && res.result instanceof Array) {
+                  let detailedWarningList = []
+                  res.result.forEach(val => {
+                    detailedWarningList.push(
+                    < div > { val } < /div>)
+                  })
+                  this.$warning({
+                    content: (
+                      < div >
+                      { detailedWarningList }
+                      < /div>
+                  )
+                })
+                } else {
+                  this.$message.success(this.$t('OperationSuccessful'))
+                }
+                this.visible = false
+                this.personnelVisible = false
+                this.$emit('addModelForm')
+              } else {
+                this.$message.warning(res.message)
+                this.confirmLoading = false
+              }
+            })
+          }
+        })
+      },
+      DutyDepartChange(index) {
+        this.formInline.dataList[index].dutyTerritory = []
+        this.formInline = { ...this.formInline }
+        this.getDutyTerritory(this.formInline.dataList[index].dutyDepart.join(','),index)
+      },
+      getDutyTerritory(row,index) {
+        let query = {
+          dutyDepart: row
+        }
+        getAction('/sys/dict/getDutyTeryByDD', query).then((res) => {
+          if (res.success) {
+            this.formInline.dataList[index].dutyTerritoryList = res.result || []
+          } else {
+            this.formInline.dataList[index].dutyTerritoryList = []
+          }
+          this.formInline = {...this.formInline}
+        })
+      },
+      handleInput(value, id, index, array) {
+        if (array) {
+          let content = array.filter(res => {
+            return res.value === id
+          })
+          if (content && content.length > 0) {
+            this.formInline.dataList[index].dutyPersonName = content[0].name
+            this.formInline.dataList[index].dutyPerson = content[0].value
+          }
+        }
+        this.$nextTick(() => {
+          this.formInline = { ...this.formInline }
+          this.$refs.ruleForm.validateField([value])
+        })
+      },
+      PersonnelSelectionChange(value, id, index) {
+        if (this.formInline.id) {
+          this.formInline[value] = id
+        } else {
+          this.formInline.dataList[index][value] = id
+        }
+        this.formInline = { ...this.formInline }
+      },
+      clickButtonToUpload(item, index, isTrue) {
+        this.numIndex = index
+        this.$refs.uploadFile.perentHandleFunc()
+        this.$refs.uploadFile.visible = true
+        this.uploadName = item
+        let ids = ''
+        console.log(index)
+        if (isTrue) {
+          ids = this.formInline.dataList[index][item]
+        } else {
+          ids = this.formInline[item]
+        }
+        getAction('sys/common/getFileInfos', { id: ids }).then((res) => {
+          if (res.success) {
+            this.$refs.uploadFile.perentHandleFunc(res.result)
+          } else {
+            this.$refs.uploadFile.perentHandleFunc()
+          }
+        })
+      },
+      /** 上传文件的回调 */
+      uploadSuccess(data) {
+        let attIdList = []
+        if (data && data.length > 0) {
+          data.map(item => {
+            attIdList.push(item.id || data.name)
+          })
+        }
+        /** 赋值给当前对应的表单文件 */
+        if (this.formInline.id) {
+          this.formInline[this.uploadName] = attIdList.join(',')
+        } else {
+          this.formInline.dataList[this.numIndex][this.uploadName] = attIdList.join(',')
+        }
+        this.formInline = { ...this.formInline }
+      },
+      addClick(index) {
+        this.formInline.dataList.splice(index + 1, 0, {})
+        this.formInline = { ...this.formInline }
+      },
+      deleteClick(index) {
+        this.formInline.dataList.splice(index, 1)
+        this.formInline = { ...this.formInline }
+      },
+      getRegulationNo() {
+        let query = {
+          projectLibraryId: this.$route.query.id,
+          roleCode: 0
+        }
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.projectNameList = res.result || []
+          } else {
+            this.projectNameList = []
+          }
+        })
+      },
+      serialNumberChange(value) {
+        let content = this.projectNameList.filter(res => {
+          return res.id === value
+        })
+        if (content && content.length > 0) {
+          this.formInline.bussDocumentLibraryId = content[0].standId
+          this.formInline.serialNumber = content[0].serialNumber
+        }
+      },
+      handleChange(value) {
+        this.formInline.sdt = undefined
+        this.queryPersonByProject(this.formInline.dutyTerritory.join(','))
+      },
+      dutyHandleChange(index) {
+        this.formInline.dataList[index].sdt = undefined
+        this.formInline = { ...this.formInline }
+        this.handleInput('dataList.' + index + '.dutyTerritory')
+        this.queryPersonByProject(this.formInline.dataList[index].dutyTerritory.join(','), index)
+      },
+      queryPersonByProject(row, index) {
+        let query = {
+          projectId: this.$route.query.id,
+          dutyTerritory: row
+        }
+        getAction('/project/projectRelatedPersonnel/queryPersonByProjectId', query).then((res) => {
+          if (res.success) {
+            if (this.formInline.id) {
+              this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || [] //工程接口人
+              if (res.result.engineeringInterfacePersonList && res.result.engineeringInterfacePersonList.length == 1) {
+                this.formInline.sdt = res.result.engineeringInterfacePersonList[0].value
+                if (!this.formInline.dutyPersonName) {
+                  this.formInline.dutyPersonName = res.result.engineeringInterfacePersonList[0].name
+                  this.formInline.dutyPerson = res.result.engineeringInterfacePersonList[0].value
+                }
+                this.formInline = { ...this.formInline }
+              } else if (this.engineeringInterfacePersonList.length == 0) {
+                this.formInline.sdt = undefined
+              }
+              this.personnelVisible = false
+              this.$nextTick(() => {
+                this.personnelVisible = true
+              })
+            } else {
+              this.$nextTick(() => {
+                this.formInline.dataList[index].engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || []
+                if (res.result.engineeringInterfacePersonList && res.result.engineeringInterfacePersonList.length == 1) {
+                  this.formInline.dataList[index].sdt = res.result.engineeringInterfacePersonList[0].value
+                  this.handleInput('dataList.' + index + '.sdt', this.formInline.dataList[index].sdt, index, res.result.engineeringInterfacePersonList)
+                }
+                this.formInline = { ...this.formInline }
+              })
+            }
+          }
+        })
+      }
+    }
+  }
+</script>
+<style>
+  .formAdd .ant-form-item-label {
+    width: 130px;
+  }
+
+  .formAdd .ant-form-item-control-wrapper {
+    display: inline-block;
+    width: 100%;
+  }
+
+  /*.formAdd .ant-form-item {*/
+  /*  margin-bottom: 20px;*/
+  /*}*/
+
+  .itemModel .ant-form-item-control-wrapper {
+    width: 100%;
+  }
+
+  .box-input .ant-select-selection--single {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple .ant-select-selection__rendered > ul > li {
+    margin-top: 6px;
+  }
+
+  .box-input .ant-calendar-picker {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-calendar-picker-input {
+    height: 38px;
+  }
+
+  .box-input .ant-input-number-input-wrap {
+    line-height: 38px;
+    height: 38px;
+  }
+</style>
+<style scoped>
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    /*align-items: center;*/
+  }
+
+  .title-text {
+    width: 114px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 48px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+    height: 40px;
+    margin-bottom: 24px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+
+  .formAdd {
+    margin-bottom: 40px;
+  }
+
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    z-index: 100;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .button-text {
+    height: 38px;
+    width: calc(100% - 100px);
+    line-height: 38px;
+    background: #fff;
+    border: 1px #00B3BE solid;
+    color: #00B3BE;
+  }
+
+  .header-text {
+    font-size: 16px;
+    font-weight: 500;
+  }
+
+  .icon-text {
+    font-size: 16px;
+    margin-right: 4px;
+  }
+
+  ::v-deep .ant-form-item-with-help {
+    margin-bottom: 25px;
+  }
+</style>
+<style>
+  .ant-input-disabled {
+    color: rgba(0, 0, 0, 0.65) !important;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue
new file mode 100644
index 000000000..b4d746f2f
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue
@@ -0,0 +1,474 @@
+<template>
+  <a-modal
+    :title="name"
+    :width="name == $t('changeSetting') ? 600 : 1000"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleOk"
+    @cancel="handleCancel"
+  >
+    <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+      <a-row :gutter="24">
+        <a-col :span="name == $t('changeSetting') ? 24 : 12"
+               v-if="name == $t('BatchSetting') || name == $t('changeSetting')">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-input class="box-input"
+                       v-model.trim="formInline.configItem"
+                       :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>
+
+              <!--              <j-dict-select-tag class="box-input" v-model="formInline.configItem"-->
+              <!--                                 @input="handleInput('configItem')"-->
+              <!--                                 :placeholder="$t('PleaseSelect')+$t('configurationItem')"-->
+              <!--                                 :type="'select'"-->
+              <!--                                 :triggerChange="false" :dictCode="'ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4'"/>-->
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-select :placeholder="$t('cannotSetResponsibilityAreas')"
+                        class="box-input"
+                        allowClear
+                        optionFilterProp="label"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        v-model="formInline.sdt">
+                <a-select-option v-for="(item, key) in engineeringInterfacePersonList"
+                                 :key="item.key"
+                                 :label="item.name"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+
+      </a-row>
+      <a-row :gutter="24" v-if="name == $t('BatchSetting')">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
+            </div>
+            <a-form-model-item class="itemModel-multi">
+              <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
+                        class="box-input"
+                        optionFilterProp="label"
+                        @change="DutyDepartChange"
+                        mode="multiple"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        v-model="formInline.dutyDepart">
+                <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
+                                 :key="key"
+                                 :label="item.key"
+                                 :value="item.key">
+                               <span style="display: inline-block;width: 100%" :title=" item.key ">
+                                     {{ item.key }}
+                               </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
+            </div>
+            <a-form-model-item class="itemModel-multi">
+              <a-select :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                        class="box-input"
+                        optionFilterProp="label"
+                        mode="multiple"
+                        @change="handleChange"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        v-model="formInline.dutyTerritory">
+                <a-select-option v-for="(item, key) in dutyTerritoryList"
+                                 :key="key"
+                                 :label="item.itemText"
+                                 :value="item.itemValue">
+                               <span style="display: inline-block;width: 100%" :title=" item.itemText ">
+                                     {{ item.itemText }}
+                               </span>
+                </a-select-option>
+              </a-select>
+              <!--              <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"-->
+              <!--                                 @input="handleInput('dutyTerritory')"-->
+              <!--                                 @changeQuery="handleChange"-->
+              <!--                                 :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
+              <!--                                 :type="'select'"-->
+              <!--                                 :triggerChange="false" :dictCode="'duty_territory'"/>-->
+            </a-form-model-item>
+          </div>
+        </a-col>
+
+      </a-row>
+      <a-row :gutter="24" v-if="name == $t('BatchSetting')">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
+            </div>
+            <a-form-model-item class="itemModel-multi">
+              <!--              tree-checkable-->
+              <a-tree-select
+                tree-node-filter-prop="title"
+                v-model="formInline.deliverableType"
+                :maxTagCount="1"
+                :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                class="box-input"
+                style="width: 100%"
+                :tree-data="DeliverableTreeList"
+                :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
+              />
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('closingDate')">{{$t('closingDate')}}</span>
+            </div>
+            <a-form-model-item class="itemModel"
+                               :prop="'endTime'"
+            >
+              <a-date-picker class="box-input"
+                             :placeholder="$t('PleaseSelect')+$t('closingDate')"
+                             @change="dateChange({db_field_name:'endTime'})"
+                             format="YYYY-MM-DD"
+                             :disabledDate="disabledDate"
+                             :getCalendarContainer="(trigger) => trigger.parentNode"
+                             v-model="formInline.endTime"
+                             style="width: 100%"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24" v-if="name == $t('BatchSetting')">
+        <a-col :span="12" v-if="roleSwitchingCode == 2">
+          <div class="box-title-text">
+            <div class="title-text">
+                      <span class="title-text-text"
+                            :title="$t('CertificationProgress')">{{$t('CertificationProgress')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <j-dict-select-tag class="box-input" v-model="formInline.certificationProgress"
+                                 @input="handleInput('certificationProgress')"
+                                 :placeholder="$t('PleaseSelect')+$t('CertificationProgress')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'certification_progress'"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24" v-if="name == $t('BatchSetting') && roleSwitchingCode == 2">
+        <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" :prop="'certificationProgressRemark'">
+              <a-textarea
+                :placeholder="$t('PleaseEnter')+$t('remarks')"
+                v-model="formInline.certificationProgressRemark" :rows="4"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+    </a-form-model>
+  </a-modal>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
+  import moment from 'moment'
+
+  export default {
+    name: 'batSetting',
+    props: ['url', 'roleSwitchingCode'],
+    components: {
+      PersonnelSelection
+    },
+    data() {
+      return {
+        visible: false,
+        confirmLoading: false,
+        formInline: {},
+        rules: {},
+        ids: [],
+        firstLevelDutyTerritoryList: [],
+        configurationItemList: [],
+        engineeringInterfacePersonList: [],
+        typeOfDeliverablesList: [],
+        name: '',
+        DeliverableTreeList: [],
+        dutyTerritoryList: []
+      }
+    },
+    mounted() {
+    },
+    methods: {
+      disabledDate(current) {
+        return current && current < moment().subtract(1, 'day')
+      },
+      getFirstLevelDutyTerritory() {
+        getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
+          if (res.success) {
+            this.firstLevelDutyTerritoryList = res.result
+          } else {
+            this.firstLevelDutyTerritoryList = []
+          }
+        })
+      },
+      DutyDepartChange(event) {
+        this.formInline.dutyTerritory = []
+        this.formInline = { ...this.formInline }
+        this.getDutyTerritory(event.join(','))
+      },
+      getDutyTerritory(row) {
+        let query = {
+          dutyDepart: row
+        }
+        getAction('/sys/dict/getDutyTeryByDD', query).then((res) => {
+          if (res.success) {
+            this.dutyTerritoryList = res.result || []
+          } else {
+            this.dutyTerritoryList = []
+          }
+        })
+      },
+      getDeliverableTree() {
+        getAction('/sys/category/getCertificationDeliverableTree', {}).then((res) => {
+          if (res.success) {
+            this.DeliverableTreeList = res.result
+          } else {
+            this.DeliverableTreeList = []
+          }
+        })
+      },
+      edit(data, name, content) {
+        this.visible = true
+        this.getDeliverableTree()
+        this.getFirstLevelDutyTerritory()
+        this.$nextTick(() => {
+          this.ids = data || []
+          this.formInline = {}
+          this.dutyTerritoryList = []
+          this.name = name
+          if (content && name == this.$t('BatchSetting')) {
+            // this.formInline.dutyTerritory = content.dutyTerritory
+            // this.queryPersonByProject(content.dutyTerritory)
+          }
+          this.formInline = { ...this.formInline }
+        })
+      },
+      handleOk() {
+        // if (this.formInline.dutyTerritory) {
+        //   this.handleOkTwo()
+        // } else {
+        this.handleOkOne()
+        // }
+      },
+      PersonnelSelectionChange(value, id) {
+        this.formInline[value] = id
+        this.formInline = { ...this.formInline }
+      },
+      handleOkOne() {
+        let ids = JSON.parse(JSON.stringify(this.ids))
+        let formInline = JSON.parse(JSON.stringify(this.formInline))
+        Object.keys(formInline).forEach(res => {
+          if (formInline[res] && formInline[res] instanceof Array) {
+            formInline[res] = formInline[res].join(',')
+          }
+        })
+        let query = {
+          ids: ids.join(','),
+          ...formInline
+        }
+        let url = ''
+        this.confirmLoading = true
+        if (this.name == this.$t('changeSetting')) {
+          url = '/project/projectCertificationInventoryEO/updateConfigItemBatch'
+        } else {
+          url = this.url.setBatch
+        }
+        if (!query.configItem) {
+          query.configItem = undefined
+        }
+        postAction(url, query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.visible = false
+            this.confirmLoading = false
+            this.$emit('batSettingForm')
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+            this.confirmLoading = false
+          }
+        })
+      },
+      handleOkTwo() {
+        let _this = this
+        this.$confirm({
+          content: _this.$t('areResponsibilityAreaInformationBatch'),
+          onOk() {
+            let ids = JSON.parse(JSON.stringify(_this.ids))
+            let query = {
+              ids: ids.join(','),
+              ..._this.formInline
+            }
+            _this.confirmLoading = true
+            postAction(_this.url.setBatch, query).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.visible = false
+                _this.confirmLoading = false
+                _this.$emit('batSettingForm')
+              } else {
+                _this.$message.warning(_this.$t('operationFailed'))
+                _this.confirmLoading = false
+              }
+            })
+          }
+        })
+      },
+      handleCancel() {
+        this.formInline = {}
+        this.visible = false
+      },
+      handleInput(value) {
+        this.$nextTick(() => {
+          this.formInline = { ...this.formInline }
+          this.$refs.ruleForm.validateField([value])
+        })
+      },
+      dateChange(item) {
+        this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
+      },
+      handleChange(value) {
+        this.formInline.sdt = undefined
+        this.queryPersonByProject(this.formInline.dutyTerritory.join(','))
+        this.formInline = {...this.formInline}
+      },
+      queryPersonByProject(row) {
+        let query = {
+          projectId: this.$route.query.id,
+          dutyTerritory: row
+        }
+        getAction('/project/projectRelatedPersonnel/queryPersonByProjectId', query).then((res) => {
+          if (res.success) {
+            this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || [] //工程接口人
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style>
+  .formAdd .ant-form-item-label {
+    width: 130px;
+  }
+
+  .formAdd .ant-form-item-control-wrapper {
+    display: inline-block;
+    width: 100%;
+  }
+
+  /*.formAdd .ant-form-item {*/
+  /*  margin-bottom: 20px;*/
+  /*}*/
+
+  .itemModel .ant-form-item-control-wrapper {
+    width: 100%;
+  }
+
+  .box-input .ant-select-selection--single {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple .ant-select-selection__rendered > ul > li {
+    margin-top: 6px;
+  }
+
+  .box-input .ant-calendar-picker {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-calendar-picker-input {
+    height: 38px;
+  }
+
+  .box-input .ant-input-number-input-wrap {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-calendar-picker-input {
+    padding: 4px 30px 4px 11px;
+  }
+</style>
+<style scoped>
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+  }
+
+  .title-text {
+    width: 104px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 42px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .formAdd {
+    margin-bottom: 40px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/deadlineForm.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/deadlineForm.vue
new file mode 100644
index 000000000..62d6ee45c
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/deadlineForm.vue
@@ -0,0 +1,143 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="500"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleOk"
+    @cancel="handleCancel"
+  >
+    <a-spin :spinning="confirmLoading">
+      <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text-index">
+              <div class="title-text-index" style="width: 100px">
+                <span class="Required">*</span>
+                <span class="title-text-text"
+                      :title="$t('cutoffTime')">
+                    {{ $t('cutoffTime') }}
+                  </span>
+              </div>
+              <a-form-model-item class="itemModel" style="width: calc(100% - 120px)" :prop="queryData.dutyDueDate">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+$t('cutoffTime')"
+                               @change="dateChange({'db_field_name':queryData.dutyDueDate})"
+                               format="YYYY-MM-DD"
+                               :disabledDate="disabledDate"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline[queryData.dutyDueDate]"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import moment from 'moment'
+
+  export default {
+    name: 'deadlineForm',
+    data() {
+      return {
+        title: '',
+        visible: false,
+        confirmLoading: false,
+        formInline: {},
+        rules: {},
+        queryData:{},
+      }
+    },
+    methods: {
+      getData(val) {
+        this.queryData = val
+        this.title = val.title
+        this.visible = true
+        this.formInline = {}
+        this.confirmLoading = false
+        this.$nextTick(() => {
+          this.$refs.ruleForm.clearValidate()
+          this.rules[val.dutyDueDate] = [
+            {
+              required: true,
+              message: this.$t('cutoffTime') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            },
+          ]
+        })
+      },
+      handleOk() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            this.$emit('deadlineDataForm', this.queryData,this.formInline)
+            this.confirmLoading = true
+          }
+        })
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      //时间禁用
+      disabledDate(current) {
+        return current && current < moment().subtract(1, 'day')
+      },
+      dateChange(item) {
+        this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .box-title-text-index {
+    line-height: 1.4;
+    display: flex;
+  }
+
+  .title-text {
+    width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .title-text-index {
+    width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    line-height: 40px;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: calc(100% - 120px);
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/modifyHistoryList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/modifyHistoryList.vue
new file mode 100644
index 000000000..32eb8dcaf
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/modifyHistoryList.vue
@@ -0,0 +1,179 @@
+<template>
+  <a-drawer
+    :title="$t('modifyHistory')"
+    :maskClosable="false"
+    :width="1000"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <div style="margin-bottom: 60px">
+      <a-table
+        :columns="columns"
+        rowKey="id"
+        :scroll="{x: '100%'}"
+        :data-source="dataList"
+        :pagination="false"
+        :loading="loading">
+
+      </a-table>
+      <div class="page" v-if="dataList.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="onChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+
+    <div class="drawer-bootom-button">
+      <a-button @click="handleCancel" type="primary">{{$t('determine')}}</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+
+  export default {
+    name: 'modifyHistoryList',
+    data() {
+      return {
+        visible: false,
+        dataList: [],
+        confirmLoading: false,
+        loading: false,
+        pageNo: 1,
+        pageSize: 10,
+        total: 0,
+        projectCertificationInventoryId: '',
+        url: {
+          list: '/project/projectCertificationInventoryLogEO/page'
+        },
+        columns: [
+          {
+            title: this.$t('Operator'),
+            dataIndex: 'createBy',
+            align: 'left',
+            ellipsis: true,
+            width: 108
+          },
+          {
+            title: this.$t('operationTime'),
+            dataIndex: 'createTime',
+            align: 'left',
+            ellipsis: true,
+            width: 148
+          },
+          {
+            title: this.$t('OperationContent'),
+            dataIndex: 'content',
+            align: 'left',
+            ellipsis: true,
+            width: 528
+          }
+        ]
+      }
+    },
+    mounted() {
+    },
+    methods: {
+      handleCancel() {
+        this.visible = false
+      },
+      getList(id) {
+        this.pageNo = 1
+        this.visible = true
+        this.projectCertificationInventoryId = id
+        this.replacePage()
+      },
+      onChange(page, pageSize) {
+        this.pageNo = page
+        this.replacePage()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.replacePage()
+      },
+      replacePage() {
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          projectCertificationInventoryId: this.projectCertificationInventoryId
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.dataList = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.dataList = []
+            this.total = 0
+            this.loading = false
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    z-index: 100;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 110px;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/reasonForReturn.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/reasonForReturn.vue
new file mode 100644
index 000000000..95aecf4cd
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/reasonForReturn.vue
@@ -0,0 +1,139 @@
+<template>
+  <div>
+    <a-modal
+      :title="title"
+      :width="600"
+      :visible="visible"
+      :confirm-loading="confirmLoading"
+      :maskClosable="false"
+      @ok="handleOk"
+      @cancel="handleCancel"
+    >
+      <a-form-model :model="formInline" class="formAdd" :rules="rules"
+                    ref="ruleForm">
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="title">{{ title }}</span>
+              </div>
+              <a-form-model-item class="itemModel" :prop="'reasonForReturn'">
+                <a-textarea :placeholder="$t('pleaseEnter')+title"
+                            v-model.trim="formInline.reasonForReturn"
+                            :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'reasonForReturn',
+    data() {
+      return {
+        visible: false,
+        confirmLoading: false,
+        formInline: {},
+        rules: {},
+        value: '',
+        text: '',
+        ids: [],
+        notConditions: '',
+        data: '',
+        title: ''
+      }
+    },
+    mounted() {
+    },
+    methods: {
+      getData(value, text, ids, notConditions, data, title) {
+        this.value = value
+        this.text = text
+        this.ids = ids
+        this.notConditions = notConditions
+        this.data = data
+        this.title = title
+        this.visible = true
+        this.formInline = {}
+        this.confirmLoading = false
+        this.$nextTick(() => {
+          this.$refs.ruleForm.clearValidate()
+          this.rules = {
+            reasonForReturn: [
+              {
+                required: true,
+                message: title + this.$t('cannotEmpty'),
+                trigger: 'blur'
+              },
+              {
+                max: 300,
+                message: title + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+                trigger: 'blur'
+              }
+            ]
+          }
+        })
+      },
+      handleOk() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            this.$emit('reasonForReturnForm', this.value, this.text, this.ids, this.notConditions, this.data,this.formInline.reasonForReturn)
+            this.confirmLoading = true
+          }
+        })
+      },
+      handleCancel() {
+        this.visible = false
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .box-title-text {
+    line-height: 1.4;
+    /*display: flex;*/
+    /*align-items: center;*/
+  }
+
+  .title-text {
+    width: 124px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 48px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 140px);
+    display: inline-block;
+    margin-top: 2px;
+    margin-bottom: 14px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/referenceDeliverablesList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/referenceDeliverablesList.vue
new file mode 100644
index 000000000..2a67fb149
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/referenceDeliverablesList.vue
@@ -0,0 +1,266 @@
+<template>
+  <a-drawer
+    :title="$t('referenceDeliverables')"
+    :maskClosable="false"
+    :width="1000"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <div style="margin-bottom: 60px">
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :md="12" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('entryName')">
+                  <span>{{$t('entryName')}}</span>
+                </div>
+                <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('entryName')"
+                         v-model="queryParam.projectName"></a-input>
+              </div>
+            </a-col>
+            <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="12" :sm="24">
+                  <a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+               </a-col>
+      </span>
+          </a-row>
+        </a-form>
+      </div>
+      <a-table
+        :columns="columns"
+        rowKey="id"
+        :scroll="{x: '100%',y:'calc(100vh - 330px)'}"
+        :data-source="dataList"
+        :pagination="false"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' '}"
+        :loading="loading">
+
+      </a-table>
+      <div class="page" v-if="dataList.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="onChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+
+    <div class="drawer-bootom-button">
+      <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('determine')}}</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+
+  export default {
+    name: 'referenceDeliverablesList',
+    components: {},
+    props: ['url'],
+    data() {
+      return {
+        visible: false,
+        queryParam: {},
+        confirmLoading: false,
+        selectedRowKeys: [],
+        columns: [
+          {
+            title: this.$t('entryName'),
+            dataIndex: 'projectName',
+            align: 'left',
+            ellipsis: true,
+            width: 223
+          },
+          {
+            title: 'Studio',
+            dataIndex: 'studioEngineerName',
+            align: 'left',
+            ellipsis: true,
+            width: 140
+          },
+          {
+            title: this.$t('explain'),
+            dataIndex: 'explanation',
+            align: 'left',
+            ellipsis: true,
+            width: 223
+          }
+        ],
+        dataList: [],
+        content: [],
+        loading: false,
+        pageNo: 1,
+        pageSize: 10,
+        total: 0,
+        ids: '',
+        detailedWarningList: []
+      }
+    },
+    mounted() {
+
+    },
+    methods: {
+      transferModel(ids, detailedWarningList) {
+        this.visible = true
+        this.queryParam = {}
+        this.detailedWarningList = detailedWarningList
+        this.selectedRowKeys = []
+        this.ids = ids.join(',')
+        this.replacePage()
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.replacePage()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.replacePage()
+      },
+      onChange(page, pageSize) {
+        this.pageNo = page
+        this.replacePage()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.replacePage()
+      },
+      replacePage() {
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...this.queryParam
+        }
+        this.loading = true
+        postAction('project/projectLibraryBase/page', query).then((res) => {
+          if (res.success) {
+            this.dataList = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+        if (this.selectedRowKeys.length > 1) {
+          this.selectedRowKeys.shift()
+        }
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      failedMessageOne(data) {
+        let detailedWarningList = data
+        this.$warning({
+          content: ( < div > { detailedWarningList } < /div>)
+        })
+      },
+      handleSubmit() {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          if (selectedRowKeys.join(',') == this.$route.query.id) {
+            this.$message.warning(this.$t('theDeliverablesCannotReferencedPleaseReselect'))
+            return
+          }
+          this.confirmLoading = true
+          postAction('/project/projectCertificationInventoryEO/citeDeliverable', {
+            projectCertificationInventoryIds: this.ids,
+            projectLibraryId: this.$route.query.id,
+            citeProjectLibraryId: selectedRowKeys.join(',')
+          }).then((res) => {
+            if (res.success) {
+              this.confirmLoading = false
+              if (res.result) {
+                this.$message.warning(res.result)
+              } else {
+                this.$message.success(this.$t('OperationSuccessful'))
+              }
+              this.visible = false
+              this.selectedRowKeys = []
+              this.$emit('referenceDeliverablesListForm')
+              if (this.detailedWarningList && this.detailedWarningList.length > 0) {
+                this.failedMessageOne(this.detailedWarningList)
+              }
+            } else {
+              if (res.result) {
+                this.$message.warning(res.result)
+              } else {
+                this.$message.warning(this.$t('operationFailed'))
+              }
+              this.confirmLoading = false
+            }
+          })
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    z-index: 100;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/transferList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/transferList.vue
new file mode 100644
index 000000000..548f3c44d
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/transferList.vue
@@ -0,0 +1,290 @@
+<template>
+  <div>
+    <a-drawer
+      :title="$t('Transfer')"
+      :maskClosable="false"
+      :width="1000"
+      placement="right"
+      :closable="true"
+      @close="handleCancel"
+      :visible="visible"
+      style="height: 100%;overflow: auto;padding-bottom: 53px;">
+      <div style="margin-bottom: 60px">
+        <div class="table-page-search-wrapper">
+          <a-form layout="inline" @keyup.enter.native="searchQuery">
+            <a-row :gutter="24">
+              <a-col :md="12" :sm="8">
+                <div class="box-title-text">
+                  <div class="title-text" :title="$t('marketCertificationList')">
+                    <span>{{$t('marketCertificationList')}}</span>
+                  </div>
+                  <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('marketCertificationList')"
+                           v-model="queryParam.name"></j-input>
+                </div>
+              </a-col>
+              <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="12" :sm="24">
+                  <a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+               </a-col>
+      </span>
+            </a-row>
+          </a-form>
+        </div>
+        <a-table
+          :components="drag(columns,'columns')"
+          :columns="columns"
+          rowKey="id"
+          :scroll="{x: 800}"
+          :data-source="dataList"
+          :pagination="false"
+          :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' }"
+          :loading="loading">
+
+        </a-table>
+        <div class="page" v-if="dataList.length > 0">
+          <a-pagination
+            :show-total="total => $t('total')+` ${total} `+$t('strip')"
+            show-quick-jumper
+            show-size-changer
+            :page-size.sync="pageSize"
+            :total="total"
+            :current="pageNo"
+            @change="onChange"
+            @showSizeChange="SizeChange"
+          />
+        </div>
+      </div>
+
+      <div class="drawer-bootom-button">
+        <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+        <a-button @click="handleSubmit(undefined)" type="primary" :loading="confirmLoading">{{$t('determine')}}
+        </a-button>
+      </div>
+    </a-drawer>
+    <transferListvirtal :url="url" @transferListFormHomo="transferListFormHomo" ref="transferListvirtalRef"/>
+  </div>
+
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+  import transferListvirtal from './transferListvirtal'
+
+  export default {
+    name: 'transferList',
+    components: {
+      transferListvirtal
+    },
+    props: ['url'],
+    mixins: [ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        visible: false,
+        queryParam: {},
+        confirmLoading: false,
+        selectedRowKeys: [],
+        columns: [
+          {
+            title: this.$t('marketCertificationList'),
+            dataIndex: 'name',
+            align: 'left',
+            ellipsis: true,
+            width: 223
+          },
+          {
+            title: this.$t('instructionForUse'),
+            dataIndex: 'useExplain',
+            align: 'left',
+            ellipsis: true,
+            width: 223
+          },
+          {
+            title: this.$t('updateTime'),
+            dataIndex: 'updateTime',
+            align: 'left',
+            ellipsis: true,
+            width: 223
+          },
+          {
+            title: this.$t('creater'),
+            dataIndex: 'createBy',
+            align: 'left',
+            ellipsis: true,
+            width: 223
+          }
+        ],
+        dataList: [],
+        content: [],
+        loading: false,
+        pageNo: 1,
+        pageSize: 10,
+        total: 0
+      }
+    },
+    mounted() {
+
+    },
+    methods: {
+      transferModel() {
+        this.visible = true
+        this.queryParam = {}
+        this.selectedRowKeys = []
+        this.replacePage()
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.replacePage()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.replacePage()
+      },
+      onChange(page, pageSize) {
+        this.pageNo = page
+        this.replacePage()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.replacePage()
+      },
+      replacePage() {
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...this.queryParam,
+          state:'1',
+        }
+        this.loading = true
+        getAction('/authDummy/authDummyInventoryBaseEO/page', query).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.replacePage()
+              return
+            }
+            this.dataList = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      transferListFormHomo() {
+        this.visible = false
+        this.selectedRowKeys = []
+        this.$emit('transferListForm')
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+        if (this.selectedRowKeys.length > 1) {
+          this.selectedRowKeys.shift()
+        }
+      },
+      handleCancel() {
+        this.visible = false
+        this.selectedRowKeys = []
+        this.$emit('visible')
+      },
+      handleSubmit(flag) {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.confirmLoading = true
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          this.confirmLoading = false
+          // this.$emit('transferListForm',selectedRowKeys.join(','))
+          this.$refs.transferListvirtalRef.transferModel(selectedRowKeys.join(','))
+          // this.selectedRowKeys = []
+          // postAction('project/projectLawsInventoryEO/add', {
+          //   dummyInventoryBaseId: selectedRowKeys.join(','),
+          //   projectLibraryId: this.$route.query.id,
+          //   flag: flag
+          // }).then((res) => {
+          //   if (res.success) {
+          //     this.confirmLoading = false
+          //     // this.$message.success(this.$t('OperationSuccessful'))
+          //     // this.visible = false
+          //     this.selectedRowKeys = []
+          //     this.$emit('transferListForm',selectedRowKeys.join(','))
+          //   } else {
+          //     // if (res.message == '该虚拟清单的维护清单中没有数据,是否需要添加') {
+          //     //   this.confirmLoading = false
+          //     //   this.getAdd()
+          //     //   return
+          //     // }
+          //     this.$message.warning(this.$t('operationFailed'))
+          //     this.confirmLoading = false
+          //   }
+          // })
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      getAdd() {
+        let _this = this
+        this.$confirm({
+          content: _this.$t('TheDoesNotContainData'),
+          onOk() {
+            _this.handleSubmit('1')
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    z-index: 100;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/transferListvirtal.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/transferListvirtal.vue
new file mode 100644
index 000000000..973bd500f
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/transferListvirtal.vue
@@ -0,0 +1,329 @@
+<template>
+  <a-drawer
+    :title="$t('Transfer')"
+    :maskClosable="false"
+    :width="1000"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <div style="margin-bottom: 60px">
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :md="12" :sm="5">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('standard')">
+                  <span>{{$t('standard')}}</span>
+                </div>
+                <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                         v-model="queryParam.serialNumber"></j-input>
+              </div>
+            </a-col>
+            <a-col :md="12" :sm="5">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('category')">
+                  <span>{{$t('category')}}</span>
+                </div>
+                <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('category')"
+                         v-model="queryParam.category"></j-input>
+              </div>
+            </a-col>
+            <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="12" :sm="24">
+<!--                 <globalAdvancedQuery ref="globalAdvancedQueryRef"-->
+                 <!--                                      @handleSuperQuery="handleSuperQuery"-->
+                 <!--                                      :fieldList="fieldList"/>-->
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+               </a-col>
+      </span>
+          </a-row>
+        </a-form>
+      </div>
+      <a-table
+        :columns="columns"
+        rowKey="id"
+        :scroll="{x: 800,y:'calc(100vh - 330px)'}"
+        :data-source="dataList"
+        :pagination="false"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:'' }"
+        :loading="loading">
+
+      </a-table>
+      <!--      <div class="page" v-if="dataList.length > 0">-->
+      <!--        <a-pagination-->
+      <!--          :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
+      <!--          show-quick-jumper-->
+      <!--          show-size-changer-->
+      <!--          :page-size.sync="pageSize"-->
+      <!--          :total="total"-->
+      <!--          :current="pageNo"-->
+      <!--          @change="onChange"-->
+      <!--          @showSizeChange="SizeChange"-->
+      <!--        />-->
+      <!--      </div>-->
+    </div>
+
+    <div class="drawer-bootom-button">
+      <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit(undefined)" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
+
+  export default {
+    name: 'transferList',
+    components: {
+      globalAdvancedQuery
+    },
+    props: ['url'],
+    data() {
+      return {
+        visible: false,
+        queryParam: {},
+        confirmLoading: false,
+        selectedRowKeys: [],
+        columns: [
+          {
+            title: this.$t('category'),
+            align: 'left',
+            dataIndex: 'category',
+            width: 150,
+            ellipsis: true
+          },
+          {
+            title: this.$t('inspectionItems'),
+            align: 'left',
+            dataIndex: 'inspectionItem',
+            width: 150,
+            ellipsis: true,
+            scopedSlots: { customRender: 'inspectionItems' }
+          },
+          {
+            title: 'WVTA ID',
+            align: 'left',
+            dataIndex: 'wvtaId',
+            width: 150,
+            ellipsis: true
+          },
+          {
+            title: this.$t('standard'),
+            align: 'left',
+            dataIndex: 'serialNumber',
+            width: 150,
+            ellipsis: true
+          },
+          {
+            title: this.$t('areaOfResponsibility'),
+            align: 'left',
+            dataIndex: 'dutyTerritoryName',
+            width: 100,
+            ellipsis: true
+          },
+          {
+            title: this.$t('typeOfDeliverables'),
+            align: 'left',
+            dataIndex: 'deliverableTypeName',
+            width: 200,
+            ellipsis: true
+          }
+        ],
+        fieldList: [
+          {
+            type: 'string',
+            value: 'wvtaId',
+            text: 'WVTA ID'
+          },
+          {
+            type: 'string',
+            value: 'inspectionItem',
+            text: this.$t('inspectionItems')
+          },
+          {
+            type: '',
+            value: 'dutyTerritory',
+            text: this.$t('areaOfResponsibility'),
+            dictCode: 'duty_territory'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          }
+        ],
+        dataList: [],
+        content: [],
+        loading: false,
+        dummyInventoryBaseId: '',
+        pageNo: 1,
+        pageSize: 10,
+        total: 0
+      }
+    },
+    mounted() {
+
+    },
+    methods: {
+      transferModel(id) {
+        this.visible = true
+        this.dummyInventoryBaseId = id
+        this.queryParam = {}
+        this.selectedRowKeys = []
+        this.replacePage()
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.replacePage()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.replacePage()
+        // this.$refs.globalAdvancedQueryRef.resetLine()
+        // this.$refs.globalAdvancedQueryRef.emitCallback()
+      },
+      onChange(page, pageSize) {
+        this.pageNo = page
+        this.replacePage()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.replacePage()
+      },
+      // handleSuperQuery(params, matchType) {
+      //   let sqp = {}
+      //   if (!params || (params && params.length == 0)) {
+      //     sqp['superQueryParams'] = ''
+      //     this.$refs.globalAdvancedQueryRef.superQueryFlag = false
+      //   } else {
+      //     this.$refs.globalAdvancedQueryRef.superQueryFlag = true
+      //     sqp['superQueryParams'] = encodeURI(JSON.stringify(params))
+      //     sqp['superQueryMatchType'] = matchType
+      //   }
+      //   this.queryParamQuery = sqp
+      //   this.replacePage()
+      // },
+      replacePage() {
+        let query = {
+          // pageNo: this.pageNo,
+          // pageSize: this.pageSize,
+          ...this.queryParamQuery,
+          ...this.queryParam,
+          authDummyInventoryBaseId: this.dummyInventoryBaseId
+        }
+        this.loading = true
+        getAction('/authDummy/authDummyInventoryInfoEO/list', query).then((res) => {
+          if (res.success) {
+            this.dataList = res.result || []
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+        // if (this.selectedRowKeys.length > 1) {
+        //   this.selectedRowKeys.shift()
+        // }
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      handleSubmit(flag) {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.confirmLoading = true
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          postAction('project/projectCertificationInventoryEO/callAdd', {
+            authDummyInventoryBaseId: this.dummyInventoryBaseId,
+            projectLibraryId: this.$route.query.id,
+            authDummyInventoryInfoIds: selectedRowKeys.join(',')
+          }).then((res) => {
+            if (res.success) {
+              this.confirmLoading = false
+              if (res.result && res.result.length > 0) {
+                let detailedWarningList = []
+                res.result.forEach(val => {
+                  detailedWarningList.push(
+                  < div > { val } < /div>)
+                })
+                this.$warning({
+                  content: (
+                    < div >
+                    { detailedWarningList }
+                    < /div>
+                )
+              })
+              } else {
+                this.$message.success(this.$t('OperationSuccessful'))
+              }
+              this.visible = false
+              this.selectedRowKeys = []
+              this.$emit('transferListFormHomo')
+            } else {
+              this.$message.warning(this.$t('operationFailed'))
+              this.confirmLoading = false
+            }
+          })
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    z-index: 100;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
new file mode 100644
index 000000000..496f75338
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
@@ -0,0 +1,2724 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('inspectionItems')">
+                <span>{{ $t('inspectionItems') }}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('inspectionItems')"
+                       v-model="queryParam.inspectionItem"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('ProcessStatus')">
+                <span>{{ $t('ProcessStatus') }}</span>
+              </div>
+              <a-select :placeholder="$t('PleaseSelect')+$t('ProcessStatus')"
+                        class="box-input"
+                        mode="multiple"
+                        allowClear
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        v-model="queryParam.flowStatus">
+                <a-select-option v-for="(item, key) in processStatusList"
+                                 :key="item.value"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('statisticalNodes')">
+                <span>{{ $t('statisticalNodes') }}</span>
+              </div>
+              <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
+                        allowClear
+                        class="box-input"
+                        show-search
+                        optionFilterProp="label"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        v-model="queryParam.firstLevelDutyTerritory">
+                <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
+                                 :key="key"
+                                 :label="item.key"
+                                 :value="item.key">
+                               <span style="display: inline-block;width: 100%" :title=" item.key ">
+                                     {{ item.key }}
+                               </span>
+                </a-select-option>
+              </a-select>
+            </div>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('areaOfResponsibility')">
+                  <span>{{ $t('areaOfResponsibility') }}</span>
+                </div>
+                <j-multi-select-tag class="box-input" v-model="queryParam.dutyTerritory"
+                                    :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                    :type="'select'"
+                                    :triggerChange="false" :dictCode="'duty_territory'"/>
+              </div>
+            </a-col>
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('standardNo')">
+                  <span>{{ $t('standardNo') }}</span>
+                </div>
+                <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standardNo')"
+                         v-model="queryParam.serialNumber"></j-input>
+              </div>
+            </a-col>
+
+          </template>
+          <span style="float: right;overflow: hidden;margin-right: 11px; " class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                 <a @click="handleToggleSearch" :style="{ marginLeft: long == 'en-us'?'-6px':'8px' }">
+                    {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                    <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                  </a>
+                  <a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <globalAdvancedQuery ref="globalAdvancedQueryRef"
+                                       @handleSuperQuery="handleSuperQuery"
+                                       :fieldList="fieldList"/>
+               </a-col>
+            </span>
+        </a-row>
+      </a-form>
+    </div>
+
+    <div class="table-operator"
+         style="overflow:hidden;margin-bottom: 20px;text-align: left">
+      <div style="margin-top: 1px;float:left;">
+
+        <!--        导出-->
+        <div @click="handleExport" v-if="roleSwitchingCode == 1 || roleSwitchingCode == 11 ||
+         roleSwitchingCode == 12 || roleSwitchingCode == 13 || roleSwitchingCode == 14 ||
+         roleSwitchingCode == 20 || roleSwitchingCode == 21"
+             class="operator-text">
+          <a-icon type="export" :rotate="-90"/>
+          {{ $t('export') }}
+        </div>
+
+        <!--        保存-->
+        <div @click="preservationClick(1)" v-if="roleSwitchingCode == 2 || roleSwitchingCode == 0"
+             class="operator-text">
+          <a-icon type="check-circle"/>
+          {{ $t('preservation') }}
+        </div>
+
+        <!--        调取-->
+        <div @click="transferClick" v-if="roleSwitchingCode == 0" class="operator-text">
+          <a-icon type="profile"/>
+          {{ $t('Transfer') }}
+        </div>
+
+        <!--        批量设置-->
+        <div @click="BatchSettingClick($t('BatchSetting'))" v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
+             class="operator-text">
+          <a-icon type="setting"/>
+          {{ $t('BatchSetting') }}
+        </div>
+
+        <!--        认证目录-->
+<!--        v-if="roleSwitchingCode == 0 || roleSwitchingCode == 1 ||-->
+<!--        roleSwitchingCode == 2"-->
+        <div @click="certificationClick"  v-has="'rzqd:homologationatalogue'" class="operator-text">
+          <a-icon type="profile"/>
+          {{ $t('CertificationDirectory') }}
+        </div>
+        <!--        带入相关人员-->
+        <div @click="bringInRelevantPersonnelClick"
+             v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
+             class="operator-text">
+          <a-icon type="user"/>
+          {{ $t('bringInRelevantPersonnel') }}
+        </div>
+        <!--        修改配置-->
+        <div @click="BatchSettingClick($t('changeSetting'))" v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21"
+             class="operator-text">
+          <a-icon type="setting"/>
+          {{ $t('changeSetting') }}
+        </div>
+
+        <!--        引用交付物-->
+        <div @click="referenceDeliverablesClick" v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21"
+             class="operator-text">
+          <a-icon type="profile"/>
+          {{ $t('referenceDeliverables') }}
+        </div>
+        <!--              添加配置-->
+        <div @click="addConfigurationClick"
+             v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21"
+             class="operator-text">
+          <a-icon type="plus"/>
+          {{ $t('addConfiguration') }}
+        </div>
+        <a-popconfirm overlayClassName="popconfirm" placement="bottomRight">
+          <template slot="title" id="popconfirm">
+            <div>
+              <!--              添加-->
+              <div @click="handleAdd"
+                   v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
+                   class="operator-text-title">
+                <a-icon type="plus"/>
+                {{ $t('add') }}
+              </div>
+              <!--              添加配置-->
+              <div @click="addConfigurationClick"
+                   v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
+                   class="operator-text-title">
+                <a-icon type="plus"/>
+                {{ $t('addConfiguration') }}
+              </div>
+              <!--              模板下载-->
+              <div @click="handleModule"
+                   v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
+                   class="operator-text-title">
+                <a-icon type="download"/>
+                {{ $t('templateDownload') }}
+              </div>
+
+              <!--              导出-->
+              <div @click="handleExport"
+                   v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2 || roleSwitchingCode == 20 || roleSwitchingCode == 21"
+                   class="operator-text-title">
+                <a-icon type="export" :rotate="-90"/>
+                {{ $t('export') }}
+              </div>
+
+              <!--              导入-->
+              <div class="operator-text-title" v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2">
+                <ImportFile :url="url" :projectLibraryId=$route.query.id :isTrue="true" :accept="'.zip'"
+                            @getList="getPersonnelList"/>
+              </div>
+
+              <!--              批量删除-->
+              <div @click="handleDel"
+                   v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
+                   class="operator-text-title">
+                <a-icon type="delete"/>
+                {{ $t('BatchDelete') }}
+              </div>
+
+              <!--              流程重置-->
+              <div @click="processResetClick"
+                   v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
+                   class="operator-text-title">
+                <a-icon type="file-search"/>
+                {{ $t('processReset') }}
+              </div>
+            </div>
+          </template>
+          <div class="operator-text" style="position: relative"
+               v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2">
+            <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
+          </div>
+        </a-popconfirm>
+      </div>
+      <div style="margin-top: 1px;float:right;">
+
+        <!--        发布-->
+        <div @click="releaseClick" v-if="roleSwitchingCode == 0" class="operator-text">
+          <a-icon type="check-circle"/>
+          {{ $t('release') }}
+        </div>
+
+        <!--        撤回-->
+        <div @click="withdrawClick" v-if="roleSwitchingCode == 0" class="operator-text">
+          <a-icon type="rollback"/>
+          {{ $t('withdraw') }}
+        </div>
+
+        <!--        发起任务-->
+        <div @click="initiatingProcessClick('rzgcsjsrw',$t('confirmLaunchTask'))"
+             v-if="roleSwitchingCode == 2" class="operator-text">
+          <a-icon type="check-circle"/>
+          {{ $t('initiateTask') }}
+        </div>
+
+        <!--        退回至Studio-->
+        <div @click="returnToStudioClick('rzgcsthrw',$t('areYouReturnToStudio'))"
+             v-if="roleSwitchingCode == 2" class="operator-text">
+          <a-icon type="close-circle"/>
+          {{ $t('returnToStudio') }}
+        </div>
+
+        <!--        审批通过-->
+        <div @click="ApprovedClick('rzgcssc_tg',$t('confirmApproval'))" v-if="roleSwitchingCode == 2"
+             class="operator-text">
+          <a-icon type="check-circle"/>
+          {{ $t('reviewAndPass') }}
+        </div>
+
+        <!--        审批退回-->
+        <div @click="ApprovedClick('rzgcssc_th',$t('confirmReturnForApproval'))" v-if="roleSwitchingCode == 2"
+             class="operator-text">
+          <a-icon type="close-circle"/>
+          {{ $t('reviewAndReturn') }}
+        </div>
+
+        <!--        补充提交-->
+        <div @click="supplementarySubmissionClick()"
+             v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21"
+             class="operator-text">
+          <a-icon type="rollback"/>
+          {{ $t('supplementarySubmission') }}
+        </div>
+
+        <!--        任务接受-->
+        <div @click="missionAcceptedClick('zrrjsrw',$t('confirmToAcceptTheTask'))"
+             v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21"
+             class="operator-text">
+          <a-icon type="check-circle"/>
+          {{ $t('missionAccepted') }}
+        </div>
+
+        <!--        任务退回-->
+        <div @click="missionAcceptedClick('zrrjjrw',$t('confirmRejectTask'))"
+             v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21"
+             class="operator-text">
+          <a-icon type="close-circle"/>
+          {{ $t('missionRejection') }}
+        </div>
+
+        <!--        提交-->
+        <div @click="submitClick('zrrtjrw',$t('confirmSubmit'))"
+             v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21" class="operator-text">
+          <a-icon type="check-circle"/>
+          {{ $t('submit') }}
+        </div>
+
+        <!--       转办 -->
+        <div @click="turnToDoClick" v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21" class="operator-text">
+          <a-icon type="undo"/>
+          {{ $t('turnToDo') }}
+        </div>
+
+        <!--        催办-->
+        <div @click="questionClick" v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2 || roleSwitchingCode == 20"
+             class="operator-text">
+          <a-icon type="sound"/>
+          {{ $t('question') }}
+        </div>
+      </div>
+    </div>
+
+    <div style="width: 100%">
+      <a-table
+        ref="table"
+        class="customizetable"
+        :loading="loading"
+        :components="drag(columns,'columnsAll')"
+        :pagination="false"
+        :scroll="{x: '100%',y:'calc(100vh - 300px)'}"
+        rowKey="id"
+        :data-source="dataSource"
+        @change="tableOnChange"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :columns="columns"
+      >
+        <span slot="serialNumber" slot-scope="text,record">
+            <a class="textName" @click="standardClick(record)">
+                 {{ text }}
+              </a>
+        </span>
+        <span slot="operation" slot-scope="text,record">
+              <a class="text-operation"
+                 v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
+                 @click="edit(record)">
+                {{ $t('edit') }}
+              </a>
+              <a class="text-operation"
+                 @click="modifyHistoryClick(record)">
+                {{ $t('history') }}
+              </a>
+              <a class="text-operation"
+                 v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
+                 @click="deleteLib(record)">
+                {{ $t('deleteLib') }}
+              </a>
+        </span>
+        <span slot="DeliverablesResult" slot-scope="text,record,index">
+                  <span v-if="(record.flowStatus == 'Results to be submitted' &&
+                  record.dutyPersonName == userInfoQuery.username && roleSwitchingCode == 20) ||
+                  (record.flowStatus == 'Review and return' &&
+                  record.dutyPersonName == userInfoQuery.username && roleSwitchingCode == 20) ||
+                  (record.flowStatus == 'Results to be submitted' && roleSwitchingCode == 21) ||
+                  (record.flowStatus == 'Review and return' && roleSwitchingCode == 21)">
+                   <a-button type="primary" class="button-text"
+                             v-if="record.valueType == 'file'"
+                             @click="clickButtonToUpload('deliveryResult',index)">
+                    {{ (record.deliveryResult === 'null' || record.deliveryResult === '' ||
+                    record.deliveryResult == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                    }}
+                   </a-button>
+                     <a-input class="box-input-index"
+                              v-else-if="record.valueType == 'text'"
+                              :maxLength="200"
+                              @blur="deliveryBlur"
+                              onkeyup="this.value=this.value.replace(/(^\s+)|(\s+$)/g, '')"
+                              v-model.trim="record.deliveryResult"
+                              :placeholder="$t('PleaseEnter')"/>
+                    <a-radio-group v-else-if="record.valueType == 'select'"
+                                   @change="deliveryChange"
+                                   v-model="record.deliveryResult">
+                      <a-radio :value="'1'">
+                           {{$t('yes')}}
+                       </a-radio>
+                       <a-radio :value="'2'">
+                          {{$t('not')}}
+                        </a-radio>
+                    </a-radio-group>
+                    <span v-else>--</span>
+                  </span>
+
+                   <span v-else>
+                       <span class="viewFile"
+                             @click="viewFileClick(record.deliveryResult)"
+                             v-if="record.deliveryResult && record.valueType == 'file'">
+                           {{$t('viewFile')}}
+                       </span>
+                        <span :title="record.deliveryResult"
+                              v-else-if="record.deliveryResult && record.valueType == 'text'">
+                             {{record.deliveryResult}}
+                        </span>
+                        <span v-else-if="record.deliveryResult && record.valueType == 'select'">
+                             {{record.deliveryResult == '1' ? $t('yes') :$t('not')}}
+                        </span>
+                       <span v-else>--</span>
+                   </span>
+        </span>
+        <span slot="reportNo" slot-scope="text,record">
+                  <a-input class="box-input-index"
+                           v-if="roleSwitchingCode == 2 || roleSwitchingCode == 0"
+                           :maxLength="200"
+                           onkeyup="this.value=this.value.replace(/(^\s+)|(\s+$)/g, '')"
+                           v-model.trim="record.reportNumber"
+                           :placeholder="$t('PleaseEnter')+$t('reportNo')"/>
+                  <span v-else>{{text}}</span>
+        </span>
+        <span slot="productModel" slot-scope="text,record">
+                  <a-input class="box-input-index"
+                           v-if="roleSwitchingCode == 2 || roleSwitchingCode == 0"
+                           :maxLength="200"
+                           onkeyup="this.value=this.value.replace(/(^\s+)|(\s+$)/g, '')"
+                           v-model.trim="record.productModel"
+                           :placeholder="$t('PleaseEnter')+$t('productModel')"/>
+                  <span v-else>{{text}}</span>
+        </span>
+        <span slot="nameOfManufacturer" slot-scope="text,record">
+                  <a-input class="box-input-index"
+                           v-if="roleSwitchingCode == 2 || roleSwitchingCode == 0"
+                           :maxLength="200"
+                           onkeyup="this.value=this.value.replace(/(^\s+)|(\s+$)/g, '')"
+                           v-model.trim="record.productionEnterpriseName"
+                           :placeholder="$t('PleaseEnter')+$t('nameOfManufacturer')"/>
+                  <span v-else>{{text}}</span>
+        </span>
+        <div slot="CertificationProgress" slot-scope="text,result">
+             <span class="box-content-Progress box-content-cou"
+                   :style="{'width':long=='zh-cn'?'116px' : '148px'}"
+                   :class="CertificationColor[result.certificationProgress]"
+                   @click="CertificationProgressClick(result)"
+             >
+              {{result.certificationProgress_dictText ? result.certificationProgress_dictText : $t('toBeStarted')}}
+             </span>
+        </div>
+        <span slot="deliverableTemplate" slot-scope="text,result">
+                <span class="viewFile"
+                      @click="viewFileClick(result.deliverableTemplate)"
+                      v-if="result.deliverableTemplate">
+                     {{$t('viewFile')}}
+                </span>
+                <span v-else>--</span>
+        </span>
+      </a-table>
+      <div class="page" v-if="dataSource.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :pageSizeOptions="['50','100','200','300']"
+          :current="pageNo"
+          @change="onChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+    <transferList :url="url" @transferListForm="transferListForm" ref="transferListRef"/>
+    <certificationDirectory :isDisplayNum="isDisplayNum" :roleSwitchingCode="roleSwitchingCode"
+                            :url="url" ref="certificationDirectoryRef"/>
+    <batSetting :url="url" ref="batSettingRef" :roleSwitchingCode="roleSwitchingCode" @batSettingForm="batSettingForm"/>
+    <addModel ref="addModelRef" @addModelForm="addModelForm"/>
+    <modifyHistory ref="modifyHistoryRef"/>
+    <uploadFile ref="uploadFile" :isMultiple="false" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
+    <TaskListModel @TaskListModelList="transferListForm" ref="TaskListModelRef"/>
+    <referenceDeliverablesList ref="referenceDeliverablesListRef" @referenceDeliverablesListForm="transferListForm"/>
+    <SelectedBy ref="SelectedByRef" :isSingleChoice="true"
+                :title="$t('turnToDo')" @SelectedByForm="SelectedByForm"></SelectedBy>
+    <viewFileModel ref="viewFileModelRef"/>
+    <reasonForReturn ref="reasonForReturnRef" @reasonForReturnForm="reasonForReturnForm"/>
+    <addConfiguration ref="addConfigurationRef" @addConfigurationForm="transferListForm"/>
+    <deadlineForm ref="deadlineFormRef" @deadlineDataForm="deadlineDataForm"/>
+    <JLoading :loading="JTextLoading">{{ $t('Submitting') }}</JLoading>
+    <!--    <a-modal-->
+    <!--      :title="listTitle"-->
+    <!--      :width="500"-->
+    <!--      :visible="visible"-->
+    <!--      :confirm-loading="confirmLoading"-->
+    <!--      :maskClosable="false"-->
+    <!--      @ok="handleOk"-->
+    <!--      @cancel="handleCancel"-->
+    <!--    >-->
+    <!--      <a-spin :spinning="confirmLoading">-->
+    <!--        <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">-->
+    <!--          <a-row :gutter="24">-->
+    <!--            <a-col :span="24">-->
+    <!--              <div class="box-title-text-index">-->
+    <!--                <div class="title-text-index">-->
+    <!--                  <span class="Required">*</span>-->
+    <!--                  <span class="title-text-text"-->
+    <!--                        :title="$t('TaskCutOffTime')">{{ $t('TaskCutOffTime') }}</span>-->
+    <!--                </div>-->
+    <!--                <a-form-model-item class="itemModel" prop="endTime">-->
+    <!--                  <a-date-picker class="box-input"-->
+    <!--                                 :placeholder="$t('PleaseSelect')+$t('TaskCutOffTime')"-->
+    <!--                                 @change="dateChange({db_field_name:'endTime'})"-->
+    <!--                                 format="YYYY-MM-DD"-->
+    <!--                                 :disabledDate="disabledDate"-->
+    <!--                                 :getCalendarContainer="(trigger) => trigger.parentNode"-->
+    <!--                                 v-model="formInline.endTime"-->
+    <!--                                 style="width: 100%"/>-->
+    <!--                </a-form-model-item>-->
+    <!--              </div>-->
+    <!--            </a-col>-->
+    <!--          </a-row>-->
+    <!--        </a-form-model>-->
+    <!--      </a-spin>-->
+    <!--    </a-modal>-->
+    <!--    <a-modal-->
+    <!--      :title="$t('roleSwitching')"-->
+    <!--      :width="500"-->
+    <!--      :visible="visibleRoleSwitching"-->
+    <!--      :confirm-loading="confirmLoadingRoleSwitching"-->
+    <!--      :maskClosable="false"-->
+    <!--      @ok="handleOkRoleSwitching"-->
+    <!--      @cancel="handleCancelRoleSwitching"-->
+    <!--    >-->
+    <!--      <a-form-model :model="formInlineRoleSwitching" class="formAdd" :rules="rulesRoleSwitching"-->
+    <!--                    ref="ruleFormRoleSwitching">-->
+    <!--        <a-row :gutter="24">-->
+    <!--          <a-col :span="24">-->
+    <!--            <div class="box-title-text-index">-->
+    <!--              <div class="title-text-Comment">-->
+    <!--                <span class="Required">*</span>-->
+    <!--                <span class="title-text-text" :title="$t('roleSwitching')">{{ $t('roleSwitching') }}</span>-->
+    <!--              </div>-->
+    <!--              <a-form-model-item class="itemModelComment" :prop="'roleSwitchingCode'">-->
+    <!--                <a-select allowClear :placeholder="$t('pleaseSelect')+$t('roleSwitching')"-->
+    <!--                          v-model="formInlineRoleSwitching.roleSwitchingCode">-->
+    <!--                  &lt;!&ndash;    <a-select-option :value="null">{{$t('pleaseSelect')}}</a-select-option>&ndash;&gt;-->
+    <!--                  <a-select-option :value="item.roleCode" v-for="item in roleSwitchingList">-->
+    <!--                 <span class="itemOption-index" :title="item.roleName">-->
+    <!--                     {{ item.roleName }}-->
+    <!--                </span>-->
+    <!--                  </a-select-option>-->
+    <!--                </a-select>-->
+    <!--              </a-form-model-item>-->
+    <!--            </div>-->
+    <!--          </a-col>-->
+    <!--        </a-row>-->
+    <!--      </a-form-model>-->
+    <!--    </a-modal>-->
+  </a-card>
+</template>
+
+<script>
+  import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
+  import certificationDirectory from '../certificationDirectory'
+  import viewFileModel from '@/components/viewFileModel/index'
+  import ImportFile from '@/components/ImportFile/index'
+  import transferList from './components/transferList'
+  import uploadFile from '@/components/uploadFile/file'
+  import addModel from './components/addModel'
+  import batSetting from './components/batSetting'
+  import modifyHistory from './components/modifyHistoryList'
+  import TaskListModel from '../TaskListModel'
+  import SelectedBy from '@/components/SelectedBy/index'
+  import reasonForReturn from './components/reasonForReturn'
+  import addConfiguration from './components/addConfiguration'
+  import deadlineForm from './components/deadlineForm'
+  import referenceDeliverablesList from './components/referenceDeliverablesList'
+  import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+  import moment from 'moment'
+  import { mapGetters } from 'vuex'
+
+  export default {
+    name: 'index',
+    props: ['isDisplayNum','areaOfResponsibility'],
+    mixins: [ResizeColumnProvide, ResizeHeader],
+    components: {
+      globalAdvancedQuery,
+      ImportFile,
+      transferList,
+      certificationDirectory,
+      batSetting,
+      addModel,
+      modifyHistory,
+      uploadFile,
+      TaskListModel,
+      referenceDeliverablesList,
+      SelectedBy,
+      viewFileModel,
+      reasonForReturn,
+      addConfiguration,
+      deadlineForm
+    },
+    data() {
+      return {
+        queryParam: {},
+        pageNo: 1,
+        pageSize: 50,
+        total: 0,
+        JTextLoading: false,
+        CertificationColor: {
+          'Test passed': 'accordColor',
+          'Test failed': 'nonConformityColor',
+          'In progress': 'TrackedColor',
+          'NA': 'notInvolvedColor',
+          'Not start': 'submittedColor',
+          'Component report submitted': 'componentColor',
+          'Component report has been stored': 'accordColor',
+          'Component report not submitted': 'TrackedColor'
+        },
+        fieldList: [
+          {
+            type: 'string',
+            value: 'category',
+            text: this.$t('category')
+          },
+          {
+            type: 'string',
+            value: 'configItem',
+            text: this.$t('configurationItem')
+          },
+          {
+            type: 'string',
+            value: 'wvtaId',
+            text: 'WVTA ID'
+          },
+          {
+            type: 'list_multi',
+            value: 'attestationType',
+            text: this.$t('certificationType'),
+            dictCode: 'ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          },
+          {
+            type: 'string',
+            value: 'serialNumber',
+            text: this.$t('standardNo')
+          },
+          // {
+          //   type: 'Personnel',
+          //   value: 'sdt',
+          //   valueName: 'sdtName',
+          //   text: this.$t('engineeringInterfacePerson')
+          // },
+          // {
+          //   type: 'Personnel',
+          //   value: 'dutyPerson',
+          //   valueName: 'dutyPersonName',
+          //   text: this.$t('personLiable')
+          // },
+          {
+            type: 'date',
+            value: 'endTime',
+            text: this.$t('closingDate')
+          }
+        ],
+        disabled: false,
+        queryParamQuery: {},
+        formInline: {},
+        toggleSearchStatus: false,
+        confirmLoading: false,
+        listTitle: '',
+        visible: false,
+        processStatusList: [],
+        rules: {
+          endTime: [
+            {
+              required: true,
+              message: this.$t('TaskCutOffTime') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ]
+        },
+        url: {
+          list: '/project/projectCertificationInventoryEO/page',
+          exportTemplate: '/project/projectCertificationInventoryEO/exportTemplate',
+          exportData: '/project/projectCertificationInventoryEO/exportData',
+          deleteBatch: '/project/projectCertificationInventoryEO/deleteBatch',
+          setBatch: '/project/projectCertificationInventoryEO/setBatch',
+          deleteOne: '/project/projectCertificationInventoryEO/delete',
+          AndUserId: '/project/projectLibraryRoleRelEO/queryByProjectLibraryIdAndUserId',
+          AndUserIdEdit: '/project/projectLibraryRoleRelEO/edit',
+          saveBatch: '/project/projectCertificationInventoryEO/saveBatch',
+          questionUrl: '/project/projectCertificationInventoryEO/expediting',
+          importZipUrl: '/project/projectCertificationInventoryEO/importData'
+        },
+        dataSource: [],
+        roleSwitchingCode: '',
+        loading: false,
+        roleSwitchingList: [],
+        visibleRoleSwitching: false,
+        confirmLoadingRoleSwitching: false,
+        formInlineRoleSwitching: {},
+        AndUserId: '',
+        rulesRoleSwitching: {
+          roleSwitchingCode: [
+            {
+              required: true,
+              message: this.$t('roleSwitching') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ]
+        },
+        columnsAll: [
+          {
+            title: this.$t('category'),
+            align: 'left',
+            dataIndex: 'category',
+            width: 120,
+            ellipsis: true,
+            fixed: 'left',
+            sorter: true
+          },
+          {
+            title: this.$t('inspectionItems'),
+            align: 'left',
+            dataIndex: 'inspectionItem',
+            width: 180,
+            ellipsis: true,
+            sorter: true,
+            fixed: 'left'
+          },
+          {
+            title: this.$t('configurationItem'),
+            align: 'left',
+            dataIndex: 'configItem',
+            width: 85,
+            ellipsis: true
+          },
+          {
+            title: this.$t('certificationType'),
+            align: 'left',
+            dataIndex: 'attestationTypeName',
+            width: 100,
+            sorter: true,
+            ellipsis: true
+          },
+          {
+            title: 'WVTA ID',
+            align: 'left',
+            dataIndex: 'wvtaId',
+            width: 95,
+            sorter: true,
+            ellipsis: true
+          },
+          {
+            title: this.$t('standardNo'),
+            align: 'left',
+            dataIndex: 'serialNumber',
+            width: 150,
+            ellipsis: true,
+            sorter: true,
+            scopedSlots: { customRender: 'serialNumber' }
+          },
+          {
+            title: this.$t('statisticalNodes'),
+            align: 'left',
+            dataIndex: 'dutyDepart',
+            width: 100,
+            ellipsis: true
+          },
+          {
+            title: this.$t('areaOfResponsibility'),
+            align: 'left',
+            dataIndex: 'dutyTerritoryName',
+            width: 100,
+            sorter: true,
+            ellipsis: true
+          },
+          {
+            title: this.$t('engineeringInterfacePerson'),
+            align: 'left',
+            dataIndex: 'sdtName',
+            width: 110,
+            sorter: true,
+            ellipsis: true
+          },
+          {
+            title: this.$t('personLiable'),
+            align: 'left',
+            dataIndex: 'dutyPersonName',
+            width: 120,
+            sorter: true,
+            ellipsis: true
+          },
+          {
+            title: this.$t('deliverableTemplate'),
+            align: 'left',
+            dataIndex: 'deliverableTemplate',
+            width: 180,
+            ellipsis: true,
+            scopedSlots: { customRender: 'deliverableTemplate' }
+          },
+          {
+            title: this.$t('typeOfDeliverables'),
+            align: 'left',
+            dataIndex: 'deliverableTypeName',
+            width: 180,
+            sorter: true,
+            ellipsis: true
+          },
+          {
+            title: this.$t('DeliverablesResult'),
+            align: 'left',
+            dataIndex: 'deliveryResult',
+            width: 210,
+            ellipsis: true,
+            scopedSlots: { customRender: 'DeliverablesResult' }
+          },
+          {
+            title: this.$t('closingDate'),
+            align: 'left',
+            dataIndex: 'endTime',
+            width: 130,
+            sorter: true,
+            ellipsis: true
+          },
+          {
+            title: this.$t('ProcessStatus'),
+            align: 'left',
+            dataIndex: 'flowStatusName',
+            width: 180,
+            sorter: true,
+            ellipsis: true
+          },
+          {
+            title: this.$t('reportNo'),
+            align: 'left',
+            dataIndex: 'reportNumber',
+            width: 180,
+            ellipsis: true,
+            scopedSlots: { customRender: 'reportNo' }
+          },
+          {
+            title: this.$t('productModel'),
+            align: 'left',
+            dataIndex: 'productModel',
+            width: 180,
+            ellipsis: true,
+            scopedSlots: { customRender: 'productModel' }
+          },
+          {
+            title: this.$t('nameOfManufacturer'),
+            align: 'left',
+            dataIndex: 'productionEnterpriseName',
+            width: 210,
+            ellipsis: true,
+            scopedSlots: { customRender: 'nameOfManufacturer' }
+          },
+          {
+            title: this.$t('CertificationProgress'),
+            align: 'left',
+            dataIndex: 'certificationProgress',
+            sorter: true,
+            width: localStorage.getItem('language') == 'zh-cn' ? 180 : 200,
+            ellipsis: true,
+            scopedSlots: { customRender: 'CertificationProgress' }
+          },
+          {
+            title: this.$t('operation'),
+            align: 'left',
+            fixed: 'right',
+            width: localStorage.getItem('language') == 'zh-cn' ? 160 : 180,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
+        selectedRowKeys: [],
+        selectedRowKeysList: [],
+        long: '',
+        toDoIds: [],
+        toDoNotConditions: [],
+        userInfoQuery: {},
+        DeliverableTreeList: [],
+        firstLevelDutyTerritoryList:[],
+      }
+    },
+    mounted() {
+      // this.getList()
+      this.getFirstLevelDutyTerritory()
+      this.long = localStorage.getItem('language') || 'zh-cn'
+      this.loading = true
+      this.userInfoQuery = this.userInfo()
+      console.log(this.areaOfResponsibility)
+      if (this.areaOfResponsibility && this.areaOfResponsibility.dutyTerritoryName) {
+        this.queryParam.firstLevelDutyTerritory = this.areaOfResponsibility.dutyTerritoryName
+        this.queryParam = { ...this.queryParam }
+      }
+      this.getProcessStatus()
+      this.getDeliverableTree()
+      this.querydreId()
+      this.getRoleByUserId(() => {
+        this.getAndUserId()
+      })
+    },
+    computed: {
+      columns: function() {
+        let columns = JSON.parse(JSON.stringify(this.columnsAll))
+        if (this.roleSwitchingCode == 11 ||
+          this.roleSwitchingCode == 12 || this.roleSwitchingCode == 13 || this.roleSwitchingCode == 14) {
+          for (let i = 0; i < columns.length; i++) {
+            if (columns[i].title == this.$t('operation')) {
+              columns.splice(i, 1)
+              i--
+            }
+          }
+        }
+        if (this.roleSwitchingCode == 20 || this.roleSwitchingCode == 21 || this.roleSwitchingCode == 11 ||
+          this.roleSwitchingCode == 12 || this.roleSwitchingCode == 13 || this.roleSwitchingCode == 14) {
+          for (let i = 0; i < columns.length; i++) {
+            if (columns[i].title == this.$t('reportNo')) {
+              columns.splice(i, 1)
+              i--
+            }
+            if (columns[i].title == this.$t('productModel')) {
+              columns.splice(i, 1)
+              i--
+            }
+            if (columns[i].title == this.$t('nameOfManufacturer')) {
+              columns.splice(i, 1)
+              i--
+            }
+            if (columns[i].title == this.$t('CertificationProgress')) {
+              columns.splice(i, 1)
+              i--
+            }
+          }
+        }
+        return columns
+      }
+    },
+    methods: {
+      ...mapGetters(['userInfo']),
+      getFirstLevelDutyTerritory() {
+        getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
+          if (res.success) {
+            this.firstLevelDutyTerritoryList = res.result
+          } else {
+            this.firstLevelDutyTerritoryList = []
+          }
+        })
+      },
+      addConfigurationClick() {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.$refs.addConfigurationRef.getData(JSON.parse(JSON.stringify(this.selectedRowKeys)))
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      querydreId() {
+        let query = {
+          projectLibraryId: this.$route.query.id
+        }
+        getAction('/project/projectCertificationInventoryEO/queryDutyPersonByProjectId', query).then((res) => {
+          if (res.success) {
+            let engineeringInterfacePerson = {
+              value: 'sdt',
+              text: this.$t('engineeringInterfacePerson'),
+              options: []
+            }
+            let personLiable = {
+              value: 'dutyPerson',
+              text: this.$t('personLiable'),
+              options: []
+            }
+            if (res.result.interfaceList && res.result.interfaceList.length > 0) {
+              res.result.interfaceList.forEach(val => {
+                engineeringInterfacePerson.options.push({
+                  value: val.id,
+                  key: val.id,
+                  label: val.userName
+                })
+              })
+            }
+            if (res.result.dutyList && res.result.dutyList.length > 0) {
+              res.result.dutyList.forEach(val => {
+                personLiable.options.push({
+                  value: val.id,
+                  key: val.id,
+                  label: val.userName
+                })
+              })
+            }
+            this.fieldList.push(engineeringInterfacePerson)
+            this.fieldList.push(personLiable)
+          } else {
+
+          }
+        })
+      },
+      getDeliverableTree() {
+        getAction('/sys/category/getCertificationDeliverableTree', {}).then((res) => {
+          if (res.success) {
+            this.DeliverableTreeList = res.result
+            this.fieldList.push({
+              type: 'treeChoice',
+              value: 'deliverableType',
+              text: this.$t('typeOfDeliverables'),
+              tree: this.DeliverableTreeList
+            })
+          } else {
+            this.DeliverableTreeList = []
+          }
+        })
+      },
+      getProcessStatus() {
+        getAction('/project/projectCertificationInventoryEO/getFlowStatusList', {}).then((res) => {
+          if (res.success) {
+            this.processStatusList = res.result || []
+          } else {
+            this.processStatusList = []
+          }
+        })
+      },
+      disabledDate(current) {
+        return current && current < moment().subtract(1, 'day')
+      },
+      onChange(page, pageSize) {
+        this.pageNo = page
+        if (this.roleSwitchingCode == 2 || this.roleSwitchingCode == 0) {
+          this.preservationClick()
+        }
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        if (this.roleSwitchingCode == 2 || this.roleSwitchingCode == 0) {
+          this.preservationClick()
+        }
+        this.getList()
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.selectedRowKeys = []
+        this.getList()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.selectedRowKeys = []
+        this.$refs.globalAdvancedQueryRef.resetLine()
+        this.$refs.globalAdvancedQueryRef.emitCallback()
+      },
+      getPersonnelList() {
+        this.pageNo = 1
+        this.getList()
+      },
+      handleSuperQuery(params, matchType) {
+        let sqp = {}
+        if (!params || (params && params.length == 0)) {
+          sqp['superQueryParams'] = ''
+          this.$refs.globalAdvancedQueryRef.superQueryFlag = false
+        } else {
+          this.$refs.globalAdvancedQueryRef.superQueryFlag = true
+          sqp['superQueryParams'] = encodeURI(JSON.stringify(params))
+          sqp['superQueryMatchType'] = matchType
+        }
+        this.queryParamQuery = sqp
+        this.pageNo = 1
+        this.getList()
+      },
+      handleToggleSearch() {
+        this.toggleSearchStatus = !this.toggleSearchStatus
+      },
+      tableOnChange(pagination, filters, sorter) {
+        this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+        if (sorter.columnKey == 'flowTypeShow') {
+          this.orderByField = 'flowType'
+        } else if (sorter.columnKey == 'taskDefinitionKeyName') {
+          this.orderByField = 'taskDefinitionKey'
+        } else {
+          this.orderByField = sorter.columnKey
+        }
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          orderBy: this.orderBy,
+          orderByField: this.orderByField,
+          ...this.queryParamQuery,
+          ...queryParam,
+          projectLibraryId: this.$route.query.id,
+          roleCode: this.roleSwitchingCode
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+            this.dataSource.forEach(value => {
+              if (value.flowStatusName == '清单待校核') {
+                value.flowStatusName = '任务待发起'
+              } else if (value.flowStatusName == 'List to be checked') {
+                value.flowStatusName = 'The task is to be initiated'
+              }
+            })
+            this.total = res.result.total
+            this.loading = false
+            this.JLoading = false
+          } else {
+            this.JLoading = false
+            this.loading = false
+          }
+        })
+      },
+      transferClick() {
+        this.$refs.transferListRef.transferModel()
+      },
+      BatchSettingClick(name) {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          let isTrue = false
+          for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+            if (!this.selectedRowKeysList[i].dutyTerritoryName) {
+              isTrue = true
+              break
+            }
+            for (let j = 1; j < this.selectedRowKeysList.length; j++) {
+              if (this.selectedRowKeysList[i].dutyTerritoryName != this.selectedRowKeysList[j].dutyTerritoryName) {
+                isTrue = true
+                break
+              }
+            }
+          }
+          if (!isTrue) {
+            this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), name, this.selectedRowKeysList[0])
+          } else {
+            this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), name)
+          }
+
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      certificationClick() {
+        this.$refs.certificationDirectoryRef.addModel()
+      },
+      onSelectChange(value, rows) {
+        this.selectedRowKeys = value
+        this.selectedRowKeysList = rows
+      },
+      handleModule() {
+        downloadFile(this.url.exportTemplate, this.$t('certificationList') + this.$t('importTemplate') + '.xls', {})
+      },
+      handleExport() {
+        let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+        let query = {
+          ...this.queryParam,
+          ids: selectedRowKeys.join(','),
+          ...this.queryParamQuery,
+          excelName: this.$route.query.projectName,
+          projectLibraryId: this.$route.query.id
+        }
+        downloadFile(this.url.exportData, this.$route.query.projectName + '.zip', query, this.Deselect)
+      },
+      handleDel() {
+        let _this = this
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          let ids = []
+          let notConditions = []
+          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)
+            } else {
+              notConditions.push(this.selectedRowKeysList[i].inspectionItem)
+            }
+          }
+          let data = ''
+          if (notConditions && notConditions.length > 0) {
+            data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataWithProcessStatusDeleted')
+          }
+          if (ids && ids.length > 0) {
+            this.$confirm({
+              content: _this.$t('ConfirmBatchDeletion'),
+              onOk() {
+                deleteAction(_this.url.deleteBatch, {
+                  ids: ids.join(','),
+                  projectLibraryId: _this.$route.query.id
+                }).then((res) => {
+                  if (res.success) {
+                    _this.$message.success(_this.$t('OperationSuccessful'))
+                    _this.selectedRowKeys = []
+                    _this.selectedRowKeysList = []
+                    _this.getList()
+                    if (notConditions && notConditions.length > 0) {
+                      _this.failedMessage(data)
+                    }
+                  } else {
+                    _this.$message.warning(res.message)
+                  }
+                })
+              }
+            })
+          } else {
+            this.failedMessage(data)
+          }
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      //流程重置
+      processResetClick() {
+        let _this = this
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          let ids = []
+          let notConditions = []
+          for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+            if (this.selectedRowKeysList[i].flowStatus == 'List to be released') {
+              notConditions.push(this.selectedRowKeysList[i].inspectionItem)
+            } else {
+              ids.push(this.selectedRowKeysList[i].id)
+            }
+          }
+          let data = ''
+          if (notConditions && notConditions.length > 0) {
+            data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('dataWithProcessReleasedCannotBeReset')
+          }
+          if (ids && ids.length > 0) {
+            this.$confirm({
+              content: _this.$t('confirmResetProcess'),
+              onOk() {
+                _this.JTextLoading = true
+                let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+                postAction('/project/projectCertificationInventoryEO/resetFlow', {
+                  ids: idList.join(','),
+                  projectLibraryId: _this.$route.query.id,
+                  operatorType: 'certificationInventoryStudioReset'
+                }).then((res) => {
+                  if (res.success) {
+                    _this.$message.success(_this.$t('OperationSuccessful'))
+                    _this.selectedRowKeys = []
+                    _this.getList()
+                    if (notConditions && notConditions.length > 0) {
+                      _this.failedMessage(data)
+                    }
+                    _this.JTextLoading = false
+                  } else {
+                    _this.$message.warning(res.message)
+                    _this.JTextLoading = false
+                  }
+                })
+              }
+            })
+          } else {
+            this.failedMessage(data)
+            this.JTextLoading = false
+          }
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      //添加
+      handleAdd() {
+        this.$refs.addModelRef.addModel()
+      },
+      dateChange(item) {
+        this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
+      },
+      releaseClick() {
+        // this.listTitle = this.$t('Deadline')
+        // if (this.selectedRowKeysList.length < 1) {
+        //   this.$message.warning(this.$t('selectLeastOne'))
+        // } else {
+        //   this.visible = true
+        // }
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          let ids = []
+          let notConditions = []
+          for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+            if ((this.selectedRowKeysList[i].flowStatus == 'List to be released' &&
+              this.selectedRowKeysList[i].deliverableType == '1635545748968783874') ||
+              (this.selectedRowKeysList[i].flowStatus == 'Certification returned' &&
+                this.selectedRowKeysList[i].deliverableType == '1635545748968783874')) {
+              ids.push(this.selectedRowKeysList[i].id)
+            } else if ((this.selectedRowKeysList[i].flowStatus == 'List to be released' &&
+              this.selectedRowKeysList[i].endTime) ||
+              (this.selectedRowKeysList[i].flowStatus == 'Certification returned' &&
+                this.selectedRowKeysList[i].endTime)) {
+              ids.push(this.selectedRowKeysList[i].id)
+            } else {
+              notConditions.push(this.selectedRowKeysList[i].inspectionItem)
+            }
+          }
+          let data = ''
+          if (notConditions && notConditions.length > 0) {
+            data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataListReleasedAndCertificationReturnCanSelected')
+          }
+          if (ids && ids.length > 0) {
+            // this.releaseData(ids, notConditions, data)
+            let query = {
+              ids: ids,
+              notConditions: notConditions,
+              data: data,
+              dutyDueDate: 'inventoryVerifyEndTime',
+              title: this.$t('release')
+            }
+            this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)))
+          } else {
+            this.failedMessage(data)
+          }
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      deadlineDataForm(val, formInline) {
+        if (val.title == this.$t('release')) {
+          this.releaseData(val.ids, val.notConditions, val.data, formInline)
+        } else if (val.title == this.$t('initiateTask')) {
+          this.initiateTaskClick(val, formInline)
+        }
+      },
+      releaseData(ids, notConditions, data, formInline) {
+        let _this = this
+        // this.$confirm({
+        //   content: _this.$t('confirmRelease'),
+        //   onOk() {
+        postAction('/project/projectCertificationInventoryEO/issue', {
+          ids: ids.join(','),
+          projectLibraryId: _this.$route.query.id,
+          inventoryVerifyEndTime: formInline.inventoryVerifyEndTime
+        }).then((res) => {
+          if (res.success) {
+            _this.$message.success(_this.$t('OperationSuccessful'))
+            _this.selectedRowKeys = []
+            _this.selectedRowKeysList = []
+            _this.getList()
+            if (notConditions && notConditions.length > 0) {
+              _this.failedMessage(data)
+            }
+            _this.$refs.deadlineFormRef.visible = false
+            _this.$refs.deadlineFormRef.confirmLoading = false
+          } else {
+            _this.$message.warning(res.message)
+            _this.$refs.deadlineFormRef.confirmLoading = false
+          }
+        })
+        // }
+        // })
+      },
+
+      initiateTaskClick(val, formInline) {
+        let _this = this
+        if (val.NAId && val.NAId.length > 0) {
+          _this.NASubmitTask(val.NAId, val.ids, val.notConditions, val.data)
+        }
+        if (val.ids && val.ids.length > 0) {
+          let query = {
+            'nodeKey': val.value,
+            'projectLibraryId': _this.$route.query.id,
+            'ids': val.ids.join(','),
+            taskConfirmEndTime: formInline.taskConfirmEndTime
+          }
+
+          postAction('/project/projectCertificationInventoryEO/submitTask', query).then((res) => {
+            if (res.success) {
+              _this.$message.success(_this.$t('OperationSuccessful'))
+              _this.getList()
+              _this.selectedRowKeys = []
+              _this.selectedRowKeysList = []
+              _this.$refs.deadlineFormRef.visible = false
+              _this.$refs.deadlineFormRef.confirmLoading = false
+              if (val.notConditions && val.notConditions.length > 0) {
+                _this.failedMessage(val.data)
+              }
+            } else {
+              _this.$message.warning(res.message)
+              _this.$refs.deadlineFormRef.confirmLoading = false
+            }
+          })
+        }
+      },
+      // handleOk() {
+      //   this.$refs.ruleForm.validate(valid => {
+      //     if (valid) {
+      //       let selectedRowKeys = []
+      //       this.selectedRowKeysList.forEach(res => {
+      //         selectedRowKeys.push(res.id)
+      //       })
+      //       let query = {
+      //         ids: selectedRowKeys.join(','),
+      //         projectLibraryId: this.$route.query.id,
+      //         ...this.formInline
+      //       }
+      //       this.confirmLoading = true
+      //       postAction('/project/projectCertificationInventoryEO/issue', query).then((res) => {
+      //         if (res.success) {
+      //           this.$message.success(this.$t('OperationSuccessful'))
+      //           this.visible = false
+      //           this.selectedRowKeys = []
+      //           this.confirmLoading = false
+      //           this.getList()
+      //         } else {
+      //           this.$message.warning(res.message)
+      //           this.confirmLoading = false
+      //         }
+      //         this.detailedSuccessList = []
+      //       })
+      //     }
+      //   })
+      // },
+      // handleCancel() {
+      //   this.formInline = {}
+      //   this.visible = false
+      // },
+
+      //撤回
+      withdrawClick() {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          let ids = []
+          let notConditions = []
+          for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+            if (this.selectedRowKeysList[i].flowStatus == 'List to be checked') {
+              ids.push(this.selectedRowKeysList[i].id)
+            } else {
+              notConditions.push(this.selectedRowKeysList[i].inspectionItem)
+            }
+          }
+          let data = ''
+          if (notConditions && notConditions.length > 0) {
+            data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyListCheckedCanRecalled')
+          }
+          if (ids && ids.length > 0) {
+            this.withdrawData(ids, notConditions, data)
+          } else {
+            this.failedMessage(data)
+          }
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      withdrawData(ids, notConditions, data) {
+        let _this = this
+        this.$confirm({
+          content: _this.$t('confirmWithdrawal'),
+          onOk() {
+            postAction('/project/projectCertificationInventoryEO/resetFlow', {
+              ids: ids.join(','),
+              projectLibraryId: _this.$route.query.id,
+              operatorType: 'certificationInventoryStudioWithdraw'
+            }).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.selectedRowKeys = []
+                _this.selectedRowKeysList = []
+                _this.getList()
+                if (notConditions && notConditions.length > 0) {
+                  _this.failedMessage(data)
+                }
+              } else {
+                _this.$message.warning(res.message)
+              }
+            })
+          }
+        })
+      },
+      //催办
+      questionClick() {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          let ids = []
+          let notConditions = []
+          let data = ''
+          if (this.roleSwitchingCode == 0) {
+            for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+              if (this.selectedRowKeysList[i].flowStatus == 'List to be checked' ||
+                this.selectedRowKeysList[i].flowStatus == 'Certification returned' ||
+                this.selectedRowKeysList[i].flowStatus == 'Task to be confirmed' ||
+                this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' ||
+                this.selectedRowKeysList[i].flowStatus == 'Refusal of responsible person' ||
+                this.selectedRowKeysList[i].flowStatus == 'Engineer return' ||
+                this.selectedRowKeysList[i].flowStatus == 'Results to be reviewed' ||
+                this.selectedRowKeysList[i].flowStatus == 'Review and return') {
+                ids.push(this.selectedRowKeysList[i].id)
+              } else {
+                notConditions.push(this.selectedRowKeysList[i].inspectionItem)
+              }
+            }
+            if (notConditions && notConditions.length > 0) {
+              data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('youCannotStatusListToBeReleasedAndApproved')
+            }
+            if (ids && ids.length > 0) {
+              this.questionData('certificationInventoryStudioExpediting', ids, notConditions, data)
+            } else {
+              this.failedMessage(data)
+            }
+          } else if (this.roleSwitchingCode == 2) {
+            for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+              if (this.selectedRowKeysList[i].flowStatus == 'Task to be confirmed' ||
+                this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' ||
+                this.selectedRowKeysList[i].flowStatus == 'Review and return') {
+                ids.push(this.selectedRowKeysList[i].id)
+              } else {
+                notConditions.push(this.selectedRowKeysList[i].inspectionItem)
+              }
+            }
+            if (notConditions && notConditions.length > 0) {
+              data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataSelected')
+            }
+            if (ids && ids.length > 0) {
+              this.questionData('certificationInventoryCertificationEngineerExpediting', ids, notConditions, data)
+            } else {
+              this.failedMessage(data)
+            }
+          } else if (this.roleSwitchingCode == 20) {
+            for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+              if (this.selectedRowKeysList[i].flowStatus == 'Task to be confirmed' ||
+                this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' ||
+                this.selectedRowKeysList[i].flowStatus == 'Review and return') {
+                ids.push(this.selectedRowKeysList[i].id)
+              } else {
+                notConditions.push(this.selectedRowKeysList[i].inspectionItem)
+              }
+            }
+            if (notConditions && notConditions.length > 0) {
+              data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataSelected')
+            }
+            if (ids && ids.length > 0) {
+              this.questionData('certificationInventorySdtExpediting', ids, notConditions, data)
+            } else {
+              this.failedMessage(data)
+            }
+          }
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      questionData(operatorType, ids, notConditions, data) {
+        let _this = this
+        this.$confirm({
+          content: _this.$t('confirmUrging'),
+          onOk() {
+            postAction(_this.url.questionUrl, {
+              ids: ids.join(','),
+              projectLibraryId: _this.$route.query.id,
+              operatorType: operatorType
+            }).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.selectedRowKeys = []
+                _this.selectedRowKeysList = []
+                _this.getList()
+                if (notConditions && notConditions.length > 0) {
+                  _this.failedMessage(data)
+                }
+              } else {
+                _this.$message.warning(res.message)
+              }
+            })
+          }
+        })
+      },
+      transferListForm() {
+        this.pageNo = 1
+        this.selectedRowKeys = []
+        this.getList()
+      },
+      batSettingForm() {
+        this.pageNo = 1
+        this.getList()
+        this.selectedRowKeys = []
+      },
+      addModelForm() {
+        this.pageNo = 1
+        this.getList()
+        this.selectedRowKeys = []
+      },
+      edit(item) {
+        this.$refs.addModelRef.editModel(JSON.parse(JSON.stringify(item)))
+      },
+      deleteLib(val) {
+        let _this = this
+        if (val.flowStatus == 'List to be released' || val.flowStatus == 'Review and pass') {
+          this.$confirm({
+            content: _this.$t('ConfirmDelete'),
+            onOk() {
+              deleteAction(_this.url.deleteOne, { id: val.id, projectLibraryId: _this.$route.query.id }).then((res) => {
+                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'))
+        }
+      },
+      modifyHistoryClick(row) {
+        this.$refs.modifyHistoryRef.getList(row.id)
+      },
+      getRoleByUserId(callback) {
+        getAction('/project/projectCertificationInventoryEO/getRoleByUserId', { projectLibraryId: this.$route.query.id }).then((res) => {
+          if (res.success) {
+            this.roleSwitchingList = res.result || []
+          } else {
+            this.roleSwitchingList = []
+          }
+          this.$emit('getRoleSwitchingList', this.roleSwitchingList)
+          callback && callback()
+        })
+      },
+      getAndUserId() {
+        let query = {
+          projectLibraryId: this.$route.query.id,
+          userId: this.userInfo().id,
+          modelType: 'Certification inventory'
+        }
+        getAction(this.url.AndUserId, query).then((res) => {
+          if (res.success) {
+            this.isDisplay = true
+            this.formInlineRoleSwitching.roleSwitchingCode = res.result.roleCode
+            this.AndUserId = res.result.id
+            if (this.formInlineRoleSwitching.roleSwitchingCode) {
+              if (!(this.roleSwitchingList.some(val => val.roleCode == this.formInlineRoleSwitching.roleSwitchingCode))) {
+                this.formInlineRoleSwitching.roleSwitchingCode = this.roleSwitchingList[0] ? this.roleSwitchingList[0].roleCode : ''
+              }
+            } else {
+              this.formInlineRoleSwitching.roleSwitchingCode = this.roleSwitchingList[0] ? this.roleSwitchingList[0].roleCode : ''
+            }
+            this.roleSwitchingCode = this.formInlineRoleSwitching.roleSwitchingCode
+            this.getList()
+            this.$emit('getRoleSwitch', this.roleSwitchingCode)
+          } else {
+            this.JLoading = false
+          }
+        })
+      },
+      roleSwitchingClick() {
+        this.visibleRoleSwitching = true
+        this.$nextTick(() => {
+          this.$refs.ruleFormRoleSwitching.clearValidate()
+          if (!this.roleSwitchingCode) {
+            this.roleSwitchingCode = '0'
+          }
+          if (!(this.roleSwitchingList.some(val => val.roleCode == this.roleSwitchingCode))) {
+            this.roleSwitchingCode = this.roleSwitchingList[0] ? this.roleSwitchingList[0].roleCode : ''
+          }
+          this.formInlineRoleSwitching.roleSwitchingCode = this.roleSwitchingCode
+          this.formInlineRoleSwitching = { ...this.formInlineRoleSwitching }
+        })
+      },
+      handleOkRoleSwitching(roleSwitchingCode) {
+        // this.$refs.ruleFormRoleSwitching.validate(valid => {
+        //   if (valid) {
+        let query = {
+          roleCode: roleSwitchingCode,
+          id: this.AndUserId,
+          projectLibraryId: this.$route.query.id,
+          modelType: 'Certification inventory'
+        }
+        // this.confirmLoadingRoleSwitching = true
+        postAction(this.url.AndUserIdEdit, query).then((res) => {
+          if (res.success) {
+            // this.isRoleSwitching = true
+            this.roleSwitchingCode = roleSwitchingCode
+            this.$message.success(this.$t('OperationSuccessful'))
+            // this.visibleRoleSwitching = false
+            // this.confirmLoadingRoleSwitching = false
+            this.selectedRowKeysList = []
+            this.selectedRowKeys = []
+            this.getList()
+            this.$emit('getRoleSwitch', this.roleSwitchingCode)
+          } else {
+            this.confirmLoadingRoleSwitching = false
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
+        // }
+        // })
+      },
+      // handleCancelRoleSwitching() {
+      //   this.visibleRoleSwitching = false
+      // },
+      //保存
+      preservationClick(num) {
+        postAction(this.url.saveBatch, { 'dataList': this.dataSource }).then((res) => {
+          if (res.success) {
+            if (num == 1) {
+              this.$message.success(this.$t('OperationSuccessful'))
+            }
+          } else {
+            if (num == 1) {
+              this.$message.warning(this.$t('operationFailed'))
+            }
+          }
+        })
+      },
+      //引用交付物
+      referenceDeliverablesClick() {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          let isTrue
+          let ids = []
+          let notConditions = []
+          let notConditionsOne = []
+          let data = ''
+          let dataOne = ''
+          let detailedWarningList = []
+          if (this.roleSwitchingCode == 20) {
+            for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+              if (this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) {
+                if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted') {
+                  ids.push(this.selectedRowKeysList[i].id)
+                } else {
+                  notConditions.push(this.selectedRowKeysList[i].inspectionItem)
+                }
+              } else {
+                notConditionsOne.push(this.selectedRowKeysList[i].inspectionItem)
+              }
+            }
+          } else {
+            for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+              if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted') {
+                ids.push(this.selectedRowKeysList[i].id)
+              } else {
+                notConditions.push(this.selectedRowKeysList[i].inspectionItem)
+              }
+            }
+          }
+          if (notConditions && notConditions.length > 0) {
+            data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataStatusSubmittedCanBeSelected')
+            detailedWarningList.push( < div > { data } < /div>)
+          }
+          if (notConditionsOne && notConditionsOne.length > 0) {
+            dataOne = this.$t('inspectionItems') + '"' + notConditionsOne.join('、') + '"' + this.$t('operationWithoutPermission')
+            detailedWarningList.push( < div > { dataOne } < /div>)
+          }
+          if (ids && ids.length > 0) {
+            this.$refs.referenceDeliverablesListRef.transferModel(ids, detailedWarningList)
+          } else {
+            this.failedMessageOne(detailedWarningList)
+          }
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      //转办
+      turnToDoClick() {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          if (this.roleSwitchingCode == 20) {
+            this.turnToDoClickJC()
+            return
+          }
+          this.toDoIds = []
+          this.toDoNotConditions = []
+          for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+            if (this.selectedRowKeysList[i].flowStatus == 'Task to be confirmed' ||
+              this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' ||
+              this.selectedRowKeysList[i].flowStatus == 'Review and return') {
+              this.toDoIds.push(this.selectedRowKeysList[i].id)
+            } else {
+              this.toDoNotConditions.push(this.selectedRowKeysList[i].inspectionItem)
+            }
+          }
+          this.toDoData = ''
+          if (this.toDoNotConditions && this.toDoNotConditions.length > 0) {
+            this.toDoData = this.$t('inspectionItems') + '"' + this.toDoNotConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataSelected')
+          }
+          if (this.toDoIds && this.toDoIds.length > 0) {
+            this.$refs.SelectedByRef.getPush()
+          } else {
+            this.failedMessage(this.toDoData)
+          }
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      //接口人转办
+      turnToDoClickJC() {
+        this.toDoIds = []
+        this.toDoNotConditions = []
+        for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+          if ((this.selectedRowKeysList[i].flowStatus == 'Task to be confirmed' ||
+            this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' ||
+            this.selectedRowKeysList[i].flowStatus == 'Review and return') &&
+            this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) {
+            this.toDoIds.push(this.selectedRowKeysList[i].id)
+          } else {
+            this.toDoNotConditions.push(this.selectedRowKeysList[i].inspectionItem)
+          }
+        }
+        this.toDoData = ''
+        if (this.toDoNotConditions && this.toDoNotConditions.length > 0) {
+          this.toDoData = this.$t('operationWithoutPermission') + ';' + this.$t('onlyDataWithTheCurrentCanBeManipulated') + ';' + this.$t('andTheAndTaskPendingConfirmation')
+        }
+        if (this.toDoIds && this.toDoIds.length > 0) {
+          this.$refs.SelectedByRef.getPush()
+        } else {
+          this.failedMessage(this.toDoData)
+        }
+      },
+      //转办接口
+      SelectedByForm(userIds) {
+        if (this.userInfo().id == userIds) {
+          this.$refs.SelectedByRef.submitLoading = false
+          this.$message.warning(this.$t('cantTransferToYourself'))
+          return
+        }
+        let query = {
+          transferUserId: userIds,
+          'projectLibraryId': this.$route.query.id,
+          'ids': this.toDoIds.join(',')
+        }
+        postAction('/project/projectCertificationInventoryEO/transferTask', query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.$refs.SelectedByRef.visible = false
+            this.$refs.SelectedByRef.submitLoading = false
+            this.getList()
+            if (this.toDoNotConditions && this.toDoNotConditions.length > 0) {
+              this.failedMessage(this.toDoData)
+            }
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+            this.$refs.SelectedByRef.submitLoading = false
+          }
+        })
+      },
+
+      clickButtonToUpload(item, index) {
+        this.$refs.uploadFile.perentHandleFunc()
+        this.$refs.uploadFile.visible = true
+        this.uploadName = item
+        this.uploadIndex = index
+        getAction('sys/common/getFileInfos', { id: this.dataSource[this.uploadIndex][this.uploadName] }).then((res) => {
+          if (res.success) {
+            this.$refs.uploadFile.perentHandleFunc(res.result)
+          } else {
+            this.$refs.uploadFile.perentHandleFunc()
+          }
+        })
+      },
+      /** 上传文件的回调 */
+      uploadSuccess(data) {
+        let attIdList = []
+        if (data && data.length > 0) {
+          data.map(item => {
+            attIdList.push(item.id || data.name)
+          })
+        }
+        /** 赋值给当前对应的表单文件 */
+        this.dataSource[this.uploadIndex][this.uploadName] = attIdList.join(',')
+        this.dataSource = [...this.dataSource]
+        this.preservationClick()
+      },
+      deliveryBlur() {
+        this.preservationClick()
+      },
+      deliveryChange() {
+        this.preservationClick()
+      },
+      CertificationProgressClick(val) {
+        let item = JSON.parse(JSON.stringify(val))
+        item.roleCode = this.roleSwitchingCode
+        this.$refs.TaskListModelRef.getData(item, this.$t('CertificationProgress'))
+      },
+      //发起流程
+      initiatingProcessClick(value, prompt) {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          let ids = []
+          let notConditions = []
+          let NAId = []
+          for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+            if (this.selectedRowKeysList[i].flowStatus == 'List to be checked' ||
+              this.selectedRowKeysList[i].flowStatus == 'Refusal of responsible person') {
+              if (this.selectedRowKeysList[i].deliverableType == '1635545748968783874') {
+                NAId.push(this.selectedRowKeysList[i].id)
+              } else if (this.selectedRowKeysList[i].dutyPerson && this.selectedRowKeysList[i].deliverableType &&
+                this.selectedRowKeysList[i].sdt && this.selectedRowKeysList[i].endTime) {
+                ids.push(this.selectedRowKeysList[i].id)
+              } else {
+                notConditions.push(this.selectedRowKeysList[i].inspectionItem)
+              }
+            } else {
+              notConditions.push(this.selectedRowKeysList[i].inspectionItem)
+            }
+          }
+          let data = ''
+          if (notConditions && notConditions.length > 0) {
+            data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyProcessReturned')
+          }
+          if ((ids && ids.length > 0) || (NAId && NAId.length > 0)) {
+            let query = {
+              value: value,
+              prompt: prompt,
+              ids: ids,
+              notConditions: notConditions,
+              data: data,
+              dutyDueDate: 'taskConfirmEndTime',
+              title: this.$t('initiateTask'),
+              NAId: NAId
+            }
+            this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)))
+            // this.submitTask(value, prompt, ids, notConditions, data, NAId)
+          } else {
+            this.failedMessage(data)
+          }
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      //退回至Studio
+      returnToStudioClick(value, prompt) {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          let ids = []
+          let notConditions = []
+          for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+            if (this.selectedRowKeysList[i].flowStatus == 'List to be checked' ||
+              this.selectedRowKeysList[i].flowStatus == 'Refusal of responsible person') {
+              ids.push(this.selectedRowKeysList[i].id)
+            } else {
+              notConditions.push(this.selectedRowKeysList[i].inspectionItem)
+            }
+          }
+          let data = ''
+          if (notConditions && notConditions.length > 0) {
+            data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyProcessStatusReturned')
+          }
+          if (ids && ids.length > 0) {
+            this.$refs.reasonForReturnRef.getData(value, prompt, ids, notConditions, data, this.$t('reasonForReturningToStudio'))
+            // this.submitTask(value, prompt, ids, notConditions, data)
+          } else {
+            this.failedMessage(data)
+          }
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      //责任人任务接受\拒绝
+      missionAcceptedClick(value, prompt) {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          if (this.roleSwitchingCode == 20) {
+            this.missionAcceptedClickJC(value, prompt)
+            return
+          }
+          let ids = []
+          let notConditions = []
+          for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+            if (this.selectedRowKeysList[i].flowStatus == 'Task to be confirmed') {
+              ids.push(this.selectedRowKeysList[i].id)
+            } else {
+              notConditions.push(this.selectedRowKeysList[i].inspectionItem)
+            }
+          }
+          let data = ''
+          if (notConditions && notConditions.length > 0) {
+            data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataStatusConfirmedSelected')
+          }
+          if (ids && ids.length > 0) {
+            if (value == 'zrrjjrw') {
+              this.$refs.reasonForReturnRef.getData(value, prompt, ids, notConditions, data, this.$t('reasonForTaskRejection'))
+            } else {
+              this.submitTask(value, prompt, ids, notConditions, data)
+            }
+          } else {
+            this.failedMessage(data)
+          }
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+
+      missionAcceptedClickJC(value, prompt) {
+        let ids = []
+        let notConditions = []
+        for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+          if (this.selectedRowKeysList[i].flowStatus == 'Task to be confirmed' &&
+            this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) {
+            ids.push(this.selectedRowKeysList[i].id)
+          } else {
+            notConditions.push(this.selectedRowKeysList[i].inspectionItem)
+          }
+        }
+        let data = ''
+        if (notConditions && notConditions.length > 0) {
+          // data = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('data')
+          data = this.$t('operationWithoutPermission') + ';' + this.$t('onlyDataWithTheCurrentCanBeManipulated') + ';' + this.$t('andProcessStatusIsTaskPendingConfirmation')
+        }
+        if (ids && ids.length > 0) {
+          if (value == 'zrrjjrw') {
+            this.$refs.reasonForReturnRef.getData(value, prompt, ids, notConditions, data, this.$t('reasonForTaskRejection'))
+          } else {
+            this.submitTask(value, prompt, ids, notConditions, data)
+          }
+        } else {
+          this.failedMessage(data)
+        }
+      },
+
+      //责任人提交
+      submitClick(value, prompt) {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          let ids = []
+          let notConditions = []
+          for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+            if (this.selectedRowKeysList[i].valueType == 'text' || this.selectedRowKeysList[i].valueType == 'select' ||
+              this.selectedRowKeysList[i].valueType == 'file') {
+              if (!this.selectedRowKeysList[i].deliveryResult) {
+                this.$message.warning(this.$t('inspectionItems') + '"' + this.selectedRowKeysList[i].inspectionItem + '"' + this.$t('deliverablesFor') + this.$t('cannotEmpty'))
+                return
+              }
+            }
+          }
+          if (this.roleSwitchingCode == 20) {
+            this.submitClickJC(value, prompt)
+            return
+          }
+          for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+            if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' ||
+              this.selectedRowKeysList[i].flowStatus == 'Review and return') {
+              ids.push(this.selectedRowKeysList[i].id)
+            } else {
+              notConditions.push(this.selectedRowKeysList[i].inspectionItem)
+            }
+          }
+          let data = ''
+          if (notConditions && notConditions.length > 0) {
+            data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataStatusSubmittedCanBeSelected')
+          }
+          if (ids && ids.length > 0) {
+            this.submitTask(value, prompt, ids, notConditions, data)
+          } else {
+            this.failedMessage(data)
+          }
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+
+      //接口人提交
+      submitClickJC(value, prompt) {
+        let ids = []
+        let notConditions = []
+        for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+          if ((this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' ||
+            this.selectedRowKeysList[i].flowStatus == 'Review and return') &&
+            this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) {
+            ids.push(this.selectedRowKeysList[i].id)
+          } else {
+            notConditions.push(this.selectedRowKeysList[i].inspectionItem)
+          }
+        }
+        let data = ''
+        if (notConditions && notConditions.length > 0) {
+          // data = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('data')
+          data = this.$t('operationWithoutPermission') + ';' + this.$t('onlyDataWithTheCurrentCanBeManipulated') + ';' + this.$t('andPendingSubmissionReviewReturned')
+        }
+        if (ids && ids.length > 0) {
+          this.submitTask(value, prompt, ids, notConditions, data)
+        } else {
+          this.failedMessage(data)
+        }
+      },
+
+      //审批通过/退回
+      ApprovedClick(value, prompt) {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          let ids = []
+          let notConditions = []
+          let isTrue = false
+          let _this = this
+          for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+            if (this.selectedRowKeysList[i].flowStatus == 'Results to be reviewed') {
+              ids.push(this.selectedRowKeysList[i].id)
+            } else if (this.selectedRowKeysList[i].flowStatus == 'Review and pass' && value == 'rzgcssc_th') {
+              ids.push(this.selectedRowKeysList[i].id)
+              isTrue = true
+            } else {
+              notConditions.push(this.selectedRowKeysList[i].inspectionItem)
+            }
+          }
+          let data = ''
+          if (notConditions && notConditions.length > 0) {
+            if (value == 'rzgcssc_th') {
+              data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataWithApprovedCanCeSelected')
+            } else {
+              data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataStatusResultReviewedCanBeSelected')
+            }
+          }
+          if (ids && ids.length > 0) {
+            let text = ''
+            if (isTrue) {
+              text = this.$t('theCurrentlySelectedDataContainsReviewed')
+            }
+            if (value == 'rzgcssc_th') {
+              if (isTrue) {
+                this.$confirm({
+                  content: text,
+                  onOk() {
+                    _this.$refs.reasonForReturnRef.getData(value, text, ids, notConditions, data, _this.$t('reviewTheReasonForReturn'))
+                  }
+                })
+              } else {
+                _this.$refs.reasonForReturnRef.getData(value, prompt, ids, notConditions, data, _this.$t('reviewTheReasonForReturn'))
+              }
+            } else {
+              this.submitTask(value, prompt, ids, notConditions, data)
+            }
+          } else {
+            this.failedMessage(data)
+          }
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+
+      reasonForReturnForm(value, text, ids, notConditions, data, reasonForReturn) {
+        let _this = this
+        let query = {
+          'nodeKey': value,
+          'projectLibraryId': _this.$route.query.id,
+          'ids': ids.join(','),
+          reasonForReturn: reasonForReturn
+        }
+        postAction('/project/projectCertificationInventoryEO/submitTask', query).then((res) => {
+          if (res.success) {
+            _this.$message.success(_this.$t('OperationSuccessful'))
+            _this.getList()
+            _this.selectedRowKeys = []
+            _this.selectedRowKeysList = []
+            _this.$refs.reasonForReturnRef.visible = false
+            _this.$refs.reasonForReturnRef.confirmLoading = false
+            if (notConditions && notConditions.length > 0) {
+              _this.failedMessage(data)
+            }
+          } else {
+            _this.$message.warning(res.message)
+            _this.$refs.reasonForReturnRef.confirmLoading = false
+          }
+        })
+      },
+
+      //提示语
+      failedMessage(data) {
+        let detailedWarningList = []
+        detailedWarningList.push(data)
+        this.$warning({
+          content: ( < div > { detailedWarningList } < /div>)
+        })
+      },
+
+      //提示语
+      failedMessageOne(data) {
+        let detailedWarningList = data
+        this.$warning({
+          content: ( < div > { detailedWarningList } < /div>)
+        })
+      },
+
+      //提交数据
+      submitTask(value, prompt, ids, notConditions, data, NAId) {
+        let _this = this
+        this.$confirm({
+          content: prompt,
+          onOk() {
+            // if (NAId && NAId.length > 0) {
+            //   _this.NASubmitTask(NAId, ids, notConditions, data)
+            // }
+            if (ids && ids.length > 0) {
+              let query = {
+                'nodeKey': value,
+                'projectLibraryId': _this.$route.query.id,
+                'ids': ids.join(',')
+              }
+              postAction('/project/projectCertificationInventoryEO/submitTask', query).then((res) => {
+                if (res.success) {
+                  _this.$message.success(_this.$t('OperationSuccessful'))
+                  _this.getList()
+                  _this.selectedRowKeys = []
+                  _this.selectedRowKeysList = []
+                  if (notConditions && notConditions.length > 0) {
+                    _this.failedMessage(data)
+                  }
+                } else {
+                  _this.$message.warning(_this.$t('operationFailed'))
+                }
+              })
+            }
+          }
+        })
+      },
+      NASubmitTask(NAId, ids, notConditions, data) {
+        let _this = this
+        let query = {
+          'flowStatus': 'NA',
+          'ids': NAId.join(',')
+        }
+        postAction('/project/projectCertificationInventoryEO/updateStatusBatch', query).then((res) => {
+          if (res.success) {
+            if (ids && ids.length > 0) {
+            } else {
+              _this.$message.success(_this.$t('OperationSuccessful'))
+              _this.getList()
+              _this.selectedRowKeys = []
+              _this.selectedRowKeysList = []
+              if (notConditions && notConditions.length > 0) {
+                _this.failedMessage(data)
+              }
+              _this.$refs.deadlineFormRef.visible = false
+              _this.$refs.deadlineFormRef.confirmLoading = false
+            }
+          } else {
+            if (ids && ids.length > 0) {
+            } else {
+              _this.$message.warning(_this.$t('operationFailed'))
+              _this.$refs.deadlineFormRef.confirmLoading = false
+            }
+          }
+        })
+      },
+      viewFileClick(item) {
+        this.$refs.viewFileModelRef.clickButtonToUpload(item)
+      },
+      standardClick(row) {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: row.bussDocumentLibraryId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      supplementarySubmissionClick() {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          let ids = []
+          let notConditions = []
+          let _this = this
+          for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+            if (this.selectedRowKeysList[i].flowStatus == 'Review and pass') {
+              if (this.roleSwitchingCode == 20 && this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) {
+                ids.push(this.selectedRowKeysList[i].id)
+              } else if (this.roleSwitchingCode == 21) {
+                ids.push(this.selectedRowKeysList[i].id)
+              } else {
+                notConditions.push(this.selectedRowKeysList[i].inspectionItem)
+              }
+            } else {
+              notConditions.push(this.selectedRowKeysList[i].inspectionItem)
+            }
+          }
+          let data = ''
+          if (notConditions && notConditions.length > 0) {
+            if (this.roleSwitchingCode == 20) {
+              data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyProcessStatusOfApprovedCanBeSelected') + this.$t('andTheOperatorCurrentData')
+            } else {
+              data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyProcessStatusOfApprovedCanBeSelected')
+            }
+          }
+          if (ids && ids.length > 0) {
+            this.$confirm({
+              content: _this.$t('confirmSupplementarySubmission'),
+              onOk() {
+                let query = {
+                  ids: ids.join(','),
+                  'flowStatus': 'Results to be submitted'
+                }
+                postAction('/project/projectCertificationInventoryEO/updateStatusBatch', query).then((res) => {
+                  if (res.success) {
+                    _this.$message.success(_this.$t('OperationSuccessful'))
+                    _this.getList()
+                    _this.selectedRowKeys = []
+                    _this.selectedRowKeysList = []
+                    if (notConditions && notConditions.length > 0) {
+                      _this.failedMessage(data)
+                    }
+                  } else {
+                    _this.$message.warning(_this.$t('operationFailed'))
+                  }
+                })
+              }
+            })
+          } else {
+            this.failedMessage(data)
+          }
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      bringInRelevantPersonnelClick(){
+        let _this = this
+        // if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.$confirm({
+            content: _this.$t('confirmBringInRelevantPersonnel'),
+            onOk() {
+              // let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+              postAction('/project/projectCertificationInventoryEO/matchRelevantPeople', {
+                // ids: selectedRowKeys.join(','),
+                projectLibraryId: _this.$route.query.id
+              }).then((res) => {
+                if (res.success) {
+                  _this.$message.success(_this.$t('OperationSuccessful'))
+                  _this.selectedRowKeys = []
+                  _this.getList()
+                } else {
+                  _this.$message.warning(_this.$t('operationFailed'))
+                }
+              })
+            }
+          })
+        // } else {
+        //   this.$message.warning(this.$t('selectLeastOne'))
+        // }
+      },
+    }
+  }
+</script>
+
+
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
+
+  .doc-detail {
+    background: #fff;
+    height: 100%;
+
+    .Virtual-detail-header {
+      width: 100%;
+      height: 68px;
+      line-height: 68px;
+      padding: 0 32px 0 32px;
+      box-sizing: border-box;
+      display: flex;
+      justify-content: space-between;
+      border-bottom: 2px #eff1f3 solid;
+      background: #fff;
+
+      .Virtual-detail-title {
+        display: inline-block;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        font-size: 20px;
+        font-weight: 400;
+        color: #040B29;
+        line-height: 68px;
+      }
+
+      .doc-detail-right {
+        width: 800px;
+        line-height: 68px;
+        display: flex;
+      }
+    }
+
+    .Virtual-detail-content {
+      padding: 0 38px 0 38px;
+      box-sizing: border-box;
+      font-size: 16px;
+
+      .box-title-text-add {
+        line-height: 1.4;
+      }
+
+      .title-text-add {
+        display: inline-block;
+        font-weight: 500;
+        margin-right: 16px;
+        height: 42px;
+        line-height: 42px;
+      }
+    }
+  }
+
+  .header-text {
+    font-size: 16px;
+    font-weight: 400;
+    height: 60px;
+    color: #000F16;
+    line-height: 40px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .box-title-text-index {
+    line-height: 1.4;
+    display: flex;
+  }
+
+  .title-text {
+    width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .title-text-index {
+    width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    line-height: 40px;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: calc(100% - 126px);
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .box-button {
+    height: 38px;
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+    margin-bottom: 20px;
+  }
+
+  .operator-text-left {
+    font-size: 14px;
+    margin-right: 20px;
+    background: #eff1f3;
+    padding: 8px 8px;
+    cursor: pointer;
+    border-radius: 4px;
+  }
+
+  /deep/ .ant-popover-buttons {
+    display: none !important;
+  }
+
+  .operator-text-title {
+    cursor: pointer;
+    margin-right: 22px;
+    font-size: 14px;
+    font-weight: 400;
+    color: #040B29;
+    margin-bottom: 22px;
+  }
+
+  .customize-text {
+    height: 1533px;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+  }
+
+  .customize-text-title {
+    margin-left: 0;
+    font-size: 14px;
+    font-weight: 400;
+    color: #040B29;
+    margin-bottom: 22px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    z-index: 100;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .itemModelComment {
+    width: calc(100% - 64px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .title-text-Comment {
+    width: 74px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 48px;
+  }
+
+  .textName {
+    width: 100%;
+    overflow: hidden;
+    display: -webkit-box;
+    text-overflow: ellipsis;
+    /*! autoprefixer: off */
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    /*! autoprefixer: on;*/
+    text-justify: inter-ideograph;
+    word-break: break-all
+  }
+
+  .buttom-box {
+    width: 100%;
+    text-align: right;
+    font-size: 16px;
+    font-weight: 500;
+    color: #000F16;
+  }
+
+  ::v-deep .ant-card-body {
+    padding: 24px 24px 0 24px;
+  }
+
+  ::v-deep .ant-table-row:first-child {
+    background: #fff !important;
+    opacity: 0.9;
+  }
+
+  ::v-deep .ant-table-body {
+    background: transparent !important;
+  }
+
+  ::v-deep .ant-table-body::-webkit-scrollbar {
+    z-index: 10000000;
+  }
+
+  /*::v-deep .ant-table .ant-table-fixed-left {*/
+  /*  height: auto !important;*/
+  /*  bottom: 8px !important;*/
+  /*}*/
+
+  /*::v-deep .ant-table .ant-table-fixed-right {*/
+  /*  height: auto !important;*/
+  /*  bottom: 8px !important;*/
+  /*}*/
+
+  ::v-deep .ant-table-fixed-header .ant-table-body-inner {
+    overflow: visible;
+  }
+
+  /*::v-deep .ant-table-fixed-left .ant-table-body-inner {*/
+  /*  overflow-y: scroll;*/
+  /*}*/
+
+  /*::v-deep .ant-table-fixed-right .ant-table-body-inner {*/
+  /*  overflow-y: scroll;*/
+  /*}*/
+  //::v-deep .ant-table-body {
+  //  padding-bottom: 7px;
+  //}
+
+  ::v-deep .ant-table-body-inner {
+    padding-bottom: 10px;
+  }
+
+  ::v-deep .ant-table-scroll .ant-table-header::-webkit-scrollbar {
+    /*height: 0;*/
+    width: 0;
+  }
+
+  ::v-deep .ant-table-body-one {
+    padding-bottom: 0 !important;
+  }
+
+  ::v-deep .antfixedLeft {
+    padding-bottom: 0 !important;
+    overflow: scroll !important;
+  }
+
+  ::v-deep .antfixedRight {
+    padding-bottom: 0 !important;
+    overflow: scroll !important;
+  }
+
+  .button-text {
+    height: 38px;
+    width: calc(100%);
+    line-height: 38px;
+    background: #fff;
+    border: 1px #00B3BE solid;
+    color: #00B3BE;
+  }
+
+  .box-input-index {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .box-content-Progress {
+    width: 88px;
+    height: 32px;
+    display: inline-block;
+    text-align: center;
+    line-height: 32px;
+    border-radius: 4px;
+    background: #f1f3f5;
+    color: #919399;
+    padding: 0 8px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .box-content-cou {
+    cursor: pointer;
+  }
+
+  .accordColor {
+    background: #dbf6e2;
+    color: #26BD4B;
+  }
+
+  .componentColor {
+    background: #EDFCEF;
+    color: #6FD682;
+  }
+
+  .nonConformityColor {
+    background: #f3dddd;
+    color: #E83030;
+  }
+
+  .TrackedColor {
+    background: #f6ebdb;
+    color: #FDA71C;
+  }
+
+  .notInvolvedColor {
+    background: #eef1f4;
+    color: #707486;
+  }
+
+  .submittedColor {
+    color: #00B3BE;
+    background: #ddf3f4;
+  }
+
+  .viewFile {
+    color: #00B3BE;
+    cursor: pointer;
+  }
+
+  .operator-text-title:last-child {
+    margin-bottom: 0;
+  }
+</style>
+<style lang="less">
+  .box-input .ant-select-selection {
+    height: 38px !important;
+  }
+
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+  }
+
+  .popconfirm {
+    z-index: 999;
+  }
+
+  .popconfirm .ant-popover-buttons {
+    display: none !important;
+  }
+
+  .popconfirm .anticon-exclamation-circle {
+    display: none !important;
+  }
+
+  .popconfirmmize {
+    z-index: 999;
+  }
+
+  .popconfirmmize .ant-popover-buttons {
+    display: none !important;
+  }
+
+  .popconfirmmize .anticon-exclamation-circle {
+    display: none !important;
+  }
+
+  .popconfirmmize .ant-popover-message {
+    padding: 4px 0 36px !important;
+  }
+
+  .ant-table-placeholder {
+    padding: 0;
+    border-top: none;
+  }
+
+  .itemModelComment .ant-form-item-control-wrapper {
+    width: 100% !important;
+  }
+
+  .second {
+    padding: 0 !important;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/commentList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/commentList.vue
new file mode 100644
index 000000000..e7fae0bfd
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/commentList.vue
@@ -0,0 +1,402 @@
+<template>
+  <div>
+    <a-drawer
+      :title="$t('comment')"
+      :maskClosable="false"
+      :width="482"
+      placement="right"
+      :closable="true"
+      @close="handleCancel"
+      :visible="visible">
+      <div class="button-box">
+        <a-input-search class="box-input box-input-search" allowClear
+                        @search="allowClearChange"
+                        :placeholder="$t('PleaseEnter')+$t('comment')"
+                        v-model="commentContent"></a-input-search>
+        <a-button @click="submitQuery" style="margin-right: 8px;" type="primary">{{$t('query')}}</a-button>
+        <a-button @click="handleSubmit" class="button-text" :title="$t('publishComment')" type="primary">
+          {{$t('publishComment')}}
+        </a-button>
+      </div>
+      <div class="comment-box" v-if="dataList && dataList.length > 0">
+        <div class="comment-box-top-box" v-for="(item,index) in dataList" :key="index">
+<!--          <div class="title-text">{{$t('record')+(index + 1)}}</div>-->
+          <div class="box-content">
+            <div class="img-box">
+              <img src="@/assets/daiban.png" class="img" alt="">
+            </div>
+            <div class="box-text">
+              <span class="box-text-name">{{item.name}}</span>
+              <span calss="box-text-time">{{item.createTime}}</span>
+            </div>
+            <div class="box-text-text">
+              {{item.content}}
+            </div>
+            <div class="box-icon" @click="messageClick(item)">
+              <a-icon type="message"/>
+            </div>
+          </div>
+          <div class="inside-box" v-if="item.projectCommentVOList && item.projectCommentVOList.length > 0">
+            <div class="box-content-inside" v-for="(val,indexOne) in item.projectCommentVOList" :key="indexOne">
+              <div class="img-box">
+                <img src="@/assets/daiban.png" class="img" alt="">
+              </div>
+              <div class="box-text">
+                <span class="box-text-name">{{val.name}}</span>
+                <span calss="box-text-time">{{val.createTime}}</span>
+              </div>
+              <div class="box-text-text">
+                {{val.content}}
+              </div>
+              <div class="box-icon" @click="messageClick(item)">
+                <a-icon type="message"/>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="comment-box-text" v-else>{{$t('noComment')}}</div>
+      <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
+    </a-drawer>
+    <a-modal
+      :title="title"
+      :width="500"
+      :visible="visibleComment"
+      :confirm-loading="confirmLoading"
+      :maskClosable="false"
+      @ok="handleOkComment"
+      @cancel="handleCancelComment"
+    >
+      <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="title">{{title}}</span>
+              </div>
+              <a-form-model-item v-if="title == $t('replyToComments')" class="itemModel" :prop="'replyContent'">
+                <a-textarea
+                  :placeholder="$t('PleaseEnter')+title"
+                  :disabled="false"
+                  v-model="formInline.replyContent" :rows="4"/>
+              </a-form-model-item>
+              <a-form-model-item v-else-if="title == $t('publishComment')" class="itemModel" :prop="'commentContent'">
+                <a-textarea
+                  :placeholder="$t('PleaseEnter')+title"
+                  :disabled="false"
+                  v-model="formInline.commentContent" :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-modal>
+  </div>
+
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+
+  export default {
+    name: 'commentList',
+    data() {
+      return {
+        visible: false,
+        dataList: [],
+        formInline: {},
+        commentContent: '',
+        loading: false,
+        title: this.$t('comment'),
+        confirmLoading: false,
+        visibleComment: false,
+        url: {
+          list: '/project/projectCommentEO/list',
+          add: '/project/projectCommentEO/add',
+          edit: '/project/projectReplyEO/add'
+        },
+        rules: {
+          commentContent: [
+            {
+              required: true,
+              message: this.$t('publishComment') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            }
+          ],
+          replyContent: [
+            {
+              required: true,
+              message: this.$t('replyToComments') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            }
+          ]
+        }
+      }
+    },
+    mounted() {
+    },
+    methods: {
+      handleCancel() {
+        this.visible = false
+      },
+      getData() {
+        this.visible = true
+        this.getList()
+      },
+      handleSubmit() {
+        this.title = this.$t('publishComment')
+        this.formInline = {}
+        this.visibleComment = true
+        this.$nextTick(() => {
+          this.$refs.ruleForm.clearValidate()
+        })
+      },
+      allowClearChange() {
+        this.getList()
+      },
+      submitQuery() {
+        this.getList()
+      },
+      getList() {
+        this.loading = true
+        getAction(this.url.list, {
+          projectLibraryId: this.$route.query.id,
+          commentContent: this.commentContent
+        }).then((res) => {
+          if (res.success) {
+            this.loading = false
+            this.dataList = res.result || []
+          } else {
+            this.loading = false
+            this.dataList = []
+          }
+        })
+      },
+      handleOkComment() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            let url = ''
+            let query = {}
+            if (this.title == this.$t('publishComment')) {
+              url = this.url.add
+              query = {
+                commentContent: this.formInline.commentContent,
+                projectLibraryId: this.$route.query.id
+              }
+            } else if (this.title == this.$t('replyToComments')) {
+              url = this.url.edit
+              query = {
+                replyContent: this.formInline.replyContent,
+                projectCommentId: this.formInline.projectCommentId
+              }
+            }
+            this.confirmLoading = true
+            postAction(url, query).then((res) => {
+              if (res.success) {
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.visibleComment = false
+                this.confirmLoading = false
+                this.getList()
+              } else {
+                this.confirmLoading = false
+                this.$message.success(this.$t('operationFailed'))
+              }
+            })
+          }
+        })
+      },
+      handleCancelComment() {
+        this.visibleComment = false
+      },
+      messageClick(row) {
+        this.formInline = {}
+        this.formInline.projectCommentId = row.id
+        this.title = this.$t('replyToComments')
+        this.visibleComment = true
+        this.$nextTick(() => {
+          this.$refs.ruleForm.clearValidate()
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  .comment-box {
+    position: absolute;
+    left: 0;
+    height: calc(100% - 140px);
+    width: 100%;
+    overflow: auto;
+    padding: 0 24px 24px 24px;
+    box-sizing: border-box;
+  }
+
+  .comment-box-top-box {
+    padding: 30px 24px 24px 24px;
+    box-sizing: border-box;
+    border: 1px solid #F1F2F4;
+    border-radius: 4px;
+    margin-bottom: 24px;
+  }
+
+  .img-box {
+    width: 32px;
+    height: 32px;
+    border-radius: 50%;
+    display: inline-block;
+    margin-right: 8px;
+    position: absolute;
+
+    .img {
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  .box-text {
+    display: inline-block;
+    position: absolute;
+    margin-left: 40px;
+
+    .box-text-name {
+      font-size: 14px;
+      font-weight: bold;
+      color: #040B29;
+      margin-right: 8px;
+    }
+
+    .box-text-time {
+      font-size: 14px;
+      font-weight: 400;
+      color: #6F7385;
+    }
+  }
+
+  .box-text-text {
+    font-size: 14px;
+    font-weight: 400;
+    color: #040B29;
+    display: inline-block;
+    margin-top: 22px;
+    margin-left: 40px;
+  }
+
+  .title-text {
+    font-size: 16px;
+    font-weight: 400;
+    color: #040B29;
+    margin-bottom: 18px;
+  }
+
+  .box-content {
+    position: relative;
+  }
+
+  .box-content-inside {
+    position: relative;
+    margin-bottom: 15px;
+  }
+
+  .box-icon {
+    position: absolute;
+    right: 0;
+    top: 0;
+    cursor: pointer;
+  }
+
+  .inside-box {
+    background: #F6F7FA;
+    border-radius: 4px;
+    margin-left: 40px;
+    width: calc(100% - 40px);
+    padding: 18px;
+    box-sizing: border-box;
+    margin-top: 15px;
+  }
+
+  .button-box {
+    text-align: right;
+    margin-bottom: 24px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    z-index: 100;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    /*align-items: center;*/
+  }
+
+  .title-text {
+    width: 74px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 48px;
+  }
+
+  .itemModel {
+    width: calc(100% - 64px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .comment-box-text {
+    text-align: center;
+    margin-top: 40px;
+  }
+
+  .box-input {
+    width: calc(100% - 183px);
+    margin-right: 8px;
+  }
+
+  .button-text {
+    width: 88px;
+    overflow: hidden;
+    padding: 0 8px;
+    //box-sizing: border-box;
+    float: right;
+  }
+
+  ::v-deep .button-text span {
+    width: 64px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    margin-top: 4px;
+  }
+</style>
+<style>
+  .box-input-search .ant-input-suffix .ant-input-search-icon{
+    display: none;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/complianceCertificationForm.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/complianceCertificationForm.vue
new file mode 100644
index 000000000..acb5fb4b2
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/complianceCertificationForm.vue
@@ -0,0 +1,302 @@
+<!--平台件-->
+<template>
+  <div class="box-top-content-right">
+    <div class="box-top-content-right-bottom">
+      <div class="process-content" v-if="timeData && timeData.length > 0">
+        <div class="process-content-right-xian"></div>
+        <div class="process-content-right-xian-color"></div>
+        <div class="process-content-right-xian-one"></div>
+        <div class="process-content-content" :style="val.left"
+             v-for="(val,indexOne) in timeData" :key="indexOne" v-if="val.g">
+          <div class="process-content-right-top" :title="val.name">{{ val.name }}</div>
+          <div class="process-content-right-button" :title="val.time.slice(0, 11)">{{ val.time.slice(0, 11) }}</div>
+          <!--                  <div class="process-content-right-button" v-if="indexOne % 2 == 1" :title="val.name">{{ val.name }}-->
+          <!--                  </div>-->
+          <a-tooltip placement="topLeft" overlayClassName="tooltipColor">
+            <template slot="title">
+              <span>{{ val.name }}</span>
+            </template>
+            <img v-if="val.status == 1" src="@/assets/heiTop.png" class="process-content-left"
+                 alt="">
+            <img v-else-if="val.status == 2" src="@/assets/kongTop.png"
+                 class="process-content-left"
+                 alt="">
+            <img v-else-if="val.status == 3" src="@/assets/shiTop.png" class="process-content-left"
+                 alt="">
+          </a-tooltip>
+
+          <!--                <div class="process-content-right-button">{{val.time.slice(0,11)}}</div>-->
+        </div>
+        <div class="process-content-contentOne" :style="val.left"
+             v-for="(val,indexTwo) in timeData" v-if="!val.g">
+          <div class="process-content-right-top" :title="val.time.slice(0, 11)">{{ val.time.slice(0, 11) }}</div>
+          <div class="process-content-right-button" :title="val.name">{{ val.name }}
+          </div>
+          <a-tooltip placement="topLeft" overlayClassName="tooltipColor">
+            <template slot="title">
+              <span>{{ val.name }}</span>
+            </template>
+            <img v-if="val.status == 1" src="@/assets/huiBottom.png" class="process-content-left"
+                 alt="">
+            <img v-else-if="val.status == 2" src="@/assets/kongBottom.png"
+                 class="process-content-left"
+                 alt="">
+            <img v-else-if="val.status == 3" src="@/assets/shiBottom.png" class="process-content-left"
+                 alt="">
+          </a-tooltip>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
+
+  export default {
+    name: 'complianceCertificationForm',
+    data() {
+      return {
+        regulatoryCertificationTaskPlanList: [],
+        timeData: [],
+        url: {
+          queryByProjectId: 'project/projectTaskPlanning/queryByProjectId'
+        }
+      }
+    },
+    mounted() {
+      this.getSetting()
+    },
+    methods: {
+      //传入 YYYY-MM , YYYY-MM  (2020-09)  (2020-12)  返回 YYYY-MM 数组
+      getYearAndMonth(start, end) {
+        let result = [];
+        let starts = start.split('-');
+        let ends = end.split('-');
+        let staYear = parseInt(starts[0]);
+        let staMon = parseInt(starts[1]);
+        let endYear = parseInt(ends[0]);
+        let endMon = parseInt(ends[1]);
+        while (staYear <= endYear) {
+          if (staYear === endYear) {
+            while (staMon < endMon) {
+              staMon++;
+              var str = staYear + '-'+(staMon >= 10 ? staMon : '0' + staMon);
+              result.push(str);
+            }
+            staYear++;
+          } else {
+            staMon++;
+            if (staMon > 12) {
+              staMon = 1;
+              staYear++;
+            }
+            let str = staYear + '-'+(staMon >= 10 ? staMon : '0' + staMon);
+            result.push(str);
+          }
+        }
+        return result;
+      },
+      getSetting() {
+        getAction(this.url.queryByProjectId, { projectId: this.$route.query.id }).then((res) => {
+          if (res.success) {
+            this.timeData = res.result || []
+            let startTime = ''
+            let endTime = ''
+            if (this.timeData.length > 0) {
+              startTime = this.timeData[0].time.slice(0, 7)
+              endTime = this.timeData[this.timeData.length - 1].time.slice(0, 7)
+              let monDiff = this.getYearAndMonth(startTime, endTime)
+              monDiff.unshift(startTime)
+              setTimeout(() => {
+                let dataList = document.getElementsByClassName('box-top-content-right-bottom')
+                let clientWidth = dataList[0].clientWidth
+                clientWidth = clientWidth / monDiff.length
+                for (let i = 0; i < monDiff.length; i++) {
+                  for (let j = 0; j < this.timeData.length; j++) {
+                    let num = (Math.floor(clientWidth / 30 * 10000)/10000) * parseInt(this.timeData[j].time.slice(8, 10))
+                    if (this.timeData[j].time.slice(0, 7) == monDiff[i]) {
+                      this.timeData[j].left = 'left:' + ((clientWidth * i + num) - 10) + 'px'
+                    }
+                  }
+                }
+                console.log(this.timeData)
+                this.timeData = [...this.timeData]
+              }, 500)
+            }
+          } else {
+            this.regulatoryCertificationTaskPlanList = []
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+
+  .box-top-content-right {
+    width: 100%;
+    padding: 0 24px;
+    box-sizing: border-box;
+  }
+
+  .box-top-content-right-bottom {
+    position: relative;
+    /*padding-top: 50px;*/
+  }
+
+  .process-content {
+    position: relative;
+    height: 110px;
+    /*overflow:hidden;*/
+
+    .process-content-content {
+      background: transparent;
+      z-index: 98;
+      /*padding: 0 6px;*/
+      position: absolute;
+      left: 40px;
+      text-align: center;
+      width: 16px;
+      height: 16px;
+      border-radius: 50%;
+      margin-top: 37px;
+
+      .process-content-left {
+        width: 16px;
+        height: 16px;
+        /*margin-top: 5px;*/
+      }
+
+      .process-content-right-top {
+        font-size: 12px;
+        color: #040B29;
+        width: 83px;
+        background: #fff;
+        display: inline-block;
+        position: absolute;
+        top: -15px;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        overflow: hidden;
+        display: -webkit-box;
+        text-overflow: ellipsis;
+        /*! autoprefixer: off */
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        /*! autoprefixer: on;*/
+        text-justify: inter-ideograph;
+        word-break: break-all
+      }
+
+      .process-content-right-button {
+        width: 83px;
+        font-size: 12px;
+        font-weight: 400;
+        color: #9C9FAC;
+        position: absolute;
+        left: 50%;
+        top: -36px;
+        transform: translate(-50%, -50%);
+        overflow: hidden;
+        display: -webkit-box;
+        text-overflow: ellipsis;
+        /*! autoprefixer: off */
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        /*! autoprefixer: on;*/
+        text-justify: inter-ideograph;
+        word-break: break-all
+      }
+    }
+
+    .process-content-contentOne {
+      background: transparent;
+      z-index: 98;
+      /*padding: 0 6px;*/
+      position: absolute;
+      left: 40px;
+      text-align: center;
+      width: 16px;
+      height: 16px;
+      border-radius: 50%;
+      margin-top: 63px;
+
+      .process-content-left {
+        width: 12px;
+        height: 12px;
+        /*margin-top: 5px;*/
+      }
+
+      .process-content-right-top {
+        font-size: 12px;
+        width: 83px;
+        background: #fff;
+        display: inline-block;
+        overflow: hidden;
+        position: absolute;
+        color: #9C9FAC;
+        top: 57px;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        overflow: hidden;
+        display: -webkit-box;
+        text-overflow: ellipsis;
+        /*! autoprefixer: off */
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        /*! autoprefixer: on;*/
+        text-justify: inter-ideograph;
+        word-break: break-all
+      }
+
+      .process-content-right-button {
+        width: 83px;
+        font-size: 12px;
+        font-weight: 400;
+        color: #040B29;
+        background: #fff;
+        position: absolute;
+        left: 50%;
+        top: 36px;
+        line-height: 11px;
+        transform: translate(-50%, -50%);
+        overflow: hidden;
+        display: -webkit-box;
+        text-overflow: ellipsis;
+        /*! autoprefixer: off */
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        /*! autoprefixer: on;*/
+        text-justify: inter-ideograph;
+        word-break: break-all
+      }
+    }
+
+    .process-content-right-xian {
+      height: 1px;
+      width: 100%;
+      background: #00B3BE;
+      position: absolute;
+      top: 48px;
+    }
+
+    .process-content-right-xian-color {
+      height: 28px;
+      width: 100%;
+      position: absolute;
+      top: 48px;
+      background: linear-gradient(90deg, rgba(0, 179, 190, 0.12) 0%, rgba(4, 11, 41, 0.02) 100%);
+      transform: matrix(-1, 0, 0, 1, 0, 0);
+    }
+
+    .process-content-right-xian-one {
+      height: 1px;
+      width: 100%;
+      background: #00B3BE;
+      position: absolute;
+      top: 74px;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/cuibanModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/cuibanModel.vue
new file mode 100644
index 000000000..762dd87cd
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/cuibanModel.vue
@@ -0,0 +1,189 @@
+<!--催办-->
+<template>
+  <a-modal
+    :title="title"
+    :width="700"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleOk"
+    @cancel="visible = false"
+  >
+    <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <div class="box-title-text">
+            <div class="title-text">
+                      <span class="title-text-text"
+                            :title="$t('taskType')">{{$t('taskType')}}</span>
+            </div>
+<!--            mode="multiple"-->
+            <a-form-model-item class="itemModel" prop="type">
+                <a-select v-model="formInline.type"
+                          class='box-input'
+                          :placeholder="$t('PleaseSelect') + $t('taskType')"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          allowClear>
+                  <a-select-option v-for="(item, key) in cuibanList" :key="key" :value="item.value">
+                      <span style="display: inline-block;width: 100%" :title=" item.label ">
+                        {{ item.label }}
+                      </span>
+                  </a-select-option>
+                </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+
+      </a-row>
+    </a-form-model>
+  </a-modal>
+</template>
+
+<script>
+import { postAction, putAction, getAction } from '@/api/manage'
+
+export default {
+  name: 'TaskListModel',
+  data() {
+    return {
+      formInline: {},
+      selectionRowsArray:[],
+      rules: {
+        type: [
+          {
+            required: true,
+            message: this.$t('PleaseSelect') + this.$t('taskType'),
+            trigger: 'change'
+          }
+          ]
+      },
+      title:'',
+      visible: false,
+      confirmLoading: false,
+      studioList: [],
+      cuibanList:[
+        { label: this.$t('confirmationOfDesignConformity'), value: '2' },
+        { label: this.$t('PrehomoConfirmation'), value: '3' },
+        { label: this.$t('verificationAndConformityconfirmation'), value: '4' },
+      ],
+      ids:'',
+      disabled: false,
+      url: {
+        edit: '/project/projectTaskInventoryEO/edit',
+        addOrUpdate: '/project/projectTaskInventoryConditionAssessmentEO/addOrUpdate',
+        list: '/project/projectTaskInventoryConditionAssessmentEO/list'
+      }
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    getData(val) {
+      this.visible = true
+      this.title = this.$t('CuiBan')
+      this.selectionRowsArray = val
+      this.$nextTick(() => {
+        this.formInline = {}
+        this.$refs.ruleForm.clearValidate()
+      })
+    },
+    getList(val) {
+      getAction(this.url.list, { projectLawsInventoryId: val.projectLawsInventoryId }).then((res) => {
+        if (res.success) {
+          this.studioList = res.result || []
+        } else {
+          this.studioList = []
+        }
+      })
+    },
+    handleInput(value) {
+      this.$nextTick(() => {
+        this.formInline = { ...this.formInline }
+        this.$refs.ruleForm.validateField([value])
+      })
+    },
+    handleOk() {
+      if (this.disabled) {
+        this.visible = false
+        return
+      }
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          let ProjectTaskUrgVo = {}
+          let projectLawsInventoryId = []
+          this.selectionRowsArray.forEach((item) => {
+            if(item.projectLawsInventoryId){
+              projectLawsInventoryId.push(item.projectLawsInventoryId)
+            }
+          })
+          ProjectTaskUrgVo = {
+              projectLawsInventoryIds: projectLawsInventoryId.join(','),
+              type: this.formInline.type,
+            }
+          this.confirmLoading = true
+          postAction('/project/projectLawsInventoryEO/taskUrg', ProjectTaskUrgVo).then((res) => {
+            if (res.success) {
+              this.visible = false
+              this.confirmLoading = false
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.$emit('cibanModel')
+            } else {
+              this.$message.warning(res.message)
+              this.confirmLoading = false
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+}
+
+.Required {
+  color: red;
+  margin-right: 4px;
+}
+
+.title-text {
+  width: 134px;
+  text-align: right;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 42px;
+  line-height: 42px;
+}
+
+.box-input {
+  display: inline-block;
+  height: 38px;
+  width: 100%;
+}
+
+.itemModel {
+  width: calc(80% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+}
+
+.title-text-text {
+  margin-top: 9px;
+}
+
+.headerText {
+  margin-left: 30px;
+  color: #040B29;
+  font-weight: 400;
+}
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/customizeList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/customizeList.vue
new file mode 100644
index 000000000..c03b4c806
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/customizeList.vue
@@ -0,0 +1,280 @@
+<template>
+  <a-drawer
+    :title="$t('customize')"
+    :maskClosable="false"
+    :width="1000"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <div style="margin-bottom: 60px">
+      <a-table
+        :components="drag(columns,'columns')"
+        :columns="columns"
+        :rowKey="record=> record.key"
+        :scroll="{x: 800}"
+        :data-source="dataList"
+        :pagination="false"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:'',getCheckboxProps: getCheckboxProps }"
+        :loading="loading">
+
+      </a-table>
+      <!--      <div class="page" v-if="dataList.length > 0">-->
+      <!--        <a-pagination-->
+      <!--          :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
+      <!--          show-quick-jumper-->
+      <!--          show-size-changer-->
+      <!--          :page-size.sync="pageSize"-->
+      <!--          :total="total"-->
+      <!--          :current="pageNo"-->
+      <!--          @change="onChange"-->
+      <!--          @showSizeChange="SizeChange"-->
+      <!--        />-->
+      <!--      </div>-->
+    </div>
+
+    <div class="drawer-bootom-button">
+      <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit(undefined)" type="primary" :loading="confirmLoading">{{$t('determine')}}</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+  export default {
+    name: 'transferList',
+    components: {},
+    props: ['url'],
+    mixins:[ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        visible: false,
+        queryParam: {},
+        confirmLoading: false,
+        selectedRowKeys: [],
+        columns: [
+          {
+            title: this.$t('customColumn'),
+            dataIndex: 'name',
+            align: 'left',
+            ellipsis: true,
+            width: 884
+          },
+        ],
+        dataList: [
+          {
+            orderBy: '1',
+            name: '1',
+            id: '1',
+            status:1,
+          },
+          {
+            orderBy: '2',
+            name: '2',
+            id: '12',
+            status:2,
+          },
+          {
+            orderBy: '3',
+            name: '3',
+            id: '13',
+          },
+          {
+            orderBy: '4',
+            name: '4',
+            id: '15',
+          },
+          {
+            orderBy: '5',
+            name: '4',
+            id: '16',
+          },
+          {
+            orderBy: '6',
+            name: '4',
+            id: '17',
+          },
+          {
+            orderBy: '7',
+            name: '4',
+            id: '18',
+          },
+          {
+            orderBy: '8',
+            name: '4',
+            id: '19',
+            status:2,
+          },
+        ],
+        content: [],
+        loading: false,
+        pageNo: 1,
+        pageSize: 10,
+        total: 0
+      }
+    },
+    mounted() {
+
+    },
+    methods: {
+      transferModel() {
+        this.visible = true
+        this.queryParam = {}
+        this.selectedRowKeys = []
+        // this.replacePage()
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.replacePage()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.replacePage()
+      },
+      onChange(page, pageSize) {
+        this.pageNo = page
+        this.replacePage()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.replacePage()
+      },
+      replacePage() {
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...this.queryParam
+        }
+        this.loading = true
+        postAction(this.url.transferUrl, query).then((res) => {
+          if (res.success) {
+            this.dataList = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+        // if (this.selectedRowKeys.length > 1) {
+        //   this.selectedRowKeys.shift()
+        // }
+      },
+      getCheckboxProps(record) {
+        console.log(record.status, 'status');
+        return ({
+          props: {
+            //当状态是1或者2的时候执行disable
+            disabled: record.status === 1 || record.status === 2
+          }
+        })
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      handleSubmit(flag) {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.confirmLoading = true
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          this.confirmLoading = false
+          this.$emit('transferListForm',selectedRowKeys.join(','))
+          this.selectedRowKeys = []
+          // postAction(this.url.addModel, {
+          //   dummyInventoryBaseId: selectedRowKeys.join(','),
+          //   projectLibraryId: this.$route.query.id,
+          //   flag: flag
+          // }).then((res) => {
+          //   if (res.success) {
+          //     this.confirmLoading = false
+          //     this.$message.success(this.$t('OperationSuccessful'))
+          //     this.visible = false
+          //     this.selectedRowKeys = []
+          //     this.$emit('transferListForm')
+          //   } else {
+          //     if (res.message == '该虚拟清单的维护清单中没有数据,是否需要添加') {
+          //       this.confirmLoading = false
+          //       this.getAdd()
+          //       return
+          //     }
+          //     this.$message.warning(this.$t('operationFailed'))
+          //     this.confirmLoading = false
+          //   }
+          // })
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      getAdd() {
+        let _this = this
+        this.$confirm({
+          content: _this.$t('TheDoesNotContainData'),
+          onOk() {
+            _this.handleSubmit('1')
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+.page {
+  text-align: right;
+  margin-top: 20px;
+}
+
+.drawer-bootom-button {
+  position: absolute;
+  bottom: 0;
+  z-index: 100;
+  width: 100%;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
+
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+
+.title-text {
+  width: 20%;
+  min-width: 110px;
+  color: #000F16;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  margin-top: 3px;
+  text-align: right;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.box-input {
+  display: inline-block;
+  width: 70%;
+  height: 38px;
+  margin-top: 2px;
+}
+
+.box-button {
+  height: 38px;
+}
+
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/detilModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/detilModel.vue
new file mode 100644
index 000000000..23e0d70f7
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/detilModel.vue
@@ -0,0 +1,507 @@
+<template>
+  <div>
+    <a-drawer
+      :title="title"
+      :maskClosable="false"
+      :width="900"
+      placement="right"
+      :closable="true"
+      @close="handleCancel"
+      :visible="visible"
+      style="height: 100%;overflow: auto;padding-bottom: 53px;">
+      <a-spin :spinning="confirmLoading">
+        <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text"
+                        :title="$t('title')">{{$t('title')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="title">
+                  <a-input class="box-input"
+                           v-model='formInline.title'
+                           :disabled="disabled"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text"
+                        :title="$t('problemType')">{{$t('problemType')}}</span>
+                </div>
+                <a-form-model-item class="itemModel-multi" prop="problemType">
+                  <j-dict-select-tag class="box-input" v-model="formInline.problemType"
+                                     :disabled="disabled"
+                                     :type="'select'"
+                                     :triggerChange="false" :dictCode="'wen4_ti2_lei4_xing2'"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <!--                  <span class="Required">*</span>-->
+                  <span class="title-text-text"
+                        :title="'PS-issue'">{{'PS-issue'}}</span>
+                </div>
+                <div>
+                  <a style='width: 273px;display: inline-block;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;margin-top: 12px;'
+                     :title='formInline.psIssue'
+                     @click='UserFeedback(formInline.psIssue)'>{{formInline.psIssue}}</a>
+                </div>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <!--                  <span class="Required">*</span>-->
+                  <span class="title-text-text"
+                        :title="$t('Relevantlawsregulations')">{{$t('Relevantlawsregulations')}}</span>
+                </div>
+                <a-form-model-item class="itemModel-multi" prop="creator">
+                  <a-input class="box-input"
+                           :title='formInline.lawsName'
+                           v-model='formInline.lawsName'
+                           :disabled="disabled"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <!--                  <span class="Required">*</span>-->
+                  <span class="title-text-text"
+                        :title="$t('RelatedItems')">{{$t('RelatedItems')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="contentTemplate">
+                  <a-select allowClear
+                            class="box-input"
+                            v-model="formInline.projectId"
+                            :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                            showSearch
+                            mode="multiple"
+                            :disabled="disabled"
+                            optionFilterProp="label"
+                            :autoClearSearchValue="false">
+                    <a-select-option v-for="(item, key) in projectNameList"
+                                     :key="key"
+                                     :label="item.projectName"
+                                     :value="item.id">
+                     <span style="display: inline-block;width: 100%" :title=" item.projectName ">
+                           {{ item.projectName}}
+                     </span>
+                    </a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <!--                  <span class="Required">*</span>-->
+                  <span class="title-text-text"
+                        :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
+                </div>
+                <a-form-model-item class="itemModel-multi" prop="creator">
+                  <a-select
+                    allowClear
+                    show-search
+                    mode="multiple"
+                    :disabled="disabled"
+                    class="box-input-search"
+                    optionFilterProp="label"
+                    :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                    v-model="formInline.dutyTerritory">
+                    <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
+                                     :key="key"
+                                     :label="item.key"
+                                     :value="item.key">
+                               <span style="display: inline-block;width: 100%" :title=" item.key ">
+                                     {{ item.key }}
+                               </span>
+                    </a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <!--                  <span class="Required">*</span>-->
+                  <span class="title-text-text"
+                        :title="$t('Problemstate')">{{$t('Problemstate')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="contentTemplate">
+                  <a-select allowClear
+                            class="box-input"
+                            v-model="formInline.problemState"
+                            :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                            showSearch
+                            :disabled="disabled"
+                            optionFilterProp="label"
+                            :autoClearSearchValue="false">
+                    <a-select-option v-for="(item, key) in ProblemstateList"
+                                     :label='item'
+                                     :key="key"
+                                     :value="item">
+                  <span style="display: inline-block;width: 100%" :title=" item">
+                    {{ item }}
+                  </span>
+                    </a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </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('descriptions')">{{$t('descriptions')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="descriptions">
+                  <a-input class="box-input"
+                           v-model='formInline.description'
+                           :disabled="disabled"/>
+                </a-form-model-item>
+              </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('documents')">{{$t('documents')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="fileLink">
+                  <div v-for="(item,index) in formInline.fileLinkList" :key="index">
+                    <a @click='UserFeedback(item.fileLink)'>{{item.fileLink}}</a>
+                  </div>
+                  <div v-for='(item,index) in formInline.fileList'>
+                    <a @click='download(item)'>{{item.fileName}}</a>
+                  </div>
+                </a-form-model-item>
+              </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('progresstracking')">{{$t('progresstracking')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="progresstracking">
+                  <div v-for="(item,index) in formInline.progressTrackingList" :key="index">
+                    <a-input class="box-input"
+                             style='width: 89%'
+                             v-model='item.progressTracking'
+                             :title='item.progressTracking'
+                             :disabled="true"/>
+                  </div>
+                </a-form-model-item>
+              </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('conculsion')">{{$t('conculsion')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="conclusion">
+                  <a-input class="box-input"
+                           v-model='formInline.conclusion'
+                           :disabled="disabled"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <!--                  <span class="Required">*</span>-->
+                  <span class="title-text-text"
+                        :title="$t('examineapproveevidence')">{{$t('examineapproveevidence')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="approvalEvidenceLink">
+                  <div v-for="(item,index) in formInline.approvalEvidenceLinkList" :key="index">
+                    <a @click='UserFeedback(item.approvalEvidenceLink)'>{{item.approvalEvidenceLink}}</a>
+                  </div>
+                  <div v-for='(item,index) in formInline.approvalEvidenceFileList'>
+                    <a @click='download(item)'>{{item.fileName}}</a>
+                  </div>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+        </a-form-model>
+      </a-spin>
+      <div class="drawer-bootom-button">
+        <a-button style="margin-right:  8px" @click="handleCancel">{{$t('close')}}</a-button>
+      </div>
+    </a-drawer>
+  </div>
+</template>
+
+<script>
+import { getAction, postAction,putAction, downloadFile } from '@/api/manage'
+import moment from 'moment'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'fillAdd',
+  components: {
+
+  },
+  data() {
+    return {
+      rules: {
+        title: [
+          {
+            required: true,
+            message: this.$t('title') + this.$t('cannotEmpty'),
+            trigger: 'blur'
+          }
+        ],
+        problemType: [
+          {
+            required: true,
+            message: this.$t('problemType') + this.$t('cannotEmpty'),
+            trigger: 'change'
+          }
+        ],
+      },
+      visible: false,
+      visibletrack: false,
+      rulestracking:{
+        progressTracking: [
+          {
+            required: true,
+            message: this.$t('text') + this.$t('cannotEmpty'),
+            trigger: 'blur'
+          }
+        ]
+      },
+      formInline: {
+        fileLinkList:[{}],
+        progressTrackingList:[{}],
+        approvalEvidenceLinkList:[{}],
+        dutyTerritory:undefined,
+        projectId:undefined,
+        problemState:undefined,
+      },
+      formInlinetracking:{},
+      confirmLoading: false,
+      title: '',
+      disabled: false,
+      isTrue: false,
+      chapterContentsList: [],
+      firstLevelDutyTerritoryList:[],
+      projectNameList: [],
+      ProblemstateList:[this.$t('red'),this.$t('yellow'),this.$t('green'),],
+      templateDisabled: false,
+      contentTemplateList: [
+        {
+          id: '1',
+          text: this.$t('defaultTemplate')
+        },
+        {
+          id: '2',
+          text: this.$t('newRequestCommentListTemplate')
+        },
+        {
+          id: '3',
+          text: this.$t('NewReleasedStandardTemplate')
+        },
+        {
+          id: '4',
+          text: this.$t('industryInformationDynamicTemplate')
+        }
+      ],
+      index:'',
+      url: {
+        add: '/project/problemManagementEO/add',
+        edit: '/project/problemManagementEO/edit',
+        queryById: '/report/lawsMonthlyReportWriteEO/queryById'
+      }
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    getNameList() {
+      getAction('/project/projectNameInfoEO/queryProjectNameList', {}).then((res) => {
+        if (res.success) {
+          this.projectNameList = res.result || []
+        } else {
+          this.projectNameList = []
+        }
+      })
+    },
+    getFirstLevelDutyTerritory() {
+      getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
+        if (res.success) {
+          this.firstLevelDutyTerritoryList = res.result
+        } else {
+          this.firstLevelDutyTerritoryList = []
+        }
+      })
+    },
+    ...mapGetters(['userInfo']),
+    edit(row) {
+      this.getNameList()
+      this.getFirstLevelDutyTerritory()
+      this.title = this.$t('view')
+      this.formInline = row
+      if(this.formInline.dutyTerritory != null){
+        this.formInline.dutyTerritory = this.formInline.dutyTerritory.split(',')
+      }else{
+        this.formInline.dutyTerritory = undefined
+      }
+      if(this.formInline.problemState == null){
+        this.formInline.problemState = undefined
+      }
+      if(this.formInline.projectId != null){
+        this.formInline.projectId = this.formInline.projectId.split(',')
+      }else{
+        this.formInline.projectId = undefined
+      }
+      getAction('/project/problemManagementEO/queryById', {id:this.formInline.id}).then((res) => {
+        if (res.success) {
+          this.formInline.fileList = res.result.fileList
+          this.formInline.approvalEvidenceFileList = res.result.approvalEvidenceFileList
+        }
+      })
+      console.log(this.formInline)
+      this.visible = true
+      this.disabled = true
+      this.$nextTick(() => {
+        this.$refs.ruleForm.clearValidate()
+      })
+    },
+    UserFeedback(item){
+      window.open(item, '_blank');
+    },
+    download(item){
+      console.log(item)
+      downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id })
+    },
+    handleCancel() {
+      this.visible = false
+    },
+  }
+}
+</script>
+<style>
+.ant-select-disabled {
+  color: rgba(0, 0, 0, 0.65);
+}
+
+.ant-input-disabled {
+  color: rgba(0, 0, 0, 0.65) !important;
+}
+</style>
+<style scoped>
+
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+}
+
+.title-text {
+  width: 114px;
+  text-align: right;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 42px;
+  line-height: 42px;
+}
+
+.box-input {
+  display: inline-block;
+  height: 38px;
+  width: 100%;
+}
+
+.itemModel {
+  width: calc(100% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+}
+
+.title-text-text {
+  margin-top: 9px;
+}
+
+.formAdd {
+  margin-bottom: 40px;
+}
+
+.Required {
+  color: red;
+  margin-right: 4px;
+}
+
+.title-text-text {
+  margin-top: 9px;
+}
+
+.formAdd {
+  margin-bottom: 40px;
+}
+
+.drawer-bootom-button {
+  position: absolute;
+  bottom: 0;
+  z-index: 100;
+  width: 100%;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
+
+.button-text {
+  height: 38px;
+  margin-top: 4px;
+}
+
+::v-deep .ant-select-tree-treenode-switcher-close {
+  width: 255px;
+}
+
+::v-deep .ant-select-tree-node-content-wrapper {
+  float: right;
+  margin-top: -2px !important;
+}
+
+::v-deep .ant-select-tree-title {
+  width: 100%;
+  display: block;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  word-break: break-word;
+}
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/fixedPlateForm.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/fixedPlateForm.vue
new file mode 100644
index 000000000..7be6ec98d
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/fixedPlateForm.vue
@@ -0,0 +1,138 @@
+<template>
+  <a-modal
+    :title="$t('fixedPlate')"
+    :width="500"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleOk"
+    @cancel="handleCancel"
+  >
+    <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="Required">*</span>
+              <span class="title-text-text" :title="$t('versionName')">{{$t('versionName')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" :prop="'versionsName'">
+              <a-input class="box-input"
+                       v-model="formInline.versionsName"
+                       :placeholder="$t('PleaseEnter')+$t('versionName')"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+    </a-form-model>
+  </a-modal>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+
+  export default {
+    name: 'fixedPlateForm',
+    data() {
+      return {
+        visible: false,
+        formInline: {},
+        loading: false,
+        confirmLoading: false,
+        url: {
+          add: '/project/projectHistoryVersionsEO/add'
+        },
+        rules: {
+          versionsName: [
+            {
+              required: true,
+              message: this.$t('versionName') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
+            {
+              max: 200,
+              message: this.$t('versionName') + this.$t('cannotExceed') + 200 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ]
+        }
+      }
+    },
+    methods: {
+      getData() {
+        this.visible = true
+        this.formInline = {}
+        this.$nextTick(() => {
+          this.$refs.ruleForm.clearValidate()
+        })
+      },
+      handleOk() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            let query = {
+              projectLibraryId: this.$route.query.id,
+              ...this.formInline
+            }
+            this.confirmLoading = true
+            postAction(this.url.add, query).then((res) => {
+              if (res.success) {
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.visible = false
+                this.confirmLoading = false
+              } else {
+                this.confirmLoading = false
+                this.$message.success(this.$t('operationFailed'))
+              }
+            })
+          }
+        })
+      },
+      handleCancel() {
+        this.visible = false
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    /*align-items: center;*/
+  }
+
+  .title-text {
+    width: 74px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 48px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 64px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/historicalVersionList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/historicalVersionList.vue
new file mode 100644
index 000000000..e45f92d50
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/historicalVersionList.vue
@@ -0,0 +1,105 @@
+<template>
+  <a-modal
+    :title="$t('historicalVersion')"
+    :width="900"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @cancel="visible = false"
+  >
+    <template slot="footer">
+      <a-button key="back" @click="visible = false">
+        {{$t('cancel')}}
+      </a-button>
+    </template>
+    <a-table
+      class="table"
+      :components="drag(columns,'columns')"
+      :columns="columns"
+      :pagination="false"
+      :scroll="{x:'100%',y: 400}"
+      :data-source="dataSource"
+      :loading="loading"
+    >
+       <span slot="operation" slot-scope="text,record">
+           <a @click="seeClick(record)">{{$t('See')}}</a>
+       </span>
+    </a-table>
+  </a-modal>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+  export default {
+    name: 'historicalVersionList',
+    mixins: [ResizeColumnProvide, ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        visible: false,
+        confirmLoading: false,
+        dataSource: [],
+        loading: false,
+        url: {
+          list: 'project/projectHistoryVersionsEO/list'
+        },
+        columns: [
+          {
+            title: this.$t('versionName'),
+            dataIndex: 'versionsName',
+            align: 'left',
+            ellipsis: true,
+            width: 362
+          },
+          {
+            title: this.$t('finalizationTime'),
+            dataIndex: 'createTime',
+            align: 'left',
+            ellipsis: true,
+            width: 362
+          },
+          {
+            title: this.$t('operation'),
+            align: 'left',
+            width: 120,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ]
+      }
+    },
+    mounted() {
+    },
+    methods: {
+      getList() {
+        this.visible = true
+        this.historicalList()
+      },
+      historicalList() {
+        let query = {
+          projectLibraryId: this.$route.query.id
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result || []
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      seeClick(item) {
+        let newUrl = this.$router.resolve({
+          path: '/historicalVersion',
+          query: item
+        })
+        window.open(newUrl.href, '_blank')
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listAddModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listAddModel.vue
new file mode 100644
index 000000000..85bc82d41
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listAddModel.vue
@@ -0,0 +1,346 @@
+<template>
+  <a-drawer
+    :title="$t('add')"
+    :maskClosable="false"
+    :width="1000"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <div style="margin-bottom: 60px">
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="12" :sm="5">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('standard')">
+                <span>{{$t('standard')}}</span>
+              </div>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                       v-model="queryParam.serial_number"></a-input>
+            </div>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+          <a-col :md="12" :sm="5">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('title')">
+                <span>{{$t('title')}}</span>
+              </div>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                       v-model="queryParam.title"></a-input>
+            </div>
+          </a-col>
+          <a-col :md="12" :sm="5">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('status')">
+                <span>{{$t('status')}}</span>
+              </div>
+              <j-dict-select-tag class="box-input" v-model="queryParam.state"
+                                 :placeholder="$t('PleaseSelect')+$t('status')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'state'"/>
+            </div>
+          </a-col>
+          </template>
+          <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
+               <a-col :md="12" :sm="24">
+                  <a @click="handleToggleSearch">
+                          {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                           <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                  </a>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <globalAdvancedQuery ref="globalAdvancedQueryRef"
+                                       @handleSuperQuery="handleSuperQuery"
+                                       :fieldList="fieldList"/>
+               </a-col>
+      </span>
+        </a-row>
+        </a-form>
+      </div>
+      <a-table
+        :components="drag(columns,'columns')"
+        :columns="columns"
+        rowKey="id"
+        :scroll="{x: 1200}"
+        :data-source="dataList"
+        :pagination="false"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :loading="loading">
+
+      </a-table>
+      <div class="page" v-if="dataList.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="onChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+
+    <div class="drawer-bootom-button">
+      <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+  export default {
+    name: 'listAddModel',
+    components: {
+      globalAdvancedQuery
+    },
+    props: ['url'],
+    mixins:[ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        toggleSearchStatus: false,
+        visible: false,
+        queryParam: {},
+        confirmLoading: false,
+        selectedRowKeys: [],
+        columns: [
+          {
+            title: this.$t('standard'),
+            dataIndex: 'serial_number',
+            align: 'left',
+            ellipsis: true,
+            width: 228
+          },
+          {
+            title: this.$t('title'),
+            dataIndex: 'title',
+            align: 'left',
+            ellipsis: true,
+            width: 228
+          },
+          {
+            title: this.$t('zoneOfApplication'),
+            dataIndex: 'region',
+            align: 'left',
+            ellipsis: true,
+            width: 228
+          },
+          // {
+          //   title: this.$t('status'),
+          //   dataIndex: 'state',
+          //   align: 'center',
+          //   ellipsis: true
+          // },
+          // {
+          //   title: this.$t('technicalField'),
+          //   dataIndex: 'technology_territory',
+          //   align: 'center',
+          //   ellipsis: true
+          // },
+          {
+            title: this.$t('ImplementationDate'),
+            dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
+            align: 'left',
+            ellipsis: true,
+            width: 190
+          },
+          {
+            title: this.$t('vehicleInProductionDate'),
+            dataIndex: 'implement_time',
+            align: 'left',
+            ellipsis: true,
+            width: 190
+          },
+          // {
+          //   title: this.$t('correspondingStandard'),
+          //   dataIndex: 'corresponding_standard',
+          //   align: 'center',
+          //   ellipsis: true
+          // }
+        ],
+        dataList: [],
+        content: [],
+        loading: false,
+        pageNo: 1,
+        pageSize: 10,
+        total: 0,
+        fieldList: [],
+        queryConditionVOList: []
+      }
+    },
+    mounted() {
+
+    },
+    methods: {
+      handleToggleSearch() {
+        this.toggleSearchStatus = !this.toggleSearchStatus
+      },
+      addModel() {
+        this.visible = true
+        this.queryParam = {}
+        this.selectedRowKeys = []
+        this.queryConditionVOList = []
+        this.replacePage()
+        this.queryConditionInventory()
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.replacePage()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.queryConditionVOList = []
+        this.$refs.globalAdvancedQueryRef.resetLine()
+        this.$refs.globalAdvancedQueryRef.emitCallback()
+        this.replacePage()
+      },
+      onChange(page, pageSize) {
+        this.pageNo = page
+        this.replacePage()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.replacePage()
+      },
+      replacePage() {
+        let queryConditionVOList = JSON.parse(JSON.stringify(this.queryConditionVOList))
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...this.queryParam,
+          queryConditionVOList: JSON.stringify(queryConditionVOList)
+        }
+        this.loading = true
+        postAction(this.url.addModelList, query).then((res) => {
+          if (res.success) {
+            this.dataList = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.dataList = []
+            this.total = 0
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      handleSubmit() {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.confirmLoading = true
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          postAction(this.url.addModel, {
+            ids: selectedRowKeys.join(','),
+            projectLibraryId: this.$route.query.id
+          }).then((res) => {
+            if (res.success) {
+              this.confirmLoading = false
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.visible = false
+              this.selectedRowKeys = []
+              this.$emit('addModelList')
+            } else {
+              this.$message.warning(res.message)
+              this.confirmLoading = false
+            }
+          })
+          this.visible = false
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      queryConditionInventory() {
+        let query = {
+          flag: 1
+        }
+        getAction(this.url.queryConditionInventory, query).then((res) => {
+          if (res.success) {
+            this.fieldList = res.result || []
+          } else {
+            this.fieldList = []
+          }
+        })
+      },
+      handleSuperQuery(params, matchType) {
+        let sqp = {}
+        if (!params || (params && params.length == 0)) {
+          this.queryConditionVOList = []
+          this.$refs.globalAdvancedQueryRef.superQueryFlag = false
+        } else {
+          this.$refs.globalAdvancedQueryRef.superQueryFlag = true
+          this.queryConditionVOList = params
+          this.queryConditionVOList.forEach(res => {
+            res.type = matchType
+          })
+        }
+        this.replacePage()
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    z-index: 100;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 110px;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
new file mode 100644
index 000000000..f7581f1be
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
@@ -0,0 +1,1211 @@
+<template>
+  <a-drawer
+    :title="$t('edit')"
+    :maskClosable="false"
+    :width="900"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <a-spin :spinning="confirmLoading">
+      <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('standard')">{{$t('standard')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="serialNumber">
+                <a-input class="box-input"
+                         :disabled="false"
+                         v-model="formInline.serialNumber"
+                         :placeholder="$t('PleaseEnter')+$t('standard')"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('title')">{{$t('title')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="title">
+                <a-input class="box-input"
+                         v-model="formInline.title"
+                         :placeholder="$t('PleaseEnter')+$t('title')"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('subtitle')">{{$t('subtitle')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="subtitle">
+                <a-input class="box-input"
+                         v-model="formInline.subtitle"
+                         :placeholder="$t('PleaseEnter')+$t('subtitle')"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('applicableSupplement')">{{$t('applicableSupplement')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="applicableSupplement">
+                <a-input class="box-input"
+                         v-model="formInline.applicableSupplement"
+                         :placeholder="$t('PleaseEnter')+$t('applicableSupplement')"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('certificationType')">{{$t('certificationType')}}</span>
+              </div>
+              <a-form-model-item class="itemModel-multi" prop="attestationType">
+                <j-multi-select-tag class="box-input" v-model="formInline.attestationType"
+                                    :placeholder="$t('PleaseSelect')+$t('certificationType')"
+                                    :type="'select'"
+                                    :triggerChange="false" :dictCode="'attestation_type'"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text"
+                      :title="$t('certificationLevel')">{{$t('certificationLevel')}}</span>
+              </div>
+              <a-form-model-item class="itemModel-multi" prop="attestationRank">
+                <j-multi-select-tag class="box-input" v-model="formInline.attestationRank"
+                                    :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
+                                    :type="'select'"
+                                    :triggerChange="false" :dictCode="'attestation_rank'"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>
+                <span class="title-text-text"
+                      :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
+              </div>
+              <a-form-model-item class="itemModel-multi" prop="dutyDepart">
+                <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
+                          class="box-input"
+                          optionFilterProp="label"
+                          @change="DutyDepartChange"
+                          mode="multiple"
+                          :disabled="formInline.roleCodeIndex == 0 ? false : true"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          v-model="formInline.dutyDepart">
+                  <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
+                                   :key="key"
+                                   :label="item.key"
+                                   :value="item.key">
+                               <span style="display: inline-block;width: 100%" :title=" item.key ">
+                                     {{ item.key }}
+                               </span>
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>
+                <span class="title-text-text"
+                      :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
+              </div>
+              <a-form-model-item class="itemModel-multi" prop="dutyTerritory">
+                <a-select :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                          class="box-input"
+                          optionFilterProp="label"
+                          mode="multiple"
+                          @change="dutyTerritoryChange"
+                          :disabled="formInline.roleCodeIndex == 0 ? false : true"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          v-model="formInline.dutyTerritory">
+                  <a-select-option v-for="(item, key) in dutyTerritoryList"
+                                   :key="key"
+                                   :label="item.itemText"
+                                   :value="item.itemValue">
+                               <span style="display: inline-block;width: 100%" :title=" item.itemText ">
+                                     {{ item.itemText }}
+                               </span>
+                  </a-select-option>
+                </a-select>
+                <!--                <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"-->
+                <!--                                    @change="dutyTerritoryChange"-->
+                <!--                                    :disabled="formInline.roleCodeIndex == 0 ? false : true"-->
+                <!--                                    :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
+                <!--                                    :type="'select'"-->
+                <!--                                    :triggerChange="false" :dictCode="'duty_territory'"/>-->
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>
+                <span class="title-text-text" :title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" :prop="'regulationOwnerId'">
+                <a-select :placeholder="$t('PleaseSelect')+$t('regulatoryEngineer')"
+                          class="box-input"
+                          :disabled="formInline.roleCodeIndex == 0 ? false : true"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          allowClear
+                          v-model="formInline.regulationOwnerId">
+                  <a-select-option v-for="(item, key) in regulatoryEngineerList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" :prop="'engineeringInterfacePerson'">
+                <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
+                          class="box-input"
+                          allowClear
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          v-model="formInline.engineeringInterfacePerson">
+                  <a-select-option v-for="(item, key) in engineeringInterfacePersonList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </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="'remarks'">
+                <a-textarea
+                  style="width: 100%"
+                  :placeholder="$t('PleaseEnter')+$t('remarks')"
+                  :disabled="false"
+                  v-model="formInline.remark" :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <div class="header-text">
+          &nbsp;{{$t('confirmationOfDesignConformity')}}
+        </div>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required"
+                      v-if="!formInline.designDeliverableType.join(',').includes('1645667531513237506')">*</span>
+                <span class="title-text-text"
+                      :title="$t('personLiable')">{{$t('personLiable')}}</span>
+              </div>
+              <a-form-model-item class="itemModel-multi"
+                                 :prop="formInline.designDeliverableType.join(',').includes('1645667531513237506')?'':'designDutyIdName'"
+                                 :rules="[{ required: formInline.designDeliverableType.join(',').includes('1645667531513237506')?false:true,
+                                 message: $t('personLiable') + $t('cannotEmpty'), trigger: 'change'}]">
+                <PersonnelSelection :query="{db_field_name:'designDutyId',db_field_txt:$t('personLiable')}"
+                                    :isSingleChoice="true"
+                                    :personneQuery="formInline"
+                                    v-if="visible"
+                                    :disabled="isEdit(this.formInline)"
+                                    @change="PersonnelSelectionChange"
+                                    v-model="formInline.designDutyIdName"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required"
+                      v-if="!formInline.designDeliverableType.join(',').includes('1645667531513237506')">*</span>
+                <span class="title-text-text"
+                      :title="$t('deliveryDate')">{{$t('deliveryDate')}}</span>
+              </div>
+              <a-form-model-item class="itemModel"
+                                 :prop="formInline.designDeliverableType.join(',').includes('1645667531513237506')?'':'designDueDate'"
+                                 :rules="[{ required: formInline.designDeliverableType.join(',').includes('1645667531513237506')?false:true,
+                                 message: $t('deliveryDate') + $t('cannotEmpty'), trigger: 'change'}]">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+$t('deliveryDate')"
+                               @change="dateChange({db_field_name:'designDueDate'})"
+                               format="YYYY-MM-DD"
+                               :disabled="isEdit(this.formInline)"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.designDueDate"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text"
+                      :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
+              </div>
+              <a-form-model-item class="itemModel-multi" prop="designDeliverableType">
+                <a-tree-select
+                  tree-node-filter-prop="title"
+                  v-model="formInline.designDeliverableType"
+                  :maxTagCount="1"
+                  @change="designDeliverableTypeChange"
+                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                  class="box-input"
+                  style="width: 100%"
+                  :disabled="isEdit(this.formInline)"
+                  :tree-data="DeliverableTreeList"
+                  tree-checkable
+                  :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
+                />
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="designDeliverableTemplate">
+                <a-button type="primary" class="button-text"
+                          @click="clickButtonToUpload('designDeliverableTemplate')">
+                  {{ (formInline.designDeliverableTemplate === 'null' || formInline.designDeliverableTemplate === '' ||
+                  formInline.designDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                  }}
+                </a-button>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24" v-if="formInline.designDutyDueDate">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('deadlineForResponsibilityConfirmation')">{{$t('deadlineForResponsibilityConfirmation')}}</span>
+              </div>
+              <a-form-model-item class="itemModel">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+$t('deadlineForResponsibilityConfirmation')"
+                               @change="dateChange({db_field_name:'designDutyDueDate'})"
+                               format="YYYY-MM-DD"
+                               :disabled="true"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.designDutyDueDate"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </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('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
+              </div>
+              <a-form-model-item class="itemModel-text" :prop="'designRemark'">
+                <a-textarea
+                  style="width: 100%"
+                  :disabled="isEdit(this.formInline)"
+                  :placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"
+                  v-model="formInline.designRemark" :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+
+        <div class="header-text">
+          &nbsp;{{$t('verificationAndConformityconfirmation')}}
+        </div>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required"
+                      v-if="!formInline.verifyDeliverableType.join(',').includes('1645667531513237506')">*</span>
+                <span class="title-text-text"
+                      :title="$t('personLiable')">{{$t('personLiable')}}</span>
+              </div>
+              <a-form-model-item class="itemModel-multi"
+                                 :prop="formInline.verifyDeliverableType.join(',').includes('1645667531513237506')?'':'verifyDutyIdName'"
+                                 :rules="[{ required: formInline.verifyDeliverableType.join(',').includes('1645667531513237506')?false:true,
+                                 message: $t('personLiable') + $t('cannotEmpty'), trigger: 'change'}]">
+                <PersonnelSelection :query="{db_field_name:'verifyDutyId',db_field_txt:$t('personLiable')}"
+                                    :isSingleChoice="true"
+                                    :personneQuery="formInline"
+                                    v-if="visible"
+                                    :disabled="isEditVerifi(this.formInline)"
+                                    @change="PersonnelSelectionChange"
+                                    v-model="formInline.verifyDutyIdName"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required"
+                      v-if="!formInline.verifyDeliverableType.join(',').includes('1645667531513237506')">*</span>
+                <span class="title-text-text"
+                      :title="$t('deliveryDate')">{{$t('deliveryDate')}}</span>
+              </div>
+              <a-form-model-item class="itemModel"
+                                 :prop="formInline.verifyDeliverableType.join(',').includes('1645667531513237506')?'':'verifyDueDate'"
+                                 :rules="[{ required: formInline.verifyDeliverableType.join(',').includes('1645667531513237506')?false:true,
+                                 message: $t('deliveryDate') + $t('cannotEmpty'), trigger: 'change'}]">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+$t('deliveryDate')"
+                               @change="dateChange({db_field_name:'verifyDueDate'})"
+                               format="YYYY-MM-DD"
+                               :disabled="isEditVerifi(this.formInline)"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.verifyDueDate"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text"
+                      :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
+              </div>
+              <a-form-model-item class="itemModel-multi" prop="verifyDeliverableType">
+                <a-tree-select
+                  tree-node-filter-prop="title"
+                  v-model="formInline.verifyDeliverableType"
+                  :maxTagCount="1"
+                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                  class="box-input"
+                  style="width: 100%"
+                  @change="verifyDeliverableTypeChange"
+                  :disabled="isEditVerifi(this.formInline)"
+                  :tree-data="DeliverableTreeList"
+                  tree-checkable
+                  :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
+                />
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="verifyDeliverableTemplate">
+                <a-button type="primary" class="button-text"
+                          @click="clickButtonToUpload('verifyDeliverableTemplate')">
+                  {{ (formInline.verifyDeliverableTemplate === 'null' || formInline.verifyDeliverableTemplate === '' ||
+                  formInline.verifyDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                  }}
+                </a-button>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24" v-if="formInline.verifyDutyDueDate">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('deadlineForResponsibilityConfirmation')">{{$t('deadlineForResponsibilityConfirmation')}}</span>
+              </div>
+              <a-form-model-item class="itemModel">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+$t('deadlineForResponsibilityConfirmation')"
+                               @change="dateChange({db_field_name:'verifyDutyDueDate'})"
+                               format="YYYY-MM-DD"
+                               :disabled="true"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.verifyDutyDueDate"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </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('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
+              </div>
+              <a-form-model-item class="itemModel-text" :prop="'verifyRemark'">
+                <a-textarea
+                  style="width: 100%"
+                  :disabled="isEditVerifi(this.formInline)"
+                  :placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"
+                  v-model="formInline.verifyRemark" :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <div class="header-text" v-if="rejectCauseList && rejectCauseList.length > 0 && formInline.roleCodeIndex == 0">
+          {{$t('reasonForReturnOfDesignCompliance')}}
+        </div>
+
+        <div v-if="rejectCauseList && rejectCauseList.length > 0 && formInline.roleCodeIndex == 0"
+             v-for="(item,index) in rejectCauseList">
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                        <span class="title-text-text"
+                              :title="$t('rejectedBy')">{{$t('rejectedBy')}}</span>
+                </div>
+                <div class="itemModel-reject">
+                  {{item.createBy ? item.createBy : '--'}}
+                </div>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                        <span class="title-text-text"
+                              :title="$t('rejectionTime')">{{$t('rejectionTime')}}</span>
+                </div>
+                <div class="itemModel-reject">
+                  {{item.rejectTime ? item.rejectTime : '--'}}
+                </div>
+              </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('rejectReason')">{{$t('rejectReason')}}</span>
+                </div>
+                <div class="itemModel-reject">
+                  {{item.rejectCause ? item.rejectCause : '--'}}
+                </div>
+              </div>
+            </a-col>
+          </a-row>
+        </div>
+
+        <div class="header-text"
+             v-if="rejectCauseListOne && rejectCauseListOne.length > 0 && formInline.roleCodeIndex == 0">
+          {{$t('verifyComplianceConfirmReturnReason')}}
+        </div>
+
+        <div v-if="rejectCauseListOne && rejectCauseListOne.length > 0 && formInline.roleCodeIndex == 0"
+             v-for="(item,index) in rejectCauseListOne">
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                        <span class="title-text-text"
+                              :title="$t('rejectedBy')">{{$t('rejectedBy')}}</span>
+                </div>
+                <div class="itemModel-reject">
+                  {{item.createBy ? item.createBy : '--'}}
+                </div>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                        <span class="title-text-text"
+                              :title="$t('rejectionTime')">{{$t('rejectionTime')}}</span>
+                </div>
+                <div class="itemModel-reject">
+                  {{item.rejectTime ? item.rejectTime : '--'}}
+                </div>
+              </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('rejectReason')">{{$t('rejectReason')}}</span>
+                </div>
+                <div class="itemModel-reject">
+                  {{item.rejectCause ? item.rejectCause : '--'}}
+                </div>
+              </div>
+            </a-col>
+          </a-row>
+        </div>
+      </a-form-model>
+    </a-spin>
+    <div class="drawer-bootom-button">
+      <a-button style="margin-right: 8px" @click="handleCancel">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit" v-if="formInline.roleCodeIndex == 0" type="primary" :loading="confirmLoading">
+        {{$t('submit')}}
+      </a-button>
+      <a-button @click="handleSubmit" v-else type="primary" :loading="confirmLoading">{{$t('confirm')}}</a-button>
+    </div>
+    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
+  </a-drawer>
+</template>
+
+<script>
+  import Standardselection from '@/components/Standardselection/index'
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
+  import { getAction, postAction, putAction } from '@/api/manage'
+  import uploadFile from '@/components/uploadFile/file'
+  import moment from 'moment'
+  import { mapGetters } from 'vuex'
+
+  export default {
+    name: 'listEditModel',
+    components: {
+      Standardselection,
+      PersonnelSelection,
+      uploadFile
+    },
+    props: ['url'],
+    data() {
+      return {
+        visible: false,
+        confirmLoading: false,
+        rejectCauseListOne: [],
+        firstLevelDutyTerritoryList: [],
+        rules: {
+          attestationRank: [
+            {
+              required: true,
+              message: this.$t('certificationLevel') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          dutyTerritory: [
+            {
+              required: true,
+              message: this.$t('areaOfResponsibility') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          dutyDepart: [
+            {
+              required: true,
+              message: this.$t('statisticalNodes') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          homologationEngineerId: [
+            {
+              required: true,
+              message: this.$t('certifiedEngineer') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          regulationOwnerId: [
+            {
+              required: true,
+              message: this.$t('regulatoryEngineer') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          engineeringInterfacePerson: [
+            {
+              required: true,
+              message: this.$t('engineeringInterfacePerson') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          subtitle: [
+            {
+              max: 300,
+              message: this.$t('subtitle') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          wvtaId: [
+            {
+              max: 100,
+              message: 'WVTA ID' + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          remark: [
+            {
+              max: 1000,
+              message: this.$t('remarks') + this.$t('cannotExceed') + 1000 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          applicableSupplement: [
+            {
+              max: 100,
+              message: this.$t('applicableSupplement') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          designRemark: [
+            {
+              max: 300,
+              message: this.$t('descriptionDeliverables') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          verifyRemark: [
+            {
+              max: 300,
+              message: this.$t('descriptionDeliverables') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          prehomoRemark: [
+            {
+              max: 300,
+              message: this.$t('descriptionDeliverables') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          designDeliverableType: [
+            {
+              required: true,
+              message: this.$t('typeOfDeliverables') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          verifyDeliverableType: [
+            {
+              required: true,
+              message: this.$t('typeOfDeliverables') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ]
+        },
+        formInline: {
+          verifyDeliverableType: [],
+          designDeliverableType: []
+        },
+        regulatoryEngineerList: [],
+        engineeringInterfacePersonList: [],
+        certificationEngineerList: [],
+        designInitiatorList: [],
+        designDutyList: [],
+        verifyInitiatorList: [],
+        verifyDutyList: [],
+        prehomoDutyList: [],
+        disabled: false,
+        designInitiatorDisabled: false,
+        designDutyIdDisabled: false,
+        prehomoInitiatorIdDisabled: false,
+        prehomoDutyIdDisabled: false,
+        verifyInitiatorIdDisabled: false,
+        DeliverableTreeList: [],
+        userInfoQuery: {},
+        rejectCauseList: [],
+        dutyTerritoryList: []
+      }
+    },
+    mounted() {
+      this.getDeliverableTree()
+      this.getFirstLevelDutyTerritory()
+      this.userInfoQuery = this.userInfo()
+    },
+    methods: {
+      getFirstLevelDutyTerritory() {
+        getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
+          if (res.success) {
+            this.firstLevelDutyTerritoryList = res.result
+          } else {
+            this.firstLevelDutyTerritoryList = []
+          }
+        })
+      },
+      isEdit(val) {
+        // if (val.designFlowStatus == 'Task to be confirmed' || val.designFlowStatus == 'Results to be submitted' ||
+        //   val.designFlowStatus == 'Results to be reviewed') {
+        //   return true
+        // } else {
+        //   return false
+        // }
+        if (val.roleCodeIndex == '0' || val.roleCodeIndex == '1') {
+          return false
+        } else {
+          return true
+        }
+      },
+      isEditVerifi(val) {
+        // if (val.verifyFlowStatus == 'Task to be confirmed' || val.verifyFlowStatus == 'Results to be submitted' ||
+        //   val.verifyFlowStatus == 'Results to be reviewed') {
+        //   return true
+        // } else {
+        //   return false
+        // }
+        if (val.roleCodeIndex == '0' || val.roleCodeIndex == '1') {
+          return false
+        } else {
+          return true
+        }
+      },
+      ...mapGetters(['userInfo']),
+      getRejectCause(id) {
+        let query = {
+          projectLawsInventoryId: id
+        }
+        getAction('/project/projectLawsInventoryRejectCauseEO/list', query).then((res) => {
+          if (res.success) {
+            this.rejectCauseList = []
+            this.rejectCauseListOne = []
+            if (res.result && res.result.length > 0) {
+              res.result.forEach(val => {
+                if (val.rejectType == '0') {
+                  this.rejectCauseList.push(val)
+                } else if (val.rejectType == '1') {
+                  this.rejectCauseListOne.push(val)
+                }
+              })
+            }
+          } else {
+            this.rejectCauseList = []
+            this.rejectCauseListOne = []
+          }
+        })
+      },
+      getDeliverableTree() {
+        getAction('/sys/category/getDeliverableTree', {}).then((res) => {
+          if (res.success) {
+            this.DeliverableTreeList = res.result
+          } else {
+            this.DeliverableTreeList = []
+          }
+        })
+      },
+      DutyDepartChange(event) {
+        this.formInline.dutyTerritory = []
+        this.formInline = { ...this.formInline }
+        this.getDutyTerritory(event.join(','))
+      },
+      getDutyTerritory(row) {
+        let query = {
+          dutyDepart: row
+        }
+        getAction('/sys/dict/getDutyTeryByDD', query).then((res) => {
+          if (res.success) {
+            this.dutyTerritoryList = res.result || []
+          } else {
+            this.dutyTerritoryList = []
+          }
+        })
+      },
+      dutyTerritoryChange(event) {
+        this.formInline.regulationOwnerId = undefined
+        this.formInline.engineeringInterfacePerson = undefined
+        this.formInline.homologationEngineerId = undefined
+        this.formInline.designInitiatorId = undefined
+        this.formInline.prehomoInitiatorId = undefined
+        this.formInline.verifyInitiatorId = undefined
+        this.queryPersonByProject(event.join(','))
+      },
+
+      queryPersonByProject(row) {
+        let dutyTerritory = ''
+        if (row.dutyTerritory) {
+          dutyTerritory = row.dutyTerritory.join(',')
+        } else {
+          dutyTerritory = row
+        }
+        let query = {
+          projectId: this.$route.query.id,
+          dutyTerritory: dutyTerritory
+        }
+        getAction(this.url.queryPersonByProject, query).then((res) => {
+          if (res.success) {
+            this.regulatoryEngineerList = res.result.lawEngineerList //法规工程师
+            this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList //工程接口人
+            this.certificationEngineerList = res.result.certificationEngineerList //认证工程师
+            if (row.dutyTerritory && row.dutyTerritory.length > 0) {
+              let _this = this
+              this.getProject(row, res, function() {
+                _this.getData(row, res)
+              })
+            } else {
+              this.getProject({}, res, function() {
+
+              })
+            }
+          }
+        })
+      },
+      getProject(row, res, callback) {
+        this.designInitiatorList = res.result.allPersonList || []
+        this.designDutyList = res.result.allPersonList || []
+        this.prehomoDutyList = res.result.allPersonList || []
+        this.verifyInitiatorList = res.result.allPersonList || []
+        this.verifyDutyList = res.result.allPersonList || []
+        callback()
+      },
+      getData(row, res) {
+        //清空下拉框选中没有的数据
+        if (!(this.designInitiatorList.some(val => val.value == row.designInitiatorId))) {
+          row.designInitiatorId = undefined
+        }
+        if (!(this.verifyInitiatorList.some(val => val.value == row.verifyInitiatorId))) {
+          row.verifyInitiatorId = undefined
+        }
+        if (!(this.regulatoryEngineerList.some(val => val.value == row.regulationOwnerId))) {
+          row.regulationOwnerId = undefined
+        }
+        if (!(this.engineeringInterfacePersonList.some(val => val.value == row.engineeringInterfacePerson))) {
+          row.engineeringInterfacePerson = undefined
+        }
+        if (!(this.certificationEngineerList.some(val => val.value == row.homologationEngineerId))) {
+          row.homologationEngineerId = undefined
+        }
+        this.$nextTick(() => {
+          this.formInline = row
+          this.formInline = { ...this.formInline }
+          this.$nextTick(() => {
+            this.$refs.ruleForm.clearValidate()
+          })
+        })
+      },
+      editModel(item) {
+        this.visible = true
+        this.dutyTerritoryList = []
+        this.regulatoryEngineerList = []
+        this.engineeringInterfacePersonList = []
+        this.certificationEngineerList = []
+        this.designInitiatorList = []
+        this.designDutyList = []
+        this.verifyInitiatorList = []
+        this.verifyDutyList = []
+        this.prehomoDutyList = []
+        this.getDeliverableTree()
+        item.designDeliverableType = item.designDeliverableType ? item.designDeliverableType.split(',') : []
+        item.prehomoDeliverableType = item.prehomoDeliverableType ? item.prehomoDeliverableType.split(',') : []
+        item.verifyDeliverableType = item.verifyDeliverableType ? item.verifyDeliverableType.split(',') : []
+        item.dutyDepart = item.dutyDepart ? item.dutyDepart.split(',') : []
+        item.dutyTerritory = item.dutyTerritory ? item.dutyTerritory.split(',') : []
+        this.getRejectCause(item.id)
+        if (item.dutyDepart && item.dutyDepart.length > 0) {
+          this.getDutyTerritory(item.dutyDepart.join(','))
+        }
+        console.log(item.dutyTerritory)
+        if (item.dutyTerritory && item.dutyTerritory.length > 0) {
+          this.queryPersonByProject(item)
+        } else {
+          this.formInline = item
+          this.formInline = { ...this.formInline }
+        }
+        this.$nextTick(() => {
+          this.$refs.ruleForm.clearValidate()
+        })
+      },
+      clickButtonToUpload(item) {
+        let isTrue = false
+        if (item == 'designDeliverableTemplate') {
+          isTrue = this.isEdit(this.formInline)
+        } else if (item == 'verifyDeliverableTemplate') {
+          isTrue = this.isEditVerifi(this.formInline)
+        }
+        this.$refs.uploadFile.perentHandleFunc()
+        this.$refs.uploadFile.visible = true
+        this.$refs.uploadFile.disabled = isTrue
+        this.uploadName = item
+        getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
+          if (res.success) {
+            this.$refs.uploadFile.perentHandleFunc(res.result)
+          } else {
+            this.$refs.uploadFile.perentHandleFunc()
+          }
+        })
+      },
+      /** 上传文件的回调 */
+      uploadSuccess(data) {
+        let attIdList = []
+        if (data && data.length > 0) {
+          data.map(item => {
+            attIdList.push(item.id || data.name)
+          })
+        }
+        /** 赋值给当前对应的表单文件 */
+        this.formInline[this.uploadName] = attIdList.join(',')
+        this.formInline = { ...this.formInline }
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      handleSubmit() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            let formInline = JSON.parse(JSON.stringify(this.formInline))
+            Object.keys(formInline).forEach(res => {
+              if (formInline[res] && formInline[res] instanceof Array) {
+                formInline[res] = formInline[res].join(',')
+              }
+            })
+            if (!formInline.verifyDutyId) {
+              formInline.verifyDutyId = ''
+            }
+            if (!formInline.regulationOwnerId) {
+              formInline.regulationOwnerId = ''
+            }
+            if (!formInline.engineeringInterfacePerson) {
+              formInline.engineeringInterfacePerson = ''
+            }
+            if (!formInline.homologationEngineerId) {
+              formInline.homologationEngineerId = ''
+            }
+            if (!formInline.designInitiatorId) {
+              formInline.designInitiatorId = ''
+            }
+            if (!formInline.designDutyId) {
+              formInline.designDutyId = ''
+            }
+            if (!formInline.prehomoInitiatorId) {
+              formInline.prehomoInitiatorId = ''
+            }
+            if (!formInline.verifyInitiatorId) {
+              formInline.verifyInitiatorId = ''
+            }
+            this.confirmLoading = true
+            putAction(this.url.editModel, formInline).then((res) => {
+              if (res.success) {
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.visible = false
+                this.confirmLoading = false
+                this.$emit('editModelList')
+              } else {
+                this.$message.warning(this.$t('operationFailed'))
+                this.confirmLoading = false
+              }
+            })
+          }
+        })
+
+      },
+      handleInput(value) {
+        this.$nextTick(() => {
+          this.formInline = { ...this.formInline }
+          this.$refs.ruleForm.validateField([value])
+        })
+      },
+      dateChange(item) {
+        this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
+      },
+      PersonnelSelectionChange(value, id) {
+        this.formInline[value] = id
+        this.formInline = { ...this.formInline }
+      },
+      designDeliverableTypeChange() {
+
+      },
+      verifyDeliverableTypeChange() {
+
+      }
+    }
+  }
+</script>
+<style>
+  .formAdd .ant-form-item-label {
+    width: 130px;
+  }
+
+  .formAdd .ant-form-item-control-wrapper {
+    display: inline-block;
+    width: 100%;
+  }
+
+  .itemModel .ant-form-item-control-wrapper {
+    width: 100%;
+  }
+
+  .itemModel-text .ant-form-item-control-wrapper {
+    width: 100% !important;
+  }
+
+  .box-input .ant-select-selection--single {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple .ant-select-selection__rendered > ul > li {
+    margin-top: 6px;
+  }
+
+  .box-input .ant-calendar-picker {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-calendar-picker-input {
+    height: 38px;
+  }
+
+  .box-input .ant-input-number-input-wrap {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .ant-input-disabled {
+    color: rgba(0, 0, 0, 0.65) !important;
+  }
+
+  .ant-select-disabled {
+    color: rgba(0, 0, 0, 0.65) !important;
+  }
+</style>
+<style scoped>
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    /*align-items: center;*/
+  }
+
+  .title-text {
+    width: 114px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 48px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+    height: 40px;
+    margin-bottom: 24px;
+  }
+
+  .itemModel-text {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .itemModel-reject {
+    width: calc(100% - 130px);
+    display: inline-block;
+    font-size: 16px;
+    word-break: break-all;
+    color: #040B29;
+    padding-top: 11px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .header-text {
+    font-size: 16px;
+    font-weight: bold;
+    margin-left: 15px;
+    /*border-bottom: 1px #d9d9d9 dashed;*/
+    height: 30px;
+    margin-bottom: 30px;
+  }
+
+  .formAdd {
+    margin-bottom: 40px;
+  }
+
+  .button-text {
+    height: 38px;
+    width: calc(100% - 100px);
+    line-height: 38px;
+    background: #fff;
+    border: 1px #00B3BE solid;
+    color: #00B3BE;
+  }
+
+  .button-text-text {
+    position: absolute;
+    right: -10px;
+    top: -21px;
+    display: inline-block;
+    padding: 6px;
+    border-radius: 50%;
+    background: red;
+    text-align: center;
+    line-height: 6px;
+    color: #fff;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    z-index: 100;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  ::v-deep .ant-form-item-with-help {
+    margin-bottom: 25px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
new file mode 100644
index 000000000..8ad6ad738
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
@@ -0,0 +1,3776 @@
+<template>
+  <a-card :bordered="false">
+    <!--    <div class="header-text">-->
+    <!--      {{ $t('DocumentStandard') }}-->
+    <!--    </div>-->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('standard')">
+                <span>{{ $t('standard') }}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                       v-model="queryParam.serialNumber"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('statisticalNodes')">
+                <span>{{ $t('statisticalNodes') }}</span>
+              </div>
+              <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
+                        allowClear
+                        show-search
+                        class="box-input"
+                        optionFilterProp="label"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        v-model="queryParam.firstLevelDutyTerritory">
+                <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
+                                 :key="key"
+                                 :label="item.key"
+                                 :value="item.key">
+                               <span style="display: inline-block;width: 100%" :title=" item.key ">
+                                     {{ item.key }}
+                               </span>
+                </a-select-option>
+              </a-select>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('ProcessStatus')">
+                <span>{{ $t('ProcessStatus') }}</span>
+              </div>
+              <a-input-group class="box-input" compact>
+                <a-select v-model="selectModel" @change="selectModelChange" style="width: 80px">
+                  <a-select-option :value="'designFlowStatus'">
+                    {{$t('design')}}
+                  </a-select-option>
+                  <a-select-option :value="'verifyFlowStatus'">
+                    {{$t('verify')}}
+                  </a-select-option>
+                </a-select>
+                <a-select :placeholder="$t('PleaseSelect')+$t('ProcessStatus')"
+                          allowClear
+                          show-search
+                          style="width: calc(100% - 80px);"
+                          mode="multiple"
+                          optionFilterProp="label"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          v-model="queryParam[selectModel]">
+                  <a-select-option v-for="(item, key) in listOptions"
+                                   :key="item.key"
+                                   :label="item.label"
+                                   :value="item.value">
+                               <span style="display: inline-block;width: 100%" :title=" item.label ">
+                                     {{ item.label }}
+                               </span>
+                  </a-select-option>
+                </a-select>
+              </a-input-group>
+            </div>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('areaOfResponsibility')">
+                  <span>{{ $t('areaOfResponsibility') }}</span>
+                </div>
+                <j-multi-select-tag class="box-input" v-model="queryParam.dutyTerritory"
+                                    :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                    :type="'select'"
+                                    :triggerChange="false" :dictCode="'duty_territory'"/>
+              </div>
+            </a-col>
+          </template>
+          <!--          <template v-if="toggleSearchStatus">-->
+          <!--            <a-col :md="6" :sm="8">-->
+          <!--              <div class="box-title-text">-->
+          <!--                <div class="title-text" :title="$t('verifyProcessStatus')">-->
+          <!--                  <span>{{ $t('verifyProcessStatus') }}</span>-->
+          <!--                </div>-->
+          <!--                <a-select :placeholder="$t('PleaseSelect')+$t('verifyProcessStatus')"-->
+          <!--                          class="box-input"-->
+          <!--                          allowClear-->
+          <!--                          :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+          <!--                          v-model="queryParam.verifyFlowStatus">-->
+          <!--                  <a-select-option v-for="(item, key) in taskOptions"-->
+          <!--                                   :key="item.key"-->
+          <!--                                   :value="item.value">-->
+          <!--                               <span style="display: inline-block;width: 100%" :title=" item.label ">-->
+          <!--                                     {{ item.label }}-->
+          <!--                               </span>-->
+          <!--                  </a-select-option>-->
+          <!--                </a-select>-->
+          <!--              </div>-->
+          <!--            </a-col>-->
+          <!--          </template>-->
+          <span style="float: right;overflow: hidden;margin-right: 11px;" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                 <a @click="handleToggleSearch" :style="{ marginLeft: long == 'en-us'?'-6px':'8px' }">
+                                                                {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                                                                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                                                     </a>
+                    <a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }" @click="searchReset">{{$t('reset')}}</a-button>
+                    <a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                    <globalAdvancedQuery ref="globalAdvancedQueryRef"
+                                         @handleSuperQuery="handleSuperQuery"
+                                         :fieldList="fieldList"/>
+
+               </a-col>
+            </span>
+        </a-row>
+      </a-form>
+    </div>
+    <div class="table-operator"
+         style="overflow:hidden;margin-bottom: 20px">
+      <div style="float: left;margin-bottom: 0px;margin-left: 20px">
+        <!--        调取-->
+        <!--        <div @click="profileClick" class="operator-text">-->
+        <!--          <a-icon type="profile"/>-->
+        <!--          重置流程（数据迁移）-->
+        <!--        </div>-->
+        <!--        调取-->
+        <div @click="transferClick" class="operator-text" v-if="this.roleSwitchingCode == '0'">
+          <a-icon type="profile"/>
+          {{ $t('Transfer') }}
+        </div>
+        <!--        带入相关人员-->
+        <div class="operator-text" @click="bringInRelevantPersonnelClick" v-if="this.roleSwitchingCode == '0'">
+          <a-icon type="user"/>
+          {{ $t('bringInRelevantPersonnel') }}
+        </div>
+        <!--        批量设置-->
+        <div class="operator-text" @click="batSettingClick"
+             v-if="this.roleSwitchingCode == '0' || this.roleSwitchingCode == '1'">
+          <a-icon type="setting"/>
+          {{ $t('BatchSetting') }}
+        </div>
+        <!--              修改操作人-->
+        <div class="operator-text" v-if="this.roleSwitchingCode == '1'"
+             @click="modifyOperatorClick('法规')">
+          <a-icon type="export" :rotate="-90"/>
+          {{ $t('modifyOperator') }}
+        </div>
+        <!--              复制-->
+        <div @click="copyClick('lawsInventoryRegulationOwnerCopy')" v-if="this.roleSwitchingCode == '1'"
+             class="operator-text">
+          <a-icon type="copy"/>
+          {{ $t('copy') }}
+        </div>
+        <!--        列表设置-->
+        <!--        v-if="this.roleSwitchingCode == '0' || this.roleSwitchingCode == '1' || this.roleSwitchingCode == '13'"-->
+        <a-popconfirm :visible="customizevisible" overlayClassName="popconfirmmize"
+                      placement="bottomRight"
+        >
+          <template slot="title" id="popconfirmmize">
+            <div style="max-height:360px;overflow:scroll;overflow-x: auto;">
+              <a-checkbox
+                style="margin-bottom: 22px;"
+                v-if="customizeList && customizeList.length"
+                v-model="checkAll"
+                :indeterminate="indeterminate"
+                @change="onCheckAllChange"
+              >{{ $t('selectAll') }}
+              </a-checkbox>
+              <a-checkbox-group @change="onChange" v-model="checkedList" class="customize-text">
+                <a-checkbox class="customize-text-title" :disabled="item.disabled" v-for="(item, key) in customizeList"
+                            :key="key" :value="item.field">{{ item.name }}
+                </a-checkbox>
+              </a-checkbox-group>
+              <div class="drawer-bootom-button">
+                <a-button @click="cancel" style="margin-right: 16px">{{ $t('cancel') }}</a-button>
+                <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{ $t('determine') }}
+                </a-button>
+              </div>
+            </div>
+          </template>
+          <div class="operator-text" style="position: relative" @click="getcustomize">
+            <a-icon type="setting"/>
+            {{ $t('customize') }}
+          </div>
+        </a-popconfirm>
+        <!--              复制-->
+        <div @click="toResubmitClick()" v-if="this.roleSwitchingCode == '31'"
+             class="operator-text">
+          <a-icon type="copy"/>
+          {{ $t('toResubmit') }}
+        </div>
+        <!--        更多-->
+        <a-popconfirm overlayClassName="popconfirm" placement="bottomRight" v-if="this.roleSwitchingCode == '0'">
+          <template slot="title" id="popconfirm">
+            <div>
+              <!--              添加-->
+              <div @click="handleAdd" class="operator-text-title">
+                <a-icon type="plus"/>
+                {{ $t('add') }}
+              </div>
+              <!--              复制-->
+              <div @click="copyClick('lawsInventoryStudioCopy')" class="operator-text-title">
+                <a-icon type="copy"/>
+                {{ $t('copy') }}
+              </div>
+              <!--              批量删除-->
+              <div @click="handleDel" class="operator-text-title">
+                <a-icon type="delete"/>
+                {{ $t('BatchDelete') }}
+              </div>
+              <!--              模板下载-->
+              <div @click="handleModule" class="operator-text-title">
+                <a-icon type="download"/>
+                {{ $t('templateDownload') }}
+              </div>
+              <!--              导入-->
+              <div class="operator-text-title">
+                <ImportFile :url="url" :projectLibraryId=$route.query.id :isTrue="true" :accept="'.zip'"
+                            @getList="getPersonnelList"/>
+              </div>
+              <!--              导出-->
+              <div @click="handleExport" v-has="'projectLawsInventory:exportData'" class="operator-text-title">
+                <a-icon type="export" :rotate="-90"/>
+                {{ $t('export') }}
+              </div>
+              <!--              定版-->
+              <div class="operator-text-title" @click="fixedPlateClick">
+                <a-icon type="pushpin"/>
+                {{ $t('fixedPlate') }}
+              </div>
+              <!--              生成合规报告-->
+              <div class="operator-text-title" @click="ExportReportClick">
+                <a-icon type="export" :rotate="-90"/>
+                {{ $t('compliancereport') }}
+              </div>
+              <!--              修改操作人-->
+              <div class="operator-text-title" @click="modifyOperatorClick('studio')">
+                <a-icon type="export" :rotate="-90"/>
+                {{ $t('modifyOperator') }}
+              </div>
+              <!--              <div class="operator-text-title" @click="batSettingClick">-->
+              <!--                <a-icon type="setting" />-->
+              <!--                {{ $t('batchSettingInformation') }}-->
+              <!--              </div>-->
+              <!--              <div class="operator-text-title" @click="batchSettingPersonnelClick">-->
+              <!--                <a-icon type="setting" />-->
+              <!--                {{ $t('batchSettingPersonnel') }}-->
+              <!--              </div>-->
+              <!--              流程重置-->
+              <div class="operator-text-title" @click="alterationClick">
+                <a-icon type="file-search"/>
+                {{ $t('processReset') }}
+              </div>
+            </div>
+          </template>
+          <div class="operator-text" style="position: relative">
+            <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
+          </div>
+        </a-popconfirm>
+      </div>
+      <div style="float: right;margin-top: 1px;;margin-right: 20px">
+
+        <!--        <div class="operator-text" @click="customizeClick">-->
+        <!--          <a-icon type="setting"/>-->
+        <!--          {{ $t('customize') }}-->
+        <!--        </div>-->
+        <div @click="handleExport" v-has="'projectLawsInventory:exportData'"
+             v-if="this.roleSwitchingCode != '0'"
+             class="operator-text">
+          <a-icon type="export" :rotate="-90"/>
+          {{ $t('export') }}
+        </div>
+        <!--        发布-->
+        <div class="operator-text" @click="initiateListConfirmationcClick('清单')"
+             v-if="this.roleSwitchingCode == '0'">
+          <a-icon type="solution"/>
+          {{ $t('release') }}
+        </div>
+        <!--        撤回-->
+        <div class="operator-text" @click="withdrawnClick" v-if="this.roleSwitchingCode == '0'">
+          <a-icon type="rollback"/>
+          {{ $t('withdraw') }}
+        </div>
+        <!--        发起任务-->
+        <div class="operator-text" @click="submitOrSendBackClick(0)" v-if="this.roleSwitchingCode == '1'">
+          <a-icon type="check-circle"/>
+          {{ $t('initiateTask') }}
+        </div>
+        <!--        退回-->
+        <div class="operator-text" @click="submitOrSendBackClick(1)" v-if="this.roleSwitchingCode == '1'">
+          <a-icon type="close-circle"/>
+          {{ $t('sendBack') }}
+        </div>
+        <!--        催办-->
+        <div class="operator-text" @click="questionClick"
+             v-if="this.roleSwitchingCode == '0' || this.roleSwitchingCode == '1' || this.roleSwitchingCode == '30'">
+          <a-icon type="sound"/>
+          {{ $t('question') }}
+        </div>
+      </div>
+    </div>
+    <div style="width: 100%">
+      <a-table
+        ref="table"
+        :components="drag(columns,'columnsAll')"
+        class="customizetable"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: '100%',y:'calc(100vh - 300px)'}"
+        rowKey="id"
+        :data-source="dataSource"
+        @change="tableOnChange"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :columns="columns"
+      >
+        <span slot="operation" slot-scope="text,record">
+              <a class="text-operation"
+                 v-if="roleSwitchingCode == 0 || roleSwitchingCode == 1"
+                 @click="edit(record)">
+                {{ $t('edit') }}
+              </a>
+          <!--              <a class="text-operation"-->
+          <!--                 v-else-->
+          <!--                 @click="viewClick(record)">-->
+          <!--                {{ $t('view') }}-->
+          <!--              </a>-->
+                        <a class="text-operation"
+                           v-if="roleSwitchingCode == 0"
+                           @click="deleteLib(record)">
+                          {{ $t('deleteLib') }}
+                        </a>
+              <a class="text-operation"
+                 @click="resultReportedClick(record)">
+                {{ $t('resultReported') }}
+              </a>
+
+        </span>
+        <!--        <span slot="operationOne" slot-scope="text,record">-->
+        <!--          <a class="text-operation"-->
+        <!--             @click="viewClick(record)">-->
+        <!--                {{ $t('view') }}-->
+        <!--          </a>-->
+        <!--        </span>-->
+        <span slot="titleName" slot-scope="text,record" :title="text">
+              <span class="textName">
+                 {{ text }}
+              </span>
+        </span>
+
+        <span slot="standard" slot-scope="text,record" :title="text">
+              <a class="textName" @click="standardClick(record)">
+                 {{ text }}
+              </a>
+        </span>
+
+        <span slot="verifyDeliverableTemplateName" slot-scope="text,result">
+                <span class="viewFile"
+                      @click="viewFileClick(result.verifyDeliverableTemplate)"
+                      v-if="result.verifyDeliverableTemplate">
+                {{$t('viewFile')}}
+              </span>
+              <span v-else>--</span>
+        </span>
+        <span slot="designDeliverableTemplate" slot-scope="text,result">
+                <span class="viewFile"
+                      @click="viewFileClick(result.designDeliverableTemplate)"
+                      v-if="result.designDeliverableTemplate">
+                {{$t('viewFile')}}
+              </span>
+              <span v-else>--</span>
+        </span>
+        <span slot="designFlowStatusName" slot-scope="text,result">
+           <span v-if="result.designFlowStatus == 'List to be released' ||
+                       result.designFlowStatus == 'Regulatory engineer returns' ||
+                       result.designFlowStatus == 'List to be checked'"
+                 :title="text">
+              {{text}}
+           </span>
+           <a v-else @click="designFlowStatusClick(result,$t('designComplianceProcess'))"
+              :title="text">{{text}}</a>
+        </span>
+        <span slot="verifyFlowStatusName" slot-scope="text,result">
+          <span v-if="result.verifyFlowStatus == 'List to be released' ||
+                      result.verifyFlowStatus == 'Regulatory engineer returns' ||
+                      result.verifyFlowStatus == 'List to be checked'"
+                :title="text">
+              {{text}}
+           </span>
+           <a v-else @click="designFlowStatusClick(result,$t('validationComplianceProcess'))"
+              :title="text">{{text}}</a>
+        </span>
+      </a-table>
+      <div class="page" v-if="dataSource.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :pageSizeOptions="['50','100','200','300']"
+          :current="pageNo"
+          @change="onChangeSize"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+      <!--      <div class="buttom-box" v-if="dataSource && dataSource.length > 0">-->
+      <!--        {{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }}-->
+      <!--      </div>-->
+    </div>
+    <listAddModel :url="url" @addModelList="addModelList" ref="addModelRef"/>
+    <listEditModel :url="url" @editModelList="addModelList" ref="editModelRef"/>
+    <batSetting :url="url" @batSettingList="addModelList" ref="batSettingRef"/>
+    <transferList :url="url" @transferListForm="transferListForm" ref="transferListRef"/>
+    <customizeList :url="url" @customizeListForm="customizeListForm" ref="customizeListRef"/>
+    <transferListvirtal :url="url" @transferListFormHomo="transferListFormHomo" ref="transferListvirtalRef"/>
+    <fixedPlate @fixedPlateForm="addModelList" ref="fixedPlateRef"/>
+    <a-modal
+      :title="listTitle"
+      :width="timeName == '任务' ? 600:500"
+      :visible="visible"
+      :confirm-loading="confirmLoading"
+      :maskClosable="false"
+      @ok="handleOk"
+      @cancel="handleCancel"
+    >
+      <a-spin :spinning="confirmLoading">
+        <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+          <a-row :gutter="24" v-if="this.timeName == '清单'">
+            <a-col :span="24">
+              <div class="box-title-text-index">
+                <div class="title-text-index">
+                  <span class="Required">*</span>
+                  <span class="title-text-text"
+                        :title="$t('TaskCutOffTime')">{{ $t('TaskCutOffTime') }}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="inventoryAffirmDueDate">
+                  <a-date-picker class="box-input"
+                                 :placeholder="$t('PleaseSelect')+$t('TaskCutOffTime')"
+                                 @change="dateChange({db_field_name:'inventoryAffirmDueDate'})"
+                                 format="YYYY-MM-DD"
+                                 :disabledDate="disabledDate"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 v-model="formInline.inventoryAffirmDueDate"
+                                 style="width: 100%"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24" v-if="this.timeName == '任务' && isDesignCompliance">
+            <a-col :span="24">
+              <div class="box-title-text-index">
+                <div class="title-text-index" style="width: 200px">
+                  <span class="Required">*</span>
+                  <span class="title-text-text"
+                        :title="$t('deadlineForConfirmationDesignComplianceResponsibility')">
+                    {{ $t('deadlineForConfirmationDesignComplianceResponsibility') }}
+                  </span>
+                </div>
+                <a-form-model-item class="itemModel" style="width: calc(100% - 220px)" prop="designDutyDueDate">
+                  <a-date-picker class="box-input"
+                                 :placeholder="$t('PleaseSelect')+$t('deadlineForConfirmationDesignComplianceResponsibility')"
+                                 @change="dateChange({db_field_name:'designDutyDueDate'})"
+                                 format="YYYY-MM-DD"
+                                 :disabledDate="disabledDate"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 v-model="formInline.designDutyDueDate"
+                                 style="width: 100%"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24" v-if="this.timeName == '任务' && isVerifyingCompliance">
+            <a-col :span="24">
+              <div class="box-title-text-index">
+                <div class="title-text-index" style="width: 200px">
+                  <span class="Required">*</span>
+                  <span class="title-text-text"
+                        :title="$t('deadlineForVerifyingComplianceResponsibilityConfirmation')">
+                    {{ $t('deadlineForVerifyingComplianceResponsibilityConfirmation') }}
+                  </span>
+                </div>
+                <a-form-model-item class="itemModel" style="width: calc(100% - 220px)" prop="verifyDutyDueDate">
+                  <a-date-picker class="box-input"
+                                 :placeholder="$t('PleaseSelect')+$t('deadlineForVerifyingComplianceResponsibilityConfirmation')"
+                                 @change="dateChange({db_field_name:'verifyDutyDueDate'})"
+                                 format="YYYY-MM-DD"
+                                 :disabledDate="disabledDate"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 v-model="formInline.verifyDutyDueDate"
+                                 style="width: 100%"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+        </a-form-model>
+      </a-spin>
+    </a-modal>
+    <a-modal
+      :title="$t('reasonForReturn')"
+      :width="500"
+      :visible="visibleComment"
+      :confirm-loading="confirmLoadingComment"
+      :maskClosable="false"
+      @ok="handleOkComment"
+      @cancel="handleCancelComment"
+    >
+      <a-form-model :model="formInlineComment" class="formAdd" :rules="rulesComment" ref="ruleFormComment">
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text-index">
+              <div class="title-text-Comment">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('reasonForReturn')">{{ $t('reasonForReturn') }}</span>
+              </div>
+              <a-form-model-item class="itemModelComment" :prop="'commentContent'">
+                <a-textarea
+                  style="width: 100%"
+                  :placeholder="$t('PleaseEnter')+$t('reasonForReturn')"
+                  :disabled="false"
+                  v-model="formInlineComment.commentContent" :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-modal>
+    <!--    <a-modal-->
+    <!--      :title="$t('roleSwitching')"-->
+    <!--      :width="500"-->
+    <!--      :visible="visibleRoleSwitching"-->
+    <!--      :confirm-loading="confirmLoadingRoleSwitching"-->
+    <!--      :maskClosable="false"-->
+    <!--      @ok="handleOkRoleSwitching"-->
+    <!--      @cancel="handleCancelRoleSwitching"-->
+    <!--    >-->
+    <!--      <a-form-model :model="formInlineRoleSwitching" class="formAdd" :rules="rulesRoleSwitching"-->
+    <!--                    ref="ruleFormRoleSwitching">-->
+    <!--        <a-row :gutter="24">-->
+    <!--          <a-col :span="24">-->
+    <!--            <div class="box-title-text-index">-->
+    <!--              <div class="title-text-Comment">-->
+    <!--                <span class="Required">*</span>-->
+    <!--                <span class="title-text-text" :title="$t('roleSwitching')">{{ $t('roleSwitching') }}</span>-->
+    <!--              </div>-->
+    <!--              <a-form-model-item class="itemModelComment" :prop="'roleSwitchingCode'">-->
+    <!--                <a-select allowClear :placeholder="$t('pleaseSelect')+$t('roleSwitching')"-->
+    <!--                          v-model="formInlineRoleSwitching.roleSwitchingCode">-->
+    <!--                  &lt;!&ndash;    <a-select-option :value="null">{{$t('pleaseSelect')}}</a-select-option>&ndash;&gt;-->
+    <!--                  <a-select-option :value="item.roleCode" v-for="item in roleSwitchingList">-->
+    <!--                 <span class="itemOption-index" :title="item.roleName">-->
+    <!--                     {{ item.roleName }}-->
+    <!--                </span>-->
+    <!--                  </a-select-option>-->
+    <!--                </a-select>-->
+    <!--              </a-form-model-item>-->
+    <!--            </div>-->
+    <!--          </a-col>-->
+    <!--        </a-row>-->
+    <!--      </a-form-model>-->
+    <!--    </a-modal>-->
+    <a-modal
+      :title="$t('question')"
+      :width="500"
+      :visible="visibleQuestion"
+      :confirm-loading="confirmLoadingQuestion"
+      :maskClosable="false"
+      @ok="handleOkQuestion"
+      @cancel="handleCancelQuestion"
+    >
+      <a-form-model :model="formInlineQuestion" class="formAdd" :rules="rulesRoleQuestion"
+                    ref="ruleFormQuestion">
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text-index">
+              <div class="title-text-Comment">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('expeditionProcess')">{{ $t('expeditionProcess') }}</span>
+              </div>
+              <a-form-model-item class="itemModelComment" :prop="'questionStatus'">
+                <a-select allowClear
+                          :placeholder="$t('pleaseSelect')+$t('expeditionProcess')"
+                          mode="multiple"
+                          v-model="formInlineQuestion.expeditingType">
+                  <a-select-option :value="item.value" v-for="item in questionList">
+                 <span class="itemOption-index" :title="item.name">
+                     {{ item.name }}
+                </span>
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-modal>
+    <a-modal
+      :title="$t('processReset')"
+      :width="500"
+      :visible="visibleReset"
+      :confirm-loading="confirmLoadingReset"
+      :maskClosable="false"
+      @ok="handleOkReset"
+      @cancel="handleCancelReset"
+    >
+      <div class="noteConfirm">
+        {{$t('NoteConfirmTheChange')}}
+      </div>
+      <a-form-model :model="formInlineReset" class="formAdd" :rules="rulesRoleReset"
+                    ref="ruleFormReset">
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text-index">
+              <div class="title-text-Comment">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('processReset')">{{ $t('processReset') }}</span>
+              </div>
+              <a-form-model-item class="itemModelComment" :prop="'operateType'">
+                <a-select :placeholder="$t('pleaseSelect')+$t('theProcessThatNeedsToBeReset')"
+                          allowClear
+                          v-model="formInlineReset.operateType">
+                  <a-select-option :value="item.value" v-for="item in processResetList">
+                 <span class="itemOption-index" :title="item.name">
+                     {{ item.name }}
+                </span>
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-modal>
+    <a-modal
+      :title="fileTitle"
+      :width="600"
+      :visible="visibleFile"
+      :maskClosable="false"
+      @cancel="visibleFile = false"
+    >
+      <template slot="footer">
+        <a-button key="back" @click="visibleFile = false">
+          {{ $t('cancel') }}
+        </a-button>
+      </template>
+      <a-table
+        class="table"
+        :columns="columnsFile"
+        :pagination="false"
+        :scroll="{x:500,y: 400}"
+        :data-source="dataSourceFile"
+        :loading="loading"
+      >
+        <span slot="fileOperation" slot-scope="record">
+           <a class="text" @click="pdfPreview(record)"
+              :disabled="record.fileSuffix == '.pdf' || record.fileSuffix == '.docx' || record.fileSuffix == '.doc'
+              || record.fileSuffix == '.jpg' || record.fileSuffix == '.png' || record.fileSuffix == '.gif'|| record.fileSuffix == '.jpeg'
+              || record.fileSuffix == '.xlsx' || record.fileSuffix == '.xls' ? false : true">
+                {{ $t('See') }}
+          </a>
+          <a class="text" @click="download(record)">
+                {{ $t('download') }}
+          </a>
+        </span>
+      </a-table>
+    </a-modal>
+    <JLoading :loading="JLoading">{{ $t('dataLoading') }}</JLoading>
+    <JLoading :loading="JTextLoading">{{ $t('Submitting') }}</JLoading>
+    <resultReportedUpload @resultReportedUploadForm="addModelList" ref="resultReportedUploadRef"/>
+    <listOfRegulationsView ref="listOfRegulationsViewRef"/>
+    <batchSettingPersonnel :url="url" ref="batchSettingPersonnelRef" @batchSettingPersonnelForm="addModelList"/>
+    <viewFileModel ref="viewFileModelRef"/>
+    <designCompliance ref="designComplianceRef"/>
+    <modifyOperator ref="modifyOperatorRef" @modifyOperatorForm="modifyOperatorForm"/>
+    <toResubmitForm ref="toResubmitFormRef" @toResubmitFormForm="toResubmitFormForm"/>
+  </a-card>
+</template>
+
+<script>
+  import ImportFile from '@/components/ImportFile/index'
+  import designCompliance from '../../../toDoCenter/projectRegulationTasks/components/designCompliance'
+  import listAddModel from './listAddModel'
+  import listEditModel from './listEditModel'
+  import batSetting from './batSetting'
+  import transferList from './transferList'
+  import customizeList from './customizeList'
+  import transferListvirtal from './transferListvirtal'
+  import fixedPlate from './fixedPlateForm'
+  import resultReportedUpload from './resultReportedUpload'
+  import listOfRegulationsView from './listOfRegulationsView'
+  import viewFileModel from '@/components/viewFileModel/index'
+  import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
+  import modifyOperator from './modifyOperator'
+  import toResubmitForm from './toResubmitForm'
+  import batchSettingPersonnel from './batchSettingPersonnel'
+  import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+  import moment from 'moment'
+  import { mapGetters } from 'vuex'
+  import { Base64 } from 'js-base64'
+
+  export default {
+    name: 'listOfRegulations',
+    props: ['areaOfResponsibilityList'],
+    components: {
+      ImportFile,
+      listAddModel,
+      listEditModel,
+      batSetting,
+      transferList,
+      customizeList,
+      transferListvirtal,
+      globalAdvancedQuery,
+      fixedPlate,
+      resultReportedUpload,
+      batchSettingPersonnel,
+      listOfRegulationsView,
+      viewFileModel,
+      designCompliance,
+      modifyOperator,
+      toResubmitForm
+    },
+    mixins: [ResizeColumnProvide, ResizeHeader],
+    data() {
+      return {
+        toggleSearchStatus: false,
+        visibleQuestion: false,
+        visibleReset: false,
+        confirmLoadingReset: false,
+        confirmLoadingQuestion: false,
+        isDesignCompliance: false,
+        isVerifyingCompliance: false,
+        firstLevelDutyTerritoryList: [],
+        pageNo: 1,
+        pageSize: 50,
+        total: 0,
+        long:'',
+        roleSwitchingList: [],
+        formInlineQuestion: {},
+        formInlineReset: {},
+        rulesRoleReset: {
+          operateType: [
+            {
+              required: true,
+              message: this.$t('processReset') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ]
+        },
+        rulesRoleQuestion: {
+          expeditingType: [
+            {
+              required: true,
+              message: this.$t('expeditionProcess') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ]
+        },
+        questionList: [
+          {
+            value: 'lawsInventoryDesignExpediting',
+            name: this.$t('designComplianceProcess')
+          },
+          {
+            value: 'lawsInventoryVerifyExpediting',
+            name: this.$t('validationComplianceProcess')
+          }
+        ],
+        processResetList: [
+          {
+            value: 'lawsInventoryAllResetFlow',
+            name: this.$t('whole')
+          },
+          {
+            value: 'lawsInventoryDesignResetFlow',
+            name: this.$t('designComplianceProcess')
+          },
+          {
+            value: 'lawsInventoryVerifyResetFlow',
+            name: this.$t('validationComplianceProcess')
+          }
+        ],
+        listTitle: '',
+        orderBy: '1',
+        orderByField: '',
+        column: [
+          {
+            title: this.$t('standard'),
+            align: 'left',
+            dataIndex: 'serialNumber',
+            width: 180,
+            fixed: 'left',
+            sorter: true,
+            scopedSlots: { customRender: 'standard' }
+          },
+          {
+            title: this.$t('title'),
+            align: 'left',
+            dataIndex: 'title',
+            width: 180,
+            scopedSlots: { customRender: 'titleName' }
+          },
+          {
+            title: this.$t('subtitle'),
+            align: 'left',
+            dataIndex: 'subtitle',
+            ellipsis: true,
+            width: 180
+          },
+          {
+            title: this.$t('applicableSupplement'),
+            align: 'left',
+            ellipsis: true,
+            dataIndex: 'applicableSupplement',
+            width: 200
+          },
+          {
+            title: this.$t('certificationType'),
+            align: 'left',
+            ellipsis: true,
+            dataIndex: 'attestationType_dictText',
+            width: 180,
+            sorter: true
+          },
+          {
+            title: this.$t('certificationLevel'),
+            align: 'left',
+            ellipsis: true,
+            dataIndex: 'attestationRank_dictText',
+            width: 180,
+            sorter: true
+          },
+          {
+            title: this.$t('statisticalNodes'),
+            align: 'left',
+            ellipsis: true,
+            dataIndex: 'dutyDepart',
+            width: 120
+          },
+          {
+            title: this.$t('areaOfResponsibility'),
+            align: 'left',
+            ellipsis: true,
+            sorter: true,
+            dataIndex: 'dutyTerritory_dictText',
+            width: 120
+          },
+          {
+            title: this.$t('regulatoryEngineer'),
+            align: 'left',
+            ellipsis: true,
+            sorter: true,
+            dataIndex: 'regulationOwnerName',
+            width: 130
+          },
+          {
+            title: this.$t('engineeringInterfacePerson'),
+            align: 'left',
+            ellipsis: true,
+            sorter: true,
+            dataIndex: 'engineeringInterfacePersonName',
+            width: 130
+          },
+          {
+            title: this.$t('remarks'),
+            align: 'left',
+            dataIndex: 'remark',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('confirmationOfDesignConformity'),
+            align: 'left',
+            children: [
+              {
+                title: this.$t('personLiable'),
+                dataIndex: 'designDutyIdName',
+                align: 'left',
+                width: 110,
+                sorter: true,
+                ellipsis: true
+              },
+              {
+                title: this.$t('deliveryDate'),
+                dataIndex: 'designDueDate',
+                align: 'left',
+                ellipsis: true,
+                sorter: true,
+                width: 140
+              },
+              {
+                title: this.$t('ProcessStatus'),
+                dataIndex: 'designFlowStatusName',
+                align: 'left',
+                ellipsis: true,
+                width: 140,
+                scopedSlots: { customRender: 'designFlowStatusName' }
+              },
+              {
+                title: this.$t('typeOfDeliverables'),
+                dataIndex: 'designDeliverableTypeName',
+                align: 'left',
+                width: 180,
+                sorter: true,
+                ellipsis: true
+              },
+              {
+                title: this.$t('deliverableTemplate'),
+                dataIndex: 'designDeliverableTemplate',
+                align: 'left',
+                width: 180,
+                ellipsis: true,
+                scopedSlots: { customRender: 'designDeliverableTemplate' }
+              }
+            ]
+          },
+          {
+            title: this.$t('verificationAndConformityconfirmation'),
+            align: 'left',
+            children: [
+              {
+                title: this.$t('personLiable'),
+                dataIndex: 'verifyDutyIdName',
+                align: 'left',
+                width: 110,
+                ellipsis: true,
+                sorter: true
+              },
+              {
+                title: this.$t('deliveryDate'),
+                dataIndex: 'verifyDueDate',
+                align: 'left',
+                ellipsis: true,
+                width: 140,
+                sorter: true
+              },
+              {
+                title: this.$t('ProcessStatus'),
+                dataIndex: 'verifyFlowStatusName',
+                align: 'left',
+                ellipsis: true,
+                width: 180,
+                scopedSlots: { customRender: 'verifyFlowStatusName' }
+              },
+              {
+                title: this.$t('typeOfDeliverables'),
+                dataIndex: 'verifyDeliverableTypeName',
+                align: 'left',
+                width: 180,
+                sorter: true,
+                ellipsis: true
+              },
+              {
+                title: this.$t('deliverableTemplate'),
+                dataIndex: 'verifyDeliverableTemplate',
+                align: 'left',
+                width: 180,
+                ellipsis: true,
+                scopedSlots: { customRender: 'verifyDeliverableTemplateName' }
+              }
+            ]
+          }
+          // {
+          //   title: this.$t('operation'),
+          //   align: 'left',
+          //   fixed: 'right',
+          //   width: 260,
+          //   scopedSlots: { customRender: 'operation' }
+          // }
+        ],
+        columnsAll: [],
+        columnsFileAll: [
+          {
+            title: this.$t('deliverableTemplate'),
+            dataIndex: 'fileName',
+            align: 'left',
+            width: 260,
+            ellipsis: true
+          },
+          {
+            title: this.$t('resultReported'),
+            dataIndex: 'fileName',
+            align: 'left',
+            width: 260,
+            ellipsis: true
+          },
+          {
+            title: this.$t('operation'),
+            align: 'left',
+            width: 130,
+            scopedSlots: { customRender: 'fileOperation' }
+          }
+        ],
+        visibleFile: false,
+        JLoading: false,
+        isRoleSwitching: true,
+        formInlineComment: {},
+        rulesComment: {
+          commentContent: [
+            {
+              required: true,
+              message: this.$t('reasonForReturn') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            }
+          ]
+        },
+        timeName: '',
+        visibleComment: false,
+        dataSourceFile: [],
+        confirmLoading: false,
+        confirmLoadingComment: false,
+        queryParamQuery: {},
+        isDisplay: true,
+        selectedRowKeys: [],
+        visible: false,
+        formInline: {},
+        rules: {
+          inventoryAffirmDueDate: [
+            {
+              required: true,
+              message: this.$t('TaskCutOffTime') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          designDutyDueDate: [
+            {
+              required: true,
+              message: this.$t('deadlineForConfirmationDesignComplianceResponsibility') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          verifyDutyDueDate: [
+            {
+              required: true,
+              message: this.$t('deadlineForVerifyingComplianceResponsibilityConfirmation') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ]
+        },
+        queryParam: {},
+        fileTitle: '',
+        parkingList: [],
+        indeterminate: false,
+        customizevisible: false,
+        checkAll: false,
+        disabled: false,
+        checkedList: ['serialNumber', 'title', 'operation'],
+        selectedValue: [],
+        customizeList: [
+          {
+            sort: '1',
+            name: this.$t('standard'),
+            disabled: true,
+            headFieldCn: '编号',
+            headFieldEn: 'Number',
+            field: 'serialNumber',
+            key: 1,
+            moduleFlag: '法规清单',
+            status: 1
+          },
+          {
+            sort: '2',
+            disabled: true,
+            name: this.$t('title'),
+            headFieldCn: '标题',
+            headFieldEn: 'title',
+            field: 'title',
+            key: 2,
+            moduleFlag: '法规清单',
+            status: 2
+          },
+          {
+            sort: '',
+            name: this.$t('subtitle'),
+            headFieldCn: '子标题',
+            headFieldEn: 'Sub-title',
+            field: 'subtitle',
+            key: 3,
+            moduleFlag: '法规清单'
+          },
+          {
+            sort: '',
+            name: this.$t('applicableSupplement'),
+            headFieldCn: '适用增补件',
+            headFieldEn: 'Applicable Supplement',
+            field: 'applicableSupplement',
+            key: 4,
+            moduleFlag: '法规清单'
+          },
+          {
+            sort: '',
+            name: this.$t('certificationType'),
+            headFieldCn: '认证类型',
+            headFieldEn: 'Certification Type',
+            field: 'attestationType_dictText',
+            key: 5,
+            moduleFlag: '法规清单'
+          },
+          {
+            sort: '',
+            name: this.$t('certificationLevel'),
+            headFieldCn: '认证级别',
+            headFieldEn: 'Certification Level',
+            field: 'attestationRank_dictText',
+            key: 6,
+            moduleFlag: '法规清单'
+          },
+          {
+            sort: '',
+            name: this.$t('statisticalNodes'),
+            headFieldCn: '责任部门',
+            headFieldEn: 'Duty Department',
+            field: 'dutyDepart',
+            key: 8,
+            moduleFlag: '法规清单'
+          },
+          {
+            sort: '',
+            name: this.$t('areaOfResponsibility'),
+            headFieldCn: '责任领域',
+            headFieldEn: 'Responsible Field',
+            field: 'dutyTerritory_dictText',
+            key: 15,
+            moduleFlag: '法规清单'
+          },
+          {
+            sort: '',
+            name: this.$t('regulatoryEngineer'),
+            headFieldCn: '法规工程师',
+            headFieldEn: 'Regulation Engineer',
+            field: 'regulationOwnerName',
+            key: 16,
+            moduleFlag: '法规清单'
+          },
+          {
+            sort: '',
+            name: this.$t('engineeringInterfacePerson'),
+            headFieldCn: '工程接口人',
+            headFieldEn: 'Eng. Interface',
+            field: 'engineeringInterfacePersonName',
+            key: 18,
+            moduleFlag: '法规清单'
+          },
+          {
+            sort: '',
+            name: this.$t('remarks'),
+            headFieldCn: '备注',
+            headFieldEn: 'Comments',
+            field: 'remark',
+            key: 18,
+            moduleFlag: '法规清单'
+          },
+          {
+            sort: '',
+            name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('personLiable'),
+            headFieldCn: '责任人',
+            headFieldEn: 'Assignee',
+            field: 'designDutyIdName',
+            affirmFlag: '1',
+            key: 22,
+            moduleFlag: '法规清单'
+          },
+          {
+            sort: '',
+            name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('deliveryDate'),
+            headFieldCn: '截止时间',
+            headFieldEn: 'Delivery Date',
+            field: 'designDueDate',
+            affirmFlag: '1',
+            key: 23,
+            moduleFlag: '法规清单'
+          },
+          {
+            sort: '',
+            name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('ProcessStatus'),
+            headFieldCn: '流程状态',
+            headFieldEn: 'Process Status',
+            field: 'designFlowStatusName',
+            affirmFlag: '1',
+            key: 24,
+            moduleFlag: '法规清单'
+          },
+          {
+            sort: '',
+            name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('typeOfDeliverables'),
+            headFieldCn: '交付物类型',
+            headFieldEn: 'Deliverable Type',
+            field: 'designDeliverableTypeName',
+            affirmFlag: '1',
+            key: 25,
+            moduleFlag: '法规清单'
+          },
+          {
+            sort: '',
+            name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('deliverableTemplate'),
+            headFieldCn: '交付物模板',
+            headFieldEn: 'Deliverable Template',
+            field: 'designDeliverableTemplate',
+            affirmFlag: '1',
+            key: 26,
+            moduleFlag: '法规清单'
+          },
+          {
+            sort: '',
+            name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('personLiable'),
+            headFieldCn: '责任人',
+            headFieldEn: 'Assignee',
+            field: 'verifyDutyIdName',
+            affirmFlag: '3',
+            key: 32,
+            moduleFlag: '法规清单'
+          },
+          {
+            sort: '',
+            name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('deliveryDate'),
+            headFieldCn: '交付日期',
+            headFieldEn: 'Delivery Date',
+            field: 'verifyDueDate',
+            affirmFlag: '3',
+            key: 33,
+            moduleFlag: '法规清单'
+          },
+          {
+            sort: '',
+            name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('ProcessStatus'),
+            headFieldCn: '流程状态',
+            headFieldEn: 'Process Status',
+            field: 'verifyFlowStatusName',
+            affirmFlag: '3',
+            key: 34,
+            moduleFlag: '法规清单'
+          },
+          {
+            sort: '',
+            name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('typeOfDeliverables'),
+            headFieldCn: '交付物类型',
+            headFieldEn: 'Deliverable Type',
+            field: 'verifyDeliverableTypeName',
+            affirmFlag: '3',
+            key: 25,
+            moduleFlag: '法规清单'
+          },
+          {
+            sort: '',
+            name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('deliverableTemplate'),
+            headFieldCn: '交付物模板',
+            headFieldEn: 'Deliverable Template',
+            field: 'verifyDeliverableTemplate',
+            affirmFlag: '3',
+            key: 36,
+            moduleFlag: '法规清单'
+          },
+          {
+            sort: '',
+            disabled: true,
+            name: this.$t('operation'),
+            headFieldCn: '操作',
+            headFieldEn: 'Operation',
+            key: 35,
+            field: 'operation',
+            moduleFlag: '法规清单',
+            status: 2
+          }
+        ],
+        url: {
+          addModelList: '/project/projectLawsInventoryEO/queryPageDummy',
+          queryConditionInventory: '/project/projectLawsInventoryEO/queryConditionInventory',
+          list: '/project/projectLawsInventoryEO/page',
+          addModel: 'project/projectLawsInventoryEO/add',
+          editModel: '/project/projectLawsInventoryEO/edit',
+          deleteBatch: '/project/projectLawsInventoryEO/deleteBatch',
+          deleteOne: '/project/projectLawsInventoryEO/delete',
+          updateStatusBatch: '/project/projectLawsInventoryEO/updateStatusBatch',
+          matchRelevantPeople: '/project/projectLawsInventoryEO/matchRelevantPeople',
+          queryPersonByProject: '/project/projectRelatedPersonnel/queryPersonByProjectId',
+          importZipUrl: '/project/projectLawsInventoryEO/importData',
+          exportTemplate: '/project/projectLawsInventoryEO/exportTemplate',
+          exportData: '/project/projectLawsInventoryEO/exportData',
+          setBatch: '/project/projectLawsInventoryEO/setBatch',//批量设置
+          copyUrl: '/project/projectLawsInventoryEO/copyInfoByIds',//复制
+          transferUrl: '/project/projectLawsInventoryEO/getPageInfoDummy',//调取
+          ExportReportUrl: '/project/projectLawsInventoryEO/downloadDocxReport',
+          AndUserId: '/project/projectLibraryRoleRelEO/queryByProjectLibraryIdAndUserId',
+          AndUserIdEdit: '/project/projectLibraryRoleRelEO/edit'
+        },
+        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
+        loading: false,
+        dataSource: [],
+        isResultReported: false,
+        // fieldList      | array   |✔| 需要查询的列集合示例如下，type类型有:date/datetime/string/int/number
+        fieldList: [
+          {
+            type: 'string',
+            value: 'title',
+            text: this.$t('title')
+          },
+          {
+            type: 'string',
+            value: 'subtitle',
+            text: this.$t('subtitle')
+          },
+          {
+            type: 'string',
+            value: 'applicableSupplement',
+            text: this.$t('applicableSupplement')
+          },
+          // {
+          //   type: '',
+          //   value: 'implementType',
+          //   text: this.$t('implementationCategory'),
+          //   dictCode: 'implement_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          // },
+          // {
+          //   type: 'date',
+          //   value: 'xin1Che1Xing2Shi2Shi1Ri4Qi1',
+          //   text: this.$t('ImplementationDate')
+          // },
+          // {
+          //   type: 'date',
+          //   value: 'implementTime',
+          //   text: this.$t('vehicleInProductionDate')
+          // },
+          // {
+          //   type: 'string',
+          //   value: 'wvtaId',
+          //   text: 'WVTA ID'
+          // },
+          {
+            type: '',
+            value: 'attestationType',
+            text: this.$t('certificationType'),
+            dictCode: 'attestation_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          },
+          {
+            type: '',
+            value: 'attestationRank',
+            text: this.$t('certificationLevel'),
+            dictCode: 'attestation_rank'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          }
+          // {
+          //   type: 'deliverables',
+          //   value: 'designDeliverableType',
+          //   text: this.$t('designaconformancedeliverabletype'),
+          // },
+          // {
+          //   type: 'deliverables',
+          //   value: 'verifyDeliverableType',
+          //   text: this.$t('verifytheconformancedeliverabletype'),
+          // },
+          // {
+          //   type: 'Personnel',
+          //   value: 'designDutyId',
+          //   valueName: 'designDutyIdName',
+          //   text: this.$t('responsiblepersonfordesigncompliance')
+          // },
+          // {
+          //   type: 'Personnel',
+          //   value: 'verifyDutyId',
+          //   valueName: 'verifyDutyIdName',
+          //   text: this.$t('responsiblepersonforverifyingcompliance')
+          // },
+          // {
+          //   type: '',
+          //   value: 'dutyTerritory',
+          //   text: this.$t('areaOfResponsibility'),
+          //   dictCode: 'duty_territory'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          // },
+          // {
+          //   type: 'Personnel',
+          //   value: 'engineeringInterfacePerson',
+          //   valueName: 'engineeringInterfacePersonName',
+          //   text: this.$t('engineeringInterfacePerson')
+          // }
+        ],
+        listOptions: [
+          {
+            value: 'List to be released',
+            key: 'List to be released',
+            label: this.$t('listToBeReleased')
+          },
+          {
+            value: 'Regulatory engineer returns',
+            key: 'Regulatory engineer returns',
+            label: this.$t('regulatoryEngineerReturns')
+          },
+          {
+            value: 'Duty Person Rejected',
+            key: 'Duty Person Rejected',
+            label: this.$t('dutyPersonRejected')
+          },
+          {
+            value: 'List to be checked',
+            key: 'List to be checked',
+            label: this.$t('listToBeChecked')
+          },
+          {
+            value: 'Task to be confirmed',
+            key: 'Task to be confirmed',
+            label: this.$t('taskToBeConfirmed')
+          },
+          {
+            value: 'Results to be submitted',
+            key: 'Results to be submitted',
+            label: this.$t('resultsToBeSubmitted')
+          },
+          {
+            value: 'Results to be reviewed',
+            key: 'Results to be reviewed',
+            label: this.$t('resultsToBeReviewed')
+          },
+          {
+            value: 'Compliance',
+            key: 'Compliance',
+            label: this.$t('compliance')
+          },
+          {
+            value: 'Non-Compliance',
+            key: 'Non-Compliance',
+            label: this.$t('nonCompliance')
+          },
+          {
+            value: 'To be tracked',
+            key: 'To be tracked',
+            label: this.$t('toBeTracked')
+          },
+          {
+            value: 'NA',
+            key: 'NA',
+            label: this.$t('NA')
+          }
+        ],
+        taskOptions: [
+          {
+            value: 'List to be released',
+            key: 'List to be released',
+            label: this.$t('listToBeReleased')
+          },
+          {
+            value: 'Regulatory engineer returns',
+            key: 'Regulatory engineer returns',
+            label: this.$t('regulatoryEngineerReturns')
+          },
+          {
+            value: 'Duty Person Rejected',
+            key: 'Duty Person Rejected',
+            label: this.$t('dutyPersonRejected')
+          },
+          {
+            value: 'List to be checked',
+            key: 'List to be checked',
+            label: this.$t('listToBeChecked')
+          },
+          {
+            value: 'Task to be confirmed',
+            key: 'Task to be confirmed',
+            label: this.$t('taskToBeConfirmed')
+          },
+          {
+            value: 'Results to be submitted',
+            key: 'Results to be submitted',
+            label: this.$t('resultsToBeSubmitted')
+          },
+          {
+            value: 'Results to be reviewed',
+            key: 'Results to be reviewed',
+            label: this.$t('resultsToBeReviewed')
+          },
+          {
+            value: 'Compliance',
+            key: 'Compliance',
+            label: this.$t('compliance')
+          },
+          {
+            value: 'Non-Compliance',
+            key: 'Non-Compliance',
+            label: this.$t('nonCompliance')
+          },
+          {
+            value: 'To be tracked',
+            key: 'To be tracked',
+            label: this.$t('toBeTracked')
+          },
+          {
+            value: 'NA',
+            key: 'NA',
+            label: this.$t('NA')
+          }
+        ],
+        selectModel: 'designFlowStatus',
+        visibleRoleSwitching: false,
+        confirmLoadingRoleSwitching: false,
+        formInlineRoleSwitching: {},
+        AndUserId: '',
+        rulesRoleSwitching: {
+          roleSwitchingCode: [
+            {
+              required: true,
+              message: this.$t('roleSwitching') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ]
+        },
+        roleSwitchingCode: '',
+        detailedSuccessList: [],
+        detailedWarningList: [],
+        rowKeysSuccessList: [],
+        selectedRowKeysList: [],
+        rowKeysWarningList: [],
+        rolecode: false,
+        dataWarningList: [],
+        completeTaskList: [],
+        requestsNum: 0,
+        JTextLoading: false,
+        questionIdList: [],
+        questionWarning: [],
+        startProcessList: [],
+        updateFlowStatusList: []
+      }
+    },
+
+    mounted() {
+      this.getFirstLevelDutyTerritory()
+      if (this.areaOfResponsibilityList && this.areaOfResponsibilityList.dutyTerritoryName) {
+        this.queryParam.firstLevelDutyTerritory = this.areaOfResponsibilityList.dutyTerritoryName
+        this.queryParam = { ...this.queryParam }
+      }
+      this.long = localStorage.getItem('language') || 'zh-cn'
+      this.JLoading = true
+      this.getHeader()
+      this.queryLawEngineerByProjectId()
+      this.queryengineeringInterfacePersonId()
+      this.querydesignDutyId()
+      this.queryverifyDutyId()
+      this.getRoleByUserId(() => {
+        this.getAndUserId()
+      })
+    },
+    computed: {
+      columnsFile() {
+        let columnResult = JSON.parse(JSON.stringify(this.columnsFileAll))
+        if (!this.isResultReported) {
+          for (var i = 0; i < columnResult.length; i++) {
+            if (columnResult[i].title === this.$t('resultReported')) {
+              columnResult.splice(i, 1)
+              i--
+            }
+          }
+        } else if (this.isResultReported) {
+          for (var i = 0; i < columnResult.length; i++) {
+            if (columnResult[i].title === this.$t('deliverableTemplate')) {
+              columnResult.splice(i, 1)
+              i--
+            }
+          }
+        }
+        return columnResult
+      },
+      columns() {
+        let columnResult = JSON.parse(JSON.stringify(this.columnsAll))
+        if (this.roleSwitchingCode == 0 || this.roleSwitchingCode == 1) {
+        } else {
+          for (var i = 0; i < columnResult.length; i++) {
+            if (columnResult[i].title === this.$t('operation')) {
+              columnResult.splice(i, 1)
+              i--
+            }
+          }
+        }
+        return columnResult
+      }
+    },
+    methods: {
+      ...mapGetters(['userInfo']),
+      getFirstLevelDutyTerritory() {
+        getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
+          if (res.success) {
+            this.firstLevelDutyTerritoryList = res.result
+          } else {
+            this.firstLevelDutyTerritoryList = []
+          }
+        })
+      },
+      modifyOperatorClick(name) {
+        if (this.selectedRowKeys.length == 0) {
+          this.$message.warning(this.$t('selectLeastOne'))
+        } else if (this.selectedRowKeys.length > 1) {
+          this.$message.warning(this.$t('OnlyOneSelected'))
+        } else {
+          let contentList = []
+          for (let i = 0; i < this.dataSource.length; i++) {
+            for (let j = 0; j < this.selectedRowKeys.length; j++) {
+              if (this.dataSource[i].id == this.selectedRowKeys[j]) {
+                contentList.push(this.dataSource[i])
+              }
+            }
+          }
+          let isVerifyFlow = false
+          let isDesignFlow = false
+          if (contentList[0].verifyFlowStatus == 'Task to be confirmed'
+            || contentList[0].verifyFlowStatus == 'Results to be submitted') {
+            isVerifyFlow = true
+          }
+          if (contentList[0].designFlowStatus == 'Task to be confirmed'
+            || contentList[0].designFlowStatus == 'Results to be submitted') {
+            isDesignFlow = true
+          }
+          if (name == '法规') {
+            if (contentList[0].regulationOwnerId == this.userInfo().id) {
+            } else {
+              this.$message.warning(this.$t('pleaseSelectRegulatoryCurrentLogin'))
+              return
+            }
+          }
+          if (isDesignFlow || isVerifyFlow) {
+            this.$refs.modifyOperatorRef.getData(contentList[0], isDesignFlow, isVerifyFlow)
+          } else {
+            this.$message.warning(this.$t('onlyDesignComplianceConfirmationSelected'))
+          }
+        }
+      },
+      modifyOperatorForm() {
+        this.pageNo = 1
+        this.getList()
+      },
+      //收起/展开
+      handleToggleSearch() {
+        this.toggleSearchStatus = !this.toggleSearchStatus
+      },
+      queryLawEngineerByProjectId() {
+        let query = {
+          projectLibraryId: this.$route.query.id
+        }
+        getAction('/project/projectRelatedPersonnel/queryLawEngineerByProjectId', query).then((res) => {
+          if (res.success) {
+            let regulatoryEngineer = {
+              value: 'regulationOwnerId',
+              text: this.$t('regulatoryEngineer'),
+              options: []
+            }
+            if (res.result && res.result.length > 0) {
+              res.result.forEach(val => {
+                regulatoryEngineer.options.push({
+                  value: val.id,
+                  key: val.id,
+                  label: val.userName
+                })
+              })
+            }
+            this.fieldList.push(regulatoryEngineer)
+          } else {
+
+          }
+        })
+      },
+      queryengineeringInterfacePersonId() {
+        let query = {
+          projectLibraryId: this.$route.query.id
+        }
+        getAction('/project/projectRelatedPersonnel/queryEngineeringInterfacePersonByProjectId', query).then((res) => {
+          if (res.success) {
+            let engineeringInterfacePerson = {
+              value: 'engineeringInterfacePerson',
+              text: this.$t('engineeringInterfacePerson'),
+              options: []
+            }
+            if (res.result && res.result.length > 0) {
+              res.result.forEach(val => {
+                engineeringInterfacePerson.options.push({
+                  value: val.id,
+                  key: val.id,
+                  label: val.userName
+                })
+              })
+            }
+            this.fieldList.push(engineeringInterfacePerson)
+          } else {
+
+          }
+        })
+      },
+      querydesignDutyId() {
+        let query = {
+          projectLibraryId: this.$route.query.id
+        }
+        getAction('/project/projectLawsInventoryEO/queryDutyPersonByProjectId', query).then((res) => {
+          if (res.success) {
+            let designDuty = {
+              value: 'designDutyId',
+              text: this.$t('responsiblepersonfordesigncompliance'),
+              options: []
+            }
+            console.log(res)
+            if (res.result.designDutyList && res.result.designDutyList.length > 0) {
+              res.result.designDutyList.forEach(val => {
+                designDuty.options.push({
+                  value: val.id,
+                  key: val.id,
+                  label: val.userName
+                })
+              })
+            }
+            this.fieldList.push(designDuty)
+          } else {
+
+          }
+        })
+      },
+      queryverifyDutyId() {
+        let query = {
+          projectLibraryId: this.$route.query.id
+        }
+        getAction('/project/projectLawsInventoryEO/queryDutyPersonByProjectId', query).then((res) => {
+          if (res.success) {
+            let verifyDuty = {
+              value: 'verifyDutyId',
+              text: this.$t('responsiblepersonforverifyingcompliance'),
+              options: []
+            }
+            if (res.result.verifyDutyList && res.result.verifyDutyList.length > 0) {
+              res.result.verifyDutyList.forEach(val => {
+                verifyDuty.options.push({
+                  value: val.id,
+                  key: val.id,
+                  label: val.userName
+                })
+              })
+            }
+            this.fieldList.push(verifyDuty)
+          } else {
+
+          }
+        })
+      },
+      //流程状态点击事件
+      designFlowStatusClick(row, name) {
+        let query = {}
+        let TaskKey = ''
+        if (name == this.$t('designComplianceProcess')) {
+          if (row.designFlowStatus == 'Task to be confirmed' || row.designFlowStatus == 'Duty Person Rejected') {
+            TaskKey = 'zrrqr'
+          } else if (row.designFlowStatus == 'Results to be submitted' || row.designFlowStatus == 'Non-Compliance' || row.designFlowStatus == 'To be tracked') {
+            TaskKey = 'zrrtjjfw'
+          } else if (row.designFlowStatus == 'Results to be reviewed' ||
+            row.designFlowStatus == 'Compliance' ||
+            row.designFlowStatus == 'NA') {
+            TaskKey = 'fggcssh'
+          }
+          query = {
+            actiProcInstId: row.designPId,
+            projectTaskInventoryId: row.id,
+            projectLibraryId: row.projectLibraryId,
+            TaskKey: TaskKey,
+            isDisplay: false,
+            flowType: 2,
+            Sponsor: 'regulationOwnerName',
+            personLiable: 'designDutyIdName',
+            typeOfDeliverables: 'designDeliverableTypeName',
+            deliverableTemplate: 'designDeliverableTemplate',
+            DueDate: 'designDueDate',
+            remarks: 'designRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId
+          }
+        } else {
+          if (row.verifyFlowStatus == 'Task to be confirmed' || row.verifyFlowStatus == 'Duty Person Rejected') {
+            TaskKey = 'zrrqr'
+          } else if (row.verifyFlowStatus == 'Results to be submitted' || row.verifyFlowStatus == 'Non-Compliance' || row.verifyFlowStatus == 'To be tracked') {
+            TaskKey = 'zrrtjjfw'
+          } else if (row.verifyFlowStatus == 'Results to be reviewed' ||
+            row.verifyFlowStatus == 'Compliance' ||
+            row.verifyFlowStatus == 'NA') {
+            TaskKey = 'fggcssh'
+          }
+          query = {
+            actiProcInstId: row.verifyPId,
+            projectTaskInventoryId: row.id,
+            projectLibraryId: row.projectLibraryId,
+            TaskKey: TaskKey,
+            flowType: 4,
+            isDisplay: false,
+            Sponsor: 'regulationOwnerName',
+            personLiable: 'verifyDutyIdName',
+            typeOfDeliverables: 'verifyDeliverableTypeName',
+            deliverableTemplate: 'verifyDeliverableTemplate',
+            DueDate: 'verifyDueDate',
+            remarks: 'verifyRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId
+          }
+        }
+        this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), name)
+      },
+
+      //查看列表页面
+      viewClick(row) {
+        row.roleCodeIndex = this.roleSwitchingCode
+        this.$refs.listOfRegulationsViewRef.editModel(JSON.parse(JSON.stringify(row)))
+      },
+
+      //模板下载
+      handleModule() {
+        downloadFile(this.url.exportTemplate, this.$t('listOfRegulations') + this.$t('importTemplate') + '.xls', {})
+      },
+
+      //时间禁用
+      disabledDate(current) {
+        return current && current < moment().subtract(1, 'day')
+      },
+
+      //获取切换角色的数据
+      getRoleByUserId(callback) {
+        getAction('/project/projectLawsInventoryEO/getRoleByUserId', { projectLibraryId: this.$route.query.id }).then((res) => {
+          if (res.success) {
+            this.roleSwitchingList = res.result || []
+          } else {
+            this.roleSwitchingList = []
+          }
+          this.$emit('getRoleSwitchingList', this.roleSwitchingList)
+          callback && callback()
+        })
+      },
+
+      //通过登录人查出当前是什么角色
+      //判断角色是否存在；存在即可展示；如不存在显示roleSwitchingList数据中的第一个
+      getAndUserId() {
+        let query = {
+          projectLibraryId: this.$route.query.id,
+          userId: this.userInfo().id,
+          modelType: 'Laws inventory'
+        }
+        getAction(this.url.AndUserId, query).then((res) => {
+          if (res.success) {
+            // this.isDisplay = true
+            if (this.$route.query.roleOpen) {
+              this.formInlineRoleSwitching.roleSwitchingCode = this.$route.query.roleOpen
+            } else {
+              this.formInlineRoleSwitching.roleSwitchingCode = res.result.roleCode
+            }
+            this.AndUserId = res.result.id
+            if (this.formInlineRoleSwitching.roleSwitchingCode) {
+              if (!(this.roleSwitchingList.some(val => val.roleCode == this.formInlineRoleSwitching.roleSwitchingCode))) {
+                this.formInlineRoleSwitching.roleSwitchingCode = this.roleSwitchingList[0] ? this.roleSwitchingList[0].roleCode : ''
+              }
+            } else {
+              this.formInlineRoleSwitching.roleSwitchingCode = this.roleSwitchingList[0] ? this.roleSwitchingList[0].roleCode : ''
+            }
+            this.roleSwitchingCode = this.formInlineRoleSwitching.roleSwitchingCode
+            this.$emit('getRoleSwitch', this.formInlineRoleSwitching.roleSwitchingCode)
+            this.getList()
+            // this.JLoading = false
+          } else {
+            this.JLoading = false
+          }
+        })
+      },
+
+      //生成合规报告
+      ExportReportClick() {
+        let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+        if (selectedRowKeys && selectedRowKeys.length == 0) {
+          this.$message.warning(this.$t('pleaseSelectData'))
+        } else if (selectedRowKeys.length > 1) {
+          this.$message.warning(this.$t('OnlyOneSelected'))
+        } else {
+          let serialNumber = this.selectedRowKeysList[0].serialNumber
+          downloadFile(this.url.ExportReportUrl, this.$t('listOfRegulations') + this.$t('complianceReporting') + '-' + serialNumber + '.docx', { id: selectedRowKeys.join(',') })
+        }
+      },
+
+      //导出
+      handleExport() {
+        let roleCodeIndex = this.roleSwitchingCode
+        let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+        let query = {
+          ...this.queryParam,
+          ids: selectedRowKeys.join(','),
+          ...this.queryParamQuery,
+          roleCode: roleCodeIndex,
+          excelName: this.$route.query.projectName,
+          projectLibraryId: this.$route.query.id
+        }
+        downloadFile(this.url.exportData, this.$route.query.projectName + '.zip', query, this.Deselect)
+      },
+      //复制
+      copyClick(operateType) {
+        if (this.selectedRowKeys.length > 0) {
+          let _this = this
+          this.$confirm({
+            content: _this.$t('ConfirmReplication'),
+            onOk() {
+              let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+              getAction(_this.url.copyUrl, { ids: idList.join(','), operateType: operateType }).then((res) => {
+                if (res.success) {
+                  _this.$message.success(_this.$t('OperationSuccessful'))
+                  _this.selectedRowKeys = []
+                  _this.getList()
+                } else {
+                  _this.$message.warning(_this.$t('operationFailed'))
+                }
+              })
+            }
+          })
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      //调取
+      transferClick() {
+        this.$refs.transferListRef.transferModel()
+      },
+      //批量设置
+      batSettingClick() {
+        let code = this.roleSwitchingCode
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          let content = []
+          for (let i = 0; i < this.dataSource.length; i++) {
+            for (let j = 0; j < this.selectedRowKeys.length; j++) {
+              if (this.dataSource[i].id == this.selectedRowKeys[j]) {
+                content.push(this.dataSource[i])
+              }
+            }
+          }
+          let isTrue = false
+          for (let i = 0; i < content.length; i++) {
+            if (!content[i].dutyTerritory_dictText) {
+              isTrue = true
+              break
+            }
+            for (let j = 1; j < content.length; j++) {
+              if (content[i].dutyTerritory_dictText != content[j].dutyTerritory_dictText) {
+                isTrue = true
+                break
+              }
+            }
+          }
+          if (!isTrue) {
+            this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), code, content[0])
+          } else {
+            this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), code)
+          }
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+
+      //批量设置人员
+      batchSettingPersonnelClick() {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          let isTrue
+          let content = []
+          for (let i = 0; i < this.dataSource.length; i++) {
+            for (let j = 0; j < selectedRowKeys.length; j++) {
+              if (this.dataSource[i].id == selectedRowKeys[j]) {
+                content.push(this.dataSource[i])
+              }
+            }
+          }
+          for (let i = 0; i < content.length; i++) {
+            if (!content[i].dutyTerritory_dictText) {
+              this.$message.warning(this.$t('theSelectedDataResponsibilityFieldCannotEmpty'))
+              return
+            }
+            for (let j = 1; j < content.length; j++) {
+              if (content[i].dutyTerritory_dictText != content[j].dutyTerritory_dictText || !content[i].dutyTerritory_dictText) {
+                this.$message.warning(this.$t('theInconsistentSameResponsibility'))
+                return
+              }
+            }
+          }
+          for (let i = 0; i < content.length; i++) {
+            if (content[i].roleCode == '0' &&
+              content[i].taskAffirmStatus != 'List to confirm') {
+              isTrue = true
+            } else {
+              isTrue = false
+              this.$message.warning(this.$t('taskConfirmedPersonnelCannotBeSetBatch'))
+              return
+            }
+          }
+          if (isTrue) {
+            this.$refs.batchSettingPersonnelRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), content)
+          }
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+
+      // 撤回
+      withdrawnClick() {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          let contentList = []
+          let detailedWarningList = []
+          let idList = []
+          for (let i = 0; i < this.dataSource.length; i++) {
+            for (let j = 0; j < selectedRowKeys.length; j++) {
+              if (this.dataSource[i].id == selectedRowKeys[j]) {
+                contentList.push(this.dataSource[i])
+              }
+            }
+          }
+          //判断当前流程状态是否为清单待校核的数据
+          for (let i = 0; i < contentList.length; i++) {
+            if (contentList[i].verifyFlowStatus == 'List to be checked' ||
+              contentList[i].designFlowStatus == 'List to be checked' ||
+              contentList[i].verifyFlowStatus == 'Duty Person Rejected' ||
+              contentList[i].designFlowStatus == 'Duty Person Rejected') {
+              idList.push(contentList[i].id)
+            } else if (contentList[i].designFlowStatus == 'NA' || contentList[i].verifyFlowStatus == 'NA') {
+              detailedWarningList.push(
+              < div > { contentList[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
+            } else {
+              detailedWarningList.push(
+              < div > { contentList[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
+            }
+          }
+
+          if (idList && idList.length > 0) {
+            let _this = this
+            this.$confirm({
+              content: _this.$t('confirmWithdraw'),
+              onOk() {
+                let query = {
+                  ids: idList.join(','),
+                  projectLibraryId: _this.$route.query.id
+                }
+                postAction('/project/projectLawsInventoryEO/studioWithdrew', query).then((res) => {
+                  if (res.success) {
+                    _this.$message.success(_this.$t('OperationSuccessful'))
+                    _this.selectedRowKeys = []
+                    _this.getList()
+                    if (detailedWarningList && detailedWarningList.length > 0) {
+                      _this.promptInformation(detailedWarningList)
+                    }
+                  } else {
+                    _this.$message.warning(_this.$t('operationFailed'))
+                  }
+                })
+              }
+            })
+          } else {
+            this.promptInformation(detailedWarningList)
+          }
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+
+      //每一次不满足条件的提示语
+      promptInformation(detailedWarningList) {
+        let that = this
+        this.$warning({
+          content: (
+            < div >
+            { detailedWarningList }
+            < /div>
+        )
+      })
+      },
+
+      handleOkQuestion() {
+        this.$refs.ruleFormQuestion.validate(valid => {
+          let formInlineQuestion = JSON.parse(JSON.stringify(this.formInlineQuestion))
+          if (formInlineQuestion.expeditingType && formInlineQuestion.expeditingType.length > 0) {
+            formInlineQuestion.expeditingType = formInlineQuestion.expeditingType.join(',')
+          }
+          let operateType = ''
+          if (this.roleSwitchingCode == '0') {
+            operateType = 'lawsInventoryStudioExpediting'
+          } else if (this.roleSwitchingCode == '1') {
+            operateType = 'lawsInventoryRegulationOwnerExpediting'
+          } else if (this.roleSwitchingCode == '30') {
+            operateType = 'lawsInventoryEngineeringInterfacePersonExpediting'
+          }
+          let query = {
+            ids: this.questionIdList.join(','),
+            projectLibraryId: this.$route.query.id,
+            expeditingType: formInlineQuestion.expeditingType,
+            operateType: operateType
+          }
+          this.confirmLoadingQuestion = true
+          postAction('project/projectLawsInventoryEO/expediting', query).then((res) => {
+            if (res.success) {
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.selectedRowKeys = []
+              this.getList()
+              this.visibleQuestion = false
+              this.confirmLoadingQuestion = false
+              if (this.questionWarning && this.questionWarning.length > 0) {
+                this.promptInformation(this.questionWarning)
+              }
+            } else {
+              this.$message.warning(this.$t('operationFailed'))
+            }
+          })
+        })
+      },
+      handleCancelQuestion() {
+        this.visibleQuestion = false
+      },
+      //催办
+      questionClick() {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          let isTrue
+          let content = []
+          this.questionIdList = []
+          let detailedWarningList = []
+          this.questionWarning = []
+          for (let i = 0; i < this.dataSource.length; i++) {
+            for (let j = 0; j < selectedRowKeys.length; j++) {
+              if (this.dataSource[i].id == selectedRowKeys[j]) {
+                content.push(this.dataSource[i])
+              }
+            }
+          }
+          for (let i = 0; i < content.length > 0; i++) {
+            if (this.roleSwitchingCode == 0) {
+              if (content[i].verifyFlowStatus == 'List to be checked' ||
+                content[i].designFlowStatus == 'List to be checked' ||
+                content[i].verifyFlowStatus == 'Task to be confirmed' ||
+                content[i].designFlowStatus == 'Task to be confirmed' ||
+                content[i].verifyFlowStatus == 'Results to be submitted' ||
+                content[i].designFlowStatus == 'Results to be submitted' ||
+                content[i].verifyFlowStatus == 'Results to be reviewed' ||
+                content[i].designFlowStatus == 'Results to be reviewed') {
+                this.questionIdList.push(content[i].id)
+              } else {
+                detailedWarningList.push(content[i].serialNumber)
+              }
+            } else if (this.roleSwitchingCode == 1 || this.roleSwitchingCode == 30) {
+              if (content[i].verifyFlowStatus == 'Task to be confirmed' ||
+                content[i].designFlowStatus == 'Task to be confirmed' ||
+                content[i].verifyFlowStatus == 'Results to be submitted' ||
+                content[i].designFlowStatus == 'Results to be submitted' ||
+                content[i].verifyFlowStatus == 'Results to be reviewed' ||
+                content[i].designFlowStatus == 'Results to be reviewed') {
+                this.questionIdList.push(content[i].id)
+              } else {
+                detailedWarningList.push(content[i].serialNumber)
+              }
+            }
+          }
+          if (detailedWarningList && detailedWarningList.length > 0) {
+            if (this.roleSwitchingCode == 0) {
+              this.questionWarning.push(
+              < div > {
+                detailedWarningList
+                .join(',') + this.$t('conditionsNotMet') + this.$t('onlyDataInTheReminderProcessBanBeProcessed')
+              } < /div>)
+            } else if (this.roleSwitchingCode == 1 || this.roleSwitchingCode == 30) {
+              this.questionWarning.push(
+              < div > {
+                detailedWarningList
+                .join(',') + this.$t('conditionsNotMet') + this.$t('onlyDataInTheReminderProcessBanBeProcessed') + this.$t('andTheProcessStatusTheList')
+              } < /div>)
+            }
+          }
+          if (this.questionIdList && this.questionIdList.length > 0) {
+            this.visibleQuestion = true
+            this.$nextTick(() => {
+              this.formInlineQuestion = {}
+              this.$refs.ruleFormQuestion.clearValidate()
+            })
+          } else {
+            this.promptInformation(this.questionWarning)
+          }
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+
+      //定版
+      fixedPlateClick() {
+        if (this.dataSource && this.dataSource.length > 0) {
+          let isTrue
+          for (let i = 0; i < this.dataSource.length; i++) {
+            if ((this.dataSource[i].verifyFlowStatus == 'Results to be submitted' ||
+                this.dataSource[i].verifyFlowStatus == 'Results to be reviewed' ||
+                this.dataSource[i].verifyFlowStatus == 'Compliance' ||
+                this.dataSource[i].verifyFlowStatus == 'Non-Compliance' ||
+                this.dataSource[i].verifyFlowStatus == 'To be tracked' ||
+                this.dataSource[i].verifyFlowStatus == 'NA'
+              ) &&
+              (this.dataSource[i].designFlowStatus == 'Results to be submitted' ||
+                this.dataSource[i].designFlowStatus == 'Results to be reviewed' ||
+                this.dataSource[i].designFlowStatus == 'Compliance' ||
+                this.dataSource[i].designFlowStatus == 'Non-Compliance' ||
+                this.dataSource[i].designFlowStatus == 'To be tracked' ||
+                this.dataSource[i].designFlowStatus == 'NA'
+              )) {
+              isTrue = true
+            } else {
+              isTrue = false
+              this.$message.warning(this.$t('theReceived'))
+              return
+            }
+          }
+          if (isTrue) {
+            this.$refs.fixedPlateRef.getData()
+          }
+        }
+      },
+
+      //流程重置
+      alterationClick() {
+        if (this.selectedRowKeys.length > 0) {
+          let _this = this
+          let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+          let isTrue
+          let content = []
+          for (let i = 0; i < this.dataSource.length; i++) {
+            for (let j = 0; j < selectedRowKeys.length; j++) {
+              if (this.dataSource[i].id == selectedRowKeys[j]) {
+                // content.push(this.dataSource[i])
+                isTrue = true
+              }
+            }
+          }
+          // for (let i = 0; i < content.length; i++) {
+          //   if (content[i].designFlowStatus == 'List to be released' &&
+          //     content[i].verifyFlowStatus == 'List to be released') {
+          //     isTrue = false
+          //
+          //   } else {
+          //     isTrue = true
+          //   }
+          // }
+          if (isTrue) {
+            this.formInlineReset = {}
+            this.$nextTick(() => {
+              this.$refs.ruleFormReset.clearValidate()
+            })
+            // this.changeInterface(selectedRowKeys)
+            this.visibleReset = true
+          }
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      handleOkReset() {
+        this.$refs.ruleFormReset.validate(valid => {
+          if (valid) {
+            let _this = this
+            _this.confirmLoadingReset = true
+            let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+            postAction('/project/projectLawsInventoryEO/change', {
+              ids: idList.join(','),
+              projectLibraryId: _this.$route.query.id,
+              operateType: _this.formInlineReset.operateType
+            }).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.confirmLoadingReset = false
+                _this.visibleReset = false
+                _this.selectedRowKeys = []
+                _this.pageNo = 1
+                _this.getList()
+              } else {
+                _this.$message.warning(_this.$t('operationFailed'))
+                _this.confirmLoadingReset = false
+              }
+            })
+          }
+        })
+      },
+      handleCancelReset() {
+        this.visibleReset = false
+      },
+      //流程重置接口
+      changeInterface() {
+        let _this = this
+        this.$confirm({
+          width: 760,
+          content: _this.$t('NoteConfirmTheChange'),
+          onOk() {
+            let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+            postAction('/project/projectLawsInventoryEO/change', {
+              ids: idList.join(','),
+              projectLibraryId: _this.$route.query.id
+            }).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.selectedRowKeys = []
+                _this.pageNo = 1
+                _this.getList()
+              } else {
+                _this.$message.warning(_this.$t('operationFailed'))
+              }
+            })
+          }
+        })
+      },
+      //添加
+      handleAdd() {
+        this.$refs.addModelRef.addModel()
+      },
+
+      //切换角色的确认事件
+      handleOkRoleSwitching(roleSwitchingCode) {
+        // this.$refs.ruleFormRoleSwitching.validate(valid => {
+        //   if (valid) {
+        let query = {
+          roleCode: roleSwitchingCode,
+          id: this.AndUserId,
+          projectLibraryId: this.$route.query.id,
+          modelType: 'Laws inventory'
+        }
+        // this.confirmLoadingRoleSwitching = true
+        postAction(this.url.AndUserIdEdit, query).then((res) => {
+          if (res.success) {
+            this.roleSwitchingCode = roleSwitchingCode
+            this.$message.success(this.$t('OperationSuccessful'))
+            // this.visibleRoleSwitching = false
+            // this.confirmLoadingRoleSwitching = false
+            this.$emit('getRoleSwitch', roleSwitchingCode)
+            this.selectedRowKeys = []
+            this.pageNo = 1
+            this.getList()
+          } else {
+            this.confirmLoadingRoleSwitching = false
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
+        //   }
+        // })
+      },
+
+      //切换角色的取消事件
+      // handleCancelRoleSwitching() {
+      //   this.visibleRoleSwitching = false
+      // },
+      //打开切换角色的弹窗；并判断当前的角色在角色列表中是否存在；如不存在选择角色列表中的第一个
+      roleSwitchingClick() {
+        this.visibleRoleSwitching = true
+        this.$nextTick(() => {
+          this.$refs.ruleFormRoleSwitching.clearValidate()
+          if (!this.roleSwitchingCode) {
+            this.roleSwitchingCode = '0'
+          }
+          if (!(this.roleSwitchingList.some(val => val.roleCode == this.roleSwitchingCode))) {
+            this.roleSwitchingCode = this.roleSwitchingList[0] ? this.roleSwitchingList[0].roleCode : ''
+          }
+          this.formInlineRoleSwitching.roleSwitchingCode = this.roleSwitchingCode
+          this.formInlineRoleSwitching = { ...this.formInlineRoleSwitching }
+        })
+      },
+      //批量删除
+      handleDel() {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          let _this = this
+          let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+          let selectedRowKeysList = []
+          let isTrue = false
+          for (let i = 0; i < this.dataSource.length; i++) {
+            for (let j = 0; j < selectedRowKeys.length; j++) {
+              if (this.dataSource[i].id == selectedRowKeys[j]) {
+                selectedRowKeysList.push(this.dataSource[i])
+              }
+            }
+          }
+          for (let i = 0; i < selectedRowKeysList.length; i++) {
+            if (
+              (selectedRowKeysList[i].verifyFlowStatus == 'List to be released' ||
+                selectedRowKeysList[i].verifyFlowStatus == 'List to be checked' ||
+                selectedRowKeysList[i].verifyFlowStatus == 'Regulatory engineer returns' ||
+                selectedRowKeysList[i].verifyFlowStatus == 'Duty Person Rejected' ||
+                selectedRowKeysList[i].verifyFlowStatus == 'Termination of task' ||
+                selectedRowKeysList[i].verifyFlowStatus == 'Compliance' ||
+                selectedRowKeysList[i].verifyFlowStatus == 'NA')
+              &&
+              (selectedRowKeysList[i].designFlowStatus == 'List to be released' ||
+                selectedRowKeysList[i].designFlowStatus == 'List to be checked' ||
+                selectedRowKeysList[i].designFlowStatus == 'Regulatory engineer returns' ||
+                selectedRowKeysList[i].designFlowStatus == 'Duty Person Rejected' ||
+                selectedRowKeysList[i].designFlowStatus == 'Termination of task' ||
+                selectedRowKeysList[i].designFlowStatus == 'Compliance' ||
+                selectedRowKeysList[i].designFlowStatus == 'NA')) {
+              isTrue = true
+            } else {
+              isTrue = false
+              // this.$message.warning(this.$t('onlyDeleted'))
+              break
+            }
+          }
+          if (isTrue) {
+            this.$confirm({
+              content: _this.$t('ConfirmBatchDeletion'),
+              onOk() {
+                let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+                postAction(_this.url.deleteBatch, {
+                  ids: idList.join(','),
+                  projectLibraryId: _this.$route.query.id
+                }).then((res) => {
+                  if (res.success) {
+                    _this.$message.success(_this.$t('OperationSuccessful'))
+                    _this.selectedRowKeys = []
+                    _this.getList()
+                  } else {
+                    _this.$message.warning(res.message)
+                  }
+                })
+              }
+            })
+          } else {
+            this.$confirm({
+              content: _this.$t('thereProcessInProgressDeletion') + '?',
+              onOk() {
+                let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+                postAction(_this.url.deleteBatch, {
+                  ids: idList.join(','),
+                  projectLibraryId: _this.$route.query.id
+                }).then((res) => {
+                  if (res.success) {
+                    _this.$message.success(_this.$t('OperationSuccessful'))
+                    _this.selectedRowKeys = []
+                    _this.getList()
+                  } else {
+                    _this.$message.warning(res.message)
+                  }
+                })
+              }
+            })
+          }
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      selectModelChange() {
+        this.queryParam['designFlowStatus'] = undefined
+        this.queryParam['verifyFlowStatus'] = undefined
+        this.queryParam = { ...this.queryParam }
+      },
+      //编辑
+      edit(item) {
+        item.roleCodeIndex = this.roleSwitchingCode
+        this.$refs.editModelRef.editModel(JSON.parse(JSON.stringify(item)))
+      },
+      //删除
+      deleteLib(val) {
+        let _this = this
+        if ((val.verifyFlowStatus == 'List to be released' ||
+          val.verifyFlowStatus == 'List to be checked' ||
+          val.verifyFlowStatus == 'Regulatory engineer returns' ||
+          val.verifyFlowStatus == 'Duty Person Rejected' ||
+          val.verifyFlowStatus == 'Termination of task' ||
+          val.verifyFlowStatus == 'Compliance' ||
+          val.verifyFlowStatus == 'NA') &&
+          (val.designFlowStatus == 'List to be released' ||
+            val.designFlowStatus == 'List to be checked' ||
+            val.designFlowStatus == 'Regulatory engineer returns' ||
+            val.designFlowStatus == 'Duty Person Rejected' ||
+            val.designFlowStatus == 'Termination of task' ||
+            val.designFlowStatus == 'Compliance' ||
+            val.designFlowStatus == 'NA')) {
+          this.$confirm({
+            content: _this.$t('ConfirmDelete'),
+            onOk() {
+              deleteAction(_this.url.deleteOne, { id: val.id, projectLibraryId: _this.$route.query.id }).then((res) => {
+                if (res.success) {
+                  _this.$message.success(_this.$t('OperationSuccessful'))
+                  _this.getList()
+                } else {
+                  _this.$message.warning(_this.$t('operationFailed'))
+                }
+              })
+            }
+          })
+        } else {
+          this.$confirm({
+            content: _this.$t('thereProcessInProgressDeletion') + '?',
+            onOk() {
+              deleteAction(_this.url.deleteOne, { id: val.id, projectLibraryId: _this.$route.query.id }).then((res) => {
+                if (res.success) {
+                  _this.$message.success(_this.$t('OperationSuccessful'))
+                  _this.getList()
+                } else {
+                  _this.$message.warning(_this.$t('operationFailed'))
+                }
+              })
+            }
+          })
+        }
+      },
+      //选择数据
+      onSelectChange(value, rows) {
+        this.selectedRowKeys = value
+        this.selectedRowKeysList = rows
+      },
+      //搜索
+      searchQuery() {
+        this.selectedRowKeys = []
+        this.pageNo = 1
+        this.getList()
+      },
+      //重置
+      searchReset() {
+        this.queryParam = {}
+        this.selectedRowKeys = []
+        this.$refs.globalAdvancedQueryRef.resetLine()
+        this.$refs.globalAdvancedQueryRef.emitCallback()
+        // this.getList()
+      },
+
+      addModelList() {
+        this.selectedRowKeys = []
+        this.pageNo = 1
+        this.getList()
+      },
+      customizeListForm(val) {
+        this.getHeader()
+      },
+      transferListForm(id) {
+        this.$refs.transferListvirtalRef.transferModel(id)
+      },
+      transferListFormHomo() {
+        this.$refs.transferListRef.handleCancel()
+        this.pageNo = 1
+        this.getList()
+      },
+      handleSuperQuery(params, matchType) {
+        let sqp = {}
+        if (!params || (params && params.length == 0)) {
+          sqp['superQueryParams'] = ''
+          this.$refs.globalAdvancedQueryRef.superQueryFlag = false
+        } else {
+          this.$refs.globalAdvancedQueryRef.superQueryFlag = true
+          sqp['superQueryParams'] = encodeURI(JSON.stringify(params))
+          sqp['superQueryMatchType'] = matchType
+        }
+        this.queryParamQuery = sqp
+        this.pageNo = 1
+        this.getList()
+      },
+
+      tableOnChange(pagination, filters, sorter) {
+        this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+        if (sorter.columnKey == 'attestationRank_dictText') {
+          this.orderByField = 'attestationRank'
+        } else if (sorter.columnKey == 'dutyTerritory_dictText') {
+          this.orderByField = 'dutyTerritory'
+        } else if (sorter.columnKey == 'designDeliverableTypeName') {
+          this.orderByField = 'designDeliverableType'
+        } else if (sorter.columnKey == 'verifyDeliverableTypeName') {
+          this.orderByField = 'verifyDeliverableType'
+        } else if (sorter.columnKey == 'designDutyIdName') {
+          this.orderByField = 'designDutyId'
+        } else if (sorter.columnKey == 'verifyDutyIdName') {
+          this.orderByField = 'verifyDutyId'
+        } else if (sorter.columnKey == 'verifyFlowStatusName') {
+          this.orderByField = 'verifyFlowStatus'
+        } else if (sorter.columnKey == 'designFlowStatusName') {
+          this.orderByField = 'designFlowStatus'
+        } else if (sorter.columnKey == 'attestationType_dictText') {
+          this.orderByField = 'attestationType'
+        } else if (sorter.columnKey == 'attestationRank_dictText') {
+          this.orderByField = 'attestationRank'
+        } else {
+          this.orderByField = sorter.columnKey
+        }
+        this.getList()
+      },
+      onChangeSize(page, pageSize) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let roleCode = this.roleSwitchingCode
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        this.getRoleByUserId()
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        if (queryParam.dutyTerritory) {
+          queryParam.dutyTerritory = '*' + queryParam.dutyTerritory + '*'
+        }
+        let query = {
+          ...this.queryParamQuery,
+          ...queryParam,
+          projectLibraryId: this.$route.query.id,
+          orderBy: this.orderBy,
+          orderByField: this.orderByField,
+          roleCode: roleCode,
+          pageNo: this.pageNo,
+          pageSize: this.pageSize
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+            this.JLoading = false
+            if (this.dataSource.length == 0) {
+              this.$nextTick(() => {
+                let anttablebody = document.getElementsByClassName('ant-table-body')
+                let antfixedLeft = document.querySelectorAll('.ant-table-fixed-left .ant-table-body-inner')
+                let antfixedRight = document.querySelectorAll('.ant-table-fixed-right .ant-table-body-inner')
+                anttablebody[0].classList.add('ant-table-body-one')
+                antfixedLeft[0].classList.add('antfixedLeft')
+                antfixedRight[0].classList.add('antfixedRight')
+              })
+            } else {
+              let anttablebody = document.getElementsByClassName('ant-table-body-one')
+              let antfixedLeft = document.getElementsByClassName('antfixedLeft')
+              let antfixedRight = document.getElementsByClassName('antfixedRight')
+              if (anttablebody && anttablebody.length > 0) {
+                anttablebody[0].classList.remove('ant-table-body-one')
+              }
+              if (antfixedLeft && antfixedLeft.length > 0) {
+                antfixedLeft[0].classList.remove('antfixedLeft')
+              }
+              if (antfixedRight && antfixedRight.length > 0) {
+                antfixedRight[0].classList.remove('antfixedRight')
+              }
+            }
+          } else {
+            this.JLoading = false
+            this.loading = false
+          }
+        })
+      },
+
+      onCheckAllChange(e) {
+        let selectedValue = ['serialNumber', 'title', 'operation']
+        this.checkedList = e.target.checked ? this.customizeList.map(item => item.field) : selectedValue
+        this.selectedValue = this.checkedList
+        this.indeterminate = false
+      },
+      onChange() {
+        this.selectedValue = this.checkedList
+      },
+      getcustomize() {
+        this.customizevisible = true
+      },
+      cancel() {
+        this.customizevisible = false
+      },
+
+      getHeader() {
+        getAction('head/headCustomEO/list', {
+          moduleFlag: '法规清单'
+        }).then((res) => {
+          if (res.success) {
+            if (res.result && res.result.length > 0) {
+              this.columnsAll = res.result
+              for (let j = 0; j < this.columnsAll.length; j++) {
+                for (let i = 0; i < this.column.length; i++) {
+                  if (this.columnsAll[j].title == this.$t('confirmationOfDesignConformity')) {
+                    if (this.column[i].title == this.$t('confirmationOfDesignConformity')) {
+                      if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) {
+                        for (let k = 0; k < this.columnsAll[j].children.length; k++) {
+                          for (let l = 0; l < this.column[i].children.length; l++) {
+                            if (this.columnsAll[j].children[k].dataIndex == this.column[i].children[l].dataIndex) {
+                              this.columnsAll[j].children[k] = this.column[i].children[l]
+                            }
+                          }
+                        }
+                      }
+                    }
+                  } else if (this.columnsAll[j].title == this.$t('verificationAndConformityconfirmation')) {
+                    if (this.column[i].title == this.$t('verificationAndConformityconfirmation')) {
+                      if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) {
+                        for (let k = 0; k < this.columnsAll[j].children.length; k++) {
+                          for (let l = 0; l < this.column[i].children.length; l++) {
+                            if (this.columnsAll[j].children[k].dataIndex == this.column[i].children[l].dataIndex) {
+                              this.columnsAll[j].children[k] = this.column[i].children[l]
+                            }
+                          }
+                        }
+                      }
+                    }
+                  } else {
+                    if (this.column[i].dataIndex == this.columnsAll[j].dataIndex) {
+                      this.columnsAll[j] = this.column[i]
+                    }
+                  }
+                }
+              }
+            } else {
+              this.columnsAll = this.column
+            }
+            let long = localStorage.getItem('language') || 'zh-cn'
+            this.columnsAll.push({
+              title: this.$t('operation'),
+              align: 'left',
+              fixed: 'right',
+              width: long == 'zh-cn' ? 180 : 226,
+              scopedSlots: { customRender: 'operation' }
+            })
+            this.columnsAll.forEach((item) => {
+              if (item.children) {
+                item.children.forEach((val) => {
+                  this.checkedList.push(item.dataIndex, val.dataIndex)
+                })
+              } else {
+                this.checkedList.push(item.dataIndex)
+              }
+            })
+            this.loading = false
+            this.JLoading = false
+          } else {
+            this.JLoading = false
+            this.loading = false
+          }
+        })
+      },
+
+      handleSubmit() {
+        let list = []
+        let uniqueArray = this.selectedValue.filter((item, index, array) => {
+          return array.indexOf(item) === index
+        })
+        uniqueArray.forEach(item => {
+          this.customizeList.forEach((val, index) => {
+            if (item == val.field) {
+              val.sort = index + 1
+              list.push(val)
+            }
+          })
+        })
+        this.confirmLoading = true
+        let headCustomEOList = JSON.parse(JSON.stringify(list))
+        let query = {
+          headCustomEOList: headCustomEOList
+        }
+        postAction('head/headCustomEO/add', query).then((res) => {
+          if (res.success) {
+            this.confirmLoading = false
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.customizevisible = false
+            this.getHeader()
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+            this.confirmLoading = false
+            this.customizevisible = false
+          }
+        })
+      },
+
+      getPersonnelList() {
+        this.getList()
+      },
+      initiateListConfirmationcClick(name) {
+        this.listTitle = this.$t('release')
+        this.timeName = name
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          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]) {
+                dataSource.push(this.dataSource[i])
+              }
+            }
+          }
+          for (let i = 0; i < dataSource.length; i++) {
+            if (dataSource[i].verifyFlowStatus == 'List to be released' ||
+              dataSource[i].verifyFlowStatus == 'Regulatory engineer returns' ||
+              dataSource[i].designFlowStatus == 'List to be released' ||
+              dataSource[i].designFlowStatus == 'Regulatory engineer returns') {
+              if (dataSource[i].regulationOwnerId) {
+                this.detailedSuccessList.push(dataSource[i])
+              } else {
+                this.detailedWarningList.push(
+                < div > { dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } < /div>)
+              }
+            } else {
+              this.detailedWarningList.push(
+              < div > { dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected') } < /div>)
+            }
+          }
+          if (this.detailedSuccessList && this.detailedSuccessList.length > 0) {
+            this.visible = true
+            this.formInline = {}
+          } else {
+            let that = this
+            this.$warning({
+              content: (
+                < div >
+                { that.detailedWarningList }
+                < /div>
+            )
+          })
+          }
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+
+      handleOk() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            if (this.timeName == '清单') {
+              let selectedRowKeys = []
+              this.detailedSuccessList.forEach(res => {
+                selectedRowKeys.push(res.id)
+              })
+              let query = {
+                ids: selectedRowKeys.join(','),
+                projectLibraryId: this.$route.query.id,
+                ...this.formInline
+              }
+              this.confirmLoading = true
+              postAction('/project/projectLawsInventoryEO/studioPublish', query).then((res) => {
+                if (res.success) {
+                  this.$message.success(this.$t('OperationSuccessful'))
+                  this.visible = false
+                  this.selectedRowKeys = []
+                  this.confirmLoading = false
+                  this.getList()
+                } else {
+                  this.$message.warning(this.$t('operationFailed'))
+                  this.confirmLoading = false
+                }
+                let that = this
+                if (this.detailedWarningList.length > 0) {
+                  this.$warning({
+                    content: (
+                      < div >
+                      { that.detailedWarningList }
+                      < /div>
+                  )
+                })
+                }
+                this.detailedSuccessList = []
+                this.detailedWarningList = []
+              })
+            } else {
+              this.confirmLoading = true
+              if (this.updateFlowStatusList && this.updateFlowStatusList.length > 0) {
+                this.updateFlowStatusBatch()
+              }
+              this.completeTaskList = []
+              for (let i = 0; i < this.startProcessList.length; i++) {
+                if (this.startProcessList[i].type == 2) {
+                  this.startProcessList[i].dataList.designDutyDueDate = this.formInline.designDutyDueDate
+                } else if (this.startProcessList[i].type == 4) {
+                  this.startProcessList[i].dataList.verifyDutyDueDate = this.formInline.verifyDutyDueDate
+                }
+                this.startProcess(this.startProcessList[i].dataList, this.startProcessList[i].type, this.startProcessList[i].requestsNum)
+              }
+            }
+          }
+        })
+      },
+
+      startProcess(value, type, index) {
+        let query = {
+          type: type,
+          projectLawsInvnetoryList: value,
+          projectNameId: this.$route.query.projectNameId,
+          projectName: this.$route.query.projectName,
+          projectLawsInventoryId: value.id
+        }
+        postAction('/workFlow/startProcess', query).then((res) => {
+          if (res.success) {
+            this.completeTaskList.push(this.completeTask(value, res.result, index))
+            Promise.all(this.completeTaskList).then((res) => {
+              if (this.requestsNum == res.length) {
+                this.visible = false
+                this.formInline = {}
+                this.selectedRowKeys = []
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.confirmLoading = false
+                this.JTextLoading = false
+                this.getList()
+                if (this.detailedWarningList && this.detailedWarningList.length > 0) {
+                  this.promptInformation(this.detailedWarningList)
+                }
+              }
+            }).catch((error) => {
+              this.JTextLoading = false
+              this.$message.warning(error.message)
+            })
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
+      },
+
+      completeTask(value, taskId, index) {
+        return new Promise((resolve, reject) => {
+          value.handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+          Object.keys(value).forEach(res => {
+            if (value[res] && typeof value[res] == 'string') {
+              value[res] = value[res].replace(/\"/g, '“')
+              value[res] = value[res].replace(/\'/g, '‘')
+            }
+          })
+          let query = {
+            userid: this.userInfo().id,
+            taskId: taskId,
+            json: JSON.stringify(value).replace(/\"/g, '\'')
+          }
+          postAction('/workFlow/completeTask', query).then((res) => {
+            if (res.success) {
+              resolve(res)
+            } else {
+              reject(res)
+            }
+          })
+        })
+      },
+
+      submitOrSendBackClick(num) {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.detailedWarningList = []
+          this.dataWarningList = []
+          let dataSource = []
+          let idList = []
+          this.rowKeysSuccessList = []
+          for (let i = 0; i < this.dataSource.length; i++) {
+            for (let j = 0; j < this.selectedRowKeys.length; j++) {
+              if (this.dataSource[i].id == this.selectedRowKeys[j]) {
+                dataSource.push(this.dataSource[i])
+              }
+            }
+          }
+          for (let i = 0; i < dataSource.length; i++) {
+            if (dataSource[i].verifyFlowStatus == 'List to be checked' ||
+              dataSource[i].designFlowStatus == 'List to be checked' ||
+              dataSource[i].verifyFlowStatus == 'Duty Person Rejected' ||
+              dataSource[i].designFlowStatus == 'Duty Person Rejected') {
+              idList.push(dataSource[i].id)
+              this.rowKeysSuccessList.push(dataSource[i])
+            } else if (dataSource[i].designFlowStatus == 'NA' || dataSource[i].verifyFlowStatus == 'NA') {
+              this.detailedWarningList.push(
+              < div > { dataSource[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
+            } else {
+              this.detailedWarningList.push(
+              < div > { dataSource[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
+            }
+          }
+          if (idList && idList.length > 0) {
+            if (num == 0) {
+              this.startProcessList = []
+              this.updateFlowStatusList = []
+              this.submitClick(this.rowKeysSuccessList)
+            } else {
+              this.visibleComment = true
+              this.formInlineComment = {}
+              this.$nextTick(() => {
+                this.$refs.ruleFormComment.clearValidate()
+              })
+            }
+          } else {
+            this.promptInformation(this.detailedWarningList)
+          }
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+
+      submitClick(dataList, num) {
+        let _this = this
+        this.requestsNum = 0
+        // this.JTextLoading = true
+        for (let i = 0; i < dataList.length; i++) {
+          if ((dataList[i].designFlowStatus == 'List to be checked' || dataList[i].designFlowStatus == 'Duty Person Rejected') &&
+            dataList[i].designDeliverableType == '1645667531513237506') {
+            this.updateFlowStatusList.push({
+              id: dataList[i].id,
+              operateType: 'lawsInventoryDesignUpdateFlowStatus'
+            })
+          } else if (dataList[i].designDeliverableType) {
+            if (!dataList[i].designDutyId) {
+              _this.detailedWarningList.push(
+              < div > { dataList[i].serialNumber + _this.$t('thePersonResponsibleForDesignCannotBeBlank') } < /div>)
+            }
+            if (!dataList[i].designDueDate) {
+              _this.detailedWarningList.push(
+              < div > { dataList[i].serialNumber + _this.$t('theDeadlineForTheDesignCannotBeEmpty') } < /div>)
+            }
+          } else {
+            _this.detailedWarningList.push(
+            < div > { dataList[i].serialNumber + _this.$t('theDeliveryProcessCannotBeEmpty') } < /div>)
+          }
+          if ((dataList[i].verifyFlowStatus == 'List to be checked' || dataList[i].verifyFlowStatus == 'Duty Person Rejected') &&
+            dataList[i].verifyDeliverableType == '1645667531513237506') {
+            this.updateFlowStatusList.push({
+              id: dataList[i].id,
+              operateType: ' lawsInventoryVerifyUpdateFlowStatus'
+            })
+          } else if (dataList[i].verifyDeliverableType) {
+            if (!dataList[i].verifyDueDate) {
+              _this.detailedWarningList.push(
+              < div > { dataList[i].serialNumber + _this.$t('theDeadlineComplianceProcessCannotEmpty') } < /div>)
+            }
+            if (!dataList[i].verifyDutyId) {
+              _this.detailedWarningList.push(
+              < div > { dataList[i].serialNumber + _this.$t('thePersonResponsibleForVerifyingEmpty') } < /div>)
+            }
+          } else {
+            _this.detailedWarningList.push(
+            < div > { dataList[i].serialNumber + _this.$t('theVerificationComplianceProcessCannotBeEmpty') } < /div>)
+          }
+          if (dataList[i].designFlowStatus == 'List to be checked' || dataList[i].designFlowStatus == 'Duty Person Rejected') {
+            if (dataList[i].designDeliverableType && dataList[i].designDutyId && dataList[i].designDueDate) {
+              if (dataList[i].designDeliverableType == '1645667531513237506') {
+
+              } else {
+                this.requestsNum++
+                this.startProcessList.push({
+                  dataList: dataList[i],
+                  type: 2,
+                  requestsNum: this.requestsNum
+                })
+              }
+              // _this.startProcess(dataList[i], 2, this.requestsNum)
+            }
+          } else if (dataList[i].designFlowStatus == 'NA') {
+            _this.detailedWarningList.push(
+            < div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
+          } else {
+            _this.detailedWarningList.push(
+            < div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
+          }
+          if (dataList[i].verifyFlowStatus == 'List to be checked' || dataList[i].verifyFlowStatus == 'Duty Person Rejected') {
+            if (dataList[i].verifyDeliverableType && dataList[i].verifyDutyId && dataList[i].verifyDueDate) {
+              if (dataList[i].verifyDeliverableType == '1645667531513237506') {
+
+              } else {
+                this.requestsNum++
+                this.startProcessList.push({
+                  dataList: dataList[i],
+                  type: 4,
+                  requestsNum: this.requestsNum
+                })
+              }
+              // _this.startProcess(dataList[i], 4, this.requestsNum)
+            }
+          } else if (dataList[i].verifyFlowStatus == 'NA') {
+            _this.detailedWarningList.push(
+            < div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
+          } else {
+            _this.detailedWarningList.push(
+            < div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
+          }
+        }
+        if (this.requestsNum == 0) {
+          if (this.updateFlowStatusList.length > 0) {
+            this.updateFlowStatusBatch()
+          } else {
+            if (_this.detailedWarningList && _this.detailedWarningList.length > 0) {
+              _this.promptInformation(_this.detailedWarningList)
+            }
+          }
+          // this.JTextLoading = false
+        } else {
+          this.listTitle = this.$t('initiateTask')
+          this.timeName = '任务'
+          this.visible = true
+          this.isDesignCompliance = false
+          this.isVerifyingCompliance = false
+          for (let i = 0; i < this.startProcessList.length; i++) {
+            if (this.startProcessList[i].type == 2) {
+              this.isDesignCompliance = true
+            } else if (this.startProcessList[i].type == 4) {
+              this.isVerifyingCompliance = true
+            }
+          }
+        }
+      },
+      updateFlowStatusBatch() {
+        let query = {
+          flowStatus: 'NA',
+          lawsInventoryArray: this.updateFlowStatusList
+        }
+        postAction('/project/projectLawsInventoryEO/updateFlowStatusBatch', query).then((res) => {
+          if (res.success) {
+            if (this.requestsNum == 0) {
+              this.visible = false
+              this.selectedRowKeys = []
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.confirmLoading = false
+              this.JTextLoading = false
+              this.getList()
+              if (this.detailedWarningList && this.detailedWarningList.length > 0) {
+                this.promptInformation(this.detailedWarningList)
+              }
+            }
+          } else {
+            if (this.requestsNum == 0) {
+              this.confirmLoading = false
+              this.$message.warning(this.$t('operationFailed'))
+            }
+          }
+        })
+      },
+      handleOkComment() {
+        this.$refs.ruleFormComment.validate(valid => {
+          if (valid) {
+            let content = []
+            let ids = []
+            if (this.rowKeysSuccessList && this.rowKeysSuccessList.length > 0) {
+              this.rowKeysSuccessList.forEach(res => {
+                content.push(res.serialNumber)
+                ids.push(res.id)
+              })
+            }
+            this.rejectCauseAdd(this.formInlineComment.commentContent, ids)
+            this.confirmLoadingComment = true
+            this.projectCommentAdd(content, this.formInlineComment.commentContent)
+            let query = {
+              projectLibraryId: this.$route.query.id,
+              ids: ids.join(',')
+            }
+            postAction('/project/projectLawsInventoryEO/regulationOwnerReturned', query).then((res) => {
+              if (res.success) {
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.selectedRowKeys = []
+                this.confirmLoading = false
+                this.visibleComment = false
+                this.confirmLoadingComment = false
+                this.rowKeysSuccessList = []
+                this.getList()
+                if (this.detailedWarningList && this.detailedWarningList.length > 0) {
+                  this.promptInformation(this.detailedWarningList)
+                  this.detailedWarningList = []
+                }
+              } else {
+                this.$message.warning(this.$t('operationFailed'))
+                this.confirmLoading = false
+                this.confirmLoadingComment = false
+              }
+            })
+          }
+        })
+      },
+      projectCommentAdd(content, commentContent) {
+        let query = {
+          commentContent: this.$t('For') + content.join(',') + this.$t('markedRejection') + '：' + commentContent,
+          projectLibraryId: this.$route.query.id
+        }
+        postAction('/project/projectCommentEO/add', query).then((res) => {
+        })
+      },
+
+      rejectCauseAdd(rejectCause, ids) {
+        let rejectTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+        let query = {
+          rejectUserId: this.userInfo().id,
+          rejectTime: rejectTime,
+          rejectCause: rejectCause,
+          projectLawsInventoryId: ids.join(','),
+          rejectType: '0'
+        }
+        postAction('/project/projectLawsInventoryRejectCauseEO/add', query).then((res) => {
+
+        })
+      },
+
+      handleCancelComment() {
+        this.visibleComment = false
+      },
+      handleCancel() {
+        this.formInline = {}
+        this.visible = false
+      },
+
+      dateChange(item) {
+        this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
+      },
+
+      clickButtonToUpload(item, num) {
+        if (num == 1) {
+          this.isResultReported = true
+          this.fileTitle = this.$t('resultReported')
+        } else {
+          this.isResultReported = false
+          this.fileTitle = this.$t('deliverableTemplate')
+        }
+        this.loading = true
+        this.visibleFile = true
+        getAction('sys/common/getFileInfos', { id: item }).then((res) => {
+          if (res.success) {
+            this.dataSourceFile = res.result
+            this.dataSourceFile.forEach((val) => {
+              let fileName = val.fileName
+              let index1 = fileName.lastIndexOf('.')
+              let index2 = fileName.length
+              let fileSuffix = fileName.substring(index1, index2)
+              val.fileSuffix = fileSuffix
+            })
+            this.loading = false
+          } else {
+            this.dataSourceFile = []
+            this.loading = false
+          }
+        })
+      },
+
+      customizeClick() {
+        this.$refs.customizeListRef.transferModel(this.columnsAll)
+      },
+
+      bringInRelevantPersonnelClick() {
+        let _this = this
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.$confirm({
+            content: _this.$t('confirmBringInRelevantPersonnel'),
+            onOk() {
+              let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+              postAction(_this.url.matchRelevantPeople, {
+                ids: selectedRowKeys.join(','),
+                projectLibraryId: _this.$route.query.id
+              }).then((res) => {
+                if (res.success) {
+                  _this.$message.success(_this.$t('OperationSuccessful'))
+                  _this.selectedRowKeys = []
+                  _this.getList()
+                } else {
+                  _this.$message.warning(_this.$t('operationFailed'))
+                }
+              })
+            }
+          })
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+
+      resultReportedClick(val) {
+        if (this.roleSwitchingCode == 1) {
+          this.$refs.resultReportedUploadRef.clickButtonToUploadFile(val)
+        } else {
+          if (val.fileId) {
+            this.clickButtonToUpload(val.fileId, 1)
+          } else {
+            this.$message.warning(this.$t('reportNotUploaded'))
+          }
+        }
+      },
+      standardClick(row) {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: row.standId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      viewFileClick(item) {
+        this.$refs.viewFileModelRef.clickButtonToUpload(item)
+      },
+      pdfPreview(fileQuery) {
+        let fileName = fileQuery.fileName
+        let index1 = fileName.lastIndexOf('.')
+        let index2 = fileName.length
+        let fileSuffix = fileName.substring(index1, index2)
+        if (fileSuffix == '.pdf') {
+          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id + '&userName=' + this.userInfo().username))
+        } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
+          window.open(url, '_blank')
+        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
+          window.open(url, '_blank')
+        } else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + fileQuery.id + fileSuffix)
+          window.open(url, '_blank')
+        } else {
+          downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
+        }
+      },
+      download(item) {
+        downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username })
+      },
+      toResubmitClick() {
+        let _this = this
+        if (this.selectedRowKeys.length == 0) {
+          this.$message.warning(this.$t('selectLeastOne'))
+        } else if (this.selectedRowKeys.length > 1) {
+          this.$message.warning(this.$t('OnlyOneSelected'))
+        } else if (this.selectedRowKeys.length == 1) {
+          let dataSource = []
+          for (let i = 0; i < this.dataSource.length; i++) {
+            for (let j = 0; j < this.selectedRowKeys.length; j++) {
+              if (this.dataSource[i].id == this.selectedRowKeys[j]) {
+                dataSource.push(this.dataSource[i])
+              }
+            }
+          }
+          let isDesign = false
+          let isVerify = false
+          if (dataSource[0].designFlowStatus == 'Compliance') {
+            isDesign = true
+          }
+          if (dataSource[0].verifyFlowStatus == 'Compliance') {
+            isVerify = true
+          }
+          if (isDesign || isVerify) {
+            this.$refs.toResubmitFormRef.getData(dataSource[0], isDesign, isVerify)
+          } else {
+            this.$message.warning(this.$t('selectDesignConformanceAsConformance'))
+          }
+        }
+      },
+      toResubmitFormForm() {
+        this.getList()
+      }
+      // profileClick() {
+      //   let _this = this
+      //   this.$confirm({
+      //     width: 760,
+      //     content: _this.$t('NoteConfirmTheChange'),
+      //     onOk() {
+      //       let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+      //       postAction('/project/projectLawsInventoryEO/resetFlowTemp', {
+      //         ids: idList.join(','),
+      //         projectLibraryId: _this.$route.query.id
+      //       }).then((res) => {
+      //         if (res.success) {
+      //           _this.$message.success(_this.$t('OperationSuccessful'))
+      //           _this.selectedRowKeys = []
+      //           _this.getList()
+      //         } else {
+      //           _this.$message.warning(_this.$t('operationFailed'))
+      //         }
+      //       })
+      //     }
+      //   })
+      // }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
+
+  .doc-detail {
+    background: #fff;
+    height: 100%;
+
+    .Virtual-detail-header {
+      width: 100%;
+      height: 68px;
+      line-height: 68px;
+      padding: 0 32px 0 32px;
+      box-sizing: border-box;
+      display: flex;
+      justify-content: space-between;
+      border-bottom: 2px #eff1f3 solid;
+      background: #fff;
+
+      .Virtual-detail-title {
+        display: inline-block;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        font-size: 20px;
+        font-weight: 400;
+        color: #040B29;
+        line-height: 68px;
+      }
+
+      .doc-detail-right {
+        width: 800px;
+        line-height: 68px;
+        display: flex;
+      }
+    }
+
+    .Virtual-detail-content {
+      padding: 0 38px 0 38px;
+      box-sizing: border-box;
+      font-size: 16px;
+
+      .box-title-text-add {
+        line-height: 1.4;
+      }
+
+      .title-text-add {
+        display: inline-block;
+        font-weight: 500;
+        margin-right: 16px;
+        height: 42px;
+        line-height: 42px;
+      }
+    }
+  }
+
+  .header-text {
+    font-size: 16px;
+    font-weight: 400;
+    height: 60px;
+    color: #000F16;
+    line-height: 40px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .box-title-text-index {
+    line-height: 1.4;
+    display: flex;
+  }
+
+  .title-text {
+    width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .title-text-index {
+    width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    line-height: 40px;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: calc(100% - 126px);
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .box-button {
+    height: 38px;
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+    margin-bottom: 20px;
+  }
+
+  .operator-text-left {
+    font-size: 14px;
+    margin-right: 20px;
+    background: #eff1f3;
+    padding: 8px 8px;
+    cursor: pointer;
+    border-radius: 4px;
+  }
+
+  /deep/ .ant-popover-buttons {
+    display: none !important;
+  }
+
+  .operator-text-title {
+    cursor: pointer;
+    margin-right: 22px;
+    font-size: 14px;
+    font-weight: 400;
+    color: #040B29;
+    margin-bottom: 22px;
+  }
+
+  .customize-text {
+    /*height: 1533px;*/
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+  }
+
+  .customize-text-title {
+    margin-left: 0;
+    font-size: 14px;
+    font-weight: 400;
+    color: #040B29;
+    margin-bottom: 22px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    z-index: 100;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .itemModelComment {
+    width: calc(100% - 64px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .title-text-Comment {
+    width: 74px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 48px;
+  }
+
+  .textName {
+    width: 100%;
+    overflow: hidden;
+    display: -webkit-box;
+    text-overflow: ellipsis;
+    /*! autoprefixer: off */
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    /*! autoprefixer: on;*/
+    text-justify: inter-ideograph;
+    word-break: break-all
+  }
+
+  .buttom-box {
+    width: 100%;
+    text-align: right;
+    font-size: 16px;
+    font-weight: 500;
+    color: #000F16;
+  }
+
+  ::v-deep .ant-card-body {
+    padding: 24px 24px 0 24px;
+  }
+
+  ::v-deep .ant-table-row:first-child {
+    background: #fff !important;
+    opacity: 0.9;
+  }
+
+  ::v-deep .ant-table-body {
+    background: transparent !important;
+  }
+
+  ::v-deep .ant-table-body::-webkit-scrollbar {
+    z-index: 10000000;
+  }
+
+  /*::v-deep .ant-table .ant-table-fixed-left {*/
+  /*  height: auto !important;*/
+  /*  bottom: 8px !important;*/
+  /*}*/
+
+  /*::v-deep .ant-table .ant-table-fixed-right {*/
+  /*  height: auto !important;*/
+  /*  bottom: 8px !important;*/
+  /*}*/
+
+  ::v-deep .ant-table-fixed-header .ant-table-body-inner {
+    overflow: visible;
+  }
+
+  /*::v-deep .ant-table-fixed-left .ant-table-body-inner {*/
+  /*  overflow-y: scroll;*/
+  /*}*/
+
+  /*::v-deep .ant-table-fixed-right .ant-table-body-inner {*/
+  /*  overflow-y: scroll;*/
+  /*}*/
+  //::v-deep .ant-table-body {
+  //  padding-bottom: 7px;
+  //}
+
+  ::v-deep .ant-table-body-inner {
+    padding-bottom: 10px;
+  }
+
+  ::v-deep .ant-table-scroll .ant-table-header::-webkit-scrollbar {
+    /*height: 0;*/
+    width: 0;
+  }
+
+  ::v-deep .ant-table-body-one {
+    padding-bottom: 0 !important;
+  }
+
+  ::v-deep .antfixedLeft {
+    padding-bottom: 0 !important;
+    overflow: scroll !important;
+  }
+
+  ::v-deep .antfixedRight {
+    padding-bottom: 0 !important;
+    overflow: scroll !important;
+  }
+
+  .viewFile {
+    color: #00B3BE;
+    cursor: pointer;
+  }
+
+  ::v-deep .ant-table-thead > tr > th .ant-table-header-column {
+    max-width: none !important;
+  }
+
+  ::v-deep .page .ant-select-selection__rendered {
+    height: 32px !important;
+    line-height: 32px !important;
+  }
+
+  ::v-deep .ant-table-thead > tr > th[colspan]:not([colspan='1']) {
+    text-align: left;
+    padding-left: 16px !important;
+    border-right: 1px solid #e8e8e8;
+  }
+
+  .operator-text-title:last-child {
+    margin-bottom: 0;
+  }
+
+  .noteConfirm {
+    font-size: 14px;
+    margin-bottom: 10px;
+  }
+</style>
+<style lang="less">
+  .box-input .ant-select-selection {
+    height: 38px !important;
+  }
+
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+  }
+
+  .popconfirm {
+    z-index: 999;
+  }
+
+  .popconfirm .ant-popover-buttons {
+    display: none !important;
+  }
+
+  .popconfirm .anticon-exclamation-circle {
+    display: none !important;
+  }
+
+  popconfirmmize {
+    z-index: 999;
+  }
+
+  .popconfirmmize .ant-popover-buttons {
+    display: none !important;
+  }
+
+  .popconfirmmize .anticon-exclamation-circle {
+    display: none !important;
+  }
+
+  .popconfirmmize .ant-popover-message {
+    padding: 4px 0 36px !important;
+  }
+
+  //.popconfirm .ant-popover-inner-content{
+  //  padding: 0px 16px;
+  //}
+  //
+  //.popconfirm .ant-popover-message{
+  //  padding: 23px 0 1px;
+  //}
+
+  .ant-table-placeholder {
+    padding: 0;
+    border-top: none;
+  }
+
+  .itemModelComment .ant-form-item-control-wrapper {
+    width: 100% !important;
+  }
+
+  //.customizetable .ant-table-thead > tr > th {
+  //  height: 46px !important;
+  //padding: 8px 8px !important;
+  //font-weight: bold;
+  //background: #f3f6f6;
+  //}
+  //.ant-table-row-cell-ellipsis{
+  //   padding: 0!important;
+  //}
+  .second {
+    padding: 0 !important;
+  }
+
+  //.tableList .ant-table-tbody > tr > td{
+  //  color: #040B29 ;
+  //}
+
+  //.tableList .ant-table-thead > tr{
+  //  padding: 2px 16px !important;
+  //}
+
+  //.tableList .ant-table-thead >tr{
+  //  height: 56px !important;
+  //}
+</style>
+<style lang="less">
+  /* vue-draggable-resizable@2.1.0 begin */
+  .resize-table-th {
+    position: relative;
+    overflow: hidden;
+  }
+
+  .resize-table-th .table-draggable-handle {
+    height: 100% !important;
+    bottom: 0;
+    left: auto !important;
+    right: -5px;
+    cursor: col-resize;
+    touch-action: none;
+  }
+
+  .confirmClass .ant-modal-confirm-body {
+    display: flex;
+  }
+
+  .confirmClass .ant-modal-confirm-body .ant-modal-confirm-content {
+    margin-top: 0 !important;
+  }
+
+  /* 插件 end */
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulationsView.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulationsView.vue
new file mode 100644
index 000000000..25a12d88f
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulationsView.vue
@@ -0,0 +1,623 @@
+<template>
+  <div>
+    <a-drawer
+      :title="$t('view')"
+      :maskClosable="false"
+      :width="900"
+      placement="right"
+      :closable="true"
+      @close="handleCancel"
+      :visible="visible"
+      style="height: 100%;overflow: auto;padding-bottom: 53px;">
+      <a-spin :spinning="confirmLoading">
+        <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('standard')">{{$t('standard')}}</span>
+                </div>
+                <div class="itemModel">
+                  {{formInline.serialNumber ? formInline.serialNumber : '--'}}
+                </div>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('title')">{{$t('title')}}</span>
+                </div>
+                <div class="itemModel">
+                  {{formInline.title ? formInline.title : '--'}}
+                </div>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('subtitle')">{{$t('subtitle')}}</span>
+                </div>
+                <div class="itemModel">
+                  {{formInline.subtitle? formInline.subtitle : '--'}}
+                </div>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('applicableSupplement')">{{$t('applicableSupplement')}}</span>
+                </div>
+                <div class="itemModel">
+                  {{formInline.applicableSupplement ? formInline.applicableSupplement : '--'}}
+                </div>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('certificationType')">{{$t('certificationType')}}</span>
+                </div>
+                <div class="itemModel">
+                  {{formInline.attestationType_dictText ? formInline.attestationType_dictText : '--'}}
+                </div>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('certificationLevel')">{{$t('certificationLevel')}}</span>
+                </div>
+                <div class="itemModel">
+                  {{formInline.attestationRank_dictText ? formInline.attestationRank_dictText : '--'}}
+                </div>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
+                </div>
+                <div class="itemModel">
+                  {{formInline.dutyTerritory_dictText ? formInline.dutyTerritory_dictText : '--'}}
+                </div>
+              </div>
+            </a-col>
+            <a-col :span="12" v-if="formInline.roleCodeIndex == 0 || formInline.roleCodeIndex == 1">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span>
+                </div>
+                <div class="itemModel">
+                  {{formInline.regulationOwnerName ? formInline.regulationOwnerName : '--'}}
+                </div>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 || formInline.roleCodeIndex == 1">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('certifiedEngineer')">{{$t('certifiedEngineer')}}</span>
+                </div>
+                <div class="itemModel">
+                  {{formInline.homologationEngineerName ? formInline.homologationEngineerName : '--'}}
+                </div>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
+                </div>
+                <div class="itemModel">
+                  {{formInline.engineeringInterfacePersonName ? formInline.engineeringInterfacePersonName : '--'}}
+                </div>
+              </div>
+            </a-col>
+          </a-row>
+          <div class="header-text">
+            &nbsp;{{$t('confirmationOfDesignConformity')}}
+          </div>
+          <a-row :gutter="24">
+            <!--            <a-col :span="12">-->
+            <!--              <div class="box-title-text">-->
+            <!--                <div class="title-text">-->
+            <!--                <span class="title-text-text"-->
+            <!--                      :title="$t('Sponsor')">{{$t('Sponsor')}}</span>-->
+            <!--                </div>-->
+            <!--                <div class="itemModel">-->
+            <!--                  {{formInline.designInitiatorName ? formInline.designInitiatorName : '&#45;&#45;'}}-->
+            <!--                </div>-->
+            <!--              </div>-->
+            <!--            </a-col>-->
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('personLiable')">{{$t('personLiable')}}</span>
+                </div>
+                <div class="itemModel">
+                  {{formInline.designDutyName ? formInline.designDutyName : '--'}}
+                </div>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('cutoffTime')">{{$t('cutoffTime')}}</span>
+                </div>
+                <div class="itemModel">
+                  {{formInline.designDueDate ? formInline.designDueDate : '--'}}
+                </div>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
+                </div>
+                <div class="itemModel">
+                  {{formInline.designDeliverableTypeName ? formInline.designDeliverableTypeName : '--'}}
+                </div>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
+                </div>
+                <div class="itemModel">
+                <span v-if="formInline.designDeliverableTemplate === 'null' || formInline.designDeliverableTemplate === '' ||
+                  formInline.designDeliverableTemplate == null">
+                 --
+                </span>
+                  <a @click="clickButtonToUpload(formInline.designDeliverableTemplate)" v-else>
+                    {{ $t('viewFile') }}
+                  </a>
+                </div>
+              </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('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
+                </div>
+                <div class="itemModel" :prop="'designRemark'">
+                  {{formInline.designRemark ? formInline.designRemark : '--'}}
+                </div>
+              </div>
+            </a-col>
+          </a-row>
+          <!--          <div class="header-text" v-if="formInline.roleCodeIndex == 0 ||-->
+          <!--        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&-->
+          <!--         formInline.homologationEngineerId == userInfoQuery.id) ||-->
+          <!--        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&-->
+          <!--        formInline.regulationOwnerId == userInfoQuery.id)">-->
+          <!--            &nbsp;{{$t('PrehomoConfirmation')}}-->
+          <!--          </div>-->
+          <!--          <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||-->
+          <!--        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&-->
+          <!--         formInline.homologationEngineerId == userInfoQuery.id) ||-->
+          <!--        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&-->
+          <!--        formInline.regulationOwnerId == userInfoQuery.id)">-->
+          <!--            <a-col :span="12">-->
+          <!--              <div class="box-title-text">-->
+          <!--                <div class="title-text">-->
+          <!--                <span class="title-text-text"-->
+          <!--                      :title="$t('Sponsor')">{{$t('Sponsor')}}</span>-->
+          <!--                </div>-->
+          <!--                <div class="itemModel">-->
+          <!--                  {{formInline.prehomoInitiatorName ? formInline.prehomoInitiatorName : '&#45;&#45;'}}-->
+          <!--                </div>-->
+          <!--              </div>-->
+          <!--            </a-col>-->
+          <!--            <a-col :span="12">-->
+          <!--              <div class="box-title-text">-->
+          <!--                <div class="title-text">-->
+          <!--                <span class="title-text-text"-->
+          <!--                      :title="$t('personLiable')">{{$t('personLiable')}}</span>-->
+          <!--                </div>-->
+          <!--                <div class="itemModel">-->
+          <!--                  {{formInline.prehomoDutyName ? formInline.prehomoDutyName : '&#45;&#45;'}}-->
+          <!--                </div>-->
+          <!--              </div>-->
+          <!--            </a-col>-->
+          <!--          </a-row>-->
+          <!--          <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||-->
+          <!--        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&-->
+          <!--         formInline.homologationEngineerId == userInfoQuery.id) ||-->
+          <!--        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&-->
+          <!--        formInline.regulationOwnerId == userInfoQuery.id)">-->
+          <!--            <a-col :span="12">-->
+          <!--              <div class="box-title-text">-->
+          <!--                <div class="title-text">-->
+          <!--                <span class="title-text-text"-->
+          <!--                      :title="$t('cutoffTime')">{{$t('cutoffTime')}}</span>-->
+          <!--                </div>-->
+          <!--                <div class="itemModel">-->
+          <!--                  {{formInline.prehomoDueDate ? formInline.prehomoDueDate : '&#45;&#45;'}}-->
+          <!--                </div>-->
+          <!--              </div>-->
+          <!--            </a-col>-->
+          <!--          </a-row>-->
+          <!--          <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||-->
+          <!--        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&-->
+          <!--         formInline.homologationEngineerId == userInfoQuery.id) ||-->
+          <!--        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&-->
+          <!--        formInline.regulationOwnerId == userInfoQuery.id)">-->
+          <!--            <a-col :span="12">-->
+          <!--              <div class="box-title-text">-->
+          <!--                <div class="title-text">-->
+          <!--                <span class="title-text-text"-->
+          <!--                      :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>-->
+          <!--                </div>-->
+          <!--                <div class="itemModel">-->
+          <!--                  {{formInline.prehomoDeliverableTypeName ? formInline.prehomoDeliverableTypeName : '&#45;&#45;'}}-->
+          <!--                </div>-->
+          <!--              </div>-->
+          <!--            </a-col>-->
+          <!--            <a-col :span="12">-->
+          <!--              <div class="box-title-text">-->
+          <!--                <div class="title-text">-->
+          <!--                <span class="title-text-text"-->
+          <!--                      :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>-->
+          <!--                </div>-->
+          <!--                <div class="itemModel">-->
+          <!--                <span v-if="formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === '' ||-->
+          <!--                  formInline.prehomoDeliverableTemplate == null">-->
+          <!--                  &#45;&#45;-->
+          <!--                </span>-->
+          <!--                  <a @click="clickButtonToUpload(formInline.prehomoDeliverableTemplate)" v-else>-->
+          <!--                    {{ $t('viewFile') }}-->
+          <!--                  </a>-->
+          <!--                </div>-->
+          <!--              </div>-->
+          <!--            </a-col>-->
+          <!--          </a-row>-->
+          <!--          <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||-->
+          <!--        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&-->
+          <!--         formInline.homologationEngineerId == userInfoQuery.id) ||-->
+          <!--        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&-->
+          <!--        formInline.regulationOwnerId == userInfoQuery.id)">-->
+          <!--            <a-col :span="24">-->
+          <!--              <div class="box-title-text">-->
+          <!--                <div class="title-text">-->
+          <!--                <span class="title-text-text"-->
+          <!--                      :title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>-->
+          <!--                </div>-->
+          <!--                <div class="itemModel">-->
+          <!--                  {{formInline.prehomoRemark ? formInline.prehomoRemark : '&#45;&#45;'}}-->
+          <!--                </div>-->
+          <!--              </div>-->
+          <!--            </a-col>-->
+          <!--          </a-row>-->
+          <div class="header-text">
+            &nbsp;{{$t('verificationAndConformityconfirmation')}}
+          </div>
+          <a-row :gutter="24">
+            <!--            <a-col :span="12">-->
+            <!--              <div class="box-title-text">-->
+            <!--                <div class="title-text">-->
+            <!--                <span class="title-text-text"-->
+            <!--                      :title="$t('Sponsor')">{{$t('Sponsor')}}</span>-->
+            <!--                </div>-->
+            <!--                <div class="itemModel">-->
+            <!--                  {{formInline.verifyInitiatorName ? formInline.verifyInitiatorName : '&#45;&#45;'}}-->
+            <!--                </div>-->
+            <!--              </div>-->
+            <!--            </a-col>-->
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('personLiable')">{{$t('personLiable')}}</span>
+                </div>
+                <div class="itemModel">
+                  {{formInline.verifyDutyName ? formInline.verifyDutyName : '--'}}
+                </div>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('cutoffTime')">{{$t('cutoffTime')}}</span>
+                </div>
+                <div class="itemModel">
+                  {{formInline.verifyDueDate ? formInline.verifyDueDate : '--'}}
+                </div>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
+                </div>
+                <div class="itemModel">
+                  {{formInline.verifyDeliverableTypeName ? formInline.verifyDeliverableTypeName : '--'}}
+                </div>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
+                </div>
+                <div class="itemModel">
+                <span v-if="formInline.verifyDeliverableTemplate === 'null' || formInline.verifyDeliverableTemplate === '' ||
+                  formInline.verifyDeliverableTemplate == null">
+                  --
+                </span>
+                  <a @click="clickButtonToUpload(formInline.verifyDeliverableTemplate)" v-else>
+                    {{ $t('viewFile') }}</a>
+                </div>
+              </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('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
+                </div>
+                <div class="itemModel">
+                  {{formInline.verifyRemark ? formInline.verifyRemark : '--'}}
+                </div>
+              </div>
+            </a-col>
+          </a-row>
+          <div class="header-text" v-if="rejectCauseList && rejectCauseList.length > 0">
+            {{$t('listConfirmationRejectionReason')}}
+          </div>
+          <div v-if="rejectCauseList && rejectCauseList.length > 0"
+               v-for="(item,index) in rejectCauseList">
+            <a-row :gutter="24">
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('rejectedBy')">{{$t('rejectedBy')}}</span>
+                  </div>
+                  <div class="itemModel">
+                    {{item.createBy ? item.createBy : '--'}}
+                  </div>
+                </div>
+              </a-col>
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('rejectionTime')">{{$t('rejectionTime')}}</span>
+                  </div>
+                  <div class="itemModel">
+                    {{item.rejectTime ? item.rejectTime : '--'}}
+                  </div>
+                </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('rejectReason')">{{$t('rejectReason')}}</span>
+                  </div>
+                  <div class="itemModel">
+                    {{item.rejectCause ? item.rejectCause : '--'}}
+                  </div>
+                </div>
+              </a-col>
+            </a-row>
+          </div>
+          <div class="header-text" v-if="rejectCauseListOne && rejectCauseListOne.length > 0">
+            {{$t('taskConfirmationRejectionReason')}}
+          </div>
+          <div v-if="rejectCauseListOne && rejectCauseListOne.length > 0"
+               v-for="(item,index) in rejectCauseListOne">
+            <a-row :gutter="24">
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('rejectedBy')">{{$t('rejectedBy')}}</span>
+                  </div>
+                  <div class="itemModel">
+                    {{item.createBy ? item.createBy : '--'}}
+                  </div>
+                </div>
+              </a-col>
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('rejectionTime')">{{$t('rejectionTime')}}</span>
+                  </div>
+                  <div class="itemModel">
+                    {{item.rejectTime ? item.rejectTime : '--'}}
+                  </div>
+                </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('rejectReason')">{{$t('rejectReason')}}</span>
+                  </div>
+                  <div class="itemModel">
+                    {{item.rejectCause ? item.rejectCause : '--'}}
+                  </div>
+                </div>
+              </a-col>
+            </a-row>
+          </div>
+        </a-form-model>
+      </a-spin>
+      <div class="drawer-bootom-button">
+        <a-button style="margin-right: 8px" @click="handleCancel">{{$t('cancel')}}</a-button>
+      </div>
+    </a-drawer>
+    <viewFileModel ref="viewFileModelRef"/>
+  </div>
+
+</template>
+
+<script>
+  import viewFileModel from '@/components/viewFileModel/index'
+  import { getAction, postAction, putAction } from '@/api/manage'
+  import { mapGetters } from 'vuex'
+
+  export default {
+    name: 'listOfRegulationsView',
+    components: {
+      viewFileModel
+    },
+    props: ['url'],
+    data() {
+      return {
+        visible: false,
+        confirmLoading: false,
+        rules: {},
+        rulesData: {},
+        formInline: {},
+        disabled: false,
+        userInfoQuery: {},
+        rejectCauseList: [],
+        rejectCauseListOne: []
+      }
+    },
+    mounted() {
+      this.userInfoQuery = this.userInfo()
+    },
+    methods: {
+      ...mapGetters(['userInfo']),
+      editModel(item) {
+        this.visible = true
+        this.formInline = item
+        this.getRejectCause(item.id)
+        this.formInline = { ...this.formInline }
+      },
+      getRejectCause(id) {
+        let query = {
+          projectLawsInventoryId: id
+        }
+        getAction('/project/projectLawsInventoryRejectCauseEO/list', query).then((res) => {
+          if (res.success) {
+            this.rejectCauseList = []
+            this.rejectCauseListOne = []
+            if (res.result && res.result.length > 0) {
+              res.result.forEach(val => {
+                if (val.rejectType == '0') {
+                  this.rejectCauseList.push(val)
+                } else if (val.rejectType == '1') {
+                  this.rejectCauseListOne.push(val)
+                }
+              })
+            }
+          } else {
+            this.rejectCauseList = []
+            this.rejectCauseListOne = []
+          }
+        })
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      clickButtonToUpload(item) {
+        this.$refs.viewFileModelRef.clickButtonToUpload(item)
+      }
+    }
+  }
+</script>
+<style scoped>
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    margin-bottom: 20px;
+    /*align-items: center;*/
+  }
+
+  .title-text {
+    width: 114px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    line-height: 24px;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    font-size: 16px;
+    word-break: break-all;
+    color: #040B29;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .header-text {
+    font-size: 16px;
+    font-weight: bold;
+    margin-left: 15px;
+    /*border-bottom: 1px #d9d9d9 dashed;*/
+    height: 30px;
+    margin-bottom: 30px;
+  }
+
+  .formAdd {
+    margin-bottom: 40px;
+  }
+
+  .button-text {
+    height: 38px;
+    width: calc(100% - 100px);
+    line-height: 38px;
+    background: #fff;
+    border: 1px #00B3BE solid;
+    color: #00B3BE;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    z-index: 100;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/modifyOperator.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/modifyOperator.vue
new file mode 100644
index 000000000..b9cbbdbcd
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/modifyOperator.vue
@@ -0,0 +1,165 @@
+<template>
+  <div>
+    <a-modal
+      :title="$t('modifyOperator')"
+      :width="600"
+      :visible="visible"
+      :confirm-loading="confirmLoading"
+      :maskClosable="false"
+      @ok="handleOk"
+      @cancel="handleCancel"
+    >
+      <a-spin :spinning="confirmLoading">
+        <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+          <a-row :gutter="24" v-if="isDesignFlow">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text"
+                        :title="$t('designComplianceProcess')">{{ $t('designComplianceProcess') }}</span>
+                </div>
+                <a-form-model-item class="itemModel-multi" prop="designTransferUserIdName">
+                  <PersonnelSelection
+                    :query="{db_field_name:'designTransferUserId',db_field_txt:$t('designComplianceProcess')+$t('Operator')}"
+                    :isSingleChoice="true"
+                    :personneQuery="formInline"
+                    v-if="visible"
+                    @change="PersonnelSelectionChange"
+                    v-model="formInline.designTransferUserIdName"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24" v-if="isVerifyFlow">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text"
+                        :title="$t('validationComplianceProcess')">{{ $t('validationComplianceProcess') }}</span>
+                </div>
+                <a-form-model-item class="itemModel-multi" prop="verifyTransferUserIdName">
+                  <PersonnelSelection
+                    :query="{db_field_name:'verifyTransferUserId',db_field_txt:$t('validationComplianceProcess')+$t('Operator')}"
+                    :isSingleChoice="true"
+                    :personneQuery="formInline"
+                    v-if="visible"
+                    @change="PersonnelSelectionChange"
+                    v-model="formInline.verifyTransferUserIdName"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+        </a-form-model>
+      </a-spin>
+    </a-modal>
+  </div>
+
+</template>
+
+<script>
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
+  import { getAction, postAction, putAction } from '@/api/manage'
+
+  export default {
+    name: 'modifyOperator',
+    components: {
+      PersonnelSelection
+    },
+    data() {
+      return {
+        visible: false,
+        confirmLoading: false,
+        formInline: {},
+        rules: {},
+        isDesignFlow: false,
+        isVerifyFlow: false,
+        selectedRowKeys: {}
+      }
+    },
+    methods: {
+      getData(val, isDesignFlow, isVerifyFlow) {
+        this.selectedRowKeys = val
+        this.visible = true
+        this.isDesignFlow = isDesignFlow
+        this.isVerifyFlow = isVerifyFlow
+        this.formInline = {}
+        this.$nextTick(() => {
+          this.$refs.ruleForm.clearValidate()
+        })
+      },
+      handleOk() {
+        if (this.formInline.designTransferUserIdName || this.formInline.verifyTransferUserIdName) {
+          let query = {
+            projectLibraryId: this.$route.query.id,
+            ids: this.selectedRowKeys.id,
+            designTransferUserId: this.formInline.designTransferUserId,
+            verifyTransferUserId: this.formInline.verifyTransferUserId
+          }
+          this.confirmLoading = true
+          postAction('/project/projectLawsInventoryEO/compulsoryTransfer', query).then((res) => {
+            if (res.success) {
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.confirmLoading = false
+              this.visible = false
+              this.$emit('modifyOperatorForm')
+            } else {
+              this.$message.warning(this.$t('operationFailed'))
+              this.confirmLoading = false
+              this.visible = false
+            }
+          })
+        } else {
+          this.$message.warning(this.$t('oneThePersonnelMustBeSelected'))
+        }
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      PersonnelSelectionChange(value, id) {
+        this.formInline[value] = id
+        this.formInline = { ...this.formInline }
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+  }
+
+  .title-text {
+    width: 124px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 42px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 150px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .formAdd {
+    margin-bottom: 40px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue
new file mode 100644
index 000000000..816b9ba99
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue
@@ -0,0 +1,701 @@
+<!--平台件-->
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('title')">
+                <span>{{$t('title')}}</span>
+              </div>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                       v-model="queryParam.title"></a-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('Relevantlawsregulations')">
+                <span>{{$t('Relevantlawsregulations')}}</span>
+              </div>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('Relevantlawsregulations')"
+                       v-model="queryParam.lawsName"></a-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('RelatedItems')">
+                <span>{{$t('RelatedItems')}}</span>
+              </div>
+              <a-select allowClear
+                        class="box-input"
+                        v-model="queryParam.projectId"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        showSearch
+                        optionFilterProp="label"
+                        :autoClearSearchValue="false"
+                        :placeholder="$t('PleaseSelect')+$t('RelatedItems')">
+                <a-select-option v-for="(item, key) in projectNameList"
+                                 :key="key"
+                                 :label="item.projectName"
+                                 :value="item.id">
+                     <span style="display: inline-block;width: 100%" :title=" item.projectName ">
+                           {{ item.projectName}}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </div>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('problemType')">
+                  <span>{{$t('problemType')}}</span>
+                </div>
+                <j-dict-select-tag class="box-input" v-model="queryParam.problemType"
+                                   :placeholder="$t('PleaseSelect')+$t('problemType')"
+                                   :type="'select'"
+                                   @changeQuery="onChange"
+                                   :triggerChange="false" :dictCode="'wen4_ti2_lei4_xing2'"/>
+              </div>
+            </a-col>
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('statisticalNodes')">
+                  <span>{{$t('statisticalNodes')}}</span>
+                </div>
+                <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
+                          allowClear
+                          show-search
+                          class="box-input"
+                          optionFilterProp="label"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          v-model="queryParam.dutyTerritory">
+                  <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
+                                   :key="key"
+                                   :label="item.key"
+                                   :value="item.key">
+                               <span style="display: inline-block;width: 100%" :title=" item.key ">
+                                     {{ item.key }}
+                               </span>
+                  </a-select-option>
+                </a-select>
+              </div>
+            </a-col>
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('Problemstate')">
+                  <span>{{$t('Problemstate')}}</span>
+                </div>
+                <a-select allowClear
+                          class="box-input"
+                          v-model="queryParam.problemState"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          showSearch
+                          optionFilterProp="label"
+                          :autoClearSearchValue="false"
+                          :placeholder="$t('PleaseSelect')+$t('Problemstate')">
+                  <a-select-option v-for="(item, key) in ProblemstateList"
+                                   :label='item'
+                                   :key="key"
+                                   :value="item">
+                  <span style="display: inline-block;width: 100%" :title=" item">
+                    {{ item }}
+                  </span>
+                  </a-select-option>
+                </a-select>
+              </div>
+            </a-col>
+          </template>
+          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                   <a @click="handleToggleSearch">
+                        {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                         <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                 </a>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+               </a-col>
+      </span>
+        </a-row>
+      </a-form>
+    </div>
+    <div class="table-operator">
+      <div class="operator-text" @click="handleAdd" v-has="'ncrTrack:add'">
+        <a-icon type="plus"/>
+        {{$t('newlyAdded')}}
+      </div>
+      <div @click="handleExport" v-has="'ncrTrack:exportData'" class="operator-text">
+        <a-icon type="export" :rotate="-90"/>
+        {{ $t('export') }}
+      </div>
+    </div>
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        rowKey="uuid"
+        :components="drag(columns,'columns')"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: '100%'}"
+        @change="tableOnChange"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :data-source="dataSource"
+        :columns="columns"
+      >
+        <!--        <span slot="standard" slot-scope="text,result">-->
+        <!--           <a @click="designFlowStatusClick(result)" class="textName" :title="text">-->
+        <!--             {{text}}-->
+        <!--           </a>-->
+        <!--        </span>-->
+        <div slot="CertificationProgress" slot-scope="text,result">
+             <span v-if="result.problemState == $t('red')" class="box-content-Progress box-content-cou nonConformityColor"
+                   :style="{'width':long=='zh-cn'?'90px' : '120px'}"
+             >
+              {{result.problemState ? result.problemState : ''}}
+             </span>
+          <span v-if="result.problemState == $t('green')" class="box-content-Progress box-content-cou accordColor"
+                :style="{'width':long=='zh-cn'?'90px' : '120px'}"
+          >
+              {{result.problemState ? result.problemState : ''}}
+             </span>
+          <span v-if="result.problemState == $t('yellow')" class="box-content-Progress box-content-cou TrackedColor"
+                :style="{'width':long=='zh-cn'?'90px' : '120px'}"
+          >
+              {{result.problemState ? result.problemState : ''}}
+             </span>
+        </div>
+<!--        <span slot="problemType" slot-scope="text,result">-->
+<!--                   <span>{{result.flag== 'NEW'?result.problemType_dictText:result.problemType}}</span>-->
+<!--                </span>-->
+        <span slot="operation" slot-scope="text,record">
+          <a class="text-operation" v-has="'ncrTrack:check'"
+             @click="detil(record)">
+                {{ $t('See') }}
+              </a>
+              <a class="text-operation" v-if="record.flag == 'NEW'" v-has="'ncrTrack:edit'"
+                 @click="edit(record)">
+                {{ $t('edit') }}
+              </a>
+              <a class="text-operation" v-if="record.flag == 'NEW'" v-has="'ncrTrack:delete'"
+                 @click="deleteLib(record)">
+                {{ $t('deleteLib') }}
+              </a>
+        </span>
+      </a-table>
+    </div>
+    <div class="page" v-if="dataSource.length > 0">
+      <a-pagination
+        :show-total="total => $t('total')+` ${total} `+$t('strip')"
+        show-quick-jumper
+        show-size-changer
+        :page-size.sync="pageSize"
+        :total="total"
+        :current="pageNo"
+        @change="pageOnChange"
+        @showSizeChange="SizeChange"
+      />
+    </div>
+    <designCompliance ref="designComplianceRef"/>
+    <addModel ref="addModelRef" @addModelForm="addModelForm"/>
+    <detilModel ref="detilModelRef"/>
+  </a-card>
+</template>
+
+<script>
+import { getAction, postAction, downloadFile, deleteAction ,downloadFilePost} from '@/api/manage'
+import PersonnelSelection from '@/components/PersonnelSelection/index'
+import designCompliance from '../../../toDoCenter/projectRegulationTasks/components/designCompliance'
+import store from '@/store/'
+import addModel from './addModelconformance'
+import moment from 'moment'
+import detilModel from './detilModel'
+import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+export default {
+  name: 'projectNonConformance',
+  components: {
+    PersonnelSelection,
+    addModel,
+    detilModel,
+    designCompliance
+  },
+  mixins:[ResizeHeader, ResizeColumnProvide],
+  data() {
+    return {
+      queryParam: {},
+      loading: false,
+      dataSource: [],
+      selectedRowKeys: [],
+      projectNameList: [],
+      firstLevelDutyTerritoryList:[],
+      ProblemstateList:[this.$t('red'),this.$t('yellow'),this.$t('green'),],
+      // CertificationColor: {
+      //   $t('red'): 'nonConformityColor',
+      //   $t('green'): 'accordColor',
+      //   $t('yellow'): 'TrackedColor',
+      // },
+      toggleSearchStatus: false,
+      columns: [
+        {
+          title: this.$t('title'),
+          align: 'left',
+          dataIndex: 'title',
+          width: 170,
+          sorter:true,
+          ellipsis: true
+        },
+        {
+          title: this.$t('Relevantlawsregulations'),
+          align: 'left',
+          dataIndex: 'lawsName',
+          width: 170,
+          sorter:true,
+          ellipsis: true
+        },
+        {
+          title: this.$t('RelatedItems'),
+          align: 'left',
+          dataIndex: 'projectName',
+          width: 170,
+          sorter:true,
+          ellipsis: true
+        },
+        {
+          title: this.$t('problemType'),
+          align: 'left',
+          dataIndex: 'problemType_dictText',
+          width: 170,
+          sorter:true,
+          ellipsis: true,
+          scopedSlots: { customRender: 'problemType' }
+        },
+        {
+          title: this.$t('statisticalNodes'),
+          align: 'left',
+          dataIndex: 'dutyTerritory',
+          width: 100,
+          sorter:true,
+          ellipsis: true
+        },
+        {
+          title: this.$t('creator'),
+          align: 'left',
+          dataIndex: 'createBy',
+          width: 100,
+          sorter:true,
+          ellipsis: true
+        },
+        {
+          title: this.$t('Problemstate'),
+          align: 'left',
+          dataIndex: 'problemState',
+          width: 120,
+          sorter:true,
+          ellipsis: true,
+          scopedSlots: { customRender: 'CertificationProgress' }
+        },
+        {
+          title: this.$t('createTime'),
+          align: 'left',
+          dataIndex: 'createTime',
+          sorter:true,
+          width: 180
+        },
+        {
+          title: this.$t('updateTime'),
+          align: 'left',
+          dataIndex: 'updateTime',
+          sorter:true,
+          width: 180
+        },
+        {
+          title: this.$t('operation'),
+          align: 'left',
+          fixed: 'right',
+          width: localStorage.getItem('language') == 'zh-cn' ? 160 : 180,
+          scopedSlots: { customRender: 'operation' }
+        }
+      ],
+      total: 0,
+      pageSize: 10,
+      pageNo: 1,
+      orderBy: '1',
+      orderByField: '',
+      long: '',
+      isPersonnelSelection:true,
+      url: {
+        page: '/project/projectLawsInventoryEO/queryNotComplianList',
+        exportData: '/project/projectLawsInventoryEO/exportNotComplianList'
+      },
+      content: []
+    }
+  },
+  created() {
+    if (store.getters.userInfo) {
+      this.$socketPublic.dispatch('webSocketInit')//初始化ws
+    }
+  },
+  mounted() {
+    this.long = localStorage.getItem('language') || 'zh-cn'
+    this.getList()
+    this.getNameList()
+    this.getFirstLevelDutyTerritory()
+  },
+  watch: {
+    '$socketPublic.state.msg': {
+      //处理接收到的消息
+      handler: function(res) {
+        let that = this
+        let data = JSON.parse(res.data)
+        if (data.msgId) {
+          this.getList()
+        }
+      }
+    }
+  },
+  methods: {
+    getFirstLevelDutyTerritory() {
+      getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
+        if (res.success) {
+          this.firstLevelDutyTerritoryList = res.result
+        } else {
+          this.firstLevelDutyTerritoryList = []
+        }
+      })
+    },
+    getNameList() {
+      getAction('/project/projectNameInfoEO/queryProjectNameList', {}).then((res) => {
+        if (res.success) {
+          this.projectNameList = res.result || []
+        } else {
+          this.projectNameList = []
+        }
+      })
+    },
+    handleToggleSearch() {
+      this.toggleSearchStatus = !this.toggleSearchStatus
+    },
+    searchQuery() {
+      this.pageNo = 1
+      this.getList()
+    },
+    addModelForm(){
+      this.getList()
+    },
+    onSelectChange(value) {
+      this.content = []
+      this.selectedRowKeys = value
+      if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+        this.dataSource.forEach(res => {
+          this.selectedRowKeys.forEach(val => {
+            if (res.uuid == val) {
+              this.content.push({
+                id: res.id || res.uuid,
+                flowType: res.flowType
+              })
+            }
+          })
+        })
+      }
+    },
+    searchReset() {
+      this.isPersonnelSelection = false
+      this.$nextTick(()=>{
+        this.isPersonnelSelection = true
+      })
+      this.pageNo = 1
+      this.queryParam = {}
+      this.getList()
+    },
+    pageOnChange(page, pageSize) {
+      this.pageNo = page
+      this.getList()
+    },
+    SizeChange(page, pageSize) {
+      this.pageNo = 1
+      this.pageSize = pageSize
+      this.getList()
+    },
+    tableOnChange(pagination, filters, sorter) {
+      this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+      this.orderByField = sorter.columnKey
+      this.getList()
+    },
+    onChange(value){
+      console.log(value)
+      this.queryParam.problemType_dictText = value
+    },
+    getList() {
+      if(this.queryParam.problemType_dictText){
+        delete this.queryParam.problemType
+      }
+      let query = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        orderBy: this.orderBy,
+        orderByField: this.orderByField,
+        projectLibraryId: this.$route.query.id,
+        projectName:this.$route.query.projectName,
+        ...this.queryParam
+      }
+      this.loading = true
+      getAction(this.url.page, query).then((res) => {
+        if (res.success) {
+          if (res.result.current > 1 && res.result.records.length == 0) {
+            this.pageNo = 1
+            this.getList()
+            return
+          }
+          this.dataSource = res.result.records || []
+          this.total = res.result.total
+          this.loading = false
+        } else {
+          this.dataSource = []
+          this.loading = false
+        }
+      })
+    },
+    handleAdd(){
+      this.$refs.addModelRef.add()
+    },
+    edit(record){
+      this.$refs.addModelRef.edit(JSON.parse(JSON.stringify(record)))
+    },
+    detil(record){
+      if(record.flag == 'NEW'){
+        this.$refs.detilModelRef.edit(JSON.parse(JSON.stringify(record)))
+      }else{
+        this.designFlowStatusClick(record)
+      }
+    },
+    deleteLib(record){
+      let _this = this
+      this.$confirm({
+        content: _this.$t('ConfirmDelete'),
+        onOk() {
+          deleteAction('/project/problemManagementEO/deleteBatch', { ids: record.uuid }).then((res) => {
+            if (res.success) {
+              _this.$message.success(_this.$t('OperationSuccessful'))
+              _this.getList()
+            } else {
+              _this.$message.warning(res.message)
+            }
+          })
+        }
+      })
+    },
+    handleExport() {
+      let query = {
+        ...this.queryParam,
+        ncrTrackVOList: this.content,
+        projectLibraryId: this.$route.query.id,
+        projectName:this.$route.query.projectName,
+      }
+      let date = moment(new Date()).format('YYYY-MM-DD')
+      downloadFilePost(this.url.exportData, this.$t('Problemanagement') + date + '.zip', query, this.Deselect)
+    },
+    Deselect() {
+      this.selectedRowKeys = []
+    },
+    PersonnelSelectionChange(value, id) {
+      this.queryParam[value] = id
+      this.queryParam = { ...this.queryParam }
+      console.log(this.queryParam)
+    },
+
+    //流程状态点击事件
+    designFlowStatusClick(row, name) {
+      let query = {}
+      let TaskKey = ''
+      if (row.flowType == '2') {
+        if (row.flowStatus == 'Task to be confirmed' || row.flowStatus == 'Duty Person Rejected') {
+          TaskKey = 'zrrqr'
+        } else if (row.flowStatus == 'Results to be submitted' || row.flowStatus == 'Non-Compliance' ||row.flowStatus == 'To be tracked') {
+          TaskKey = 'zrrtjjfw'
+        } else if (row.flowStatus == 'Results to be reviewed' ||
+          row.flowStatus == 'Compliance' ||
+          row.flowStatus == 'NA') {
+          TaskKey = 'fggcssh'
+        }
+        query = {
+          actiProcInstId: row.actiProcInstId,
+          projectTaskInventoryId: row.id,
+          projectLibraryId: this.$route.query.id,
+          TaskKey: TaskKey,
+          isDisplay: false,
+          flowType: row.flowType,
+          Sponsor: 'regulationOwnerName',
+          personLiable: 'designDutyIdName',
+          typeOfDeliverables: 'designDeliverableTypeName',
+          deliverableTemplate: 'designDeliverableTemplate',
+          DueDate: 'designDueDate',
+          remarks: 'designRemark',
+        }
+      } else if(row.flowType == '4'){
+        if (row.flowStatus == 'Task to be confirmed' || row.flowStatus == 'Duty Person Rejected') {
+          TaskKey = 'zrrqr'
+        } else if (row.flowStatus == 'Results to be submitted' || row.flowStatus == 'Non-Compliance' ||row.flowStatus == 'To be tracked') {
+          TaskKey = 'zrrtjjfw'
+        } else if (row.flowStatus == 'Results to be reviewed' ||
+          row.flowStatus == 'Compliance' ||
+          row.flowStatus == 'NA') {
+          TaskKey = 'fggcssh'
+        }
+        query = {
+          actiProcInstId: row.actiProcInstId,
+          projectTaskInventoryId: row.id,
+          projectLibraryId: this.$route.query.id,
+          TaskKey: TaskKey,
+          flowType: row.flowType,
+          isDisplay: false,
+          Sponsor: 'regulationOwnerName',
+          personLiable: 'verifyDutyIdName',
+          typeOfDeliverables: 'verifyDeliverableTypeName',
+          deliverableTemplate: 'verifyDeliverableTemplate',
+          DueDate: 'verifyDueDate',
+          remarks: 'verifyRemark',
+        }
+      }
+      this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), row.flowTypeName)
+    },
+    standardClick(val) {
+      let num = val.prcType
+      let query = {
+        taskIds: val.taskId,
+        projectTaskInventoryId: val.projectLawsInventoryId,
+        projectLibraryId: val.projectLibraryId,
+        projectName: val.projectName,
+        id: val.projectLibraryId,
+        serialNumber: val.serialNumber,
+        actiProcInstId: val.prcId,
+        primaryKeyId: val.projectTaskInventoryDetailId,
+        TaskKey: val.taskDefinitionKey,
+        isDisplay: val.status == 'NotDone' ? true : false
+      }
+      switch (num) {
+        case '2':
+          query.flowType = 2
+          query.Sponsor = 'designInitiatorName'
+          query.personLiable = 'designDutyName'
+          query.typeOfDeliverables = 'designDeliverableTypeName'
+          query.deliverableTemplate = 'designDeliverableTemplate'
+          query.DueDate = 'designDueDate'
+          query.remarks = 'designRemark'
+          break
+        case '3':
+          query.flowType = 3
+          query.Sponsor = 'prehomoInitiatorName'
+          query.personLiable = 'prehomoDutyName'
+          query.typeOfDeliverables = 'prehomoDeliverableTypeName'
+          query.deliverableTemplate = 'prehomoDeliverableTemplate'
+          query.DueDate = 'prehomoDueDate'
+          query.remarks = 'prehomoRemark'
+          break
+        case '4':
+          query.flowType = 4
+          query.Sponsor = 'verifyInitiatorName'
+          query.personLiable = 'verifyDutyName'
+          query.typeOfDeliverables = 'verifyDeliverableTypeName'
+          query.deliverableTemplate = 'verifyDeliverableTemplate'
+          query.DueDate = 'verifyDueDate'
+          query.remarks = 'verifyRemark'
+          break
+      }
+      let newUrl = this.$router.resolve({
+        path: '/taskListProcess',
+        query: query
+      })
+      window.open(newUrl.href, '_blank')
+    }
+  }
+}
+</script>
+<style scoped>
+@import '~@assets/less/common.less';
+
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+
+.title-text {
+  width: 110px;
+  color: #000F16;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  margin-top: 3px;
+  text-align: right;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.box-input {
+  display: inline-block;
+  width: 70%;
+  height: 38px;
+  margin-top: 2px;
+}
+
+.box-button {
+  height: 38px;
+  /*margin-top: 2px;*/
+}
+
+.page {
+  text-align: right;
+  margin-top: 20px;
+}
+.box-content-Progress {
+  width: 78px;
+  height: 32px;
+  display: inline-block;
+  text-align: center;
+  line-height: 32px;
+  border-radius: 4px;
+  background: #f1f3f5;
+  color: #919399;
+}
+.accordColor {
+  background: #dbf6e2;
+  color: #26BD4B;
+}
+
+.nonConformityColor {
+  background: #f3dddd;
+  color: #E83030;
+}
+
+.TrackedColor {
+  background: #f6ebdb;
+  color: #FDA71C;
+}
+
+.notInvolvedColor {
+  background: #eef1f4;
+  color: #707486;
+}
+
+.submittedColor {
+  color: #00B3BE;
+  background: #ddf3f4;
+}
+.textName {
+  width: 100%;
+  overflow: hidden;
+  display: -webkit-box;
+  text-overflow: ellipsis;
+  /*! autoprefixer: off */
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  /*! autoprefixer: on;*/
+  text-justify: inter-ideograph;
+  word-break: break-all
+}
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/projectStatus.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/projectStatus.vue
new file mode 100644
index 000000000..add208228
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/projectStatus.vue
@@ -0,0 +1,74 @@
+<!--平台件-->
+<template>
+  <a-card :bordered="false">
+    <a-tabs type="card" v-model="activeKey" @change="activeKeyChange" class="ant-tabs">
+      <a-tab-pane :key="$t('regulatoryComplianceManagement')" :tab="$t('regulatoryComplianceManagement')">
+        <regulatoryCompliance @currentStatus="currentStatus"
+                                          :idList="idList"
+                                          v-if="activeKey == $t('regulatoryComplianceManagement')"/>
+      </a-tab-pane>
+      <a-tab-pane :key="$t('certificationActivityManagement')" :tab="$t('certificationActivityManagement')">
+        <certificationActivity @currentStatus="currentStatus" :idList="idList"
+                                 v-if="activeKey == $t('certificationActivityManagement')"/>
+      </a-tab-pane>
+      <a-tab-pane :key="$t('Problemanagement')" :tab="$t('Problemanagement')">
+        <nonConformance @currentStatus="currentStatus" v-if="activeKey == $t('Problemanagement')"/>
+      </a-tab-pane>
+    </a-tabs>
+  </a-card>
+</template>
+
+<script>
+  import regulatoryCompliance from './regulatoryCompliance'
+  import certificationActivity from './certificationActivity'
+  import nonConformance from './nonConformance'
+  import { getAction, postAction } from '@/api/manage'
+
+  export default {
+    name: 'projectStatus',
+    components: {
+      regulatoryCompliance,
+      certificationActivity,
+      nonConformance,
+    },
+    data() {
+      return {
+        activeKey: this.$t('regulatoryComplianceManagement'),
+        selectedRowKeys: [],
+        idList: []
+      }
+    },
+    methods: {
+      activeKeyChange(){
+         this.$emit('projectStatusForm',this.activeKey)
+      },
+      currentStatus(item) {
+        this.$emit('currentStatus', item)
+      },
+      versionStatisticsClick() {
+        this.$refs.versionStatisticsRef.addModel(JSON.parse(JSON.stringify(this.selectedRowKeys)))
+      },
+      versionStatisticsForm(value) {
+        this.idList = []
+        let activeKey = JSON.parse(JSON.stringify(this.activeKey))
+        this.activeKey = ''
+        if (value && value.length > 0) {
+          value.forEach(res => {
+            this.idList.push(JSON.parse(res).id)
+          })
+        }
+        this.selectedRowKeys = JSON.parse(JSON.stringify(value))
+        this.$nextTick(() => {
+          this.activeKey = activeKey
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  @import '~@assets/less/common.less';
+  ::v-deep .ant-card-body{
+    padding: 0 0 24px 0 ;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/regulatoryCompliance.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/regulatoryCompliance.vue
new file mode 100644
index 000000000..9b9619dbe
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/regulatoryCompliance.vue
@@ -0,0 +1,397 @@
+<!--平台件-->
+<template>
+  <div class="box-content">
+    <div class="box-content-top">
+      <div class="total-text">
+        <span>{{$t('totalTable')+' : '+mainTopNum}}</span>
+      </div>
+      <div id="main-top"></div>
+    </div>
+    <div class="box-content-left">
+      <div class="total-text">
+        <span>{{$t('totalTable')+' : '+mainLeftNum}}</span>
+      </div>
+      <div id="main-left"></div>
+    </div>
+    <div class="box-content-right">
+      <div class="total-text">
+        <span>{{$t('totalTable')+' : '+mainRightNum}}</span>
+      </div>
+      <div id="main-right"> </div>
+    </div>
+    <responsibilityList @responsibility="responsibility" ref="responsibilityListRef"/>
+  </div>
+</template>
+
+<script>
+  import * as echarts from 'echarts'
+  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+  import responsibilityList from './responsibilityList'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+  export default {
+    name: 'regulatoryCompliance',
+    components: {
+      responsibilityList
+    },
+    props: {
+      idList: {
+        type: Array,
+        default: []
+      }
+    },
+    mixins: [ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        loading: false,
+        url: {
+          getProjectDetailsStatistics: '/project/projectLibraryBase/getProjectDetailsStatistics'
+        },
+        mainTopNum: 0,
+        mainLeftNum: 0,
+        mainRightNum: 0,
+        columns: [
+          {
+            title: this.$t('red'),
+            align: 'left',
+            dataIndex: 'redCount',
+            width: 139
+          },
+          {
+            title: this.$t('yellow'),
+            align: 'left',
+            dataIndex: 'yellowCount',
+            width: 139
+          },
+          {
+            title: this.$t('green'),
+            align: 'left',
+            dataIndex: 'greenCount',
+            width: 139
+          },
+          {
+            title: this.$t('blue'),
+            align: 'left',
+            dataIndex: 'blueCount',
+            width: 139
+          }
+        ]
+      }
+    },
+    mounted() {
+      this.getData()
+    },
+    methods: {
+      getData() {
+        let id = ''
+        if (this.idList && this.idList.length > 0) {
+          id = this.idList.join(',')
+        } else {
+          id = this.$route.query.id
+        }
+        getAction(this.url.getProjectDetailsStatistics, { id: id }).then((res) => {
+          if (res.success) {
+            if (res.result) {
+              let mainTopDataSource = res.result.taskToConfirmMap ? res.result.taskToConfirmMap.taskToConfirmMapList : []
+              let mainLeftDataSource = res.result.designComplianceMap ? res.result.designComplianceMap.designComplianceMapList : []
+              let mainRightDataSource = res.result.verifyComplianceMap ? res.result.verifyComplianceMap.verifyComplianceMapList : []
+              this.mainTopEcharts(mainTopDataSource)
+              this.mainLeftEcharts(mainLeftDataSource)
+              this.mainRightEcharts(mainRightDataSource)
+            }
+          }
+        })
+      },
+      getEcharts(chart, title, color, data) {
+        var myChart = echarts.init(document.getElementById(chart))
+        myChart.setOption({
+          title: {
+            text: title
+          },
+          tooltip: {
+            trigger: 'item',
+            textStyle: {
+              fontWeight: 'normal',
+              fontSize: 14,
+              color: '#040B29',
+              fontFamily: 'BlueSkyNoto'
+            },
+            formatter: function(parms) {
+              let str = parms.marker + ' ' + parms.data.name + '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' + parms.data.value + ' (' + parms.percent + '%)'
+              return str
+            }
+          },
+          legend: {
+            itemWidth: 12,
+            itemHeight: 12,
+            bottom: '0',
+            left: 'center',
+            itemGap: 30,
+            icon: 'circle'
+          },
+          series: [
+            {
+              name: title,
+              type: 'pie',
+              radius: ['40%', '54%'],
+              avoidLabelOverlap: false,
+              label: {
+                show: false,
+                position: 'center'
+              },
+              labelLine: {
+                show: false
+              },
+              color: color,
+              data: data
+            }
+          ]
+        })
+        myChart.on('click', (params) => {
+          let query = {}
+          if (params.seriesName == this.$t('regulatoryTaskConfirmation')) {
+            query = {
+              title: params.seriesName+'-'+params.name,
+              projectLibraryId: this.$route.query.id,
+              operatorType: 'queryFGTaskToConfirmStatistics',
+              status: params.data.status
+            }
+          } else if (params.seriesName == this.$t('designCompliance')) {
+            query = {
+              title: params.seriesName+'-'+params.name,
+              projectLibraryId: this.$route.query.id,
+              operatorType: 'queryDesignStatistics',
+              status: params.data.status
+            }
+          } else if (params.seriesName == this.$t('verifyCompliance')) {
+            query = {
+              title: params.seriesName+'-'+params.name,
+              projectLibraryId: this.$route.query.id,
+              operatorType: 'queryVerifyStatistics',
+              status: params.data.status
+            }
+          }
+          this.$refs.responsibilityListRef.getData(query)
+        })
+      },
+
+      mainTopEcharts(dataSource) {
+        let data = []
+        let color = []
+        this.mainTopNum = 0
+        if (dataSource && dataSource.length > 0) {
+          this.dataSource = [{}]
+          dataSource.forEach(res => {
+            if (res.taskAffirmStatus == 'Not started') {
+              data.push({
+                value: res.taskAffirmStatusCount,
+                name: this.$t('notLaunch'),
+                color: '#00B3BE',
+                status: res.taskAffirmStatus
+              })
+              color.push('#00B3BE')
+            } else if (res.taskAffirmStatus == 'List to confirm') {
+              data.push({
+                value: res.taskAffirmStatusCount,
+                name: this.$t('listToConfirm'),
+                color: '#FDA71C',
+                status: res.taskAffirmStatus
+              })
+              color.push('#FDA71C')
+            } else if (res.taskAffirmStatus == 'Accepted') {
+              data.push({
+                value: res.taskAffirmStatusCount,
+                name: this.$t('accept'),
+                color: '#26BC4B',
+                status: res.taskAffirmStatus
+              })
+              color.push('#26BC4B')
+            } else if (res.taskAffirmStatus == 'Rejected') {
+              data.push({
+                value: res.taskAffirmStatusCount,
+                name: this.$t('refuse'),
+                color: '#E83030',
+                status: res.taskAffirmStatus
+              })
+              color.push('#E83030')
+            }
+            this.mainTopNum += res.taskAffirmStatusCount
+          })
+        }
+        this.getEcharts('main-top', this.$t('regulatoryTaskConfirmation'), color, data)
+      },
+
+      mainLeftEcharts(dataSource) {
+        let data = []
+        let color = []
+        this.mainLeftNum = 0
+        if (dataSource && dataSource.length > 0) {
+          this.dataSource = [{}]
+          dataSource.forEach(res => {
+            if (res.designFlowTaskStatus == 'Not started') {
+              data.push({
+                value: res.designFlowTaskStatusCount,
+                name: this.$t('notLaunch'),
+                color: '#00B3BE',
+                status: res.designFlowTaskStatus
+              })
+              color.push('#00B3BE')
+            } else if (res.designFlowTaskStatus == 'List to confirm') {
+              data.push({
+                value: res.designFlowTaskStatusCount,
+                name: this.$t('listToConfirm'),
+                color: '#FDA71C',
+                status: res.designFlowTaskStatus
+              })
+              color.push('#FDA71C')
+            } else if (res.designFlowTaskStatus == 'Compliance') {
+              data.push({
+                value: res.designFlowTaskStatusCount,
+                name: this.$t('compliance'),
+                color: '#26BC4B',
+                status: res.designFlowTaskStatus
+              })
+              color.push('#26BC4B')
+            } else if (res.designFlowTaskStatus == 'Non-Compliance') {
+              data.push({
+                value: res.designFlowTaskStatusCount,
+                name: this.$t('nonCompliance'),
+                color: '#707486',
+                status: res.designFlowTaskStatus
+              })
+              color.push('#707486')
+            }
+            this.mainLeftNum += res.designFlowTaskStatusCount
+          })
+        }
+        this.getEcharts('main-left', this.$t('designCompliance'), color, data)
+      },
+
+      mainRightEcharts(dataSource) {
+        let data = []
+        let color = []
+        this.mainRightNum = 0
+        if (dataSource && dataSource.length > 0) {
+          this.dataSource = [{}]
+          dataSource.forEach(res => {
+            if (res.verifyFlowTaskStatus == 'Not started') {
+              data.push({
+                value: res.verifyFlowTaskStatusCount,
+                name: this.$t('notLaunch'),
+                color: '#00B3BE',
+                status: res.verifyFlowTaskStatus
+              })
+              color.push('#00B3BE')
+            } else if (res.verifyFlowTaskStatus == 'List to confirm') {
+              data.push({
+                value: res.verifyFlowTaskStatusCount,
+                name: this.$t('listToConfirm'),
+                color: '#FDA71C',
+                status: res.verifyFlowTaskStatus
+              })
+              color.push('#FDA71C')
+            } else if (res.verifyFlowTaskStatus == 'Compliance') {
+              data.push({
+                value: res.verifyFlowTaskStatusCount,
+                name: this.$t('compliance'),
+                color: '#26BC4B',
+                status: res.verifyFlowTaskStatus
+              })
+              color.push('#26BC4B')
+            } else if (res.verifyFlowTaskStatus == 'Non-Compliance') {
+              data.push({
+                value: res.verifyFlowTaskStatusCount,
+                name: this.$t('nonCompliance'),
+                color: '#707486',
+                status: res.verifyFlowTaskStatus
+              })
+              color.push('#707486')
+            }
+            this.mainRightNum += res.verifyFlowTaskStatusCount
+          })
+        }
+        this.getEcharts('main-right', this.$t('verifyCompliance'), color, data)
+      },
+
+      responsibility(item) {
+        this.$emit('currentStatus', item)
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  .box-content {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+
+    .box-content-top {
+      width: 100%;
+      position: relative;
+      margin-top: 4px;
+      height: 346px;
+      border: 2px #eff1f3 solid;
+      border-radius: 6px;
+
+      #main-top {
+        width: 100%;
+        height: 100%;
+        padding: 20px 24px;
+        box-sizing: border-box;
+      }
+    }
+
+    .box-content-left {
+      width: calc(50% - 10px);
+      margin-top: 20px;
+      height: 346px;
+      position: relative;
+      border: 2px #eff1f3 solid;
+      border-radius: 6px;
+
+      #main-left {
+        width: 100%;
+        height: 100%;
+        padding: 20px 24px;
+        box-sizing: border-box;
+      }
+    }
+
+    .box-content-right {
+      width: calc(50% - 10px);
+      margin-top: 20px;
+      height: 346px;
+      position: relative;
+      border-radius: 6px;
+      border: 2px #eff1f3 solid;
+
+      #main-right {
+        width: 100%;
+        height: 100%;
+        padding: 24px;
+        box-sizing: border-box;
+      }
+    }
+  }
+
+  .headerText {
+    margin-left: 30px;
+    color: #040B29;
+    font-weight: 400;
+    position: absolute;
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .total-text {
+    position: absolute;
+    right: 28px;
+    top: 19px;
+    font-size: 18px;
+    font-weight: bold;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/responsibilityList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/responsibilityList.vue
new file mode 100644
index 000000000..86259d364
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/responsibilityList.vue
@@ -0,0 +1,157 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @cancel="visible = false"
+  >
+    <template slot="footer">
+      <a-button key="back" @click="visible = false">
+        {{$t('cancel')}}
+      </a-button>
+    </template>
+    <!--        <div style="text-align: right;margin-bottom: 10px">-->
+    <!--            <div @click="handleExport" class="operator-text">-->
+    <!--                <a-icon type="export" :rotate="-90"/>-->
+    <!--                {{$t('export')}}-->
+    <!--            </div>-->
+    <!--        </div>-->
+    <a-table
+      ref="table"
+      :components="drag(columns,'columns')"
+      :loading="loading"
+      :pagination="false"
+      :scroll="{x: '100%',y:400}"
+      :data-source="dataSource"
+      @change="tableOnChange"
+      :columns="columns"
+    >
+      <!--         -->
+      <a slot="areaOfResponsibility" @click="areaOfResponsibilityClick(result)" slot-scope="text,result">
+                {{text}}
+      </a>
+    </a-table>
+  </a-modal>
+</template>
+
+<script>
+  import { getAction, postAction, downloadFile } from '@/api/manage'
+  import moment from 'moment'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+  export default {
+    name: 'responsibilityList',
+    mixins: [ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        visible: false,
+        title: '',
+        confirmLoading: false,
+        loading: false,
+        dataSource: [],
+        queryParam: {},
+        url: {
+          groupByTerritoryXls: '/project/projectLibraryBase/exportProjectDetailsStatisticsGroupByTerritoryXls',
+          GroupByTerritory: '/project/projectLibraryBase/getProjectDetailsStatisticsGroupByTerritory'
+        },
+        columns: [
+          {
+            title: this.$t('areaOfResponsibility'),
+            dataIndex: 'dutyTerritoryName',
+            align: 'left',
+            width: 150,
+            ellipsis: true,
+            sorter: true,
+            scopedSlots: { customRender: 'areaOfResponsibility' }
+          },
+          {
+            title: this.$t('Quantity'),
+            dataIndex: 'amount',
+            align: 'left',
+            ellipsis: true,
+            width: 150,
+            sorter: true
+          },
+          {
+            title: this.$t('proportionWithInTheAreaOfResponsibility'),
+            dataIndex: 'percentage',
+            align: 'left',
+            ellipsis: true,
+            width: 240,
+            sorter: true
+          }
+        ]
+      }
+    },
+    mounted() {
+    },
+    methods: {
+      getData(data) {
+        this.visible = true
+        this.title = data.title
+        this.queryParam = data
+        this.getList()
+      },
+      tableOnChange(pagination, filters, sorter) {
+        this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+        if (sorter.columnKey == 'attestationRank_dictText') {
+          this.orderByField = 'attestationRank'
+        } else if (sorter.columnKey == 'dutyTerritory_dictText') {
+          this.orderByField = 'dutyTerritory'
+        } else if (sorter.columnKey == 'designDeliverableTypeName') {
+          this.orderByField = 'designDeliverableType'
+        } else if (sorter.columnKey == 'verifyDeliverableTypeName') {
+          this.orderByField = 'verifyDeliverableType'
+        } else if (sorter.columnKey == 'designDutyIdName') {
+          this.orderByField = 'designDutyId'
+        } else if (sorter.columnKey == 'verifyDutyIdName') {
+          this.orderByField = 'verifyDutyId'
+        }  else if (sorter.columnKey == 'verifyFlowStatusName') {
+          this.orderByField = 'verifyFlowStatus'
+        }  else if (sorter.columnKey == 'designFlowStatusName') {
+          this.orderByField = 'designFlowStatus'
+        } else {
+          this.orderByField = sorter.columnKey
+        }
+        this.getList()
+      },
+      getList() {
+        this.loading = true
+        let query = {
+           ...this.queryParam,
+          orderBy: this.orderBy,
+          orderByField: this.orderByField,
+        }
+        getAction(this.url.GroupByTerritory, query).then((res) => {
+          if (res.success) {
+            this.loading = false
+            this.dataSource = res.result.dataList || []
+          } else {
+            this.loading = false
+            this.dataSource = []
+          }
+        })
+      },
+      handleExport() {
+        downloadFile(this.url.groupByTerritoryXls, this.title + '.xls', this.queryParam)
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      areaOfResponsibilityClick(item) {
+        if (this.queryParam.operatorType == 'queryFGTaskToConfirmStatistics' ||
+          this.queryParam.operatorType == 'queryDesignStatistics' ||
+          this.queryParam.operatorType == 'queryVerifyStatistics') {
+          item.isListing = '1'
+        }
+        this.$emit('responsibility', item)
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/resultReportedUpload.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/resultReportedUpload.vue
new file mode 100644
index 000000000..a45c9d3a3
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/resultReportedUpload.vue
@@ -0,0 +1,245 @@
+<template>
+  <div>
+    <a-modal v-model="visible"
+             :maskClosable="false"
+             @ok="handleOk"
+             :confirm-loading="confirmLoading"
+             @cancel="handleCancel"
+             :title="title">
+      <a-upload-dragger
+        accept='*.*'
+        :disabled="disabled"
+        class="ant-upload-list"
+        :class="{'uploadFile':isUploadFile}"
+        name="file"
+        :file-list="myfileList"
+        :multiple="true"
+        :action="uploadAction+'?cut='+cut"
+        :headers="headers"
+        @preview="preview"
+        :before-upload="beforeUpload"
+        :remove='remove'
+        @change="handleChange">
+        <p v-if="!isUploadFile">
+          <a-icon class="action-upload" type="cloud-upload"/>
+        </p>
+        <p v-if="!isUploadFile" class="ant-upload-text" style="font-size: 14px;line-height: 30px">
+          {{this.$t('clickUpload')}}</p>
+      </a-upload-dragger>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+  import Vue from 'vue'
+  import { ACCESS_TOKEN } from '@/store/mutation-types'
+  import { getAction, postAction, downFile, downloadFile, putAction } from '@/api/manage'
+  import { Base64 } from 'js-base64'
+  import { mapGetters } from 'vuex'
+
+  export default {
+    name: 'resultReportedUpload',
+    props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile'],
+    data() {
+      return {
+        visible: false,
+        title: this.$t('upload1') + this.$t('resultReported'),
+        uploadAction: window._CONFIG['domianURL'] + '/sys/common/upload',
+        state: undefined,
+        myuploadAction: window._CONFIG['domianURL'] + this.thisFileUploadUrl,
+        upDataList: [],
+        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
+        fileList: [],
+        myfileList: [],
+        isLoding: false,
+        cut: '',
+        confirmLoading: false,
+        uploadQuery: {},
+        url: {
+          editModel: '/project/projectLawsInventoryEO/edit'
+        }
+      }
+    },
+    created() {
+      const token = Vue.ls.get(ACCESS_TOKEN)
+      this.headers = { 'X-Access-Token': token }
+      this.containerId = 'container-ty-' + new Date().getTime()
+    },
+    mounted() {
+      let long = localStorage.getItem('language')
+      this.cut = ''
+      if (long && long == 'zh-cn') {
+        this.cut = 'cn'
+      } else if (long && long == 'en-us') {
+        this.cut = 'en'
+      }
+    },
+    methods: {
+      ...mapGetters(['userInfo']),
+      clickButtonToUploadFile(item) {
+        this.uploadQuery = item
+        this.myfileList = []
+        this.visible = true
+        getAction('sys/common/getFileInfos', { id: item.fileId }).then((res) => {
+          if (res.success) {
+            this.myfileList = res.result
+            if (this.myfileList && this.myfileList.length > 0) {
+              this.myfileList.forEach((val) => {
+                val.name = val.fileName
+                val.uid = val.id
+                if (val.response) {
+                  this.fileList.push(val.response.result)
+                } else {
+                  this.fileList.push(val)
+                }
+              })
+            } else {
+              this.myfileList = []
+            }
+          }
+        })
+      },
+      handleOk() {
+        if (this.myfileList && this.myfileList.length == 0) {
+          this.$message.warning(this.$t('pleaseUpload') + this.$t('resultReported'))
+        } else {
+          let content = []
+          this.fileList.forEach(res => {
+            content.push(res.id || res.name)
+          })
+          let formInline = JSON.parse(JSON.stringify(this.uploadQuery))
+          Object.keys(formInline).forEach(res => {
+            if (formInline[res] && formInline[res] instanceof Array) {
+              formInline[res] = formInline[res].join(',')
+            }
+          })
+          formInline.fileId = content.join(',')
+          this.confirmLoading = true
+          putAction(this.url.editModel, formInline).then((res) => {
+            if (res.success) {
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.visible = false
+              this.confirmLoading = false
+              this.$emit('resultReportedUploadForm')
+            } else {
+              this.$message.warning(this.$t('operationFailed'))
+              this.confirmLoading = false
+            }
+          })
+        }
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      beforeUpload(file) {
+        this.fileTypeSatus = true
+        this.$message.destroy()
+      },
+      remove() {
+        this.fileTypeSatus = true
+      },
+      handleChange(info) {
+        let { file } = info
+        const status = info.file.status
+        info.fileList.forEach((val, index) => {
+          if (val.response && !val.response.result) {
+            this.$message.error(val.response.message)
+            info.fileList.splice(index, 1)
+          }
+        })
+        if (status === 'error') {
+          this.$message.destroy()
+          this.$message.error(`${info.file.name}` + this.$t('FileUploadFailed'))
+        } else if (status === 'removed') {
+          this.myfileList = info.fileList
+          this.fileList = []
+          this.myfileList.forEach((res) => {
+            if (res.response) {
+              this.fileList.push(res.response.result)
+            } else {
+              this.fileList.push(res)
+            }
+          })
+          if (this.myfileList.length > 0) {
+            this.$message.destroy()
+            this.$message.success(`${info.file.name}` + this.$t('DeletedSuccessfully'))
+          }
+        } else if (status === 'done') {
+          this.fileList = []
+          this.myfileList = info.fileList
+          if (info.fileList.length > 20) {
+            info.fileList.splice(20)
+            this.myfileList = info.fileList
+            this.myfileList.forEach((res) => {
+              if (res.response) {
+                this.fileList.push(res.response.result)
+              } else {
+                this.fileList.push(res)
+              }
+            })
+            this.$message.destroy()
+            this.$message.error(this.$t('UploadMost'))
+            return
+          }
+          this.myfileList.forEach((res) => {
+            if (res.response) {
+              this.fileList.push(res.response.result)
+            } else {
+              this.fileList.push(res)
+            }
+          })
+          if (this.myfileList.length > 0) {
+            this.$message.destroy()
+            if (file.response.success) {
+              this.$message.success(`${info.file.name}` + this.$t('FileUploadedSuccessfully'))
+            }
+          }
+        } else if (status === 'uploading') {
+          this.myfileList = info.fileList
+          // this.$message.success(`${info.file.name} 文件上传成功。`);
+        }
+      },
+      resetFileList() {
+        this.myfileList = []
+        this.fileList = []
+      },
+      preview(file) {
+        let fileQuery = file.response ? file.response.result : file
+        let fileName = fileQuery.fileName
+        let index1 = fileName.lastIndexOf('.')
+        let index2 = fileName.length
+        let fileSuffix = fileName.substring(index1, index2)
+        if (fileSuffix === '.pdf') {
+          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username))
+        } else if (fileSuffix === '.docx' || fileSuffix === '.doc') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
+          window.open(url, '_blank')
+        } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
+          window.open(url, '_blank')
+        }else if(fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg'){
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + fileQuery.id + fileSuffix)
+          window.open(url, '_blank')
+        } else {
+          downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id,userName:this.userInfo().username })
+        }
+      }
+    }
+  }
+</script>
+
+<style>
+  .ant-upload-list-item-name {
+    color: rgba(0, 0, 0, 0.65) !important;
+  }
+
+  .action-upload {
+    font-size: 67px;
+    color: #c0c4cc;
+  }
+
+  .uploadFile {
+
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
new file mode 100644
index 000000000..f1413d6d5
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
@@ -0,0 +1,267 @@
+<!--平台件合规设定-->
+<template>
+  <a-drawer
+    :title="$t('setting')"
+    :maskClosable="false"
+    :width="1000"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <a-spin :spinning="confirmLoading">
+      <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+        <div v-for="(item,index) in formInline.list" :key="index">
+          <div style='margin-left: 25px'>
+            <a-row :gutter="24">
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="title-text-text" :title="$t('Nodename')">{{$t('Nodename')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel">
+                    <a-input class="box-input"
+                             v-model="item.nodename"
+                             :placeholder="$t('PleaseEnter')+$t('Nodename')"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+              <a-col :span="12"  style='margin-left: -49px'>
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="title-text-text" :title="$t('Nodedate')">{{$t('Nodedate')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel">
+                    <a-date-picker class="box-input"
+                                   :placeholder="$t('PleaseSelect')+$t('Nodedate')"
+                                   @change="dateChange(item,index)"
+                                   format="YYYY-MM-DD"
+                                   :getCalendarContainer="(trigger) => trigger.parentNode"
+                                   v-model="item.date"
+                                   :disabled="false"
+                                   style="width: 100%"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+              <a-icon class="icon-text" style='font-size: 20px;margin-top: 10px;' @click="addClick(index)" type="plus"/>
+              <a-icon class="icon-text" style='font-size: 20px;margin-top: 10px;' v-if="formInline.list.length > 1" @click="deleteClick(index)"
+                      type="minus" />
+            </a-row>
+          </div>
+
+        </div>
+      </a-form-model>
+    </a-spin>
+    <div class="drawer-bootom-button">
+      <a-button style="margin-right: 8px" @click="handleCancel">{{$t('cancel')}}</a-button>
+      <a-button @click="handleOk" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+  import { getAction, postAction, putAction } from '@/api/manage'
+  import moment from 'moment'
+
+  export default {
+    name: 'settingList',
+    props: ['url'],
+    data() {
+      return {
+        visible: false,
+        confirmLoading: false,
+        formInline: {
+          list:[{}]
+        },
+        rules: {
+        },
+        ids: []
+      }
+    },
+    mounted() {
+    },
+    methods: {
+      addClick(index){
+        if(this.formInline.list.length > 19){
+          this.$message.warning(this.$t('maximum'))
+        }else{
+          this.formInline.list.splice(index + 1, 0, {})
+        }
+        this.formInline = { ...this.formInline }
+      },
+      deleteClick(index) {
+        this.formInline.list.splice(index, 1)
+        this.formInline = { ...this.formInline }
+      },
+      edit() {
+        this.visible = true
+        this.$nextTick(() => {
+          this.$refs.ruleForm.clearValidate()
+        })
+        this.settingQueryForm()
+      },
+      settingQueryForm() {
+        getAction(this.url.settingQueryForm, { projectId: this.$route.query.id }).then((res) => {
+          if (res.success) {
+            this.$nextTick(() => {
+              this.formInline=res.result? {list:[{}]} :res.result
+              if(!res.result.list || res.result.list.length==0){
+                this.formInline.list=[{}]
+              }
+
+            })
+          }
+        })
+      },
+      handleOk() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            let query = {
+              ...this.formInline,
+              projectId: this.$route.query.id
+            }
+            let url = ''
+            let Action
+            if (this.formInline.id) {
+              url = this.url.editSettingUrl
+              Action = putAction
+            } else {
+              url = this.url.addSettingUrl
+              Action = postAction
+            }
+            this.confirmLoading = true
+            Action(url, query).then((res) => {
+              if (res.success) {
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.visible = false
+                this.confirmLoading = false
+                this.$emit('settingListForm')
+                if(res.result.matchVdr == true){
+                  this.vdrClick()
+                }
+              } else {
+                this.$message.warning(this.$t('operationFailed'))
+                this.confirmLoading = false
+              }
+            })
+          }
+        })
+      },
+      handleCancel() {
+        this.formInline = {}
+        this.visible = false
+      },
+      dateChange(item,index) {
+        this.formInline.list[index].date = this.formInline.list[index].date ? moment(this.formInline.list[index].date).format('YYYY-MM-DD') : ''
+      }
+    }
+  }
+</script>
+
+<style>
+  .formAdd .ant-form-item-label {
+    width: 130px;
+  }
+
+  .formAdd .ant-form-item-control-wrapper {
+    display: inline-block;
+    width: 100%;
+  }
+
+  /*.formAdd .ant-form-item {*/
+  /*  margin-bottom: 20px;*/
+  /*}*/
+
+  .itemModel .ant-form-item-control-wrapper {
+    width: 100%;
+  }
+
+  .box-input .ant-select-selection--single {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple .ant-select-selection__rendered > ul > li {
+    margin-top: 6px;
+  }
+
+  .box-input .ant-calendar-picker {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-calendar-picker-input {
+    height: 38px;
+  }
+
+  .box-input .ant-input-number-input-wrap {
+    line-height: 38px;
+    height: 38px;
+  }
+</style>
+<style scoped>
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+  }
+
+  .title-text {
+    width: 106px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 42px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .formAdd {
+    margin-bottom: 40px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 3px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    z-index: 100;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/taskBatSetting.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/taskBatSetting.vue
new file mode 100644
index 000000000..4984c404f
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/taskBatSetting.vue
@@ -0,0 +1,251 @@
+<template>
+  <a-modal
+    :title="$t('batSetting')"
+    :width="600"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleOk"
+    @cancel="handleCancel"
+  >
+    <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <div class="box-title-text">
+            <div class="title-text">
+                      <span class="title-text-text"
+                            :title="$t('CertificationProgress')">{{$t('CertificationProgress')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <j-dict-select-tag class="box-input" v-model="formInline.certificationProgress"
+                                 @input="handleInput('certificationProgress')"
+                                 :placeholder="$t('PleaseSelect')+$t('CertificationProgress')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'certification_progress'"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="24">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text"
+                    :title="$t('CurrentStatus')">{{$t('CurrentStatus')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" prop="conditionAssessment">
+              <a-select
+                v-model="formInline.conditionAssessment"
+                :placeholder="$t('PleaseSelect')+$t('CurrentProjectStatusEvaluation')">
+                <a-select-option :value="'1'">
+                             <span style="display: inline-block;width: 100%">
+                                    {{ $t('red') }}
+                             </span>
+                </a-select-option>
+                <a-select-option :value="'2'">
+                             <span style="display: inline-block;width: 100%">
+                                    {{ $t('yellow') }}
+                             </span>
+                </a-select-option>
+                <a-select-option :value="'3'">
+                             <span style="display: inline-block;width: 100%">
+                                    {{ $t('green') }}
+                             </span>
+                </a-select-option>
+
+                <a-select-option :value="'4'" disabled>
+                               <span style="display: inline-block;width: 100%">
+                                     {{ $t('blue') }}
+                                </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+    </a-form-model>
+  </a-modal>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import moment from 'moment'
+
+  export default {
+    name: 'taskBatSetting',
+    props: ['url'],
+    data() {
+      return {
+        visible: false,
+        confirmLoading: false,
+        formInline: {},
+        rules: {},
+        ids: []
+      }
+    },
+    mounted() {
+    },
+    methods: {
+      edit(data) {
+        this.visible = true
+        this.$nextTick(() => {
+          this.ids = data || []
+          this.formInline = {}
+        })
+      },
+      handleOk() {
+        if (this.formInline.dutyTerritory) {
+          this.handleOkTwo()
+        } else {
+          this.handleOkOne()
+        }
+      },
+      handleOkOne() {
+        let ids = JSON.parse(JSON.stringify(this.ids))
+        let query = {
+          ids: ids.join(','),
+          ...this.formInline
+        }
+        this.confirmLoading = true
+        postAction(this.url.setBatch, query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.visible = false
+            this.confirmLoading = false
+            this.$emit('batSettingList')
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+            this.confirmLoading = false
+          }
+        })
+      },
+      handleOkTwo() {
+        let _this = this
+        this.$confirm({
+          content: _this.$t('areResponsibilityAreaInformationBatch'),
+          onOk() {
+            let ids = JSON.parse(JSON.stringify(_this.ids))
+            let query = {
+              ids: ids.join(','),
+              ..._this.formInline
+            }
+            _this.confirmLoading = true
+            postAction(_this.url.setBatch, query).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.visible = false
+                _this.confirmLoading = false
+                _this.$emit('batSettingList')
+              } else {
+                _this.$message.warning(_this.$t('operationFailed'))
+                _this.confirmLoading = false
+              }
+            })
+          }
+        })
+      },
+      handleCancel() {
+        this.formInline = {}
+        this.visible = false
+      },
+      handleInput(value) {
+        this.$nextTick(() => {
+          this.formInline = { ...this.formInline }
+          this.$refs.ruleForm.validateField([value])
+        })
+      },
+    }
+  }
+</script>
+
+<style>
+  .formAdd .ant-form-item-label {
+    width: 130px;
+  }
+
+  .formAdd .ant-form-item-control-wrapper {
+    display: inline-block;
+    width: 100%;
+  }
+
+  /*.formAdd .ant-form-item {*/
+  /*  margin-bottom: 20px;*/
+  /*}*/
+
+  .itemModel .ant-form-item-control-wrapper {
+    width: 100%;
+  }
+
+  .box-input .ant-select-selection--single {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple .ant-select-selection__rendered > ul > li {
+    margin-top: 6px;
+  }
+
+  .box-input .ant-calendar-picker {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-calendar-picker-input {
+    height: 38px;
+  }
+
+  .box-input .ant-input-number-input-wrap {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-calendar-picker-input {
+    padding: 4px 30px 4px 11px;
+  }
+</style>
+<style scoped>
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+  }
+
+  .title-text {
+    width: 84px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 42px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .formAdd {
+    margin-bottom: 40px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/toResubmitForm.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/toResubmitForm.vue
new file mode 100644
index 000000000..d61438078
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/toResubmitForm.vue
@@ -0,0 +1,452 @@
+<template>
+  <a-drawer
+    :title="$t('toResubmit')"
+    :maskClosable="false"
+    :width="700"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;margin-bottom: 436px;">
+    <a-spin :spinning="confirmLoading">
+      <div class="box">
+        <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text" :title="$t('submissionProcess')">{{$t('submissionProcess')}}</span>
+                </div>
+              </div>
+              <a-form-model-item class="itemModel" :prop="'submissionProcess'">
+                <a-select :placeholder="$t('PleaseSelect')+$t('submissionProcess')"
+                          v-model="formInline.submissionProcess">
+                  <a-select-option v-for="(item, key) in submissionProcessList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name}}
+                     </span>
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text" :title="$t('resultofhandling')">{{$t('resultofhandling')}}</span>
+                </div>
+              </div>
+              <a-form-model-item class="itemModel" :prop="'disposeResult'">
+                <a-radio-group @change="reviewResultChange"
+                               class="box-input"
+                               v-model="formInline.disposeResult">
+                  <a-radio value="Compliance">
+                    {{$t('accord')}}
+                  </a-radio>
+                  <a-radio value="Non-Compliance">
+                    {{$t('nonConformity')}}
+                  </a-radio>
+                  <a-radio value="To be tracked">
+                    {{$t('Tracked')}}
+                  </a-radio>
+                  <a-radio value="NA">
+                    {{$t('notInvolved')}}
+                  </a-radio>
+<!--                  <a-radio value="Returned">-->
+<!--                    {{$t('sendBack')}}-->
+<!--                  </a-radio>-->
+                </a-radio-group>
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24" v-if="isDeliveryTime">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text"
+                        :title="$t('expectedDeliveryTime')">{{$t('expectedDeliveryTime')}}</span>
+                </div>
+              </div>
+              <a-form-model-item class="itemModel" :prop="'deliveryTime'">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+$t('expectedDeliveryTime')"
+                               @change="dateChange({db_field_name:'deliveryTime'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.deliveryTime"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text" :title="$t('feedbackMessage')">{{$t('feedbackMessage')}}</span>
+                </div>
+              </div>
+              <a-form-model-item class="itemModel" prop="approvalOpinion">
+                <a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackMessage')"
+                            v-model="formInline.approvalOpinion"
+                            :rows="2"
+                            style="min-height: 68px"
+                />
+              </a-form-model-item>
+            </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('enclosure')">{{$t('enclosure')}}</span>
+                </div>
+              </div>
+              <a-form-model-item class="itemModel">
+                <a-button type="primary" class="button-text"
+                          @click="clickButtonToUpload('approvalFile')">
+                  {{ (formInline.approvalFile === 'null' || formInline.approvalFile === '' ||
+                  formInline.approvalFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                  }}
+                </a-button>
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+        </a-form-model>
+        <uploadFile ref="uploadFile"
+                    @uploadSuccess="uploadSuccess"/>
+      </div>
+    </a-spin>
+    <div class="drawer-bootom-button">
+      <a-button style="margin-right: 8px" @click="handleCancel">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+  import { getAction, postAction, putAction, deleteAction } from '@/api/manage'
+  import uploadFile from '@/components/uploadFile/file'
+  import moment from 'moment'
+  import { mapGetters } from 'vuex'
+
+  export default {
+    name: 'toResubmitForm',
+    components: {
+      uploadFile
+    },
+    data() {
+      return {
+        visible: false,
+        confirmLoading: false,
+        isDeliveryTime: false,
+        formInline: {},
+        submissionProcessList: [],
+        rules: {
+          disposeResult: [
+            {
+              required: true,
+              message: this.$t('resultofhandling') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          submissionProcess: [
+            {
+              required: true,
+              message: this.$t('submissionProcess') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          deliveryTime: [
+            {
+              required: true,
+              message: this.$t('expectedDeliveryTime') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          approvalOpinion: [
+            {
+              required: true,
+              message: this.$t('feedbackMessage') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
+            {
+              max: 300,
+              message: this.$t('feedbackMessage') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          engineerFeedbackContent: [
+            {
+              required: true,
+              message: this.$t('feedbackFromTheEngineer') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
+            {
+              max: 300,
+              message: this.$t('feedbackFromTheEngineer') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          fileId: [
+            {
+              required: true,
+              message: this.$t('Deliverables') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ]
+        },
+        listOfData: {}
+      }
+    },
+    mounted() {
+    },
+    methods: {
+      ...mapGetters(['userInfo']),
+      handleCancel() {
+        this.visible = false
+      },
+      handleSubmit() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            this.confirmLoading = true
+            if (this.formInline.disposeResult == 'To be tracked') {
+              this.formInline.approvalOpinion = this.formInline.approvalOpinion + ';' + this.$t('expectedDeliveryTime') + ':' + this.formInline.deliveryTime
+            }
+            if (this.formInline.submissionProcess == '1') {
+              this.formInline.flowType = '32'
+            } else if (this.formInline.submissionProcess == '2') {
+              this.formInline.flowType = '34'
+            }
+            let query = Object.assign(this.listOfData, this.formInline)
+            this.startProcess(query)
+          }
+        })
+      },
+      startProcess(value) {
+        let query = {
+          type: 31,
+          projectLawsInvnetoryList: value,
+          projectNameId: this.$route.query.projectNameId,
+          projectName: this.$route.query.projectName,
+          projectLawsInventoryId: value.id
+        }
+        postAction('/workFlow/startProcess', query).then((res) => {
+          if (res.success) {
+            this.completeTask(value, res.result)
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
+      },
+
+      completeTask(value, taskId) {
+        value.handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+        Object.keys(value).forEach(res => {
+          if (value[res] && typeof value[res] == 'string') {
+            value[res] = value[res].replace(/\"/g, '“')
+            value[res] = value[res].replace(/\'/g, '‘')
+          }
+        })
+        let query = {
+          userid: this.userInfo().id,
+          taskId: taskId,
+          json: JSON.stringify(value).replace(/\"/g, '\'')
+        }
+        postAction('/workFlow/completeTask', query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.visible = false
+            this.confirmLoading = false
+            this.$emit('toResubmitFormForm')
+          } else {
+            this.confirmLoading = false
+            this.$message.warning(res.message)
+          }
+        })
+      },
+      getData(val, isDesign, isVerify) {
+        this.submissionProcessList = []
+        this.visible = true
+        this.listOfData = val
+        this.formInline = {}
+        if (isDesign) {
+          this.submissionProcessList.push({
+            name: this.$t('designComplianceProcess'),
+            value: '1'
+          })
+        } else {
+          this.formInline.submissionProcess = '2'
+        }
+        if (isVerify) {
+          this.submissionProcessList.push({
+            name: this.$t('validationComplianceProcess'),
+            value: '2'
+          })
+        } else {
+          this.formInline.submissionProcess = '1'
+        }
+        this.$nextTick(() => {
+          this.$refs.ruleForm.clearValidate()
+        })
+      },
+      reviewResultChange(value) {
+        if (value.target.value == 'To be tracked') {
+          this.isDeliveryTime = true
+        } else {
+          this.isDeliveryTime = false
+          this.formInline.deliveryTime = ''
+        }
+        this.formInline = { ...this.formInline }
+      },
+      clickButtonToUpload(item) {
+        this.$refs.uploadFile.perentHandleFunc()
+        this.$refs.uploadFile.visible = true
+        this.uploadName = item
+        getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
+          if (res.success) {
+            this.$refs.uploadFile.perentHandleFunc(res.result)
+          } else {
+            this.$refs.uploadFile.perentHandleFunc()
+          }
+        })
+      },
+      /** 上传文件的回调 */
+      uploadSuccess(data) {
+        let attIdList = []
+        if (data && data.length > 0) {
+          data.map(item => {
+            attIdList.push(item.id || data.name)
+          })
+        }
+        /** 赋值给当前对应的表单文件 */
+        this.formInline[this.uploadName] = attIdList.join(',')
+        this.formInline = { ...this.formInline }
+        this.$nextTick(() => {
+          this.$refs.ruleForm.validateField([this.uploadName])
+        })
+      },
+      dateChange(item) {
+        this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
+        this.formInline = { ...this.formInline }
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  .box {
+    padding: 0 0 24px 0;
+    box-sizing: border-box;
+  }
+
+  .box-text {
+    display: flex;
+    justify-content: space-between;
+    height: 40px;
+    line-height: 24px;
+
+    .header-text {
+      font-size: 16px;
+      font-weight: bold;
+      color: #000;
+    }
+  }
+
+  .box-title-text {
+    /*line-height: 1.4;*/
+    display: flex;
+    /*align-items: center;*/
+  }
+
+  .title-text {
+    /*width: 88px;*/
+    text-align: left;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 32px;
+    line-height: 36px;
+    color: #000F16;
+  }
+
+  .title-text-fq {
+    /*width: 130px;*/
+    text-align: left;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 48px;
+    color: #000F16;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: 100%;
+    display: inline-block;
+    margin-top: 2px;
+    margin-bottom: 0px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  /*.formAdd {*/
+  /*  margin-bottom: 40px;*/
+  /*}*/
+
+  .text-header {
+    font-size: 16px;
+    color: #040B29;
+    font-weight: 400;
+  }
+
+  .button-text {
+    height: 38px;
+    width: calc(50% - 100px);
+    line-height: 38px;
+    background: #fff;
+    border: 1px #00B3BE solid;
+    color: #00B3BE;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    z-index: 100;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferList.vue
new file mode 100644
index 000000000..2c77137b0
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferList.vue
@@ -0,0 +1,268 @@
+<template>
+  <a-drawer
+    :title="$t('Transfer')"
+    :maskClosable="false"
+    :width="1000"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <div style="margin-bottom: 60px">
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :md="12" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('VirtualListName')">
+                  <span>{{$t('VirtualListName')}}</span>
+                </div>
+                <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('VirtualListName')"
+                         v-model="queryParam.name"></j-input>
+              </div>
+            </a-col>
+            <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="12" :sm="24">
+                  <a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+               </a-col>
+      </span>
+          </a-row>
+        </a-form>
+      </div>
+      <a-table
+        :components="drag(columns,'columns')"
+        :columns="columns"
+        rowKey="id"
+        :scroll="{x: 1000}"
+        :data-source="dataList"
+        :pagination="false"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' }"
+        :loading="loading">
+
+      </a-table>
+      <div class="page" v-if="dataList.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="onChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+
+    <div class="drawer-bootom-button">
+      <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit(undefined)" type="primary" :loading="confirmLoading">{{$t('determine')}}</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+  export default {
+    name: 'transferList',
+    components: {},
+    props: ['url'],
+    mixins: [ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        visible: false,
+        queryParam: {},
+        confirmLoading: false,
+        selectedRowKeys: [],
+        columns: [
+          {
+            title: this.$t('VirtualListName'),
+            dataIndex: 'name',
+            align: 'left',
+            ellipsis: true,
+            width: 235
+          },
+          {
+            title: this.$t('instructionForUse'),
+            dataIndex: 'useExplain',
+            align: 'left',
+            ellipsis: true,
+            width: 235
+          },
+          {
+            title: this.$t('updateTime'),
+            dataIndex: 'updateTime',
+            align: 'left',
+            ellipsis: true,
+            width: 235
+          },
+          {
+            title: this.$t('creater'),
+            dataIndex: 'createBy',
+            align: 'left',
+            ellipsis: true,
+            width: 235
+          }
+        ],
+        dataList: [],
+        content: [],
+        loading: false,
+        pageNo: 1,
+        pageSize: 10,
+        total: 0
+      }
+    },
+    mounted() {
+
+    },
+    methods: {
+      transferModel() {
+        this.visible = true
+        this.queryParam = {}
+        this.selectedRowKeys = []
+        this.replacePage()
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.replacePage()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.replacePage()
+      },
+      onChange(page, pageSize) {
+        this.pageNo = page
+        this.replacePage()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.replacePage()
+      },
+      replacePage() {
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...this.queryParam
+        }
+        this.loading = true
+        postAction(this.url.transferUrl, query).then((res) => {
+          if (res.success) {
+            this.dataList = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+        if (this.selectedRowKeys.length > 1) {
+          this.selectedRowKeys.shift()
+        }
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      handleSubmit(flag) {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.confirmLoading = true
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          this.confirmLoading = false
+          this.$emit('transferListForm',selectedRowKeys.join(','))
+          this.selectedRowKeys = []
+          // postAction(this.url.addModel, {
+          //   dummyInventoryBaseId: selectedRowKeys.join(','),
+          //   projectLibraryId: this.$route.query.id,
+          //   flag: flag
+          // }).then((res) => {
+          //   if (res.success) {
+          //     this.confirmLoading = false
+          //     this.$message.success(this.$t('OperationSuccessful'))
+          //     this.visible = false
+          //     this.selectedRowKeys = []
+          //     this.$emit('transferListForm')
+          //   } else {
+          //     if (res.message == '该虚拟清单的维护清单中没有数据,是否需要添加') {
+          //       this.confirmLoading = false
+          //       this.getAdd()
+          //       return
+          //     }
+          //     this.$message.warning(this.$t('operationFailed'))
+          //     this.confirmLoading = false
+          //   }
+          // })
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      getAdd() {
+        let _this = this
+        this.$confirm({
+          content: _this.$t('TheDoesNotContainData'),
+          onOk() {
+            _this.handleSubmit('1')
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    z-index: 100;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferListRxswin.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferListRxswin.vue
new file mode 100644
index 000000000..06462dac8
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferListRxswin.vue
@@ -0,0 +1,233 @@
+<template>
+  <a-drawer
+    :title="$t('Transfer')"
+    :maskClosable="false"
+    :width="1000"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <div style="margin-bottom: 60px">
+      <a-table
+        :components="drag(columns,'columns')"
+        :columns="columns"
+        rowKey="id"
+        :scroll="{x: 800}"
+        :data-source="dataList"
+        :pagination="false"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' }"
+        :loading="loading">
+
+      </a-table>
+      <div class="page" v-if="dataList.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="onChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+
+    <div class="drawer-bootom-button">
+      <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit(undefined)" type="primary" :loading="confirmLoading">{{$t('determine')}}</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+  export default {
+    name: 'transferList',
+    components: {},
+    props: ['url'],
+    mixins: [ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        visible: false,
+        queryParam: {},
+        confirmLoading: false,
+        selectedRowKeys: [],
+        columns: [
+          {
+            title: this.$t('projectVersion'),
+            dataIndex: 'projectName',
+            align: 'left',
+            ellipsis: true,
+            width: 235
+          },
+          {
+            title: this.$t('Listcreationtime'),
+            dataIndex: 'createTime',
+            align: 'left',
+            ellipsis: true,
+          },
+        ],
+        dataList: [],
+        content: [],
+        loading: false,
+        pageNo: 1,
+        pageSize: 10,
+        total: 0
+      }
+    },
+    mounted() {
+
+    },
+    methods: {
+      transferModel() {
+        this.visible = true
+        this.queryParam = {}
+        this.selectedRowKeys = []
+        this.replacePage()
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.replacePage()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.replacePage()
+      },
+      onChange(page, pageSize) {
+        this.pageNo = page
+        this.replacePage()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.replacePage()
+      },
+      replacePage() {
+        let query = {
+          projectId: this.$route.query.id,
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...this.queryParam
+        }
+        this.loading = true
+        getAction('/project/projectRxswinEO/getOnePage', query).then((res) => {
+          if (res.success) {
+            this.dataList = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+        if (this.selectedRowKeys.length > 1) {
+          this.selectedRowKeys.shift()
+        }
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      handleSubmit(flag) {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.confirmLoading = true
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          this.confirmLoading = false
+          this.$emit('transferListForm',selectedRowKeys.join(','))
+          this.selectedRowKeys = []
+          // postAction(this.url.addModel, {
+          //   dummyInventoryBaseId: selectedRowKeys.join(','),
+          //   projectLibraryId: this.$route.query.id,
+          //   flag: flag
+          // }).then((res) => {
+          //   if (res.success) {
+          //     this.confirmLoading = false
+          //     this.$message.success(this.$t('OperationSuccessful'))
+          //     this.visible = false
+          //     this.selectedRowKeys = []
+          //     this.$emit('transferListForm')
+          //   } else {
+          //     if (res.message == '该虚拟清单的维护清单中没有数据,是否需要添加') {
+          //       this.confirmLoading = false
+          //       this.getAdd()
+          //       return
+          //     }
+          //     this.$message.warning(this.$t('operationFailed'))
+          //     this.confirmLoading = false
+          //   }
+          // })
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      getAdd() {
+        let _this = this
+        this.$confirm({
+          content: _this.$t('TheDoesNotContainData'),
+          onOk() {
+            _this.handleSubmit('1')
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    z-index: 100;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferListvirtal.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferListvirtal.vue
new file mode 100644
index 000000000..e7bacbf3a
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferListvirtal.vue
@@ -0,0 +1,411 @@
+<template>
+  <a-drawer
+    :title="$t('Transfer')"
+    :maskClosable="false"
+    :width="1100"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <div style="margin-bottom: 60px">
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :md="12" :sm="5">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('standard')">
+                  <span>{{$t('standard')}}</span>
+                </div>
+                <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                         v-model="queryParam.serialNumber"></j-input>
+              </div>
+            </a-col>
+            <a-col :md="12" :sm="5">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('title')">
+                  <span>{{$t('title')}}</span>
+                </div>
+                <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                         v-model="queryParam.title"></j-input>
+              </div>
+            </a-col>
+            <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="12" :sm="24">
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                 <globalAdvancedQuery ref="globalAdvancedQueryRef"
+                                      @handleSuperQuery="handleSuperQuery"
+                                      :fieldList="fieldList"/>
+               </a-col>
+      </span>
+          </a-row>
+        </a-form>
+      </div>
+      <a-table
+        :columns="columns"
+        rowKey="id"
+        :scroll="{x: 800,y:'calc(100vh - 330px)'}"
+        :data-source="dataList"
+        :pagination="false"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :loading="loading">
+
+      </a-table>
+<!--      <div class="page" v-if="dataList.length > 0">-->
+<!--        <a-pagination-->
+<!--          :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
+<!--          show-quick-jumper-->
+<!--          show-size-changer-->
+<!--          :page-size.sync="pageSize"-->
+<!--          :total="total"-->
+<!--          :current="pageNo"-->
+<!--          @change="onChange"-->
+<!--          @showSizeChange="SizeChange"-->
+<!--        />-->
+<!--      </div>-->
+    </div>
+
+    <div class="drawer-bootom-button">
+      <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit(undefined)" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+import { getAction, postAction } from '@/api/manage'
+import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
+
+export default {
+  name: 'transferList',
+  components: {
+    globalAdvancedQuery
+  },
+  props: ['url'],
+  data() {
+    return {
+      visible: false,
+      queryParam: {},
+      confirmLoading: false,
+      selectedRowKeys: [],
+      columns: [
+        {
+          title: this.$t('standard'),
+          align: 'left',
+          dataIndex: 'serialNumber',
+          width: 180,
+          fixed: 'left',
+          ellipsis: true,
+          scopedSlots: { customRender: 'standard' }
+        },
+        {
+          title: this.$t('title'),
+          align: 'left',
+          dataIndex: 'title',
+          width: 180,
+          fixed: 'left',
+          ellipsis: true,
+          scopedSlots: { customRender: 'titleName' }
+        },
+        {
+          title: this.$t('subtitle'),
+          align: 'left',
+          dataIndex: 'subtitle',
+          ellipsis: true,
+          width: 150
+        },
+        {
+          title: this.$t('zoneOfApplication'),
+          align: 'left',
+          dataIndex: 'region_dictText',
+          width: 150,
+          ellipsis: true
+        },
+        {
+          title: this.$t('correspondingStandard'),
+          align: 'left',
+          dataIndex: 'correspondingStandard',
+          width: 150,
+          ellipsis: true
+        },
+        {
+          title: this.$t('implementationCategory'),
+          align: 'left',
+          dataIndex: 'implementType_dictText',
+          width: 150,
+          ellipsis: true
+        },
+        {
+          title: this.$t('ImplementationDate'),
+          align: 'left',
+          width: 190,
+          dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1',
+          ellipsis: true
+        },
+        {
+          title: this.$t('vehicleInProductionDate'),
+          align: 'left',
+          width: 190,
+          dataIndex: 'implementTime',
+          ellipsis: true
+        },
+        {
+          title: this.$t('certificationType'),
+          align: 'left',
+          dataIndex: 'attestationType_dictText',
+          width: 180,
+          ellipsis: true
+        },
+        {
+          title: this.$t('certificationLevel'),
+          align: 'left',
+          dataIndex: 'attestationRank_dictText',
+          width: 180,
+          ellipsis: true
+        },
+        {
+          title: this.$t('applicableSupplement'),
+          align: 'left',
+          width: 220,
+          dataIndex: 'applicableSupplement',
+          ellipsis: true
+        },
+        {
+          title: 'WVTA ID',
+          align: 'left',
+          dataIndex: 'wvtaId',
+          width: 180,
+          ellipsis: true
+        },
+        {
+          title: this.$t('areaOfResponsibility'),
+          align: 'left',
+          ellipsis: true,
+          dataIndex: 'dutyTerritory_dictText',
+          width: 180
+        },
+      ],
+      fieldList: [
+        {
+          type: 'string',
+          value: 'subtitle',
+          text: this.$t('subtitle')
+        },
+        {
+          type: '',
+          value: 'region',
+          text: this.$t('zoneOfApplication'),
+          dictCode: 'region'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+        },
+        {
+          type: 'string',
+          value: 'correspondingStandard',
+          text: this.$t('correspondingStandard')
+        },
+        {
+          type: '',
+          value: 'implementType',
+          text: this.$t('implementationCategory'),
+          dictCode: 'implement_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+        },
+        {
+          type: 'date',
+          value: 'xin1Che1Xing2Shi2Shi1Ri4Qi1',
+          text: this.$t('ImplementationDate')
+        },
+        {
+          type: 'date',
+          value: 'implementTime',
+          text: this.$t('vehicleInProductionDate')
+        },
+        {
+          type: '',
+          value: 'attestationType',
+          text: this.$t('certificationType'),
+          dictCode: 'attestation_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+        },
+        {
+          type: '',
+          value: 'attestationRank',
+          text: this.$t('certificationLevel'),
+          dictCode: 'attestation_rank'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+        },
+        {
+          type: 'string',
+          value: 'applicableSupplement',
+          text: this.$t('applicableSupplement')
+        },
+        {
+          type: 'string',
+          value: 'wvtaId',
+          text: 'WVTA ID'
+        },
+        {
+          type: '',
+          value: 'dutyTerritory',
+          text: this.$t('areaOfResponsibility'),
+          dictCode: 'duty_territory'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+        },
+
+      ],
+      dataList: [],
+      content: [],
+      loading: false,
+      dummyInventoryBaseId:'',
+      pageNo: 1,
+      pageSize: 10,
+      total: 0
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    transferModel(id) {
+      this.visible = true
+      this.dummyInventoryBaseId = id
+      this.queryParam = {}
+      this.selectedRowKeys = []
+      this.replacePage()
+    },
+    searchQuery() {
+      this.pageNo = 1
+      this.replacePage()
+    },
+    searchReset() {
+      this.pageNo = 1
+      this.queryParam = {}
+      this.replacePage()
+      this.$refs.globalAdvancedQueryRef.resetLine()
+      this.$refs.globalAdvancedQueryRef.emitCallback()
+    },
+    onChange(page, pageSize) {
+      this.pageNo = page
+      this.replacePage()
+    },
+    SizeChange(page, pageSize) {
+      this.pageNo = 1
+      this.pageSize = pageSize
+      this.replacePage()
+    },
+    handleSuperQuery(params, matchType) {
+      let sqp = {}
+      if (!params || (params && params.length == 0)) {
+        sqp['superQueryParams'] = ''
+        this.$refs.globalAdvancedQueryRef.superQueryFlag = false
+      } else {
+        this.$refs.globalAdvancedQueryRef.superQueryFlag = true
+        sqp['superQueryParams'] = encodeURI(JSON.stringify(params))
+        sqp['superQueryMatchType'] = matchType
+      }
+      this.queryParamQuery = sqp
+      this.replacePage()
+    },
+    replacePage() {
+      let query = {
+        // pageNo: this.pageNo,
+        // pageSize: this.pageSize,
+        ...this.queryParamQuery,
+        ...this.queryParam,
+        dummyInventoryBaseId: this.dummyInventoryBaseId
+      }
+      this.loading = true
+      getAction('/dummy/dummyInventoryInfoEO/list', query).then((res) => {
+        if (res.success) {
+          this.dataList = res.result || []
+          this.loading = false
+        } else {
+          this.loading = false
+        }
+      })
+    },
+    onSelectChange(value) {
+      this.selectedRowKeys = value
+      // if (this.selectedRowKeys.length > 1) {
+      //   this.selectedRowKeys.shift()
+      // }
+    },
+    handleCancel() {
+      this.visible = false
+    },
+    handleSubmit(flag) {
+      if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+        this.confirmLoading = true
+        let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+        postAction('project/projectLawsInventoryEO/add', {
+          dummyInventoryBaseId: this.dummyInventoryBaseId,
+          projectLibraryId: this.$route.query.id,
+          dummyids: selectedRowKeys.join(','),
+        }).then((res) => {
+          if (res.success) {
+            this.confirmLoading = false
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.visible = false
+            this.selectedRowKeys = []
+            this.$emit('transferListFormHomo')
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+            this.confirmLoading = false
+          }
+        })
+      } else {
+        this.$message.warning(this.$t('selectLeastOne'))
+      }
+    },
+  }
+}
+</script>
+
+<style scoped>
+.page {
+  text-align: right;
+  margin-top: 20px;
+}
+
+.drawer-bootom-button {
+  position: absolute;
+  bottom: 0;
+  z-index: 100;
+  width: 100%;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
+
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+
+.title-text {
+  width: 20%;
+  min-width: 110px;
+  color: #000F16;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  margin-top: 3px;
+  text-align: right;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.box-input {
+  display: inline-block;
+  width: 70%;
+  height: 38px;
+  margin-top: 2px;
+}
+
+.box-button {
+  height: 38px;
+}
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferListvirtalRxswin.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferListvirtalRxswin.vue
new file mode 100644
index 000000000..f3e961882
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferListvirtalRxswin.vue
@@ -0,0 +1,370 @@
+<template>
+  <a-drawer
+    :title="$t('Transfer')"
+    :maskClosable="false"
+    :width="1100"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <div style="margin-bottom: 60px">
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :md="12" :sm="8">
+              <div class="box-title-text-search">
+                <div class="title-text-search" :title="$t('standard')">
+                  <span>{{$t('standard')}}</span>
+                </div>
+                <a-input class="box-input-search" allowClear :placeholder="$t('PleaseEnter') + $t('standard')"
+                         v-model="queryParam.serialNumber"></a-input>
+              </div>
+            </a-col>
+
+            <template v-if="toggleSearchStatus">
+              <a-col :md="12" :sm="8">
+                <div class="box-title-text-search">
+                  <div class="title-text-search" :title="$t('theme')">
+                    <span>{{$t('theme')}}</span>
+                  </div>
+                  <a-input class="box-input-search" allowClear :placeholder="$t('PleaseEnter') + $t('theme')"
+                           v-model="queryParam.theme"></a-input>
+                </div>
+              </a-col>
+              <a-col :md="12" :sm="8">
+                <div class="box-title-text-search">
+                  <div class="title-text-search" :title="'RXSWIN'">
+                    <span>RXSWIN</span>
+                  </div>
+                  <a-input class="box-input-search" allowClear :placeholder="$t('PleaseEnter') + 'RXSWIN'"
+                           v-model="queryParam.rxswin"></a-input>
+                </div>
+              </a-col>
+<!--              <a-col :md="12" :sm="8">-->
+<!--                <div class="box-title-text-search">-->
+<!--                  <div class="title-text-search" :title="$t('Correspondingversion')">-->
+<!--                    <span>{{$t('Correspondingversion')}}</span>-->
+<!--                  </div>-->
+<!--                  <a-select :placeholder="$t('PleaseSelect')+$t('Correspondingversion')"-->
+<!--                            allowClear-->
+<!--                            show-search-->
+<!--                            class="box-input-search"-->
+<!--                            optionFilterProp="label"-->
+<!--                            showSearch-->
+<!--                            :autoClearSearchValue="false"-->
+<!--                            :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+<!--                            v-model="queryParam.version">-->
+<!--                    <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"-->
+<!--                                     :key="key"-->
+<!--                                     :label="item.key"-->
+<!--                                     :value="item.key">-->
+<!--                               <span style="display: inline-block;width: 100%" :title=" item.key ">-->
+<!--                                     {{ item.key }}-->
+<!--                               </span>-->
+<!--                    </a-select-option>-->
+<!--                  </a-select>-->
+<!--                </div>-->
+<!--              </a-col>-->
+            </template>
+            <span style="float: right;overflow: hidden;margin-right: 11px;margin-bottom: 20px"
+                  class="table-page-search-submitButtons">
+                  <a @click="handleToggleSearch">
+                            {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                            <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                 </a>
+                  <a-button class="box-button-search" style="margin-left: 8px"
+                            @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button-search" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+      </span>
+          </a-row>
+        </a-form>
+      </div>
+      <a-table
+        :columns="columns"
+        rowKey="id"
+        :scroll="{x: 800,y:'calc(100vh - 330px)'}"
+        :data-source="dataList"
+        :pagination="false"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :loading="loading">
+
+      </a-table>
+      <div class="page" v-if="dataList.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="onChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+
+    <div class="drawer-bootom-button">
+      <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit(undefined)" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+import { getAction, postAction } from '@/api/manage'
+import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
+
+export default {
+  name: 'transferList',
+  components: {
+    globalAdvancedQuery
+  },
+  props: ['url'],
+  data() {
+    return {
+      toggleSearchStatus: false,
+      visible: false,
+      queryParam: {},
+      confirmLoading: false,
+      selectedRowKeys: [],
+      columns: [
+        {
+          title: this.$t('standard'),
+          align: 'left',
+          dataIndex: 'serialNumber',
+          ellipsis: true,
+          sorter:true,
+          width: 170
+        },
+        {
+          title: this.$t('theme'),
+          align: 'left',
+          dataIndex: 'theme',
+          ellipsis: true,
+          sorter:true,
+          width: 300
+        },
+        {
+          title: 'RXSWIN',
+          align: 'left',
+          dataIndex: 'rxswin',
+          ellipsis: true,
+          sorter:true,
+          width: 170
+        },
+        {
+          title: this.$t('Correspondingversion'),
+          align: 'left',
+          dataIndex: 'version',
+          ellipsis: true,
+          sorter:true,
+          width: 170
+        },
+      ],
+      dataList: [],
+      content: [],
+      loading: false,
+      dummyInventoryBaseId:'',
+      pageNo: 1,
+      pageSize: 10,
+      total: 0
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    transferModel(id) {
+      this.visible = true
+      this.projectId = id
+      this.queryParam = {}
+      this.selectedRowKeys = []
+      this.replacePage()
+    },
+    handleToggleSearch() {
+      this.toggleSearchStatus = !this.toggleSearchStatus
+    },
+    searchQuery() {
+      this.pageNo = 1
+      this.replacePage()
+    },
+    searchReset() {
+      this.pageNo = 1
+      this.queryParam = {}
+      this.replacePage()
+    },
+    onChange(page, pageSize) {
+      this.pageNo = page
+      this.replacePage()
+    },
+    SizeChange(page, pageSize) {
+      this.pageNo = 1
+      this.pageSize = pageSize
+      this.replacePage()
+    },
+    replacePage() {
+      let query = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        ...this.queryParam,
+        projectId: this.projectId
+      }
+      this.loading = true
+      getAction('/project/projectRxswinEO/getTwoPage', query).then((res) => {
+        if (res.success) {
+          this.dataList = res.result.records || []
+          this.loading = false
+        } else {
+          this.loading = false
+        }
+      })
+    },
+    onSelectChange(value) {
+      this.selectedRowKeys = value
+      // if (this.selectedRowKeys.length > 1) {
+      //   this.selectedRowKeys.shift()
+      // }
+    },
+    handleCancel() {
+      this.visible = false
+    },
+    handleSubmit(flag) {
+      if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+        this.confirmLoading = true
+        let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+        getAction('/project/projectRxswinEO/iSExist', {
+          projectId: this.$route.query.id,
+          // projectLibraryId: this.$route.query.id,
+          ids: selectedRowKeys.join(','),
+        }).then((res) => {
+          if (res.success) {
+            this.confirmLoading = false
+            // this.$message.success(this.$t('OperationSuccessful'))
+            if(res.result == 'YES'){
+              let _this = this
+              this.$confirm({
+                content: _this.$t('AlreadyExists'),
+                onOk() {
+                  getAction('/project/projectRxswinEO/addBatch', {
+                    ids: selectedRowKeys.join(','),
+                    flag:'YES',
+                    projectId: _this.$route.query.id,
+                  }).then((res) => {
+                    if (res.success) {
+                      _this.$message.success(_this.$t('OperationSuccessful'))
+                      _this.visible = false
+                      _this.$emit('transferListFormHomo')
+                    } else {
+                      _this.$message.warning(res.message)
+                    }
+                  })
+                },
+                onCancel() {
+                  _this.visible = false
+                  _this.$emit('transferListFormHomo')
+                }
+              })
+            }else{
+              this.visible = false
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.$emit('transferListFormHomo')
+            }
+            this.selectedRowKeys = []
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+            this.confirmLoading = false
+          }
+        })
+      } else {
+        this.$message.warning(this.$t('selectLeastOne'))
+      }
+    },
+  }
+}
+</script>
+
+<style scoped>
+.page {
+  text-align: right;
+  margin-top: 20px;
+}
+
+.drawer-bootom-button {
+  position: absolute;
+  bottom: 0;
+  z-index: 100;
+  width: 100%;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
+
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+
+.title-text {
+  width: 20%;
+  min-width: 110px;
+  color: #000F16;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  margin-top: 3px;
+  text-align: right;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.box-input {
+  display: inline-block;
+  width: 70%;
+  height: 38px;
+  margin-top: 2px;
+}
+
+.box-button {
+  height: 38px;
+}
+.box-title-text-search {
+  line-height: 1.4;
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+
+.title-text-search {
+  width: 110px;
+  color: #000F16;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  margin-top: 3px;
+  text-align: right;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.box-input-search {
+  display: inline-block;
+  width: calc(100% - 100px);
+  height: 38px;
+  margin-top: 2px;
+}
+
+.box-button-search {
+  height: 38px;
+  /*margin-top: 2px;*/
+}
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/versionStatistics.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/versionStatistics.vue
new file mode 100644
index 000000000..2dc681fe3
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/versionStatistics.vue
@@ -0,0 +1,195 @@
+<!--平台件-->
+<template>
+  <a-drawer
+    :title="$t('versionStatistics')"
+    :maskClosable="false"
+    :width="1000"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <div style="margin-bottom: 60px">
+      <a-table
+        :components="drag(columns,'columns')"
+        :columns="columns"
+        :rowKey="(record)=>JSON.stringify(record)"
+        :scroll="{x: '100%',y:'calc(100vh - 280px)'}"
+        :data-source="dataList"
+        :pagination="false"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :loading="loading">
+
+      </a-table>
+      <div class="page" v-if="dataList.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="onChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+
+    <div class="drawer-bootom-button">
+      <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+  export default {
+    name: 'versionStatistics',
+    mixins:[ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        visible: false,
+        queryParam: {},
+        confirmLoading: false,
+        selectedRowKeys: [],
+        columns: [
+          {
+            title: this.$t('VersionNumber'),
+            dataIndex: 'projectVersion',
+            align: 'left',
+            ellipsis: true,
+            width: 200
+          },
+          {
+            title: this.$t('describe'),
+            dataIndex: 'explanation',
+            align: 'left',
+            ellipsis: true,
+            width: 500
+          }
+        ],
+        dataList: [],
+        loading: false,
+        pageNo: 1,
+        pageSize: 10,
+        total: 0,
+        url: {
+          list: '/project/projectLibraryBase/versionStatistics'
+        }
+      }
+    },
+    mounted() {
+
+    },
+    methods: {
+      addModel(value) {
+        this.visible = true
+        this.queryParam = {}
+        this.selectedRowKeys = JSON.parse(JSON.stringify(value))
+        this.replacePage()
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.replacePage()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.replacePage()
+      },
+      onChange(page, pageSize) {
+        this.pageNo = page
+        this.replacePage()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.replacePage()
+      },
+      replacePage() {
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          id:this.$route.query.id,
+          ...this.queryParam
+        }
+        this.loading = true
+        postAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.dataList = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.dataList = []
+            this.total = 0
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      handleSubmit() {
+        this.$emit('versionStatisticsForm', this.selectedRowKeys)
+        this.visible = false
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    z-index: 100;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 33px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 100%;
+    height: 38px;
+  }
+
+  .box-button {
+    height: 38px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue
new file mode 100644
index 000000000..83188bba9
--- /dev/null
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue
@@ -0,0 +1,701 @@
+<template>
+  <div class="doc-detail">
+    <div class="Virtual-detail-header" style="position: fixed;top: 0">
+      <div class="Virtual-detail-title">
+                  <span style="line-height: 64px;display: inline-block;float: left">
+                    <a-icon @click="backClick" type="left-circle" theme="filled"
+                            style="margin-right: 8px;font-size: 30px;color: #21c9cc;"/>
+                  </span>
+        <span>
+             {{ this.title }}
+        </span>
+      </div>
+      <div class="Virtual-detail-text-right">
+<!--        待办中心-->
+        <div class="operator-text"
+             v-if="textTitle === $t('listOfRegulations')"
+             v-has="'projectComment:list'"
+             @click="todocenterClick">
+          <a-icon type="qrcode"/>
+          {{ $t('todocenter') }}
+        </div>
+<!--        更新LOGO-->
+        <div class="operator-text" v-has="'projectLawsInventoryLog:page'"
+             v-if="textTitle === $t('listOfRegulations')"
+             @click="UpdateLogClick">
+          <a-icon type="reload"/>
+          {{ $t('UpdateLog') }}
+        </div>
+<!--        历史版本-->
+        <div class="operator-text" v-has="'projectHistoryVersions:list'"
+             v-if="textTitle === $t('listOfRegulations')"
+             @click="historicalVersionClick">
+          <a-icon type="clock-circle"/>
+          {{ $t('historicalVersion') }}
+        </div>
+<!--        切换用户-->
+        <a-popconfirm overlayClassName="popconfirmDetails"
+                      :visible="visible"
+                      @visibleChange="handleVisibleChange"
+                      placement="bottomRight">
+          <template slot="title" id="popconfirmDetails">
+            <div @click="roleSwitchingClick(item.roleCode)"
+                 v-for="(item,index) in roleSwitchingList"
+                 class="operator-text-title"
+                 :class="{'operator-text-title-color' :item.roleName == roleSwitchName ? true : false}"
+                 :title="item.roleName">
+              {{ item.roleName }}
+            </div>
+            <JLoading :loading="JTextLoading"></JLoading>
+          </template>
+          <div class="operator-text" style="position: relative"
+               v-if="(textTitle === $t('certificationList') || textTitle === $t('listOfRegulations')) && roleSwitchName">
+            <a-icon type="select"/>
+            {{ roleSwitchName }}
+          </div>
+        </a-popconfirm>
+      </div>
+    </div>
+<!--    左侧切换按钮-->
+    <div style="padding: 52px 0 0 0;background: #ffffff;height:100%">
+      <div class="detail-content" style="height: 100%">
+        <div v-if="isDisplay" class="Virtual-detail-left">
+<!--          项目详情-->
+          <div class="Virtual-detail-left-text" :title="$t('projectDetails')"
+               v-has="'projectLawsInventory:projectDetails'"
+               v-if="isTrue"
+               @click="textClick(0,$t('projectDetails'))">
+            <a-icon type="container"/>
+            {{ $t('projectDetails') }}
+          </div>
+<!--          法规清单-->
+          <div class="Virtual-detail-left-text" v-has="'projectLawsInventory:list'" :title="$t('listOfRegulations')"
+               @click="textClick(1,$t('listOfRegulations'))">
+            <a-icon type="control"/>
+            {{ $t('listOfRegulations') }}
+          </div>
+<!--          认证清单-->
+          <div class="Virtual-detail-left-text" :title="$t('certificationList')"
+               v-has="'projectLawsInventory:CertificationList'"
+               @click="textClick(6,$t('certificationList'))">
+            <a-icon type="safety"/>
+            {{ $t('certificationList') }}
+          </div>
+          <a-icon @click="textIconClick" type="menu-fold" class="text-icon"/>
+        </div>
+        <div v-if="!isDisplay" class="Virtual-detail-left-One">
+          <div class="Virtual-detail-left-text"
+               :title="$t('projectDetails')"
+               v-has="'projectLawsInventory:projectDetails'"
+               v-if="isTrue"
+               @click="textClick(0,$t('projectDetails'))">
+            <a-icon type="container"/>
+          </div>
+          <div class="Virtual-detail-left-text" v-has="'projectLawsInventory:list'" :title="$t('listOfRegulations')"
+               @click="textClick(1,$t('listOfRegulations'))">
+            <a-icon type="control"/>
+          </div>
+          <div class="Virtual-detail-left-text" :title="$t('certificationList')"
+               v-has="'projectLawsInventory:CertificationList'"
+               @click="textClick(6,$t('certificationList'))">
+            <a-icon type="safety"/>
+          </div>
+          <a-icon @click="textIconClick" type="menu-unfold" class="text-icon-one"/>
+        </div>
+        <div class="Virtual-detail-right"
+             :style="{'width':isDisplay?'calc(100% - 240px)':'calc(100% - 66px)'}">
+          <ProjectDetailsName @TaskListChange="TaskListChange" v-if="textTitle === $t('projectDetails')"/>
+          <listOfRegulations v-else-if="textTitle === $t('listOfRegulations')"
+                             ref="listOfRegulationsRef"
+                             @getRoleSwitch="getRoleSwitch"
+                             @getRoleSwitchingList="getRoleSwitchingList"
+                             :areaOfResponsibilityList="areaOfResponsibilityList"/>
+          <!--          <TaskList :isDisplayNum="isDisplayNum" :areaOfResponsibility="areaOfResponsibility"-->
+          <!--                    v-else-if="textTitle === $t('taskList')"/>-->
+          <TaskParameterCollection v-else-if="textTitle === $t('TaskParameterCollection')"/>
+          <nonConformance v-else-if="textTitle === $t('nonConformance')"/>
+          <!--          <projectStatus @TaskListChange="TaskListChange"-->
+          <!--                         v-else-if="textTitle === $t('projectStatus')"/>-->
+          <certificationList ref="certificationListRef"
+                             :isDisplayNum="isDisplayNum"
+                             :areaOfResponsibility="areaOfResponsibility"
+                             @getRoleSwitch="getRoleSwitch"
+                             @getRoleSwitchingList="getRoleSwitchingList"
+                             v-else-if="textTitle === $t('certificationList')"/>
+        </div>
+      </div>
+    </div>
+    <updateLog :url="url" ref="updateLogRef"/>
+    <historicalVersionList ref="historicalVersionListRef"/>
+    <commentList ref="commentListRef"/>
+    <JLoading :loading="loading"></JLoading>
+  </div>
+</template>
+
+<script>
+import TaskList from './components/TaskList'
+import SelectedBy from '@/components/SelectedBy/index'
+import listOfRegulations from './components/listOfRegulations'
+import ProjectDetailsName from './components/ProjectDetails'
+import TaskParameterCollection from './components/TaskParameterCollection'
+import nonConformance from './components/nonConformance'
+import projectStatus from './components/projectStatus'
+import updateLog from '@/components/UpdateLog/index'
+import historicalVersionList from './components/historicalVersionList'
+import commentList from './components/commentList'
+import {getAction, postAction, deleteAction, downloadFile} from '@/api/manage'
+import certificationList from './components/certificationList/index'
+import PersonnelSelection from '@/components/PersonnelSelection/index'
+import {mapGetters} from 'vuex'
+
+export default {
+  name: 'ProjectDetails',
+  components: {
+    TaskList,
+    listOfRegulations,
+    ProjectDetailsName,
+    TaskParameterCollection,
+    nonConformance,
+    updateLog,
+    historicalVersionList,
+    commentList,
+    projectStatus,
+    certificationList,
+    SelectedBy,
+    PersonnelSelection
+  },
+  data() {
+    return {
+      title: '',
+      selectVisible: false,
+      confirmLoading: false,
+      submitLoading: false,
+      isDisplayNum: '',
+      textTitle: '',
+      isTrue: true,
+      loading: false,
+      selectLoading: false,
+      JTextLoading: false,
+      isDisplay: true,
+      areaOfResponsibilityList: {},
+      url: {
+        logList: '/project/projectLawsInventoryLogEO/page',
+        historicalVersionUrl: '',
+        queryUserPremissionByProjectLibraryId: '/project/projectCertificationDirectoryEO/queryUserPremissionByProjectLibraryId'
+      },
+      roleSwitchListCn: {
+        '0': 'studio工程师',
+        '1': '法规工程师',
+        '2': '认证工程师',
+        '4': '法规工程师/认证工程师',
+        '11': 'R&H Manager',
+        '12': '系统管理员',
+        '13': 'Viewer',
+        '14': '品牌管理员',
+        '20': '工程接口人',
+        '21': '责任人',
+        '30': '工程接口人',
+        '31': '责任人'
+      },
+      roleSwitchListEn: {
+        '0': 'R&H Studio',
+        '1': 'studio',
+        '2': 'homo',
+        '4': 'Regulatory Engineer/Certification Engineer',
+        '11': 'R&H Manager',
+        '12': 'admin',
+        '13': 'Viewer',
+        '14': 'BrandAdministrator',
+        '20': 'Interface person',
+        '21': 'Person liable',
+        '30': 'Engineering interface person',
+        '31': 'Person liable'
+      },
+      areaOfResponsibility: {},
+      engineeringInterfacePerson: '',
+      roleSwitchName: '',
+      roleSwitchingList: [],
+      visible: false,
+      userIds: '',
+      userName: '',
+      dataSource: [],
+      columns: [
+        {
+          title: this.$t('replacedPerson'),
+          align: 'left',
+          dataIndex: 'userName',
+          width: 180,
+          customRender: (value, row, index) => {
+            const obj = {
+              children: value,
+              attrs: {}
+            }
+            if (index === 0) {
+              obj.attrs.rowSpan = row.maxLength
+            } else {
+              obj.attrs.rowSpan = 0
+            }
+            return obj
+          }
+        },
+        {
+          title: this.$t('areaOfResponsibility'),
+          align: 'left',
+          dataIndex: 'title',
+          width: 180
+        },
+        {
+          title: this.$t('replacementPerson'),
+          align: 'left',
+          dataIndex: 'replacementPerson',
+          width: 180,
+          scopedSlots: {customRender: 'replacementPerson'}
+        }
+      ]
+    }
+  },
+  created() {
+    document.title = this.$route.query.projectName ? this.$t('projectDetails') + '-' + this.$route.query.projectName : this.$t('projectDetails')
+    this.title = this.$route.query.projectName
+  },
+  mounted() {
+    this.getTaskId()
+    if (this.$route.query.type) {
+      if (this.$route.query.type == '101') {
+        this.textColor(this.$t('projectDetails'))
+        this.textTitle = this.$t('projectDetails')
+      } else if (this.$route.query.type == '102') {
+        if (this.$route.query.dutyTerritoryName) {
+          this.areaOfResponsibilityList = this.$route.query
+        }
+        this.textColor(this.$t('listOfRegulations'))
+        this.textTitle = this.$t('listOfRegulations')
+      } else if (this.$route.query.type == '103') {
+        // this.textColor(this.$t('taskList'))
+        // this.textTitle = this.$t('taskList')
+        this.$router.push({
+          path: '/projectRegulationTasks'
+        })
+      } else if (this.$route.query.type == '104') {
+        // this.textColor(this.$t('nonConformance'))
+        // this.textTitle = this.$t('nonConformance')
+      } else if (this.$route.query.type == '105') {
+        this.textColor(this.$t('TaskParameterCollection'))
+        this.textTitle = this.$t('TaskParameterCollection')
+      } else if (this.$route.query.type == '106') {
+        if (this.$route.query.dutyTerritoryName) {
+          this.areaOfResponsibility = this.$route.query
+        }
+        this.textColor(this.$t('certificationList'))
+        this.textTitle = this.$t('certificationList')
+      }
+    } else {
+      if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+        if (this.userInfo().userRoleList.length == 1 && this.userInfo().userRoleList[0].roleCode == 'sdt') {
+          this.getList()
+        } else {
+          this.textColor(0)
+        }
+      } else {
+        this.textColor(0)
+      }
+    }
+  },
+  methods: {
+    ...mapGetters(['userInfo']),
+    textIconClick() {
+      this.isDisplay = !this.isDisplay
+    },
+    globalReplacementClick() {
+      this.$refs.SelectedByRef.getPush()
+    },
+    SelectedByForm(userIds, userName) {
+      this.userIds = userIds
+      this.userName = userName
+      this.selectVisible = true
+      this.$refs.SelectedByRef.visible = false
+      this.$refs.SelectedByRef.submitLoading = false
+      this.getUserAllDutyTerritoryList()
+    },
+    getUserAllDutyTerritoryList() {
+      let query = {
+        projectLibraryId: this.$route.query.id,
+        userName: this.userName,
+        userId: this.userIds
+      }
+      this.selectLoading = true
+      getAction('/project/projectLibraryBase/getUserAllDutyTerritoryList', query).then((res) => {
+        if (res.success) {
+          this.dataSource = res.result || []
+          this.dataSource.forEach(val => {
+            val.newUserId = ''
+            val.userName = this.userName
+            val.maxLength = this.dataSource.length
+          })
+          this.selectLoading = false
+        } else {
+          this.dataSource = []
+          this.selectLoading = false
+        }
+      })
+    },
+    handleCancel() {
+      this.selectVisible = false
+    },
+    handleSubmit() {
+      if (this.dataSource.length > 0) {
+        let replacementUserList = []
+        this.dataSource.forEach(res => {
+          replacementUserList.push({
+            dutyTerritory: res.value,
+            newUserId: res.newUserId || '',
+            newUserName: res.newUserIdName || ''
+          })
+        })
+        let query = {
+          userId: this.userIds,
+          projectLibraryId: this.$route.query.id,
+          userName: this.userName,
+          replacementUserList: replacementUserList
+        }
+        this.submitLoading = true
+        postAction('/project/projectLibraryBase/overallReplacementUser', query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.submitLoading = false
+            this.selectVisible = false
+            this.dataSource = []
+            this.userName = ''
+            this.userIds = ''
+            let textTitle = this.textTitle
+            this.textTitle = ''
+            this.$nextTick(() => {
+              this.textTitle = textTitle
+            })
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+            this.submitLoading = false
+          }
+        })
+      } else {
+        this.$message.warning(this.$t('thereReplaceableData'))
+      }
+    },
+    textColor(name) {
+      let textColor = document.getElementsByClassName('Virtual-detail-left-text-color')
+      if (textColor && textColor.length > 0) {
+        textColor[0].classList.remove('Virtual-detail-left-text-color')
+      }
+      let text = document.getElementsByClassName('Virtual-detail-left-text')
+      if (name == 0) {
+        text[name].classList.add('Virtual-detail-left-text-color')
+        this.textTitle = text[name].title
+      } else {
+        if (text && text.length > 0) {
+          for (let i = 0; i < text.length; i++) {
+            if (text[i].title == name) {
+              text[i].classList.add('Virtual-detail-left-text-color')
+            } else if (text[i].title == name) {
+              text[i].classList.add('Virtual-detail-left-text-color')
+            } else if (text[i].title == name) {
+              text[i].classList.add('Virtual-detail-left-text-color')
+            } else if (text[i].title == name) {
+              text[i].classList.add('Virtual-detail-left-text-color')
+            } else if (text[i].title == name) {
+              text[i].classList.add('Virtual-detail-left-text-color')
+            }
+          }
+        }
+      }
+    },
+    textClick(num, name) {
+      this.areaOfResponsibilityList = {}
+      this.areaOfResponsibility = {}
+      this.textTitle = name
+      let textColor = document.getElementsByClassName('Virtual-detail-left-text-color')
+      if (textColor && textColor.length > 0) {
+        textColor[0].classList.remove('Virtual-detail-left-text-color')
+      }
+      let text = document.getElementsByClassName('Virtual-detail-left-text')
+      for (let i = 0; i < text.length; i++) {
+        if (text[i].title == name) {
+          text[i].classList.add('Virtual-detail-left-text-color')
+        } else if (text[i].title == name) {
+          text[i].classList.add('Virtual-detail-left-text-color')
+        } else if (text[i].title == name) {
+          text[i].classList.add('Virtual-detail-left-text-color')
+        } else if (text[i].title == name) {
+          text[i].classList.add('Virtual-detail-left-text-color')
+        } else if (text[i].title == name) {
+          text[i].classList.add('Virtual-detail-left-text-color')
+        }
+      }
+    },
+    //待办中心跳转
+    todocenterClick() {
+      this.$router.push({
+        path: '/projectRegulationTasks',
+        query: {
+          projectName: this.$route.query.projectName
+        }
+      })
+    },
+    UpdateLogClick() {
+      this.$refs.updateLogRef.getList({projectLibraryId: this.$route.query.id})
+    },
+    historicalVersionClick() {
+      this.$refs.historicalVersionListRef.getList()
+    },
+    commentClick() {
+      this.$refs.commentListRef.getData()
+    },
+    getTaskId() {
+      let query = {
+        projectLibraryId: this.$route.query.id
+      }
+      getAction(this.url.queryUserPremissionByProjectLibraryId, query).then((res) => {
+        if (res.success) {
+          this.isDisplayNum = res.result
+        }
+      })
+    },
+    getList() {
+      let query = {
+        projectId: this.$route.query.id
+      }
+      this.loading = true
+      postAction('/project/projectRelatedPersonnel/page', query).then((res) => {
+        if (res.success) {
+          let dataSource = res.result || []
+          dataSource.forEach(res => {
+            if (res.engineeringInterfacePerson || res.certificationEngineer || res.lawEngineer) {
+              this.engineeringInterfacePerson += res.engineeringInterfacePerson + ',' + res.certificationEngineer + ',' + res.lawEngineer + ','
+            }
+          })
+          if (this.engineeringInterfacePerson.includes(this.userInfo().id) ||
+            this.$route.query.studioEngineer == this.userInfo().id) {
+            this.isTrue = true
+          } else {
+            this.isTrue = false
+          }
+          this.$nextTick(() => {
+            this.textColor(0)
+          })
+          this.loading = false
+        } else {
+          this.textColor(0)
+          this.loading = false
+        }
+      })
+    },
+    TaskListChange(item) {
+      if (item.isListing && item.isListing == '1') {
+        this.areaOfResponsibilityList = item
+        this.textTitle = this.$t('listOfRegulations')
+      } else {
+        this.areaOfResponsibility = item
+        this.textTitle = this.$t('certificationList')
+      }
+      let textColor = document.getElementsByClassName('Virtual-detail-left-text-color')
+      if (textColor && textColor.length > 0) {
+        textColor[0].classList.remove('Virtual-detail-left-text-color')
+      }
+      let text = document.getElementsByClassName('Virtual-detail-left-text')
+      for (let i = 0; i < text.length; i++) {
+        if (text[i].title == this.textTitle) {
+          text[i].classList.add('Virtual-detail-left-text-color')
+        }
+      }
+    },
+    backClick() {
+      this.$router.push({
+        path: '/projectLibrary'
+      })
+    },
+    roleSwitchingClick(roleCode) {
+      this.JTextLoading = true
+      if (this.textTitle === this.$t('listOfRegulations')) {
+        this.$refs.listOfRegulationsRef.handleOkRoleSwitching(roleCode)
+      } else {
+        this.$refs.certificationListRef.handleOkRoleSwitching(roleCode)
+      }
+    },
+    getRoleSwitchingList(list) {
+      this.roleSwitchingList = list || []
+      this.roleSwitchingList = [...this.roleSwitchingList]
+    },
+    handleVisibleChange(visible) {
+      this.visible = visible
+    },
+    getRoleSwitch(value) {
+      let long = localStorage.getItem('language') || 'zh-cn'
+      if (long == 'zh-cn') {
+        this.roleSwitchName = this.roleSwitchListCn[value]
+      } else {
+        this.roleSwitchName = this.roleSwitchListEn[value]
+      }
+      this.JTextLoading = false
+      this.visible = false
+    },
+    PersonnelSelectionChange(value, id, index) {
+      this.dataSource[index][value] = id
+      this.dataSource = [...this.dataSource]
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import '~@assets/less/common.less';
+
+.doc-detail {
+  background: #fff;
+  height: 100%;
+  position: relative;
+
+  .Virtual-detail-header {
+    width: 100%;
+    height: 56px;
+    line-height: 56px;
+    padding: 0 32px 0 32px;
+    box-sizing: border-box;
+    display: flex;
+    justify-content: space-between;
+    border-bottom: 2px #eff1f3 solid;
+    background: #fff;
+
+    .Virtual-detail-title {
+      display: inline-block;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      overflow: hidden;
+      font-size: 20px;
+      font-weight: 400;
+      color: #040B29;
+      line-height: 55px;
+    }
+
+    .doc-detail-right {
+      width: 800px;
+      line-height: 68px;
+      display: flex;
+    }
+  }
+
+  .Virtual-detail-left {
+    width: 240px;
+    flex: 0 0 240px;
+    padding: 16px 24px;
+    box-sizing: border-box;
+    font-size: 16px;
+    line-height: 3;
+    float: left;
+    transition: all 0.2s;
+
+    .Virtual-detail-left-text {
+      padding: 2px 12px;
+      cursor: pointer;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
+
+  .Virtual-detail-left-One {
+    width: 66px;
+    flex: 0 0 66px;
+    display: inline-block;
+    padding: 16px 16px;
+    box-sizing: border-box;
+    font-size: 18px;
+    right: 0;
+    transition: all 0.2s;
+
+    .Virtual-detail-left-text {
+      padding: 2px 8px;
+      cursor: pointer;
+      margin-bottom: 18px;
+      color: rgb(0, 0, 0);
+    }
+  }
+
+  .Virtual-detail-right {
+    border-left: 2px #eff1f3 solid;
+    height: 100%;
+    float: right;
+    overflow: auto;
+    transition: all 0.2s;
+  }
+}
+
+.Virtual-detail-left-text-color {
+  background: #eff1f3;
+  border-radius: 4px;
+}
+
+.Virtual-detail-text-right {
+
+}
+
+.text-icon {
+  color: rgb(0, 0, 0);
+  font-size: 22px;
+  position: absolute;
+  left: 200px;
+  bottom: 20px;
+  transition: all 0.2s;
+}
+
+.text-icon-one {
+  color: rgb(0, 0, 0);
+  font-size: 22px;
+  position: absolute;
+  left: 22px;
+  bottom: 20px;
+  transition: all 0.2s;
+}
+
+.operator-text-title {
+  cursor: pointer;
+  margin-right: 22px;
+  font-size: 14px;
+  font-weight: 400;
+  color: #040B29;
+  margin-bottom: 22px;
+}
+
+.operator-text-title:last-child {
+  margin-bottom: 0;
+}
+
+.operator-text-title-color {
+  color: #00B3BE;
+}
+
+.drawer-bootom-button {
+  position: absolute;
+  bottom: 0;
+  z-index: 100;
+  width: 100%;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
+</style>
+<style>
+.popconfirmDetails {
+  z-index: 999;
+  top: 42px !important;
+}
+
+.popconfirmDetails .ant-popover-buttons {
+  display: none !important;
+}
+
+.popconfirmDetails .anticon-exclamation-circle {
+  display: none !important;
+}
+</style>
\ No newline at end of file

From f680da60e6c3a293465a01a212067566d0f7dae4 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 12 Sep 2023 17:07:38 +0800
Subject: [PATCH 004/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ProjectPlatformController.java |  311 ++
 .../mapper/ProjectPlatformMapper.java         |   32 +
 .../mapper/xml/ProjectPlatform.xml            |  303 ++
 .../service/IProjectPlatformService.java      |  191 +
 .../impl/ProjectPlatformServiceImpl.java      | 3573 +++++++++++++++++
 5 files changed, 4410 insertions(+)
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/ProjectPlatformController.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/ProjectPlatformMapper.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/ProjectPlatform.xml
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IProjectPlatformService.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/ProjectPlatformServiceImpl.java

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/ProjectPlatformController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/ProjectPlatformController.java
new file mode 100644
index 000000000..3d02d8201
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/ProjectPlatformController.java
@@ -0,0 +1,311 @@
+package com.jero.modules.projectPlatform.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.vo.DictModel;
+import com.jero.modules.project.entity.ProjectLibraryBase;
+import com.jero.modules.project.service.IProjectLibraryBaseService;
+import com.jero.modules.projectPlatform.service.IProjectPlatformService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @Description: 项目库基础表
+ * @Author: jero-boot
+ * @Date:   2022-04-11
+ * @Version: V1.0
+ */
+@Api(tags="平台件项目库")
+@RestController
+@RequestMapping("/project/platform")
+@Slf4j
+public class ProjectPlatformController extends JeroController<ProjectLibraryBase, IProjectPlatformService> {
+	@Autowired
+	private IProjectPlatformService projectPlatformService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "项目库基础表-分页列表查询")
+	@ApiOperation(value="项目库基础表-分页列表查询", notes="项目库基础表-分页列表查询")
+	@PostMapping(value = "/page")
+	public Result<?> queryPageList(@RequestBody Map<String,Object> params) {
+		List<ProjectLibraryBase> pageList= projectPlatformService.queryPageList(params);
+		Page pages = projectPlatformService.getPages(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()), pageList);
+		return Result.OK(params.get("cut").toString(),pages);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "项目库基础表-列表查询")
+    @ApiOperation(value="项目库基础表-列表查询", notes="项目库基础表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<ProjectLibraryBase>> queryList(ProjectLibraryBase projectLibraryBase) {
+        List<ProjectLibraryBase> list = projectPlatformService.getList(projectLibraryBase);
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param projectLibraryBase
+	 * @return
+	 */
+	@AutoLog(value = "项目库基础表-添加")
+	@ApiOperation(value="项目库基础表-添加", notes="项目库基础表-添加")
+	@RequiresPermissions("projectLibraryBase:add")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) throws ParseException {
+		projectPlatformService.add(projectLibraryBase);
+		return Result.OK("添加成功！");
+	}
+	/**
+	 * 项目扩展(添加子项目子项目基本信息、相关人员名单、法规/认证任务计划与被扩展项目保持一致)
+	 *
+	 * @param projectLibraryBase
+	 * @return
+	 */
+	@AutoLog(value = "项目扩展(添加子项目)")
+	@ApiOperation(value="项目扩展(添加子项目)", notes="项目扩展(添加子项目)")
+	@RequiresPermissions("projectLibraryBase:add")
+	@PostMapping(value = "/addChild")
+	public Result<?> addChild(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) throws ParseException {
+		projectPlatformService.addChild(projectLibraryBase);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param projectLibraryBase
+	 * @return
+	 */
+	@AutoLog(value = "项目库基础表-编辑")
+	@ApiOperation(value="项目库基础表-编辑", notes="项目库基础表-编辑")
+	@RequiresPermissions("projectLibraryBase:edit")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) {
+		projectPlatformService.editById(projectLibraryBase);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "项目库基础表-通过id删除")
+	@ApiOperation(value="项目库基础表-通过id删除", notes="项目库基础表-通过id删除")
+	@RequiresPermissions("projectLibraryBase:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id,
+							@RequestParam(name="cut",required=true) String cut) {
+		projectPlatformService.deleteById(id,cut);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "项目库基础表-批量删除")
+	@ApiOperation(value="项目库基础表-批量删除", notes="项目库基础表-批量删除")
+	@RequiresPermissions("projectLibraryBase:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids,
+								 @RequestParam(name="cut",required=true) String cut) {
+		this.projectPlatformService.deleteByIds(Arrays.asList(ids.split(",")),cut);
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "项目库基础表-通过id查询")
+	@ApiOperation(value="项目库基础表-通过id查询", notes="项目库基础表-通过id查询")
+	@RequiresPermissions("projectLibraryBase:queryById")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id,
+							   @RequestParam(name="cut",required=true) String cut) {
+		List<ProjectLibraryBase> data = projectPlatformService.queryById(id,cut);
+			if(data==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cut,data);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param projectLibraryBase
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ProjectLibraryBase projectLibraryBase) {
+        return super.exportXls(request, projectLibraryBase, ProjectLibraryBase.class, "项目库基础表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ProjectLibraryBase.class);
+    }
+
+	/**
+	 * 项目详情-统计接口
+	 * @param id 项目库id
+	 * @return
+	 */
+	@AutoLog(value = "项目详情-统计接口")
+	@ApiOperation(value="项目详情-统计接口", notes="项目详情-统计接口")
+	@GetMapping(value = "/getProjectDetailsStatistics")
+	public Result<?> getProjectDetailsStatistics(@RequestParam(name="id",required=true) String id,
+							   @RequestParam(name="cut",required=true) String cut) {
+		Map<String,Object> data = projectPlatformService.getProjectDetailsStatistics(id);
+		return Result.OK(cut,data);
+	}
+
+	/**
+	 * 项目详情-统计接口-根据领域分组
+	 * @return
+	 */
+	@AutoLog(value = "项目详情-统计接口-根据领域分组")
+	@ApiOperation(value="项目详情-统计接口-根据领域分组", notes="项目详情-统计接口-根据领域分组")
+	@GetMapping(value = "/getProjectDetailsStatisticsGroupByTerritory")
+	public Result<?> getProjectDetailsStatisticsGroupByTerritory(@RequestParam Map<String,Object> params) {
+		Map<String,Object> data = projectPlatformService.getProjectDetailsStatisticsGroupByTerritory(params);
+		return Result.OK((String)params.get("cut"),data);
+	}
+
+	/**
+	 * 导出excel
+	 *
+	 * @param request
+	 * @param params
+	 */
+	@RequestMapping(value = "/exportProjectDetailsStatisticsGroupByTerritoryXls")
+	public void exportProjectDetailsStatisticsGroupByTerritoryXls(HttpServletResponse response,HttpServletRequest request, @RequestParam Map<String,Object> params) {
+		projectPlatformService.exportProjectDetailsStatisticsGroupByTerritoryXls(response,request, params);
+	}
+
+
+	/**
+	 * 项目置顶,取消置顶(只置顶主项目)
+	 * @param id
+	 * @param flag 0为置顶,  1为取消置顶
+	 * @return
+	 */
+	@AutoLog(value = "项目置顶,取消置顶(只置顶主项目)")
+	@ApiOperation(value="项目置顶,取消置顶(只置顶主项目)", notes="项目置顶,取消置顶(只置顶主项目)")
+	@GetMapping(value = "/top")
+	public Result<?> top(String id,String flag) {
+		projectPlatformService.top(id,flag);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 * 获取项目所有的版本(主版本和子版本的集合)
+	 * @param id 项目id
+	 * @return
+	 */
+	@AutoLog(value = "获取项目所有的版本(主版本和子版本的集合)")
+	@ApiOperation(value="获取项目所有的版本(主版本和子版本的集合)", notes="获取项目所有的版本(主版本和子版本的集合)")
+	@GetMapping(value = "/getVersionsInfo")
+	public Result<?> getVersionsInfo(String id) {
+		List<String> versionsInfoList = projectPlatformService.getVersionsInfo(id);
+		return Result.OK(versionsInfoList);
+	}
+
+	/**
+	 * 版本统计
+	 * @return
+	 */
+	@AutoLog(value = "版本统计")
+	@ApiOperation(value="版本统计)", notes="版本统计")
+	@PostMapping(value = "/versionStatistics")
+	public Result<?> versionStatistics(@RequestBody Map<String,Object> params) {
+		List<ProjectLibraryBase> projectLibraryBasesList = projectPlatformService.versionStatistics(String.valueOf(params.get("id")));
+		Page pages = projectPlatformService.getPages(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()), projectLibraryBasesList);
+		return Result.OK(pages);
+	}
+
+	@AutoLog(value = "对接火山引擎接口getProjectInfo")
+	@ApiOperation(value="对接火山引擎接口-获取项目统计信息1", notes="对接火山引擎接口-获取项目统计信息1")
+	@PostMapping(value = "/getProjectInfo")
+	public Result<?> getProjectInfo(){
+		JSONArray resList = projectPlatformService.getProjectInfo();
+		return Result.OK(resList);
+	}
+
+	@AutoLog(value = "对接火山引擎接口getProjectProgressInfo")
+	@ApiOperation(value="对接火山引擎接口-获取项目统计信息2", notes="对接火山引擎接口-获取项目统计信息2")
+	@PostMapping(value = "/getProjectProgressInfo")
+	public Result<?> getProjectProgressInfo(){
+		JSONArray resList = this.projectPlatformService.getProjectProgressInfo();
+		return Result.OK(resList);
+	}
+
+	// 导出项目进度统计(状态导出)
+	@RequestMapping(value = "/exportProjectProgressStatisticsXls")
+	public void exportProjectProgressStatisticsXls(HttpServletResponse response,HttpServletRequest request, @RequestParam Map<String,Object> params) {
+		this.projectPlatformService.exportProjectProgressStatisticsXls(response,request, params);
+	}
+
+	@AutoLog(value = "获取用户在该项目中所有的责任领域")
+	@ApiOperation(value="获取用户在该项目中所有的责任领域", notes="获取用户在该项目中所有的责任领域")
+	@GetMapping(value = "/getUserAllDutyTerritoryList")
+	public Result<List<DictModel>> getUserAllDutyTerritoryList(@RequestParam Map<String,Object> params){
+		List<DictModel> resList = this.projectPlatformService.getUserAllDutyTerritoryList(params);
+		return Result.OK(resList);
+	}
+
+	@AutoLog(value = "全局替换用户")
+	@ApiOperation(value="全局替换用户", notes="全局替换用户")
+	@PostMapping(value = "/overallReplacementUser")
+	public Result<?> overallReplacementUser(@RequestBody JSONObject json){
+		return this.projectPlatformService.overallReplacementUser(json);
+	}
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/ProjectPlatformMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/ProjectPlatformMapper.java
new file mode 100644
index 000000000..20c20cead
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/ProjectPlatformMapper.java
@@ -0,0 +1,32 @@
+package com.jero.modules.projectPlatform.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.modules.project.entity.ProjectLibraryBase;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 项目库基础表
+ * @Author: jero-boot
+ * @Date:   2022-04-11
+ * @Version: V1.0
+ */
+public interface ProjectPlatformMapper extends BaseMapper<ProjectLibraryBase> {
+    /**分页列表*/
+    List<ProjectLibraryBase> queryPageList(@Param("params") Map<String, Object> params);
+    List<ProjectLibraryBase> queryMaimList();
+//    IPage<ProjectLibraryBase> queryPageList(IPage page, Map<String, Object> params);
+
+    List<ProjectLibraryBase> getList(@Param("projectLibraryBase") ProjectLibraryBase projectLibraryBase);
+
+    /**根据id查询*/
+    List<ProjectLibraryBase> queryById(String id);
+
+    ProjectLibraryBase selectProjectName(@Param("projectLibraryId") String projectLibraryId);
+
+    List<ProjectLibraryBase> getListByIds(@Param("idList") List<String> idList);
+
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/ProjectPlatform.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/ProjectPlatform.xml
new file mode 100644
index 000000000..aae850b73
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/ProjectPlatform.xml
@@ -0,0 +1,303 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.projectPlatform.mapper.ProjectPlatformMapper">
+    <resultMap id="ProjectLibraryBaseResultMap" type="com.jero.modules.project.entity.ProjectLibraryBase">
+        <id column="id" property="id" />
+
+        <result column="project_name_id" property="projectNameId" />
+        <result column="year_name_id" property="yearNameId" />
+        <result column="target_market" property="targetMarket" />
+        <result column="project_status" property="projectStatus" />
+        <result column="studio_engineer" property="studioEngineer" />
+        <result column="certification_engineer" property="certificationEngineer" />
+        <result column="vehicle_platform" property="vehiclePlatform" />
+        <result column="digital_platform" property="digitalPlatform" />
+        <result column="ipd_info" property="ipdInfo" />
+        <result column="vehicle_development_plan" property="vehicleDevelopmentPlan" />
+        <result column="attestation_plan" property="attestationPlan" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="brand" property="brand" />
+    </resultMap>
+
+    <sql id="select_item">
+        select
+            plb.id,
+            plb.project_name_id,
+            pni.project_name as project_name,
+            pyni.id as year_name_id,
+            pyni.year_name,
+            plb.target_market,
+            plb.project_status,
+            plb.studio_engineer,
+            studiouser.username as studio_engineer_name,
+            plb.certification_engineer,
+            plb.vehicle_platform,
+            plb.digital_platform,
+            plb.ipd_info,
+            plb.vehicle_development_plan,
+            plb.attestation_plan,
+            plb.create_by,
+            plb.create_time,
+            plb.sys_org_code,
+            plb.update_by,
+            plb.update_time,
+            plb.parent_id,
+            plb.project_version,
+            plb.explanation,
+            plb.software_version,
+            plb.sort,
+            plb.flag,
+            plb.brand,
+            sdi.item_text brandText,
+            sdi.en_name brandTextEn
+        from project_library_base as plb
+        left join project_name_info as pni on  plb.project_name_id=pni.id
+        left join sys_user as studiouser on plb.studio_engineer=studiouser.id
+        left join project_year_name_info as pyni on plb.year_name_id=pyni.id
+        left join sys_dict_item as sdi on sdi.item_value = plb.brand
+    </sql>
+
+    <select id="queryPageList" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
+
+        <include refid="select_item"/>
+
+        <where>
+            <if test="params.projectName != null and params.projectName != ''">
+                <!--搜索条件:项目名称,包含%,单独搜索-->
+                <choose>
+                    <when test='params.projectName != null and params.projectName != "" and params.projectName.contains("%")'>
+                        ( pni.project_name like '%1%%' escape '1' or pni.project_name like '%1%%' escape '1')
+                    </when>
+                    <otherwise>
+            <!--(pni.project_name like concat('%',#{params.projectName},'%') or pyni.year_name like concat('%',#{params.projectName},'%'))-->
+        </otherwise>
+    </choose>
+</if>
+
+            <!--搜索条件:目标市场-->
+            <if test="params.targetMarket != null and params.targetMarket != '' ">
+                and plb.target_market like concat('%',#{params.targetMarket},'%')
+            </if>
+
+            <!--搜索条件:项目状态-->
+            <if test="params.projectStatus != null and params.projectStatus != '' ">
+                and plb.project_status like concat('%',#{params.projectStatus},'%')
+            </if>
+
+            <if test="params.studioEngineer != null and params.studioEngineer != ''">
+                <!--搜索条件:studio工程师,包含%,单独搜索-->
+                <choose>
+                    <when test='params.studioEngineer != null and params.studioEngineer != "" and params.studioEngineer.contains("%")'>
+                        and plb.studio_engineer like '%1%%' escape '1'
+                    </when>
+                    <otherwise>
+                        and plb.studio_engineer like concat('%',#{params.studioEngineer},'%')
+                    </otherwise>
+                </choose>
+            </if>
+
+            <if test="params.certificationEngineer != null and params.certificationEngineer != ''">
+                <!--搜索条件:认证工程师,包含%,单独搜索-->
+                <choose>
+                    <when test='params.certificationEngineer != null and params.certificationEngineer != "" and params.certificationEngineer.contains("%")'>
+                        and plb.certification_engineer like '%1%%' escape '1'
+                    </when>
+                    <otherwise>
+                        and plb.certification_engineer like concat('%',#{params.certificationEngineer},'%')
+                    </otherwise>
+                </choose>
+            </if>
+
+            <!--搜索条件:车型平台-->
+            <if test="params.vehiclePlatform != null and params.vehiclePlatform != '' ">
+                and plb.vehicle_platform like concat('%',#{params.vehiclePlatform},'%')
+            </if>
+
+            <!--搜索条件:数字平台-->
+            <if test="params.digitalPlatform != null and params.digitalPlatform != '' ">
+                and plb.digital_platform like concat('%',#{params.digitalPlatform},'%')
+            </if>
+
+            <!--搜索条件:品牌-->
+            <if test="params.brand != null and params.brand != '' ">
+                and plb.brand = #{params.brand}
+            </if>
+        </where>
+        order by plb.sort desc, plb.create_time desc
+    </select>
+    <select id="queryMaimList" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
+
+        <include refid="select_item"/>
+
+        <where>
+            parent_id = '' or parent_id is null
+        </where>
+        order by  plb.create_time desc
+    </select>
+<!--    <select id="queryPageList" resultType="com.jero.modules.project.entity.ProjectLibraryBase">-->
+
+<!--        <include refid="select_item"/>-->
+
+<!--        <where>-->
+<!--            <if test="params.projectName != null and params.projectName != ''">-->
+<!--                &lt;!&ndash;搜索条件:项目名称,包含%,单独搜索&ndash;&gt;-->
+<!--                <choose>-->
+<!--                    <when test='params.projectName != null and params.projectName != "" and params.projectName.contains("%")'>-->
+<!--                        ( pni.project_name like '%1%%' escape '1' or pni.project_name like '%1%%' escape '1')-->
+<!--                    </when>-->
+<!--                    <otherwise>-->
+<!--                        (pni.project_name like concat('%',#{params.projectName},'%') or pyni.year_name like concat('%',#{params.projectName},'%'))-->
+<!--                    </otherwise>-->
+<!--                </choose>-->
+<!--            </if>-->
+
+<!--            &lt;!&ndash;搜索条件:目标市场&ndash;&gt;-->
+<!--            <if test="params.targetMarket != null and params.targetMarket != '' ">-->
+<!--                and plb.target_market like concat('%',#{params.targetMarket},'%')-->
+<!--            </if>-->
+
+<!--            &lt;!&ndash;搜索条件:项目状态&ndash;&gt;-->
+<!--            <if test="params.projectStatus != null and params.projectStatus != '' ">-->
+<!--                and plb.project_status like concat('%',#{params.projectStatus},'%')-->
+<!--            </if>-->
+
+<!--            <if test="params.studioEngineer != null and params.studioEngineer != ''">-->
+<!--                &lt;!&ndash;搜索条件:studio工程师,包含%,单独搜索&ndash;&gt;-->
+<!--                <choose>-->
+<!--                    <when test='params.studioEngineer != null and params.studioEngineer != "" and params.studioEngineer.contains("%")'>-->
+<!--                        and plb.studio_engineer like '%1%%' escape '1'-->
+<!--                    </when>-->
+<!--                    <otherwise>-->
+<!--                        and plb.studio_engineer like concat('%',#{params.studioEngineer},'%')-->
+<!--                    </otherwise>-->
+<!--                </choose>-->
+<!--            </if>-->
+
+<!--            <if test="params.certificationEngineer != null and params.certificationEngineer != ''">-->
+<!--                &lt;!&ndash;搜索条件:认证工程师,包含%,单独搜索&ndash;&gt;-->
+<!--                <choose>-->
+<!--                    <when test='params.certificationEngineer != null and params.certificationEngineer != "" and params.certificationEngineer.contains("%")'>-->
+<!--                        and plb.certification_engineer like '%1%%' escape '1'-->
+<!--                    </when>-->
+<!--                    <otherwise>-->
+<!--                        and plb.certification_engineer like concat('%',#{params.certificationEngineer},'%')-->
+<!--                    </otherwise>-->
+<!--                </choose>-->
+<!--            </if>-->
+
+<!--            &lt;!&ndash;搜索条件:车型平台&ndash;&gt;-->
+<!--            <if test="params.vehiclePlatform != null and params.vehiclePlatform != '' ">-->
+<!--                and plb.vehicle_platform like concat('%',#{params.vehiclePlatform},'%')-->
+<!--            </if>-->
+
+<!--            &lt;!&ndash;搜索条件:数字平台&ndash;&gt;-->
+<!--            <if test="params.digitalPlatform != null and params.digitalPlatform != '' ">-->
+<!--                and plb.digital_platform like concat('%',#{params.digitalPlatform},'%')-->
+<!--            </if>-->
+<!--        </where>-->
+<!--        order by plb.create_time desc-->
+<!--    </select>-->
+    <select id="getList" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
+
+        <include refid="select_item"/>
+
+        <where>
+            <if test="projectLibraryBase.projectName != null and projectLibraryBase.projectName != ''">
+                <!--搜索条件:项目名称,包含%,单独搜索-->
+                <choose>
+                    <when test='projectLibraryBase.projectName != null and projectLibraryBase.projectName != "" and projectLibraryBase.projectName.contains("%")'>
+                        and pni.project_name like '%1%%' escape '1'
+                    </when>
+                    <otherwise>
+                        and pni.project_name like concat('%',#{projectLibraryBase.projectName},'%')
+                    </otherwise>
+                </choose>
+            </if>
+
+            <!--搜索条件:目标市场-->
+            <if test="projectLibraryBase.targetMarket != null and projectLibraryBase.targetMarket != '' ">
+                and plb.target_market like concat('%',#{projectLibraryBase.targetMarket},'%')
+            </if>
+
+            <!--搜索条件:项目状态-->
+            <if test="projectLibraryBase.projectStatus != null and projectLibraryBase.projectStatus != '' ">
+                and plb.project_status like concat('%',#{projectLibraryBase.projectStatus},'%')
+            </if>
+
+            <!--搜索条件:品牌-->
+            <if test="projectLibraryBase.brand != null and projectLibraryBase.brand != '' ">
+                and plb.brand = #{projectLibraryBase.brand}
+            </if>
+
+            <if test="projectLibraryBase.studioEngineer != null and projectLibraryBase.studioEngineer != ''">
+                <!--搜索条件:studio工程师,包含%,单独搜索-->
+                <choose>
+                    <when test='projectLibraryBase.studioEngineer != null and projectLibraryBase.studioEngineer != "" and projectLibraryBase.studioEngineer.contains("%")'>
+                        and plb.studio_engineer like '%1%%' escape '1'
+                    </when>
+                    <otherwise>
+                        and plb.studio_engineer like concat('%',#{projectLibraryBase.studioEngineer},'%')
+                    </otherwise>
+                </choose>
+            </if>
+
+            <if test="projectLibraryBase.certificationEngineer != null and projectLibraryBase.certificationEngineer != ''">
+                <!--搜索条件:认证工程师,包含%,单独搜索-->
+                <choose>
+                    <when test='projectLibraryBase.certificationEngineer != null and projectLibraryBase.certificationEngineer != "" and projectLibraryBase.certificationEngineer.contains("%")'>
+                        and plb.certification_engineer like '%1%%' escape '1'
+                    </when>
+                    <otherwise>
+                        and plb.certification_engineer like concat('%',#{projectLibraryBase.certificationEngineer},'%')
+                    </otherwise>
+                </choose>
+            </if>
+
+            <!--搜索条件:车型平台-->
+<!--            <if test="projectLibraryBase.vehiclePlatform != null and projectLibraryBase.vehiclePlatform != '' ">-->
+<!--                and plb.vehicle_platform like concat('%',#{projectLibraryBase.vehiclePlatform},'%')-->
+<!--            </if>-->
+
+            <!--搜索条件:数字平台-->
+<!--            <if test="projectLibraryBase.digitalPlatform != null and projectLibraryBase.digitalPlatform != '' ">-->
+<!--                and plb.digital_platform like concat('%',#{projectLibraryBase.digitalPlatform},'%')-->
+<!--            </if>-->
+        </where>
+        order by plb.create_time desc
+    </select>
+
+    <select id="queryById" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
+        <include refid="select_item"/>
+        <where>
+            <if test="id != null and id != '' ">
+                plb.id=#{id}
+            </if>
+        </where>
+        order by plb.create_time desc
+    </select>
+
+    <select id="selectProjectName" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
+        SELECT
+            concat( pni.project_name, '-', pyni.year_name ) AS project_name
+        FROM
+            project_library_base plb
+            LEFT JOIN project_name_info pni ON plb.project_name_id = pni.id
+            LEFT JOIN project_year_name_info pyni ON plb.year_name_id = pyni.id
+        WHERE
+            plb.id = #{projectLibraryId}
+    </select>
+
+    <select id="getListByIds" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
+
+        <include refid="select_item"/>
+        where plb.id in
+        <foreach collection="idList" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        order by plb.create_time desc
+    </select>
+</mapper>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IProjectPlatformService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IProjectPlatformService.java
new file mode 100644
index 000000000..7a3996700
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IProjectPlatformService.java
@@ -0,0 +1,191 @@
+package com.jero.modules.projectPlatform.service;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.vo.DictModel;
+import com.jero.modules.project.entity.ProjectLibraryBase;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 项目库基础表
+ * @Author: jero-boot
+ * @Date:   2022-04-11
+ * @Version: V1.0
+ */
+public interface IProjectPlatformService extends IService<ProjectLibraryBase> {
+
+	/**
+	 * 保存
+	 *
+	 * @param projectLibraryBase
+	 * @return
+	 */
+    void add(ProjectLibraryBase projectLibraryBase) throws ParseException;
+
+	/**
+	 * 项目扩展(添加子项目-子项目基本信息、相关人员名单、法规/认证任务计划与被扩展项目保持一致)
+	 *
+	 * @param projectLibraryBase
+	 * @return
+	 */
+    void addChild(ProjectLibraryBase projectLibraryBase) throws ParseException;
+
+	/**
+	 * 更新
+	 *
+	 * @param projectLibraryBase
+	 * @return
+	 */
+    void editById(ProjectLibraryBase projectLibraryBase);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id, String cut);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids,String cut);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	List<ProjectLibraryBase> queryById(String id,String cut);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ProjectLibraryBase> getList(ProjectLibraryBase projectLibraryBase);
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @return
+	 */
+	List<ProjectLibraryBase> queryPageList(Map<String, Object> params);
+//	IPage<ProjectLibraryBase> queryPageList(Map<String, Object> params);
+
+	/**
+	 * 项目详情-统计接口
+	 * @param id
+	 * @return
+	 */
+    Map<String, Object> getProjectDetailsStatistics(String id);
+
+	/**
+	 * 项目详情-统计接口-根据领域分组
+	 * @param params
+	 * @return
+	 */
+    Map<String, Object> getProjectDetailsStatisticsGroupByTerritory(Map<String, Object> params);
+
+	void exportProjectDetailsStatisticsGroupByTerritoryXls(HttpServletResponse response, HttpServletRequest request, Map<String, Object> params);
+
+    void checkData(String id, String cut);
+
+	void disposeData(List<ProjectLibraryBase> records,String cut,boolean disposeTargetMarketFlag);
+
+	Page getPages(Integer currentPage, Integer pageSize, List<ProjectLibraryBase> list);
+
+	/**
+	 * 项目置顶,取消置顶(只置顶主项目)
+	 * @param id
+	 * @param flag 0为置顶,  1为取消置顶
+	 * @return
+	 */
+	void top(String id,String flag);
+
+	/**
+	 * 获取项目所有的版本(主版本和子版本的集合)
+	 * @param id
+	 * @return
+	 */
+	List<String> getVersionsInfo(String id);
+
+	/**
+	 * 版本统计
+	 * @param id
+	 * @return
+	 */
+	List<ProjectLibraryBase> versionStatistics(String id);
+
+	/**
+	 * 通过主项目id和子项目版本号
+	 * @param version
+	 * @param parentId
+	 * @return
+	 */
+	String getIdByVersionAndParentId(String version, String parentId);
+
+	/**
+	 *  查询主项目及其所有子项目
+	 * @param parentId
+	 * @return
+	 */
+	List<ProjectLibraryBase> getParentAndChildern(String parentId);
+
+	/**
+	 * 根据id查询项目库详情信息  发送飞书消息时使用，之前的 queryById不太兼容
+	 * @param projectLibraryId
+	 * @return
+	 */
+	ProjectLibraryBase selectById(String projectLibraryId);
+
+	/**
+	 * 对接火山引擎接口-获取项目统计信息
+	 * @return
+	 */
+	JSONArray getProjectInfo();
+
+	/**
+	 * 对接火山引擎接口-获取项目统计信息
+	 * @return
+	 */
+    JSONArray getProjectProgressInfo();
+
+	/**
+	 * 导出项目进度统计(状态导出)
+	 * @param response
+	 * @param request
+	 * @param params
+	 */
+    void exportProjectProgressStatisticsXls(HttpServletResponse response, HttpServletRequest request, Map<String, Object> params);
+
+	/**
+	 * 获取用户在该项目中所有的责任领域数组
+	 * @param params
+	 * @return
+	 */
+    List<DictModel> getUserAllDutyTerritoryList(Map<String, Object> params);
+
+	/**
+	 * 全局替换用户
+	 * @param json
+	 * @return
+	 */
+    Result<?> overallReplacementUser(JSONObject json);
+
+	List<ProjectLibraryBase> queryList(List<String> projectIdList);
+
+	List<ProjectLibraryBase> getListByIds(List<String> projectIdList);
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/ProjectPlatformServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/ProjectPlatformServiceImpl.java
new file mode 100644
index 000000000..e328bc564
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/ProjectPlatformServiceImpl.java
@@ -0,0 +1,3573 @@
+package com.jero.modules.projectPlatform.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.api.vo.Result;
+import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.exception.JeroBootException;
+import com.jero.common.system.vo.DictModel;
+import com.jero.common.system.vo.LoginUser;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
+import com.jero.modules.cert.collect.entity.ParamsManifestEO;
+import com.jero.modules.cert.collect.enums.CollectManifestStateEnum;
+import com.jero.modules.cert.collect.enums.CollectManifestStatisticsStateEnum;
+import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
+import com.jero.modules.cert.collect.service.IParamsManifestEOService;
+import com.jero.modules.cert.template.enums.ControlTypeEnum;
+import com.jero.modules.dummy.enums.OrderEnum;
+import com.jero.modules.enums.DictCodeEnum;
+import com.jero.modules.feishu.enums.TemplateInfoEnum2;
+import com.jero.modules.ota.service.impl.OtaManageApplyEOServiceImpl;
+import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
+import com.jero.modules.project.entity.ProjectLawsInventoryEO;
+import com.jero.modules.project.entity.ProjectLawsInventoryLogEO;
+import com.jero.modules.project.entity.ProjectLibraryBase;
+import com.jero.modules.project.entity.ProjectLibraryRoleRelEO;
+import com.jero.modules.project.entity.ProjectRelatedPersonnel;
+import com.jero.modules.project.entity.ProjectTaskInventoryEO;
+import com.jero.modules.project.entity.ProjectTaskPlanning;
+import com.jero.modules.project.entity.ProjectUserPermission;
+import com.jero.modules.project.enums.CertificationFlowNodeEnum;
+import com.jero.modules.project.enums.CertificationInventoryFlowStatusEnum;
+import com.jero.modules.project.enums.CertificationProgressEnum;
+import com.jero.modules.project.enums.ComplianceFlowStatusEnum;
+import com.jero.modules.project.enums.DesignComplianceStatusEnum;
+import com.jero.modules.project.enums.HSStatisticalNodesEnum;
+import com.jero.modules.project.enums.OperatorTypeEnum;
+import com.jero.modules.project.enums.PermissionDescriptionEnum;
+import com.jero.modules.project.enums.ProjectRoleEnum;
+import com.jero.modules.project.enums.ProjectTaskPlanningNameEnum;
+import com.jero.modules.project.enums.ProjectUserLocationEnum;
+import com.jero.modules.project.enums.RoleRelModelTypeEnum;
+import com.jero.modules.project.enums.TaskAffirmStatusEnum;
+import com.jero.modules.project.enums.TaskStatusEnum;
+import com.jero.modules.project.enums.TopEnum;
+import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper;
+import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
+import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
+import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper;
+import com.jero.modules.project.mapper.ProjectTaskInventoryEOMapper;
+import com.jero.modules.project.mapper.ProjectUserPermissionMapper;
+import com.jero.modules.project.service.IConditionAssessmentEOService;
+import com.jero.modules.project.service.IProjectCertificationInventoryEOService;
+import com.jero.modules.project.service.IProjectLibraryBaseService;
+import com.jero.modules.project.service.IProjectLibraryRoleRelEOService;
+import com.jero.modules.project.service.IProjectLibraryStatisticsService;
+import com.jero.modules.project.service.IProjectUserPermissionService;
+import com.jero.modules.project.service.impl.ProjectLawsInventoryEOServiceImpl;
+import com.jero.modules.project.service.impl.ProjectLawsInventoryLogEOServiceImpl;
+import com.jero.modules.project.service.impl.ProjectNameInfoEOServiceImpl;
+import com.jero.modules.project.service.impl.ProjectRelatedPersonnelServiceImpl;
+import com.jero.modules.project.service.impl.ProjectTaskPlanningServiceImpl;
+import com.jero.modules.project.vo.TimeNodeVO;
+import com.jero.modules.projectPlatform.mapper.ProjectPlatformMapper;
+import com.jero.modules.projectPlatform.service.IProjectPlatformService;
+import com.jero.modules.system.entity.SysDictItem;
+import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.enums.DicCodeEnum;
+import com.jero.modules.system.mapper.SysDictItemMapper;
+import com.jero.modules.system.mapper.SysRoleMapper;
+import com.jero.modules.system.mapper.SysUserMapper;
+import com.jero.modules.system.service.IProjectUserBrandService;
+import com.jero.modules.system.service.ISysDictService;
+import com.jero.modules.system.service.ISysUserService;
+import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
+import com.jero.modules.system.util.StringUtils;
+import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
+import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService;
+import com.jero.modules.top.entity.TopProjectEO;
+import com.jero.modules.top.service.ITopProjectEOService;
+import com.jero.modules.wkflow.enums.FlowTypeEnum;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.shiro.SecurityUtils;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.text.Collator;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+/**
+ * @Description: 项目库基础表
+ * @Author: jero-boot
+ * @Date:   2022-04-11
+ * @Version: V1.0
+ */
+@Service
+public class ProjectPlatformServiceImpl extends ServiceImpl<ProjectPlatformMapper, ProjectLibraryBase> implements IProjectPlatformService {
+	@Autowired
+	private ProjectLibraryBaseMapper projectLibraryBaseMapper;
+
+	@Autowired
+	private SysDictItemMapper sysDictItemMapper;
+
+	@Autowired
+	private SysUserMapper sysUserMapper;
+
+	@Autowired
+	private ProjectRelatedPersonnelServiceImpl projectRelatedPersonnelService;
+	@Autowired
+	private ProjectTaskPlanningServiceImpl projectTaskPlanningService;
+
+	@Autowired
+	private ProjectLawsInventoryEOMapper projectLawsInventoryEOMapper;
+
+	@Autowired
+	private ProjectTaskInventoryEOMapper projectTaskInventoryEOMapper;
+
+	@Autowired
+	private IConditionAssessmentEOService conditionAssessmentEOService;
+
+	@Autowired
+	private SysDictItemServiceImpl sysDictItemServiceImpl;
+
+	@Autowired
+	private ProjectNameInfoEOMapper projectNameInfoEOMapper;
+	@Autowired
+	private ProjectNameInfoEOServiceImpl projectNameInfoEOService;
+
+	@Autowired
+	private IProjectLibraryRoleRelEOService projectLibraryRoleRelEOService;
+
+	@Autowired
+	private ProjectLawsInventoryEOServiceImpl projectLawsInventoryEOService;
+
+	@Autowired
+	private ProjectLawsInventoryLogEOServiceImpl projectLawsInventoryLogEOService;
+
+	@Autowired
+	private ProjectRelatedPersonnelMapper projectRelatedPersonnelMapper;
+
+	@Autowired
+	private IParamsManifestEOService paramsManifestEOService;
+
+	@Autowired
+	private ISysDictService sysDictService;
+
+	@Autowired
+	private ISysUserService sysUserService;
+
+	@Autowired
+	private SysRoleMapper sysRoleMapper;
+
+	@Autowired
+	private IProjectUserPermissionService projectUserPermissionService;
+
+	@Autowired
+	private ProjectUserPermissionMapper projectUserPermissionMapper;
+
+	@Autowired
+	private IProjectUserBrandService projectUserBrandService;
+
+	@Autowired
+	private ITopProjectEOService iTopProjectEOService;
+
+	@Autowired
+	private IProjectCertificationInventoryEOService projectCertificationInventoryEOService;
+
+	@Autowired
+	private IProcessInfoDetailEOService processInfoDetailEOService;
+
+	@Autowired
+	private IParamsCollectManifestEOService paramsCollectManifestEOService;
+
+	@Autowired
+	private IProjectLibraryStatisticsService projectLibraryStatisticsService;
+	@Autowired
+	private OtaManageApplyEOServiceImpl otaManageApplyEOService;
+
+	private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+	private static DecimalFormat df = new DecimalFormat("#.00");
+	private static String percentSign = "%";
+
+	/**
+	 * 保存
+	 *
+	 * @param projectLibraryBase
+	 * @return
+	 */
+	@Override
+	@Transactional
+	public void add(ProjectLibraryBase projectLibraryBase) throws ParseException {
+		Date now = new Date();
+
+		projectLibraryBase.setCreateTime(now);
+		projectLibraryBase.setUpdateTime(now);
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		projectLibraryBase.setCreateBy(sysUser.getUsername());
+		projectLibraryBase.setUpdateBy(sysUser.getUsername());
+
+		checkExitData(projectLibraryBase);
+		save(projectLibraryBase);
+
+		//创建任务计划时间轴
+		projectTaskPlanningService.setProjectTaskPlanning(projectLibraryBase.getId());
+
+		List<ProjectLibraryRoleRelEO> projectLibraryRoleRelEOList = new ArrayList<>();
+		//初始化当前项目的studio与项目库 法规清单 角色关系
+		ProjectLibraryRoleRelEO lawsInventoryRoleRelEO = new ProjectLibraryRoleRelEO();
+		lawsInventoryRoleRelEO.setProjectLibraryId(projectLibraryBase.getId());
+		lawsInventoryRoleRelEO.setUserId(projectLibraryBase.getStudioEngineer());
+		lawsInventoryRoleRelEO.setRoleCode(ProjectRoleEnum.STUDIO_ENGINEER.getValue());
+		lawsInventoryRoleRelEO.setModelType(RoleRelModelTypeEnum.LAWS_INVENTORY.getValue());
+		projectLibraryRoleRelEOList.add(lawsInventoryRoleRelEO);
+
+		// 初始化当前项目的studio与项目库 认证清单 角色关系
+		ProjectLibraryRoleRelEO certificationInventoryRoleRelEO = new ProjectLibraryRoleRelEO();
+		certificationInventoryRoleRelEO.setProjectLibraryId(projectLibraryBase.getId());
+		certificationInventoryRoleRelEO.setUserId(projectLibraryBase.getStudioEngineer());
+		certificationInventoryRoleRelEO.setRoleCode(ProjectRoleEnum.STUDIO_ENGINEER.getValue());
+		certificationInventoryRoleRelEO.setModelType(RoleRelModelTypeEnum.CERTIFICATION_INVENTORY.getValue());
+		projectLibraryRoleRelEOList.add(certificationInventoryRoleRelEO);
+		this.projectLibraryRoleRelEOService.saveBatch(projectLibraryRoleRelEOList);
+
+		//项目权限表添加
+		List<ProjectUserPermission> adds = new ArrayList<>();
+		if (ObjectUtils.isNotEmpty(projectLibraryBase.getStudioEngineer())) {
+			ProjectUserPermission projectUserPermission = new ProjectUserPermission();
+			projectUserPermission.setProjectId(projectLibraryBase.getId());
+			projectUserPermission.setUserId(projectLibraryBase.getStudioEngineer());
+			projectUserPermission.setBelong(ProjectUserLocationEnum.PROJECT_ADD_STUDIO.getValue());
+			projectUserPermission.setCreateTime(now);
+			projectUserPermission.setUpdateTime(now);
+			adds.add(projectUserPermission);
+		}
+		if (ObjectUtils.isNotEmpty(projectLibraryBase.getCertificationEngineer())) {
+			for (String id : projectLibraryBase.getCertificationEngineer().split(",")) {
+				ProjectUserPermission projectUserPermission = new ProjectUserPermission();
+				projectUserPermission.setProjectId(projectLibraryBase.getId());
+				projectUserPermission.setUserId(id);
+				projectUserPermission.setBelong(ProjectUserLocationEnum.PROJECT_ADD_CERTIFICATION.getValue());
+				projectUserPermission.setCreateTime(now);
+				projectUserPermission.setUpdateTime(now);
+				adds.add(projectUserPermission);
+			}
+		}
+		if (ObjectUtils.isNotEmpty(adds)) {
+			projectUserPermissionService.saveBatch(adds);
+		}
+
+	}
+
+
+
+	/**
+	 * 项目扩展(添加子项目--子项目基本信息、相关人员名单、法规/认证任务计划与被扩展项目保持一致)
+	 * @param projectLibraryBase
+	 * @throws ParseException
+	 */
+	@Override
+	@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
+	public void addChild(ProjectLibraryBase projectLibraryBase) throws ParseException {
+		String id = projectLibraryBase.getId();//主项目id
+		String projectId = UUID.randomUUID().toString().replace("-", "");
+		//主表中添加数据
+		ProjectLibraryBase projectLibraryBaseTemp = this.getById(id);
+		projectLibraryBaseTemp.setCreateBy(null);
+		projectLibraryBaseTemp.setCreateTime(null);
+		projectLibraryBaseTemp.setUpdateBy(null);
+		projectLibraryBaseTemp.setUpdateTime(null);
+		projectLibraryBaseTemp.setId(projectId);
+		projectLibraryBaseTemp.setParentId(id);
+		projectLibraryBaseTemp.setProjectVersion(projectLibraryBase.getProjectVersion());
+		projectLibraryBaseTemp.setExplanation(projectLibraryBase.getExplanation());
+		this.save(projectLibraryBaseTemp);
+
+		//处理版本号排序问题，如果版本号插入到中间，后面版本数字顺眼
+		checkVersionOrder(id,projectLibraryBase.getProjectVersion(),projectId);
+
+		Date now = new Date();
+		//相关人员名单中添加数据
+		List<ProjectRelatedPersonnel> projectRelatedPersonnelList = projectRelatedPersonnelMapper.queryPageList(id,
+				DictCodeEnum.DUTY_TERRITORY.getValue(),
+				null,
+				null,
+				null,
+				null,null);
+		if(projectRelatedPersonnelList.size() != 0){
+			List<ProjectUserPermission> relatedPersonnelPermissionList = new ArrayList<>();
+			for (ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnelList) {
+				String relatedPersonnelId = UUID.randomUUID().toString().replace("-", "");
+				projectRelatedPersonnel.setId(relatedPersonnelId);
+				projectRelatedPersonnel.setProjectId(projectId);
+
+				//添加人员权限
+				if (ObjectUtils.isNotEmpty(projectRelatedPersonnel.getLawEngineer())) {
+					for (String lawEngineerId : projectRelatedPersonnel.getLawEngineer().split(",")) {
+						//projectUserPermissionService.queryRelatedPersonnelPermission(projectLibraryBase.getId(),lawEngineerId,ProjectUserLocationEnum.PROJECT_DETAIL_RELEVANT_PERSONNEL_LAW.getValue());
+						ProjectUserPermission permission = new ProjectUserPermission();
+						permission.setProjectId(projectId);
+						permission.setUserId(lawEngineerId);
+						permission.setBelong(ProjectUserLocationEnum.PROJECT_DETAIL_RELEVANT_PERSONNEL_LAW.getValue());
+						permission.setDescription(PermissionDescriptionEnum.PROJECT_RELATED_PERSONNEL.getValue() + relatedPersonnelId);
+						permission.setCreateTime(now);
+						permission.setUpdateTime(now);
+						relatedPersonnelPermissionList.add(permission);
+					}
+				}
+				if (ObjectUtils.isNotEmpty(projectRelatedPersonnel.getEngineeringInterfacePerson())) {
+					for (String engineeringInterfacePersonId : projectRelatedPersonnel.getEngineeringInterfacePerson().split(",")) {
+						ProjectUserPermission permission = new ProjectUserPermission();
+						permission.setProjectId(projectId);
+						permission.setUserId(engineeringInterfacePersonId);
+						permission.setBelong(ProjectUserLocationEnum.PROJECT_DETAIL_RELEVANT_PERSONNEL_INTERFACE.getValue());
+						permission.setDescription(PermissionDescriptionEnum.PROJECT_RELATED_PERSONNEL.getValue() + relatedPersonnelId);
+						permission.setCreateTime(now);
+						permission.setUpdateTime(now);
+						relatedPersonnelPermissionList.add(permission);
+					}
+				}
+				if (ObjectUtils.isNotEmpty(projectRelatedPersonnel.getCertificationEngineer())) {
+					for (String certificationEngineerId : projectRelatedPersonnel.getCertificationEngineer().split(",")) {
+						ProjectUserPermission permission = new ProjectUserPermission();
+						permission.setProjectId(projectId);
+						permission.setUserId(certificationEngineerId);
+						permission.setBelong(ProjectUserLocationEnum.PROJECT_DETAIL_RELEVANT_PERSONNEL_CERTIFICATION.getValue());
+						permission.setDescription(PermissionDescriptionEnum.PROJECT_RELATED_PERSONNEL.getValue() + relatedPersonnelId);
+						permission.setCreateTime(now);
+						permission.setUpdateTime(now);
+						relatedPersonnelPermissionList.add(permission);
+					}
+
+				}
+
+			}
+			projectRelatedPersonnelService.saveBatch(projectRelatedPersonnelList);
+			if (ObjectUtils.isNotEmpty(relatedPersonnelPermissionList)) {
+				projectUserPermissionService.saveBatch(relatedPersonnelPermissionList);
+			}
+		}
+
+		//法规/认证任务计划添加数据  projectTaskPlanningService
+		LambdaQueryWrapper<ProjectTaskPlanning> wrapper = new LambdaQueryWrapper<>();
+		wrapper.in(ProjectTaskPlanning::getProjectId,projectLibraryBase.getId());
+		ProjectTaskPlanning projectTaskPlanning = projectTaskPlanningService.getOne(wrapper);
+		if(ObjectUtils.isNotEmpty(projectTaskPlanning)){
+			projectTaskPlanning.setId(UUID.randomUUID().toString().replace("-", ""));
+			projectTaskPlanning.setProjectId(projectId);
+			projectTaskPlanningService.add(projectTaskPlanning);
+		}
+
+
+		//初始化当前项目的studio与项目库 角色关系  projectLibraryRoleRelEOService
+		LambdaQueryWrapper<ProjectLibraryRoleRelEO> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.in(ProjectLibraryRoleRelEO::getProjectLibraryId,projectLibraryBase.getId());
+		List<ProjectLibraryRoleRelEO> projectLibraryRoleRelEOList = projectLibraryRoleRelEOService.list(queryWrapper);
+
+		List<ProjectUserPermission> studioUserPermissions = new ArrayList<>();
+		if(ObjectUtils.isNotEmpty(projectLibraryRoleRelEOList)){
+			for (ProjectLibraryRoleRelEO projectLibraryRoleRelEO : projectLibraryRoleRelEOList) {
+				projectLibraryRoleRelEO.setId(UUID.randomUUID().toString().replace("-", ""));
+				projectLibraryRoleRelEO.setProjectLibraryId(projectId);
+				projectLibraryRoleRelEOService.add(projectLibraryRoleRelEO);
+				//添加studio权限
+				ProjectUserPermission studioUserPermission = new ProjectUserPermission();
+				studioUserPermission.setProjectId(projectId);
+				studioUserPermission.setUserId(projectLibraryRoleRelEO.getUserId());
+				studioUserPermission.setBelong(ProjectUserLocationEnum.PROJECT_ADD_STUDIO.getValue());
+				studioUserPermission.setCreateTime(now);
+				studioUserPermission.setUpdateTime(now);
+				studioUserPermissions.add(studioUserPermission);
+			}
+		}
+		if (ObjectUtils.isNotEmpty(studioUserPermissions)) {
+			projectUserPermissionService.saveBatch(studioUserPermissions);
+		}
+	}
+
+	/**
+	 * 如果创建的子项目版本号重复，处理排序
+	 * @param id
+	 * @param version
+	 * @param projectId
+	 */
+	private void checkVersionOrder(String id,String version,String projectId) {
+		LambdaQueryWrapper<ProjectLibraryBase> wrapperVer = new LambdaQueryWrapper<>();
+		//查找其他统计子版本项目
+		wrapperVer.eq(ProjectLibraryBase::getParentId, id);
+		wrapperVer.orderByAsc(ProjectLibraryBase::getProjectVersion);
+		List<ProjectLibraryBase> clist = this.list(wrapperVer);
+		int tmpInt = Integer.parseInt(version);
+		for (ProjectLibraryBase plb : clist) {
+			int ver = Integer.parseInt(plb.getProjectVersion());
+			if(!plb.getId().equals(projectId) && ver == tmpInt){
+				tmpInt++;
+				String verStr = String.valueOf(tmpInt);
+				if(verStr.length() <= 1){
+					verStr= "0" + verStr;
+				}
+				plb.setProjectVersion(verStr);
+				this.updateById(plb);
+			}
+		}
+	}
+
+
+	/**检查车型名称id,年款号,目标市场,版本同时存在,报错*/
+	public void checkExitData(ProjectLibraryBase projectLibraryBase){
+		String projectNameId = projectLibraryBase.getProjectNameId();
+		String yearNameId = projectLibraryBase.getYearNameId();
+		String targetMarket = projectLibraryBase.getTargetMarket();
+		QueryWrapper<ProjectLibraryBase> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("project_name_id",projectNameId)
+				.eq("year_name_id",yearNameId)
+				.eq("target_market",targetMarket)
+				.eq("project_version",targetMarket);
+		if(StringUtils.isNotBlank(projectLibraryBase.getId())){
+			queryWrapper.ne("id",projectLibraryBase.getId());
+		}
+		Integer count = projectLibraryBaseMapper.selectCount(queryWrapper);
+		if (count > 0) {
+			if(CutEnum.CN.getValue().equals(projectLibraryBase.getCut())) {
+				throw new JeroBootException("已存在车型名称,年款号,目标市场均同的数据");
+			}else{
+				throw new JeroBootException("There are data with the same model name, model number and target market.");
+			}
+		}
+	}
+	/**
+	 * 更新
+	 *
+	 * @param projectLibraryBase
+	 * @return
+	 */
+	@Override
+	public void editById(ProjectLibraryBase projectLibraryBase) {
+		Date now = new Date();
+		projectLibraryBase.setUpdateTime(now);
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		projectLibraryBase.setUpdateBy(sysUser.getUsername());
+
+		ProjectLibraryBase original = baseMapper.selectById(projectLibraryBase.getId());
+
+		// 如果studio编辑了认证工程师，需要给旧的认证工程师发送认证清单任务消息
+		if(StringUtils.isNotEmpty(projectLibraryBase.getCertificationEngineer()) && StringUtils.isNotEmpty(original.getCertificationEngineer())){
+			this.editCertificationEngineer(projectLibraryBase, original);
+		}
+
+		checkExitData(projectLibraryBase);
+		saveOrUpdate(projectLibraryBase);
+		checkVersionOrder(projectLibraryBase.getParentId(),projectLibraryBase.getProjectVersion(),projectLibraryBase.getId());
+
+		// 删除当前项目的studio与项目库 角色关系
+		QueryWrapper<ProjectLibraryRoleRelEO> deleteLibraryRoleRelWrapper = new QueryWrapper<>();
+		deleteLibraryRoleRelWrapper.lambda().eq(ProjectLibraryRoleRelEO::getProjectLibraryId,projectLibraryBase.getId());
+		projectLibraryRoleRelEOService.remove(deleteLibraryRoleRelWrapper);
+		//删除当前项目studio项目权限
+		QueryWrapper<ProjectUserPermission> delStudioPermission = new QueryWrapper<>();
+		delStudioPermission.eq("project_id", projectLibraryBase.getId()).eq("belong", ProjectUserLocationEnum.PROJECT_ADD_STUDIO.getValue());
+		projectUserPermissionService.remove(delStudioPermission);
+		//删除当前项目certification engineer项目权限
+		QueryWrapper<ProjectUserPermission> delCertificationPermission = new QueryWrapper<>();
+		delCertificationPermission.eq("project_id", projectLibraryBase.getId()).eq("belong", ProjectUserLocationEnum.PROJECT_ADD_CERTIFICATION.getValue());
+		projectUserPermissionService.remove(delCertificationPermission);
+
+		/*// 初始化当前项目的studio与项目库 角色关系
+		ProjectLibraryRoleRelEO projectLibraryRoleRelEO = new ProjectLibraryRoleRelEO();
+		projectLibraryRoleRelEO.setProjectLibraryId(projectLibraryBase.getId());
+		projectLibraryRoleRelEO.setUserId(projectLibraryBase.getStudioEngineer());
+		projectLibraryRoleRelEO.setRoleCode(ProjectRoleEnum.STUDIO_ENGINEER.getValue());
+		projectLibraryRoleRelEOService.add(projectLibraryRoleRelEO);*/
+
+		List<ProjectLibraryRoleRelEO> projectLibraryRoleRelEOList = new ArrayList<>();
+		//初始化当前项目的studio与项目库 法规清单 角色关系
+		ProjectLibraryRoleRelEO lawsInventoryRoleRelEO = new ProjectLibraryRoleRelEO();
+		lawsInventoryRoleRelEO.setProjectLibraryId(projectLibraryBase.getId());
+		lawsInventoryRoleRelEO.setUserId(projectLibraryBase.getStudioEngineer());
+		lawsInventoryRoleRelEO.setRoleCode(ProjectRoleEnum.STUDIO_ENGINEER.getValue());
+		lawsInventoryRoleRelEO.setModelType(RoleRelModelTypeEnum.LAWS_INVENTORY.getValue());
+		projectLibraryRoleRelEOList.add(lawsInventoryRoleRelEO);
+
+		// 初始化当前项目的studio与项目库 认证清单 角色关系
+		ProjectLibraryRoleRelEO certificationInventoryRoleRelEO = new ProjectLibraryRoleRelEO();
+		certificationInventoryRoleRelEO.setProjectLibraryId(projectLibraryBase.getId());
+		certificationInventoryRoleRelEO.setUserId(projectLibraryBase.getStudioEngineer());
+		certificationInventoryRoleRelEO.setRoleCode(ProjectRoleEnum.STUDIO_ENGINEER.getValue());
+		certificationInventoryRoleRelEO.setModelType(RoleRelModelTypeEnum.CERTIFICATION_INVENTORY.getValue());
+		projectLibraryRoleRelEOList.add(certificationInventoryRoleRelEO);
+		this.projectLibraryRoleRelEOService.saveBatch(projectLibraryRoleRelEOList);
+
+		//重新设置当前项目studio项目权限
+		List<ProjectUserPermission> engineers = new ArrayList<>();
+		ProjectUserPermission studioPermission = new ProjectUserPermission();
+		studioPermission.setProjectId(projectLibraryBase.getId());
+		studioPermission.setUserId(projectLibraryBase.getStudioEngineer());
+		studioPermission.setBelong(ProjectUserLocationEnum.PROJECT_ADD_STUDIO.getValue());
+		studioPermission.setCreateTime(now);
+		studioPermission.setUpdateTime(now);
+		engineers.add(studioPermission);
+		//重新设置当前项目certification engineer项目权限
+		if (ObjectUtils.isNotEmpty(projectLibraryBase.getCertificationEngineer())) {
+			for (String certificationEngineer : projectLibraryBase.getCertificationEngineer().split(",")) {
+				ProjectUserPermission certificationPermission = new ProjectUserPermission();
+				certificationPermission.setProjectId(projectLibraryBase.getId());
+				certificationPermission.setUserId(certificationEngineer);
+				certificationPermission.setBelong(ProjectUserLocationEnum.PROJECT_ADD_CERTIFICATION.getValue());
+				certificationPermission.setCreateTime(now);
+				certificationPermission.setUpdateTime(now);
+				engineers.add(certificationPermission);
+			}
+		}
+		if (ObjectUtils.isNotEmpty(engineers)) {
+			projectUserPermissionService.saveBatch(engineers);
+		}
+
+		//编辑时如果认证工程师发生变化,同步修改相关人员名单中的认证工程师
+		List<ProjectRelatedPersonnel> result = projectRelatedPersonnelMapper.queryPageList(projectLibraryBase.getId(),
+				DictCodeEnum.DUTY_TERRITORY.getValue(), null, null, null, null,null);
+		//项目的认证工程师
+		String certificationEngineer = projectLibraryBase.getCertificationEngineer();
+		//一个都不选的情况下
+		if ("".equals(certificationEngineer)) {
+			//删除当前项目的相关人员名单中认证工程师权限
+			QueryWrapper<ProjectUserPermission> delWrapper = new QueryWrapper<>();
+			delWrapper.eq("project_id", projectLibraryBase.getId())
+					.eq("belong", ProjectUserLocationEnum.PROJECT_DETAIL_RELEVANT_PERSONNEL_CERTIFICATION.getValue());
+			projectUserPermissionService.remove(delWrapper);
+			//删除当前项目的法规清单中认证工程师权限
+			QueryWrapper<ProjectUserPermission> delLawInventoryWrapper = new QueryWrapper<>();
+			delLawInventoryWrapper.eq("project_id", projectLibraryBase.getId())
+					.eq("belong", ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_HOMOLOGATION.getValue());
+			projectUserPermissionService.remove(delLawInventoryWrapper);
+		}
+		//选择了其他工程师
+		if(StringUtils.isNotBlank(certificationEngineer)){
+			if(StringUtils.isNotEmpty(original.getCertificationEngineer())){
+				for (String id : original.getCertificationEngineer().split(",")) {
+					if (!certificationEngineer.contains(id)) {
+						//如果原来的认证工程师被删除了，则需要同步删除当前项目的相关人员名单中该认证工程师权限
+						QueryWrapper<ProjectUserPermission> delWrapper = new QueryWrapper<>();
+						delWrapper.eq("project_id", projectLibraryBase.getId()).eq("user_id",id).
+								eq("belong", ProjectUserLocationEnum.PROJECT_DETAIL_RELEVANT_PERSONNEL_CERTIFICATION.getValue());
+						projectUserPermissionService.remove(delWrapper);
+						//如果原来的认证工程师被删除了，则需要同步删除当前项目的法规清单中该认证工程师权限
+						QueryWrapper<ProjectUserPermission> delLawInventoryWrapper = new QueryWrapper<>();
+						delLawInventoryWrapper.eq("project_id", projectLibraryBase.getId()).eq("user_id",id).
+								eq("belong", ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_HOMOLOGATION.getValue());
+						projectUserPermissionService.remove(delLawInventoryWrapper);
+					}
+				}
+			}
+
+
+			for (ProjectRelatedPersonnel projectRelatedPersonnel : result) {
+				//相关人员名单的认证工程师
+				String certificationEngineerTemp = projectRelatedPersonnel.getCertificationEngineer();
+				if(StringUtils.isNotBlank(certificationEngineerTemp)){
+					StringBuilder sb = new StringBuilder();
+					for (String s : certificationEngineerTemp.split(",")) {
+						if(certificationEngineer.contains(s)){
+							sb.append(s + ",");
+						}
+					}
+					String substring = "";
+					if(StringUtils.isNotBlank(sb)){
+						substring = sb.substring(0, sb.length() - 1);
+					}
+					projectRelatedPersonnel.setCertificationEngineer(substring);
+				}
+			}
+			//批量修改相关人员名单信息中的认证工程师
+			projectRelatedPersonnelService.updateBatchById(result);
+		}
+		/**
+		 *法规清单发起任务前或任务结束后修改studio或者修改认证工程师时，
+		 *如果设计符合性确认、Pre-Homo确认、 验证符合性确认中的发起人跟责任人引用到了这两人，
+		 *而且这两个人不属于相关人员名单的工程接口人和法规工程师,同步删除这两人的权限
+		 */
+
+		List<String> belongs = new ArrayList<>();
+		belongs.add(ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_DESIGN_INITIATOR.getValue());
+		belongs.add(ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_DESIGN_DUTY.getValue());
+		belongs.add(ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_PREHOMO_INITIATOR.getValue());
+		belongs.add(ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_PREHOMO_DUTY.getValue());
+		belongs.add(ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_VERIFY_INITIATOR.getValue());
+		belongs.add(ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_VERIFY_DUTY.getValue());
+
+		QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("project_library_id", projectLibraryBase.getId());
+		List<ProjectLawsInventoryEO> list = projectLawsInventoryEOService.list(queryWrapper);
+		if (ObjectUtils.isNotEmpty(list)) {
+			for (ProjectLawsInventoryEO lawsInventoryEO : list) {
+				boolean boo = false;
+				//发起任务前
+				if (TaskAffirmStatusEnum.NOT_STARTED.getValue().equals(lawsInventoryEO.getTaskAffirmStatus())) {
+					boo = true;
+				}
+				//任务结束后
+				if (!boo) {
+					int count = 0;
+					QueryWrapper<ProjectTaskInventoryEO> taskInventoryQueryWrapper = new QueryWrapper<>();
+					taskInventoryQueryWrapper.eq("project_laws_inventory_id",lawsInventoryEO.getId());
+					List<ProjectTaskInventoryEO> taskInventoryRecords = projectTaskInventoryEOMapper.selectList(taskInventoryQueryWrapper);
+					for (ProjectTaskInventoryEO taskInventoryRecord : taskInventoryRecords) {
+						String designStatus = taskInventoryRecord.getDesignStatus();
+						String verifyStatus = taskInventoryRecord.getVerifyStatus();
+						String prehomoStatus = taskInventoryRecord.getPrehomoStatus();
+						boolean designStatusFlag = StringUtils.isBlank(designStatus) || designStatus.equals(DesignComplianceStatusEnum.REVIEW_COMPLETED.getValue());
+						boolean verifyStatusFlag = StringUtils.isBlank(verifyStatus) || verifyStatus.equals(DesignComplianceStatusEnum.REVIEW_COMPLETED.getValue());
+						boolean prehomoStatusFlag = StringUtils.isBlank(prehomoStatus) || prehomoStatus.equals(DesignComplianceStatusEnum.REVIEW_COMPLETED.getValue());
+						if (designStatusFlag && verifyStatusFlag && prehomoStatusFlag) {
+							count++;
+						}
+					}
+					if (count == 3) {
+						boo = true;
+					}
+				}
+				if (boo) {
+					QueryWrapper<ProjectRelatedPersonnel> personnelQueryWrapper = new QueryWrapper<>();
+					personnelQueryWrapper.eq("duty_territory", lawsInventoryEO.getDutyTerritory()).eq("project_id", projectLibraryBase.getId());
+					List<ProjectRelatedPersonnel> personnels = projectRelatedPersonnelService.list(personnelQueryWrapper);
+
+					if (!original.getStudioEngineer().equals(projectLibraryBase.getStudioEngineer())) {
+						StringBuilder participator = new StringBuilder();
+						if (ObjectUtils.isNotEmpty(personnels)) {
+							if (ObjectUtils.isNotEmpty(personnels.get(0).getLawEngineer())) {
+								participator.append(personnels.get(0).getLawEngineer() + ",");
+							}
+							if (ObjectUtils.isNotEmpty(personnels.get(0).getCertificationEngineer())) {
+								participator.append(personnels.get(0).getCertificationEngineer() + ",");
+							}
+							if (ObjectUtils.isNotEmpty(personnels.get(0).getEngineeringInterfacePerson())) {
+								participator.append(personnels.get(0).getEngineeringInterfacePerson() + ",");
+							}
+						}
+						if (!participator.toString().contains(original.getStudioEngineer())) {
+							//删除当前studio在法规清单中的人员权限
+							QueryWrapper<ProjectUserPermission> del = new QueryWrapper<>();
+							del.eq("project_id", projectLibraryBase.getId()).eq("user_id", original.getStudioEngineer()).in("belong",belongs).
+									eq("description", PermissionDescriptionEnum.PROJECT_LAWS_INVENTORY.getValue() + lawsInventoryEO.getId());
+							projectUserPermissionService.remove(del);
+						}
+					}
+					if (ObjectUtils.isNotEmpty(original.getCertificationEngineer())) {
+						for (String id : original.getCertificationEngineer().split(",")) {
+							if (!certificationEngineer.contains(id)) {
+								StringBuilder participator = new StringBuilder();
+								if (ObjectUtils.isNotEmpty(personnels)) {
+									if (ObjectUtils.isNotEmpty(personnels.get(0).getLawEngineer())) {
+										participator.append(personnels.get(0).getLawEngineer() + ",");
+									}
+									if (ObjectUtils.isNotEmpty(personnels.get(0).getEngineeringInterfacePerson())) {
+										participator.append(personnels.get(0).getEngineeringInterfacePerson() + ",");
+									}
+								}
+								participator.append(original.getStudioEngineer());
+								if (!participator.toString().contains(id)) {
+									//删除当前studio在法规清单中的人员权限
+									QueryWrapper<ProjectUserPermission> del = new QueryWrapper<>();
+									del.eq("project_id", projectLibraryBase.getId()).eq("user_id", id).in("belong",belongs).
+											eq("description", PermissionDescriptionEnum.PROJECT_LAWS_INVENTORY.getValue() + lawsInventoryEO.getId());
+									projectUserPermissionService.remove(del);
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+	}
+
+	/**
+	 * 编辑认证工程师逻辑处理
+	 * @param newPlbEO
+	 * @param oldPlbEO
+	 */
+	private void editCertificationEngineer(ProjectLibraryBase newPlbEO, ProjectLibraryBase oldPlbEO) {
+		List<String> oldCertificationEngineerIdList = Arrays.asList(oldPlbEO.getCertificationEngineer().split(","));
+		List<String> newCertificationEngineerIdList = Arrays.asList(newPlbEO.getCertificationEngineer().split(","));
+
+		oldCertificationEngineerIdList = oldCertificationEngineerIdList.stream().filter(originalCertificationEngineerId -> {
+			boolean flag = true;
+			for (String newCertificationEngineerId : newCertificationEngineerIdList) {
+				// 如果新传进来的 认证工程师id跟现有的认证工程师id一致，不用发消息
+				if(StringUtils.equals(newCertificationEngineerId,originalCertificationEngineerId)){
+					flag = false;
+					break;
+				}
+			}
+			return flag;
+		}).collect(Collectors.toList());
+
+		if(CollectionUtils.isNotEmpty(oldCertificationEngineerIdList)){
+			// 判断当前项目下是否还有需要认证工程师操作的数据  只有清单待校核、结果待审查  这两个状态的数据由认证工程师操作。
+			List<String> flowStatusList = new ArrayList<>();
+			flowStatusList.add(CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
+			flowStatusList.add(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue());
+
+			QueryWrapper<ProjectCertificationInventoryEO> certificationInventoryEOQueryWrapper = new QueryWrapper<>();
+			certificationInventoryEOQueryWrapper.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId, newPlbEO.getId());
+			certificationInventoryEOQueryWrapper.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList);
+			List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.projectCertificationInventoryEOService.list(certificationInventoryEOQueryWrapper);
+			if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOList)){
+				this.projectCertificationInventoryEOService.certificationInventoryEOListSortByEndTimeAsc(projectCertificationInventoryEOList);
+				List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(oldCertificationEngineerIdList);
+				this.projectCertificationInventoryEOService.sendMessageByTemplateId(
+						projectCertificationInventoryEOList,
+						TemplateInfoEnum2.CERTIFICATION_MESSAGE13.getValue(),
+						oldCertificationEngineerIdList,
+						userInfoList,
+						projectCertificationInventoryEOList.get(0).getEndTime(),""
+				);
+			}
+		}
+
+		this.setRzlcCertificationEngineerTask(newPlbEO);
+	}
+
+	/**
+	 * 重新设置认证工程师在待办中心的 认证流程的 待办任务。
+	 * @param projectLibraryBase
+	 */
+	private void setRzlcCertificationEngineerTask(ProjectLibraryBase projectLibraryBase) {
+		if(org.apache.commons.lang3.StringUtils.isNotEmpty(projectLibraryBase.getCertificationEngineer())){
+			List<String> certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
+			QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
+			pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId, projectLibraryBase.getId());
+			List<ProjectCertificationInventoryEO> pciEOList = this.projectCertificationInventoryEOService.list(pciQueryWrap);
+
+			if(CollectionUtils.isNotEmpty(pciEOList)){
+				// 清单待校核的数据
+				List<ProjectCertificationInventoryEO> pciToBeCheckedList = pciEOList.stream().filter(pci -> {
+					boolean flag = false;
+					if(StringUtils.equals(pci.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())){
+						flag = true;
+					}
+					return flag;
+				}).collect(Collectors.toList());
+				// 如果该项目下清单待校核的数据不为空，给这些认证工程师分配待办任务。
+				if(CollectionUtils.isNotEmpty(pciToBeCheckedList)){
+					// 删除待办中心（是这个项目库的 pre-Homo流程的待办任务， 认证工程师接受任务节点的数据）
+					QueryWrapper<ProcessInfoDetailEO> pidQueryWrap = new QueryWrapper<>();
+					pidQueryWrap.lambda().eq(ProcessInfoDetailEO::getProcessInfoId, projectLibraryBase.getId());
+					pidQueryWrap.lambda().eq(ProcessInfoDetailEO::getTaskDefinitionKey,CertificationFlowNodeEnum.RZGCSJSRW.getKey());
+					pidQueryWrap.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.CERTIFICATION_LC.getValue());
+					pidQueryWrap.orderByAsc("end_time");
+					List<ProcessInfoDetailEO> pidEoList = this.processInfoDetailEOService.list(pidQueryWrap);
+					if(CollectionUtils.isNotEmpty(pidEoList)){
+						List<String> pidEoIdList = pidEoList.stream().map(ProcessInfoDetailEO::getId).distinct().collect(Collectors.toList());
+						this.processInfoDetailEOService.deleteByIds(pidEoIdList);
+					}
+
+					// 获取责任确认截止时间 最早的时间
+					this.projectCertificationInventoryEOService.certificationInventoryEOListSortByTaskConfirmEndTimeAsc(pciToBeCheckedList);
+					Date endTime = pciToBeCheckedList.get(0).getInventoryVerifyEndTime();
+					if(ObjectUtils.isEmpty(endTime)){
+						endTime = pidEoList.get(0).getEndTime();
+					}
+
+					// 给认证工程师分配任务
+					List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
+					for (String userId : certificationEngineerIdList) {
+						ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
+						processInfoDetailEO.setUserId(userId);
+						processInfoDetailEO.setTaskDefinitionKey(CertificationFlowNodeEnum.RZGCSJSRW.getKey());
+						processInfoDetailEO.setCreateTime(new Date());
+						processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue());
+						processInfoDetailEO.setProcessInfoId(projectLibraryBase.getId());
+						processInfoDetailEO.setActiProcInstId(projectLibraryBase.getId());
+						processInfoDetailEO.setFlowType(FlowTypeEnum.CERTIFICATION_LC.getValue());
+						processInfoDetailEO.setEndTime(endTime);
+						processInfoDetailEOList.add(processInfoDetailEO);
+					}
+					this.processInfoDetailEOService.saveBatch(processInfoDetailEOList);
+				}
+
+				// 结果待提交的数据
+				List<ProjectCertificationInventoryEO> pciToBeReviewEDList = pciEOList.stream().filter(pci -> {
+					boolean flag = false;
+					if(StringUtils.equals(pci.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())){
+						flag = true;
+					}
+					return flag;
+				}).collect(Collectors.toList());
+
+				if(CollectionUtils.isNotEmpty(pciToBeReviewEDList)){
+					// 删除待办中心（是这个项目库的 pre-Homo流程的待办任务， 认证工程师审查 任务节点的数据）
+					QueryWrapper<ProcessInfoDetailEO> pidQueryWrap = new QueryWrapper<>();
+					pidQueryWrap.lambda().eq(ProcessInfoDetailEO::getProcessInfoId, projectLibraryBase.getId());
+					pidQueryWrap.lambda().eq(ProcessInfoDetailEO::getTaskDefinitionKey,CertificationFlowNodeEnum.RZGCSSC.getKey());
+					pidQueryWrap.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.CERTIFICATION_LC.getValue());
+					pidQueryWrap.orderByAsc("end_time");
+					List<ProcessInfoDetailEO> pidEoList = this.processInfoDetailEOService.list(pidQueryWrap);
+
+					// 获取截止日期最早的一天。
+					this.projectCertificationInventoryEOService.certificationInventoryEOListSortByEndTimeAsc(pciToBeReviewEDList);
+					Date endTime = pciToBeReviewEDList.get(0).getEndTime();
+					if(CollectionUtils.isNotEmpty(pidEoList)){
+						endTime = pidEoList.get(0).getEndTime();
+
+						List<String> pidEoIdList = pidEoList.stream().map(ProcessInfoDetailEO::getId).distinct().collect(Collectors.toList());
+						this.processInfoDetailEOService.deleteByIds(pidEoIdList);
+					}
+
+					// 给认证工程师分配任务
+					List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
+					for (String userId : certificationEngineerIdList) {
+						ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
+						processInfoDetailEO.setUserId(userId);
+						processInfoDetailEO.setTaskDefinitionKey(CertificationFlowNodeEnum.RZGCSSC.getKey());
+						processInfoDetailEO.setCreateTime(new Date());
+						processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue());
+						processInfoDetailEO.setProcessInfoId(projectLibraryBase.getId());
+						processInfoDetailEO.setActiProcInstId(projectLibraryBase.getId());
+						processInfoDetailEO.setFlowType(FlowTypeEnum.CERTIFICATION_LC.getValue());
+						processInfoDetailEO.setEndTime(endTime);
+						processInfoDetailEOList.add(processInfoDetailEO);
+					}
+					this.processInfoDetailEOService.saveBatch(processInfoDetailEOList);
+				}
+			}
+		}
+	}
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public void deleteById(String id,String cut) {
+		checkData(id,cut);
+
+		// 关联删除项目下的所有收集清单
+		paramsManifestEOService.deleteByProjectId(id);
+
+		//删除主项目
+		removeById(id);
+
+		//删除子项目
+		LambdaQueryWrapper<ProjectLibraryBase> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(ProjectLibraryBase::getParentId,id);
+		List<ProjectLibraryBase> list = this.list(wrapper);
+		if(ObjectUtils.isNotEmpty(list)){
+			List<String> idList = list.stream().map(ProjectLibraryBase::getId).collect(Collectors.toList());
+			this.removeByIds(idList);
+		}
+
+		//关联删除-相关人员
+		QueryWrapper<ProjectRelatedPersonnel> relatedPersonnelQueryWrapper = new QueryWrapper<>();
+		relatedPersonnelQueryWrapper.eq("project_id",id);
+		projectRelatedPersonnelService.remove(relatedPersonnelQueryWrapper);
+
+		//关联删除-任务计划时间轴
+		QueryWrapper<ProjectTaskPlanning> taskPlanningQueryWrapper = new QueryWrapper<>();
+		taskPlanningQueryWrapper.eq("project_id",id);
+		projectTaskPlanningService.remove(taskPlanningQueryWrapper);
+
+		//关联删除-法规清单
+		QueryWrapper<ProjectLawsInventoryEO> lawsInventoryEOQueryWrapper = new QueryWrapper<>();
+		lawsInventoryEOQueryWrapper.eq("project_library_id ",id);
+		projectLawsInventoryEOService.remove(lawsInventoryEOQueryWrapper);
+
+		//关联删除-法规清单log
+		QueryWrapper<ProjectLawsInventoryLogEO> logEOQueryWrapper = new QueryWrapper<>();
+		logEOQueryWrapper.in("project_library_id",id);
+		projectLawsInventoryLogEOService.remove(logEOQueryWrapper);
+
+		//删除权限
+		QueryWrapper<ProjectUserPermission> permissionQueryWrapper = new QueryWrapper<>();
+		permissionQueryWrapper.eq("project_id", id);
+		projectUserPermissionService.remove(permissionQueryWrapper);
+	}
+
+	/*
+	* 判断是否可以删除
+	*/
+	@Override
+	public void checkData(String id, String cut) {
+		//判断该条项目是否是自己创建,如果不是则不能删除
+		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		List<ProjectLibraryBase> projectLibraryBases = this.queryById(id,null);
+		//管理员和创建人可以删除,其余人不能删除
+		boolean administrator = sysUserService.isAdministrator();
+		if(!loginUser.getUsername().equals(projectLibraryBases.get(0).getCreateBy()) && !administrator){
+			if(CutEnum.CN.getValue().equals(cut)){
+				throw new JeroBootException("该条项目非本人创建,不能删除");
+			}else{
+				throw new JeroBootException("This item is not created by myself and cannot be deleted");
+			}
+		}
+		QueryWrapper<ProjectLawsInventoryEO> lawsInventoryQueryWrapper = new QueryWrapper<>();
+		lawsInventoryQueryWrapper.eq("project_library_id",id);
+		List<ProjectLawsInventoryEO> lawsInventoryRecords = projectLawsInventoryEOMapper.selectList(lawsInventoryQueryWrapper);
+		for(ProjectLawsInventoryEO projectLawsInventoryEO : lawsInventoryRecords){
+			String inventoryAffirmStatus = projectLawsInventoryEO.getInventoryAffirmStatus();//清单确认状态
+			//清单确认状态(未发起、接受、拒绝）
+			boolean inventoryAffirmFlag = (
+					org.apache.commons.lang3.StringUtils.equals(inventoryAffirmStatus,TaskAffirmStatusEnum.NOT_STARTED.getValue()) ||
+					org.apache.commons.lang3.StringUtils.equals(inventoryAffirmStatus,TaskAffirmStatusEnum.ACCEPTED.getValue()) ||
+					org.apache.commons.lang3.StringUtils.equals(inventoryAffirmStatus,TaskAffirmStatusEnum.REJECTED.getValue())
+			);
+
+			String taskAffirmStatus = projectLawsInventoryEO.getTaskAffirmStatus();//任务确认状态
+			//任务确认状态(未发起、接受、拒绝)
+			boolean taskAffirmFlag = (
+					org.apache.commons.lang3.StringUtils.equals(taskAffirmStatus,TaskAffirmStatusEnum.NOT_STARTED.getValue()) ||
+					org.apache.commons.lang3.StringUtils.equals(taskAffirmStatus,TaskAffirmStatusEnum.ACCEPTED.getValue()) ||
+					org.apache.commons.lang3.StringUtils.equals(taskAffirmStatus,TaskAffirmStatusEnum.REJECTED.getValue())
+			);
+
+			if (!(inventoryAffirmFlag && taskAffirmFlag)) {
+				if (CutEnum.CN.getValue().equals(cut)) {
+					throw new JeroBootException("当前项目下有未走完的流程，不能删除");
+				}else{
+					throw new JeroBootException("There are unfinished processes under the current project and cannot be deleted.");
+				}
+			}
+
+			String lawsInventoryId = projectLawsInventoryEO.getId();
+
+			QueryWrapper<ProjectTaskInventoryEO> taskInventoryQueryWrapper = new QueryWrapper<>();
+			taskInventoryQueryWrapper.eq("project_laws_inventory_id",lawsInventoryId);
+			List<ProjectTaskInventoryEO> taskInventoryRecords = projectTaskInventoryEOMapper.selectList(taskInventoryQueryWrapper);
+			//设计、验证、prehomo流程（流程状态是空  或 审查完成）
+			for(ProjectTaskInventoryEO projectTaskInventoryEO : taskInventoryRecords){
+				String designStatus = projectTaskInventoryEO.getDesignStatus();
+				String verifyStatus = projectTaskInventoryEO.getVerifyStatus();
+				String prehomoStatus = projectTaskInventoryEO.getPrehomoStatus();
+
+				boolean designStatusFlag = StringUtils.isBlank(designStatus) || designStatus.equals(DesignComplianceStatusEnum.REVIEW_COMPLETED.getValue());
+				boolean verifyStatusFlag = StringUtils.isBlank(verifyStatus) || verifyStatus.equals(DesignComplianceStatusEnum.REVIEW_COMPLETED.getValue());
+				boolean prehomoStatusFlag = StringUtils.isBlank(prehomoStatus) || prehomoStatus.equals(DesignComplianceStatusEnum.REVIEW_COMPLETED.getValue());
+
+				if (!(designStatusFlag && verifyStatusFlag && prehomoStatusFlag)) {
+					if (CutEnum.CN.getValue().equals(cut)) {
+						throw new JeroBootException("当前项目下有未走完的流程，不能删除");
+					}else{
+						throw new JeroBootException("There are unfinished processes under the current project and cannot be deleted.");
+					}
+				}
+			}
+		}
+	}
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+	public void deleteByIds(List<String> ids,String cut) {
+		for(String id :ids){
+			checkData(id,cut);
+		}
+		removeByIds(ids);
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public List<ProjectLibraryBase> queryById(String id,String cut) {
+		List<ProjectLibraryBase> records = projectLibraryBaseMapper.queryById(id);
+		disposeData(records,"",false);
+		//目标市场数据字典
+		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
+		for(ProjectLibraryBase projectLibraryBase: records){
+			//历史数据的主版本没有版本号,所以默认给00
+			if(StringUtils.isBlank(projectLibraryBase.getParentId()) && StringUtils.isBlank(projectLibraryBase.getProjectVersion())){
+				projectLibraryBase.setProjectVersion("00");
+			}
+			//目标市场
+			Map<String,Object> param = new HashMap<>();
+			param.put("cut",cut);
+			String targetMarket = getMarket(param, targetMarketList, projectLibraryBase);
+			//主项目的版本号
+			String projectVersion = "";
+			if(StringUtils.isBlank(projectLibraryBase.getParentId())){
+				projectVersion = "00";
+			}else{
+				projectVersion = projectLibraryBase.getProjectVersion();
+			}
+			if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){
+				projectLibraryBase.setProjectName(projectLibraryBase.getProjectName()
+						+ "-" + projectLibraryBase.getYearName()
+						+ "-" + targetMarket);
+//				projectLibraryBase.setProjectName(projectLibraryBase.getProjectName()
+//						+ "-" + projectLibraryBase.getYearName()
+//						+ "-" + targetMarket
+//						+ "-" + projectVersion);
+			}
+		}
+		return records;
+	}
+
+	/**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+	public List<ProjectLibraryBase> getList(ProjectLibraryBase projectLibraryBase) {
+		List<ProjectLibraryBase> list = projectLibraryBaseMapper.getList(projectLibraryBase);
+		return list;
+	}
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @return
+	 */
+	@Override
+	public List<ProjectLibraryBase> queryPageList(Map<String,Object> params) {
+		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		Integer isViewer = sysRoleMapper.queryUserRoleByCode(ProjectRoleEnum.VIEWER.getName(), loginUser.getId());
+		Set<String> projectIds = new HashSet<>();
+		//根据项目用户权限表筛选有权访问的项目
+		Set<String> permissionProjectIds = projectUserPermissionMapper.queryProjectIdsByUserId(loginUser.getId());
+		if (ObjectUtils.isNotEmpty(permissionProjectIds)) {
+			projectIds.addAll(permissionProjectIds);
+		}
+		if (isViewer > 0) {
+			//如果是Viewer，根据配置的品牌筛选可访问的项目
+			List<String> brandTypes = projectUserBrandService.queryBrandByUserId(loginUser.getId());
+			if (ObjectUtils.isNotEmpty(brandTypes)) {
+				QueryWrapper<ProjectLibraryBase> queryWrapper = new QueryWrapper<>();
+				queryWrapper.in("brand",brandTypes);
+				if (ObjectUtils.isNotEmpty(list(queryWrapper))) {
+					projectIds.addAll(list(queryWrapper).stream().map(ProjectLibraryBase::getId).collect(Collectors.toSet()));
+				}
+			}
+		}
+
+		List<ProjectLibraryBase> result = projectLibraryBaseMapper.queryPageList(params);
+		disposeData(result,"",false);
+		//目标市场
+		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
+
+		//置顶
+		List<String> idList = result.stream().map(ProjectLibraryBase::getId).collect(Collectors.toList());
+		List<TopProjectEO> topProjectEOList = new ArrayList<>();
+		if(ObjectUtils.isNotEmpty(idList)){
+			LambdaQueryWrapper<TopProjectEO> wrapper = new LambdaQueryWrapper<>();
+			wrapper.in(TopProjectEO::getCreateBy,loginUser.getUsername()).in(TopProjectEO::getProjectLibraryBaseId,idList).orderByDesc(TopProjectEO::getSort);
+			topProjectEOList = iTopProjectEOService.list(wrapper);
+		}
+
+		for(ProjectLibraryBase projectLibraryBase: result){
+			//置顶处理
+			if(ObjectUtils.isNotEmpty(topProjectEOList)){
+				List<TopProjectEO> collect = topProjectEOList.stream()
+						.filter(e -> projectLibraryBase.getId().equals(e.getProjectLibraryBaseId())
+								&& loginUser.getUsername().equals(e.getCreateBy()))
+						.collect(Collectors.toList());
+				if(ObjectUtils.isNotEmpty(collect)){
+					projectLibraryBase.setFlag(collect.get(0).getFlag());
+					projectLibraryBase.setSort(collect.get(0).getSort());
+				}else{
+					projectLibraryBase.setSort("0");
+				}
+			}else{
+				projectLibraryBase.setSort("0");
+			}
+			//目标市场
+			String targetMarket = getMarket(params, targetMarketList, projectLibraryBase);
+			//主项目的版本号
+			String projectVersion = "";
+			if(StringUtils.isBlank(projectLibraryBase.getParentId())){
+				projectVersion = "00";
+			}else{
+				projectVersion = projectLibraryBase.getProjectVersion();
+			}
+			if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){
+				projectLibraryBase.setProjectName(projectLibraryBase.getProjectName()
+						+ "-" + projectLibraryBase.getYearName()
+						+ "-" + targetMarket
+						+ "-" + projectVersion);
+			}
+		}
+
+		if(ObjectUtils.isEmpty(params.get("orderByField"))){
+				Collections.sort(result, new Comparator<ProjectLibraryBase>() {
+					@Override
+					public int compare(ProjectLibraryBase o1, ProjectLibraryBase o2) {
+						return -o1.getSort().compareTo(o2.getSort());
+					}
+				});
+		}
+
+		//所有主项目
+		List<ProjectLibraryBase> projectLibraryBaseListParent = projectLibraryBaseMapper.queryMaimList();
+		disposeData(projectLibraryBaseListParent,"",false);
+		for(ProjectLibraryBase projectLibraryBase: projectLibraryBaseListParent){
+			//目标市场
+			String targetMarket = getMarket(params, targetMarketList, projectLibraryBase);
+			//主项目的版本号
+			String projectVersion = "";
+			if(StringUtils.isBlank(projectLibraryBase.getParentId())){
+				projectVersion = "00";
+			}else{
+				projectVersion = projectLibraryBase.getProjectVersion();
+			}
+			if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){
+				projectLibraryBase.setProjectName(projectLibraryBase.getProjectName()
+						+ "-" + projectLibraryBase.getYearName()
+						+ "-" + targetMarket
+						+ "-" + projectVersion);
+			}
+		}
+
+		//项目名称模糊查询特殊处理(因为项目名称是多字段拼接的)
+		if(ObjectUtils.isNotEmpty(params.get("projectName"))){
+			result = result.stream().filter(e->e.getProjectName().toLowerCase().contains(String.valueOf(params.get("projectName")).toLowerCase())).collect(Collectors.toList());
+		}
+		List<ProjectLibraryBase> projectLibraryBaseParentList = result.stream().filter(e -> StringUtils.isBlank(e.getParentId())).distinct().collect(Collectors.toList());
+		//处理搜索版本号,(因为列表展示数据是以主项目为主并绑定子项目, 所以搜索的时候只有子项目这种情况需要特殊处理)
+		List<ProjectLibraryBase> resultNew = getProjectLibraryBases(result, projectLibraryBaseListParent);
+		disposeData(resultNew,"",false);
+
+
+		//数据组装
+//		List<ProjectLibraryBase> resultTemp = new LinkedList<>();
+//		for (ProjectLibraryBase projectLibraryBase : result) {
+//			if(StringUtils.isBlank(projectLibraryBase.getParentId())){
+//				resultTemp.add(projectLibraryBase);
+//			}
+//		}
+
+		for (ProjectLibraryBase projectLibraryBase : projectLibraryBaseParentList) {
+			//子项目
+			List<ProjectLibraryBase> children = result.stream()
+					.filter(e -> StringUtils.isNotBlank(e.getParentId()) && projectLibraryBase.getId().equals(e.getParentId())).collect(Collectors.toList());
+			if(children.size() != 0){
+				//子项目的基础上添加的子项目
+				List<String> childrenIdList = children.stream().map(ProjectLibraryBase::getId).distinct().collect(Collectors.toList());
+				List<ProjectLibraryBase> childrenList = result.stream()
+						.filter(e -> StringUtils.isNotBlank(e.getParentId()) && childrenIdList.contains(e.getParentId())).collect(Collectors.toList());
+				children.addAll(childrenList);
+
+				//按版本排序
+				Collections.sort(children);
+				projectLibraryBase.setChildren(children);
+				//最后一个版本号(主项目和主项目都需要设置)
+				String versionLast = children.get(children.size() - 1).getProjectVersion();
+				//主版本设置最后一个版本号(用于项目扩展中的版本号)
+				projectLibraryBase.setVersionLast(versionLast);
+				for (ProjectLibraryBase child : children) {
+					//每个子版本版本设置最后一个版本号(用于项目扩展中的版本号)
+					child.setVersionLast(versionLast);
+				}
+			}
+		}
+
+		List<ProjectLibraryBase> resultLast = new ArrayList<>();
+		//权限筛选
+		if (sysUserService.isAdministrator()) {
+			//管理员查看全部
+			if(ObjectUtils.isNotEmpty(projectLibraryBaseParentList)){
+				resultLast = projectLibraryBaseParentList;
+			}else{
+				resultLast = resultNew;
+			}
+		} else {
+			for (ProjectLibraryBase projectLibraryBase : projectLibraryBaseParentList) {
+				//判断父项目是否有权限
+				if (!projectIds.contains(projectLibraryBase.getId())) {
+					//判断子项目是否有权限
+					List<ProjectLibraryBase> children = projectLibraryBase.getChildren();
+					if (ObjectUtils.isNotEmpty(children)) {
+						for (ProjectLibraryBase child : children) {
+							//将有权限的放入最后返回的集合中
+							if (projectIds.contains(child.getId())) {
+								resultLast.add(child);
+							}
+						}
+					}
+				} else {
+					List<ProjectLibraryBase> children = projectLibraryBase.getChildren();
+					if (ObjectUtils.isNotEmpty(children)) {
+						List<ProjectLibraryBase> lastChild = new ArrayList<>();
+						//判断子项目是否有权限
+						for (ProjectLibraryBase child : children) {
+							if (projectIds.contains(child.getId())) {
+								lastChild.add(child);
+							}
+						}
+						projectLibraryBase.setChildren(lastChild);
+					}
+					resultLast.add(projectLibraryBase);
+				}
+
+			}
+		}
+		//表头排序
+		hearSort(params, resultLast);
+		return resultLast;
+	}
+
+	private void hearSort(Map<String, Object> params, List<ProjectLibraryBase> resultLast) {
+		if(ObjectUtils.isNotEmpty(params.get("orderByField"))){
+			Collator comparator = Collator.getInstance(Locale.CHINESE);
+			//项目名称，R&H Studio，车型平台，数字平台
+			if("projectName".equals(params.get("orderByField"))){
+				if(OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))){
+					Collections.sort(resultLast,(e1, e2)->{
+						return comparator.compare(e1.getProjectName(),e2.getProjectName());
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))){
+					Collections.sort(resultLast,(e1,e2)->{
+						return comparator.compare(e2.getProjectName(),e1.getProjectName());
+					});
+				}
+			}
+			//R&H Studio
+			if("studioEngineerName".equals(params.get("orderByField"))){
+				if(OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))){
+					Collections.sort(resultLast,(e1, e2)->{
+						return comparator.compare(e1.getStudioEngineerName(),e2.getStudioEngineerName());
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))){
+					Collections.sort(resultLast,(e1,e2)->{
+						return comparator.compare(e2.getStudioEngineerName(),e1.getStudioEngineerName());
+					});
+				}
+			}
+			//车型平台
+			if("vehiclePlatform".equals(params.get("orderByField"))){
+				if(OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))){
+					Collections.sort(resultLast,(e1, e2)->{
+						return comparator.compare(e1.getVehiclePlatform(),e2.getVehiclePlatform());
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))){
+					Collections.sort(resultLast,(e1,e2)->{
+						return comparator.compare(e2.getVehiclePlatform(),e1.getVehiclePlatform());
+					});
+				}
+			}
+			//数字平台
+			if("digitalPlatform".equals(params.get("orderByField"))){
+				if(OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))){
+					Collections.sort(resultLast,(e1, e2)->{
+						return comparator.compare(e1.getDigitalPlatform(),e2.getDigitalPlatform());
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))){
+					Collections.sort(resultLast,(e1,e2)->{
+						return comparator.compare(e2.getDigitalPlatform(),e1.getDigitalPlatform());
+					});
+				}
+			}
+		}
+	}
+
+	@NotNull
+	private List<ProjectLibraryBase> getProjectLibraryBases(List<ProjectLibraryBase> result, List<ProjectLibraryBase> projectLibraryBaseListParent) {
+		//result中的主项目以及子项目对应的主项目
+		List<ProjectLibraryBase> resultParent = new LinkedList<>();
+		for (ProjectLibraryBase projectLibraryBase : result) {
+			if(StringUtils.isBlank(projectLibraryBase.getParentId())){
+				resultParent.add(projectLibraryBase);
+			}else{
+				//子项目
+				List<ProjectLibraryBase> collect = result.stream()
+						.filter(e -> projectLibraryBase.getId().equals(e.getParentId()))
+						.collect(Collectors.toList());
+				if(ObjectUtils.isNotEmpty(collect)){
+					resultParent.addAll(collect);
+				}
+
+			}
+		}
+
+		//搜索结果中子项目的子项目
+		List<ProjectLibraryBase> resultChild = new ArrayList<>();
+		//所有子项目
+		List<ProjectLibraryBase> childrenListTemp = result.stream().filter(e -> StringUtils.isNotBlank(e.getParentId())).collect(Collectors.toList());
+		List<String> childrenIdListTemp = childrenListTemp.stream().map(ProjectLibraryBase::getId).collect(Collectors.toList());
+
+		//子项目的子项目
+		List<ProjectLibraryBase> collect3 = result.stream().filter(e -> StringUtils.isNotBlank(e.getParentId()) && childrenIdListTemp.contains(e.getParentId())).collect(Collectors.toList());
+
+		if(ObjectUtils.isNotEmpty(collect3)){
+			//子项目的子项目的父id
+			List<String> childList = collect3.stream().map(ProjectLibraryBase::getParentId).collect(Collectors.toList());
+			//子项目
+			resultChild = childrenListTemp.stream().filter(e -> childList.contains(e.getId())).collect(Collectors.toList());
+		}
+
+
+		//所有的主项目与通过筛选条件查询来的主项目进行过滤
+		List<ProjectLibraryBase> resultNew = new LinkedList<>();
+		//主项目
+		List<ProjectLibraryBase> collect1 = result.stream().filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList());
+		resultNew.addAll(collect1);
+		List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
+		for (ProjectLibraryBase projectLibraryBase : projectLibraryBaseListParent) {
+			List<ProjectLibraryBase> resultNewTemp = new ArrayList<>();
+			//子项目
+			List<ProjectLibraryBase> collect = result.stream().filter(e -> projectLibraryBase.getId().equals(e.getParentId())).collect(Collectors.toList());
+			if(ObjectUtils.isNotEmpty(collect)){
+				resultNewTemp.addAll(collect);
+			}
+			//子项目的子项目
+			if(ObjectUtils.isNotEmpty(resultChild)){
+				List<ProjectLibraryBase> collect2 = resultChild.stream().filter(e -> e.getParentId().equals(projectLibraryBase.getId())).collect(Collectors.toList());
+				if(ObjectUtils.isNotEmpty(collect2)){
+					resultNewTemp.addAll(collect2);
+				}
+			}
+			if(ObjectUtils.isNotEmpty(resultNewTemp)){
+				projectLibraryBase.setChildren(resultNewTemp);
+				projectLibraryBaseList.add(projectLibraryBase);
+			}
+		}
+//		resultNew = resultNew.stream().distinct().collect(Collectors.toList());
+		return projectLibraryBaseList;
+	}
+//	/**
+//	 * 分页列表查询
+//	 *
+//	 * @return
+//	 */
+//	@Override
+//	public List<ProjectLibraryBase> queryPageList(Map<String,Object> params) {
+//		List<ProjectLibraryBase> result = projectLibraryBaseMapper.queryPageList(params);
+//		disposeData(result,"",false);
+//		//目标市场
+//		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
+//
+//		for(ProjectLibraryBase projectLibraryBase: result){
+//			//目标市场
+//			String targetMarket = getMarket(params, targetMarketList, projectLibraryBase);
+//			//主项目的版本号
+//			String projectVersion = "";
+//			if(StringUtils.isBlank(projectLibraryBase.getParentId())){
+//				projectVersion = "00";
+//			}else{
+//				projectVersion = projectLibraryBase.getProjectVersion();
+//			}
+//			if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){
+//				projectLibraryBase.setProjectName(projectLibraryBase.getProjectName()
+//						+ "-" + projectLibraryBase.getYearName()
+//						+ "-" + targetMarket
+//						+ "-" + projectVersion);
+//			}
+//		}
+//		//项目名称模糊查询特殊处理(因为项目名称是多字段拼接的)
+//		if(ObjectUtils.isNotEmpty(params.get("projectName"))){
+//			result = result.stream().filter(e->e.getProjectName().toLowerCase().contains(String.valueOf(params.get("projectName")).toLowerCase())).collect(Collectors.toList());
+//		}
+//		//数据组装
+//		List<ProjectLibraryBase> resultTemp = new LinkedList<>();
+//		for (ProjectLibraryBase projectLibraryBase : result) {
+//			if(StringUtils.isBlank(projectLibraryBase.getParentId())){
+//				resultTemp.add(projectLibraryBase);
+//			}
+//		}
+//
+//		for (ProjectLibraryBase projectLibraryBase : resultTemp) {
+//			//子项目
+//			List<ProjectLibraryBase> children = result.stream()
+//					.filter(e -> StringUtils.isNotBlank(e.getParentId()) && projectLibraryBase.getId().equals(e.getParentId())).collect(Collectors.toList());
+//			if(children.size() != 0){
+//				//子项目的基础上添加的子项目
+//				List<String> childrenIdList = children.stream().map(ProjectLibraryBase::getId).distinct().collect(Collectors.toList());
+//				List<ProjectLibraryBase> childrenList = result.stream()
+//						.filter(e -> StringUtils.isNotBlank(e.getParentId()) && childrenIdList.contains(e.getParentId())).collect(Collectors.toList());
+//				children.addAll(childrenList);
+//
+//				//按版本排序
+//				Collections.sort(children);
+//				projectLibraryBase.setChildren(children);
+//				//最后一个版本号(主项目和主项目都需要设置)
+//				String versionLast = children.get(children.size() - 1).getProjectVersion();
+//				//主版本设置最后一个版本号(用于项目扩展中的版本号)
+//				projectLibraryBase.setVersionLast(versionLast);
+//				for (ProjectLibraryBase child : children) {
+//					//每个子版本版本设置最后一个版本号(用于项目扩展中的版本号)
+//					child.setVersionLast(versionLast);
+//				}
+//			}
+//		}
+//		return resultTemp;
+//	}
+
+	public String getMarket(Map<String, Object> params, List<DictModel> targetMarketList, ProjectLibraryBase projectLibraryBase) {
+		List<DictModel> dictModelList = new ArrayList<>();
+		if(StringUtils.isNotBlank(projectLibraryBase.getTargetMarket())){
+			for (String s : projectLibraryBase.getTargetMarket().split(",")) {
+				List<DictModel> dictModelListTemp = targetMarketList.stream()
+						.filter(e -> s.equals(e.getValue())).collect(Collectors.toList());
+				dictModelList.addAll(dictModelListTemp);
+			}
+		}
+		String targetMarket = "";
+		if(dictModelList.size() != 0){
+			StringBuilder sb = new StringBuilder();
+			for (DictModel dictModel : dictModelList) {
+				if(CutEnum.CN.getValue().equals(params.get("cut"))){
+					sb.append(dictModel.getText()+",");
+				}else{
+					sb.append(dictModel.getTextEn()+",");
+				}
+			}
+			if(StringUtils.isNotBlank(sb)){
+				targetMarket = sb.substring(0,sb.length()-1);
+			}
+		}
+		return targetMarket;
+	}
+
+	public Page getPages(Integer currentPage, Integer pageSize, List<ProjectLibraryBase> list){
+		Page page =new Page();
+		if(list==null){
+			return null;
+		}
+		int size = list.size();
+		if(pageSize > size){
+			pageSize = size;
+		}
+		if(pageSize!=0){
+			//求出最⼤页数，防⽌currentPage越界
+			int maxPage = size % pageSize ==0? size / pageSize : size / pageSize +1;
+			if(currentPage > maxPage){
+				currentPage = maxPage;
+			}
+		}
+		//当前页第⼀条数据的下标
+		int curIdx = currentPage >1?(currentPage -1)* pageSize :0;
+		List pageList =new ArrayList();
+		//将当前页的数据放进pageList
+		for(int i =0; i < pageSize && curIdx + i < size; i++){
+			pageList.add(list.get(curIdx + i));
+		}
+		page.setCurrent(currentPage).setSize(pageSize).setTotal(list.size()).setRecords(pageList);
+		return page;
+	}
+
+
+//	/**
+//	 * 分页列表查询
+//	 *
+//	 * @return
+//	 */
+//	@Override
+//	public IPage<ProjectLibraryBase> queryPageList(Map<String,Object> params) {
+//		Integer pageNo = Integer.parseInt(params.get("pageNo").toString());
+//		Integer pageSize = Integer.parseInt(params.get("pageSize").toString());
+//		IPage page = new Page(pageNo, pageSize);
+//		IPage<ProjectLibraryBase> result = projectLibraryBaseMapper.queryPageList(page, params);
+//		List<ProjectLibraryBase> records = result.getRecords();
+//		disposeData(records,"",false);
+//		for(ProjectLibraryBase projectLibraryBase: records){
+//			if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){
+//				projectLibraryBase.setProjectName(projectLibraryBase.getProjectName() + "-" + projectLibraryBase.getYearName());
+//			}
+//		}
+//		return result;
+//	}
+
+	@Override
+	public void disposeData(List<ProjectLibraryBase> records,String cut,boolean disposeTargetMarketFlag) {
+		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
+		for (ProjectLibraryBase projectLibraryBase : records) {
+			List<SysUser> sysUsers = new ArrayList<>();
+			//认证工程师多个id查询
+			if (StringUtils.isNotEmpty(projectLibraryBase.getCertificationEngineer())) {
+				List<String> certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
+				if (CollectionUtils.isNotEmpty(certificationEngineerIdList)) {
+					certificationEngineerIdList = certificationEngineerIdList.stream().distinct().collect(Collectors.toList());
+					QueryWrapper<SysUser> userqueryWrapper = new QueryWrapper<>();
+					userqueryWrapper.in("id ", certificationEngineerIdList);
+					sysUsers = sysUserMapper.selectList(userqueryWrapper);
+				}
+
+				if (CollectionUtils.isNotEmpty(sysUsers)) {
+					String certificationEngineerId = projectLibraryBase.getCertificationEngineer();
+					String certificationEngineerName = null;
+					StringBuilder certificationName = new StringBuilder();
+
+					for (String data : certificationEngineerIdList) {
+						if (StringUtils.isNotEmpty(certificationEngineerId)) {
+							certificationEngineerName = sysUsers.stream().filter(e -> data.equals(e.getId()))
+									.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
+						}
+						certificationName.append(certificationEngineerName).append(",");
+					}
+					if(StringUtils.isNotBlank(certificationName)){
+						String substring = certificationName.substring(0, certificationName.length() - 1);
+						projectLibraryBase.setCertificationEngineerName(substring);
+					}
+				}
+			}
+
+			if(disposeTargetMarketFlag){
+				if(StringUtils.isNotEmpty(projectLibraryBase.getTargetMarket())){
+					String targetMarketName = "";
+					String[] targetMarketArr = projectLibraryBase.getTargetMarket().split(",");
+					if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+						targetMarketName = targetMarketList.stream().filter(targetMarket -> {
+							boolean flag = false;
+							for (String s : targetMarketArr) {
+								if (StringUtils.equals(s, targetMarket.getValue())) {
+									flag = true;
+								}
+							}
+							return flag;
+						}).map(DictModel::getTextEn).collect(Collectors.joining(","));
+					}else {
+						targetMarketName = targetMarketList.stream().filter(targetMarket -> {
+							boolean flag = false;
+							for (String s : targetMarketArr) {
+								if (StringUtils.equals(s, targetMarket.getValue())) {
+									flag = true;
+								}
+							}
+							return flag;
+						}).map(DictModel::getText).collect(Collectors.joining(","));
+					}
+					projectLibraryBase.setTargetMarketName(targetMarketName);
+				}
+			}
+
+		}
+	}
+
+	@Override
+	public Map<String, Object> getProjectDetailsStatistics(String id) {
+		Map<String,Object> result = new HashMap<>();
+
+		//当前项目状态
+		Map<String,Object> currentProjectStatusMap = new HashMap<>();
+		//清单确认
+		Map<String,Object> listingToConfirmMap = new HashMap<>();
+		//任务确认
+		Map<String,Object> taskToConfirmMap = new HashMap<>();
+		//设计符合性
+		Map<String,Object> designComplianceMap = new HashMap<>();
+		//prehomo确认
+		Map<String,Object> prehomoMap = new HashMap<>();
+		//验证符合性
+		Map<String,Object> verifyComplianceMap = new HashMap<>();
+		//认证进度
+		Map<String,Object> certificationProgressMap = new HashMap<>();
+		// 认证任务确认
+		Map<String,Object> rzTaskToConfirmMap = new HashMap<>();
+
+		//清单确认统计
+		/*List<Map<String,Object>> listingToConfirmMapList = this.projectLawsInventoryEOMapper.getlistingToConfirmStatistics(id);
+		listingToConfirmMap.put("listingToConfirmMapList",listingToConfirmMapList);
+		result.put("listingToConfirmMap",listingToConfirmMap);*/
+
+		QueryWrapper<ProjectLawsInventoryEO> lawsInventoryEOQueryWrapper = new QueryWrapper<>();
+		lawsInventoryEOQueryWrapper.lambda().in(ProjectLawsInventoryEO::getProjectLibraryId,Arrays.asList(id.split(",")));
+		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = projectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper);
+		if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
+			List<String> projectLawsInventoryIdList = projectLawsInventoryEOList.stream().distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList());
+
+			//任务确认统计
+			List<Map<String,Object>> taskToConfirmMapList = this.projectLawsInventoryEOService.getTaskToConfirmStatistics(projectLawsInventoryEOList);
+			int taskAffirmStatusCount = 0;
+			if(CollectionUtils.isNotEmpty(taskToConfirmMapList)){
+				//taskAffirmStatusCount
+				for (Map<String, Object> taskToConfirm : taskToConfirmMapList) {
+					taskAffirmStatusCount += (int) taskToConfirm.get("taskAffirmStatusCount");
+				}
+			}
+			taskToConfirmMap.put("taskToConfirmMapList",taskToConfirmMapList);
+			taskToConfirmMap.put("count",taskAffirmStatusCount);
+			result.put("taskToConfirmMap",taskToConfirmMap);
+
+			//当前项目状态统计   获取一个 最差的结果 统计的数据 就是studio看到的数据。
+			/*List<Map<String,Object>> currentProjectStatusMapList = new ArrayList<>();
+			CurrentProjectStatusEnum[] values = CurrentProjectStatusEnum.values();
+			for (CurrentProjectStatusEnum value : values) {
+				Map<String,Object> map = new HashMap<>();
+				map.put("color",value.getValue());
+				currentProjectStatusMapList.add(map);
+			}
+			int currentProjectStatusTotal;
+			List<ConditionAssessmentEO> projectStatusAssessList = this.conditionAssessmentEOService.getProjectStatusAssessList(projectLawsInventoryIdList);
+
+			for (Map<String, Object> map : currentProjectStatusMapList) {
+				List<ConditionAssessmentEO> collect = projectStatusAssessList.stream().filter(
+						projectStatusAssess -> StringUtils.equals(projectStatusAssess.getConditionAssessment(),map.get("color").toString())
+				).collect(Collectors.toList());
+				map.put("conditionAssessmentCount",collect.size());
+			}
+
+			currentProjectStatusTotal = currentProjectStatusMapList.stream().filter(
+					currentProjectStatus -> Integer.parseInt(currentProjectStatus.get("conditionAssessmentCount").toString()) != 0
+			).mapToInt(currentProjectStatus -> Integer.parseInt(currentProjectStatus.get("conditionAssessmentCount").toString())).sum();
+
+			currentProjectStatusMap.put("currentProjectStatusMapList",currentProjectStatusMapList);
+			currentProjectStatusMap.put("currentProjectStatusTotal",currentProjectStatusTotal);
+			result.put("currentProjectStatusMap",currentProjectStatusMap);*/
+
+			//设计符合性
+			List<Map<String,Object>> designComplianceMapList = this.projectLawsInventoryEOService.getDesignComplianceStatistice(projectLawsInventoryEOList);
+			int designFlowTaskStatusCount = 0;
+			if(CollectionUtils.isNotEmpty(designComplianceMapList)){
+				for (Map<String, Object> designCompliance : designComplianceMapList) {
+					designFlowTaskStatusCount += (int) designCompliance.get("designFlowTaskStatusCount");
+				}
+			}
+			designComplianceMap.put("designComplianceMapList",designComplianceMapList);
+			designComplianceMap.put("count",designFlowTaskStatusCount);
+			result.put("designComplianceMap",designComplianceMap);
+
+			//验证符合性
+			List<Map<String,Object>> verifyComplianceMapList = this.projectLawsInventoryEOService.getVerifyComplianceStatistice(projectLawsInventoryEOList);
+			int verifyFlowTaskStatusCount = 0;
+			if(CollectionUtils.isNotEmpty(verifyComplianceMapList)){
+				for (Map<String, Object> verifyCompliance : verifyComplianceMapList) {
+					verifyFlowTaskStatusCount += (int) verifyCompliance.get("verifyFlowTaskStatusCount");
+				}
+			}
+			verifyComplianceMap.put("verifyComplianceMapList",verifyComplianceMapList);
+			verifyComplianceMap.put("count",verifyFlowTaskStatusCount);
+			result.put("verifyComplianceMap",verifyComplianceMap);
+
+			//认证进度统计
+			/*int certificationProgressTotal;
+			List<Map<String,Object>> certificationProgressMapList = this.projectTaskInventoryEOMapper.getCertificationProgressStatistics(projectLawsInventoryIdList);
+			certificationProgressTotal = certificationProgressMapList.stream().filter(
+					certificationProgress -> Integer.parseInt(certificationProgress.get("certificationProgressCount").toString()) != 0
+			).mapToInt(certificationProgress -> Integer.parseInt(certificationProgress.get("certificationProgressCount").toString())).sum();
+
+			CertificationProgressEnum[] CertificationProgressEnumValues = CertificationProgressEnum.values();
+			for (CertificationProgressEnum certificationProgressEnumValue : CertificationProgressEnumValues) {
+				boolean flag = true;
+				for (Map<String, Object> map : certificationProgressMapList) {
+					if(map.get("certificationProgress") != null){
+						if(StringUtils.equals(certificationProgressEnumValue.getValue(),map.get("certificationProgress").toString())){
+							flag = false;
+							break;
+						}
+					}
+				}
+				if(flag){
+					Map<String,Object> map = new HashMap<>();
+					map.put("certificationProgress",certificationProgressEnumValue.getValue());
+					map.put("certificationProgressCount",0);
+					certificationProgressMapList.add(map);
+				}
+			}
+
+			certificationProgressMap.put("certificationProgressTotal",certificationProgressTotal);
+			certificationProgressMap.put("certificationProgressMapList",certificationProgressMapList);
+			result.put("certificationProgressMap",certificationProgressMap);*/
+		}
+
+		QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
+		pciQueryWrap.lambda().in(ProjectCertificationInventoryEO::getProjectLibraryId,Arrays.asList(id.split(",")));
+		List<ProjectCertificationInventoryEO> pciEoList = this.projectCertificationInventoryEOService.list(pciQueryWrap).stream().filter(pciEo -> {
+			boolean flag = false;
+			if (!StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.UNINVOLVED.getValue())) {
+				flag = true;
+			}
+			return flag;
+		}).distinct().collect(Collectors.toList());
+		if(CollectionUtils.isNotEmpty(pciEoList)){
+			// 认证清单-任务确认统计
+			List<Map<String,Object>> rzTaskToConfirmMapList = this.projectCertificationInventoryEOService.getTaskToConfirmStatistics(pciEoList);
+			int taskAffirmStatusCount = 0;
+			if(CollectionUtils.isNotEmpty(rzTaskToConfirmMapList)){
+				for (Map<String, Object> rzTaskToConfirm : rzTaskToConfirmMapList) {
+					taskAffirmStatusCount += (int) rzTaskToConfirm.get("taskAffirmStatusCount");
+				}
+			}
+			rzTaskToConfirmMap.put("rzTaskToConfirmMapList",rzTaskToConfirmMapList);
+			rzTaskToConfirmMap.put("count",taskAffirmStatusCount);
+			result.put("rzTaskToConfirmMap",rzTaskToConfirmMap);
+
+			// Pre-Homo 统计
+			List<Map<String,Object>> prehomoMapList = this.projectCertificationInventoryEOService.getPrehomoStatistice(pciEoList);
+			int preHomoCount = 0;
+			if (CollectionUtils.isNotEmpty(prehomoMapList)) {
+				for (Map<String, Object> prehomo : prehomoMapList) {
+					preHomoCount += (int) prehomo.get("taskAffirmStatusCount");
+				}
+			}
+			prehomoMap.put("prehomoMapList",prehomoMapList);
+			prehomoMap.put("count",preHomoCount);
+			result.put("prehomoMap",prehomoMap);
+
+			// 认证进度 统计
+			List<Map<String,Object>> allMapList = this.projectCertificationInventoryEOService.getAllCertificationProgressStatistics(pciEoList);
+			List<Map<String,Object>> carMapList = this.projectCertificationInventoryEOService.getCarCertificationProgressStatistics(pciEoList);
+			List<Map<String,Object>> partMapList = this.projectCertificationInventoryEOService.getPartCertificationProgressStatistics(pciEoList);
+			certificationProgressMap.put("allMapList",allMapList);// 全部
+			certificationProgressMap.put("carMapList",carMapList);// 整车
+			certificationProgressMap.put("partMapList",partMapList);// 零部件
+			int allCount = 0;
+			if(CollectionUtils.isNotEmpty(allMapList)){
+				for (Map<String, Object> all : allMapList) {
+					allCount += (int) all.get("certificationProgressCount");
+				}
+			}
+			int carCount = 0;
+			if(CollectionUtils.isNotEmpty(carMapList)){
+				for (Map<String, Object> car : carMapList) {
+					carCount += (int) car.get("certificationProgressCount");
+				}
+			}
+			int partCount = 0;
+			if(CollectionUtils.isNotEmpty(partMapList)){
+				for (Map<String, Object> part : partMapList) {
+					partCount += (int) part.get("certificationProgressCount");
+				}
+			}
+
+			certificationProgressMap.put("allCount",allCount);// 全部
+			certificationProgressMap.put("carCount",carCount);// 整车
+			certificationProgressMap.put("partCount",partCount);// 零部件
+			result.put("certificationProgressMap",certificationProgressMap);
+		}
+
+		return result;
+	}
+//	@Override
+//	public Map<String, Object> getProjectDetailsStatistics(String id) {
+//		Map<String,Object> result = new HashMap<>();
+//
+//		//当前项目状态
+//		Map<String,Object> currentProjectStatusMap = new HashMap<>();
+//		//清单确认
+//		Map<String,Object> listingToConfirmMap = new HashMap<>();
+//		//任务确认
+//		Map<String,Object> taskToConfirmMap = new HashMap<>();
+//		//设计符合性
+//		Map<String,Object> designComplianceMap = new HashMap<>();
+//		//prehomo确认
+//		Map<String,Object> prehomoMap = new HashMap<>();
+//		//验证符合性
+//		Map<String,Object> verifyComplianceMap = new HashMap<>();
+//		//认证进度
+//		Map<String,Object> certificationProgressMap = new HashMap<>();
+//
+//		//清单确认统计
+//		List<Map<String,Object>> listingToConfirmMapList = this.projectLawsInventoryEOMapper.getlistingToConfirmStatistics(id);
+//		listingToConfirmMap.put("listingToConfirmMapList",listingToConfirmMapList);
+//		result.put("listingToConfirmMap",listingToConfirmMap);
+//
+//		//任务确认统计
+//		List<Map<String,Object>> taskToConfirmMapList = this.projectLawsInventoryEOMapper.getTaskToConfirmStatistics(id);
+//		taskToConfirmMap.put("taskToConfirmMapList",taskToConfirmMapList);
+//		result.put("taskToConfirmMap",taskToConfirmMap);
+//
+//		QueryWrapper<ProjectLawsInventoryEO> lawsInventoryEOQueryWrapper = new QueryWrapper<>();
+//		lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,id);
+//		//lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getInventoryAffirmStatus, InventoryAffirmStatusEnum.ACCEPTED.getValue());
+//		//lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getTaskAffirmStatus, TaskAffirmStatusEnum.ACCEPTED.getValue());
+//		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = projectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper);
+//		if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
+//			List<String> projectLawsInventoryIdList = projectLawsInventoryEOList.stream().distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList());
+//
+//			//当前项目状态统计   获取一个 最差的结果 统计的数据 就是studio看到的数据。
+//			List<Map<String,Object>> currentProjectStatusMapList = new ArrayList<>();
+//			CurrentProjectStatusEnum[] values = CurrentProjectStatusEnum.values();
+//			for (CurrentProjectStatusEnum value : values) {
+//				Map<String,Object> map = new HashMap<>();
+//				map.put("color",value.getValue());
+//				currentProjectStatusMapList.add(map);
+//			}
+//			int currentProjectStatusTotal;
+//			List<ConditionAssessmentEO> projectStatusAssessList = this.conditionAssessmentEOService.getProjectStatusAssessList(projectLawsInventoryIdList);
+//
+//			for (Map<String, Object> map : currentProjectStatusMapList) {
+//				List<ConditionAssessmentEO> collect = projectStatusAssessList.stream().filter(
+//						projectStatusAssess -> StringUtils.equals(projectStatusAssess.getConditionAssessment(),map.get("color").toString())
+//				).collect(Collectors.toList());
+//				map.put("conditionAssessmentCount",collect.size());
+//			}
+//
+//			currentProjectStatusTotal = currentProjectStatusMapList.stream().filter(
+//					currentProjectStatus -> Integer.parseInt(currentProjectStatus.get("conditionAssessmentCount").toString()) != 0
+//			).mapToInt(currentProjectStatus -> Integer.parseInt(currentProjectStatus.get("conditionAssessmentCount").toString())).sum();
+//
+//			currentProjectStatusMap.put("currentProjectStatusMapList",currentProjectStatusMapList);
+//			currentProjectStatusMap.put("currentProjectStatusTotal",currentProjectStatusTotal);
+//			result.put("currentProjectStatusMap",currentProjectStatusMap);
+//
+//			//设计符合性
+//			List<Map<String,Object>> designComplianceMapList = this.projectTaskInventoryEOMapper.getDesignComplianceStatistice(projectLawsInventoryIdList);
+//			designComplianceMap.put("designComplianceMapList",designComplianceMapList);
+//			result.put("designComplianceMap",designComplianceMap);
+//
+//			//prehomo确认
+//			List<Map<String,Object>> prehomoMapList = this.projectTaskInventoryEOMapper.getPrehomoStatistice(projectLawsInventoryIdList);
+//			prehomoMap.put("prehomoMapList",prehomoMapList);
+//			result.put("prehomoMap",prehomoMap);
+//
+//			//验证符合性
+//			List<Map<String,Object>> verifyComplianceMapList = this.projectTaskInventoryEOMapper.getVerifyComplianceStatistice(projectLawsInventoryIdList);
+//			verifyComplianceMap.put("verifyComplianceMapList",verifyComplianceMapList);
+//			result.put("verifyComplianceMap",verifyComplianceMap);
+//
+//			//认证进度统计
+//			int certificationProgressTotal;
+//			List<Map<String,Object>> certificationProgressMapList = this.projectTaskInventoryEOMapper.getCertificationProgressStatistics(projectLawsInventoryIdList);
+//			certificationProgressTotal = certificationProgressMapList.stream().filter(
+//					certificationProgress -> Integer.parseInt(certificationProgress.get("certificationProgressCount").toString()) != 0
+//			).mapToInt(certificationProgress -> Integer.parseInt(certificationProgress.get("certificationProgressCount").toString())).sum();
+//
+//			CertificationProgressEnum[] CertificationProgressEnumValues = CertificationProgressEnum.values();
+//			for (CertificationProgressEnum certificationProgressEnumValue : CertificationProgressEnumValues) {
+//				boolean flag = true;
+//				for (Map<String, Object> map : certificationProgressMapList) {
+//					if(map.get("certificationProgress") != null){
+//						if(StringUtils.equals(certificationProgressEnumValue.getValue(),map.get("certificationProgress").toString())){
+//							flag = false;
+//							break;
+//						}
+//					}
+//				}
+//				if(flag){
+//					Map<String,Object> map = new HashMap<>();
+//					map.put("certificationProgress",certificationProgressEnumValue.getValue());
+//					map.put("certificationProgressCount",0);
+//					certificationProgressMapList.add(map);
+//				}
+//			}
+//
+//			certificationProgressMap.put("certificationProgressTotal",certificationProgressTotal);
+//			certificationProgressMap.put("certificationProgressMapList",certificationProgressMapList);
+//			result.put("certificationProgressMap",certificationProgressMap);
+//		}
+//
+//		return result;
+//	}
+
+	/**
+	 * 项目详情-统计接口-根据领域分组
+	 * @param params
+	 * @return
+	 */
+	@Override
+	public Map<String, Object> getProjectDetailsStatisticsGroupByTerritory(Map<String, Object> params) {
+		String operatorType = (String) params.get("operatorType");
+		String projectLibraryId = (String) params.get("projectLibraryId");
+		if(StringUtils.isEmpty(projectLibraryId)){
+			throw new JeroBootException("项目库id不能为空！");
+		}
+		String cut = (String) params.get("cut");
+		Map<String,Object> result = new HashMap<>();
+		List<Map<String, Object>> dataList = new ArrayList<>();
+
+		QueryWrapper<ProjectLawsInventoryEO> lawsInventoryEOQueryWrapper = new QueryWrapper<>();
+		lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
+		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = projectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper);
+
+		List<SysDictItem> sysDictItems = new ArrayList<>();
+		// 法规清单所有的责任领域
+		String pliDutyTerritoryStr = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getDutyTerritory).collect(Collectors.joining(","));
+		if (StringUtils.isNotEmpty(pliDutyTerritoryStr)) {
+			List<String> pliDutyTerritoryList = Arrays.asList(pliDutyTerritoryStr.split(",")).stream().distinct().collect(Collectors.toList());
+			sysDictItems = this.sysDictItemServiceImpl.selectItemsAll().stream().filter(sysDictItem -> {
+				boolean flag = false;
+				for (String pliDutyTerritory : pliDutyTerritoryList) {
+					if(StringUtils.equals(sysDictItem.getItemValue(),pliDutyTerritory)){
+						flag = true;
+						break;
+					}
+				}
+				return flag;
+			}).collect(Collectors.toList());
+		}
+
+		Map<String,Object> pliEoMap = new HashMap<>();
+
+		Map<String, List<SysDictItem>> firstLevelDutyTerritoryMapFG = this.sysDictItemServiceImpl.getFirstLevelSysDictItemByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue(),sysDictItems);
+		if(ObjectUtils.isNotEmpty(firstLevelDutyTerritoryMapFG)){
+			// 根据责任领域组装法规清单数据，后续计算使用
+			for (Map.Entry<String, List<SysDictItem>> firstLevelMap : firstLevelDutyTerritoryMapFG.entrySet()) {
+				String key = firstLevelMap.getKey();
+				List<SysDictItem> dutyTerritoryList = firstLevelMap.getValue();
+				if(StringUtils.isEmpty(key) || CollectionUtils.isEmpty(dutyTerritoryList)){
+					continue;
+				}
+				List<ProjectLawsInventoryEO> pliEoList = projectLawsInventoryEOList.stream().filter(pliEo -> {
+					boolean flag = false;
+					for (SysDictItem dutyTerritory : dutyTerritoryList) {
+						if (StringUtils.contains(pliEo.getDutyTerritory(), dutyTerritory.getItemValue())) {
+							flag = true;
+							break;
+						}
+					}
+					return flag;
+				}).collect(Collectors.toList());
+
+				JSONObject json = new JSONObject();
+				json.put("dutyTerritoryList",dutyTerritoryList);
+				json.put("pliEoList",pliEoList);
+				pliEoMap.put(key,json);
+			}
+		}
+		String status = (String) params.get("status");
+		if (CollectionUtils.isNotEmpty(projectLawsInventoryEOList)) {
+			for (Map.Entry<String, Object> pliMap : pliEoMap.entrySet()) {
+				String key = pliMap.getKey();
+				JSONObject json = (JSONObject) pliMap.getValue();
+				List<ProjectLawsInventoryEO> pliEoList = (List<ProjectLawsInventoryEO>) json.get("pliEoList");
+				Map<String, Object> dataMaps = new HashMap<>();
+				if(StringUtils.equals(OperatorTypeEnum.QUERY_FG_TASK_TO_CONFIRM_STATISTICS.getValue(),operatorType)){
+					dataMaps = this.projectLibraryStatisticsService.getFGTaskToConfirmStatisticsGroupByTerritory(pliEoList,params);
+				}else if(StringUtils.equals(OperatorTypeEnum.QUERY_DESIGN_STATISTICS.getValue(),operatorType)){
+					dataMaps = this.projectLibraryStatisticsService.getDesignComplianceStatisticeGroupByTerritory(pliEoList,params);
+				}else if(StringUtils.equals(OperatorTypeEnum.QUERY_VERIFY_STATISTICS.getValue(),operatorType)){
+					dataMaps = this.projectLibraryStatisticsService.getVerifyComplianceStatisticeGroupByTerritory(pliEoList,params);
+				}
+				if(ObjectUtils.isEmpty(dataMaps)){
+					continue;
+				}
+				Map<String, Object> dataMap = (Map<String, Object>) dataMaps.get(status);
+				double amount = (double) dataMap.get("amount");
+				if(amount != 0){
+					dataMap.put("dutyTerritoryName",key);
+					dataList.add(dataMap);
+				}
+			}
+			if(CollectionUtils.isNotEmpty(dataList)){
+				this.projectDetailsStatisticsGroupByTerritoryHearSort(dataList,params);
+				result.put("dataList",dataList);
+				return result;
+			}
+//			if(StringUtils.equals(OperatorTypeEnum.QUERY_FG_TASK_TO_CONFIRM_STATISTICS.getValue(),operatorType)){
+//				if(ObjectUtils.isNotEmpty(pliEoMap)){
+//
+//					List<Map<String, Object>> dataList = new ArrayList<>();
+//					for (Map.Entry<String, Object> pliMap : pliEoMap.entrySet()) {
+//						String key = pliMap.getKey();
+//						JSONObject json = (JSONObject) pliMap.getValue();
+//						List<ProjectLawsInventoryEO> pliEoList = (List<ProjectLawsInventoryEO>) json.get("pliEoList");
+//						Map<String, Object> dataMaps = this.projectLibraryStatisticsService.getFGTaskToConfirmStatisticsGroupByTerritory(pliEoList,params);
+//						Map<String, Object> dataMap = (Map<String, Object>) dataMaps.get(status);
+//						double amount = (double) dataMap.get("amount");
+//						if(amount != 0){
+//							dataMap.put("dutyTerritoryName",key);
+//							dataList.add(dataMap);
+//						}
+//					}
+//					result.put("dataList",dataList);
+//				}
+//			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_CURRENT_PROJECT_STATUS_STATISTICS.getValue(),operatorType)){
+//				params.put("projectLawsInventoryIdList",projectLawsInventoryIdList);
+//				List<Map<String, Object>> conditionAssessmentMapList = this.conditionAssessmentEOService.getProjectStatusAssessStatisticsGroupByTerritory(params);
+//				disposeData(conditionAssessmentMapList,cut);
+//				result.put("dataList",conditionAssessmentMapList);
+//			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_LISTING_TO_CONFIRM_STATISTICS.getValue(),operatorType)){
+//				//清单确认 状态
+//				String inventoryAffirmStatus = (String) params.get("inventoryAffirmStatus");
+//				List<Map<String,Object>> listingToConfirmList = this.projectLawsInventoryEOMapper.getListingToConfirmStatisticsGroupByTerritory(projectLibraryId,inventoryAffirmStatus);
+//				disposeData(listingToConfirmList,cut);
+//				result.put("dataList",listingToConfirmList);
+//			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_TASK_TO_CONFIRM_STATISTICS.getValue(),operatorType)){
+//				//任务确认 状态
+//				String taskAffirmStatus = (String) params.get("taskAffirmStatus");
+//				List<Map<String,Object>> taskToConfirmList = this.projectLawsInventoryEOMapper.getTaskToConfirmStatisticsGroupByTerritory(projectLibraryId,taskAffirmStatus);
+//				disposeData(taskToConfirmList,cut);
+//				result.put("dataList",taskToConfirmList);
+//			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_DESIGN_STATISTICS.getValue(),operatorType)){
+//				//设计符合性
+//				List<Map<String, Object>> dataList = new ArrayList<>();
+//				for (Map.Entry<String, Object> pliMap : pliEoMap.entrySet()) {
+//					String key = pliMap.getKey();
+//					JSONObject json = (JSONObject) pliMap.getValue();
+//					List<ProjectLawsInventoryEO> pliEoList = (List<ProjectLawsInventoryEO>) json.get("pliEoList");
+//					Map<String, Object> dataMaps = this.projectLibraryStatisticsService.getDesignComplianceStatisticeGroupByTerritory(pliEoList,params);
+//					Map<String, Object> dataMap = (Map<String, Object>) dataMaps.get(status);
+//					double amount = (double) dataMap.get("amount");
+//					if(amount != 0){
+//						dataMap.put("dutyTerritoryName",key);
+//						dataList.add(dataMap);
+//					}
+//				}
+//				result.put("dataList",dataList);
+//			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_PREHOMO_STATISTICS.getValue(),operatorType)){
+//				//prehomo确认 流程任务状态
+//				String prehomoFlowTaskStatus = (String) params.get("prehomoFlowTaskStatus");
+//				if(CollectionUtils.isNotEmpty(projectLawsInventoryIdList)){
+//					List<Map<String,Object>> prehomoList = this.projectTaskInventoryEOMapper.getPrehomoStatisticeGroupByTerritory(projectLawsInventoryIdList,prehomoFlowTaskStatus);
+//					disposeData(prehomoList,cut);
+//					result.put("dataList",prehomoList);
+//				}
+//			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_VERIFY_STATISTICS.getValue(),operatorType)){
+//				//验证符合性 流程任务状态
+//				List<Map<String, Object>> dataList = new ArrayList<>();
+//				for (Map.Entry<String, Object> pliMap : pliEoMap.entrySet()) {
+//					String key = pliMap.getKey();
+//					JSONObject json = (JSONObject) pliMap.getValue();
+//					List<ProjectLawsInventoryEO> pliEoList = (List<ProjectLawsInventoryEO>) json.get("pliEoList");
+//					Map<String, Object> dataMaps = this.projectLibraryStatisticsService.getVerifyComplianceStatisticeGroupByTerritory(pliEoList,params);
+//					Map<String, Object> dataMap = (Map<String, Object>) dataMaps.get(status);
+//					double amount = (double) dataMap.get("amount");
+//					if(amount != 0){
+//						dataMap.put("dutyTerritoryName",key);
+//						dataList.add(dataMap);
+//					}
+//				}
+//				result.put("dataList",dataList);
+//			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_CERTIFICATION_PROGRESS_STATISTICS.getValue(),operatorType)){
+//				//认证进度 流程任务状态
+//				String certificationProgress = (String) params.get("certificationProgress");
+//
+//				if(CollectionUtils.isNotEmpty(projectLawsInventoryIdList)){
+//					List<Map<String,Object>> certificationProgressList = this.projectTaskInventoryEOMapper.getCertificationProgressStatisticsGroupByTerritory(projectLawsInventoryIdList,certificationProgress);
+//					disposeData(certificationProgressList,cut);
+//					result.put("dataList",certificationProgressList);
+//				}
+//			}
+		}
+
+		Map<String,Object> pciEoMap = new HashMap<>();
+		QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
+		pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId);
+		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.projectCertificationInventoryEOService.list(pciQueryWrap);
+		String pciDutyTerritoryStr = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getDutyTerritory).collect(Collectors.joining(","));
+		if (StringUtils.isNotEmpty(pciDutyTerritoryStr)) {
+			List<String> pciDutyTerritoryList = Arrays.asList(pciDutyTerritoryStr.split(",")).stream().distinct().collect(Collectors.toList());
+			sysDictItems = this.sysDictItemServiceImpl.selectItemsAll().stream().filter(sysDictItem -> {
+				boolean flag = false;
+				for (String pliDutyTerritory : pciDutyTerritoryList) {
+					if(StringUtils.equals(sysDictItem.getItemValue(),pliDutyTerritory)){
+						flag = true;
+						break;
+					}
+				}
+				return flag;
+			}).collect(Collectors.toList());
+		}
+		Map<String, List<SysDictItem>> firstLevelDutyTerritoryMapRZ = this.sysDictItemServiceImpl.getFirstLevelSysDictItemByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue(),sysDictItems);
+		if(ObjectUtils.isNotEmpty(firstLevelDutyTerritoryMapRZ)){
+			// 根据责任领域组装法规清单数据，后续计算使用
+			for (Map.Entry<String, List<SysDictItem>> firstLevelMap : firstLevelDutyTerritoryMapRZ.entrySet()) {
+				String key = firstLevelMap.getKey();
+				List<SysDictItem> dutyTerritoryList = firstLevelMap.getValue();
+				if(StringUtils.isEmpty(key) || CollectionUtils.isEmpty(dutyTerritoryList)){
+					continue;
+				}
+				List<ProjectCertificationInventoryEO> pciEoList = projectCertificationInventoryEOList.stream().filter(pciEo -> {
+					boolean flag = false;
+					for (SysDictItem dutyTerritory : dutyTerritoryList) {
+						if (StringUtils.contains(pciEo.getDutyTerritory(), dutyTerritory.getItemValue())) {
+							flag = true;
+							break;
+						}
+					}
+					return flag;
+				}).collect(Collectors.toList());
+
+				JSONObject json = new JSONObject();
+				json.put("dutyTerritoryList",dutyTerritoryList);
+				json.put("pciEoList",pciEoList);
+				pciEoMap.put(key,json);
+			}
+		}
+		if (CollectionUtils.isNotEmpty(projectCertificationInventoryEOList) && ObjectUtils.isNotEmpty(pciEoMap)) {
+			for (Map.Entry<String, Object> pciMap : pciEoMap.entrySet()) {
+				String key = pciMap.getKey();
+				JSONObject json = (JSONObject) pciMap.getValue();
+				List<ProjectCertificationInventoryEO> pciEoList = (List<ProjectCertificationInventoryEO>) json.get("pciEoList");
+				Map<String, Object> dataMaps = new HashMap<>();
+				if(StringUtils.equals(OperatorTypeEnum.QUERY_RZ_TASK_TO_CONFIRM_STATISTICS.getValue(),operatorType)){
+					dataMaps = this.projectLibraryStatisticsService.getRZTaskToConfirmStatisticsGroupByTerritory(pciEoList,params);
+				}else if(StringUtils.equals(OperatorTypeEnum.QUERY_PREHOMO_STATISTICS.getValue(),operatorType)){
+					dataMaps = this.projectLibraryStatisticsService.getPrehomoStatisticeGroupByTerritory(pciEoList,params);
+				}else if(StringUtils.equals(OperatorTypeEnum.QUERY_CERTIFICATION_PROGRESS_STATISTICS_ALL.getValue(),operatorType)){
+					dataMaps = this.projectLibraryStatisticsService.getAllCertificationProgressStatisticsGroupByTerritory(pciEoList,params);
+				}else if(StringUtils.equals(OperatorTypeEnum.QUERY_CERTIFICATION_PROGRESS_STATISTICS_CAR.getValue(),operatorType)){
+					dataMaps = this.projectLibraryStatisticsService.getCarCertificationProgressStatisticsGroupByTerritory(pciEoList,params);
+				}else if(StringUtils.equals(OperatorTypeEnum.QUERY_CERTIFICATION_PROGRESS_STATISTICS_PART.getValue(),operatorType)){
+					dataMaps = this.projectLibraryStatisticsService.getPartCertificationProgressStatisticsGroupByTerritory(pciEoList,params);
+				}
+				if(ObjectUtils.isEmpty(dataMaps)){
+					continue;
+				}
+				Map<String, Object> dataMap = (Map<String, Object>) dataMaps.get(status);
+				double amount = (double) dataMap.get("amount");
+				if(amount != 0){
+					dataMap.put("dutyTerritoryName",key);
+					dataList.add(dataMap);
+				}
+			}
+			this.projectDetailsStatisticsGroupByTerritoryHearSort(dataList,params);
+			result.put("dataList",dataList);
+		}
+		return result;
+	}
+
+	/**
+	 * 项目库详情统计-根据责任领域分组统计数据-表头排序
+	 * @param dataList
+	 * @param params
+	 */
+	private void projectDetailsStatisticsGroupByTerritoryHearSort(List<Map<String, Object>> dataList,Map<String,Object> params) {
+		String orderByField = (String) params.get("orderByField");
+		String orderBy = (String) params.get("orderBy");
+		if(CollectionUtils.isNotEmpty(dataList)){
+			Collator comparator = Collator.getInstance(Locale.CHINESE);
+			Collections.sort(dataList,(data1,data2)->{
+				String param1 = "";
+				String param2 = "";
+				// 一级责任领域名称
+				if("dutyTerritoryName".equals(orderByField)){
+					param1 = StringUtils.isNotEmpty((String) data1.get("dutyTerritoryName")) ? (String) data1.get("dutyTerritoryName") : "";
+					param2 = StringUtils.isNotEmpty((String) data2.get("dutyTerritoryName")) ? (String) data2.get("dutyTerritoryName") : "";
+					if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+						return comparator.compare(param1,param2);
+					}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+						return comparator.compare(param2,param1);
+					}
+				}
+				// 数量
+				if(StringUtils.isEmpty(orderByField) || "amount".equals(orderByField)){
+					double p1 = data1.get("amount") != null ? (double) data1.get("amount") : 0;
+					double p2 = data2.get("amount") != null ? (double) data2.get("amount") : 0;
+					if(StringUtils.isEmpty(orderBy) || OrderEnum.POSITIVE.getValue().equals(orderBy)){
+						return (int)(p1 - p2);
+					}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+						return (int)(p2 - p1);
+					}
+				}
+				// 占比
+				if("percentage".equals(orderByField)){
+					double p1 = StringUtils.isNotEmpty((String) data1.get("percentage")) ? Double.parseDouble (((String) data1.get("percentage")).replace("%","")) : 0;
+					double p2 = StringUtils.isNotEmpty((String) data2.get("percentage")) ? Double.parseDouble (((String) data2.get("percentage")).replace("%","")) : 0;
+					if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+						return (int)(p1 - p2);
+					}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+						return (int)(p2 - p1);
+					}
+				}
+				return 0;
+			});
+		}
+	}
+
+	@Override
+	public void exportProjectDetailsStatisticsGroupByTerritoryXls(HttpServletResponse response, HttpServletRequest request, Map<String, Object> params) {
+		Map<String, Object> projectDetailsStatisticsGroupByTerritory = getProjectDetailsStatisticsGroupByTerritory(params);
+		String operatorType = (String) params.get("operatorType");
+		String cut = (String) params.get("cut");
+		String sheetName = "";
+		String title = "";
+		if (StringUtils.equals(cut,CutEnum.CN.getValue())) {
+			title = "责任领域,数量,责任领域内占比";
+			if(StringUtils.equals(OperatorTypeEnum.QUERY_FG_TASK_TO_CONFIRM_STATISTICS.getValue(),operatorType)){
+				sheetName = "法规任务确认";
+			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_DESIGN_STATISTICS.getValue(),operatorType)){
+				sheetName = "设计符合性";
+			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_VERIFY_STATISTICS.getValue(),operatorType)){
+				sheetName = "验证符合性";
+			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_RZ_TASK_TO_CONFIRM_STATISTICS.getValue(),operatorType)){
+				sheetName = "认证任务确认";
+			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_PREHOMO_STATISTICS.getValue(),operatorType)){
+				sheetName = "Pre-Homo流程";
+			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_CERTIFICATION_PROGRESS_STATISTICS_ALL.getValue(),operatorType)){
+				sheetName = "认证进度";
+			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_CERTIFICATION_PROGRESS_STATISTICS_CAR.getValue(),operatorType)){
+				sheetName = "认证进度";
+			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_CERTIFICATION_PROGRESS_STATISTICS_PART.getValue(),operatorType)){
+				sheetName = "认证进度";
+			}
+			/*if(StringUtils.equals(OperatorTypeEnum.QUERY_CURRENT_PROJECT_STATUS_STATISTICS.getValue(),operatorType)){
+				sheetName = "项目状态";
+			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_LISTING_TO_CONFIRM_STATISTICS.getValue(),operatorType)){
+				sheetName = "清单确认";
+			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_TASK_TO_CONFIRM_STATISTICS.getValue(),operatorType)){
+				sheetName = "任务确认";
+			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_DESIGN_STATISTICS.getValue(),operatorType)){
+				sheetName = "设计符合性";
+			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_PREHOMO_STATISTICS.getValue(),operatorType)){
+				sheetName = "Pre-homo";
+			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_VERIFY_STATISTICS.getValue(),operatorType)){
+				sheetName = "验证符合性";
+			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_CERTIFICATION_PROGRESS_STATISTICS.getValue(),operatorType)){
+				sheetName = "认证进度";
+			}*/
+		}else if (StringUtils.equals(cut,CutEnum.EN.getValue())) {
+			title = "Responsible Field,Quantity,Proportion within the area of responsibility";
+			if(StringUtils.equals(OperatorTypeEnum.QUERY_FG_TASK_TO_CONFIRM_STATISTICS.getValue(),operatorType)){
+				sheetName = "Regulation Task Confirmation";
+			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_DESIGN_STATISTICS.getValue(),operatorType)){
+				sheetName = "Design Compliance";
+			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_VERIFY_STATISTICS.getValue(),operatorType)){
+				sheetName = "Verify Compliance";
+			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_RZ_TASK_TO_CONFIRM_STATISTICS.getValue(),operatorType)){
+				sheetName = "Certification Task Confirmation";
+			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_PREHOMO_STATISTICS.getValue(),operatorType)){
+				sheetName = "Pre-Homo flow";
+			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_CERTIFICATION_PROGRESS_STATISTICS_ALL.getValue(),operatorType)){
+				sheetName = "Homologation Progress";
+			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_CERTIFICATION_PROGRESS_STATISTICS_CAR.getValue(),operatorType)){
+				sheetName = "Homologation Progress";
+			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_CERTIFICATION_PROGRESS_STATISTICS_PART.getValue(),operatorType)){
+				sheetName = "Homologation Progress";
+			}
+			/*if(StringUtils.equals(OperatorTypeEnum.QUERY_CURRENT_PROJECT_STATUS_STATISTICS.getValue(),operatorType)){
+				sheetName = "Project status";
+			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_LISTING_TO_CONFIRM_STATISTICS.getValue(),operatorType)){
+				sheetName = "Listing to confirm";
+			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_TASK_TO_CONFIRM_STATISTICS.getValue(),operatorType)){
+				sheetName = "Task to confirm";
+			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_DESIGN_STATISTICS.getValue(),operatorType)){
+				sheetName = "Design compliance";
+			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_PREHOMO_STATISTICS.getValue(),operatorType)){
+				sheetName = "Pre-homo";
+			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_VERIFY_STATISTICS.getValue(),operatorType)){
+				sheetName = "Verify compliance";
+			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_CERTIFICATION_PROGRESS_STATISTICS.getValue(),operatorType)){
+				sheetName = "Certification progress";
+			}*/
+		}
+
+
+		OutputStream os = null;
+		HSSFWorkbook workbook = new HSSFWorkbook();
+
+		try {
+			String fileName = sheetName + ".xlsx";
+			response.setHeader("Content-Disposition",
+					"attachment; filename=" + fileName);
+			response.setContentType("application/force-download");
+
+			HSSFSheet sheet = workbook.createSheet(sheetName);
+
+			String[] titleArr = title.split(",");
+			Row firstRow = sheet.createRow(0);
+
+			CellStyle cellStyleTitle = workbook.createCellStyle();
+			cellStyleTitle.setAlignment(HorizontalAlignment.CENTER);
+			for (int i = 0; i < 3; i++){
+				sheet.setColumnWidth(i, 5000);
+				Cell cell = firstRow.createCell(i);
+				cell.setCellStyle(cellStyleTitle);
+				cell.setCellValue(titleArr[i]);
+			}
+
+			createSheetData(sheet,projectDetailsStatisticsGroupByTerritory,params);
+
+			os = response.getOutputStream();
+			workbook.write(os);
+			os.flush();
+		}catch (IOException ex){
+			if(CutEnum.CN.getValue().equals(cut)){
+				throw new JeroBootException("下载文件失败");
+			}else{
+				throw new JeroBootException("Failed to download file");
+			}
+		}
+	}
+
+	public void createSheetData(HSSFSheet sheet,Map<String, Object> exportDataMap, Map<String, Object> params){
+		List<Map<String,Object>> exportDataList = (List<Map<String, Object>>) exportDataMap.get("dataList");
+		int rowIndex = 1;
+		for (int dataIndex = 0; dataIndex < exportDataList.size(); dataIndex++) {
+			Row dataRow = sheet.createRow(rowIndex);
+			dataRow.createCell(0).setCellValue(exportDataList.get(dataIndex).get("dutyTerritoryName").toString());
+			dataRow.createCell(1).setCellValue(String.valueOf(Math.round((Double) exportDataList.get(dataIndex).get("amount"))));
+			dataRow.createCell(2).setCellValue(exportDataList.get(dataIndex).get("percentage").toString());
+			rowIndex ++;
+		}
+	}
+
+	/**
+	 * 处理 根据领域统计的数据
+	 * @param datas
+	 * @param cut
+	 */
+	public void disposeData(List<Map<String,Object>> datas,String cut){
+		List<SysDictItem> dutyTerritoryList = sysDictItemServiceImpl.selectItemsByDictCode("duty_territory");
+		if(CollectionUtils.isNotEmpty(datas)){
+			for (Map<String, Object> data : datas) {
+				if(data.get("dutyTerritory") != null){
+					String[] dutyTerritorieArr = data.get("dutyTerritory").toString().split(",");
+					String dutyTerritories = "";
+					for (String dutyTerritorie : dutyTerritorieArr) {
+						List<String> collect = new ArrayList<>();
+						if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+							collect = dutyTerritoryList.stream()
+									.filter(e -> StringUtils.equals(dutyTerritorie, e.getItemValue()))
+									.map(SysDictItem::getItemText)
+									.collect(Collectors.toList());
+						}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+							collect = dutyTerritoryList.stream()
+									.filter(e -> StringUtils.equals(dutyTerritorie, e.getItemValue()))
+									.map(SysDictItem::getEnName)
+									.collect(Collectors.toList());
+						}
+						if(CollectionUtils.isNotEmpty(collect)){
+							dutyTerritories += collect.get(0) + ",";
+						}
+					}
+
+					if(StringUtils.isNotEmpty(dutyTerritories)){
+						dutyTerritories = dutyTerritories.substring(0,dutyTerritories.length()-1);
+					}
+//					data.put("dutyTerritory",dutyTerritories);
+					data.put("dutyTerritoryName",dutyTerritories);
+				}
+			}
+		}
+	}
+
+	@Override
+	public void top(String id, String flag) {
+		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		ProjectLibraryBase projectLibraryBase = this.getById(id);
+		//置顶的时候将取消置顶标识传过来即:flag=1
+		if(TopEnum.TOP_CANCEL.getValue().equals(flag)){
+			TopProjectEO topProjectEO = new TopProjectEO();
+			topProjectEO.setProjectLibraryBaseId(id);
+			topProjectEO.setFlag(TopEnum.TOP_CANCEL.getValue());
+			topProjectEO.setCreateBy(loginUser.getUsername());
+
+			//置顶
+			LambdaQueryWrapper<TopProjectEO> wrapper = new LambdaQueryWrapper<>();
+			wrapper.in(TopProjectEO::getCreateBy,loginUser.getUsername()).orderByDesc(TopProjectEO::getSort);
+			List<TopProjectEO> list = iTopProjectEOService.list(wrapper);
+			if(list.size() != 0){
+				String sort = list.get(0).getSort();
+				int sortTemp = Integer.valueOf(sort) + 1;
+				topProjectEO.setSort(String.valueOf(sortTemp));
+			}else{
+				//首个置顶的项目排序为1
+				topProjectEO.setSort("1");
+			}
+			iTopProjectEOService.save(topProjectEO);
+
+		}else{
+			//取消置顶
+			LambdaUpdateWrapper<TopProjectEO> wrapper = new LambdaUpdateWrapper<>();
+			wrapper.in(TopProjectEO::getCreateBy,loginUser.getUsername()).in(TopProjectEO::getProjectLibraryBaseId,id);
+			iTopProjectEOService.remove(wrapper);
+		}
+	}
+//	@Override
+//	public void top(String id, String flag) {
+//		ProjectLibraryBase projectLibraryBase = this.getById(id);
+//		//置顶的时候将取消置顶标识传过来即:flag=1
+//		if(TopEnum.TOP_CANCEL.getValue().equals(flag)){
+//			//置顶
+//			LambdaQueryWrapper<ProjectLibraryBase> wrapper = new LambdaQueryWrapper<>();
+//			wrapper.isNotNull(ProjectLibraryBase::getSort).orderByDesc(ProjectLibraryBase::getSort);
+//			List<ProjectLibraryBase> list = this.list(wrapper);
+//			if(list.size() != 0){
+//				String sort = list.get(list.size() - 1).getSort();
+//				int sortTemp = Integer.valueOf(sort) + 1;
+//				projectLibraryBase.setSort(String.valueOf(sortTemp));
+//			}else{
+//				//首个置顶的项目排序为1
+//				projectLibraryBase.setSort("1");
+//			}
+//			projectLibraryBase.setFlag(TopEnum.TOP_CANCEL.getValue());
+//			this.updateById(projectLibraryBase);
+//
+//		}else{
+//			//取消置顶
+//			LambdaUpdateWrapper<ProjectLibraryBase> updateWrapper = new LambdaUpdateWrapper<>();
+//			updateWrapper.in(ProjectLibraryBase::getId,id);
+//			updateWrapper.set(ProjectLibraryBase::getSort,null).set(ProjectLibraryBase::getFlag,null);
+//			this.update(projectLibraryBase,updateWrapper);
+//		}
+//	}
+
+	@Override
+	public List<String> getVersionsInfo(String id) {
+		LambdaUpdateWrapper<ProjectLibraryBase> wrapper = new LambdaUpdateWrapper<>();
+		wrapper.in(ProjectLibraryBase::getId,id).or().in(ProjectLibraryBase::getParentId,id);
+		List<ProjectLibraryBase> list = this.list(wrapper);
+		List<String> result = new ArrayList<>();
+		if(list.size() != 0){
+			result = list.stream().map(ProjectLibraryBase::getProjectVersion).collect(Collectors.toList());
+			Collections.sort(result);
+		}
+		return result;
+	}
+
+	/**
+	 * 版本统计
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public List<ProjectLibraryBase> versionStatistics(String id) {
+		LambdaUpdateWrapper<ProjectLibraryBase> wrapper = new LambdaUpdateWrapper<>();
+		wrapper.in(ProjectLibraryBase::getId,id).or().in(ProjectLibraryBase::getParentId,id);
+		List<ProjectLibraryBase> list = this.list(wrapper);
+		if(list.size() != 0){
+//			Collections.sort(list);
+		}
+		return list;
+	}
+
+	/**
+	 * 通过主项目id和子项目版本号
+	 * @param version
+	 * @param parentId
+	 * @return
+	 */
+	@Override
+	public String getIdByVersionAndParentId(String version, String parentId) {
+		if ("00".equals(version)) {
+			return  parentId;
+		}
+		LambdaQueryWrapper<ProjectLibraryBase> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(ProjectLibraryBase::getProjectVersion,version);
+		wrapper.eq(ProjectLibraryBase::getParentId, parentId);
+		List<ProjectLibraryBase> list = this.list(wrapper);
+		if (CollectionUtils.isNotEmpty(list)) {
+			return list.get(0).getId();
+		} else {
+			return null;
+		}
+
+	}
+
+	@Override
+	public List<ProjectLibraryBase> getParentAndChildern(String parentId) {
+		LambdaQueryWrapper<ProjectLibraryBase> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(ProjectLibraryBase::getId,parentId);
+		wrapper.or().eq(ProjectLibraryBase::getParentId, parentId);
+		List<ProjectLibraryBase> list = this.list(wrapper);
+		return list;
+	}
+
+	@Override
+	public ProjectLibraryBase selectById(String projectLibraryId) {
+		ProjectLibraryBase result = null;
+		List<ProjectLibraryBase> records = this.projectLibraryBaseMapper.queryById(projectLibraryId);
+		if(CollectionUtils.isNotEmpty(records)){
+			List<String> studioEngineerUserIdList = records.stream().map(ProjectLibraryBase::getStudioEngineer).distinct().collect(Collectors.toList());
+			List<SysUser> studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(studioEngineerUserIdList);
+			disposeData(records,"",false);
+
+			List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
+			for(ProjectLibraryBase projectLibraryBase: records){
+				//历史数据的主版本没有版本号,所以默认给00
+				if(StringUtils.isBlank(projectLibraryBase.getParentId()) && StringUtils.isBlank(projectLibraryBase.getProjectVersion())){
+					projectLibraryBase.setProjectVersion("00");
+				}
+				//目标市场 英文
+				Map<String,Object> paramEn = new HashMap<>();
+				paramEn.put("cut",CutEnum.EN.getValue());
+				String targetMarketEn = getMarket(paramEn, targetMarketList, projectLibraryBase);
+
+				//目标市场 中文
+				Map<String,Object> paramCn = new HashMap<>();
+				paramCn.put("cut",CutEnum.CN.getValue());
+				String targetMarketCn = getMarket(paramCn, targetMarketList, projectLibraryBase);
+
+				//主项目的版本号
+				String projectVersion = "";
+				if(StringUtils.isBlank(projectLibraryBase.getParentId())){
+					projectVersion = "00";
+				}else{
+					projectVersion = projectLibraryBase.getProjectVersion();
+				}
+				if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){
+					projectLibraryBase.setProjectNameEn(projectLibraryBase.getProjectName()
+							+ "-" + projectLibraryBase.getYearName()
+							+ "-" + targetMarketEn
+							+ "-" + projectVersion);
+
+					projectLibraryBase.setProjectNameCn(projectLibraryBase.getProjectName()
+							+ "-" + projectLibraryBase.getYearName()
+							+ "-" + targetMarketCn
+							+ "-" + projectVersion);
+				}
+
+				if(StringUtils.isNotEmpty(projectLibraryBase.getStudioEngineer())){
+					if(CollectionUtils.isNotEmpty(studioEngineerUserInfo)){
+						String studioEngineerUserName = studioEngineerUserInfo.stream().filter(studioEngineerUser -> {
+							boolean flag = false;
+							if (StringUtils.equals(projectLibraryBase.getStudioEngineer(), studioEngineerUser.getId())) {
+								flag = true;
+							}
+							return flag;
+						}).map(SysUser::getUsername).collect(Collectors.joining(","));
+
+						projectLibraryBase.setStudioEngineerName(studioEngineerUserName);
+					}
+				}
+			}
+
+			result = records.get(0);
+		}
+		return result;
+	}
+
+	/**
+	 * 对接火山引擎接口-获取项目统计信息
+	 * @return
+	 */
+	@Override
+	public JSONArray getProjectInfo() {
+		Date now = new Date();
+		List<ProjectLibraryBase> plbList = this.getList(new ProjectLibraryBase());
+		JSONArray resList = new JSONArray();
+		for (ProjectLibraryBase plb: plbList) {
+			JSONObject jsonObject = new JSONObject();
+			jsonObject.put("projectId",plb.getId());
+			jsonObject.put("projectName",plb.getShowName());
+			List<List<TimeNodeVO>> TimeNodeVOsList = projectTaskPlanningService.queryByProjectId(plb.getId(),CutEnum.CN.getValue());
+			//获取前置节点
+			TimeNodeVO preNodeTnVo = null;
+			//获取后置节点
+			TimeNodeVO postNodeTnVo = null;
+			if (ObjectUtils.isNotEmpty(TimeNodeVOsList) && TimeNodeVOsList.size() > 0) {
+				List<TimeNodeVO> TimeNodeVOList = TimeNodeVOsList.get(0);
+				for (TimeNodeVO tnVo : TimeNodeVOList) {
+					if(tnVo.isG()){
+						continue;
+					}
+					if (null != postNodeTnVo) {
+						break;
+					}
+					tnVo.setProjectId(plb.getId());
+					if (now.after(tnVo.getTime())) {
+						preNodeTnVo = tnVo;
+					}
+					if (now.before(tnVo.getTime())) {
+						postNodeTnVo = tnVo;
+					}
+				}
+			}
+			JSONArray preNodeList = getNodeList(preNodeTnVo);
+			jsonObject.put("preNode", preNodeList);
+			JSONArray postNodeList = getNodeList(postNodeTnVo);
+			jsonObject.put("postNode",postNodeList);
+			resList.add(jsonObject);
+		}
+		return resList;
+	}
+
+	@Override
+	public JSONArray getProjectProgressInfo() {
+		List<ProjectLibraryBase> plbList = this.getList(new ProjectLibraryBase());
+		JSONArray resList = new JSONArray();
+		for (ProjectLibraryBase plb: plbList) {
+			JSONObject jsonObject = new JSONObject();
+			jsonObject.put("projectId",plb.getId());
+			jsonObject.put("projectName",plb.getShowName());
+			jsonObject.put("studio",plb.getStudioEngineerName());
+			List<List<TimeNodeVO>> TimeNodeVOsList = projectTaskPlanningService.queryByProjectId(plb.getId(),CutEnum.CN.getValue());
+
+			JSONArray preNodeList = new JSONArray();
+			if (ObjectUtils.isNotEmpty(TimeNodeVOsList) && TimeNodeVOsList.size() > 0) {
+				List<TimeNodeVO> TimeNodeVOList = TimeNodeVOsList.get(0);
+				for (TimeNodeVO tnVo : TimeNodeVOList) {
+					if(tnVo.isG()){
+						continue;
+					}
+					tnVo.setProjectId(plb.getId());
+					preNodeList.addAll(getNodeProgressList(tnVo));
+				}
+			}
+			jsonObject.put("preNode", preNodeList);
+			resList.add(jsonObject);
+		}
+		return resList;
+	}
+
+	@Override
+	public void exportProjectProgressStatisticsXls(HttpServletResponse response, HttpServletRequest request, Map<String, Object> params) {
+		String fileName = "";
+		String cut = (String) params.get("cut");
+		String projectLibraryId = (String) params.get("projectLibraryId");
+		if(StringUtils.isEmpty(projectLibraryId)){
+			throw new JeroBootException("项目库id不能为空！");
+		}
+		OutputStream ops = null;
+		HSSFWorkbook workbook = new HSSFWorkbook();
+		this.exportRegulatoryManagement(workbook,params);
+		this.exportCertificationManagement(workbook,params);
+		this.exportParameterCollecting(workbook,params);
+		this.exportOtaCollecting(workbook,params);
+		try {
+			response.setHeader("Content-Disposition",
+					"attachment; filename=" + fileName);
+			response.setContentType("application/force-download");
+			ops = response.getOutputStream();
+			workbook.write(ops);
+			ops.flush();
+		}catch (IOException ex){
+			if(CutEnum.CN.getValue().equals(cut)){
+				throw new JeroBootException("下载文件失败");
+			}else{
+				throw new JeroBootException("Failed to download file");
+			}
+		}
+	}
+
+	@Override
+	public List<DictModel> getUserAllDutyTerritoryList(Map<String, Object> params) {
+		List<DictModel> result = new ArrayList<>();
+		List<SysDictItem> sysDictItems = this.sysDictItemServiceImpl.selectItemsAll();
+		List<SysDictItem> dutyTerritorySdiList = sysDictItems.stream().filter(sysDictItem -> {
+			return (StringUtils.equals(sysDictItem.getDictCode(), DicCodeEnum.DUTY_TERRITORY.getCode()));
+		}).collect(Collectors.toList());
+		params.put("dutyTerritorySdiList",dutyTerritorySdiList);
+
+		List<SysDictItem> userAllDutyTerritorySdiList = new ArrayList<>();
+		List<SysDictItem> prpSdiList = this.projectRelatedPersonnelService.getUserDutyTerritoryList(params);
+		if(CollectionUtils.isNotEmpty(prpSdiList)){
+			userAllDutyTerritorySdiList.addAll(prpSdiList);
+		}
+		List<SysDictItem> pliSdiList = this.projectLawsInventoryEOService.getUserDutyTerritoryList(params);
+		if(CollectionUtils.isNotEmpty(pliSdiList)){
+			userAllDutyTerritorySdiList.addAll(pliSdiList);
+		}
+		List<SysDictItem> pciSdiList = this.projectCertificationInventoryEOService.getUserDutyTerritoryList(params);
+		if(CollectionUtils.isNotEmpty(pciSdiList)){
+			userAllDutyTerritorySdiList.addAll(pciSdiList);
+		}
+		String projectLibraryId = (String) params.get("projectLibraryId");
+		ProjectLibraryBase projectLibraryBase = this.selectById(projectLibraryId);
+		params.put("parentId",projectLibraryBase.getParentId());
+		List<SysDictItem> pmSdiList = this.paramsManifestEOService.getUserDutyTerritoryList(params);
+		if(CollectionUtils.isNotEmpty(pmSdiList)){
+			userAllDutyTerritorySdiList.addAll(pmSdiList);
+		}
+
+		userAllDutyTerritorySdiList = userAllDutyTerritorySdiList.stream().distinct().collect(Collectors.toList());
+		if(CollectionUtils.isNotEmpty(userAllDutyTerritorySdiList)){
+			for (SysDictItem sysDictItem : userAllDutyTerritorySdiList) {
+				DictModel dictModel = new DictModel();
+				dictModel.setText(sysDictItem.getItemText());
+				dictModel.setTextEn(sysDictItem.getEnName());
+				dictModel.setValue(sysDictItem.getItemValue());
+				result.add(dictModel);
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * 全局替换用户
+	 * @param json
+	 * @return
+	 */
+	@Override
+	public Result<?> overallReplacementUser(JSONObject json) {
+		this.projectRelatedPersonnelService.replacementUser(json);
+		this.projectLawsInventoryEOService.replacementUser(json);
+		this.projectCertificationInventoryEOService.replacementUser(json);
+		String projectLibraryId = json.getString("projectLibraryId");
+		ProjectLibraryBase projectLibraryBase = this.selectById(projectLibraryId);
+		json.put("parentId",projectLibraryBase.getParentId());
+		this.paramsManifestEOService.replacementUser(json);
+		return Result.OK("全局替换成功！");
+	}
+
+	/**
+	 * 导出法规符合性管理
+	 * @param workbook
+	 * @param params
+	 */
+	private void exportRegulatoryManagement(HSSFWorkbook workbook,Map<String,Object> params) {
+		String cut = (String) params.get("cut");
+		String sheetName = "法规符合性管理";
+		String firstTitle = "法规任务确认," +
+				"设计符合性确认," +
+				"验证符合性确认";
+		String secondTitle = "责任领域（一级）," +
+				"未发起,待确认,接受,拒绝,完成度," +
+				"未发起,待确认,符合,不符合,完成度," +
+				"未发起,待确认,符合,不符合,完成度";
+		if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+			sheetName = "Regulatory compliance management";
+			firstTitle = "Regulatory task confirmation," +
+					"Design Conformity Verification," +
+					"Verification Conformity Confirmation";
+			secondTitle = "Area of responsibility (level 1)," +
+					"Not launched,To be confirmed,Accept,Refuse,Degree of completion," +
+					"Not launched,To be confirmed,Meet,Not meet,Degree of completion," +
+					"Not launched,To be confirmed,Meet,Not meet,Degree of completion";
+		}
+		HSSFSheet sheet = workbook.createSheet(sheetName);
+		//合并单元格     起始行，结束行，起始列，结束列
+		CellRangeAddress region1 = new CellRangeAddress(0, 0, 1, 5);
+		sheet.addMergedRegion(region1);
+		CellRangeAddress region2 = new CellRangeAddress(0, 0, 6, 10);
+		sheet.addMergedRegion(region2);
+		CellRangeAddress region3 = new CellRangeAddress(0, 0, 11, 15);
+		sheet.addMergedRegion(region3);
+
+		String[] firstTitleArr = firstTitle.split(",");
+		String[] secondTitleArr = secondTitle.split(",");
+		Row firstRow = sheet.createRow(0);
+		Row secondRow = sheet.createRow(1);
+
+		CellStyle cellStyleTitle = workbook.createCellStyle();
+		cellStyleTitle.setAlignment(HorizontalAlignment.CENTER);
+		for (int i = 0; i <= 15; i++){
+			sheet.setColumnWidth(i, 3500);
+			Cell firstRowCell = firstRow.createCell(i);
+			firstRowCell.setCellStyle(cellStyleTitle);
+			if(i == 1){
+				firstRowCell.setCellValue(firstTitleArr[0]);
+			}else if(i==6){
+				firstRowCell.setCellValue(firstTitleArr[1]);
+			}else if(i==11){
+				firstRowCell.setCellValue(firstTitleArr[2]);
+			}
+
+			Cell secondRowCell = secondRow.createCell(i);
+			secondRowCell.setCellValue(secondTitleArr[i]);
+		}
+
+		String projectLibraryId = (String) params.get("projectLibraryId");
+
+		QueryWrapper<ProjectLawsInventoryEO> pliQueryWrap = new QueryWrapper<>();
+		pliQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
+		List<ProjectLawsInventoryEO> pliEOList = this.projectLawsInventoryEOMapper.selectList(pliQueryWrap);
+		List<SysDictItem> sysDictItems = new ArrayList<>();
+		String pliDutyTerritoryStr = pliEOList.stream().map(ProjectLawsInventoryEO::getDutyTerritory).collect(Collectors.joining(","));
+		if (StringUtils.isNotEmpty(pliDutyTerritoryStr)) {
+			List<String> pliDutyTerritoryList = Arrays.asList(pliDutyTerritoryStr.split(",")).stream().distinct().collect(Collectors.toList());
+			sysDictItems = this.sysDictItemServiceImpl.selectItemsAll().stream().filter(sysDictItem -> {
+				boolean flag = false;
+				for (String pliDutyTerritory : pliDutyTerritoryList) {
+					if(StringUtils.equals(sysDictItem.getItemValue(),pliDutyTerritory)){
+						flag = true;
+						break;
+					}
+				}
+				return flag;
+			}).collect(Collectors.toList());
+		}
+
+		Map<String, List<SysDictItem>> firstLevelDutyTerritoryMap = this.sysDictItemServiceImpl.getFirstLevelSysDictItemByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue(),sysDictItems);
+		if(ObjectUtils.isNotEmpty(firstLevelDutyTerritoryMap)){
+			int dataIndex = 2;
+			for (Map.Entry<String, List<SysDictItem>> firstLevelMap : firstLevelDutyTerritoryMap.entrySet()) {
+				String key = firstLevelMap.getKey();
+				List<SysDictItem> dutyTerritoryList = firstLevelMap.getValue();
+				if(StringUtils.isEmpty(key) || CollectionUtils.isEmpty(dutyTerritoryList)){
+					continue;
+				}
+				List<ProjectLawsInventoryEO> pliEoList = pliEOList.stream().filter(pliEo -> {
+					boolean flag = false;
+					for (SysDictItem dutyTerritory : dutyTerritoryList) {
+						if (StringUtils.contains(pliEo.getDutyTerritory(), dutyTerritory.getItemValue())) {
+							flag = true;
+							break;
+						}
+					}
+					return flag;
+				}).collect(Collectors.toList());
+
+				this.exportRegulatoryManagementSetData(params, sheet, dataIndex ,key,pliEoList);
+				dataIndex ++;
+			}
+		}
+	}
+
+	/**
+	 * 导出法规符合性管理-设置数据
+	 * @param params
+	 * @param sheet
+	 * @param dataIndex
+	 * @param key
+	 * @param pliEoList
+	 */
+	private void exportRegulatoryManagementSetData(Map<String, Object> params, HSSFSheet sheet, int dataIndex, String key, List<ProjectLawsInventoryEO> pliEoList) {
+		Row dataRow = sheet.createRow(dataIndex);
+		dataRow.createCell(0).setCellValue(key);
+
+		Map<String, Object> taskConfirmMap= this.projectLibraryStatisticsService.getFGTaskToConfirmStatisticsGroupByTerritory(pliEoList, params);
+		Map<String,Object> taskConfirmNotStartedMap = (Map<String, Object>) taskConfirmMap.get(TaskAffirmStatusEnum.NOT_STARTED.getValue());
+		double taskConfirmNotStartedAmount = (double) taskConfirmNotStartedMap.get("amount");
+		Map<String,Object> taskConfirmToConfirmMap = (Map<String, Object>) taskConfirmMap.get(TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue());
+		double taskConfirmToConfirmAmount = (double) taskConfirmToConfirmMap.get("amount");
+		Map<String,Object> taskConfirmAcceptedMap = (Map<String, Object>) taskConfirmMap.get(TaskAffirmStatusEnum.ACCEPTED.getValue());
+		double taskConfirmAcceptedAmount = (double) taskConfirmAcceptedMap.get("amount");
+		Map<String,Object> taskConfirmRejectedMap = (Map<String, Object>) taskConfirmMap.get(TaskAffirmStatusEnum.REJECTED.getValue());
+		double taskConfirmRejectedAmount = (double) taskConfirmRejectedMap.get("amount");
+		dataRow.createCell(1).setCellValue(taskConfirmNotStartedAmount);
+		dataRow.createCell(2).setCellValue(taskConfirmToConfirmAmount);
+		dataRow.createCell(3).setCellValue(taskConfirmAcceptedAmount);
+		dataRow.createCell(4).setCellValue(taskConfirmRejectedAmount);
+		double taskConfirmCount = taskConfirmNotStartedAmount + taskConfirmToConfirmAmount + taskConfirmAcceptedAmount + taskConfirmRejectedAmount;
+		double taskConfirmPercentage = (taskConfirmAcceptedAmount / taskConfirmCount) * 100;
+		String taskConfirmPercentageStr = (taskConfirmPercentage != 0 && (taskConfirmCount !=0 )) ? df.format(taskConfirmPercentage) : "0";
+		dataRow.createCell(5).setCellValue(taskConfirmPercentageStr + percentSign);
+
+		Map<String, Object> designMap = this.projectLibraryStatisticsService.getDesignComplianceStatisticeGroupByTerritory(pliEoList, params);
+		Map<String,Object> designNotStartedMap = (Map<String, Object>) designMap.get(TaskAffirmStatusEnum.NOT_STARTED.getValue());
+		double designNotStartedAmount = (double) designNotStartedMap.get("amount");
+		Map<String,Object> designToConfirmMap = (Map<String, Object>) designMap.get(TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue());
+		double designToConfirmAmount = (double) designToConfirmMap.get("amount");
+		Map<String,Object> designComplianceMap = (Map<String, Object>) designMap.get(ComplianceFlowStatusEnum.CONFORMITY.getValue());
+		double designComplianceAmount = (double) designComplianceMap.get("amount");
+		Map<String,Object> designNonComplianceMap = (Map<String, Object>) designMap.get(ComplianceFlowStatusEnum.INCONFORMITY.getValue());
+		double designNonComplianceAmount = (double) designNonComplianceMap.get("amount");
+		dataRow.createCell(6).setCellValue(designNotStartedAmount);
+		dataRow.createCell(7).setCellValue(designToConfirmAmount);
+		dataRow.createCell(8).setCellValue(designComplianceAmount);
+		dataRow.createCell(9).setCellValue(designNonComplianceAmount);
+		double designCount = designNotStartedAmount + designToConfirmAmount + designComplianceAmount + designNonComplianceAmount;
+		double designPercentage = (designComplianceAmount / designCount) * 100;
+		String designPercentageStr = (designPercentage != 0 && (designCount !=0 )) ? df.format(designPercentage) : "0";
+		dataRow.createCell(10).setCellValue(designPercentageStr + percentSign);
+
+		Map<String, Object> verifyMap = this.projectLibraryStatisticsService.getVerifyComplianceStatisticeGroupByTerritory(pliEoList, params);
+		Map<String,Object> verifyNotStartedMap = (Map<String, Object>) verifyMap.get(TaskAffirmStatusEnum.NOT_STARTED.getValue());
+		double verifyNotStartedAmount = (double) verifyNotStartedMap.get("amount");
+		Map<String,Object> verifyToConfirmMap = (Map<String, Object>) verifyMap.get(TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue());
+		double verifyToConfirmAmount = (double) verifyToConfirmMap.get("amount");
+		Map<String,Object> verifyComplianceMap = (Map<String, Object>) verifyMap.get(ComplianceFlowStatusEnum.CONFORMITY.getValue());
+		double verifyComplianceAmount = (double) verifyComplianceMap.get("amount");
+		Map<String,Object> verifyNonComplianceMap = (Map<String, Object>) verifyMap.get(ComplianceFlowStatusEnum.INCONFORMITY.getValue());
+		double verifyNonComplianceAmount = (double) verifyNonComplianceMap.get("amount");
+		dataRow.createCell(11).setCellValue(verifyNotStartedAmount);
+		dataRow.createCell(12).setCellValue(verifyToConfirmAmount);
+		dataRow.createCell(13).setCellValue(verifyComplianceAmount);
+		dataRow.createCell(14).setCellValue(verifyNonComplianceAmount);
+		double verifyCount = verifyNotStartedAmount + verifyToConfirmAmount + verifyComplianceAmount + verifyNonComplianceAmount;
+		double verifyPercentage = (verifyComplianceAmount / verifyCount) * 100;
+		String verifyPercentageStr = (verifyPercentage != 0 && (verifyCount !=0 )) ? df.format(verifyPercentage) : "0";
+		dataRow.createCell(15).setCellValue(verifyPercentageStr + percentSign);
+	}
+
+	/**
+	 * 导出认证活动管理
+	 * @param workbook
+	 * @param params
+	 */
+	private void exportCertificationManagement(HSSFWorkbook workbook,Map<String,Object> params){
+		String cut = (String) params.get("cut");
+		String sheetName = "认证活动管理";
+		String firstTitle = "认证任务确认," +
+				"Pre-Homo," +
+				"认证进度";
+		String secondTitle = "责任领域（一级）," +
+				"未发起,待确认,接受,拒绝,完成度," +
+				"未发起,待确认,审查通过,审查退回,完成度," +
+				"未开始,进行中,实验通过,实验失败,部件报告未上传,部件报告已上传,部件报告已入库,完成度";
+		if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+			sheetName = "Certification Activity Management";
+			firstTitle = "Authentication task confirmation," +
+					"Pre-Homo," +
+					"Certification progress";
+			secondTitle = "Area of responsibility (level 1)," +
+					"Not launched,To be confirmed,Accept,Refuse,Degree of completion," +
+					"Not launched,To be confirmed,Review of the adoption,Review return,Degree of completion," +
+					"Not started,In progress,Experiment passed,Experiment failed,Parts report not uploaded,Parts report uploaded,Parts report in stock,Degree of completion";
+		}
+		HSSFSheet sheet = workbook.createSheet(sheetName);
+
+		//合并单元格     起始行，结束行，起始列，结束列
+		CellRangeAddress region1 = new CellRangeAddress(0, 0, 1, 5);
+		sheet.addMergedRegion(region1);
+		CellRangeAddress region2 = new CellRangeAddress(0, 0, 6, 10);
+		sheet.addMergedRegion(region2);
+		CellRangeAddress region3 = new CellRangeAddress(0, 0, 11, 18);
+		sheet.addMergedRegion(region3);
+		CellRangeAddress region4 = new CellRangeAddress(0, 0, 19, 23);
+		sheet.addMergedRegion(region4);
+
+		String[] firstTitleArr = firstTitle.split(",");
+		String[] secondTitleArr = secondTitle.split(",");
+		Row firstRow = sheet.createRow(0);
+		Row secondRow = sheet.createRow(1);
+
+		CellStyle cellStyleTitle = workbook.createCellStyle();
+		cellStyleTitle.setAlignment(HorizontalAlignment.CENTER);
+		for (int i = 0; i <= 18; i++){
+			sheet.setColumnWidth(i, 3500);
+			Cell firstRowCell = firstRow.createCell(i);
+			firstRowCell.setCellStyle(cellStyleTitle);
+			if(i == 1){
+				firstRowCell.setCellValue(firstTitleArr[0]);
+			}else if(i==6){
+				firstRowCell.setCellValue(firstTitleArr[1]);
+			}else if(i==11){
+				firstRowCell.setCellValue(firstTitleArr[2]);
+			}else if(i==19){
+				firstRowCell.setCellValue(firstTitleArr[3]);
+			}
+			Cell secondRowCell = secondRow.createCell(i);
+			secondRowCell.setCellValue(secondTitleArr[i]);
+		}
+
+		String projectLibraryId = (String) params.get("projectLibraryId");
+		QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
+		pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId);
+		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.projectCertificationInventoryEOService.list(pciQueryWrap).stream().filter(pciEo -> {
+			boolean flag = false;
+			if (!StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.UNINVOLVED.getValue())) {
+				flag = true;
+			}
+			return flag;
+		}).distinct().collect(Collectors.toList());
+		String pciDutyTerritoryStr = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getDutyTerritory).collect(Collectors.joining(","));
+		List<SysDictItem> sysDictItems = new ArrayList<>();
+		if (StringUtils.isNotEmpty(pciDutyTerritoryStr)) {
+			List<String> pciDutyTerritoryList = Arrays.asList(pciDutyTerritoryStr.split(",")).stream().distinct().collect(Collectors.toList());
+			sysDictItems = this.sysDictItemServiceImpl.selectItemsAll().stream().filter(sysDictItem -> {
+				boolean flag = false;
+				for (String pliDutyTerritory : pciDutyTerritoryList) {
+					if(StringUtils.equals(sysDictItem.getItemValue(),pliDutyTerritory)){
+						flag = true;
+						break;
+					}
+				}
+				return flag;
+			}).collect(Collectors.toList());
+		}
+		Map<String, List<SysDictItem>> firstLevelDutyTerritoryMap = this.sysDictItemServiceImpl.getFirstLevelSysDictItemByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue(),sysDictItems);
+		if(ObjectUtils.isNotEmpty(firstLevelDutyTerritoryMap)){
+			int dataIndex = 2;
+			for (Map.Entry<String, List<SysDictItem>> firstLevelMap : firstLevelDutyTerritoryMap.entrySet()) {
+				String key = firstLevelMap.getKey();
+				List<SysDictItem> dutyTerritoryList = firstLevelMap.getValue();
+				if(StringUtils.isEmpty(key) || CollectionUtils.isEmpty(dutyTerritoryList)){
+					continue;
+				}
+				List<ProjectCertificationInventoryEO> pciEoList = projectCertificationInventoryEOList.stream().filter(pciEo -> {
+					boolean flag = false;
+					for (SysDictItem dutyTerritory : dutyTerritoryList) {
+						if (StringUtils.contains(pciEo.getDutyTerritory(), dutyTerritory.getItemValue())) {
+							flag = true;
+							break;
+						}
+					}
+					return flag;
+				}).collect(Collectors.toList());
+				this.exportCertificationManagementSetData(params, sheet, dataIndex, key, pciEoList);
+
+				dataIndex ++;
+			}
+		}
+	}
+
+	/**
+	 * 导出认证活动管理-设置数据
+	 * @param params
+	 * @param sheet
+	 * @param dataIndex
+	 * @param key
+	 * @param pciEoList
+	 */
+	private void exportCertificationManagementSetData(Map<String, Object> params, HSSFSheet sheet, int dataIndex, String key, List<ProjectCertificationInventoryEO> pciEoList) {
+		Row dataRow = sheet.createRow(dataIndex);
+		dataRow.createCell(0).setCellValue(key);
+
+		Map<String, Object> taskConfirmMap = this.projectLibraryStatisticsService.getRZTaskToConfirmStatisticsGroupByTerritory(pciEoList, params);
+		Map<String,Object> taskConfirmNotStartedMap = (Map<String, Object>) taskConfirmMap.get(TaskAffirmStatusEnum.NOT_STARTED.getValue());
+		double taskConfirmNotStartedAmount = (double) taskConfirmNotStartedMap.get("amount");
+		Map<String,Object> taskConfirmToConfirmMap = (Map<String, Object>) taskConfirmMap.get(TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue());
+		double taskConfirmToConfirmAmount = (double) taskConfirmToConfirmMap.get("amount");
+		Map<String,Object> taskConfirmAcceptedMap = (Map<String, Object>) taskConfirmMap.get(TaskAffirmStatusEnum.ACCEPTED.getValue());
+		double taskConfirmAcceptedAmount = (double) taskConfirmAcceptedMap.get("amount");
+		Map<String,Object> taskConfirmRejectedMap = (Map<String, Object>) taskConfirmMap.get(TaskAffirmStatusEnum.REJECTED.getValue());
+		double taskConfirmRejectedAmount = (double) taskConfirmRejectedMap.get("amount");
+		dataRow.createCell(1).setCellValue(taskConfirmNotStartedAmount);
+		dataRow.createCell(2).setCellValue(taskConfirmToConfirmAmount);
+		dataRow.createCell(3).setCellValue(taskConfirmAcceptedAmount);
+		dataRow.createCell(4).setCellValue(taskConfirmRejectedAmount);
+		double taskConfirmCount = taskConfirmNotStartedAmount + taskConfirmToConfirmAmount + taskConfirmAcceptedAmount + taskConfirmRejectedAmount;
+		double taskConfirmPercentage = (taskConfirmAcceptedAmount / taskConfirmCount) * 100;
+		String taskConfirmPercentageStr = (taskConfirmPercentage != 0 && (taskConfirmCount !=0 )) ? df.format(taskConfirmPercentage) : "0";
+		dataRow.createCell(5).setCellValue(taskConfirmPercentageStr + percentSign);
+
+		Map<String, Object> prehomoMap = this.projectLibraryStatisticsService.getPrehomoStatisticeGroupByTerritory(pciEoList, params);
+		Map<String, Object> prehomoNotStartedMap = (Map<String, Object>) prehomoMap.get(TaskAffirmStatusEnum.NOT_STARTED.getValue());
+		double prehomoNotStartedAmount = (double) prehomoNotStartedMap.get("amount");
+		Map<String, Object> prehomoToConfirmMap = (Map<String, Object>) prehomoMap.get(TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue());
+		double prehomoToConfirmAmount = (double) prehomoToConfirmMap.get("amount");
+		Map<String, Object> prehomoAcceptedMap = (Map<String, Object>) prehomoMap.get(CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue());
+		double prehomoAcceptedAmount = (double) prehomoAcceptedMap.get("amount");
+		Map<String, Object> prehomoRejectedMap = (Map<String, Object>) prehomoMap.get(CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue());
+		double prehomoRejectedAmount = (double) prehomoRejectedMap.get("amount");
+		dataRow.createCell(6).setCellValue(prehomoNotStartedAmount);
+		dataRow.createCell(7).setCellValue(prehomoToConfirmAmount);
+		dataRow.createCell(8).setCellValue(prehomoAcceptedAmount);
+		dataRow.createCell(9).setCellValue(prehomoRejectedAmount);
+		double prehomoCount = prehomoNotStartedAmount + prehomoToConfirmAmount + prehomoAcceptedAmount + prehomoRejectedAmount;
+		double prehomoPercentage = (prehomoAcceptedAmount / prehomoCount) * 100;
+		String prehomoPercentageStr = (prehomoPercentage != 0 && (prehomoCount !=0 )) ? df.format(prehomoPercentage) : "0";
+		dataRow.createCell(10).setCellValue(prehomoPercentageStr + percentSign);
+
+		Map<String, Object> certificationProgressMap = this.projectLibraryStatisticsService.getPartCertificationProgressStatisticsGroupByTerritory(pciEoList, params);
+		Map<String, Object> certificationProgressNotStartMap = (Map<String, Object>)certificationProgressMap.get(CertificationProgressEnum.NOT_START.getValue());
+		double certificationProgressNotStartAmount = (double) certificationProgressNotStartMap.get("amount");
+		Map<String, Object> certificationProgressInProgressMap = (Map<String, Object>)certificationProgressMap.get(CertificationProgressEnum.IN_PROGRESS.getValue());
+		double certificationProgressInProgressAmount = (double) certificationProgressInProgressMap.get("amount");
+		Map<String, Object> certificationProgressTestPassedMap = (Map<String, Object>)certificationProgressMap.get(CertificationProgressEnum.TEST_PASSED.getValue());
+		double certificationProgressTestPassedAmount = (double) certificationProgressTestPassedMap.get("amount");
+		Map<String, Object> certificationProgressTestFailedMap = (Map<String, Object>)certificationProgressMap.get(CertificationProgressEnum.TEST_FAILED.getValue());
+		double certificationProgressTestFailedAmount = (double) certificationProgressTestFailedMap.get("amount");
+		Map<String, Object> certificationProgressNotSubmitMap = (Map<String, Object>)certificationProgressMap.get(CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue());
+		double certificationProgressNotSubmitAmount = (double) certificationProgressNotSubmitMap.get("amount");
+		Map<String, Object> certificationProgressSubmitMap = (Map<String, Object>)certificationProgressMap.get(CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue());
+		double certificationProgressSubmitAmount = (double) certificationProgressSubmitMap.get("amount");
+		Map<String, Object> certificationProgressStoredMap = (Map<String, Object>)certificationProgressMap.get(CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue());
+		double certificationProgressStoredAmount = (double) certificationProgressStoredMap.get("amount");
+		dataRow.createCell(11).setCellValue(certificationProgressNotStartAmount);
+		dataRow.createCell(12).setCellValue(certificationProgressInProgressAmount);
+		dataRow.createCell(13).setCellValue(certificationProgressTestPassedAmount);
+		dataRow.createCell(14).setCellValue(certificationProgressTestFailedAmount);
+		dataRow.createCell(15).setCellValue(certificationProgressNotSubmitAmount);
+		dataRow.createCell(16).setCellValue(certificationProgressSubmitAmount);
+		dataRow.createCell(17).setCellValue(certificationProgressStoredAmount);
+		double certificationProgressCount = certificationProgressNotStartAmount + certificationProgressInProgressAmount
+				+ certificationProgressTestPassedAmount + certificationProgressTestFailedAmount
+				+ certificationProgressNotSubmitAmount + certificationProgressSubmitAmount
+				+ certificationProgressStoredAmount;
+		double certificationProgressPercentage = (certificationProgressTestPassedAmount / certificationProgressCount) * 100;
+		String certificationProgressPercentageStr = (certificationProgressPercentage != 0 && (certificationProgressCount !=0 )) ? df.format(certificationProgressPercentage) : "0";
+		dataRow.createCell(18).setCellValue(certificationProgressPercentageStr + percentSign);
+	}
+
+	/**
+	 * 导出认证参数收集
+	 * @param workbook
+	 * @param params
+	 */
+	private void exportParameterCollecting(HSSFWorkbook workbook, Map<String, Object> params) {
+		String cut = (String) params.get("cut");
+		String sheetName = "认证参数收集";
+		String firstTitle = "认证参数收集";
+		String secondTitle = "责任领域（一级）,未开始,收集中,已提交,已同步至上报库,完成度";
+		if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+			sheetName = "Authentication parameter collection";
+			firstTitle = "Authentication parameter collection";
+			secondTitle = "Area of responsibility (level 1),Not started,Collecting,Has submitted,Synced to the report library,Degree of completion";
+		}
+		HSSFSheet sheet = workbook.createSheet(sheetName);
+		//合并单元格     起始行，结束行，起始列，结束列
+		CellRangeAddress region1 = new CellRangeAddress(0, 0, 1, 5);
+		sheet.addMergedRegion(region1);
+
+		String[] secondTitleArr = secondTitle.split(",");
+		Row firstRow = sheet.createRow(0);
+		Row secondRow = sheet.createRow(1);
+
+		CellStyle cellStyleTitle = workbook.createCellStyle();
+		cellStyleTitle.setAlignment(HorizontalAlignment.CENTER);
+		for (int i = 0; i <= 5; i++){
+			sheet.setColumnWidth(i, 3500);
+			Cell firstRowCell = firstRow.createCell(i);
+			firstRowCell.setCellStyle(cellStyleTitle);
+			if(i == 1){
+				firstRowCell.setCellValue(firstTitle);
+			}
+
+			Cell secondRowCell = secondRow.createCell(i);
+			secondRowCell.setCellValue(secondTitleArr[i]);
+		}
+
+		String projectLibraryId = (String) params.get("projectLibraryId");
+
+		QueryWrapper<ParamsManifestEO> pmQueryWrap = new QueryWrapper<>();
+		pmQueryWrap.lambda().eq(ParamsManifestEO::getProjectId,projectLibraryId);
+		List<ParamsManifestEO> pmEoList = this.paramsManifestEOService.list(pmQueryWrap);
+		if(CollectionUtils.isNotEmpty(pmEoList)){
+			List<String> pmIdList = pmEoList.stream().map(ParamsManifestEO::getId).distinct().collect(Collectors.toList());
+			QueryWrapper<ParamsCollectManifestEO> pcmQueryWrap = new QueryWrapper<>();
+			pcmQueryWrap.lambda().in(ParamsCollectManifestEO::getParamsManifestId,pmIdList);
+			List<ParamsCollectManifestEO> pcmEoList = this.paramsCollectManifestEOService.list(pcmQueryWrap);
+			pcmEoList = pcmEoList.stream().filter(pcmEo -> !StringUtils.equals(pcmEo.getControlType(),ControlTypeEnum.Title.getValue())).collect(Collectors.toList());
+
+			List<SysDictItem> sysDictItems = new ArrayList<>();
+			String pcmDutyTerritoryStr = pcmEoList.stream().map(ParamsCollectManifestEO::getDutyTerritory).collect(Collectors.joining(","));
+			if (StringUtils.isNotEmpty(pcmDutyTerritoryStr)) {
+				List<String> pcmDutyTerritoryList = Arrays.asList(pcmDutyTerritoryStr.split(",")).stream().distinct().collect(Collectors.toList());
+				sysDictItems = this.sysDictItemServiceImpl.selectItemsAll().stream().filter(sysDictItem -> {
+					boolean flag = false;
+					for (String pcmDutyTerritory : pcmDutyTerritoryList) {
+						if(StringUtils.equals(sysDictItem.getItemValue(),pcmDutyTerritory)){
+							flag = true;
+							break;
+						}
+					}
+					return flag;
+				}).collect(Collectors.toList());
+			}
+
+			Map<String, List<SysDictItem>> firstLevelDutyTerritoryMap = this.sysDictItemServiceImpl.getFirstLevelSysDictItemByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue(),sysDictItems);
+			if(ObjectUtils.isNotEmpty(firstLevelDutyTerritoryMap)){
+				int dataIndex = 2;
+				for (Map.Entry<String, List<SysDictItem>> firstLevelMap : firstLevelDutyTerritoryMap.entrySet()) {
+					String key = firstLevelMap.getKey();
+					List<SysDictItem> dutyTerritoryList = firstLevelMap.getValue();
+					if(StringUtils.isEmpty(key) || CollectionUtils.isEmpty(dutyTerritoryList)){
+						continue;
+					}
+					List<ParamsCollectManifestEO> pcmEos = pcmEoList.stream().filter(pcmEo -> {
+						boolean flag = false;
+						for (SysDictItem dutyTerritory : dutyTerritoryList) {
+							if (StringUtils.contains(pcmEo.getDutyTerritory(), dutyTerritory.getItemValue())) {
+								flag = true;
+								break;
+							}
+						}
+						return flag;
+					}).collect(Collectors.toList());
+					if(CollectionUtils.isNotEmpty(pcmEos)){
+						this.exportParameterCollectingSetData(params, sheet, dataIndex ,key,pcmEos);
+					}
+					dataIndex ++;
+				}
+			}
+		}
+	}
+	private void exportOtaCollecting(HSSFWorkbook workbook, Map<String, Object> params) {
+		String cut = (String) params.get("cut");
+		String sheetName = "OTA状态";
+		String firstTitle = "匹配状态统计,OTA认证进度统计";
+		String secondTitle = "软件版本,待匹配,待审批,锁定,退回,未开始,进行中,实验通过,实验失败,部件报告未提交,部件报告已提交,部件报告已入库";
+		if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+			sheetName = "OTA status";
+			firstTitle = "Matching state statistics,OTA authentication progress statistics";
+			secondTitle = "Software version," +
+					"To be matched," +
+					"To be approved," +
+					"lock," +
+					"Reject,"+
+					"Not started," +
+					"Ongoing," +
+					"Test Passed," +
+					"Test Failed," +
+					"Component report not submitted," +
+					"Component report submitted," +
+					"Component report has been stored";
+		}
+		HSSFSheet sheet = workbook.createSheet(sheetName);
+		//合并单元格     起始行，结束行，起始列，结束列
+		CellRangeAddress region1 = new CellRangeAddress(0, 0, 1, 4);
+		sheet.addMergedRegion(region1);
+		CellRangeAddress region2 = new CellRangeAddress(0, 0, 5, 11);
+		sheet.addMergedRegion(region2);
+
+		String[] firstTitleArr = firstTitle.split(",");
+		String[] secondTitleArr = secondTitle.split(",");
+		Row firstRow = sheet.createRow(0);
+		Row secondRow = sheet.createRow(1);
+
+		CellStyle cellStyleTitle = workbook.createCellStyle();
+		cellStyleTitle.setAlignment(HorizontalAlignment.CENTER);
+		for (int i = 0; i <= 11; i++){
+			sheet.setColumnWidth(i, 3500);
+			Cell firstRowCell = firstRow.createCell(i);
+			firstRowCell.setCellStyle(cellStyleTitle);
+			if(i == 1){
+				firstRowCell.setCellValue(firstTitleArr[0]);
+			}else if(i==5){
+				firstRowCell.setCellValue(firstTitleArr[1]);
+			}
+			Cell secondRowCell = secondRow.createCell(i);
+			secondRowCell.setCellValue(secondTitleArr[i]);
+		}
+
+		String projectLibraryId = (String) params.get("projectLibraryId");
+		List<Map<String, Object>> mapList = otaManageApplyEOService.getStatisticalStatus(projectLibraryId, null, cut,null);
+
+		if(ObjectUtils.isNotEmpty(mapList)){
+			int dataIndex = 2;
+			for (Map<String, Object> map : mapList) {
+				String plannedBpLaunchBatch = (String) map.get("plannedBpLaunchBatch");
+				Map<String, Object> matchStatusMap = (Map<String, Object>)map.get("matchStatusMap");
+				Map<String, Object> attestationScheduleMap = (Map<String, Object>)map.get("attestationScheduleMap");
+
+				String.valueOf(matchStatusMap.get("locked"));
+				String locked = String.valueOf(matchStatusMap.get("locked"));
+				String rejected = String.valueOf(matchStatusMap.get("rejected"));
+				String to_be_approved = String.valueOf(matchStatusMap.get("to_be_approved"));
+				String to_be_matched = String.valueOf(matchStatusMap.get("to_be_matched"));
+				String Component_report_has_been_stored = String.valueOf(attestationScheduleMap.get("Component_report_has_been_stored"));
+				String Component_report_not_submitted = String.valueOf(attestationScheduleMap.get("Component_report_not_submitted"));
+				String Component_report_submitted = String.valueOf(attestationScheduleMap.get("Component_report_submitted"));
+				String In_progress = String.valueOf(attestationScheduleMap.get("In_progress"));
+				String Not_start =String.valueOf(attestationScheduleMap.get("Not_start"));
+				String Test_failed = String.valueOf(attestationScheduleMap.get("Test_failed"));
+				String Test_passed = String.valueOf(attestationScheduleMap.get("Test_passed"));
+				Row dataRow = sheet.createRow(dataIndex);
+				dataRow.createCell(0).setCellValue(plannedBpLaunchBatch);
+				dataRow.createCell(1).setCellValue(to_be_matched);
+				dataRow.createCell(2).setCellValue(to_be_approved);
+				dataRow.createCell(3).setCellValue(locked);
+				dataRow.createCell(4).setCellValue(rejected);
+				dataRow.createCell(5).setCellValue(Not_start);
+				dataRow.createCell(6).setCellValue(In_progress);
+				dataRow.createCell(7).setCellValue(Test_passed);
+				dataRow.createCell(8).setCellValue(Test_failed);
+				dataRow.createCell(9).setCellValue(Component_report_not_submitted);
+				dataRow.createCell(10).setCellValue(Component_report_submitted);
+				dataRow.createCell(11).setCellValue(Component_report_has_been_stored);
+				dataIndex ++;
+			}
+		}
+	}
+
+	/**
+	 * 导出认证参数收集-设置数据
+	 * @param params
+	 * @param sheet
+	 * @param dataIndex
+	 * @param key
+	 * @param pcmEos
+	 */
+	private void exportParameterCollectingSetData(Map<String, Object> params, HSSFSheet sheet, int dataIndex, String key, List<ParamsCollectManifestEO> pcmEos) {
+		Map<String, Object> parameterCollectingMap = this.projectLibraryStatisticsService.getParameterCollectingStatisticsGroupByTerritory(pcmEos,params);
+		Map<String, Object> notStartMap = (Map<String, Object>) parameterCollectingMap.get(CollectManifestStatisticsStateEnum.NOT_START.getValue());
+		double notStartAmount = (double) notStartMap.get("amount");
+		Map<String, Object> collectingMap = (Map<String, Object>) parameterCollectingMap.get(CollectManifestStatisticsStateEnum.COLLECTING.getValue());
+		double collectingAmount = (double) collectingMap.get("amount");
+		Map<String, Object> submitMap = (Map<String, Object>) parameterCollectingMap.get(CollectManifestStatisticsStateEnum.SUBMIT.getValue());
+		double submitAmount = (double) submitMap.get("amount");
+		Map<String, Object> syncReporMap = (Map<String, Object>) parameterCollectingMap.get(CollectManifestStatisticsStateEnum.SYNC_REPORT.getValue());
+		double syncReporAmount = (double) syncReporMap.get("amount");
+
+		Row dataRow = sheet.createRow(dataIndex);
+		dataRow.createCell(0).setCellValue(key);
+		dataRow.createCell(1).setCellValue(notStartAmount);
+		dataRow.createCell(2).setCellValue(collectingAmount);
+		dataRow.createCell(3).setCellValue(submitAmount);
+		dataRow.createCell(4).setCellValue(syncReporAmount);
+		double parameterCollectingCount = notStartAmount + collectingAmount + submitAmount + syncReporAmount;
+		double completionCount = submitAmount + syncReporAmount;
+		double parameterCollectingPercentage = (completionCount / parameterCollectingCount) * 100;
+		String parameterCollectingPercentageStr = (parameterCollectingPercentage != 0 && (completionCount !=0 )) ? df.format(parameterCollectingPercentage) : "0";
+		dataRow.createCell(5).setCellValue(parameterCollectingPercentageStr + percentSign);
+	}
+
+	private JSONArray getNodeProgressList(TimeNodeVO nodeTnVo) {
+		//根据节点获取对应进度和时间
+		JSONArray nodeList = new JSONArray();
+		if(ObjectUtils.isNotEmpty(nodeTnVo)){
+			String projectId = nodeTnVo.getProjectId();
+
+			QueryWrapper<ProjectLawsInventoryEO> pliQueryWrap = new QueryWrapper<>();
+			pliQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectId);
+			List<ProjectLawsInventoryEO> pliEoList = this.projectLawsInventoryEOService.list(pliQueryWrap);
+
+			QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
+			pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectId);
+			List<ProjectCertificationInventoryEO> pciEoList = this.projectCertificationInventoryEOService.list(pciQueryWrap);
+
+			QueryWrapper<ParamsManifestEO> pmQueryWrap = new QueryWrapper<>();
+			pmQueryWrap.lambda().eq(ParamsManifestEO::getProjectId,projectId);
+			List<ParamsManifestEO> pmEoList = this.paramsManifestEOService.list(pmQueryWrap);
+			List<ParamsCollectManifestEO> pcmEoList = new ArrayList<>();
+			if(CollectionUtils.isNotEmpty(pmEoList)){
+				List<String> pmIdList = pmEoList.stream().map(ParamsManifestEO::getId).distinct().collect(Collectors.toList());
+				QueryWrapper<ParamsCollectManifestEO> pcmQueryWrap = new QueryWrapper<>();
+				pcmQueryWrap.lambda().in(ParamsCollectManifestEO::getParamsManifestId,pmIdList);
+				pcmEoList = this.paramsCollectManifestEOService.list(pcmQueryWrap);
+			}
+
+			Map<String,Object> getProgressParams = new HashMap<>();
+			getProgressParams.put("pliEoList",pliEoList);
+			getProgressParams.put("pciEoList",pciEoList);
+			getProgressParams.put("pcmEoList",pcmEoList);
+
+			if(ProjectTaskPlanningNameEnum.LEGAL_TASK_CONFIRMATION.getName().equals(nodeTnVo.getName())){
+				JSONObject preNode = new JSONObject();
+				preNode.put("nodeName", "法规任务确认");
+				preNode.put("progress", this.getProgress(nodeTnVo,HSStatisticalNodesEnum.HS_FGRWQR.getValue(),getProgressParams));
+				preNode.put("date", sdf.format(nodeTnVo.getTime()));
+				nodeList.add(preNode);
+
+				JSONObject preNode1 = new JSONObject();
+				preNode1.put("nodeName", "认证任务确认");
+				preNode1.put("progress", this.getProgress(nodeTnVo,HSStatisticalNodesEnum.HS_RZRWQR.getValue(),getProgressParams));
+				preNode1.put("date", sdf.format(nodeTnVo.getTime()));
+				nodeList.add(preNode1);
+			}else if(ProjectTaskPlanningNameEnum.DESIGN_DEADLINE.getName().equals(nodeTnVo.getName())){
+				JSONObject preNode = new JSONObject();
+				preNode.put("nodeName", "设计符合性流程");
+				preNode.put("progress", this.getProgress(nodeTnVo,HSStatisticalNodesEnum.HS_SJFHX.getValue(),getProgressParams));
+				preNode.put("date", sdf.format(nodeTnVo.getTime()));
+				nodeList.add(preNode);
+			}else if(ProjectTaskPlanningNameEnum.VERIFY_DEADLINE.getName().equals(nodeTnVo.getName())){
+				JSONObject preNode = new JSONObject();
+				preNode.put("nodeName", "验证符合性流程");
+				preNode.put("progress", this.getProgress(nodeTnVo,HSStatisticalNodesEnum.HS_YZFHX.getValue(),getProgressParams));
+				preNode.put("date", sdf.format(nodeTnVo.getTime()));
+				nodeList.add(preNode);
+			}else if(ProjectTaskPlanningNameEnum.ATTESTATION_START_TIME.getName().equals(nodeTnVo.getName())){
+				JSONObject preNode = new JSONObject();
+				preNode.put("nodeName", "Pre-Homo流程");
+				preNode.put("progress", this.getProgress(nodeTnVo,HSStatisticalNodesEnum.HS_PRE_HOMO.getValue(),getProgressParams));
+				preNode.put("date", sdf.format(nodeTnVo.getTime()));
+				nodeList.add(preNode);
+
+				JSONObject preNode1 = new JSONObject();
+				preNode1.put("nodeName", "参数收集进度");
+				preNode1.put("progress", this.getProgress(nodeTnVo,HSStatisticalNodesEnum.HS_CSSJJD.getValue(),getProgressParams));
+				preNode1.put("date", sdf.format(nodeTnVo.getTime()));
+				nodeList.add(preNode1);
+			}else if(ProjectTaskPlanningNameEnum.ATTESTATION_END_TIME.getName().equals(nodeTnVo.getName())){
+				JSONObject preNode = new JSONObject();
+				preNode.put("nodeName", "认证进度");
+				preNode.put("progress", this.getProgress(nodeTnVo,HSStatisticalNodesEnum.HS_RZJD.getValue(),getProgressParams));
+				preNode.put("date", sdf.format(nodeTnVo.getTime()));
+				nodeList.add(preNode);
+			}
+		}
+		return nodeList;
+	}
+
+	private JSONArray getNodeList(TimeNodeVO nodeTnVo) {
+		//根据节点获取对应进度和时间
+		JSONArray nodeList = new JSONArray();
+		if(ObjectUtils.isNotEmpty(nodeTnVo)){
+			String projectId = nodeTnVo.getProjectId();
+
+			QueryWrapper<ProjectLawsInventoryEO> pliQueryWrap = new QueryWrapper<>();
+			pliQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectId);
+			List<ProjectLawsInventoryEO> pliEoList = this.projectLawsInventoryEOService.list(pliQueryWrap);
+
+			QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
+			pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectId);
+			List<ProjectCertificationInventoryEO> pciEoList = this.projectCertificationInventoryEOService.list(pciQueryWrap);
+
+			QueryWrapper<ParamsManifestEO> pmQueryWrap = new QueryWrapper<>();
+			pmQueryWrap.lambda().eq(ParamsManifestEO::getProjectId,projectId);
+			List<ParamsManifestEO> pmEoList = this.paramsManifestEOService.list(pmQueryWrap);
+			List<ParamsCollectManifestEO> pcmEoList = new ArrayList<>();
+			if(CollectionUtils.isNotEmpty(pmEoList)){
+				List<String> pmIdList = pmEoList.stream().map(ParamsManifestEO::getId).distinct().collect(Collectors.toList());
+				QueryWrapper<ParamsCollectManifestEO> pcmQueryWrap = new QueryWrapper<>();
+				pcmQueryWrap.lambda().in(ParamsCollectManifestEO::getParamsManifestId,pmIdList);
+				pcmEoList = this.paramsCollectManifestEOService.list(pcmQueryWrap);
+			}
+
+			Map<String,Object> getProgressParams = new HashMap<>();
+			getProgressParams.put("pliEoList",pliEoList);
+			getProgressParams.put("pciEoList",pciEoList);
+			getProgressParams.put("pcmEoList",pcmEoList);
+
+			if(ProjectTaskPlanningNameEnum.LIST_CONFIRMATION.getName().equals(nodeTnVo.getName()) || ProjectTaskPlanningNameEnum.LEGAL_TASK_CONFIRMATION.getName().equals(nodeTnVo.getName())){
+				JSONObject preNode = new JSONObject();
+				preNode.put("nodeName", "法规任务确认");
+				preNode.put("progress", this.getProgress(nodeTnVo,HSStatisticalNodesEnum.HS_FGRWQR.getValue(),getProgressParams));
+				preNode.put("date", sdf.format(nodeTnVo.getTime()));
+				nodeList.add(preNode);
+
+				JSONObject preNode1 = new JSONObject();
+				preNode1.put("nodeName", "认证任务确认");
+				preNode1.put("progress", this.getProgress(nodeTnVo,HSStatisticalNodesEnum.HS_RZRWQR.getValue(),getProgressParams));
+				preNode1.put("date", sdf.format(nodeTnVo.getTime()));
+				nodeList.add(preNode1);
+			}else if(ProjectTaskPlanningNameEnum.DESIGN_DEADLINE.getName().equals(nodeTnVo.getName())){
+				JSONObject preNode = new JSONObject();
+				preNode.put("nodeName", "设计符合性流程");
+				preNode.put("progress", this.getProgress(nodeTnVo,HSStatisticalNodesEnum.HS_SJFHX.getValue(),getProgressParams));
+				preNode.put("date", sdf.format(nodeTnVo.getTime()));
+				nodeList.add(preNode);
+			}else if(ProjectTaskPlanningNameEnum.PREHOMO_DEADLINE.getName().equals(nodeTnVo.getName()) ||ProjectTaskPlanningNameEnum.ATTESTATION_START_TIME.getName().equals(nodeTnVo.getName())){
+				JSONObject preNode = new JSONObject();
+				preNode.put("nodeName", "Pre-Homo流程");
+				preNode.put("progress", this.getProgress(nodeTnVo,HSStatisticalNodesEnum.HS_PRE_HOMO.getValue(),getProgressParams));
+				preNode.put("date", sdf.format(nodeTnVo.getTime()));
+				nodeList.add(preNode);
+
+				JSONObject preNode1 = new JSONObject();
+				preNode1.put("nodeName", "参数收集进度");
+				preNode1.put("progress", this.getProgress(nodeTnVo,HSStatisticalNodesEnum.HS_CSSJJD.getValue(),getProgressParams));
+				preNode1.put("date", sdf.format(nodeTnVo.getTime()));
+				nodeList.add(preNode1);
+			}else if(ProjectTaskPlanningNameEnum.CERTIFICATION_SUBMISSION.getName().equals(nodeTnVo.getName()) || ProjectTaskPlanningNameEnum.ATTESTATION_END_TIME.getName().equals(nodeTnVo.getName())){
+				JSONObject preNode = new JSONObject();
+				preNode.put("nodeName", "认证进度");
+				preNode.put("progress", this.getProgress(nodeTnVo,HSStatisticalNodesEnum.HS_RZJD.getValue(),getProgressParams));
+				preNode.put("date", sdf.format(nodeTnVo.getTime()));
+				nodeList.add(preNode);
+
+				JSONObject preNode1 = new JSONObject();
+				preNode1.put("nodeName", "参数收集进度");
+				preNode1.put("progress", this.getProgress(nodeTnVo,HSStatisticalNodesEnum.HS_CSSJJD.getValue(),getProgressParams));
+				preNode1.put("date", sdf.format(nodeTnVo.getTime()));
+				nodeList.add(preNode1);
+			}else if(ProjectTaskPlanningNameEnum.VERIFY_DEADLINE.getName().equals(nodeTnVo.getName())){
+				JSONObject preNode = new JSONObject();
+				preNode.put("nodeName", "验证符合性流程");
+				preNode.put("progress", this.getProgress(nodeTnVo,HSStatisticalNodesEnum.HS_YZFHX.getValue(),getProgressParams));
+				preNode.put("date", sdf.format(nodeTnVo.getTime()));
+				nodeList.add(preNode);
+			}
+		}
+		return nodeList;
+	}
+
+	public String getProgress(TimeNodeVO nodeTnVo,String statisticalNode,Map<String,Object> params){
+		DecimalFormat df = new DecimalFormat("#.00");
+		double result = 0;
+		List<ProjectLawsInventoryEO> pliEoList = (List<ProjectLawsInventoryEO>) params.get("pliEoList");
+		List<ProjectCertificationInventoryEO> pciEoList = (List<ProjectCertificationInventoryEO>) params.get("pciEoList");
+		List<ParamsCollectManifestEO> pcmEoList = (List<ParamsCollectManifestEO>) params.get("pcmEoList");
+
+		if (StringUtils.equals(statisticalNode,HSStatisticalNodesEnum.HS_FGRWQR.getValue())) {
+			int count = pliEoList.size() * 2;
+			if (count > 0) {
+				double designCompleteCount = (double) pliEoList.stream().filter(pliEo -> {
+					boolean flag = (
+							StringUtils.equals(pliEo.getDesignFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+									|| StringUtils.equals(pliEo.getDesignFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
+									|| StringUtils.equals(pliEo.getDesignFlowStatus(), ComplianceFlowStatusEnum.CONFORMITY.getValue())
+									|| StringUtils.equals(pliEo.getDesignFlowStatus(), ComplianceFlowStatusEnum.INCONFORMITY.getValue())
+									|| StringUtils.equals(pliEo.getDesignFlowStatus(), ComplianceFlowStatusEnum.TO_TRACK.getValue())
+									|| StringUtils.equals(pliEo.getDesignFlowStatus(), ComplianceFlowStatusEnum.UNINVOLVED.getValue())
+									|| StringUtils.equals(pliEo.getDesignFlowStatus(), ComplianceFlowStatusEnum.TERMINATION_OF_TASK.getValue())
+					);
+					return flag;
+				}).count();
+
+				double verifyCompleteCount = (double) pliEoList.stream().filter(pliEo -> {
+					boolean flag = (
+							StringUtils.equals(pliEo.getVerifyFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+									|| StringUtils.equals(pliEo.getVerifyFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
+									|| StringUtils.equals(pliEo.getVerifyFlowStatus(), ComplianceFlowStatusEnum.CONFORMITY.getValue())
+									|| StringUtils.equals(pliEo.getVerifyFlowStatus(), ComplianceFlowStatusEnum.INCONFORMITY.getValue())
+									|| StringUtils.equals(pliEo.getVerifyFlowStatus(), ComplianceFlowStatusEnum.TO_TRACK.getValue())
+									|| StringUtils.equals(pliEo.getVerifyFlowStatus(), ComplianceFlowStatusEnum.UNINVOLVED.getValue())
+									|| StringUtils.equals(pliEo.getVerifyFlowStatus(), ComplianceFlowStatusEnum.TERMINATION_OF_TASK.getValue())
+					);
+					return flag;
+				}).count();
+
+				result = ((designCompleteCount + verifyCompleteCount) / count) * 100;
+			}
+		} else if  (StringUtils.equals(statisticalNode,HSStatisticalNodesEnum.HS_RZRWQR.getValue())) {
+			int count = pciEoList.size();
+			if (count > 0) {
+				double completeCount = (double) pciEoList.stream().filter(pciEo -> {
+					boolean flag = (
+							StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+									|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
+									|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue())
+									|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())
+									|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.UNINVOLVED.getValue())
+					);
+					return flag;
+				}).count();
+
+				result = (completeCount / count) * 100;
+			}
+		} else if  (StringUtils.equals(statisticalNode,HSStatisticalNodesEnum.HS_SJFHX.getValue())) {
+			int count = pliEoList.size();
+			if (count > 0) {
+				double completeCount = (double) pliEoList.stream().filter(pliEo -> {
+					boolean flag = (
+							StringUtils.equals(pliEo.getDesignFlowStatus(), ComplianceFlowStatusEnum.CONFORMITY.getValue())
+									|| StringUtils.equals(pliEo.getDesignFlowStatus(), ComplianceFlowStatusEnum.UNINVOLVED.getValue())
+					);
+					return flag;
+				}).count();
+
+				result = (completeCount / count) * 100;
+			}
+		} else if  (StringUtils.equals(statisticalNode,HSStatisticalNodesEnum.HS_PRE_HOMO.getValue())) {
+			int count = pciEoList.size();
+			if (count > 0) {
+				double completeCount = (double) pciEoList.stream().filter(pciEo -> {
+					boolean flag = (
+							StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue())
+									|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.UNINVOLVED.getValue())
+					);
+					return flag;
+				}).count();
+
+				result = (completeCount / count) * 100;
+			}
+		} else if  (StringUtils.equals(statisticalNode,HSStatisticalNodesEnum.HS_RZJD.getValue())) {
+			// 认证清单认证进度为 实验通过的是完成。
+			int count = pciEoList.size();
+			if (count > 0) {
+				double completeCount = (double)pciEoList.stream().filter(pciEo -> {
+					boolean flag = (
+							StringUtils.equals(pciEo.getCertificationProgress(),CertificationProgressEnum.TEST_PASSED.getValue())
+					);
+					return flag;
+				}).count();
+
+				result = (completeCount / count) * 100;
+			}
+		} else if  (StringUtils.equals(statisticalNode,HSStatisticalNodesEnum.HS_YZFHX.getValue())) {
+			int count = pliEoList.size();
+			if (count > 0) {
+				double completeCount = (double) pliEoList.stream().filter(pliEo -> {
+					boolean flag = (
+							StringUtils.equals(pliEo.getVerifyFlowStatus(), ComplianceFlowStatusEnum.CONFORMITY.getValue())
+									|| StringUtils.equals(pliEo.getVerifyFlowStatus(), ComplianceFlowStatusEnum.UNINVOLVED.getValue())
+					);
+					return flag;
+				}).count();
+
+				result = (completeCount / count) * 100;
+			}
+		} else if  (StringUtils.equals(statisticalNode,HSStatisticalNodesEnum.HS_CSSJJD.getValue())) {
+			if(CollectionUtils.isNotEmpty(pcmEoList)){
+				int count = pcmEoList.size();
+				double completeCount = (double) pcmEoList.stream().filter(pcmEo -> {
+					boolean flag = (
+							StringUtils.equals(pcmEo.getState(), CollectManifestStateEnum.SUBMIT.getValue())
+									|| StringUtils.equals(pcmEo.getState(),CollectManifestStateEnum.SYNC_REPORT.getValue())
+					);
+					return flag;
+				}).count();
+
+				result = (completeCount / count) * 100;
+			}
+		}
+
+		return result != 0 ? df.format(result) : "0";
+	}
+
+
+	@Override
+	public List<ProjectLibraryBase> queryList(List<String> projectIdList) {
+		QueryWrapper<ProjectLibraryBase> queryWrapper = new QueryWrapper<>();
+		queryWrapper.in("id",projectIdList);
+		List<ProjectLibraryBase> res = this.list(queryWrapper);
+		return res;
+	}
+
+	@Override
+	public List<ProjectLibraryBase> getListByIds(List<String> projectIdList) {
+		List<ProjectLibraryBase> res = new ArrayList<>();
+		if(CollectionUtils.isNotEmpty(projectIdList)){
+			res = this.getBaseMapper().getListByIds(projectIdList);
+		}
+		return res;
+	}
+}
+
+

From d092e00267459b6531f6c1239bc5b4d5402a92f8 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 13 Sep 2023 10:52:29 +0800
Subject: [PATCH 005/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=20=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificationList/components/addModel.vue |  88 ++---
 .../components/certificationList/index.vue    | 157 ++------
 .../components/listOfRegulations.vue          |  28 +-
 .../components/transferListRxswin.vue         | 233 -----------
 .../components/transferListvirtalRxswin.vue   | 370 ------------------
 5 files changed, 79 insertions(+), 797 deletions(-)
 delete mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferListRxswin.vue
 delete mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferListvirtalRxswin.vue

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
index b47e38a8d..09fc9060d 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
@@ -196,28 +196,28 @@
                                        :prop="'dataList.'+index+'.dutyTerritory'"
                                        :rules="[{ required: true, message: $t('areaOfResponsibility') + $t('cannotEmpty'), trigger: 'change'},]"
                     >
-                      <a-select :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                class="box-input"
-                                optionFilterProp="label"
-                                mode="multiple"
-                                @change="dutyHandleChange(index)"
-                                :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                                v-model="item.dutyTerritory">
-                        <a-select-option v-for="(val, key) in item.dutyTerritoryList"
-                                         :key="key"
-                                         :label="val.itemText"
-                                         :value="val.itemValue">
-                               <span style="display: inline-block;width: 100%" :title=" val.itemText ">
-                                     {{ val.itemText }}
-                               </span>
-                        </a-select-option>
-                      </a-select>
-                      <!--                      <j-dict-select-tag class="box-input" v-model="item.dutyTerritory"-->
-                      <!--                                         @input="handleInput('dataList.'+index+'.dutyTerritory')"-->
-                      <!--                                         @changeQuery="dutyHandleChange(index)"-->
-                      <!--                                         :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
-                      <!--                                         :type="'select'"-->
-                      <!--                                         :triggerChange="false" :dictCode="'duty_territory'"/>-->
+<!--                      <a-select :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
+<!--                                class="box-input"-->
+<!--                                optionFilterProp="label"-->
+<!--                                mode="multiple"-->
+<!--                                @change="dutyHandleChange(index)"-->
+<!--                                :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+<!--                                v-model="item.dutyTerritory">-->
+<!--                        <a-select-option v-for="(val, key) in item.dutyTerritoryList"-->
+<!--                                         :key="key"-->
+<!--                                         :label="val.itemText"-->
+<!--                                         :value="val.itemValue">-->
+<!--                               <span style="display: inline-block;width: 100%" :title=" val.itemText ">-->
+<!--                                     {{ val.itemText }}-->
+<!--                               </span>-->
+<!--                        </a-select-option>-->
+<!--                      </a-select>-->
+                      <j-dict-select-tag class="box-input" v-model="item.dutyTerritory"
+                                         @input="handleInput('dataList.'+index+'.dutyTerritory')"
+                                         @changeQuery="dutyHandleChange(index)"
+                                         :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                         :type="'select'"
+                                         :triggerChange="false" :dictCode="'duty_territory'"/>
                     </a-form-model-item>
                   </div>
                 </a-col>
@@ -460,28 +460,28 @@
                   <a-form-model-item class="itemModel-multi"
                                      :prop="'dutyTerritory'"
                   >
-                    <a-select :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                              class="box-input"
-                              optionFilterProp="label"
-                              mode="multiple"
-                              @change="handleChange"
-                              :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                              v-model="formInline.dutyTerritory">
-                      <a-select-option v-for="(item, key) in dutyTerritoryList"
-                                       :key="key"
-                                       :label="item.itemText"
-                                       :value="item.itemValue">
-                               <span style="display: inline-block;width: 100%" :title=" item.itemText ">
-                                     {{ item.itemText }}
-                               </span>
-                      </a-select-option>
-                    </a-select>
-<!--                    <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"-->
-<!--                                       @input="handleInput('dutyTerritory')"-->
-<!--                                       @changeQuery="handleChange"-->
-<!--                                       :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
-<!--                                       :type="'select'"-->
-<!--                                       :triggerChange="false" :dictCode="'duty_territory'"/>-->
+<!--                    <a-select :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
+<!--                              class="box-input"-->
+<!--                              optionFilterProp="label"-->
+<!--                              mode="multiple"-->
+<!--                              @change="handleChange"-->
+<!--                              :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+<!--                              v-model="formInline.dutyTerritory">-->
+<!--                      <a-select-option v-for="(item, key) in dutyTerritoryList"-->
+<!--                                       :key="key"-->
+<!--                                       :label="item.itemText"-->
+<!--                                       :value="item.itemValue">-->
+<!--                               <span style="display: inline-block;width: 100%" :title=" item.itemText ">-->
+<!--                                     {{ item.itemText }}-->
+<!--                               </span>-->
+<!--                      </a-select-option>-->
+<!--                    </a-select>-->
+                    <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
+                                       @input="handleInput('dutyTerritory')"
+                                       @changeQuery="handleChange"
+                                       :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                       :type="'select'"
+                                       :triggerChange="false" :dictCode="'duty_territory'"/>
                   </a-form-model-item>
                 </div>
               </a-col>
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
index 496f75338..7378538fb 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
@@ -110,7 +110,7 @@
         </div>
 
         <!--        保存-->
-        <div @click="preservationClick(1)" v-if="roleSwitchingCode == 2 || roleSwitchingCode == 0"
+        <div @click="preservationClick(1)" v-if="roleSwitchingCode == 2 || roleSwitchingCode == 1"
              class="operator-text">
           <a-icon type="check-circle"/>
           {{ $t('preservation') }}
@@ -123,7 +123,7 @@
         </div>
 
         <!--        批量设置-->
-        <div @click="BatchSettingClick($t('BatchSetting'))" v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
+        <div @click="BatchSettingClick($t('BatchSetting'))" v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2"
              class="operator-text">
           <a-icon type="setting"/>
           {{ $t('BatchSetting') }}
@@ -136,13 +136,6 @@
           <a-icon type="profile"/>
           {{ $t('CertificationDirectory') }}
         </div>
-        <!--        带入相关人员-->
-        <div @click="bringInRelevantPersonnelClick"
-             v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
-             class="operator-text">
-          <a-icon type="user"/>
-          {{ $t('bringInRelevantPersonnel') }}
-        </div>
         <!--        修改配置-->
         <div @click="BatchSettingClick($t('changeSetting'))" v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21"
              class="operator-text">
@@ -168,21 +161,21 @@
             <div>
               <!--              添加-->
               <div @click="handleAdd"
-                   v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
+                   v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2"
                    class="operator-text-title">
                 <a-icon type="plus"/>
                 {{ $t('add') }}
               </div>
               <!--              添加配置-->
               <div @click="addConfigurationClick"
-                   v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
+                   v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2"
                    class="operator-text-title">
                 <a-icon type="plus"/>
                 {{ $t('addConfiguration') }}
               </div>
               <!--              模板下载-->
               <div @click="handleModule"
-                   v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
+                   v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2"
                    class="operator-text-title">
                 <a-icon type="download"/>
                 {{ $t('templateDownload') }}
@@ -190,21 +183,21 @@
 
               <!--              导出-->
               <div @click="handleExport"
-                   v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2 || roleSwitchingCode == 20 || roleSwitchingCode == 21"
+                   v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2 || roleSwitchingCode == 20 || roleSwitchingCode == 21"
                    class="operator-text-title">
                 <a-icon type="export" :rotate="-90"/>
                 {{ $t('export') }}
               </div>
 
               <!--              导入-->
-              <div class="operator-text-title" v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2">
+              <div class="operator-text-title" v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2">
                 <ImportFile :url="url" :projectLibraryId=$route.query.id :isTrue="true" :accept="'.zip'"
                             @getList="getPersonnelList"/>
               </div>
 
               <!--              批量删除-->
               <div @click="handleDel"
-                   v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
+                   v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2"
                    class="operator-text-title">
                 <a-icon type="delete"/>
                 {{ $t('BatchDelete') }}
@@ -212,7 +205,7 @@
 
               <!--              流程重置-->
               <div @click="processResetClick"
-                   v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
+                   v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2"
                    class="operator-text-title">
                 <a-icon type="file-search"/>
                 {{ $t('processReset') }}
@@ -220,21 +213,15 @@
             </div>
           </template>
           <div class="operator-text" style="position: relative"
-               v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2">
+               v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2">
             <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
           </div>
         </a-popconfirm>
       </div>
       <div style="margin-top: 1px;float:right;">
 
-        <!--        发布-->
-        <div @click="releaseClick" v-if="roleSwitchingCode == 0" class="operator-text">
-          <a-icon type="check-circle"/>
-          {{ $t('release') }}
-        </div>
-
         <!--        撤回-->
-        <div @click="withdrawClick" v-if="roleSwitchingCode == 0" class="operator-text">
+        <div @click="withdrawClick" v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2" class="operator-text">
           <a-icon type="rollback"/>
           {{ $t('withdraw') }}
         </div>
@@ -305,7 +292,7 @@
         </div>
 
         <!--        催办-->
-        <div @click="questionClick" v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2 || roleSwitchingCode == 20"
+        <div @click="questionClick" v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2 || roleSwitchingCode == 20"
              class="operator-text">
           <a-icon type="sound"/>
           {{ $t('question') }}
@@ -334,7 +321,7 @@
         </span>
         <span slot="operation" slot-scope="text,record">
               <a class="text-operation"
-                 v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
+                 v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2"
                  @click="edit(record)">
                 {{ $t('edit') }}
               </a>
@@ -343,7 +330,7 @@
                 {{ $t('history') }}
               </a>
               <a class="text-operation"
-                 v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
+                 v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2"
                  @click="deleteLib(record)">
                 {{ $t('deleteLib') }}
               </a>
@@ -400,7 +387,7 @@
         </span>
         <span slot="reportNo" slot-scope="text,record">
                   <a-input class="box-input-index"
-                           v-if="roleSwitchingCode == 2 || roleSwitchingCode == 0"
+                           v-if="roleSwitchingCode == 2 || roleSwitchingCode == 1"
                            :maxLength="200"
                            onkeyup="this.value=this.value.replace(/(^\s+)|(\s+$)/g, '')"
                            v-model.trim="record.reportNumber"
@@ -409,7 +396,7 @@
         </span>
         <span slot="productModel" slot-scope="text,record">
                   <a-input class="box-input-index"
-                           v-if="roleSwitchingCode == 2 || roleSwitchingCode == 0"
+                           v-if="roleSwitchingCode == 2 || roleSwitchingCode == 1"
                            :maxLength="200"
                            onkeyup="this.value=this.value.replace(/(^\s+)|(\s+$)/g, '')"
                            v-model.trim="record.productModel"
@@ -418,22 +405,13 @@
         </span>
         <span slot="nameOfManufacturer" slot-scope="text,record">
                   <a-input class="box-input-index"
-                           v-if="roleSwitchingCode == 2 || roleSwitchingCode == 0"
+                           v-if="roleSwitchingCode == 2 || roleSwitchingCode == 1"
                            :maxLength="200"
                            onkeyup="this.value=this.value.replace(/(^\s+)|(\s+$)/g, '')"
                            v-model.trim="record.productionEnterpriseName"
                            :placeholder="$t('PleaseEnter')+$t('nameOfManufacturer')"/>
                   <span v-else>{{text}}</span>
         </span>
-        <div slot="CertificationProgress" slot-scope="text,result">
-             <span class="box-content-Progress box-content-cou"
-                   :style="{'width':long=='zh-cn'?'116px' : '148px'}"
-                   :class="CertificationColor[result.certificationProgress]"
-                   @click="CertificationProgressClick(result)"
-             >
-              {{result.certificationProgress_dictText ? result.certificationProgress_dictText : $t('toBeStarted')}}
-             </span>
-        </div>
         <span slot="deliverableTemplate" slot-scope="text,result">
                 <span class="viewFile"
                       @click="viewFileClick(result.deliverableTemplate)"
@@ -842,15 +820,6 @@
             ellipsis: true,
             scopedSlots: { customRender: 'nameOfManufacturer' }
           },
-          {
-            title: this.$t('CertificationProgress'),
-            align: 'left',
-            dataIndex: 'certificationProgress',
-            sorter: true,
-            width: localStorage.getItem('language') == 'zh-cn' ? 180 : 200,
-            ellipsis: true,
-            scopedSlots: { customRender: 'CertificationProgress' }
-          },
           {
             title: this.$t('operation'),
             align: 'left',
@@ -914,10 +883,10 @@
               columns.splice(i, 1)
               i--
             }
-            if (columns[i].title == this.$t('CertificationProgress')) {
-              columns.splice(i, 1)
-              i--
-            }
+            // if (columns[i].title == this.$t('CertificationProgress')) {
+            //   columns.splice(i, 1)
+            //   i--
+            // }
           }
         }
         return columns
@@ -1011,7 +980,7 @@
       },
       onChange(page, pageSize) {
         this.pageNo = page
-        if (this.roleSwitchingCode == 2 || this.roleSwitchingCode == 0) {
+        if (this.roleSwitchingCode == 2 || this.roleSwitchingCode == 1) {
           this.preservationClick()
         }
         this.getList()
@@ -1019,7 +988,7 @@
       SizeChange(page, pageSize) {
         this.pageNo = 1
         this.pageSize = pageSize
-        if (this.roleSwitchingCode == 2 || this.roleSwitchingCode == 0) {
+        if (this.roleSwitchingCode == 2 || this.roleSwitchingCode == 1) {
           this.preservationClick()
         }
         this.getList()
@@ -1094,6 +1063,8 @@
               return
             }
             this.dataSource = res.result.records || []
+            // this.selectedRowKeys = this.dataSource.map(item => item.id)
+            // console.log(this.selectedRowKeys)
             this.dataSource.forEach(value => {
               if (value.flowStatusName == '清单待校核') {
                 value.flowStatusName = '任务待发起'
@@ -1263,52 +1234,6 @@
       dateChange(item) {
         this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
       },
-      releaseClick() {
-        // this.listTitle = this.$t('Deadline')
-        // if (this.selectedRowKeysList.length < 1) {
-        //   this.$message.warning(this.$t('selectLeastOne'))
-        // } else {
-        //   this.visible = true
-        // }
-        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-          let ids = []
-          let notConditions = []
-          for (let i = 0; i < this.selectedRowKeysList.length; i++) {
-            if ((this.selectedRowKeysList[i].flowStatus == 'List to be released' &&
-              this.selectedRowKeysList[i].deliverableType == '1635545748968783874') ||
-              (this.selectedRowKeysList[i].flowStatus == 'Certification returned' &&
-                this.selectedRowKeysList[i].deliverableType == '1635545748968783874')) {
-              ids.push(this.selectedRowKeysList[i].id)
-            } else if ((this.selectedRowKeysList[i].flowStatus == 'List to be released' &&
-              this.selectedRowKeysList[i].endTime) ||
-              (this.selectedRowKeysList[i].flowStatus == 'Certification returned' &&
-                this.selectedRowKeysList[i].endTime)) {
-              ids.push(this.selectedRowKeysList[i].id)
-            } else {
-              notConditions.push(this.selectedRowKeysList[i].inspectionItem)
-            }
-          }
-          let data = ''
-          if (notConditions && notConditions.length > 0) {
-            data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataListReleasedAndCertificationReturnCanSelected')
-          }
-          if (ids && ids.length > 0) {
-            // this.releaseData(ids, notConditions, data)
-            let query = {
-              ids: ids,
-              notConditions: notConditions,
-              data: data,
-              dutyDueDate: 'inventoryVerifyEndTime',
-              title: this.$t('release')
-            }
-            this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)))
-          } else {
-            this.failedMessage(data)
-          }
-        } else {
-          this.$message.warning(this.$t('selectLeastOne'))
-        }
-      },
       deadlineDataForm(val, formInline) {
         if (val.title == this.$t('release')) {
           this.releaseData(val.ids, val.notConditions, val.data, formInline)
@@ -1466,7 +1391,7 @@
           let ids = []
           let notConditions = []
           let data = ''
-          if (this.roleSwitchingCode == 0) {
+          if (this.roleSwitchingCode == 1 || this.roleSwitchingCode == 2) {
             for (let i = 0; i < this.selectedRowKeysList.length; i++) {
               if (this.selectedRowKeysList[i].flowStatus == 'List to be checked' ||
                 this.selectedRowKeysList[i].flowStatus == 'Certification returned' ||
@@ -1856,11 +1781,6 @@
       deliveryChange() {
         this.preservationClick()
       },
-      CertificationProgressClick(val) {
-        let item = JSON.parse(JSON.stringify(val))
-        item.roleCode = this.roleSwitchingCode
-        this.$refs.TaskListModelRef.getData(item, this.$t('CertificationProgress'))
-      },
       //发起流程
       initiatingProcessClick(value, prompt) {
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
@@ -2283,31 +2203,6 @@
           this.$message.warning(this.$t('selectLeastOne'))
         }
       },
-      bringInRelevantPersonnelClick(){
-        let _this = this
-        // if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-          this.$confirm({
-            content: _this.$t('confirmBringInRelevantPersonnel'),
-            onOk() {
-              // let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
-              postAction('/project/projectCertificationInventoryEO/matchRelevantPeople', {
-                // ids: selectedRowKeys.join(','),
-                projectLibraryId: _this.$route.query.id
-              }).then((res) => {
-                if (res.success) {
-                  _this.$message.success(_this.$t('OperationSuccessful'))
-                  _this.selectedRowKeys = []
-                  _this.getList()
-                } else {
-                  _this.$message.warning(_this.$t('operationFailed'))
-                }
-              })
-            }
-          })
-        // } else {
-        //   this.$message.warning(this.$t('selectLeastOne'))
-        // }
-      },
     }
   }
 </script>
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
index 8ad6ad738..0ea88a2d0 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
@@ -1,3 +1,4 @@
+<!--平台件-->
 <template>
   <a-card :bordered="false">
     <!--    <div class="header-text">-->
@@ -133,18 +134,13 @@
         <!--          重置流程（数据迁移）-->
         <!--        </div>-->
         <!--        调取-->
-        <div @click="transferClick" class="operator-text" v-if="this.roleSwitchingCode == '0'">
+        <div @click="transferClick" class="operator-text" v-if="this.roleSwitchingCode == '1' || this.roleSwitchingCode == '2'">
           <a-icon type="profile"/>
           {{ $t('Transfer') }}
         </div>
-        <!--        带入相关人员-->
-        <div class="operator-text" @click="bringInRelevantPersonnelClick" v-if="this.roleSwitchingCode == '0'">
-          <a-icon type="user"/>
-          {{ $t('bringInRelevantPersonnel') }}
-        </div>
         <!--        批量设置-->
         <div class="operator-text" @click="batSettingClick"
-             v-if="this.roleSwitchingCode == '0' || this.roleSwitchingCode == '1'">
+             v-if="this.roleSwitchingCode == '2' || this.roleSwitchingCode == '1'">
           <a-icon type="setting"/>
           {{ $t('BatchSetting') }}
         </div>
@@ -199,7 +195,7 @@
           {{ $t('toResubmit') }}
         </div>
         <!--        更多-->
-        <a-popconfirm overlayClassName="popconfirm" placement="bottomRight" v-if="this.roleSwitchingCode == '0'">
+        <a-popconfirm overlayClassName="popconfirm" placement="bottomRight" v-if="this.roleSwitchingCode == '2' || this.roleSwitchingCode == '1'">
           <template slot="title" id="popconfirm">
             <div>
               <!--              添加-->
@@ -279,14 +275,8 @@
           <a-icon type="export" :rotate="-90"/>
           {{ $t('export') }}
         </div>
-        <!--        发布-->
-        <div class="operator-text" @click="initiateListConfirmationcClick('清单')"
-             v-if="this.roleSwitchingCode == '0'">
-          <a-icon type="solution"/>
-          {{ $t('release') }}
-        </div>
         <!--        撤回-->
-        <div class="operator-text" @click="withdrawnClick" v-if="this.roleSwitchingCode == '0'">
+        <div class="operator-text" @click="withdrawnClick" v-if="this.roleSwitchingCode == '2' || this.roleSwitchingCode == '1'">
           <a-icon type="rollback"/>
           {{ $t('withdraw') }}
         </div>
@@ -302,7 +292,7 @@
         </div>
         <!--        催办-->
         <div class="operator-text" @click="questionClick"
-             v-if="this.roleSwitchingCode == '0' || this.roleSwitchingCode == '1' || this.roleSwitchingCode == '30'">
+             v-if="this.roleSwitchingCode == '2' || this.roleSwitchingCode == '1' || this.roleSwitchingCode == '30'">
           <a-icon type="sound"/>
           {{ $t('question') }}
         </div>
@@ -324,7 +314,7 @@
       >
         <span slot="operation" slot-scope="text,record">
               <a class="text-operation"
-                 v-if="roleSwitchingCode == 0 || roleSwitchingCode == 1"
+                 v-if="roleSwitchingCode == 2 || roleSwitchingCode == 1"
                  @click="edit(record)">
                 {{ $t('edit') }}
               </a>
@@ -334,7 +324,7 @@
           <!--                {{ $t('view') }}-->
           <!--              </a>-->
                         <a class="text-operation"
-                           v-if="roleSwitchingCode == 0"
+                           v-if="roleSwitchingCode == 2 || roleSwitchingCode == 1"
                            @click="deleteLib(record)">
                           {{ $t('deleteLib') }}
                         </a>
@@ -1566,7 +1556,7 @@
       },
       columns() {
         let columnResult = JSON.parse(JSON.stringify(this.columnsAll))
-        if (this.roleSwitchingCode == 0 || this.roleSwitchingCode == 1) {
+        if (this.roleSwitchingCode == 2 || this.roleSwitchingCode == 1) {
         } else {
           for (var i = 0; i < columnResult.length; i++) {
             if (columnResult[i].title === this.$t('operation')) {
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferListRxswin.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferListRxswin.vue
deleted file mode 100644
index 06462dac8..000000000
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferListRxswin.vue
+++ /dev/null
@@ -1,233 +0,0 @@
-<template>
-  <a-drawer
-    :title="$t('Transfer')"
-    :maskClosable="false"
-    :width="1000"
-    placement="right"
-    :closable="true"
-    @close="handleCancel"
-    :visible="visible"
-    style="height: 100%;overflow: auto;padding-bottom: 53px;">
-    <div style="margin-bottom: 60px">
-      <a-table
-        :components="drag(columns,'columns')"
-        :columns="columns"
-        rowKey="id"
-        :scroll="{x: 800}"
-        :data-source="dataList"
-        :pagination="false"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' }"
-        :loading="loading">
-
-      </a-table>
-      <div class="page" v-if="dataList.length > 0">
-        <a-pagination
-          :show-total="total => $t('total')+` ${total} `+$t('strip')"
-          show-quick-jumper
-          show-size-changer
-          :page-size.sync="pageSize"
-          :total="total"
-          :current="pageNo"
-          @change="onChange"
-          @showSizeChange="SizeChange"
-        />
-      </div>
-    </div>
-
-    <div class="drawer-bootom-button">
-      <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
-      <a-button @click="handleSubmit(undefined)" type="primary" :loading="confirmLoading">{{$t('determine')}}</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-  import { getAction, postAction } from '@/api/manage'
-  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
-
-  export default {
-    name: 'transferList',
-    components: {},
-    props: ['url'],
-    mixins: [ResizeHeader, ResizeColumnProvide],
-    data() {
-      return {
-        visible: false,
-        queryParam: {},
-        confirmLoading: false,
-        selectedRowKeys: [],
-        columns: [
-          {
-            title: this.$t('projectVersion'),
-            dataIndex: 'projectName',
-            align: 'left',
-            ellipsis: true,
-            width: 235
-          },
-          {
-            title: this.$t('Listcreationtime'),
-            dataIndex: 'createTime',
-            align: 'left',
-            ellipsis: true,
-          },
-        ],
-        dataList: [],
-        content: [],
-        loading: false,
-        pageNo: 1,
-        pageSize: 10,
-        total: 0
-      }
-    },
-    mounted() {
-
-    },
-    methods: {
-      transferModel() {
-        this.visible = true
-        this.queryParam = {}
-        this.selectedRowKeys = []
-        this.replacePage()
-      },
-      searchQuery() {
-        this.pageNo = 1
-        this.replacePage()
-      },
-      searchReset() {
-        this.pageNo = 1
-        this.queryParam = {}
-        this.replacePage()
-      },
-      onChange(page, pageSize) {
-        this.pageNo = page
-        this.replacePage()
-      },
-      SizeChange(page, pageSize) {
-        this.pageNo = 1
-        this.pageSize = pageSize
-        this.replacePage()
-      },
-      replacePage() {
-        let query = {
-          projectId: this.$route.query.id,
-          pageNo: this.pageNo,
-          pageSize: this.pageSize,
-          ...this.queryParam
-        }
-        this.loading = true
-        getAction('/project/projectRxswinEO/getOnePage', query).then((res) => {
-          if (res.success) {
-            this.dataList = res.result.records || []
-            this.total = res.result.total
-            this.loading = false
-          } else {
-            this.loading = false
-          }
-        })
-      },
-      onSelectChange(value) {
-        this.selectedRowKeys = value
-        if (this.selectedRowKeys.length > 1) {
-          this.selectedRowKeys.shift()
-        }
-      },
-      handleCancel() {
-        this.visible = false
-      },
-      handleSubmit(flag) {
-        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-          this.confirmLoading = true
-          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
-          this.confirmLoading = false
-          this.$emit('transferListForm',selectedRowKeys.join(','))
-          this.selectedRowKeys = []
-          // postAction(this.url.addModel, {
-          //   dummyInventoryBaseId: selectedRowKeys.join(','),
-          //   projectLibraryId: this.$route.query.id,
-          //   flag: flag
-          // }).then((res) => {
-          //   if (res.success) {
-          //     this.confirmLoading = false
-          //     this.$message.success(this.$t('OperationSuccessful'))
-          //     this.visible = false
-          //     this.selectedRowKeys = []
-          //     this.$emit('transferListForm')
-          //   } else {
-          //     if (res.message == '该虚拟清单的维护清单中没有数据,是否需要添加') {
-          //       this.confirmLoading = false
-          //       this.getAdd()
-          //       return
-          //     }
-          //     this.$message.warning(this.$t('operationFailed'))
-          //     this.confirmLoading = false
-          //   }
-          // })
-        } else {
-          this.$message.warning(this.$t('selectLeastOne'))
-        }
-      },
-      getAdd() {
-        let _this = this
-        this.$confirm({
-          content: _this.$t('TheDoesNotContainData'),
-          onOk() {
-            _this.handleSubmit('1')
-          }
-        })
-      }
-    }
-  }
-</script>
-
-<style scoped>
-  .page {
-    text-align: right;
-    margin-top: 20px;
-  }
-
-  .drawer-bootom-button {
-    position: absolute;
-    bottom: 0;
-    z-index: 100;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
-  }
-
-  .box-title-text {
-    line-height: 1.4;
-    display: flex;
-    align-items: center;
-    margin-bottom: 10px;
-  }
-
-  .title-text {
-    width: 20%;
-    min-width: 110px;
-    color: #000F16;
-    display: inline-block;
-    font-weight: 500;
-    font-size: 14px;
-    margin-right: 16px;
-    margin-top: 3px;
-    text-align: right;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-
-  .box-input {
-    display: inline-block;
-    width: 70%;
-    height: 38px;
-    margin-top: 2px;
-  }
-
-  .box-button {
-    height: 38px;
-  }
-</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferListvirtalRxswin.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferListvirtalRxswin.vue
deleted file mode 100644
index f3e961882..000000000
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferListvirtalRxswin.vue
+++ /dev/null
@@ -1,370 +0,0 @@
-<template>
-  <a-drawer
-    :title="$t('Transfer')"
-    :maskClosable="false"
-    :width="1100"
-    placement="right"
-    :closable="true"
-    @close="handleCancel"
-    :visible="visible"
-    style="height: 100%;overflow: auto;padding-bottom: 53px;">
-    <div style="margin-bottom: 60px">
-      <div class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="searchQuery">
-          <a-row :gutter="24">
-            <a-col :md="12" :sm="8">
-              <div class="box-title-text-search">
-                <div class="title-text-search" :title="$t('standard')">
-                  <span>{{$t('standard')}}</span>
-                </div>
-                <a-input class="box-input-search" allowClear :placeholder="$t('PleaseEnter') + $t('standard')"
-                         v-model="queryParam.serialNumber"></a-input>
-              </div>
-            </a-col>
-
-            <template v-if="toggleSearchStatus">
-              <a-col :md="12" :sm="8">
-                <div class="box-title-text-search">
-                  <div class="title-text-search" :title="$t('theme')">
-                    <span>{{$t('theme')}}</span>
-                  </div>
-                  <a-input class="box-input-search" allowClear :placeholder="$t('PleaseEnter') + $t('theme')"
-                           v-model="queryParam.theme"></a-input>
-                </div>
-              </a-col>
-              <a-col :md="12" :sm="8">
-                <div class="box-title-text-search">
-                  <div class="title-text-search" :title="'RXSWIN'">
-                    <span>RXSWIN</span>
-                  </div>
-                  <a-input class="box-input-search" allowClear :placeholder="$t('PleaseEnter') + 'RXSWIN'"
-                           v-model="queryParam.rxswin"></a-input>
-                </div>
-              </a-col>
-<!--              <a-col :md="12" :sm="8">-->
-<!--                <div class="box-title-text-search">-->
-<!--                  <div class="title-text-search" :title="$t('Correspondingversion')">-->
-<!--                    <span>{{$t('Correspondingversion')}}</span>-->
-<!--                  </div>-->
-<!--                  <a-select :placeholder="$t('PleaseSelect')+$t('Correspondingversion')"-->
-<!--                            allowClear-->
-<!--                            show-search-->
-<!--                            class="box-input-search"-->
-<!--                            optionFilterProp="label"-->
-<!--                            showSearch-->
-<!--                            :autoClearSearchValue="false"-->
-<!--                            :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
-<!--                            v-model="queryParam.version">-->
-<!--                    <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"-->
-<!--                                     :key="key"-->
-<!--                                     :label="item.key"-->
-<!--                                     :value="item.key">-->
-<!--                               <span style="display: inline-block;width: 100%" :title=" item.key ">-->
-<!--                                     {{ item.key }}-->
-<!--                               </span>-->
-<!--                    </a-select-option>-->
-<!--                  </a-select>-->
-<!--                </div>-->
-<!--              </a-col>-->
-            </template>
-            <span style="float: right;overflow: hidden;margin-right: 11px;margin-bottom: 20px"
-                  class="table-page-search-submitButtons">
-                  <a @click="handleToggleSearch">
-                            {{ !toggleSearchStatus ? $t('open') : $t('away') }}
-                            <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-                 </a>
-                  <a-button class="box-button-search" style="margin-left: 8px"
-                            @click="searchReset">{{$t('reset')}}</a-button>
-                  <a-button class="box-button-search" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
-      </span>
-          </a-row>
-        </a-form>
-      </div>
-      <a-table
-        :columns="columns"
-        rowKey="id"
-        :scroll="{x: 800,y:'calc(100vh - 330px)'}"
-        :data-source="dataList"
-        :pagination="false"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
-        :loading="loading">
-
-      </a-table>
-      <div class="page" v-if="dataList.length > 0">
-        <a-pagination
-          :show-total="total => $t('total')+` ${total} `+$t('strip')"
-          show-quick-jumper
-          show-size-changer
-          :page-size.sync="pageSize"
-          :total="total"
-          :current="pageNo"
-          @change="onChange"
-          @showSizeChange="SizeChange"
-        />
-      </div>
-    </div>
-
-    <div class="drawer-bootom-button">
-      <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
-      <a-button @click="handleSubmit(undefined)" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-import { getAction, postAction } from '@/api/manage'
-import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
-
-export default {
-  name: 'transferList',
-  components: {
-    globalAdvancedQuery
-  },
-  props: ['url'],
-  data() {
-    return {
-      toggleSearchStatus: false,
-      visible: false,
-      queryParam: {},
-      confirmLoading: false,
-      selectedRowKeys: [],
-      columns: [
-        {
-          title: this.$t('standard'),
-          align: 'left',
-          dataIndex: 'serialNumber',
-          ellipsis: true,
-          sorter:true,
-          width: 170
-        },
-        {
-          title: this.$t('theme'),
-          align: 'left',
-          dataIndex: 'theme',
-          ellipsis: true,
-          sorter:true,
-          width: 300
-        },
-        {
-          title: 'RXSWIN',
-          align: 'left',
-          dataIndex: 'rxswin',
-          ellipsis: true,
-          sorter:true,
-          width: 170
-        },
-        {
-          title: this.$t('Correspondingversion'),
-          align: 'left',
-          dataIndex: 'version',
-          ellipsis: true,
-          sorter:true,
-          width: 170
-        },
-      ],
-      dataList: [],
-      content: [],
-      loading: false,
-      dummyInventoryBaseId:'',
-      pageNo: 1,
-      pageSize: 10,
-      total: 0
-    }
-  },
-  mounted() {
-
-  },
-  methods: {
-    transferModel(id) {
-      this.visible = true
-      this.projectId = id
-      this.queryParam = {}
-      this.selectedRowKeys = []
-      this.replacePage()
-    },
-    handleToggleSearch() {
-      this.toggleSearchStatus = !this.toggleSearchStatus
-    },
-    searchQuery() {
-      this.pageNo = 1
-      this.replacePage()
-    },
-    searchReset() {
-      this.pageNo = 1
-      this.queryParam = {}
-      this.replacePage()
-    },
-    onChange(page, pageSize) {
-      this.pageNo = page
-      this.replacePage()
-    },
-    SizeChange(page, pageSize) {
-      this.pageNo = 1
-      this.pageSize = pageSize
-      this.replacePage()
-    },
-    replacePage() {
-      let query = {
-        pageNo: this.pageNo,
-        pageSize: this.pageSize,
-        ...this.queryParam,
-        projectId: this.projectId
-      }
-      this.loading = true
-      getAction('/project/projectRxswinEO/getTwoPage', query).then((res) => {
-        if (res.success) {
-          this.dataList = res.result.records || []
-          this.loading = false
-        } else {
-          this.loading = false
-        }
-      })
-    },
-    onSelectChange(value) {
-      this.selectedRowKeys = value
-      // if (this.selectedRowKeys.length > 1) {
-      //   this.selectedRowKeys.shift()
-      // }
-    },
-    handleCancel() {
-      this.visible = false
-    },
-    handleSubmit(flag) {
-      if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-        this.confirmLoading = true
-        let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
-        getAction('/project/projectRxswinEO/iSExist', {
-          projectId: this.$route.query.id,
-          // projectLibraryId: this.$route.query.id,
-          ids: selectedRowKeys.join(','),
-        }).then((res) => {
-          if (res.success) {
-            this.confirmLoading = false
-            // this.$message.success(this.$t('OperationSuccessful'))
-            if(res.result == 'YES'){
-              let _this = this
-              this.$confirm({
-                content: _this.$t('AlreadyExists'),
-                onOk() {
-                  getAction('/project/projectRxswinEO/addBatch', {
-                    ids: selectedRowKeys.join(','),
-                    flag:'YES',
-                    projectId: _this.$route.query.id,
-                  }).then((res) => {
-                    if (res.success) {
-                      _this.$message.success(_this.$t('OperationSuccessful'))
-                      _this.visible = false
-                      _this.$emit('transferListFormHomo')
-                    } else {
-                      _this.$message.warning(res.message)
-                    }
-                  })
-                },
-                onCancel() {
-                  _this.visible = false
-                  _this.$emit('transferListFormHomo')
-                }
-              })
-            }else{
-              this.visible = false
-              this.$message.success(this.$t('OperationSuccessful'))
-              this.$emit('transferListFormHomo')
-            }
-            this.selectedRowKeys = []
-          } else {
-            this.$message.warning(this.$t('operationFailed'))
-            this.confirmLoading = false
-          }
-        })
-      } else {
-        this.$message.warning(this.$t('selectLeastOne'))
-      }
-    },
-  }
-}
-</script>
-
-<style scoped>
-.page {
-  text-align: right;
-  margin-top: 20px;
-}
-
-.drawer-bootom-button {
-  position: absolute;
-  bottom: 0;
-  z-index: 100;
-  width: 100%;
-  border-top: 1px solid #e8e8e8;
-  padding: 10px 16px;
-  text-align: right;
-  left: 0;
-  background: #fff;
-  border-radius: 0 0 2px 2px;
-}
-
-.box-title-text {
-  line-height: 1.4;
-  display: flex;
-  align-items: center;
-  margin-bottom: 10px;
-}
-
-.title-text {
-  width: 20%;
-  min-width: 110px;
-  color: #000F16;
-  display: inline-block;
-  font-weight: 500;
-  font-size: 14px;
-  margin-right: 16px;
-  margin-top: 3px;
-  text-align: right;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.box-input {
-  display: inline-block;
-  width: 70%;
-  height: 38px;
-  margin-top: 2px;
-}
-
-.box-button {
-  height: 38px;
-}
-.box-title-text-search {
-  line-height: 1.4;
-  display: flex;
-  align-items: center;
-  margin-bottom: 10px;
-}
-
-.title-text-search {
-  width: 110px;
-  color: #000F16;
-  display: inline-block;
-  font-weight: 500;
-  font-size: 14px;
-  margin-right: 16px;
-  margin-top: 3px;
-  text-align: right;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.box-input-search {
-  display: inline-block;
-  width: calc(100% - 100px);
-  height: 38px;
-  margin-top: 2px;
-}
-
-.box-button-search {
-  height: 38px;
-  /*margin-top: 2px;*/
-}
-</style>
\ No newline at end of file

From 183901b7241db7cb8511fadf6227cc3ab96ab9ba Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 13 Sep 2023 11:24:39 +0800
Subject: [PATCH 006/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js              |  2 ++
 jero-web/src/common/lang/zh-cn.js              |  2 ++
 .../platformItemLibrary/index.vue              |  4 ++--
 .../platformItemLibraryDetails/index.vue       | 18 +++++++++---------
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 31619136c..80d898f80 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1972,4 +1972,6 @@ module.exports = {
   maximum:'A maximum of 20 nodes can be added',
   Nodename:'Node Name',
   Nodedate:'Node Time',
+  Associatedplatform:'Associated platform',
+  associatedItem:'There are multiple matching items in the platform item. Please select the associated item',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 6134024bc..babf28ee6 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -3928,4 +3928,6 @@ module.exports = {
   maximum:'最多添加20个节点',
   Nodename:'节点名称',
   Nodedate:'节点时间',
+  Associatedplatform:'关联平台件',
+  associatedItem:'在平台件项目中包含多条匹配内容，请选择关联项',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibrary/index.vue b/jero-web/src/views/projectManagement/platformItemLibrary/index.vue
index 88622b8ce..d690e3235 100644
--- a/jero-web/src/views/projectManagement/platformItemLibrary/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibrary/index.vue
@@ -43,7 +43,7 @@
       </a-form>
     </div>
     <div class="table-operator">
-      <div @click="handleAdd" class="operator-text" v-has="'projectLibraryBase:add'">
+      <div @click="handleAdd" class="operator-text" v-has="'Platform:add'">
         <a-icon type="plus"/>
         {{$t('newlyAdded')}}
       </div>
@@ -76,7 +76,7 @@
               {{record.flag == '1'?$t('cancelTopping'):$t('Topping')}}
             </a>
             <a class="text-operation"
-               v-has="'projectLibraryBase:delete'"
+               v-has="'Platform:delete'"
                v-if="record.createBy == userInfoQuery.username || record.studioEngineerName == userInfoQuery.username || administrators"
                @click="deleteLib(record)">{{$t('deleteLib')}}</a>
           <!--          <a class="text-operation" @click="entryNameClick(record)">{{$t('see')}}</a>-->
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue
index 83188bba9..5fc89ba34 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue
@@ -14,20 +14,20 @@
 <!--        待办中心-->
         <div class="operator-text"
              v-if="textTitle === $t('listOfRegulations')"
-             v-has="'projectComment:list'"
+             v-has="'PlatformComment:list'"
              @click="todocenterClick">
           <a-icon type="qrcode"/>
           {{ $t('todocenter') }}
         </div>
 <!--        更新LOGO-->
-        <div class="operator-text" v-has="'projectLawsInventoryLog:page'"
+        <div class="operator-text" v-has="'PlatformComment:logo'"
              v-if="textTitle === $t('listOfRegulations')"
              @click="UpdateLogClick">
           <a-icon type="reload"/>
           {{ $t('UpdateLog') }}
         </div>
 <!--        历史版本-->
-        <div class="operator-text" v-has="'projectHistoryVersions:list'"
+        <div class="operator-text" v-has="'projectHistoryVersions:platform'"
              v-if="textTitle === $t('listOfRegulations')"
              @click="historicalVersionClick">
           <a-icon type="clock-circle"/>
@@ -62,21 +62,21 @@
         <div v-if="isDisplay" class="Virtual-detail-left">
 <!--          项目详情-->
           <div class="Virtual-detail-left-text" :title="$t('projectDetails')"
-               v-has="'projectLawsInventory:projectDetails'"
+               v-has="'Platform:projectDetails'"
                v-if="isTrue"
                @click="textClick(0,$t('projectDetails'))">
             <a-icon type="container"/>
             {{ $t('projectDetails') }}
           </div>
 <!--          法规清单-->
-          <div class="Virtual-detail-left-text" v-has="'projectLawsInventory:list'" :title="$t('listOfRegulations')"
+          <div class="Virtual-detail-left-text" v-has="'Platform:list'" :title="$t('listOfRegulations')"
                @click="textClick(1,$t('listOfRegulations'))">
             <a-icon type="control"/>
             {{ $t('listOfRegulations') }}
           </div>
 <!--          认证清单-->
           <div class="Virtual-detail-left-text" :title="$t('certificationList')"
-               v-has="'projectLawsInventory:CertificationList'"
+               v-has="'Platform:CertificationList'"
                @click="textClick(6,$t('certificationList'))">
             <a-icon type="safety"/>
             {{ $t('certificationList') }}
@@ -86,17 +86,17 @@
         <div v-if="!isDisplay" class="Virtual-detail-left-One">
           <div class="Virtual-detail-left-text"
                :title="$t('projectDetails')"
-               v-has="'projectLawsInventory:projectDetails'"
+               v-has="'Platform:projectDetails'"
                v-if="isTrue"
                @click="textClick(0,$t('projectDetails'))">
             <a-icon type="container"/>
           </div>
-          <div class="Virtual-detail-left-text" v-has="'projectLawsInventory:list'" :title="$t('listOfRegulations')"
+          <div class="Virtual-detail-left-text" v-has="'Platform:list'" :title="$t('listOfRegulations')"
                @click="textClick(1,$t('listOfRegulations'))">
             <a-icon type="control"/>
           </div>
           <div class="Virtual-detail-left-text" :title="$t('certificationList')"
-               v-has="'projectLawsInventory:CertificationList'"
+               v-has="'Platform:CertificationList'"
                @click="textClick(6,$t('certificationList'))">
             <a-icon type="safety"/>
           </div>

From 4548626778d115a4804f094bda7f26d25b8f632f Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 13 Sep 2023 11:28:03 +0800
Subject: [PATCH 007/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...tformProjectLawsInventoryEOController.java |   576 +
 ...PlatformProjectLibraryBaseController.java} |     9 +-
 .../platformProjectNameInfoEOController.java  |   203 +
 .../PlatformProjectLawsInventoryEOMapper.java |    49 +
 ... => PlatformProjectLibraryBaseMapper.java} |     2 +-
 .../PlatpromProjectNameInfoEOMapper.java      |    20 +
 .../PlatformProjectLawsInventoryEOMapper.xml  |   195 +
 ...l => PlatformProjectLibraryBaseMapper.xml} |     2 +-
 .../xml/PlatformProjectNameInfoEOMapper.xml   |    15 +
 ... IPlatformIProjectLibraryBaseService.java} |     2 +-
 ...PlatformProjectLawsInventoryEOService.java |   325 +
 .../IPlatformProjectNameInfoEOService.java    |    73 +
 ...formProjectLawsInventoryEOServiceImpl.java | 12047 ++++++++++++++++
 ...latformProjectLibraryBaseServiceImpl.java} |     7 +-
 .../PlatformProjectNameInfoEOServiceImpl.java |   382 +
 15 files changed, 13895 insertions(+), 12 deletions(-)
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/PlatformProjectLawsInventoryEOController.java
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/{ProjectPlatformController.java => PlatformProjectLibraryBaseController.java} (97%)
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/platformProjectNameInfoEOController.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/PlatformProjectLawsInventoryEOMapper.java
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/{ProjectPlatformMapper.java => PlatformProjectLibraryBaseMapper.java} (91%)
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/PlatpromProjectNameInfoEOMapper.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/PlatformProjectLawsInventoryEOMapper.xml
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/{ProjectPlatform.xml => PlatformProjectLibraryBaseMapper.xml} (99%)
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/PlatformProjectNameInfoEOMapper.xml
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/{IProjectPlatformService.java => IPlatformIProjectLibraryBaseService.java} (97%)
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IPlatformProjectLawsInventoryEOService.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IPlatformProjectNameInfoEOService.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/{ProjectPlatformServiceImpl.java => PlatformProjectLibraryBaseServiceImpl.java} (99%)
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/PlatformProjectNameInfoEOServiceImpl.java

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/PlatformProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/PlatformProjectLawsInventoryEOController.java
new file mode 100644
index 000000000..817b54f74
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/PlatformProjectLawsInventoryEOController.java
@@ -0,0 +1,576 @@
+package com.jero.modules.projectPlatform.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.itextpdf.text.DocumentException;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.common.util.PageUtil;
+import com.jero.modules.document.entity.BussDocumentLibraryEO;
+import com.jero.modules.document.service.IBussDocumentLibraryEOService;
+import com.jero.modules.dummy.entity.DummyInventoryBaseEO;
+import com.jero.modules.dummy.service.IDummyInventoryBaseEOService;
+import com.jero.modules.project.entity.ProjectLawsInventoryEO;
+import com.jero.modules.project.service.IProjectLawsInventoryEOService;
+import com.jero.modules.project.vo.ProjectTaskUrgVo;
+import com.jero.modules.projectPlatform.service.IPlatformProjectLawsInventoryEOService;
+import com.jero.modules.system.entity.SysRole;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @Description: 项目库-法规清单表
+ * @Author: jero-boot
+ * @Date:   2022-04-14
+ * @Version: V1.0
+ */
+@Api(tags="平台件项目库-法规清单表")
+@RestController
+@RequestMapping("/project/platformProjectLawsInventoryEO")
+@Slf4j
+public class PlatformProjectLawsInventoryEOController extends JeroController<ProjectLawsInventoryEO, IProjectLawsInventoryEOService> {
+	@Autowired
+	private IPlatformProjectLawsInventoryEOService projectLawsInventoryEOService;
+	 @Autowired
+	 private IBussDocumentLibraryEOService bussDocumentLibraryEOService;
+	 @Autowired
+	 private IDummyInventoryBaseEOService dummyInventoryBaseEOService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param projectLawsInventoryEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "项目库-法规清单表-分页列表查询")
+	@ApiOperation(value="项目库-法规清单表-分页列表查询", notes="项目库-法规清单表-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(ProjectLawsInventoryEO projectLawsInventoryEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		IPage<ProjectLawsInventoryEO> pageList = this.projectLawsInventoryEOService.queryPage(projectLawsInventoryEO,pageNo,pageSize,req);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "项目库-法规清单表-列表查询")
+    @ApiOperation(value="项目库-法规清单表-列表查询", notes="项目库-法规清单表-列表查询")
+	@GetMapping(value = "/list")
+	@RequiresPermissions("projectLawsInventory:list")
+	public Result<List<ProjectLawsInventoryEO>> queryList(ProjectLawsInventoryEO projectLawsInventoryEO,HttpServletRequest req) {
+        List<ProjectLawsInventoryEO> list = projectLawsInventoryEOService.queryList(projectLawsInventoryEO,req);
+        return Result.OK(projectLawsInventoryEO.getCut(),list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param projectLawsInventoryEO
+	 * @return
+	 */
+	@AutoLog(value = "项目库-法规清单表-添加")
+	@ApiOperation(value="项目库-法规清单表-添加", notes="项目库-法规清单表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody ProjectLawsInventoryEO projectLawsInventoryEO) {
+		projectLawsInventoryEOService.add(projectLawsInventoryEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param projectLawsInventoryEO
+	 * @return
+	 */
+	@AutoLog(value = "项目库-法规清单表-编辑")
+	@ApiOperation(value="项目库-法规清单表-编辑", notes="项目库-法规清单表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody ProjectLawsInventoryEO projectLawsInventoryEO) {
+		projectLawsInventoryEOService.editById(projectLawsInventoryEO);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "项目库-法规清单表-通过id删除")
+	@ApiOperation(value="项目库-法规清单表-通过id删除", notes="项目库-法规清单表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id,
+							@RequestParam(name="projectLibraryId",required=true) String projectLibraryId,
+							@RequestParam(name="cut",required=true) String cut) {
+		projectLawsInventoryEOService.deleteById(id,projectLibraryId,cut);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "项目库-法规清单表-批量删除")
+	@ApiOperation(value="项目库-法规清单表-批量删除", notes="项目库-法规清单表-批量删除")
+	@PostMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestBody JSONObject json) {
+		String ids = json.getString("ids");
+		String projectLibraryId = json.getString("projectLibraryId");
+		String cut = json.getString("cut");
+		this.projectLawsInventoryEOService.deleteByIds(Arrays.asList(ids.split(",")),projectLibraryId,cut);
+		return Result.OK("批量删除成功!");
+	}
+
+	 /**
+	  * 通过id查询
+	  *
+	  * @param id
+	  * @return
+	  */
+	 @AutoLog(value = "项目库-法规清单表-通过id查询")
+	 @ApiOperation(value="项目库-法规清单表-通过id查询", notes="项目库-法规清单表-通过id查询")
+	 @GetMapping(value = "/queryById")
+	 public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		 ProjectLawsInventoryEO projectLawsInventoryEO = projectLawsInventoryEOService.queryById(id);
+		 if(projectLawsInventoryEO==null) {
+			 return Result.error("未找到对应数据");
+		 }
+		 return Result.OK(projectLawsInventoryEO);
+	 }
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param projectLawsInventoryEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ProjectLawsInventoryEO projectLawsInventoryEO) {
+        return super.exportXls(request, projectLawsInventoryEO, ProjectLawsInventoryEO.class, "项目库-法规清单表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ProjectLawsInventoryEO.class);
+    }
+
+	 /**
+	  *  批量更新法规清单状态
+	  * @param json
+	  * @return
+	  */
+	 @AutoLog(value = "项目库-法规清单表-批量更新状态")
+	 @ApiOperation(value="项目库-法规清单表-批量更新状态", notes="项目库-法规清单表-批量更新状态")
+	 @PostMapping(value = "/updateStatusBatch")
+	 public Result<?> updateStatusBatch(@RequestBody JSONObject json) {
+		 return this.projectLawsInventoryEOService.updateStatusBatch(json);
+	 }
+
+	 /**
+	  * 匹配相关人员
+	  * @param params
+	  * @return
+	  */
+	 @AutoLog(value = "项目库-法规清单表-匹配相关人员")
+	 @ApiOperation(value="项目库-法规清单表-匹配相关人员", notes="项目库-法规清单表-匹配相关人员")
+	 @PostMapping(value = "/matchRelevantPeople")
+	 public Result<?> matchRelevantPeople(@RequestBody Map<String,Object> params){
+	 	return this.projectLawsInventoryEOService.matchRelevantPeople(params);
+	 }
+
+	 /**
+	  * 流程调用接口
+	  * @param jsonObject
+	  * @return
+	  */
+	 @AutoLog(value = "项目库-法规清单表-流程调用")
+	 @ApiOperation(value="项目库-法规清单表-流程调用", notes="项目库-法规清单表-流程调用")
+	 @PostMapping(value = "/processCall")
+	 public Result<?> processCall(@RequestBody JSONObject jsonObject){
+		 return this.projectLawsInventoryEOService.processCall(jsonObject);
+	 }
+
+	 /**
+	  * 通过id查询
+	  * @param params
+	  * @return
+	  */
+	 @AutoLog(value = "项目库-法规清单表-通过id与操作类型查询")
+	 @ApiOperation(value="项目库-法规清单表-通过id与操作类型查询", notes="项目库-法规清单表-通过id与操作类型查询")
+	 @GetMapping(value = "/queryProjectLawsInventoryInfoById")
+	 public Result<?> queryProjectLawsInventoryInfoById(@RequestParam Map<String,Object> params) {
+		 List<ProjectLawsInventoryEO> result = projectLawsInventoryEOService.queryProjectLawsInventoryInfoById(params);
+		 return Result.OK((String) params.get("cut"),result);
+	 }
+
+	 @AutoLog(value = "法规清单添加调用文档库数据--分页")
+	 @ApiOperation(value="法规清单添加调用文档库数据--分页", notes="法规清单添加调用文档库数据--分页")
+	 @PostMapping(value = "/queryPageInfoBussDocument")
+	 public Result<?> queryPageInfo(@RequestBody BussDocumentLibraryEO bussDocumentLibraryEO,
+										 HttpServletRequest req) {
+		 QueryWrapper<BussDocumentLibraryEO> queryWrapper = QueryGenerator.initQueryWrapper(bussDocumentLibraryEO, req.getParameterMap());
+		 Page<BussDocumentLibraryEO> page = new Page<BussDocumentLibraryEO>(bussDocumentLibraryEO.getPageNo(), bussDocumentLibraryEO.getPageSize());
+		 IPage<BussDocumentLibraryEO> pageList = bussDocumentLibraryEOService.queryPageInfoDummy(page, queryWrapper,bussDocumentLibraryEO);
+		 return Result.OK(pageList);
+	 }
+
+	 /**
+	  * 复制
+	  *
+	  * @param ids
+	  * @return
+	  */
+	 @AutoLog(value = "复制")
+	 @ApiOperation(value="复制", notes="复制")
+	 @GetMapping(value = "/copyInfoByIds")
+	 public Result<?> copyInfoByIds(@RequestParam(name="ids",required=true) String ids,
+									@RequestParam(name="cut",required=true) String cut,
+									@RequestParam(name="operateType",required=true) String operateType) {
+		 try {
+			 projectLawsInventoryEOService.copyInfoByIds(ids,operateType);
+		 } catch (Exception e) {
+			 if(CutEnum.CN.getValue().equals(cut)){
+				 return Result.error("复制失败");
+			 }else{
+				 return Result.error("Copy the failure");
+			 }
+		 }
+		 if(CutEnum.CN.getValue().equals(cut)){
+			 return Result.OK("复制成功");
+		 }else{
+			 return Result.OK("Copy success");
+		 }
+	 }
+
+
+	 /**
+	  *  批量设置
+	  *
+	  * @param projectLawsInventoryEO
+	  * @return
+	  */
+	 @AutoLog(value = "批量设置")
+	 @ApiOperation(value="批量设置", notes="批量设置")
+	 @PostMapping(value = "/setBatch")
+	 public Result<?> setBatch(@RequestBody ProjectLawsInventoryEO projectLawsInventoryEO) {
+		 String cut = projectLawsInventoryEO.getCut();
+		 try {
+			 projectLawsInventoryEOService.setBatch(projectLawsInventoryEO);
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 log.error("批量设置失败：" + e.getMessage());
+			 if(CutEnum.CN.getValue().equals(cut)){
+				 return Result.error("批量设置失败！");
+			 }else{
+				 return Result.error("Batch set success");
+			 }
+		 }
+		 if(CutEnum.CN.getValue().equals(cut)){
+			 return Result.OK("批量设置成功");
+		 }else{
+			 return Result.OK("Batch set success");
+		 }
+	 }
+
+	 /**
+	  * 调取虚拟清单数据
+	  *
+	  * @param dummyInventoryBaseEO
+	  * @param pageNo
+	  * @param pageSize
+	  * @param req
+	  * @return
+	  */
+	 @AutoLog(value = "调取虚拟清单数据")
+	 @ApiOperation(value="调取虚拟清单数据", notes="调取虚拟清单数据")
+	 @PostMapping(value = "/getPageInfoDummy")
+	 public Result<?> getPageInfoDummy(@RequestBody DummyInventoryBaseEO dummyInventoryBaseEO,
+									@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									HttpServletRequest req) {
+//		dummyInventoryBaseEO.setName("*发*");
+		 QueryWrapper<DummyInventoryBaseEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryBaseEO, req.getParameterMap());
+		 queryWrapper.orderByDesc("create_time");
+		 Page<DummyInventoryBaseEO> page = new Page<DummyInventoryBaseEO>(pageNo, pageSize);
+		 IPage<DummyInventoryBaseEO> pageList = dummyInventoryBaseEOService.getPageInfoDummy(page,queryWrapper);
+		 return Result.OK(dummyInventoryBaseEO.getCut(),pageList);
+	 }
+
+
+	 @ApiOperation(value = "模板下载")
+	 @GetMapping(value = "/exportTemplate")
+	 public void exportTemplate(ProjectLawsInventoryEO projectLawsInventoryEO, HttpServletResponse response, HttpServletRequest request) throws Exception {
+		 projectLawsInventoryEOService.exportTemplate(projectLawsInventoryEO,response,request);
+	 }
+
+	 /**
+	  * 导出数据
+	  *  @param request
+	  * @param projectLawsInventoryEO
+	  */
+	 @RequestMapping(value = "/exportData")
+	 @RequiresPermissions("projectLawsInventory:exportData")
+	 public void exportData(HttpServletResponse response,
+							HttpServletRequest request,
+							ProjectLawsInventoryEO projectLawsInventoryEO) {
+		 projectLawsInventoryEOService.exportData(response,request, projectLawsInventoryEO);
+	 }
+
+	 /**
+	  * 导入数据
+	  *
+	  * @param file
+	  * @param projectLawsInventoryEO
+	  * @return
+	  */
+	 @RequestMapping(value = "/importData", method = RequestMethod.POST)
+	 public Result<?> importData(@RequestParam(value = "file", required = false) MultipartFile file,
+								 ProjectLawsInventoryEO projectLawsInventoryEO) {
+		 projectLawsInventoryEOService.importData(file,projectLawsInventoryEO);
+		 return Result.OK("导入成功");
+	 }
+
+
+	 @AutoLog(value = "变更")
+	 @ApiOperation(value="变更", notes="变更")
+	 @PostMapping(value = "/change")
+	 public Result<?> change(@RequestBody JSONObject params) {
+	 	return this.projectLawsInventoryEOService.change(params);
+	 }
+
+	 @AutoLog(value = "下载pdf报告")
+	 @ApiOperation(value="下载pdf报告", notes="下载pdf报告")
+	 @GetMapping(value = "/downloadReport")
+	 public void downloadReport(@RequestParam Map<String,Object> params, HttpServletRequest req, HttpServletResponse resp) throws DocumentException {
+		 this.projectLawsInventoryEOService.downloadReport(params,req,resp);
+	 }
+
+	 /**
+	  * 列表查询条件 标识传 1-->用于查询文档库字段属
+	  * 法规清单添加调取文档库时高级搜索条件
+	  * @param flag
+	  * @return
+	  */
+	 @AutoLog(value = "法规清单添加调取文档库时高级搜索条件")
+	 @ApiOperation(value="法规清单添加调取文档库时高级搜索条件", notes="法规清单添加调取文档库时高级搜索条件")
+	 @GetMapping(value = "/queryConditionInventory")
+	 public Result<List<Map<String,Object>>> queryConditionInventory(@RequestParam(name="flag",required=true) String flag,
+																	 @RequestParam(name="cut",required=true) String cut) {
+		 List<Map<String,Object>> list = bussDocumentLibraryEOService.queryConditionInventory(flag,cut);
+		 return Result.OK(list);
+	 }
+
+
+	 @ApiOperation(value="法规清单中添加调用文档库数据--分页", notes="法规清单中添加调用文档库数据--分页")
+	 @PostMapping(value = "/queryPageDummy")
+	 @ResponseBody
+	 public net.sf.json.JSONObject queryPageDummy(@RequestBody Map<String,Object> parameter) {
+		 IPage infoPage = bussDocumentLibraryEOService.getPageDummy(parameter);
+		 Result<IPage> ok = Result.OK(infoPage);
+		 net.sf.json.JSONObject jsonResult = net.sf.json.JSONObject.fromObject(ok);
+		 return jsonResult;
+	 }
+
+	/**
+	 *
+	 * @param params
+	 * 			cut:中英文标识
+	 * 			id：法规清单id
+	 * @param req
+	 * @param resp
+	 * @throws DocumentException
+	 */
+	@AutoLog(value = "下载docx报告")
+	@ApiOperation(value="下载docx报告", notes="下载docx报告")
+	@GetMapping(value = "/downloadDocxReport")
+ 	public void downloadDocxReport(@RequestParam Map<String,Object> params, HttpServletRequest req, HttpServletResponse resp) throws DocumentException {
+		this.projectLawsInventoryEOService.downloadDocxReport(params,req,resp);
+	}
+
+	@AutoLog(value = "催办")
+	@ApiOperation(value="催办", notes="催办")
+	@PostMapping(value = "/expediting")
+	public Result<?> expediting(@RequestBody JSONObject json) {
+		return this.projectLawsInventoryEOService.expediting(json);
+	}
+
+	/**
+	 * 当前登录用户角色
+	 * @return
+	 */
+	@ApiOperation(value = "当前登录用户角色")
+	@RequestMapping(value = "/getRoleByUserId", method = RequestMethod.GET)
+	public Result<List<SysRole>> getRoleByUserId(String projectLibraryId,String cut) {
+		Result<List<SysRole>> result = new Result<>();
+		List<SysRole> list = projectLawsInventoryEOService.getRoleByUserId(projectLibraryId,cut);
+		if(list==null||list.size()<=0) {
+			result.error500("未找到角色信息");
+		}else {
+			result.setResult(list);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+
+	@AutoLog(value = "任务清单催办")
+	@ApiOperation(value="任务清单催办", notes="任务清单催办")
+	@PostMapping(value = "/taskUrg")
+	public Result<?> taskUrg(@RequestBody ProjectTaskUrgVo projectTaskUrgVo) {
+		return this.projectLawsInventoryEOService.taskUrg(projectTaskUrgVo);
+	}
+
+
+	@AutoLog(value = "项目库-法规清单表-根据项目库id更新符合性流程发起人、责任人接口")
+	@ApiOperation(value="项目库-法规清单表-根据项目库id更新符合性流程发起人、责任人接口", notes="项目库-法规清单表-根据项目库id更新符合性流程发起人、责任人接口")
+	@GetMapping(value = "/updateFlowInfoByProjectLibraryIds")
+	public Result<?> updateFlowInfoByProjectLibraryIds(@RequestParam("projectLibraryIds") String projectLibraryIds){
+		return this.projectLawsInventoryEOService.updateFlowInfoByProjectLibraryIds(projectLibraryIds);
+	}
+
+	@AutoLog(value = "项目库-法规清单表-studio发布")
+	@ApiOperation(value="项目库-法规清单表-studio发布", notes="项目库-法规清单表-studio发布")
+	@PostMapping(value = "/studioPublish")
+	public Result<?> studioPublish(@RequestBody JSONObject json) {
+		return this.projectLawsInventoryEOService.studioPublish(json);
+	}
+
+	@AutoLog(value = "项目库-法规清单表-studio撤回")
+	@ApiOperation(value="项目库-法规清单表-studio撤回", notes="项目库-法规清单表-studio撤回")
+	@PostMapping(value = "/studioWithdrew")
+	public Result<?> studioWithdrew(@RequestBody JSONObject json) {
+		return this.projectLawsInventoryEOService.studioWithdrew(json);
+	}
+
+	@AutoLog(value = "项目库-法规清单表-法规工程师退回")
+	@ApiOperation(value="项目库-法规清单表-法规工程师退回", notes="项目库-法规清单表-法规工程师退回")
+	@PostMapping(value = "/regulationOwnerReturned")
+	public Result<?> regulationOwnerReturned(@RequestBody JSONObject json) {
+		return this.projectLawsInventoryEOService.regulationOwnerReturned(json);
+	}
+
+	@AutoLog(value = "流程重置-迁移法规清单流程历史数据专用")
+	@ApiOperation(value="流程重置-迁移法规清单流程历史数据专用", notes="流程重置-迁移法规清单流程历史数据专用")
+	@PostMapping(value = "/resetFlowTemp")
+	public Result<?> resetFlowTemp(@RequestBody JSONObject params) {
+		return this.projectLawsInventoryEOService.resetFlowTemp(params);
+	}
+
+	/**
+	 *  批量更新法规清单状态
+	 * @param json
+	 * @return
+	 */
+	@AutoLog(value = "项目库-法规清单表-批量更新流程状态")
+	@ApiOperation(value="项目库-法规清单表-批量更新流程状态", notes="项目库-法规清单表-批量更新流程状态")
+	@PostMapping(value = "/updateFlowStatusBatch")
+	public Result<?> updateFlowStatusBatch(@RequestBody JSONObject json) {
+		return this.projectLawsInventoryEOService.updateFlowStatusBatch(json);
+	}
+
+	@AutoLog(value = "项目库-法规清单表-引用交付物")
+	@ApiOperation(value="项目库-法规清单表-引用交付物", notes="项目库-法规清单表-引用交付物")
+	@PostMapping(value = "/citeDeliverable")
+	public Result<?> citeDeliverable(@RequestBody JSONObject json) {
+		return this.projectLawsInventoryEOService.citeDeliverable(json);
+	}
+
+	@AutoLog(value = "项目库-法规清单表-强制转办")
+	@ApiOperation(value="项目库-法规清单表-强制转办", notes="项目库-法规清单表-强制转办")
+	@PostMapping(value = "/compulsoryTransfer")
+	public Result<?> compulsoryTransfer(@RequestBody JSONObject json) {
+		return this.projectLawsInventoryEOService.compulsoryTransfer(json);
+	}
+
+	/**
+	 * 通过projectId查询责任人
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "项目库-法规清单表-通过projectId查询责任人")
+	@ApiOperation(value="项目库-法规清单表-通过projectId查询责任人", notes="项目库-法规清单表-通过projectId查询责任人")
+	@GetMapping(value = "/queryDutyPersonByProjectId")
+	public Result<?> queryDutyPersonByProjectId(@RequestParam Map<String,Object> params){
+		Map<String, List<Map<String, Object>>> res = this.projectLawsInventoryEOService.queryDutyPersonByProjectId(params);
+		return Result.OK(res);
+	}
+
+	/**
+	 * 分页查询不符合项列表
+	 * @return
+	 */
+	@AutoLog(value = "项目库-法规清单表-查询不符合项列表")
+	@ApiOperation(value="项目库-法规清单表-查询不符合项列表", notes="项目库-法规清单表-查询不符合项列表")
+	@GetMapping(value = "/queryNotComplianList")
+	public Result<?> queryNotComplianList(@RequestParam Map<String,Object> params) {
+		List<Map<String,Object>> result = this.projectLawsInventoryEOService.queryNotComplianList(params);
+		Page pages = PageUtil.getPages(Integer.parseInt((String) params.get("pageNo")), Integer.parseInt((String) params.get("pageSize")), result);
+		return Result.OK(pages);
+	}
+
+	/**
+	 * 导出不符合项列表
+	 *  @param request
+	 * @param params
+	 */
+	@AutoLog(value = "项目库-法规清单表-导出不符合项列表")
+	@ApiOperation(value="项目库-法规清单表-导出不符合项列表", notes="项目库-法规清单表-导出不符合项列表")
+	@RequestMapping(value = "/exportNotComplianList")
+	public void exportNotComplianList(HttpServletResponse response,
+						   HttpServletRequest request,
+						   @RequestBody Map<String,Object> params) {
+		this.projectLawsInventoryEOService.exportNotComplianList(response,request, params);
+	}
+
+	@AutoLog(value = "项目库-法规清单表-定版校验")
+	@ApiOperation(value="项目库-法规清单表-定版校验", notes="项目库-法规清单表-定版校验")
+	@GetMapping(value = "/finalizationVerify")
+	public Result<?> finalizationVerify(@RequestParam Map<String,Object> params){
+		return this.projectLawsInventoryEOService.finalizationVerify(params);
+	}
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/ProjectPlatformController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/PlatformProjectLibraryBaseController.java
similarity index 97%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/ProjectPlatformController.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/PlatformProjectLibraryBaseController.java
index 3d02d8201..286ff33bb 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/ProjectPlatformController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/PlatformProjectLibraryBaseController.java
@@ -8,8 +8,7 @@ import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.vo.DictModel;
 import com.jero.modules.project.entity.ProjectLibraryBase;
-import com.jero.modules.project.service.IProjectLibraryBaseService;
-import com.jero.modules.projectPlatform.service.IProjectPlatformService;
+import com.jero.modules.projectPlatform.service.IPlatformIProjectLibraryBaseService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -43,11 +42,11 @@ import java.util.Map;
  */
 @Api(tags="平台件项目库")
 @RestController
-@RequestMapping("/project/platform")
+@RequestMapping("/project/platformProjectLibraryBase")
 @Slf4j
-public class ProjectPlatformController extends JeroController<ProjectLibraryBase, IProjectPlatformService> {
+public class PlatformProjectLibraryBaseController extends JeroController<ProjectLibraryBase, IPlatformIProjectLibraryBaseService> {
 	@Autowired
-	private IProjectPlatformService projectPlatformService;
+	private IPlatformIProjectLibraryBaseService projectPlatformService;
 
 	/**
 	 * 分页列表查询
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/platformProjectNameInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/platformProjectNameInfoEOController.java
new file mode 100644
index 000000000..ec820e3d4
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/platformProjectNameInfoEOController.java
@@ -0,0 +1,203 @@
+package com.jero.modules.projectPlatform.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.project.entity.ProjectLibraryBase;
+import com.jero.modules.project.entity.ProjectNameInfoEO;
+import com.jero.modules.project.service.IProjectNameInfoEOService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * @Description: 项目名信息表
+ * @Author: jero-boot
+ * @Date:   2022-04-18
+ * @Version: V1.0
+ */
+@Api(tags="平台件-项目名信息表")
+@RestController
+@RequestMapping("/project/platformProjectNameInfoEO")
+@Slf4j
+public class platformProjectNameInfoEOController extends JeroController<ProjectNameInfoEO, IProjectNameInfoEOService> {
+	@Autowired
+	private IProjectNameInfoEOService projectNameInfoEOService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param projectNameInfoEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "项目名信息表-分页列表查询")
+	@ApiOperation(value="项目名信息表-分页列表查询", notes="项目名信息表-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(ProjectNameInfoEO projectNameInfoEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ProjectNameInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(projectNameInfoEO, req.getParameterMap());
+		Page<ProjectNameInfoEO> page = new Page<ProjectNameInfoEO>(pageNo, pageSize);
+		IPage<ProjectNameInfoEO> pageList = projectNameInfoEOService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "项目名信息表-列表查询")
+    @ApiOperation(value="项目名信息表-列表查询", notes="项目名信息表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<ProjectNameInfoEO>> queryList() {
+		List<ProjectNameInfoEO> list = projectNameInfoEOService.queryList();
+		return Result.OK(list);
+	}
+    /**
+	 * 返回项目全拼
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "返回项目全拼")
+    @ApiOperation(value="返回项目全拼", notes="返回项目全拼")
+	@GetMapping(value = "/queryProjectNameList")
+	public Result<List<ProjectLibraryBase>> queryProjectNameList(String cut) {
+		List<ProjectLibraryBase> list = projectNameInfoEOService.queryProjectNameList(cut);
+		return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param projectNameInfoEO
+	 * @return
+	 */
+	@AutoLog(value = "项目名信息表-添加")
+	@ApiOperation(value="项目名信息表-添加", notes="项目名信息表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody ProjectNameInfoEO projectNameInfoEO) {
+		projectNameInfoEOService.add(projectNameInfoEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param projectNameInfoEO
+	 * @return
+	 */
+	@AutoLog(value = "项目名信息表-编辑")
+	@ApiOperation(value="项目名信息表-编辑", notes="项目名信息表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody ProjectNameInfoEO projectNameInfoEO) {
+		projectNameInfoEOService.editById(projectNameInfoEO);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "项目名信息表-通过id删除")
+	@ApiOperation(value="项目名信息表-通过id删除", notes="项目名信息表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		projectNameInfoEOService.deleteById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "项目名信息表-批量删除")
+	@ApiOperation(value="项目名信息表-批量删除", notes="项目名信息表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.projectNameInfoEOService.deleteByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "项目名信息表-通过id查询")
+	@ApiOperation(value="项目名信息表-通过id查询", notes="项目名信息表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOService.queryById(id);
+		if(projectNameInfoEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(projectNameInfoEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param projectNameInfoEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ProjectNameInfoEO projectNameInfoEO) {
+        return super.exportXls(request, projectNameInfoEO, ProjectNameInfoEO.class, "项目名信息表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ProjectNameInfoEO.class);
+    }
+
+	 /**
+	  * 接收space系统数据
+	  *
+	  * @return
+	  */
+//	 @AutoLog(value = "项目名信息表-space")
+//	 @ApiOperation(value="项目名信息表-space", notes="项目名信息表-space")
+//	 @RequestMapping(value = "/getSpaceInfo", method = RequestMethod.POST)
+//	 public void getSpaceInfo(@RequestParam(name="cut",required=true) String cut) {
+//		 projectNameInfoEOService.getSpaceInfo(cut);
+//	 }
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/PlatformProjectLawsInventoryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/PlatformProjectLawsInventoryEOMapper.java
new file mode 100644
index 000000000..511fd032f
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/PlatformProjectLawsInventoryEOMapper.java
@@ -0,0 +1,49 @@
+package com.jero.modules.projectPlatform.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.modules.project.entity.ProjectLawsInventoryEO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 项目库-法规清单表
+ * @Author: jero-boot
+ * @Date:   2022-04-14
+ * @Version: V1.0
+ */
+public interface PlatformProjectLawsInventoryEOMapper extends BaseMapper<ProjectLawsInventoryEO> {
+
+    /**
+     * 获取清单确认统计
+     * @param projectLibraryId  项目库id
+     * @return
+     */
+    List<Map<String, Object>> getlistingToConfirmStatistics(@Param("projectLibraryId") String projectLibraryId);
+
+    /**
+     * 获取清单确认统计
+     * @param projectLibraryId  项目库id
+     * @return
+     */
+    List<Map<String, Object>> getTaskToConfirmStatistics(@Param("projectLibraryId")String projectLibraryId);
+
+    /**
+     * 统计该项目中，某一个 清单确认状态的数据  根据领域分组
+     * @param projectLibraryId      项目库id
+     * @param inventoryAffirmStatus 清单确认状态
+     * @return
+     */
+    List<Map<String, Object>> getListingToConfirmStatisticsGroupByTerritory(@Param("projectLibraryId") String projectLibraryId,@Param("inventoryAffirmStatus") String inventoryAffirmStatus);
+
+    /**
+     * 统计该项目中，某一个 任务确认状态的数据  根据领域分组
+     * @param projectLibraryId
+     * @param taskAffirmStatus
+     * @return
+     */
+    List<Map<String, Object>> getTaskToConfirmStatisticsGroupByTerritory(@Param("projectLibraryId") String projectLibraryId, @Param("taskAffirmStatus") String taskAffirmStatus);
+
+    List<Map<String,Object>> queryNotComplianList(@Param("params") Map<String, Object> params);
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/ProjectPlatformMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/PlatformProjectLibraryBaseMapper.java
similarity index 91%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/ProjectPlatformMapper.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/PlatformProjectLibraryBaseMapper.java
index 20c20cead..c08f2214f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/ProjectPlatformMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/PlatformProjectLibraryBaseMapper.java
@@ -13,7 +13,7 @@ import java.util.Map;
  * @Date:   2022-04-11
  * @Version: V1.0
  */
-public interface ProjectPlatformMapper extends BaseMapper<ProjectLibraryBase> {
+public interface PlatformProjectLibraryBaseMapper extends BaseMapper<ProjectLibraryBase> {
     /**分页列表*/
     List<ProjectLibraryBase> queryPageList(@Param("params") Map<String, Object> params);
     List<ProjectLibraryBase> queryMaimList();
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/PlatpromProjectNameInfoEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/PlatpromProjectNameInfoEOMapper.java
new file mode 100644
index 000000000..5af436747
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/PlatpromProjectNameInfoEOMapper.java
@@ -0,0 +1,20 @@
+package com.jero.modules.projectPlatform.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.modules.project.entity.ProjectNameInfoEO;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * @Description: 项目名信息表
+ * @Author: jero-boot
+ * @Date:   2022-04-18
+ * @Version: V1.0
+ */
+public interface PlatpromProjectNameInfoEOMapper extends BaseMapper<ProjectNameInfoEO> {
+    @Select("select pni.id,pni.project_name,pyni.id as year_id,pyni.year_name,pni.vehicle_platform,pni.digital_platform\n" +
+            "from project_name_info as pni\n" +
+            "left join project_year_name_info as pyni on pni.id=pyni.project_name_id;")
+    List<ProjectNameInfoEO> selectProjectNameAndYear();
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/PlatformProjectLawsInventoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/PlatformProjectLawsInventoryEOMapper.xml
new file mode 100644
index 000000000..6051afa8c
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/PlatformProjectLawsInventoryEOMapper.xml
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.projectPlatform.mapper.PlatformProjectLawsInventoryEOMapper">
+    <resultMap id="ProjectLawsInventoryEOResultMap" type="com.jero.modules.project.entity.ProjectLawsInventoryEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="project_library_id" property="projectLibraryId" />
+        <result column="serial_number" property="serialNumber" />
+        <result column="title" property="title" />
+        <result column="subtitle" property="subtitle" />
+        <result column="corresponding_standard" property="correspondingStandard" />
+        <result column="implement_type" property="implementType" />
+        <result column="xin1_che1_xing2_shi2_shi1_ri4_qi1" property="xin1Che1Xing2Shi2Shi1Ri4Qi1" />
+        <result column="implement_time" property="implementTime" />
+        <result column="attestation_type" property="attestationType" />
+        <result column="attestation_rank" property="attestationRank" />
+        <result column="wvta_id" property="wvtaId" />
+        <result column="duty_territory" property="dutyTerritory" />
+        <result column="regulation_owner_id" property="regulationOwnerId" />
+        <result column="homologation_engineer_id" property="homologationEngineerId" />
+        <result column="engineering_interface_person" property="engineeringInterfacePerson" />
+        <result column="remark" property="remark" />
+        <result column="design_deliverable_type" property="designDeliverableType" />
+        <result column="design_deliverable_template" property="designDeliverableTemplate" />
+        <result column="design_initiator" property="designInitiator" />
+        <result column="design_duty" property="designDuty" />
+        <result column="design_due_date" property="designDueDate" />
+        <result column="prehomo_deliverable_type" property="prehomoDeliverableType" />
+        <result column="prehomo_deliverable_template" property="prehomoDeliverableTemplate" />
+        <result column="prehomo_initiator" property="prehomoInitiator" />
+        <result column="prehomo_duty" property="prehomoDuty" />
+        <result column="prehomo_due_date" property="prehomoDueDate" />
+        <result column="verify_deliverable_type" property="verifyDeliverableType" />
+        <result column="verify_deliverable_template" property="verifyDeliverableTemplate" />
+        <result column="verify_initiator" property="verifyInitiator" />
+        <result column="verify_duty" property="verifyDuty" />
+        <result column="verify_due_date" property="verifyDueDate" />
+        <result column="region" property="region" />
+        <result column="applicable_supplement" property="applicableSupplement" />
+        <result column="verify_remark" property="verifyRemark" />
+        <result column="prehomo_remark" property="prehomoRemark" />
+        <result column="design_remark" property="designRemark" />
+        <result column="file_id" property="fileId" />
+    </resultMap>
+
+    <select id="getlistingToConfirmStatistics" resultType="hashmap">
+        select
+            count(inventory_affirm_status) as "inventoryAffirmStatusCount",
+            inventory_affirm_status as "inventoryAffirmStatus",
+            id as "id"
+        from
+            project_laws_inventory
+        where
+            project_library_id in
+            <foreach collection="projectLibraryId.split(',')" index="index" separator="," open="(" close=")" item="item">
+                #{item}
+            </foreach>
+        group by inventory_affirm_status
+    </select>
+
+    <select id="getTaskToConfirmStatistics" resultType="hashmap">
+        select
+            count(task_affirm_status) as "taskAffirmStatusCount",
+            task_affirm_status as "taskAffirmStatus",
+            id as "id"
+        from
+            project_laws_inventory
+        where
+            project_library_id in
+            <foreach collection="projectLibraryId.split(',')" index="index" separator="," open="(" close=")" item="item">
+                #{item}
+            </foreach>
+        group by task_affirm_status
+    </select>
+
+
+    <select id="getListingToConfirmStatisticsGroupByTerritory" resultType="hashmap">
+        select
+            count(inventory_affirm_status) as "amount",
+            inventory_affirm_status as "inventoryAffirmStatus",
+            id as "id",
+            duty_territory as "dutyTerritory"
+        from
+            project_laws_inventory
+        where
+            project_library_id = #{projectLibraryId}
+          and inventory_affirm_status = #{inventoryAffirmStatus}
+        group by duty_territory;
+    </select>
+
+    <select id="getTaskToConfirmStatisticsGroupByTerritory" resultType="hashmap">
+        select
+            count(task_affirm_status) as "amount",
+            task_affirm_status as "taskAffirmStatus",
+            id as "id",
+            duty_territory as "dutyTerritory"
+        from
+            project_laws_inventory
+        where
+            project_library_id = #{projectLibraryId}
+          and task_affirm_status = #{taskAffirmStatus}
+        group by duty_territory;
+    </select>
+
+    <select id="queryNotComplianList" resultType="hashmap">
+        select
+                id as "id",
+                serial_number as "serialNumber",
+                title as "title",
+                flow_type as "flowType",
+                duty_territory as "dutyTerritory",
+                flow_status as "flowStatus",
+                regulation_owner_id as "regulationOwnerId",
+                duty_id as "dutyId",
+                stand_id as "standId"
+        from (
+              SELECT
+                  id,
+                  serial_number,
+                  title,
+                  "2" as flow_type,
+                  duty_territory,
+                  design_flow_status as flow_status,
+                  regulation_owner_id,
+                  design_duty_id as duty_id,
+                  project_library_id,
+                  stand_id
+              FROM
+                  project_laws_inventory
+              WHERE
+                  project_library_id = #{params.projectLibraryId}
+                  and design_flow_status IN
+                  <foreach collection="params.complianceFlowStatusList" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                  </foreach>
+              UNION
+              SELECT
+                  id,
+                  serial_number,
+                  title,
+                  "4" as flow_type,
+                  duty_territory,
+                  verify_flow_status as flow_status,
+                  regulation_owner_id,
+                  verify_duty_id as duty_id,
+                  project_library_id,
+                  stand_id
+              FROM
+                  project_laws_inventory
+              WHERE
+                  project_library_id = #{params.projectLibraryId}
+                  and verify_flow_status IN
+                  <foreach collection="params.complianceFlowStatusList" index="index" item="item" open="(" separator="," close=")">
+                        #{item}
+                  </foreach>
+        ) temp
+        <!--<include refid="BaseQuerySql"/>-->
+        <!--<if test="params.orderByField != null and params.orderByField != ''">
+            order by temp.${params.orderByField}
+            <if test="params.orderBy == 1">
+                asc
+            </if>
+            <if test="params.orderBy == 2">
+                desc
+            </if>
+        </if>-->
+        <if test="params.orderByField == null or params.orderByField == ''">
+            order by temp.serial_number desc
+        </if>
+    </select>
+
+    <sql id="BaseQuerySql">
+        <where>
+            <if test="params.serialNumber != null and params.serialNumber !=''">
+                and temp.serial_number like CONCAT(CONCAT('%',#{params.serialNumber}),'%')
+            </if>
+            <if test="params.title != null and params.title !=''">
+                and temp.title like CONCAT(CONCAT('%',#{params.title}),'%')
+            </if>
+            <if test="params.dutyTerritory != null and params.dutyTerritory !=''">
+                and temp.duty_territory like CONCAT(CONCAT('%',#{params.dutyTerritory}),'%')
+                <!--and (
+                    temp.duty_territory = #{params.dutyTerritory} or
+                    <foreach collection="params.dutyTerritory.split(',')" index="" item="item" open="(" close=")" separator="or">
+                        temp.duty_territory like  CONCAT(CONCAT('%',#{item}),'%')
+                    </foreach>
+                )-->
+            </if>
+        </where>
+    </sql>
+</mapper>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/ProjectPlatform.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/PlatformProjectLibraryBaseMapper.xml
similarity index 99%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/ProjectPlatform.xml
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/PlatformProjectLibraryBaseMapper.xml
index aae850b73..69a29afee 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/ProjectPlatform.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/PlatformProjectLibraryBaseMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jero.modules.projectPlatform.mapper.ProjectPlatformMapper">
+<mapper namespace="com.jero.modules.projectPlatform.mapper.PlatformProjectLibraryBaseMapper">
     <resultMap id="ProjectLibraryBaseResultMap" type="com.jero.modules.project.entity.ProjectLibraryBase">
         <id column="id" property="id" />
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/PlatformProjectNameInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/PlatformProjectNameInfoEOMapper.xml
new file mode 100644
index 000000000..b48883b20
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/PlatformProjectNameInfoEOMapper.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.projectPlatform.mapper.PlatpromProjectNameInfoEOMapper">
+    <resultMap id="ProjectNameInfoEOResultMap" type="com.jero.modules.project.entity.ProjectNameInfoEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="project_name" property="projectName" />
+        <result column="vehicle_platform" property="vehiclePlatform" />
+        <result column="digital_platform" property="digitalPlatform" />
+    </resultMap>
+</mapper>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IProjectPlatformService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IPlatformIProjectLibraryBaseService.java
similarity index 97%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IProjectPlatformService.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IPlatformIProjectLibraryBaseService.java
index 7a3996700..61bb66498 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IProjectPlatformService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IPlatformIProjectLibraryBaseService.java
@@ -20,7 +20,7 @@ import java.util.Map;
  * @Date:   2022-04-11
  * @Version: V1.0
  */
-public interface IProjectPlatformService extends IService<ProjectLibraryBase> {
+public interface IPlatformIProjectLibraryBaseService extends IService<ProjectLibraryBase> {
 
 	/**
 	 * 保存
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IPlatformProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IPlatformProjectLawsInventoryEOService.java
new file mode 100644
index 000000000..5114ece63
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IPlatformProjectLawsInventoryEOService.java
@@ -0,0 +1,325 @@
+package com.jero.modules.projectPlatform.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.itextpdf.text.DocumentException;
+import com.jero.common.api.vo.Result;
+import com.jero.common.constant.enums.MessageTypeEnum;
+import com.jero.common.system.vo.LoginUser;
+import com.jero.modules.feishu.vo.FeishuMsgVo;
+import com.jero.modules.project.entity.ProjectLawsInventoryEO;
+import com.jero.modules.project.vo.ProjectTaskUrgVo;
+import com.jero.modules.system.entity.SysCategory;
+import com.jero.modules.system.entity.SysDictItem;
+import com.jero.modules.system.entity.SysRole;
+import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
+import com.jero.modules.todoCenter.entity.ProcessInfoEO;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 项目库-法规清单表
+ * @Author: jero-boot
+ * @Date:   2022-04-14
+ * @Version: V1.0
+ */
+public interface IPlatformProjectLawsInventoryEOService extends IService<ProjectLawsInventoryEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param projectLawsInventoryEO
+	 * @return
+	 */
+    void add(ProjectLawsInventoryEO projectLawsInventoryEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param projectLawsInventoryEO
+	 * @return
+	 */
+    void editById(ProjectLawsInventoryEO projectLawsInventoryEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id,String projectLibraryId,String cut);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids,String projectLibraryId,String cut);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ProjectLawsInventoryEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ProjectLawsInventoryEO> queryList(ProjectLawsInventoryEO projectLawsInventoryEO, HttpServletRequest req);
+
+	/**
+	 * 批量更新状态
+	 * @param json
+	 * @return
+	 */
+	Result<?> updateStatusBatch(JSONObject json);
+
+	void sendMessage(String msgTitle, String msgContent, List<String> userIdList, String projectLibraryId, Map<String,Object> params, FeishuMsgVo feishuMsgVo, MessageTypeEnum messageType,String initiator);
+
+	/**
+	 * 匹配相关人员
+	 * @param params
+	 * @return
+	 */
+    Result<?> matchRelevantPeople(Map<String, Object> params);
+
+	/**
+	 * 流程调用
+	 * @param jsonObject
+	 * @return
+	 */
+    Result<?> processCall(JSONObject jsonObject);
+
+	List<ProjectLawsInventoryEO> queryProjectLawsInventoryInfoById(Map<String, Object> params);
+
+
+	void copyInfoByIds(String ids,String operateType);
+
+	/**
+	 * 批量设置
+	 * @param projectLawsInventoryEO
+	 */
+	void setBatch(ProjectLawsInventoryEO projectLawsInventoryEO);
+
+	/**
+	 * 模板下载
+	 * @param projectLawsInventoryEO
+	 * @param response
+	 * @param request
+	 */
+	void exportTemplate(ProjectLawsInventoryEO projectLawsInventoryEO, HttpServletResponse response, HttpServletRequest request);
+
+	void exportData(HttpServletResponse response,
+					HttpServletRequest request,
+					ProjectLawsInventoryEO projectLawsInventoryEO);
+
+	void importData(MultipartFile file,
+					ProjectLawsInventoryEO projectLawsInventoryEO);
+
+	void dataDispose(List<ProjectLawsInventoryEO> list, LoginUser currentUser, int isProjectRole, String cut);
+
+	Result<?> change(JSONObject parmas);
+
+	/**
+	 * 下载pdf报告
+	 * @param params
+	 * @param req
+	 * @param resp
+	 * @throws DocumentException
+	 */
+	void downloadReport(Map<String, Object> params,HttpServletRequest req, HttpServletResponse resp)throws DocumentException;
+
+	/**
+	 * 下载docx报告
+	 * @param params
+	 * @param req
+	 * @param resp
+	 */
+	void downloadDocxReport(Map<String, Object> params, HttpServletRequest req, HttpServletResponse resp);
+
+	/**
+	 * 催办
+	 * @param json
+	 * @return
+	 */
+    Result<?> expediting(JSONObject json);
+
+	List<SysRole> getRoleByUserId(String projectLibraryId,String cut);
+
+	void addProcessInfo(ProcessInfoEO processInfoEO, String projectLibraryId, Date endTime);
+
+	void addProcessInfoDetail(String processInfoId, List<ProcessInfoDetailEO> processInfoDetailEOList, Date endTime);
+
+	Result<?> taskUrg(ProjectTaskUrgVo projectTaskUrgVo);
+
+    Result<?> updateFlowInfoByProjectLibraryIds(String projectLibraryIds);
+	void updateFlowInfo(ProjectLawsInventoryEO projectLawsInventoryEO);
+	/**
+	 * studio发布，启动清单确认流程
+	 * @param json
+	 * @return
+	 */
+	Result<?> studioPublish(JSONObject json);
+
+	/**
+	 * studio撤回
+	 * @param json
+	 * @return
+	 */
+	Result<?> studioWithdrew(JSONObject json);
+
+	/**
+	 * 法规工程师退回
+	 * @param json
+	 * @return
+	 */
+	Result<?> regulationOwnerReturned(JSONObject json);
+
+	/**
+	 * 根据id获取交付物类型展示名称
+	 * @param projectLawsInventoryId
+	 * @param cut
+	 * @param flowType
+	 * @return
+	 */
+	String getDeliverableTypeNameById(String projectLawsInventoryId, String cut, String flowType,List<ProjectLawsInventoryEO> projectLawsInventoryEOList,List<SysCategory> categoryList);
+
+	/**
+	 * 根据id获取责任领域展示名称
+	 * @param projectLawsInventoryId
+	 * @param cut
+	 * @param projectLawsInventoryEOList
+	 * @param sysDictItems
+	 * @param dicCode
+	 * @return
+	 */
+    String getDutyTerritoryNameById(String projectLawsInventoryId, String cut, List<ProjectLawsInventoryEO> projectLawsInventoryEOList, List<SysDictItem> sysDictItems,String dicCode);
+
+	void sendMessageByTemplateId(String templeteId,Map<String,Object> params);
+
+	Map<String, Object> getProjectLawsInventoryLinkHrefFeishu(String projectLibraryId, String PRN_CN, String PRN_EN,String roleOpen);
+
+	/**
+	 * 获取待办中心跳转链接
+	 * @param projectLibraryId
+	 * @param todoCenterParams
+	 * @return
+	 */
+	Map<String, Object> getToDoCenterLinkHrefFeishu(String projectLibraryId, Map<String,Object> todoCenterParams);
+
+	/**
+	 * 法规清单根据清单确认截至日期顺序排序
+	 * @param projectLawsInventoryEOS
+	 */
+	void lawsInventoryEOListSortByInventoryAffirmDueDate(List<ProjectLawsInventoryEO> projectLawsInventoryEOS);
+
+	/**
+	 * 法规清单根据设计符合性截至日期顺序排序
+	 * @param projectLawsInventoryEOS
+	 */
+	void lawsInventoryEOListSortByDesignDueDate(List<ProjectLawsInventoryEO> projectLawsInventoryEOS);
+
+	/**
+	 * 法规清单根据验证符合性截至日期顺序排序
+	 * @param projectLawsInventoryEOS
+	 */
+	void lawsInventoryEOListSortByVerifyDueDate(List<ProjectLawsInventoryEO> projectLawsInventoryEOS);
+
+	/**
+	 * 创建查询权限，2023-04-06 修改UAT问题第22条
+	 * @param isProjectRole
+	 * @param currentUser
+	 */
+    void createQueryPermission(int isProjectRole, LoginUser currentUser, QueryWrapper<ProjectLawsInventoryEO> projectLawsInventoryEOQueryWrapper);
+
+	Result<?> resetFlowTemp(JSONObject parmas);
+
+	/**
+	 * 批量更新流程状态
+	 * @param json
+	 * @return
+	 */
+	Result<?> updateFlowStatusBatch(JSONObject json);
+
+    Result<?> citeDeliverable(JSONObject json);
+
+    Result<?> compulsoryTransfer(JSONObject json);
+
+	Map<String, List<Map<String, Object>>> queryDutyPersonByProjectId(Map<String, Object> params);
+
+	/**
+	 * 获取任务确认统计信息
+	 * @param projectLawsInventoryEOList
+	 * @return
+	 */
+    List<Map<String, Object>> getTaskToConfirmStatistics(List<ProjectLawsInventoryEO> projectLawsInventoryEOList);
+
+	/**
+	 * 获取设计符合性统计信息
+	 * @param projectLawsInventoryEOList
+	 * @return
+	 */
+	List<Map<String, Object>> getDesignComplianceStatistice(List<ProjectLawsInventoryEO> projectLawsInventoryEOList);
+
+	/**
+	 * 获取验证符合性统计信息
+	 * @param projectLawsInventoryEOList
+	 * @return
+	 */
+	List<Map<String, Object>> getVerifyComplianceStatistice(List<ProjectLawsInventoryEO> projectLawsInventoryEOList);
+
+	List<Map<String,Object>> queryNotComplianList(Map<String, Object> params);
+
+	void exportNotComplianList(HttpServletResponse response, HttpServletRequest request, Map<String, Object> params);
+
+	/**
+	 * 按照法规任务确认状态分组
+	 * @param pliEos
+	 * @return
+	 */
+	Map<String, Object> groupByFGRwqrStatus(List<ProjectLawsInventoryEO> pliEos);
+
+	/**
+	 * 按照设计符合性状态分组
+	 * @param pliEos
+	 * @return
+	 */
+	Map<String, Object> groupByDesignStatus(List<ProjectLawsInventoryEO> pliEos);
+
+	/**
+	 * 按照验证符合性状态分组
+	 * @param pliEos
+	 * @return
+	 */
+	Map<String, Object> groupByVerifyStatus(List<ProjectLawsInventoryEO> pliEos);
+
+	IPage<ProjectLawsInventoryEO> queryPage(ProjectLawsInventoryEO projectLawsInventoryEO, Integer pageNo, Integer pageSize, HttpServletRequest req);
+
+	Result<?> finalizationVerify(Map<String, Object> params);
+
+	/**
+	 * 获取用户的责任领域数组
+	 * @param params
+	 * @return
+	 */
+	List<SysDictItem> getUserDutyTerritoryList(Map<String, Object> params);
+
+	/***
+	 * 替换用户
+	 * @param params
+	 */
+    void replacementUser(JSONObject json);
+	int checkUserRole(String projectLibraryId, String currentUserId, String lawsInventoryId);
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IPlatformProjectNameInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IPlatformProjectNameInfoEOService.java
new file mode 100644
index 000000000..6ab834589
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IPlatformProjectNameInfoEOService.java
@@ -0,0 +1,73 @@
+package com.jero.modules.projectPlatform.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.project.entity.ProjectLibraryBase;
+import com.jero.modules.project.entity.ProjectNameInfoEO;
+
+import java.util.List;
+
+/**
+ * @Description: 项目名信息表
+ * @Author: jero-boot
+ * @Date:   2022-04-18
+ * @Version: V1.0
+ */
+public interface IPlatformProjectNameInfoEOService extends IService<ProjectNameInfoEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param projectNameInfoEO
+	 * @return
+	 */
+    void add(ProjectNameInfoEO projectNameInfoEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param projectNameInfoEO
+	 * @return
+	 */
+    void editById(ProjectNameInfoEO projectNameInfoEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ProjectNameInfoEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ProjectNameInfoEO> queryList();
+
+	/**
+	 * 返回项目全拼
+	 * @return
+	 */
+	List<ProjectLibraryBase> queryProjectNameList(String cut);
+
+
+
+	//void getSpaceInfo(String cut);
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
new file mode 100644
index 000000000..e8180761f
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -0,0 +1,12047 @@
+package com.jero.modules.projectPlatform.service.impl;
+
+import cn.hutool.core.util.URLUtil;
+import cn.hutool.core.util.ZipUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.utils.IOUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.itextpdf.text.Chapter;
+import com.itextpdf.text.Document;
+import com.itextpdf.text.DocumentException;
+import com.itextpdf.text.Element;
+import com.itextpdf.text.Font;
+import com.itextpdf.text.PageSize;
+import com.itextpdf.text.Paragraph;
+import com.itextpdf.text.Phrase;
+import com.itextpdf.text.Section;
+import com.itextpdf.text.pdf.BaseFont;
+import com.itextpdf.text.pdf.PdfPCell;
+import com.itextpdf.text.pdf.PdfPTable;
+import com.itextpdf.text.pdf.PdfWriter;
+import com.jero.common.api.vo.Result;
+import com.jero.common.constant.CommonConstant;
+import com.jero.common.constant.WebsocketConst;
+import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.constant.enums.MessageType2Enum;
+import com.jero.common.constant.enums.MessageTypeEnum;
+import com.jero.common.constant.enums.MsgColorEnum;
+import com.jero.common.exception.JeroBootException;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.common.system.vo.DictModel;
+import com.jero.common.system.vo.LoginUser;
+import com.jero.common.util.DateUtils;
+import com.jero.common.util.oss.CosBootUtil;
+import com.jero.modules.document.entity.BussDocumentLibraryEO;
+import com.jero.modules.document.service.IBussDocumentLibraryEOService;
+import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl;
+import com.jero.modules.dummy.entity.DummyInventoryBaseEO;
+import com.jero.modules.dummy.entity.DummyInventoryInfoEO;
+import com.jero.modules.dummy.enums.AttestationRankEnum;
+import com.jero.modules.dummy.enums.OrderEnum;
+import com.jero.modules.dummy.service.IDummyInventoryInfoEOService;
+import com.jero.modules.dummy.service.impl.DummyInventoryBaseEOServiceImpl;
+import com.jero.modules.enums.DictCodeEnum;
+import com.jero.modules.feishu.enums.TemplateInfoEnum2;
+import com.jero.modules.feishu.service.IFeishuService;
+import com.jero.modules.feishu.vo.FeishuMsg2Vo;
+import com.jero.modules.feishu.vo.FeishuMsgVo;
+import com.jero.modules.message.websocket.WebSocket;
+import com.jero.modules.oss.entity.OSSFile;
+import com.jero.modules.oss.service.IOSSFileService;
+import com.jero.modules.project.entity.ConditionAssessmentEO;
+import com.jero.modules.project.entity.ProblemManagementEO;
+import com.jero.modules.project.entity.ProjectLawsInventoryEO;
+import com.jero.modules.project.entity.ProjectLawsInventoryEOEn;
+import com.jero.modules.project.entity.ProjectLawsInventoryRejectCauseEO;
+import com.jero.modules.project.entity.ProjectLibraryBase;
+import com.jero.modules.project.entity.ProjectNameInfoEO;
+import com.jero.modules.project.entity.ProjectRelatedPersonnel;
+import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO;
+import com.jero.modules.project.entity.ProjectTaskInventoryEO;
+import com.jero.modules.project.entity.ProjectUserPermission;
+import com.jero.modules.project.entity.ProjectYearNameInfoEO;
+import com.jero.modules.project.enums.CertificationProgressEnum;
+import com.jero.modules.project.enums.ColourEnum;
+import com.jero.modules.project.enums.ComplianceFlowStatusEnum;
+import com.jero.modules.project.enums.CurrentProjectStatusEnum;
+import com.jero.modules.project.enums.DataEnum;
+import com.jero.modules.project.enums.DataSourceEnum;
+import com.jero.modules.project.enums.DesignComplianceStatusEnum;
+import com.jero.modules.project.enums.InventoryAffirmNodeEnum;
+import com.jero.modules.project.enums.InventoryAffirmStatusEnum;
+import com.jero.modules.project.enums.JumpLinkEnum;
+import com.jero.modules.project.enums.MsgTypeEnum;
+import com.jero.modules.project.enums.OperatorResultEnum;
+import com.jero.modules.project.enums.OperatorTypeEnum;
+import com.jero.modules.project.enums.PermissionDescriptionEnum;
+import com.jero.modules.project.enums.ProjectInventoryFieldEnum;
+import com.jero.modules.project.enums.ProjectRoleEnum;
+import com.jero.modules.project.enums.ProjectUserLocationEnum;
+import com.jero.modules.project.enums.RequestSourceEnum;
+import com.jero.modules.project.enums.TaskAffirmStatusEnum;
+import com.jero.modules.project.enums.TaskStatusEnum;
+import com.jero.modules.project.mapper.ProblemManagementEOMapper;
+import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
+import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
+import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper;
+import com.jero.modules.project.mapper.ProjectYearNameInfoEOMapper;
+import com.jero.modules.project.service.IConditionAssessmentEOService;
+import com.jero.modules.project.service.IFeedbackHistoryService;
+import com.jero.modules.project.service.IProjectLawsInventoryRejectCauseEOService;
+import com.jero.modules.project.service.IProjectLibraryRoleRelEOService;
+import com.jero.modules.project.service.IProjectRelatedPersonnelService;
+import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService;
+import com.jero.modules.project.service.IProjectTaskInventoryEOService;
+import com.jero.modules.project.service.IProjectTaskInventoryFeedbackEOService;
+import com.jero.modules.project.service.IProjectUserPermissionService;
+import com.jero.modules.project.service.editImpl.ProjectLawsInventoryEOEditServiceImpl;
+import com.jero.modules.project.service.impl.ProblemManagementEOServiceImpl;
+import com.jero.modules.project.service.impl.ProjectLawsInventoryLogEOServiceImpl;
+import com.jero.modules.project.service.impl.ProjectLibraryBaseServiceImpl;
+import com.jero.modules.project.service.impl.ProjectRelatedPersonnelServiceImpl;
+import com.jero.modules.project.util.WordUtil;
+import com.jero.modules.project.vo.NcrTrackVO;
+import com.jero.modules.project.vo.ProblemManagementVO;
+import com.jero.modules.project.vo.ProjectTaskUrgVo;
+import com.jero.modules.projectPlatform.mapper.PlatformProjectLawsInventoryEOMapper;
+import com.jero.modules.projectPlatform.service.IPlatformProjectLawsInventoryEOService;
+import com.jero.modules.split.common.FileUnZip;
+import com.jero.modules.system.entity.SysAnnouncement;
+import com.jero.modules.system.entity.SysCategory;
+import com.jero.modules.system.entity.SysDictItem;
+import com.jero.modules.system.entity.SysRole;
+import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.enums.DicCodeEnum;
+import com.jero.modules.system.mapper.SysCategoryMapper;
+import com.jero.modules.system.mapper.SysDictItemMapper;
+import com.jero.modules.system.mapper.SysRoleMapper;
+import com.jero.modules.system.mapper.SysUserMapper;
+import com.jero.modules.system.service.IProjectUserDutyTerritoryService;
+import com.jero.modules.system.service.ISysAnnouncementService;
+import com.jero.modules.system.service.ISysDictItemService;
+import com.jero.modules.system.service.ISysDictService;
+import com.jero.modules.system.service.ISysUserService;
+import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
+import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
+import com.jero.modules.system.util.PDFUtils;
+import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
+import com.jero.modules.todoCenter.entity.ProcessInfoEO;
+import com.jero.modules.todoCenter.enums.DesignComplianceFlowNodeKeyEnum;
+import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum;
+import com.jero.modules.todoCenter.enums.VerifyComplianceFlowNodeKeyEnum;
+import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService;
+import com.jero.modules.todoCenter.service.IProcessInfoEOService;
+import com.jero.modules.wkflow.entity.ProcessHistoryEO;
+import com.jero.modules.wkflow.enums.DesignComplianceNodeEnum;
+import com.jero.modules.wkflow.enums.FlowTypeEnum;
+import com.jero.modules.wkflow.feginClient.impl.TaskFeignClientImpl;
+import com.jero.modules.wkflow.feginClient.impl.WorkFlowFeignClientImpl;
+import com.jero.modules.wkflow.service.IProcessHistoryEOService;
+import com.jero.modules.wkflow.service.impl.ProcessHistoryEOServiceImpl;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import org.apache.poi.hssf.usermodel.HSSFDateUtil;
+import org.apache.poi.hssf.usermodel.HSSFRichTextString;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.WorkbookFactory;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.apache.shiro.SecurityUtils;
+import org.aspectj.util.FileUtil;
+import org.docx4j.Docx4J;
+import org.docx4j.TraversalUtil;
+import org.docx4j.XmlUtils;
+import org.docx4j.finders.ClassFinder;
+import org.docx4j.openpackaging.exceptions.Docx4JException;
+import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
+import org.docx4j.wml.Tbl;
+import org.docx4j.wml.Tr;
+import org.jeecgframework.poi.excel.ExcelExportUtil;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.text.Collator;
+import java.text.DateFormat;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import static com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl.copyFile;
+
+//import com.jero.modules.project.util.WordUtil;
+
+/**
+ * @Description: 项目库-法规清单表
+ * @Author: jero-boot
+ * @Date:   2022-04-14
+ * @Version: V1.0
+ */
+@Slf4j
+@Service
+@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
+public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<PlatformProjectLawsInventoryEOMapper, ProjectLawsInventoryEO> implements IPlatformProjectLawsInventoryEOService {
+
+	private static DecimalFormat df = new DecimalFormat("#.00");
+	private static String percentSign = "%";
+	@Autowired
+	private ProjectLibraryBaseMapper projectLibraryBaseMapper;
+
+	@Autowired
+	private SysUserMapper sysUserMapper;
+
+	@Autowired
+	private IBussDocumentLibraryEOService iBussDocumentLibraryEOService;
+
+	@Autowired
+	private IOSSFileService iOSSFileService;
+
+	@Autowired
+	private IFeishuService iFeishuService;
+
+	@Autowired
+	private ISysAnnouncementService sysAnnouncementService;
+
+	@Autowired
+	private ISysUserService sysUserService;
+
+	@Autowired
+	private WebSocket webSocket;
+
+	@Autowired
+	private ProjectRelatedPersonnelMapper projectRelatedPersonnelMapper;
+
+	@Autowired
+	private ProjectNameInfoEOMapper projectNameInfoEOMapper;
+
+	@Autowired
+	private ProjectYearNameInfoEOMapper projectYearNameInfoEOMapper;
+
+	@Autowired
+	private IProjectTaskInventoryEOService projectTaskInventoryEOService;
+
+	@Autowired
+	private IProjectTaskInventoryDetailEOService projectTaskInventoryDetailEOService;
+
+	@Autowired
+	private IProjectTaskInventoryFeedbackEOService projectTaskInventoryFeedbackEOService;
+
+	@Autowired
+	private IFeedbackHistoryService feedbackHistoryService;
+
+	@Autowired
+	private IDummyInventoryInfoEOService dummyInventoryInfoEOService;
+	@Value(value = "${jero.path.upload}")
+	private String uploadpath;
+	@Value("${jero.path.exportPdfTempPath}")
+	private String exportPdfTempPath;
+	@Value("${jero.path.simfangFontFilePath}")
+	private String simfangFontFilePath;
+	@Value(value = "${jero.backUrl}")
+	private String backUrl;
+	@Value(value = "${jero.backUrlPhone}")
+	private String backUrlPhone;
+
+	@Autowired
+	private SysCategoryServiceImpl sysCategoryService;
+	@Autowired
+	private SysDictItemServiceImpl sysDictItemServiceImpl;
+	@Autowired
+	private IProjectRelatedPersonnelService iProjectRelatedPersonnelService;
+
+	@Autowired
+	private ProjectLawsInventoryLogEOServiceImpl projectLawsInventoryLogEOService;
+
+	@Autowired
+	private DummyInventoryBaseEOServiceImpl dummyInventoryBaseEOService;
+
+	@Autowired
+	private SysDictItemMapper sysDictItemMapper;
+
+	@Autowired
+	private IProcessHistoryEOService processHistoryEOService;
+
+	@Autowired
+	private IConditionAssessmentEOService conditionAssessmentEOService;
+
+	@Autowired
+	private WorkFlowFeignClientImpl workFlowFeignClient;
+	@Autowired
+	SysCategoryMapper sysCategoryMapper;
+
+	@Autowired
+	private TaskFeignClientImpl taskFeignClient;
+
+	@Autowired
+	SysRoleMapper sysRoleMapper;
+	@Autowired
+	ProjectLibraryBaseServiceImpl projectLibraryBaseService;
+	@Autowired
+	ProjectRelatedPersonnelServiceImpl projectRelatedPersonnelService;
+
+	@Autowired
+	private IProjectLawsInventoryRejectCauseEOService projectLawsInventoryRejectCauseEOService;
+	@Autowired
+	private IProcessInfoEOService processInfoEOService;
+	@Autowired
+	private IProcessInfoDetailEOService processInfoDetailEOService;
+
+	@Autowired
+	private IFeishuService feishuService;
+
+	@Autowired
+	private IBussDocumentLibraryEOService bussDocumentLibraryEOService;
+
+	@Autowired
+	private IProjectUserPermissionService projectUserPermissionService;
+
+	@Autowired
+	private IProjectUserDutyTerritoryService projectUserDutyTerritoryService;
+
+	@Autowired
+	private ISysDictItemService sysDictItemService;
+	@Autowired
+	private IProjectLibraryRoleRelEOService projectLibraryRoleRelEOService;
+	@Autowired
+	private ProjectLawsInventoryEOEditServiceImpl editService;
+	@Autowired
+	private ProblemManagementEOServiceImpl problemManagementEOService;
+	@Autowired
+	private ProblemManagementEOMapper problemManagementEOMapper;
+	@Autowired
+	private ISysDictService sysDictService;
+	@Autowired
+	private BussDocumentLibraryEOServiceImpl documentLibraryEOService;
+	@Autowired
+	private ProcessHistoryEOServiceImpl processHistoryEOServiceImpl;
+
+	/**
+	 * 保存
+	 *
+	 * @param projectLawsInventoryEO
+	 * @return
+	 */
+	@Override
+	public void add(ProjectLawsInventoryEO projectLawsInventoryEO) {
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		Date now = new Date();
+		List<ProjectTaskInventoryEO> projectTaskInventoryEOList = new ArrayList<>();
+		//法规清单所有的数据
+		LambdaQueryWrapper<ProjectLawsInventoryEO> wrapperTemp = new LambdaQueryWrapper<>();
+		wrapperTemp.in(ProjectLawsInventoryEO::getProjectLibraryId, projectLawsInventoryEO.getProjectLibraryId());
+		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = this.list(wrapperTemp);
+		//调取
+		String dummyInventoryBaseId = projectLawsInventoryEO.getDummyInventoryBaseId();
+		if (StringUtils.isNotBlank(projectLawsInventoryEO.getDummyids())) {
+			//查询虚拟清单对应清单维护中的数据
+			LambdaQueryWrapper<DummyInventoryInfoEO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+			lambdaQueryWrapper.in(DummyInventoryInfoEO::getId, Arrays.asList(projectLawsInventoryEO.getDummyids().split(",")));
+			List<DummyInventoryInfoEO> dummyInventoryInfoEOList = dummyInventoryInfoEOService.list(lambdaQueryWrapper);
+			List<DummyInventoryInfoEO> dummyInventoryInfoEOListNew = new ArrayList<>();
+			if (dummyInventoryInfoEOList.size() != 0) {
+				List<ProjectLawsInventoryEO> projectLawsInventoryEOS = new ArrayList<>();
+				//责任领域如果有多个,则需要拆分成多条
+				for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOList) {
+					String dutyTerritory = dummyInventoryInfoEO.getDutyTerritory();
+					if (StringUtils.isNotBlank(dutyTerritory)) {
+						for (String dutyTerritoryOne : dutyTerritory.split(",")) {
+							DummyInventoryInfoEO dummyInventoryInfoEONew = new DummyInventoryInfoEO();
+							BeanUtils.copyProperties(dummyInventoryInfoEO, dummyInventoryInfoEONew);
+							dummyInventoryInfoEONew.setDutyTerritory(dutyTerritoryOne);
+							dummyInventoryInfoEOListNew.add(dummyInventoryInfoEONew);
+						}
+					} else {
+						dummyInventoryInfoEOListNew.add(dummyInventoryInfoEO);
+					}
+				}
+				if (projectLawsInventoryEOList.size() == 0) {
+					//此时法规清单中没有数据,直接将维护清单中的数据添加即可
+					for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOListNew) {
+						ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO();
+						projectLawsInventoryEOTemp.setProjectLibraryId(projectLawsInventoryEO.getProjectLibraryId());
+						BeanUtils.copyProperties(dummyInventoryInfoEO, projectLawsInventoryEOTemp);
+						projectLawsInventoryEOTemp.setId(UUID.randomUUID().toString().replace("-", ""));
+						projectLawsInventoryEOTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
+						projectLawsInventoryEOTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
+						projectLawsInventoryEOTemp.setStandId(dummyInventoryInfoEO.getBussDocumentLibraryId());
+						projectLawsInventoryEOTemp.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+						projectLawsInventoryEOTemp.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+						projectLawsInventoryEOTemp.setCreateTime(new Date());
+						projectLawsInventoryEOTemp.setUpdateTime(new Date());
+						projectLawsInventoryEOS.add(projectLawsInventoryEOTemp);
+					}
+				} else {
+					//此时法规清单中有数据,再添加虚拟清单数据时,如果法规清单中已有要填加的虚拟清单数据,则数据以法规清单为准
+					List<ProjectLawsInventoryEO> projectLawsInventoryEOListTemp = new ArrayList<>();
+					for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOListNew) {
+						List<ProjectLawsInventoryEO> collect = projectLawsInventoryEOList.stream()
+								.filter(e -> e.getSerialNumber().equals(dummyInventoryInfoEO.getSerialNumber())).collect(Collectors.toList());
+						if (collect.size() != 0) {
+							for (ProjectLawsInventoryEO lawsInventoryEO : collect) {
+								//数据对比
+								ProjectLawsInventoryEO projectLawsInventoryEOTemp = dataCompare(lawsInventoryEO, dummyInventoryInfoEO);
+								projectLawsInventoryEOListTemp.add(projectLawsInventoryEOTemp);
+							}
+						} else {
+							ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO();
+							projectLawsInventoryEOTemp.setProjectLibraryId(projectLawsInventoryEO.getProjectLibraryId());
+							BeanUtils.copyProperties(dummyInventoryInfoEO, projectLawsInventoryEOTemp);
+							projectLawsInventoryEOTemp.setId(UUID.randomUUID().toString().replace("-", ""));
+							projectLawsInventoryEOTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
+							projectLawsInventoryEOTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
+							projectLawsInventoryEOTemp.setStandId(dummyInventoryInfoEO.getBussDocumentLibraryId());
+							projectLawsInventoryEOTemp.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+							projectLawsInventoryEOTemp.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+							projectLawsInventoryEOTemp.setCreateTime(new Date());
+							projectLawsInventoryEOTemp.setUpdateTime(new Date());
+							projectLawsInventoryEOS.add(projectLawsInventoryEOTemp);
+						}
+					}
+					if (projectLawsInventoryEOListTemp.size() != 0) {
+						this.updateBatchById(projectLawsInventoryEOListTemp);
+					}
+				}
+				if (projectLawsInventoryEOS.size() != 0) {
+					this.saveBatch(projectLawsInventoryEOS);
+					//设置权限
+					for (ProjectLawsInventoryEO lawsInventoryEO : projectLawsInventoryEOS) {
+						ProjectUserPermission permission = new ProjectUserPermission();
+						permission.setProjectId(projectLawsInventoryEO.getProjectLibraryId());
+						permission.setUserId(sysUser.getId());
+						permission.setBelong(ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_CREATE_BY.getValue());
+						permission.setDescription(PermissionDescriptionEnum.PROJECT_LAWS_INVENTORY.getValue() + lawsInventoryEO.getId());
+						permission.setCreateTime(now);
+						permission.setUpdateTime(now);
+						projectUserPermissionService.add(permission);
+					}
+					projectLawsInventoryEOS.forEach(lawsInventory -> {
+						ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
+						String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
+						projectTaskInventoryEO.setId(projectTaskInventoryId);
+						projectTaskInventoryEO.setProjectLawsInventoryId(lawsInventory.getId());
+						projectTaskInventoryEO.setStandId(lawsInventory.getStandId());
+						projectTaskInventoryEO.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
+						projectTaskInventoryEOList.add(projectTaskInventoryEO);
+					});
+
+					//更新log
+					String projectLibraryId = projectLawsInventoryEOS.stream().map(e -> e.getProjectLibraryId()).collect(Collectors.toList()).get(0);
+					String username = sysUser.getUsername();
+					QueryWrapper<DummyInventoryBaseEO> queryWrapper = new QueryWrapper<>();
+					String dummyInventoryBaseName = dummyInventoryBaseEOService.list(queryWrapper.eq("id", dummyInventoryBaseId)).get(0).getName();//name
+					String contentLog = username + "调取了" + dummyInventoryBaseName + "虚拟清单的标准内容";
+					String enContentLog = username + " called the standard content of" + dummyInventoryBaseName + "virtual inventory.";
+					projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId, CutEnum.CN.getValue());
+					projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId, CutEnum.EN.getValue());
+				}
+			} else if (dummyInventoryInfoEOList.size() == 0 && StringUtils.isBlank(projectLawsInventoryEO.getFlag())) {
+				//flag为二次确认标识,flag为空时进行验证
+				throw new JeroBootException("该虚拟清单的维护清单中没有数据,是否需要添加");
+			}
+		}
+
+		//新增
+		String ids = projectLawsInventoryEO.getIds();
+		if (StringUtils.isNotBlank(ids)) {
+			//验重,对于每条法规清单添加文档库数据(之前添加过的就不能再次添加)
+			//1.已经添加过的文档库数据
+			LambdaQueryWrapper<ProjectLawsInventoryEO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+			lambdaQueryWrapper.in(ProjectLawsInventoryEO::getProjectLibraryId, Arrays.asList(projectLawsInventoryEO.getProjectLibraryId().split(",")));
+			List<ProjectLawsInventoryEO> projectLawsInventoryEOS = this.list(lambdaQueryWrapper);
+			List<String> serialNumberList = new ArrayList<>();
+			if (projectLawsInventoryEOS.size() != 0) {
+				List<String> collect = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getSerialNumber).collect(Collectors.toList());
+				serialNumberList.addAll(collect);
+			}
+			//2.文档库数据
+			LambdaQueryWrapper<BussDocumentLibraryEO> wrapper = new LambdaQueryWrapper<>();
+			wrapper.in(BussDocumentLibraryEO::getId, Arrays.asList(ids.split(",")));
+			List<BussDocumentLibraryEO> bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapper);
+			if (bussDocumentLibraryEOList.size() != 0) {
+				List<String> serialNumberBussList = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList());
+				if (serialNumberList.size() != 0) {
+					List<String> collect = serialNumberList.stream().filter(e -> serialNumberBussList.contains(e)).collect(Collectors.toList());
+					if (collect.size() != 0) {
+						if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+							throw new JeroBootException(StringUtils.join(collect, ",") + "已存在不能重复添加,请重新选择");
+						} else {
+							throw new JeroBootException(StringUtils.join(collect, ",") + "Already exists and cannot be added again");
+						}
+					}
+				}
+			}
+
+			List<ProjectLawsInventoryEO> list = new ArrayList<>();
+			List<ProjectUserPermission> addPermission = new ArrayList<>();
+			for (BussDocumentLibraryEO bussDocumentLibraryEO : bussDocumentLibraryEOList) {
+				String standId = bussDocumentLibraryEO.getId();
+
+				ProjectLawsInventoryEO projectLawsInventoryTemp = new ProjectLawsInventoryEO();
+				BeanUtils.copyProperties(bussDocumentLibraryEO, projectLawsInventoryTemp);
+				String projectLawsInventoryId = UUID.randomUUID().toString().replace("-", "");
+				projectLawsInventoryTemp.setId(projectLawsInventoryId);
+				projectLawsInventoryTemp.setProjectLibraryId(projectLawsInventoryEO.getProjectLibraryId());
+				projectLawsInventoryTemp.setCreateTime(new Date());
+				projectLawsInventoryTemp.setUpdateTime(new Date());
+				projectLawsInventoryTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
+				projectLawsInventoryTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
+				projectLawsInventoryTemp.setStandId(standId);
+				projectLawsInventoryTemp.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+				projectLawsInventoryTemp.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+				list.add(projectLawsInventoryTemp);
+
+				ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
+				String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
+				projectTaskInventoryEO.setId(projectTaskInventoryId);
+				projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventoryId);
+				projectTaskInventoryEO.setStandId(standId);
+				projectTaskInventoryEO.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
+				projectTaskInventoryEOList.add(projectTaskInventoryEO);
+
+				//添加权限
+				ProjectUserPermission permission = new ProjectUserPermission();
+				permission.setProjectId(projectLawsInventoryEO.getProjectLibraryId());
+				permission.setUserId(sysUser.getId());
+				permission.setBelong(ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_CREATE_BY.getValue());
+				permission.setDescription(PermissionDescriptionEnum.PROJECT_LAWS_INVENTORY.getValue() + projectLawsInventoryId);
+				permission.setCreateTime(now);
+				permission.setUpdateTime(now);
+				addPermission.add(permission);
+			}
+			super.saveBatch(list);
+			if (ObjectUtils.isNotEmpty(addPermission)) {
+				projectUserPermissionService.saveBatch(addPermission);
+			}
+
+			//更新log
+			String username = sysUser.getUsername();
+			String serialNumber = list.stream().map(e -> e.getSerialNumber()).collect(Collectors.joining(","));
+			String contentLog = username + "向清单中添加了“" + serialNumber + "”";
+			String enContentLog = username + " added “" + serialNumber + "” to the list.";
+
+			projectLawsInventoryLogEOService.updateLog(contentLog, projectLawsInventoryEO.getProjectLibraryId(), CutEnum.CN.getValue());
+			projectLawsInventoryLogEOService.updateLog(enContentLog, projectLawsInventoryEO.getProjectLibraryId(), CutEnum.EN.getValue());
+		}
+
+		if (CollectionUtils.isNotEmpty(projectTaskInventoryEOList)) {
+			//项目任务清单数据初始化。
+			this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
+			projectTaskInventoryEOList.forEach(taskInventory -> {
+				this.initConditionAssessmentEO(taskInventory.getProjectLawsInventoryId());
+			});
+		}
+	}
+
+	@Override
+	public void editById(ProjectLawsInventoryEO projectLawsInventoryEO) {
+		this.editService.editById(projectLawsInventoryEO);
+	}
+
+	/**
+	 * 更新流程信息
+	 *
+	 * @param projectLawsInventoryEO
+	 */
+	@Override
+	public void updateFlowInfo(ProjectLawsInventoryEO projectLawsInventoryEO) {
+		//只有法规的 任务确认状态为接受，才能启动 设计、验证、prehomo三个流程。
+		if (StringUtils.equals(projectLawsInventoryEO.getTaskAffirmStatus(), TaskAffirmStatusEnum.ACCEPTED.getValue())) {
+			QueryWrapper<ProjectTaskInventoryEO> taskInventoryQueryWrapper = new QueryWrapper<>();
+			taskInventoryQueryWrapper.lambda().eq(ProjectTaskInventoryEO::getProjectLawsInventoryId, projectLawsInventoryEO.getId());
+			ProjectTaskInventoryEO projectTaskInventoryEO = projectTaskInventoryEOService.getBaseMapper().selectOne(taskInventoryQueryWrapper);
+			if (projectTaskInventoryEO != null) {
+				String designPId = projectTaskInventoryEO.getDesignPId();
+				if (StringUtils.isNotEmpty(designPId)) {
+					updateFlowAssignee(projectLawsInventoryEO, projectTaskInventoryEO, designPId, FlowTypeEnum.SJFHXSHLC.getValue());
+				}
+
+				String verifyPId = projectTaskInventoryEO.getVerifyPId();
+				if (StringUtils.isNotEmpty(verifyPId)) {
+					updateFlowAssignee(projectLawsInventoryEO, projectTaskInventoryEO, verifyPId, FlowTypeEnum.YZFHXSCLC.getValue());
+				}
+
+				String prehomoPId = projectTaskInventoryEO.getPrehomoPId();
+				if (StringUtils.isNotEmpty(prehomoPId)) {
+					updateFlowAssignee(projectLawsInventoryEO, projectTaskInventoryEO, prehomoPId, FlowTypeEnum.PREHOMOQRLC.getValue());
+				}
+			}
+		}
+	}
+
+	/**
+	 * 更新流程办理人
+	 *
+	 * @param projectLawsInventoryEO 法规清单数据
+	 * @param projectTaskInventoryEO 任务清单数据
+	 * @param pId                    流程实例id
+	 * @param flowType               流程类型
+	 */
+	public void updateFlowAssignee(ProjectLawsInventoryEO projectLawsInventoryEO, ProjectTaskInventoryEO projectTaskInventoryEO, String pId, String flowType) {
+		QueryWrapper<ProjectTaskInventoryDetailEO> taskInventoryDetailWrapper = new QueryWrapper<>();
+		taskInventoryDetailWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getProjectTaskInventoryId, projectTaskInventoryEO.getProjectLawsInventoryId());
+		taskInventoryDetailWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getActiProcInstId, pId);
+		taskInventoryDetailWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getFlowType, flowType);
+		List<ProjectTaskInventoryDetailEO> taskInventoryDetailList = projectTaskInventoryDetailEOService.getBaseMapper().selectList(taskInventoryDetailWrapper);
+
+		if (CollectionUtils.isNotEmpty(taskInventoryDetailList)) {
+			if (StringUtils.equals(flowType, FlowTypeEnum.SJFHXSHLC.getValue())) {
+				for (ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO : taskInventoryDetailList) {
+					if (StringUtils.equals(projectTaskInventoryDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey())) {
+						//更新责任人的任务
+						projectTaskInventoryDetailEO.setUserId(projectLawsInventoryEO.getDesignDutyId());
+					}
+					if (StringUtils.equals(projectTaskInventoryDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.SPONSOR_REVIEW.getKey())) {
+						//更新发起人的任务
+						projectTaskInventoryDetailEO.setUserId(projectLawsInventoryEO.getDesignInitiatorId());
+					}
+					this.projectTaskInventoryDetailEOService.updateById(projectTaskInventoryDetailEO);
+				}
+			} else if (StringUtils.equals(flowType, FlowTypeEnum.PREHOMOQRLC.getValue())) {
+				for (ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO : taskInventoryDetailList) {
+					if (StringUtils.equals(projectTaskInventoryDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey())) {
+						//更新责任人的任务
+						projectTaskInventoryDetailEO.setUserId(projectLawsInventoryEO.getPrehomoDutyId());
+					}
+					if (StringUtils.equals(projectTaskInventoryDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.SPONSOR_REVIEW.getKey())) {
+						//更新发起人的任务
+						projectTaskInventoryDetailEO.setUserId(projectLawsInventoryEO.getPrehomoInitiatorId());
+					}
+					this.projectTaskInventoryDetailEOService.updateById(projectTaskInventoryDetailEO);
+				}
+			} else if (StringUtils.equals(flowType, FlowTypeEnum.YZFHXSCLC.getValue())) {
+				for (ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO : taskInventoryDetailList) {
+					if (StringUtils.equals(projectTaskInventoryDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey())) {
+						//更新责任人的任务
+						projectTaskInventoryDetailEO.setUserId(projectLawsInventoryEO.getVerifyDutyId());
+					}
+					if (StringUtils.equals(projectTaskInventoryDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.SPONSOR_REVIEW.getKey())) {
+						//更新发起人的任务
+						projectTaskInventoryDetailEO.setUserId(projectLawsInventoryEO.getVerifyInitiatorId());
+					}
+					this.projectTaskInventoryDetailEOService.updateById(projectTaskInventoryDetailEO);
+				}
+			}
+			//更新待办中心流程信息明细表，处理人
+			this.updateProcessInfoDetailAssignee(projectLawsInventoryEO, pId, flowType);
+		}
+	}
+
+	/**
+	 * 更新待办中心流程信息明细表，处理人
+	 *
+	 * @param projectLawsInventoryEO
+	 * @param pId
+	 * @param flowType
+	 */
+	public void updateProcessInfoDetailAssignee(ProjectLawsInventoryEO projectLawsInventoryEO, String pId, String flowType) {
+		this.processInfoDetailEOService.updateProcessInfoDetailUserId(projectLawsInventoryEO, pId, flowType);
+	}
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public void deleteById(String id, String projectLibraryId, String cut) {
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		int isProjectRole = this.checkUserRole(projectLibraryId, currentUser.getId(), "");
+		if (!ProjectRoleEnum.STUDIO_ENGINEER.getValue().equals(String.valueOf(isProjectRole))) {
+			if (CutEnum.CN.getValue().equals(cut)) {
+				throw new JeroBootException("该用户没有删除权限");
+			} else {
+				throw new JeroBootException("The user has no deletion permission");
+			}
+		}
+
+		//更新log
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		String username = sysUser.getUsername();
+		QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
+		String serialNumber = list(queryWrapper.eq("id", id)).get(0).getSerialNumber();
+		String contentLog = username + "删除了清单中的“" + serialNumber + "”";
+		String enContentLog = username + " deleted “" + serialNumber + "” from the list";
+		projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId, CutEnum.CN.getValue());
+		projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId, CutEnum.EN.getValue());
+
+		removeById(id);
+		this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(Arrays.asList(id.split(",")));
+
+		//删除该条法规清单数据的 项目当前状态数据
+		QueryWrapper<ConditionAssessmentEO> conditionAssessmentRemoveWrapper = new QueryWrapper<>();
+		conditionAssessmentRemoveWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId, id);
+		this.conditionAssessmentEOService.remove(conditionAssessmentRemoveWrapper);
+		//删除该条法规清单数据的拒绝原因。
+		QueryWrapper<ProjectLawsInventoryRejectCauseEO> rejectCauseRemoveWrapper = new QueryWrapper<>();
+		rejectCauseRemoveWrapper.lambda().eq(ProjectLawsInventoryRejectCauseEO::getProjectLawsInventoryId, id);
+		this.projectLawsInventoryRejectCauseEOService.remove(rejectCauseRemoveWrapper);
+		//删除相关人员权限
+		QueryWrapper<ProjectUserPermission> delPermission = new QueryWrapper<>();
+		delPermission.eq("description", PermissionDescriptionEnum.PROJECT_LAWS_INVENTORY.getValue() + id);
+		projectUserPermissionService.remove(delPermission);
+	}
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+	public void deleteByIds(List<String> ids, String projectLibraryId, String cut) {
+		if (ObjectUtils.isEmpty(ids)) {
+			if (CutEnum.CN.getValue().equals(cut)) {
+				throw new JeroBootException("请选择数据");
+			} else {
+				throw new JeroBootException("Please select data");
+			}
+		}
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		int isProjectRole = this.checkUserRole(projectLibraryId, currentUser.getId(), "");
+		if (!ProjectRoleEnum.STUDIO_ENGINEER.getValue().equals(String.valueOf(isProjectRole))) {
+			if (CutEnum.CN.getValue().equals(cut)) {
+				throw new JeroBootException("该用户没有删除权限");
+			} else {
+				throw new JeroBootException("The user has no deletion permission");
+			}
+		}
+
+		//更新log
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		String username = sysUser.getUsername();
+		QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
+		List<ProjectLawsInventoryEO> lawsList = list(queryWrapper.in("id", ids));
+		String serialNumber = lawsList.stream().map(e -> e.getSerialNumber()).collect(Collectors.joining(","));
+
+		String contentLog = username + "删除了清单中的“" + serialNumber + "”";
+		String enContentLog = username + " deleted “" + serialNumber + "” from the list";
+		projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId, CutEnum.CN.getValue());
+		projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId, CutEnum.EN.getValue());
+		removeByIds(ids);
+		this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(ids);
+
+		//删除该条法规清单数据的 项目当前状态数据
+		QueryWrapper<ConditionAssessmentEO> conditionAssessmentRemoveWrapper = new QueryWrapper<>();
+		conditionAssessmentRemoveWrapper.lambda().in(ConditionAssessmentEO::getProjectLawsInventoryId, ids);
+		this.conditionAssessmentEOService.remove(conditionAssessmentRemoveWrapper);
+
+		//删除该条法规清单数据的拒绝原因。
+		QueryWrapper<ProjectLawsInventoryRejectCauseEO> rejectCauseRemoveWrapper = new QueryWrapper<>();
+		rejectCauseRemoveWrapper.lambda().in(ProjectLawsInventoryRejectCauseEO::getProjectLawsInventoryId, ids);
+		this.projectLawsInventoryRejectCauseEOService.remove(rejectCauseRemoveWrapper);
+
+		//删除相关人员权限
+		List<String> description = new ArrayList<>();
+		QueryWrapper<ProjectUserPermission> delPermission = new QueryWrapper<>();
+		for (String id : ids) {
+			description.add(PermissionDescriptionEnum.PROJECT_LAWS_INVENTORY.getValue() + id);
+		}
+		delPermission.in("description", description);
+		projectUserPermissionService.remove(delPermission);
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public ProjectLawsInventoryEO queryById(String id) {
+		return getById(id);
+	}
+
+	/**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+	public List<ProjectLawsInventoryEO> queryList(ProjectLawsInventoryEO projectLawsInventoryEO, HttpServletRequest req) {
+
+		long startTime = System.currentTimeMillis();
+		String dutyTerritoryStr = "";
+		if (StringUtils.isNotEmpty(projectLawsInventoryEO.getDutyTerritory())) {
+			dutyTerritoryStr = projectLawsInventoryEO.getDutyTerritory();
+			projectLawsInventoryEO.setDutyTerritory(null);
+		}
+
+		QueryWrapper<ProjectLawsInventoryEO> projectLawsInventoryEOQueryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO, req.getParameterMap());
+		projectLawsInventoryEOQueryWrapper.orderByDesc("create_time", "serial_number");
+		String projectLibraryId = projectLawsInventoryEO.getProjectLibraryId();
+
+		if (StringUtils.isNotEmpty(dutyTerritoryStr)) {
+			String finalDutyTerritoryStr = dutyTerritoryStr.replaceAll("\\*", "");
+			projectLawsInventoryEOQueryWrapper.and(query -> {
+				query.lambda().like(ProjectLawsInventoryEO::getDutyTerritory, finalDutyTerritoryStr);
+				if (StringUtils.contains(finalDutyTerritoryStr, ",")) {
+					String[] dutyTerritoryArr = finalDutyTerritoryStr.split(",");
+					for (String duty : dutyTerritoryArr) {
+						query.or(q -> {
+							q.like("duty_territory", duty);
+						});
+					}
+				}
+			});
+		}
+
+
+		if (StringUtils.isEmpty(projectLibraryId)) {
+			throw new JeroBootException("项目库id不能为空！");
+		}
+
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		//projectLawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
+
+		//验证当前用户在该项目中是什么角色
+		//int isProjectRole = checkUserRole(projectLibraryId, currentUser.getId(), "");
+		//if(isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())){
+		int isProjectRole = Integer.parseInt(projectLawsInventoryEO.getRoleCode());
+
+		log.info("一阶段消耗时间：" + (System.currentTimeMillis() - startTime));
+
+		if (isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())
+				&& isProjectRole != Integer.parseInt(ProjectRoleEnum.MANAGER.getValue())
+				&& isProjectRole != Integer.parseInt(ProjectRoleEnum.ADMIN.getValue())
+				&& isProjectRole != Integer.parseInt(ProjectRoleEnum.VIEWER.getValue())) {
+			/*projectLawsInventoryEOQueryWrapper.and(queryWrapper ->{
+				queryWrapper.eq("regulation_owner_id",currentUser.getId()).
+						or().eq("engineering_interface_person",currentUser.getId()).
+						or().eq("design_duty_id",currentUser.getId()).
+						or().eq("verify_duty_id",currentUser.getId());
+			});*/
+
+			// 创建查询权限
+			this.createQueryPermission(isProjectRole, currentUser, projectLawsInventoryEOQueryWrapper);
+		}
+		List<ProjectLawsInventoryEO> result = super.baseMapper.selectList(projectLawsInventoryEOQueryWrapper);
+		log.info("二阶段消耗时间：" + (System.currentTimeMillis() - startTime));
+		if (isProjectRole == Integer.parseInt(ProjectRoleEnum.VIEWER.getValue())) {
+			//查当前用户Viewer对应责任领域
+			List<String> dutyTerritoryList = projectUserDutyTerritoryService.queryDutyTerritoryByUserId(currentUser.getId());
+			if (ObjectUtils.isNotEmpty(dutyTerritoryList)) {
+//				result = result.stream().filter(e -> dutyTerritoryList.contains(e.getDutyTerritory())).collect(Collectors.toList());
+				result = result.stream().filter(data -> {
+					boolean flag = false;
+					if (StringUtils.isNotEmpty(data.getDutyTerritory())) {
+						for (String dutyTerritory : dutyTerritoryList) {
+							if (StringUtils.contains(data.getDutyTerritory(), dutyTerritory)) {
+								flag = true;
+								break;
+							}
+						}
+					}
+					return flag;
+				}).collect(Collectors.toList());
+			} else {
+				result = new ArrayList<>();
+			}
+		}
+		dataDispose(result, currentUser, isProjectRole, projectLawsInventoryEO.getCut());
+		log.info("三阶段消耗时间：" + (System.currentTimeMillis() - startTime));
+		dataDictDispose(result, projectLawsInventoryEO.getCut());
+		log.debug("处理数据字典消耗时间：" + (System.currentTimeMillis() - startTime));
+		//表头排序
+		result = hearSort(projectLawsInventoryEO, result);
+		return result;
+	}
+
+	private List<ProjectLawsInventoryEO> hearSort(ProjectLawsInventoryEO projectLawsInventoryEO, List<ProjectLawsInventoryEO> result) {
+//		String orderBy = "1";
+//		String orderByField = "serialNumber";
+		String orderBy = projectLawsInventoryEO.getOrderBy();
+		String orderByField = projectLawsInventoryEO.getOrderByField();
+		if (ObjectUtils.isNotEmpty(orderByField)) {
+			Collator comparator = Collator.getInstance(Locale.CHINESE);
+			//编号  serialNumber
+			if ("serialNumber".equals(orderByField)) {
+				if (OrderEnum.POSITIVE.getValue().equals(orderBy)) {
+					Collections.sort(result, (e1, e2) -> {
+						return comparator.compare(e1.getSerialNumber(), e2.getSerialNumber());
+					});
+				} else if (OrderEnum.REVERSE.getValue().equals(orderBy)) {
+					Collections.sort(result, (e1, e2) -> {
+						return comparator.compare(e2.getSerialNumber(), e1.getSerialNumber());
+					});
+				}
+			}
+			// 认证类型 attestationType
+			if("attestationType".equals(orderByField)){
+				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+					Collections.sort(result,(e1, e2)->{
+						String e1AttestationType = StringUtils.isNotBlank(e1.getAttestationType()) ? e1.getAttestationType() : "";
+						String e2AttestationType = StringUtils.isNotBlank(e2.getAttestationType()) ? e2.getAttestationType() : "";
+						return comparator.compare(e1AttestationType,e2AttestationType);
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+					Collections.sort(result,(e1,e2)->{
+						String e1AttestationType = StringUtils.isNotBlank(e1.getAttestationType()) ? e1.getAttestationType() : "";
+						String e2AttestationType = StringUtils.isNotBlank(e2.getAttestationType()) ? e2.getAttestationType() : "";
+						return comparator.compare(e2AttestationType,e1AttestationType);
+					});
+				}
+			}
+			// 认证级别 attestationRank
+			if("attestationRank".equals(orderByField)){
+				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+					Collections.sort(result,(e1, e2)->{
+						String e1AttestationRank = StringUtils.isNotBlank(e1.getAttestationRank()) ? e1.getAttestationRank() : "";
+						String e2AttestationRank = StringUtils.isNotBlank(e2.getAttestationRank()) ? e2.getAttestationRank() : "";
+						return comparator.compare(e1AttestationRank,e2AttestationRank);
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+					Collections.sort(result,(e1,e2)->{
+						String e1AttestationRank = StringUtils.isNotBlank(e1.getAttestationRank()) ? e1.getAttestationRank() : "";
+						String e2AttestationRank = StringUtils.isNotBlank(e2.getAttestationRank()) ? e2.getAttestationRank() : "";
+						return comparator.compare(e2AttestationRank,e1AttestationRank);
+					});
+				}
+			}
+			// WVTA ID  wvtaId
+			if ("wvtaId".equals(orderByField)) {
+				if (OrderEnum.POSITIVE.getValue().equals(orderBy)) {
+					Collections.sort(result, (e1, e2) -> {
+						return comparator.compare(e1.getWvtaId(), e2.getWvtaId());
+					});
+				} else if (OrderEnum.REVERSE.getValue().equals(orderBy)) {
+					Collections.sort(result, (e1, e2) -> {
+						return comparator.compare(e2.getWvtaId(), e1.getWvtaId());
+					});
+				}
+			}
+			// 责任领域  dutyTerritory_dictText
+			if ("dutyTerritory".equals(orderByField)) {
+				if (OrderEnum.POSITIVE.getValue().equals(orderBy)) {
+					Collections.sort(result, (e1, e2) -> {
+						return comparator.compare(e1.getDutyTerritory_dictText(), e2.getDutyTerritory_dictText());
+					});
+				} else if (OrderEnum.REVERSE.getValue().equals(orderBy)) {
+					Collections.sort(result, (e1, e2) -> {
+						return comparator.compare(e2.getDutyTerritory_dictText(), e1.getDutyTerritory_dictText());
+					});
+				}
+			}
+			// 法规工程师  regulationOwnerName
+			if ("regulationOwnerName".equals(orderByField)) {
+				if (OrderEnum.POSITIVE.getValue().equals(orderBy)) {
+					Collections.sort(result, (e1, e2) -> {
+						return comparator.compare(e1.getRegulationOwnerName(), e2.getRegulationOwnerName());
+					});
+				} else if (OrderEnum.REVERSE.getValue().equals(orderBy)) {
+					Collections.sort(result, (e1, e2) -> {
+						return comparator.compare(e2.getRegulationOwnerName(), e1.getRegulationOwnerName());
+					});
+				}
+			}
+			// 认证工程师   homologationEngineerName
+			if ("homologationEngineerName".equals(orderByField)) {
+				if (OrderEnum.POSITIVE.getValue().equals(orderBy)) {
+					Collections.sort(result, (e1, e2) -> {
+						return comparator.compare(e1.getHomologationEngineerName(), e2.getHomologationEngineerName());
+					});
+				} else if (OrderEnum.REVERSE.getValue().equals(orderBy)) {
+					Collections.sort(result, (e1, e2) -> {
+						return comparator.compare(e2.getHomologationEngineerName(), e1.getHomologationEngineerName());
+					});
+				}
+			}
+			// 工程接口人   engineeringInterfacePersonName
+			if ("engineeringInterfacePersonName".equals(orderByField)) {
+				if (OrderEnum.POSITIVE.getValue().equals(orderBy)) {
+					Collections.sort(result, (e1, e2) -> {
+						return comparator.compare(e1.getEngineeringInterfacePersonName(), e2.getEngineeringInterfacePersonName());
+					});
+				} else if (OrderEnum.REVERSE.getValue().equals(orderBy)) {
+					Collections.sort(result, (e1, e2) -> {
+						return comparator.compare(e2.getEngineeringInterfacePersonName(), e1.getEngineeringInterfacePersonName());
+					});
+				}
+			}
+			List<ProjectLawsInventoryEO> list = new LinkedList<>();
+			// 清单确认状态（未发起，法规待确认，认证待确认，接受，法规拒绝，认证拒绝）  inventoryAffirmStatusName
+			//InventoryAffirmStatusEnum
+			if ("inventoryAffirmStatusName".equals(orderByField)) {
+				result = inventorySort(orderBy, orderByField, result, list);
+			}
+			// 任务确认状态（未发起，待确认，接受，拒绝） taskAffirmStatusName
+			//TaskAffirmStatusEnum
+			if ("taskAffirmStatusName".equals(orderByField)) {
+				result = taskSort(orderBy, orderByField, result, list);
+			}
+			// 认证级别（WVTA，Com.-VTA，Cert.-Market，Reg.-Market） attestationRank_dictText
+			if ("attestationRank".equals(orderByField)) {
+				result = attestationRankSort(orderBy, orderByField, result, list);
+			}
+
+			// 设计符合性排序
+			// 设计符合性-责任人   designDutyId
+			if ("designDutyId".equals(orderByField)) {
+				if (OrderEnum.POSITIVE.getValue().equals(orderBy)) {
+					Collections.sort(result, (e1, e2) -> {
+						return comparator.compare(e1.getDesignDutyIdName(), e2.getDesignDutyIdName());
+					});
+				} else if (OrderEnum.REVERSE.getValue().equals(orderBy)) {
+					Collections.sort(result, (e1, e2) -> {
+						return comparator.compare(e2.getDesignDutyIdName(), e1.getDesignDutyIdName());
+					});
+				}
+			}
+			// 设计符合性-截止时间   designDueDate
+			if ("designDueDate".equals(orderByField)) {
+				if (OrderEnum.POSITIVE.getValue().equals(orderBy)) {
+					Collections.sort(result, (e1, e2) -> {
+						if (e1.getDesignDueDate() != null && e2.getDesignDueDate() != null) {
+							String e1DesignDueDate = DateUtils.formatDate(e1.getDesignDueDate());
+							String e2DesignDueDate = DateUtils.formatDate(e2.getDesignDueDate());
+							return comparator.compare(e1DesignDueDate, e2DesignDueDate);
+						}
+						return -1;
+					});
+				} else if (OrderEnum.REVERSE.getValue().equals(orderBy)) {
+					Collections.sort(result, (e1, e2) -> {
+						if (e1.getDesignDueDate() != null && e2.getDesignDueDate() != null) {
+							String e1DesignDueDate = DateUtils.formatDate(e1.getDesignDueDate());
+							String e2DesignDueDate = DateUtils.formatDate(e2.getDesignDueDate());
+							return comparator.compare(e2DesignDueDate, e1DesignDueDate);
+						}
+						return -1;
+					});
+				}
+			}
+			// 设计符合性-交付物类型  designDeliverableType
+			if ("designDeliverableType".equals(orderByField)) {
+				if (OrderEnum.POSITIVE.getValue().equals(orderBy)) {
+					Collections.sort(result, (e1, e2) -> {
+						if (e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null) {
+							return comparator.compare(e1.getDesignDeliverableTypeName(), e2.getDesignDeliverableTypeName());
+						}
+						return -1;
+					});
+				} else if (OrderEnum.REVERSE.getValue().equals(orderBy)) {
+					Collections.sort(result, (e1, e2) -> {
+						if (e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null) {
+							return comparator.compare(e2.getDesignDeliverableTypeName(), e1.getDesignDeliverableTypeName());
+						}
+						return -1;
+					});
+				}
+			}
+			// 设计符合性-流程状态  designFlowStatusName
+			if ("designFlowStatusName".equals(orderByField)) {
+//				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+//					Collections.sort(result,(e1, e2)->{
+//						if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){
+//							return comparator.compare(e1.getDesignDeliverableTypeName(),e2.getDesignDeliverableTypeName());
+//						}
+//						return -1;
+//					});
+//				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+//					Collections.sort(result,(e1,e2)->{
+//						if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){
+//							return comparator.compare(e2.getDesignDeliverableTypeName(),e1.getDesignDeliverableTypeName());
+//						}
+//						return -1;
+//					});
+//				}
+			}
+
+			// 验证符合性排序
+			// 验证符合性-责任人   verifyDutyId
+			if ("verifyDutyId".equals(orderByField)) {
+				if (OrderEnum.POSITIVE.getValue().equals(orderBy)) {
+					Collections.sort(result, (e1, e2) -> {
+						return comparator.compare(e1.getVerifyDutyIdName(), e2.getVerifyDutyIdName());
+					});
+				} else if (OrderEnum.REVERSE.getValue().equals(orderBy)) {
+					Collections.sort(result, (e1, e2) -> {
+						return comparator.compare(e2.getVerifyDutyIdName(), e1.getVerifyDutyIdName());
+					});
+				}
+			}
+			// 验证符合性-截止时间   verifyDueDate
+			if ("verifyDueDate".equals(orderByField)) {
+				if (OrderEnum.POSITIVE.getValue().equals(orderBy)) {
+					Collections.sort(result, (e1, e2) -> {
+						if (e1.getVerifyDueDate() != null && e2.getVerifyDueDate() != null) {
+							String e1VerifyDueDate = DateUtils.formatDate(e1.getVerifyDueDate());
+							String e2VerifyDueDate = DateUtils.formatDate(e2.getVerifyDueDate());
+							return comparator.compare(e1VerifyDueDate, e2VerifyDueDate);
+						}
+						return -1;
+					});
+				} else if (OrderEnum.REVERSE.getValue().equals(orderBy)) {
+					Collections.sort(result, (e1, e2) -> {
+						if (e1.getVerifyDueDate() != null && e2.getVerifyDueDate() != null) {
+							String e1VerifyDueDate = DateUtils.formatDate(e1.getVerifyDueDate());
+							String e2VerifyDueDate = DateUtils.formatDate(e2.getVerifyDueDate());
+							return comparator.compare(e2VerifyDueDate, e1VerifyDueDate);
+						}
+						return -1;
+					});
+				}
+			}
+			// 验证符合性-交付物类型  verifyDeliverableType
+			if ("verifyDeliverableType".equals(orderByField)) {
+				if (OrderEnum.POSITIVE.getValue().equals(orderBy)) {
+					Collections.sort(result, (e1, e2) -> {
+						if (e1.getVerifyDeliverableTypeName() != null && e2.getVerifyDeliverableTypeName() != null) {
+							return comparator.compare(e1.getVerifyDeliverableTypeName(), e2.getVerifyDeliverableTypeName());
+						}
+						return -1;
+					});
+				} else if (OrderEnum.REVERSE.getValue().equals(orderBy)) {
+					Collections.sort(result, (e1, e2) -> {
+						if (e1.getVerifyDeliverableTypeName() != null && e2.getVerifyDeliverableTypeName() != null) {
+							return comparator.compare(e2.getVerifyDeliverableTypeName(), e1.getVerifyDeliverableTypeName());
+						}
+						return -1;
+					});
+				}
+			}
+			// 验证符合性-流程状态  designFlowStatusName
+			if ("verifyFlowStatusName".equals(orderByField)) {
+//				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+//					Collections.sort(result,(e1, e2)->{
+//						if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){
+//							return comparator.compare(e1.getDesignDeliverableTypeName(),e2.getDesignDeliverableTypeName());
+//						}
+//						return -1;
+//					});
+//				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+//					Collections.sort(result,(e1,e2)->{
+//						if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){
+//							return comparator.compare(e2.getDesignDeliverableTypeName(),e1.getDesignDeliverableTypeName());
+//						}
+//						return -1;
+//					});
+//				}
+			}
+		}
+		return result;
+	}
+
+	//清单确认状态排序
+	private List<ProjectLawsInventoryEO> inventorySort(String orderBy, String orderByField,
+													   List<ProjectLawsInventoryEO> dummyInventoryInfoEOList,
+													   List<ProjectLawsInventoryEO> list) {
+		if (ObjectUtils.isNotEmpty(orderByField) && "inventoryAffirmStatusName".equals(orderByField)) {
+			List<ProjectLawsInventoryEO> notStarted = dummyInventoryInfoEOList.stream()
+					.filter(e -> e.getInventoryAffirmStatusName().equals(InventoryAffirmStatusEnum.NOT_STARTED.getName())).collect(Collectors.toList());
+			List<ProjectLawsInventoryEO> regEngToConfirm = dummyInventoryInfoEOList.stream()
+					.filter(e -> e.getInventoryAffirmStatusName().equals(InventoryAffirmStatusEnum.REG_ENG_TO_CONFIRM.getName())).collect(Collectors.toList());
+			List<ProjectLawsInventoryEO> homoEngToConfirm = dummyInventoryInfoEOList.stream()
+					.filter(e -> e.getInventoryAffirmStatusName().equals(InventoryAffirmStatusEnum.HOMO_ENG_TO_CONFIRM.getName())).collect(Collectors.toList());
+			List<ProjectLawsInventoryEO> accepted = dummyInventoryInfoEOList.stream()
+					.filter(e -> e.getInventoryAffirmStatusName().equals(InventoryAffirmStatusEnum.ACCEPTED.getName())).collect(Collectors.toList());
+			List<ProjectLawsInventoryEO> regEngRejected = dummyInventoryInfoEOList.stream()
+					.filter(e -> e.getInventoryAffirmStatusName().equals(InventoryAffirmStatusEnum.REG_ENG_REJECTED.getName())).collect(Collectors.toList());
+			List<ProjectLawsInventoryEO> homoEngRejected = dummyInventoryInfoEOList.stream()
+					.filter(e -> e.getInventoryAffirmStatusName().equals(InventoryAffirmStatusEnum.HOMO_ENG_REJECTED.getName())).collect(Collectors.toList());
+			List<ProjectLawsInventoryEO> listToConfirm = dummyInventoryInfoEOList.stream()
+					.filter(e -> e.getInventoryAffirmStatusName().equals(InventoryAffirmStatusEnum.LIST_TO_CONFIRM.getName())).collect(Collectors.toList());
+			List<ProjectLawsInventoryEO> rejected = dummyInventoryInfoEOList.stream()
+					.filter(e -> e.getInventoryAffirmStatusName().equals(InventoryAffirmStatusEnum.REJECTED.getName())).collect(Collectors.toList());
+
+
+			if (OrderEnum.POSITIVE.getValue().equals(orderBy)) {
+				//正序
+				list.addAll(notStarted);
+				list.addAll(listToConfirm);
+				list.addAll(regEngToConfirm);
+				list.addAll(homoEngToConfirm);
+				list.addAll(accepted);
+				list.addAll(rejected);
+				list.addAll(regEngRejected);
+				list.addAll(homoEngRejected);
+
+			} else if (OrderEnum.REVERSE.getValue().equals(orderBy)) {
+				//倒序
+				list.addAll(homoEngRejected);
+				list.addAll(regEngRejected);
+				list.addAll(rejected);
+				list.addAll(accepted);
+				list.addAll(homoEngToConfirm);
+				list.addAll(regEngToConfirm);
+				list.addAll(listToConfirm);
+				list.addAll(notStarted);
+			}
+		}
+		if (ObjectUtils.isNotEmpty(list)) {
+			return list;
+		} else {
+			return dummyInventoryInfoEOList;
+		}
+	}
+
+	// 任务确认状态排序
+	private List<ProjectLawsInventoryEO> taskSort(String orderBy, String orderByField,
+												  List<ProjectLawsInventoryEO> dummyInventoryInfoEOList,
+												  List<ProjectLawsInventoryEO> list) {
+		if (ObjectUtils.isNotEmpty(orderByField) && "taskAffirmStatusName".equals(orderByField)) {
+			List<ProjectLawsInventoryEO> notStarted = dummyInventoryInfoEOList.stream()
+					.filter(e -> e.getTaskAffirmStatusName().equals(TaskAffirmStatusEnum.NOT_STARTED.getName())).collect(Collectors.toList());
+			List<ProjectLawsInventoryEO> listToConfirm = dummyInventoryInfoEOList.stream()
+					.filter(e -> e.getTaskAffirmStatusName().equals(TaskAffirmStatusEnum.LIST_TO_CONFIRM.getName())).collect(Collectors.toList());
+			List<ProjectLawsInventoryEO> accepted = dummyInventoryInfoEOList.stream()
+					.filter(e -> e.getTaskAffirmStatusName().equals(TaskAffirmStatusEnum.ACCEPTED.getName())).collect(Collectors.toList());
+			List<ProjectLawsInventoryEO> rejected = dummyInventoryInfoEOList.stream()
+					.filter(e -> e.getTaskAffirmStatusName().equals(TaskAffirmStatusEnum.REJECTED.getName())).collect(Collectors.toList());
+
+
+			if (OrderEnum.POSITIVE.getValue().equals(orderBy)) {
+				//正序
+				list.addAll(notStarted);
+				list.addAll(listToConfirm);
+				list.addAll(accepted);
+				list.addAll(rejected);
+
+			} else if (OrderEnum.REVERSE.getValue().equals(orderBy)) {
+				//倒序
+				list.addAll(rejected);
+				list.addAll(accepted);
+				list.addAll(listToConfirm);
+				list.addAll(notStarted);
+			}
+		}
+		if (ObjectUtils.isNotEmpty(list)) {
+			return list;
+		} else {
+			return dummyInventoryInfoEOList;
+		}
+	}
+
+	//认证级别
+	private List<ProjectLawsInventoryEO> attestationRankSort(String orderBy, String orderByField,
+															 List<ProjectLawsInventoryEO> dummyInventoryInfoEOList,
+															 List<ProjectLawsInventoryEO> list) {
+		if (ObjectUtils.isNotEmpty(orderByField) && "attestationRank".equals(orderByField)) {
+			List<ProjectLawsInventoryEO> wvta = dummyInventoryInfoEOList.stream()
+					.filter(e -> e.getAttestationRank_dictText().startsWith(AttestationRankEnum.WVTA.getValue())).collect(Collectors.toList());
+			List<ProjectLawsInventoryEO> vta = dummyInventoryInfoEOList.stream()
+					.filter(e -> e.getAttestationRank_dictText().startsWith(AttestationRankEnum.VTA.getValue())).collect(Collectors.toList());
+			List<ProjectLawsInventoryEO> market = dummyInventoryInfoEOList.stream()
+					.filter(e -> e.getAttestationRank_dictText().startsWith(AttestationRankEnum.MARKET.getValue())).collect(Collectors.toList());
+			List<ProjectLawsInventoryEO> regu = dummyInventoryInfoEOList.stream()
+					.filter(e -> e.getAttestationRank_dictText().startsWith(AttestationRankEnum.REGU.getValue())).collect(Collectors.toList());
+			List<ProjectLawsInventoryEO> na = dummyInventoryInfoEOList.stream()
+					.filter(e -> e.getAttestationRank_dictText().startsWith(AttestationRankEnum.NA.getValue())).collect(Collectors.toList());
+
+			Collator comparator = Collator.getInstance(Locale.CHINESE);
+			if (OrderEnum.POSITIVE.getValue().equals(orderBy)) {
+				attestationRankPositive(orderBy, wvta, comparator);
+				attestationRankPositive(orderBy, vta, comparator);
+				attestationRankPositive(orderBy, market, comparator);
+				attestationRankPositive(orderBy, regu, comparator);
+				attestationRankPositive(orderBy, na, comparator);
+				//正序
+				List<ProjectLawsInventoryEO> collect = dummyInventoryInfoEOList.stream().filter(e -> StringUtils.isBlank(e.getAttestationRank_dictText())).collect(Collectors.toList());
+				list.addAll(collect);
+				list.addAll(wvta);
+				list.addAll(vta);
+				list.addAll(market);
+				list.addAll(regu);
+				list.addAll(na);
+
+			} else if (OrderEnum.REVERSE.getValue().equals(orderBy)) {
+				attestationRankReverse(orderBy, wvta, comparator);
+				attestationRankReverse(orderBy, vta, comparator);
+				attestationRankReverse(orderBy, market, comparator);
+				attestationRankReverse(orderBy, regu, comparator);
+				attestationRankReverse(orderBy, na, comparator);
+				//倒序
+				list.addAll(na);
+				list.addAll(regu);
+				list.addAll(market);
+				list.addAll(vta);
+				list.addAll(wvta);
+				List<ProjectLawsInventoryEO> collect = dummyInventoryInfoEOList.stream().filter(e -> StringUtils.isBlank(e.getAttestationRank_dictText())).collect(Collectors.toList());
+				list.addAll(collect);
+			}
+		}
+		if (ObjectUtils.isNotEmpty(list)) {
+			return list;
+		} else {
+			return dummyInventoryInfoEOList;
+		}
+	}
+
+	//正序
+	private void attestationRankPositive(String orderBy, List<ProjectLawsInventoryEO> list, Collator comparator) {
+		if (OrderEnum.POSITIVE.getValue().equals(orderBy)) {
+			Collections.sort(list, (e1, e2) -> {
+				return comparator.compare(e1.getAttestationRank_dictText(), e2.getAttestationRank_dictText());
+			});
+		} else if (OrderEnum.REVERSE.getValue().equals(orderBy)) {
+			Collections.sort(list, (e1, e2) -> {
+				return comparator.compare(e2.getAttestationRank_dictText(), e1.getAttestationRank_dictText());
+			});
+		}
+	}
+
+	//倒序
+	private void attestationRankReverse(String orderBy, List<ProjectLawsInventoryEO> list, Collator comparator) {
+		if (OrderEnum.POSITIVE.getValue().equals(orderBy)) {
+			Collections.sort(list, (e1, e2) -> {
+				return comparator.compare(e1.getAttestationRank_dictText(), e2.getAttestationRank_dictText());
+			});
+		} else if (OrderEnum.REVERSE.getValue().equals(orderBy)) {
+			Collections.sort(list, (e1, e2) -> {
+				return comparator.compare(e2.getAttestationRank_dictText(), e1.getAttestationRank_dictText());
+			});
+		}
+	}
+
+	/**
+	 * 数据字典数据处理方法
+	 *
+	 * @param result 返回值
+	 * @param cut    中英文切换
+	 */
+	public void dataDictDispose(List<ProjectLawsInventoryEO> result, String cut) {
+		if (CollectionUtils.isNotEmpty(result)) {
+			List<SysDictItem> sysDictItems = sysDictItemServiceImpl.getBaseMapper().selectItemsAll();
+			for (ProjectLawsInventoryEO projectLawsInventoryEO : result) {
+				if (StringUtils.isBlank(projectLawsInventoryEO.getWvtaId())) {
+					projectLawsInventoryEO.setWvtaId("");
+				}
+				if (StringUtils.isBlank(projectLawsInventoryEO.getDutyTerritory_dictText())) {
+					projectLawsInventoryEO.setDutyTerritory_dictText("");
+				}
+				//处理适用地区
+				String region = projectLawsInventoryEO.getRegion();
+				if (StringUtils.isNotEmpty(region)) {
+					String region_dictText = disposeShowDictItemValue(sysDictItems, region, cut, ProjectInventoryFieldEnum.REGION.getValue());
+					projectLawsInventoryEO.setRegion_dictText(region_dictText);
+				}
+
+				//处理实施类别
+				String implementType = projectLawsInventoryEO.getImplementType();
+				if (StringUtils.isNotEmpty(implementType)) {
+					String implementType_dictText = disposeShowDictItemValue(sysDictItems, implementType, cut, ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getValue());
+					projectLawsInventoryEO.setImplementType_dictText(implementType_dictText);
+				}
+
+				//处理认证类型
+				String attestationType = projectLawsInventoryEO.getAttestationType();
+				if (StringUtils.isNotEmpty(attestationType)) {
+					String attestationType_dictText = disposeShowDictItemValue(sysDictItems, attestationType, cut, ProjectInventoryFieldEnum.ATTESTATION_TYPE.getValue());
+					projectLawsInventoryEO.setAttestationType_dictText(attestationType_dictText);
+				}
+
+				//处理认证级别
+				String attestationRank = projectLawsInventoryEO.getAttestationRank();
+				if (StringUtils.isNotEmpty(attestationRank)) {
+					String attestationRank_dictText = disposeShowDictItemValue(sysDictItems, attestationRank, cut, ProjectInventoryFieldEnum.ATTESTATION_RANK.getValue());
+					projectLawsInventoryEO.setAttestationRank_dictText(attestationRank_dictText);
+				} else {
+					projectLawsInventoryEO.setAttestationRank_dictText("");
+				}
+
+				//处理责任领域
+				String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
+				if (StringUtils.isNotEmpty(dutyTerritory)) {
+					String dutyTerritory_dictText = disposeShowDictItemValue(sysDictItems, dutyTerritory, cut, ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
+					projectLawsInventoryEO.setDutyTerritory_dictText(dutyTerritory_dictText);
+				}
+
+				//处理设计符合性确认-交付物类型
+				String designDeliverableType = projectLawsInventoryEO.getDesignDeliverableType();
+				if (StringUtils.isNotEmpty(designDeliverableType)) {
+					String designDeliverableType_dictText = disposeShowDictItemValue(sysDictItems, designDeliverableType, cut, ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getValue());
+					projectLawsInventoryEO.setDesignDeliverableType_dictText(designDeliverableType_dictText);
+				}
+
+				//处理设计符合性确认-发起人角色
+				String designInitiator = projectLawsInventoryEO.getDesignInitiator();
+				if (StringUtils.isNotEmpty(designInitiator)) {
+					String designInitiator_dictText = disposeShowDictItemValue(sysDictItems, designInitiator, cut, ProjectInventoryFieldEnum.DESIGN_INITIATOR.getValue());
+					projectLawsInventoryEO.setDesignInitiator_dictText(designInitiator_dictText);
+				}
+
+				//处理设计符合性确认-责任人角色
+				String designDuty = projectLawsInventoryEO.getDesignDuty();
+				if (StringUtils.isNotEmpty(designDuty)) {
+					String designDuty_dictText = disposeShowDictItemValue(sysDictItems, designDuty, cut, ProjectInventoryFieldEnum.DESIGN_DUTY.getValue());
+					projectLawsInventoryEO.setDesignDuty_dictText(designDuty_dictText);
+				}
+
+				//处理prehomo确认-交付物类型
+				String prehomoDeliverableType = projectLawsInventoryEO.getPrehomoDeliverableType();
+				if (StringUtils.isNotEmpty(prehomoDeliverableType)) {
+					String prehomoDeliverableType_dictText = disposeShowDictItemValue(sysDictItems, prehomoDeliverableType, cut, ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getValue());
+					projectLawsInventoryEO.setPrehomoDeliverableType_dictText(prehomoDeliverableType_dictText);
+				}
+
+				//处理prehomo确认-发起人角色
+				String prehomoInitiator = projectLawsInventoryEO.getPrehomoInitiator();
+				if (StringUtils.isNotEmpty(prehomoInitiator)) {
+					String prehomoInitiator_dictText = disposeShowDictItemValue(sysDictItems, prehomoInitiator, cut, ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getValue());
+					projectLawsInventoryEO.setPrehomoInitiator_dictText(prehomoInitiator_dictText);
+				}
+
+				//处理prehomo确认-责任人角色
+				String prehomoDuty = projectLawsInventoryEO.getPrehomoDuty();
+				if (StringUtils.isNotEmpty(prehomoDuty)) {
+					String prehomoDuty_dictText = disposeShowDictItemValue(sysDictItems, prehomoDuty, cut, ProjectInventoryFieldEnum.PREHOMO_DUTY.getValue());
+					projectLawsInventoryEO.setPrehomoDuty_dictText(prehomoDuty_dictText);
+				}
+
+				//处理验证符合性确认-交付物类型
+				String verifyDeliverableType = projectLawsInventoryEO.getVerifyDeliverableType();
+				if (StringUtils.isNotEmpty(verifyDeliverableType)) {
+					String verifyDeliverableType_dictText = disposeShowDictItemValue(sysDictItems, verifyDeliverableType, cut, ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getValue());
+					projectLawsInventoryEO.setVerifyDeliverableType_dictText(verifyDeliverableType_dictText);
+				}
+
+				//处理验证符合性确认-发起人角色
+				String verifyInitiator = projectLawsInventoryEO.getVerifyInitiator();
+				if (StringUtils.isNotEmpty(verifyInitiator)) {
+					String verifyInitiator_dictText = disposeShowDictItemValue(sysDictItems, verifyInitiator, cut, ProjectInventoryFieldEnum.VERIFY_INITIATOR.getValue());
+					projectLawsInventoryEO.setVerifyInitiator_dictText(verifyInitiator_dictText);
+				}
+
+				//处理验证符合性确认-责任人角色
+				String verifyDuty = projectLawsInventoryEO.getVerifyDuty();
+				if (StringUtils.isNotEmpty(verifyDuty)) {
+					String verifyDuty_dictText = disposeShowDictItemValue(sysDictItems, verifyDuty, cut, ProjectInventoryFieldEnum.VERIFY_DUTY.getValue());
+					projectLawsInventoryEO.setVerifyDuty_dictText(verifyDuty_dictText);
+				}
+			}
+		}
+	}
+
+	/**
+	 * 处理展示数据字典值
+	 *
+	 * @param sysDictItems 所有的数据字典项
+	 * @param fieldValues  字段值
+	 * @param cut          中英文切换标识
+	 * @param dicCode      数据字典code码
+	 * @return
+	 */
+	public String disposeShowDictItemValue(List<SysDictItem> sysDictItems, String fieldValues, String cut, String dicCode) {
+		String result = "";
+		List<SysDictItem> sysDictItemList = sysDictItems.stream().filter(e -> {
+			boolean flag = false;
+			if (StringUtils.equals(e.getDictCode(), dicCode)) {
+				flag = true;
+			}
+			return flag;
+		}).distinct().collect(Collectors.toList());
+		if (CollectionUtils.isNotEmpty(sysDictItemList)) {
+			if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+				result = sysDictItemList.stream().filter(e -> {
+					boolean flag = false;
+					List<String> fieldValueStrList = Arrays.asList(fieldValues.split(","));
+					for (String fieldValueStr : fieldValueStrList) {
+						if (StringUtils.equals(fieldValueStr, e.getItemValue())) {
+							flag = true;
+							break;
+						}
+					}
+					return flag;
+				}).map(SysDictItem::getItemText).collect(Collectors.joining(","));
+			} else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
+				result = sysDictItemList.stream().filter(e -> {
+					boolean flag = false;
+					List<String> fieldValueStrList = Arrays.asList(fieldValues.split(","));
+					for (String fieldValueStr : fieldValueStrList) {
+						if (StringUtils.equals(fieldValueStr, e.getItemValue())) {
+							flag = true;
+							break;
+						}
+					}
+					return flag;
+				}).map(SysDictItem::getEnName).collect(Collectors.joining(","));
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * 数据处理
+	 *
+	 * @param list
+	 */
+	@Override
+	public void dataDispose(List<ProjectLawsInventoryEO> list, LoginUser currentUser, int isProjectRole, String cut) {
+		if (CollectionUtils.isNotEmpty(list)) {
+			//树形结构数据字典(技术领域)
+			List<SysCategory> categoryList = sysCategoryService.list();
+			List<String> userIdList = new ArrayList<>();
+			List<String> deliverableList = new ArrayList<>();
+			List<String> correspondingStandardList = new ArrayList<>();
+			for (ProjectLawsInventoryEO projectLawsInventoryEO : list) {
+				if (StringUtils.isNotBlank(projectLawsInventoryEO.getCorrespondingStandard())) {
+					correspondingStandardList.addAll(Arrays.asList(projectLawsInventoryEO.getCorrespondingStandard().split(",")));
+				}
+			}
+			List<BussDocumentLibraryEO> bussDocumentLibraryEOS = new ArrayList<>();
+			if (correspondingStandardList.size() != 0) {
+				LambdaQueryWrapper<BussDocumentLibraryEO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+				lambdaQueryWrapper.in(BussDocumentLibraryEO::getId, correspondingStandardList);
+				bussDocumentLibraryEOS = iBussDocumentLibraryEOService.list(lambdaQueryWrapper);
+			}
+
+			for (ProjectLawsInventoryEO projectLawsInventoryEO : list) {
+				//处理交付物类型
+				String designDeliverableType = projectLawsInventoryEO.getDesignDeliverableType();
+				String prehomoDeliverableType = projectLawsInventoryEO.getPrehomoDeliverableType();
+				String verifyDeliverableType = projectLawsInventoryEO.getVerifyDeliverableType();
+				//设计交付物类型
+				if (StringUtils.isNotBlank(designDeliverableType)) {
+					List<String> designDeliverableTypeList = Arrays.asList(designDeliverableType.split(","));
+					String name = getTreeName(cut, categoryList, designDeliverableTypeList);
+					projectLawsInventoryEO.setDesignDeliverableTypeName(name);
+				}
+				//pre交付物类型
+				if (StringUtils.isNotBlank(prehomoDeliverableType)) {
+					List<String> prehomoDeliverableTypeList = Arrays.asList(prehomoDeliverableType.split(","));
+					String name = getTreeName(cut, categoryList, prehomoDeliverableTypeList);
+					projectLawsInventoryEO.setPrehomoDeliverableTypeName(name);
+				}
+				//验证交付物类型
+				if (StringUtils.isNotBlank(verifyDeliverableType)) {
+					List<String> verifyDeliverableTypeList = Arrays.asList(verifyDeliverableType.split(","));
+					String name = getTreeName(cut, categoryList, verifyDeliverableTypeList);
+					projectLawsInventoryEO.setVerifyDeliverableTypeName(name);
+				}
+				StringBuilder sb = new StringBuilder();
+				if (StringUtils.isNotBlank(projectLawsInventoryEO.getCorrespondingStandard()) && bussDocumentLibraryEOS.size() != 0) {
+					for (String correspondingStandard : projectLawsInventoryEO.getCorrespondingStandard().split(",")) {
+						List<BussDocumentLibraryEO> collect = bussDocumentLibraryEOS.stream().filter(e -> e.getId().equals(correspondingStandard)).collect(Collectors.toList());
+						if (collect.size() != 0) {
+							sb.append(collect.get(0).getSerialNumber() + ",");
+						} else {
+							sb.append(correspondingStandard + ",");
+						}
+					}
+					if (StringUtils.isNotBlank(sb)) {
+						String substring = sb.substring(0, sb.length() - 1);
+						projectLawsInventoryEO.setCorrespondingStandard(substring);
+					}
+				}
+				//认证工程师id
+				if (StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId())) {
+					userIdList.add(projectLawsInventoryEO.getHomologationEngineerId());
+				} else {
+					projectLawsInventoryEO.setHomologationEngineerName("");
+				}
+				//法规工程师id
+				if (StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId())) {
+					userIdList.add(projectLawsInventoryEO.getRegulationOwnerId());
+				} else {
+					projectLawsInventoryEO.setRegulationOwnerName("");
+				}
+				//工程接口人id
+				if (StringUtils.isNotEmpty(projectLawsInventoryEO.getEngineeringInterfacePerson())) {
+					userIdList.add(projectLawsInventoryEO.getEngineeringInterfacePerson());
+				} else {
+					projectLawsInventoryEO.setEngineeringInterfacePersonName("");
+				}
+
+				//设计符合性确认
+				//发起人
+				if (StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignInitiatorId())) {
+					userIdList.add(projectLawsInventoryEO.getDesignInitiatorId());
+				}
+				//责任人
+				if (StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignDutyId())) {
+					userIdList.add(projectLawsInventoryEO.getDesignDutyId());
+				}
+
+				//prehomo确认
+				//发起人
+				if (StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoInitiatorId())) {
+					userIdList.add(projectLawsInventoryEO.getPrehomoInitiatorId());
+				}
+				//责任人
+				if (StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoDutyId())) {
+					userIdList.add(projectLawsInventoryEO.getPrehomoDutyId());
+				}
+
+				//验证符合性确认
+				//发起人
+				if (StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyInitiatorId())) {
+					userIdList.add(projectLawsInventoryEO.getVerifyInitiatorId());
+				}
+				//责任人
+				if (StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyDutyId())) {
+					userIdList.add(projectLawsInventoryEO.getVerifyDutyId());
+				}
+
+				//设计符合性确认交付物模板
+				if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())) {
+					deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getDesignDeliverableTemplate().split(",")));
+				}
+				// Prehomo确认交付物模板
+				if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())) {
+					deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableTemplate().split(",")));
+				}
+				// 验证符合性确认交付物模板
+				if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())) {
+					deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getVerifyDeliverableTemplate().split(",")));
+				}
+			}
+
+			List<SysUser> sysUsers = new ArrayList<>();
+			if (CollectionUtils.isNotEmpty(userIdList)) {
+				userIdList = userIdList.stream().distinct().collect(Collectors.toList());
+				QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
+				sysUserQueryWrapper.lambda().in(SysUser::getId, userIdList);
+				sysUsers = sysUserMapper.selectList(sysUserQueryWrapper);
+			}
+
+			//文件
+			List<OSSFile> fileInfos = new ArrayList<>();
+			if (deliverableList.size() != 0) {
+				fileInfos = iOSSFileService.getFileInfos(StringUtils.join(deliverableList, ","));
+			}
+
+			for (ProjectLawsInventoryEO projectLawsInventoryEO : list) {
+				//处理人员展示名称
+				if (CollectionUtils.isNotEmpty(sysUsers)) {
+					String homologationEngineerId = projectLawsInventoryEO.getHomologationEngineerId();
+					if (StringUtils.isNotEmpty(homologationEngineerId)) {
+						String homologationEngineerName = sysUsers.stream().filter(e -> homologationEngineerId.equals(e.getId())).
+								map(SysUser::getUsername).collect(Collectors.joining(","));
+						projectLawsInventoryEO.setHomologationEngineerName(homologationEngineerName);
+					}
+					String regulationOwnerId = projectLawsInventoryEO.getRegulationOwnerId();
+					if (StringUtils.isNotEmpty(regulationOwnerId)) {
+						String regulationOwnerName = sysUsers.stream().filter(e -> regulationOwnerId.equals(e.getId())).
+								map(SysUser::getUsername).collect(Collectors.joining(","));
+						projectLawsInventoryEO.setRegulationOwnerName(regulationOwnerName);
+					}
+					String engineeringInterfacePerson = projectLawsInventoryEO.getEngineeringInterfacePerson();
+					if (StringUtils.isNotEmpty(engineeringInterfacePerson)) {
+						String engineeringInterfacePersonName = sysUsers.stream().filter(e -> engineeringInterfacePerson.equals(e.getId())).
+								map(SysUser::getUsername).collect(Collectors.joining(","));
+						projectLawsInventoryEO.setEngineeringInterfacePersonName(engineeringInterfacePersonName);
+					}
+
+					//设计符合性确认
+					//发起人
+					String designInitiatorId = projectLawsInventoryEO.getDesignInitiatorId();
+					if (StringUtils.isNotEmpty(designInitiatorId)) {
+						String designInitiatorName = sysUsers.stream().filter(e -> designInitiatorId.equals(e.getId())).
+								map(SysUser::getUsername).collect(Collectors.joining(","));
+						projectLawsInventoryEO.setDesignInitiatorName(designInitiatorName);
+					}
+					//责任人
+					String designDutyId = projectLawsInventoryEO.getDesignDutyId();
+					if (StringUtils.isNotEmpty(designDutyId)) {
+						String designDutyName = sysUsers.stream().filter(e -> designDutyId.equals(e.getId())).
+								map(SysUser::getUsername).collect(Collectors.joining(","));
+						projectLawsInventoryEO.setDesignDutyIdName(designDutyName);
+					} else {
+						projectLawsInventoryEO.setDesignDutyIdName("");
+					}
+
+					//prehomo确认
+					//发起人
+					String prehomoInitiatorId = projectLawsInventoryEO.getPrehomoInitiatorId();
+					if (StringUtils.isNotEmpty(prehomoInitiatorId)) {
+						String prehomoInitiatorName = sysUsers.stream().filter(e -> prehomoInitiatorId.equals(e.getId())).
+								map(SysUser::getUsername).collect(Collectors.joining(","));
+						projectLawsInventoryEO.setPrehomoInitiatorName(prehomoInitiatorName);
+					}
+					//责任人
+					String prehomoDutyId = projectLawsInventoryEO.getPrehomoDutyId();
+					if (StringUtils.isNotEmpty(prehomoDutyId)) {
+						String prehomoDutyName = sysUsers.stream().filter(e -> prehomoDutyId.equals(e.getId())).
+								map(SysUser::getUsername).collect(Collectors.joining(","));
+						projectLawsInventoryEO.setPrehomoDutyName(prehomoDutyName);
+					}
+
+					//验证符合性确认
+					//发起人
+					String verifyInitiatorId = projectLawsInventoryEO.getVerifyInitiatorId();
+					if (StringUtils.isNotEmpty(verifyInitiatorId)) {
+						String verifyInitiatorName = sysUsers.stream().filter(e -> verifyInitiatorId.equals(e.getId())).
+								map(SysUser::getUsername).collect(Collectors.joining(","));
+						projectLawsInventoryEO.setVerifyInitiatorName(verifyInitiatorName);
+					}
+					//责任人
+					String verifyDutyId = projectLawsInventoryEO.getVerifyDutyId();
+					if (StringUtils.isNotEmpty(verifyDutyId)) {
+						String verifyDutyName = sysUsers.stream().filter(e -> verifyDutyId.equals(e.getId())).
+								map(SysUser::getUsername).collect(Collectors.joining(","));
+						projectLawsInventoryEO.setVerifyDutyIdName(verifyDutyName);
+					} else {
+						projectLawsInventoryEO.setVerifyDutyIdName("");
+					}
+				}
+
+				//清单确认状态
+				/*String inventoryAffirmStatus = projectLawsInventoryEO.getInventoryAffirmStatus();
+				if(StringUtils.isNotEmpty(inventoryAffirmStatus)){
+					if(StringUtils.equals(cut, CutEnum.CN.getValue())){
+						projectLawsInventoryEO.setInventoryAffirmStatusName(InventoryAffirmStatusEnum.getTextByValue(inventoryAffirmStatus));
+					}else {
+						projectLawsInventoryEO.setInventoryAffirmStatusName(inventoryAffirmStatus);
+					}
+				}*/
+				/**
+				 * 清单确认状态展示：
+				 * 			待确认：展示 法规工程师待确认 或 认证工程师待确认
+				 * 			拒绝：展示 法规工程师拒绝 或 认证工程师拒绝
+				 *
+				 */
+				String inventoryAffirmStatus = projectLawsInventoryEO.getInventoryAffirmStatus();
+				if (StringUtils.isNotEmpty(inventoryAffirmStatus)) {
+					//如果是待确认
+					if (StringUtils.equals(inventoryAffirmStatus, InventoryAffirmStatusEnum.LIST_TO_CONFIRM.getValue())) {
+						if (StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerSubmitStatus())
+								&& StringUtils.equals(projectLawsInventoryEO.getHomologationEngineerSubmitStatus(), OperatorResultEnum.ACCEPTED.getValue())) {
+
+							//如果 认证工程师提交状态 不为空，则证明认证工程师已经提交过了，展示状态应该展示 法规工程师待确认
+							if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+								projectLawsInventoryEO.setInventoryAffirmStatusName(InventoryAffirmStatusEnum.REG_ENG_TO_CONFIRM.getName());
+							} else {
+								projectLawsInventoryEO.setInventoryAffirmStatusName(InventoryAffirmStatusEnum.REG_ENG_TO_CONFIRM.getValue());
+							}
+						} else if (StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerSubmitStatus())
+								&& StringUtils.equals(projectLawsInventoryEO.getRegulationOwnerSubmitStatus(), OperatorResultEnum.ACCEPTED.getValue())) {
+
+							//如果 法规工程师提交状态 不为空，则证明法规工程师已经提交过了，展示状态应该展示 认证工程师待确认
+							if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+								projectLawsInventoryEO.setInventoryAffirmStatusName(InventoryAffirmStatusEnum.HOMO_ENG_TO_CONFIRM.getName());
+							} else {
+								projectLawsInventoryEO.setInventoryAffirmStatusName(InventoryAffirmStatusEnum.HOMO_ENG_TO_CONFIRM.getValue());
+							}
+						} else {
+							if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+								projectLawsInventoryEO.setInventoryAffirmStatusName(InventoryAffirmStatusEnum.getTextByValue(inventoryAffirmStatus));
+							} else {
+								projectLawsInventoryEO.setInventoryAffirmStatusName(inventoryAffirmStatus);
+							}
+						}
+						//如果是拒绝
+					} else if (StringUtils.equals(inventoryAffirmStatus, InventoryAffirmStatusEnum.REJECTED.getValue())) {
+						if ((StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerSubmitStatus()) && StringUtils.equals(projectLawsInventoryEO.getHomologationEngineerSubmitStatus(), OperatorResultEnum.REJECTED.getValue()))
+								&& (StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerSubmitStatus()) && StringUtils.equals(projectLawsInventoryEO.getRegulationOwnerSubmitStatus(), OperatorResultEnum.REJECTED.getValue()))) {
+							if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+								projectLawsInventoryEO.setInventoryAffirmStatusName(InventoryAffirmStatusEnum.REJECTED.getName());
+							} else {
+								projectLawsInventoryEO.setInventoryAffirmStatusName(InventoryAffirmStatusEnum.REJECTED.getValue());
+							}
+						} else if (StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerSubmitStatus())
+								&& StringUtils.equals(projectLawsInventoryEO.getHomologationEngineerSubmitStatus(), OperatorResultEnum.REJECTED.getValue())) {
+							//如果认证工程师提交状态不为空，并且认证工程师提交状态为拒绝
+							if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+								projectLawsInventoryEO.setInventoryAffirmStatusName(InventoryAffirmStatusEnum.HOMO_ENG_REJECTED.getName());
+							} else {
+								projectLawsInventoryEO.setInventoryAffirmStatusName(InventoryAffirmStatusEnum.HOMO_ENG_REJECTED.getValue());
+							}
+						} else if (StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerSubmitStatus())
+								&& StringUtils.equals(projectLawsInventoryEO.getRegulationOwnerSubmitStatus(), OperatorResultEnum.REJECTED.getValue())) {
+
+							//如果 法规工程师提交状态 不为空，则证明法规工程师已经提交过了，展示状态应该展示 认证工程师待确认
+							if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+								projectLawsInventoryEO.setInventoryAffirmStatusName(InventoryAffirmStatusEnum.REG_ENG_REJECTED.getName());
+							} else {
+								projectLawsInventoryEO.setInventoryAffirmStatusName(InventoryAffirmStatusEnum.REG_ENG_REJECTED.getValue());
+							}
+						}
+					} else {
+						if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+							projectLawsInventoryEO.setInventoryAffirmStatusName(InventoryAffirmStatusEnum.getTextByValue(inventoryAffirmStatus));
+						} else {
+							projectLawsInventoryEO.setInventoryAffirmStatusName(inventoryAffirmStatus);
+						}
+					}
+				}
+
+				//任务确认状态
+				String taskAffirmStatus = projectLawsInventoryEO.getTaskAffirmStatus();
+				if (StringUtils.isNotEmpty(taskAffirmStatus)) {
+					if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+						projectLawsInventoryEO.setTaskAffirmStatusName(InventoryAffirmStatusEnum.getTextByValue(taskAffirmStatus));
+					} else {
+						projectLawsInventoryEO.setTaskAffirmStatusName(taskAffirmStatus);
+					}
+				}
+
+				String roleCode = "";
+				String roleName = "";
+				//设置当前用户在该项目中的角色
+				if (isProjectRole == Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())) {
+					roleCode = ProjectRoleEnum.STUDIO_ENGINEER.getValue();
+					roleName = ProjectRoleEnum.STUDIO_ENGINEER.getName();
+				} else {
+					if (StringUtils.equals(currentUser.getId(), projectLawsInventoryEO.getRegulationOwnerId())
+							&& StringUtils.equals(currentUser.getId(), projectLawsInventoryEO.getHomologationEngineerId())) {
+						roleCode = ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue();
+						roleName = ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getName();
+					} else if (StringUtils.equals(currentUser.getId(), projectLawsInventoryEO.getRegulationOwnerId())) {
+						roleCode = ProjectRoleEnum.REGULATI_ENGINEER.getValue();
+						roleName = ProjectRoleEnum.REGULATI_ENGINEER.getName();
+					} else if (StringUtils.equals(currentUser.getId(), projectLawsInventoryEO.getHomologationEngineerId())) {
+						roleCode = ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue();
+						roleName = ProjectRoleEnum.HOMOLOGATION_ENGINEER.getName();
+					}
+				}
+				projectLawsInventoryEO.setRoleCode(roleCode);
+				projectLawsInventoryEO.setRoleName(roleName);
+
+				//交付物类型模板
+				if (fileInfos.size() != 0) {
+					if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())) {
+						String fileName = this.editService.getFileName(projectLawsInventoryEO, fileInfos, projectLawsInventoryEO.getDesignDeliverableTemplate());
+						if (StringUtils.isNotBlank(fileName)) {
+							projectLawsInventoryEO.setDesignDeliverableTemplateName(fileName);
+						}
+					}
+					if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())) {
+						String fileName = this.editService.getFileName(projectLawsInventoryEO, fileInfos, projectLawsInventoryEO.getPrehomoDeliverableTemplate());
+						if (StringUtils.isNotBlank(fileName)) {
+							projectLawsInventoryEO.setPrehomoDeliverableTemplateName(fileName);
+						}
+					}
+					if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())) {
+						String fileName = this.editService.getFileName(projectLawsInventoryEO, fileInfos, projectLawsInventoryEO.getVerifyDeliverableTemplate());
+						if (StringUtils.isNotBlank(fileName)) {
+							projectLawsInventoryEO.setVerifyDeliverableTemplateName(fileName);
+
+						}
+					}
+				}
+
+				// 处理符合性流程状态。
+				if (StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignFlowStatus())) {
+					String designFlowStatusName = ComplianceFlowStatusEnum.getTextByValue(projectLawsInventoryEO.getDesignFlowStatus(), cut);
+					projectLawsInventoryEO.setDesignFlowStatusName(designFlowStatusName);
+				}
+				if (StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyFlowStatus())) {
+					String verifyFlowStatusName = ComplianceFlowStatusEnum.getTextByValue(projectLawsInventoryEO.getVerifyFlowStatus(), cut);
+					projectLawsInventoryEO.setVerifyFlowStatusName(verifyFlowStatusName);
+				}
+
+				// 返回符合性流程的流程实例id
+				if (!StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
+						|| !StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())) {
+					QueryWrapper<ProcessInfoDetailEO> processInfoDetailEOQueryWrapper = new QueryWrapper<>();
+					processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId, projectLawsInventoryEO.getId());
+					processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType, FlowTypeEnum.YZFHXSCLC.getValue());
+					List<ProcessInfoDetailEO> processInfoDetailEOS = this.processInfoDetailEOService.list(processInfoDetailEOQueryWrapper);
+					if (CollectionUtils.isNotEmpty(processInfoDetailEOS)) {
+						projectLawsInventoryEO.setVerifyPId(processInfoDetailEOS.get(0).getActiProcInstId());
+					}
+				}
+				if (!StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
+						|| !StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())) {
+					QueryWrapper<ProcessInfoDetailEO> processInfoDetailEOQueryWrapper = new QueryWrapper<>();
+					processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId, projectLawsInventoryEO.getId());
+					processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType, FlowTypeEnum.SJFHXSHLC.getValue());
+					List<ProcessInfoDetailEO> processInfoDetailEOS = this.processInfoDetailEOService.list(processInfoDetailEOQueryWrapper);
+					if (CollectionUtils.isNotEmpty(processInfoDetailEOS)) {
+						projectLawsInventoryEO.setDesignPId(processInfoDetailEOS.get(0).getActiProcInstId());
+					}
+				}
+			}
+		}
+	}
+
+	private String getTreeName(String cut, List<SysCategory> categoryList, List<String> technologyTerritoryList) {
+		StringBuilder sb = new StringBuilder();
+		for (String technologyTerritory : technologyTerritoryList) {
+			List<SysCategory> collect = categoryList.stream().filter(e -> technologyTerritory.equals(e.getId())).collect(Collectors.toList());
+			if (collect.size() != 0) {
+				if (CutEnum.CN.getValue().equals(cut)) {
+					sb.append(collect.get(0).getName() + ",");
+				} else {
+					sb.append(collect.get(0).getEnName() + ",");
+				}
+			}
+		}
+		String technologyTerritoryName = "";
+		if (StringUtils.isNotBlank(sb)) {
+			technologyTerritoryName = sb.substring(0, sb.length() - 1);
+		}
+		return technologyTerritoryName;
+	}
+
+	/**
+	 * 批量更新状态
+	 *
+	 * @param json
+	 * @return
+	 */
+	@Override
+	public Result<?> updateStatusBatch(JSONObject json) {
+		String result = "";
+		//operatorType: 0：studio工程师发起清单确认  1：法规工程师/认证工程师 （提交或拒绝）
+		String operatorType = json.getString("operatorType");
+		String projectLibraryId = json.getString("projectLibraryId");//项目id
+		String cut = json.getString("cut");//中英文切换标识
+		if (StringUtils.isEmpty(operatorType)) {
+			throw new JeroBootException("操作类型不能为空！");
+		}
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		try {
+			ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectOne(new QueryWrapper<ProjectLibraryBase>()
+					.lambda().eq(ProjectLibraryBase::getId, projectLibraryId));
+
+			// studio信息
+			SysUser studioUserInfo = this.sysUserMapper.selectOne(
+					new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer())
+			);
+
+			QueryWrapper<ProjectNameInfoEO> projectNameInfoEOQueryWrapper = new QueryWrapper<>();
+			projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId());
+			ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
+
+			QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
+			projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId, projectLibraryBase.getYearNameId());
+			ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper);
+
+			//项目名称
+			String projectVersion = (com.jero.modules.system.util.StringUtils.isBlank(projectLibraryBase.getParentId()) && com.jero.modules.system.util.StringUtils.isBlank(projectLibraryBase.getProjectVersion())) ? "00" : projectLibraryBase.getProjectVersion();
+			String projectName = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + "-" + projectLibraryBase.getTargetMarket() + "-" + projectVersion;
+			//TODO 切换成枚举，不要在代码里出现魔数
+			if (StringUtils.equals(operatorType, OperatorTypeEnum.INVENTORY_AFFIRM.getValue())) {
+				String ids = json.getString("ids");
+
+				//验证用户是否是该项目的studio
+				isStudio(projectLibraryId, cut);
+				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+				//清单确认截止时间
+				String inventoryAffirmDueDate = json.getString("inventoryAffirmDueDate");
+				Date endTime = new Date();
+				try {
+					endTime = sdf.parse(inventoryAffirmDueDate);
+				} catch (ParseException e) {
+					e.printStackTrace();
+				}
+
+				QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
+				if (StringUtils.isNotEmpty(ids)) {
+					queryWrapper.lambda().in(ProjectLawsInventoryEO::getId, Arrays.asList(ids.split(",")));
+				}
+				queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId, projectLibraryId);
+				List<ProjectLawsInventoryEO> projectLawsInventoryEOS = this.baseMapper.selectList(queryWrapper);
+
+				List<String> userIdList = new ArrayList<>();
+				List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
+				for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOS) {
+					//未发起或拒绝 可以发起清单确认
+					boolean checkStatus = (StringUtils.equals(projectLawsInventoryEO.getInventoryAffirmStatus(), InventoryAffirmStatusEnum.NOT_STARTED.getValue())
+							|| StringUtils.equals(projectLawsInventoryEO.getInventoryAffirmStatus(), InventoryAffirmStatusEnum.REJECTED.getValue()));
+					//如果该数据的法规工程师、认证工程师都不为空
+					boolean checkUser = (StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId())
+							&& StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId()));
+
+					if (checkStatus && checkUser) {
+						projectLawsInventoryEO.setInventoryAffirmStatus(InventoryAffirmStatusEnum.LIST_TO_CONFIRM.getValue());
+						projectLawsInventoryEO.setInventoryAffirmDueDate(sdf.parse(inventoryAffirmDueDate));
+						LambdaUpdateWrapper<ProjectLawsInventoryEO> updateWrapper = new LambdaUpdateWrapper<>();
+						updateWrapper.eq(ProjectLawsInventoryEO::getId, projectLawsInventoryEO.getId());
+						//认证工程师标识 如果认证工程师提交状态为空， 或认证工程师拒绝过，给认证工程师任务，让他处理
+						boolean homologationEngineerFlag = (
+								StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerSubmitStatus())
+										|| StringUtils.equals(projectLawsInventoryEO.getHomologationEngineerSubmitStatus(), "1")
+						);
+						//法规工程师标识 如果法规工程师提交状态为空， 或法规工程师拒绝过，给法规工程师任务，让他处理
+						boolean regulationOwnerFlag = (
+								StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerSubmitStatus())
+										|| StringUtils.equals(projectLawsInventoryEO.getRegulationOwnerSubmitStatus(), "1")
+						);
+						if (homologationEngineerFlag) {
+							updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerSubmitStatus, null);
+							userIdList.add(projectLawsInventoryEO.getHomologationEngineerId());
+
+							ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
+							processInfoDetailEO.setProjectLawsInventoryId(projectLawsInventoryEO.getId());
+							processInfoDetailEO.setUserId(projectLawsInventoryEO.getHomologationEngineerId());
+							processInfoDetailEO.setTaskDefinitionKey(InventoryAffirmNodeEnum.HOMOLOGATION_ENGINEER_AUDIT.getKey());
+							processInfoDetailEO.setEndTime(endTime);
+							processInfoDetailEO.setCreateTime(new Date());
+							processInfoDetailEO.setCreateBy(currentUser.getId());
+							processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue());
+
+							processInfoDetailEOList.add(processInfoDetailEO);
+						}
+						if (regulationOwnerFlag) {
+							updateWrapper.set(ProjectLawsInventoryEO::getRegulationOwnerSubmitStatus, null);
+							userIdList.add(projectLawsInventoryEO.getRegulationOwnerId());
+
+							ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
+							processInfoDetailEO.setProjectLawsInventoryId(projectLawsInventoryEO.getId());
+							processInfoDetailEO.setUserId(projectLawsInventoryEO.getRegulationOwnerId());
+							processInfoDetailEO.setTaskDefinitionKey(InventoryAffirmNodeEnum.REGULATION_OWNER_AUDIT.getKey());
+							processInfoDetailEO.setEndTime(endTime);
+							processInfoDetailEO.setCreateTime(new Date());
+							processInfoDetailEO.setCreateBy(currentUser.getId());
+							processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue());
+
+							processInfoDetailEOList.add(processInfoDetailEO);
+						}
+
+						if (homologationEngineerFlag || regulationOwnerFlag) {
+							//创建一条当前发起清单确认的studio的已办任务。
+							ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
+							processInfoDetailEO.setProjectLawsInventoryId(projectLawsInventoryEO.getId());
+							processInfoDetailEO.setUserId(currentUser.getId());
+							processInfoDetailEO.setTaskDefinitionKey(InventoryAffirmNodeEnum.INITIATED_BY_STUDIO_ENGINEERS.getKey());
+							processInfoDetailEO.setEndTime(endTime);
+							processInfoDetailEO.setCreateTime(new Date());
+							processInfoDetailEO.setCreateBy(currentUser.getId());
+							processInfoDetailEO.setStatus(TaskStatusEnum.HAVE_DONE.getValue());
+
+							processInfoDetailEO.setSubmitTime(new Date());
+							processInfoDetailEOList.add(processInfoDetailEO);
+
+							super.update(projectLawsInventoryEO, updateWrapper);
+						}
+					}
+				}
+
+				if (CollectionUtils.isNotEmpty(userIdList)) {
+					userIdList = userIdList.stream().distinct().collect(Collectors.toList());
+					List<SysUser> sysUsers = sysUserService.listByIds(userIdList);
+					List<String> thirdIdList = new ArrayList<>();
+					if (CollectionUtils.isNotEmpty(sysUsers)) {
+						thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList());
+					}
+					//消息内容
+					//String msgContentEN = currentUser.getUsername() + " initiated the regulation list confirmation for "
+					//		+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					//		+ ". The due date is " + inventoryAffirmDueDate+ ". Please check and address it in a timely manner.";
+					//String msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					//		+ ": You have a regulation list confirmation task to complete";
+
+					// 飞书消息封装
+					//FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
+					//feishuMsgVo.setContent("Hello! Please check and address this task in a timely manner.");
+					//feishuMsgVo.setTaskType("Regulation List Confirmation");
+					//feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
+					//feishuMsgVo.setInitiator(studioUserInfo.getUsername());
+					//feishuMsgVo.setDueDate(inventoryAffirmDueDate);
+
+					//飞书跳转链接
+					String hrefFeishu = backUrl
+							+ JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink()
+							+ projectLibraryId + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType()
+							+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
+							+ projectYearNameInfoEO.getYearName()
+							+ "&targetMarket=" + projectLibraryBase.getTargetMarket();
+
+					try {
+						FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+						feishuMsgVo.setTitle(MessageType2Enum.REGULATION_LIST_CONFIRMATION.getCn() + "/" + MessageType2Enum.REGULATION_LIST_CONFIRMATION.getEn());
+						feishuMsgVo.setCnContentUpper("您好，请及时查看处理此项任务，谢谢!");
+						feishuMsgVo.setCnContentLower("项目: " + projectName +
+								"\n发起人: " + currentUser.getUsername() +
+								"\n截止时间: " + inventoryAffirmDueDate);
+						feishuMsgVo.setEnContentUpper("Please check and address the task in a timely manner. Thank you!");
+						feishuMsgVo.setEnContentLower("Project: " + projectName +
+								"\nInitiator: " + currentUser.getUsername() +
+								"\nDue Date: " + inventoryAffirmDueDate);
+						feishuMsgVo.setUrl(hrefFeishu);
+						feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
+						feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
+					} catch (IOException e) {
+						log.error("飞书消息推送失败");
+					}
+
+					//系统内部跳转链接
+					//String href = "<a href='"
+					//		+ JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryId + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType()
+					//		+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
+					//		+ projectYearNameInfoEO.getYearName()
+					//		+ "&targetMarket=" + projectLibraryBase.getTargetMarket()
+					//		+ "'>" + " View details" + "</a>";
+					//String contentInfo = msgContentEN + " " + href;
+					//Map<String,Object> sendMessageMap = new HashMap<>();
+					//sendMessageMap.put("hrefFeishu",hrefFeishu);
+					//sendMessageMap.put("contentInfo",contentInfo);
+
+					//发送消息
+					//sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.LIST_CONFIRMATION,currentUser.getUsername());
+
+					//往待办中心添加数据。
+					ProcessInfoEO processInfoEO = new ProcessInfoEO();
+					this.addProcessInfo(processInfoEO, projectLibraryId, endTime);
+					this.addProcessInfoDetail(processInfoEO.getId(), processInfoDetailEOList, endTime);
+				}
+
+				result = "发起清单确认";
+			} else if (StringUtils.equals(operatorType, OperatorTypeEnum.SUBMIT_OR_REJECTED.getValue())) {
+				//提交结果 0通过 1拒绝
+				String operatorResult = json.getString("operatorResult");
+				if (StringUtils.equals(operatorResult, OperatorResultEnum.ACCEPTED.getValue())) {
+					result = "提交";
+				} else if (StringUtils.equals(operatorResult, OperatorResultEnum.REJECTED.getValue())) {
+					result = "拒绝";
+				}
+
+				/*List<String> idList = Arrays.asList(ids.split(","));
+
+				for (String id : idList) {
+					int isProjectRole = checkUserRole(projectLibraryId, currentUser.getId(), id);
+
+					ProjectLawsInventoryEO projectLawsInventoryEO = getById(id);
+
+					if(isProjectRole == Integer.parseInt(ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue())){
+						projectLawsInventoryEO.setRegulationOwnerSubmitStatus(operatorResult);
+						projectLawsInventoryEO.setHomologationEngineerSubmitStatus(operatorResult);
+					}else if(isProjectRole == Integer.parseInt(ProjectRoleEnum.REGULATI_ENGINEER.getValue())){
+						projectLawsInventoryEO.setRegulationOwnerSubmitStatus(operatorResult);
+					}else if(isProjectRole == Integer.parseInt(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){
+						projectLawsInventoryEO.setHomologationEngineerSubmitStatus(operatorResult);
+					}
+
+					//如果不是studio
+					if(isProjectRole != -1 && isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())){
+
+						String inventoryAffirmStatus = "";
+
+						//如果法规工程师与认证工程师都是提交通过 把清单确认状态设置为 接受
+						if(StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerSubmitStatus()) && StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerSubmitStatus())){
+							if(projectLawsInventoryEO.getRegulationOwnerSubmitStatus().equals("0") && projectLawsInventoryEO.getHomologationEngineerSubmitStatus().equals("0")){
+								inventoryAffirmStatus = InventoryAffirmStatusEnum.ACCEPTED.getValue();
+							}
+
+							//如果法规工程师与认证工程师 其中一个人是拒绝 把清单确认状态设置为 拒绝
+							if(projectLawsInventoryEO.getRegulationOwnerSubmitStatus().equals("1") || projectLawsInventoryEO.getHomologationEngineerSubmitStatus().equals("1")){
+								inventoryAffirmStatus = InventoryAffirmStatusEnum.REJECTED.getValue();
+							}
+						}
+
+						if(StringUtils.isNotEmpty(inventoryAffirmStatus)){
+							projectLawsInventoryEO.setInventoryAffirmStatus(inventoryAffirmStatus);
+						}
+						super.baseMapper.updateById(projectLawsInventoryEO);
+					}
+				}*/
+
+				JSONArray lawsInventoryList = json.getJSONArray("lawsInventoryList");
+				if (CollectionUtils.isNotEmpty(lawsInventoryList)) {
+					Map<String, Object> lawsInventoryMap = null;
+					for (Object lawsInventory : lawsInventoryList) {
+						lawsInventoryMap = JSONObject.parseObject(JSONObject.toJSONString(lawsInventory), Map.class);
+						int isProjectRole = (int) lawsInventoryMap.get("roleCode");
+						String id = (String) lawsInventoryMap.get("id");
+
+						ProjectLawsInventoryEO projectLawsInventoryEO = getById(id);
+
+						//法规中英文
+						BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(projectLawsInventoryEO.getStandId());
+						String LAW_EN = "";
+						if (ObjectUtils.isNotEmpty(bussDocumentLibraryEO)) {
+							if (ObjectUtils.isNotEmpty(bussDocumentLibraryEO.getTitleEn())) {
+								LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();
+							} else {
+								LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle();
+							}
+						} else {
+							LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle();
+						}
+
+						if (isProjectRole == Integer.parseInt(ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue())) {
+							projectLawsInventoryEO.setRegulationOwnerSubmitStatus(operatorResult);
+							projectLawsInventoryEO.setHomologationEngineerSubmitStatus(operatorResult);
+						} else if (isProjectRole == Integer.parseInt(ProjectRoleEnum.REGULATI_ENGINEER.getValue())) {
+							projectLawsInventoryEO.setRegulationOwnerSubmitStatus(operatorResult);
+						} else if (isProjectRole == Integer.parseInt(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) {
+							projectLawsInventoryEO.setHomologationEngineerSubmitStatus(operatorResult);
+						}
+
+						//如果不是studio
+						if (isProjectRole != -1 && isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())) {
+
+							String inventoryAffirmStatus = "";
+
+							//如果法规工程师与认证工程师都是提交通过 把清单确认状态设置为 接受
+							if (StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerSubmitStatus()) && StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerSubmitStatus())) {
+								if (projectLawsInventoryEO.getRegulationOwnerSubmitStatus().equals("0") && projectLawsInventoryEO.getHomologationEngineerSubmitStatus().equals("0")) {
+									inventoryAffirmStatus = InventoryAffirmStatusEnum.ACCEPTED.getValue();
+								}
+
+								/*//如果法规工程师与认证工程师 其中一个人是拒绝 把清单确认状态设置为 拒绝
+								if(projectLawsInventoryEO.getRegulationOwnerSubmitStatus().equals("1") || projectLawsInventoryEO.getHomologationEngineerSubmitStatus().equals("1")){
+									inventoryAffirmStatus = InventoryAffirmStatusEnum.REJECTED.getValue();
+								}*/
+							}
+
+							//只要有一个人拒绝，就改为拒绝。
+							if (StringUtils.equals(operatorResult, OperatorResultEnum.REJECTED.getValue())) {
+								inventoryAffirmStatus = InventoryAffirmStatusEnum.REJECTED.getValue();
+								//如果拒绝，给studio发消息
+
+								SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+								//消息内容
+								//String msgContentEN = "";
+								//String msgTitle = "";
+
+								if (isProjectRole == Integer.parseInt(ProjectRoleEnum.REGULATI_ENGINEER.getValue()) || isProjectRole == Integer.parseInt(ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue())) {
+									//msgContentEN = "The regulation list confirmation" +" of "+projectLawsInventoryEO.getSerialNumber() +" for "
+									//		+ projectNameInfoEO.getProjectName() +" is rejected by " +currentUser.getUsername() +". Please check and address it in a timely manner.";
+									//msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket() +
+									//		": You have a regulation list confirmation task to complete";
+
+
+									// 飞书消息封装
+									//FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
+									//feishuMsgVo.setContent("Hello! This task is rejected by " +currentUser.getUsername()+ ". Please check and address it in a timely manner.");
+									//feishuMsgVo.setTaskType("Regulation List Confirmation");
+									//feishuMsgVo.setRegulationNo(projectLawsInventoryEO.getSerialNumber());
+									//feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
+									//feishuMsgVo.setInitiator(studioUserInfo.getUsername());
+									//feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getInventoryAffirmDueDate()));
+
+									//飞书跳转链接
+									String hrefFeishu = backUrl
+											+ JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink()
+											+ projectLibraryId + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType()
+											+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
+											+ projectYearNameInfoEO.getYearName()
+											+ "&targetMarket=" + projectLibraryBase.getTargetMarket();
+									//系统内部跳转链接
+									//String href = "<a href='"
+									//		+ JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryId + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType()
+									//		+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
+									//		+ projectYearNameInfoEO.getYearName()
+									//		+ "&targetMarket=" + projectLibraryBase.getTargetMarket()
+									//		+ "'>" + " View details" + "</a>";
+									//String contentInfo = msgContentEN + " " + href;
+									//Map<String,Object> sendMessageMap = new HashMap<>();
+									//sendMessageMap.put("hrefFeishu",hrefFeishu);
+									//sendMessageMap.put("contentInfo",contentInfo);
+
+									//发送消息
+									List<String> userIdList = new ArrayList<>();
+									userIdList.add(projectLibraryBase.getStudioEngineer());
+									List<SysUser> sysUsers = sysUserService.listByIds(userIdList);
+									List<String> thirdIdList = new ArrayList<>();
+									if (CollectionUtils.isNotEmpty(sysUsers)) {
+										thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList());
+									}
+									//sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.LIST_CONFIRMATION,studioUserInfo.getUsername());
+									String dueDate = sdf.format(projectLawsInventoryEO.getInventoryAffirmDueDate());
+									try {
+										FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+										feishuMsgVo.setTitle(MessageType2Enum.REGULATION_LIST_CONFIRMATION.getCn() + "/" + MessageType2Enum.REGULATION_LIST_CONFIRMATION.getEn());
+										feishuMsgVo.setCnContentUpper("您好，该任务被" + currentUser.getUsername() + "拒绝，请及时查看处理");
+										feishuMsgVo.setCnContentLower("项目: " + projectName +
+												"\n法规: " + projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle() +
+												"\n发起人: " + currentUser.getUsername() +
+												"\n截止时间: " + dueDate);
+										feishuMsgVo.setEnContentUpper("Hello! This task is rejected by " + currentUser.getUsername() + ". Please check and address it in a timely manner");
+										feishuMsgVo.setEnContentLower("Project: " + projectName +
+												"\nRegulation No: " + LAW_EN +
+												"\nInitiator: " + currentUser.getUsername() +
+												"\nDue Date: " + dueDate);
+										feishuMsgVo.setUrl(hrefFeishu);
+										feishuMsgVo.setColor(MsgColorEnum.RED.getValue()); // 颜色
+										feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
+									} catch (IOException e) {
+										log.error("飞书消息推送失败");
+									}
+								}
+
+								if (isProjectRole == Integer.parseInt(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue()) || isProjectRole == Integer.parseInt(ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue())) {
+									//msgContentEN = "The regulation list confirmation of "+projectLawsInventoryEO.getSerialNumber() + " for "
+									//		+ projectNameInfoEO.getProjectName() +" is rejected by " + currentUser.getUsername() +". Please check and address it in a timely manner.";
+									//msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket() +
+									//		": You have a regulation list confirmation task to complete";
+
+									// 飞书消息封装
+									//FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
+									//feishuMsgVo.setContent("Hello! This task is rejected by "+currentUser.getUsername()+". Please check and address it in a timely manner.");
+									//feishuMsgVo.setTaskType("Regulation List Confirmation");
+									//feishuMsgVo.setRegulationNo(projectLawsInventoryEO.getSerialNumber());
+									//feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
+									//feishuMsgVo.setInitiator(studioUserInfo.getUsername());
+									//feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getInventoryAffirmDueDate()));
+
+									//飞书跳转链接
+									String hrefFeishu = backUrl
+											+ JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink()
+											+ projectLibraryId + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType()
+											+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
+											+ projectYearNameInfoEO.getYearName()
+											+ "&targetMarket=" + projectLibraryBase.getTargetMarket();
+									//系统内部跳转链接
+									//String href = "<a href='"
+									//		+ JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryId + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType()
+									//		+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
+									//		+ projectYearNameInfoEO.getYearName()
+									//		+ "&targetMarket=" + projectLibraryBase.getTargetMarket()
+									//		+ "'>" + " View details" + "</a>";
+									//String contentInfo = msgContentEN + " " + href;
+									//Map<String,Object> sendMessageMap = new HashMap<>();
+									//sendMessageMap.put("hrefFeishu",hrefFeishu);
+									//sendMessageMap.put("contentInfo",contentInfo);
+
+									//发送消息
+									List<String> userIdList = new ArrayList<>();
+									userIdList.add(projectLibraryBase.getStudioEngineer());
+									List<SysUser> sysUsers = sysUserService.listByIds(userIdList);
+									List<String> thirdIdList = new ArrayList<>();
+									if (CollectionUtils.isNotEmpty(sysUsers)) {
+										thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList());
+									}
+									//sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.LIST_CONFIRMATION,studioUserInfo.getUsername());
+									String dueDate = sdf.format(projectLawsInventoryEO.getInventoryAffirmDueDate());
+									try {
+										FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+										feishuMsgVo.setTitle(MessageType2Enum.REGULATION_LIST_CONFIRMATION.getCn() + "/" + MessageType2Enum.REGULATION_LIST_CONFIRMATION.getEn());
+										feishuMsgVo.setCnContentUpper("您好，该任务被" + currentUser.getUsername() + "拒绝，请及时查看处理");
+										feishuMsgVo.setCnContentLower("项目: " + projectName +
+												"\n法规: " + projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle() +
+												"\n发起人: " + currentUser.getUsername() +
+												"\n截止时间: " + dueDate);
+										feishuMsgVo.setEnContentUpper("Hello! This task is rejected by " + currentUser.getUsername() + ". Please check and address it in a timely manner");
+										feishuMsgVo.setEnContentLower("Project: " + projectName +
+												"\nRegulation No: " + LAW_EN +
+												"\nInitiator: " + currentUser.getUsername() +
+												"\nDue Date: " + dueDate);
+										feishuMsgVo.setUrl(hrefFeishu);
+										feishuMsgVo.setColor(MsgColorEnum.RED.getValue()); // 颜色
+										feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
+									} catch (IOException e) {
+										log.error("飞书消息推送失败");
+									}
+								}
+							}
+
+							if (StringUtils.isNotEmpty(inventoryAffirmStatus)) {
+								projectLawsInventoryEO.setInventoryAffirmStatus(inventoryAffirmStatus);
+							}
+							super.baseMapper.updateById(projectLawsInventoryEO);
+							this.updateProcessInfoDetail(projectLawsInventoryEO.getId());
+
+							//如果法规、认证工程师都提交通过，法规清单 清单确认状态为：接受， 并且给当前项目的studio发送消息
+							/*if(StringUtils.equals(inventoryAffirmStatus,InventoryAffirmStatusEnum.ACCEPTED.getValue())){
+								SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+								//消息内容
+								String msgContentEN = "The regulation list confirmation of "
+										+projectLawsInventoryEO.getSerialNumber()+" for "
+										+ projectNameInfoEO.getProjectName() +" is completed. Please check.";
+								String msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+										+ ": You have a regulation list confirmation notification to check";
+
+								// 飞书消息封装
+								FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
+								feishuMsgVo.setContent("Hello! This task is completed. Please check.");
+								feishuMsgVo.setTaskType("Regulation List Confirmation");
+								feishuMsgVo.setRegulationNo(projectLawsInventoryEO.getSerialNumber());
+								feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
+								feishuMsgVo.setInitiator(studioUserInfo.getUsername());
+								feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getInventoryAffirmDueDate()));
+
+								//飞书跳转链接
+								String hrefFeishu = backUrl
+										+ JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink()
+										+ projectLibraryId + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType()
+										+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
+										+ projectYearNameInfoEO.getYearName()
+										+ "&targetMarket=" + projectLibraryBase.getTargetMarket();
+								//系统内部跳转链接
+								String href = "<a href='"
+										+ JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryId + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType()
+										+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
+										+ projectYearNameInfoEO.getYearName()
+										+ "&targetMarket=" + projectLibraryBase.getTargetMarket()
+										+ "'>" + " View details" + "</a>";
+								String contentInfo = msgContentEN + " " + href;
+								Map<String,Object> sendMessageMap = new HashMap<>();
+								sendMessageMap.put("hrefFeishu",hrefFeishu);
+								sendMessageMap.put("contentInfo",contentInfo);
+
+								//发送消息
+								List<String> userIdList = new ArrayList<>();
+								userIdList.add(projectLibraryBase.getStudioEngineer());
+								sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.LIST_CONFIRMATION,studioUserInfo.getUsername());
+							}*/
+						}
+					}
+				} else {
+					throw new JeroBootException("请至少勾选一条法规清单进行" + result);
+				}
+
+			}
+		} catch (Exception ex) {
+			log.error("批量" + result + " 更新状态失败：" + ex.getMessage());
+			throw new JeroBootException("批量" + result + "失败！");
+		}
+		return new Result<>().success(result + "成功！");
+	}
+
+	/**
+	 * 发送消息
+	 *
+	 * @param msgContent
+	 * @param userIdList
+	 * @param projectLibraryId
+	 */
+	@Override
+	public void sendMessage(String msgTitle, String msgContent, List<String> userIdList, String projectLibraryId, Map<String, Object> sendMessageMap, FeishuMsgVo feishuMsgVo, MessageTypeEnum messageType, String initiator) {
+		String idTemp = projectLibraryId;
+
+		List<SysUser> sysUsers = sysUserService.listByIds(userIdList);
+		List<String> thirdIdList = new ArrayList<>();
+		if (CollectionUtils.isNotEmpty(sysUsers)) {
+			thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList());
+		}
+//		//飞书跳转链接
+		String hrefFeishu = (String) sendMessageMap.get("hrefFeishu");
+		//消息内容
+		String contentInfo = (String) sendMessageMap.get("contentInfo");
+
+		//系统消息
+		SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgTitle, msgContent, contentInfo, messageType, initiator);
+		sysAnnouncementService.saveAnnouncement(sysAnnouncement);
+		sendWebsocket(idTemp, idTemp);
+
+//		//飞书消息
+		try {
+			if (feishuMsgVo != null) {
+				// 补充飞书跳转链接
+				feishuMsgVo.setUrl(hrefFeishu);
+				feishuMsgVo.setTitle(messageType.getName());
+				iFeishuService.sendCardMsg(thirdIdList.toArray(new String[]{}), feishuMsgVo);
+			} else {
+				iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), msgContent, messageType.getName(), hrefFeishu);
+			}
+		} catch (IOException e) {
+			log.error("飞书消息推送失败");
+		}
+	}
+
+	@NotNull
+	private SysAnnouncement getSysAnnouncement(List<String> userIdList, String title, String content, String contentInfo, MessageTypeEnum messageType, String initiator) {
+		SysAnnouncement sysAnnouncement = new SysAnnouncement();
+		sysAnnouncement.setInitiator(initiator);
+		sysAnnouncement.setDelFlag("0");
+		sysAnnouncement.setSendStatus("0");
+		sysAnnouncement.setSendTime(new Date());
+		sysAnnouncement.setMsgCategory(messageType.getValue());//消息类型
+		sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户
+		sysAnnouncement.setTitile(title);
+		sysAnnouncement.setMsgContent(content);
+		sysAnnouncement.setMsgContentInfo(contentInfo);
+		sysAnnouncement.setUserIds(StringUtils.join(userIdList, ","));
+		return sysAnnouncement;
+	}
+
+	private void sendWebsocket(String msgId, String msgTet) {
+		JSONObject obj = new JSONObject();
+		obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC);
+		obj.put(WebsocketConst.MSG_ID, msgId);
+		obj.put(WebsocketConst.MSG_TXT, msgTet);
+		webSocket.sendMessage(obj.toJSONString());
+	}
+
+	/**
+	 * 匹配相关人员
+	 *
+	 * @param params
+	 * @return
+	 */
+	@Override
+	public Result<?> matchRelevantPeople(Map<String, Object> params) {
+		String projectLibraryId = (String) params.get("projectLibraryId");//项目id
+
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		int isProjectRole = this.checkUserRole(projectLibraryId, currentUser.getId(), "");
+		//验证用户是否是该项目的studio工程师，只有studio工程师才能匹配相关人员
+		if (isProjectRole == Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())) {
+			//获取当前项目中的相关人员信息
+			QueryWrapper<ProjectRelatedPersonnel> queryProjectPerson = new QueryWrapper<>();
+			queryProjectPerson.lambda().eq(ProjectRelatedPersonnel::getProjectId, projectLibraryId);
+			List<ProjectRelatedPersonnel> projectRelatedPersonnels = this.projectRelatedPersonnelMapper.selectList(queryProjectPerson);
+
+			if (CollectionUtils.isNotEmpty(projectRelatedPersonnels)) {
+				QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
+				/*List<String> inventoryAffirmStatusList = new ArrayList<>();
+				inventoryAffirmStatusList.add(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
+				inventoryAffirmStatusList.add(InventoryAffirmStatusEnum.REJECTED.getValue());
+				queryWrapper.lambda().in(ProjectLawsInventoryEO::getInventoryAffirmStatus,inventoryAffirmStatusList);*/
+
+				String ids = (String) params.get("ids");
+				if (StringUtils.isNotEmpty(ids)) {
+					List<String> projectLawsInventoryIdList = Arrays.asList(ids.split(","));
+					queryWrapper.lambda().in(ProjectLawsInventoryEO::getId, projectLawsInventoryIdList);
+				}
+
+				queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId, projectLibraryId);
+				//查询当前项目下，清单状态为 未发起、拒绝状态的法规清单。
+				List<ProjectLawsInventoryEO> projectLawsInventoryEOS = this.baseMapper.selectList(queryWrapper);
+				//项目库信息(获取studio)
+				LambdaQueryWrapper<ProjectLibraryBase> wrapper = new LambdaQueryWrapper<>();
+				wrapper.in(ProjectLibraryBase::getId, projectLibraryId);
+				List<ProjectLibraryBase> projectLibraryBases = projectLibraryBaseMapper.selectList(wrapper);
+				String studioEngineer = "";
+				if (projectLibraryBases.size() != 0) {
+					studioEngineer = projectLibraryBases.get(0).getStudioEngineer();
+				}
+
+				for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOS) {
+					//法规清单的责任领域
+					/*String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
+					if(StringUtils.isNotBlank(dutyTerritory)){
+						List<ProjectRelatedPersonnel> projectRelatedPersonnelList = new ArrayList<>();
+						for (String s : dutyTerritory.split(",")) {
+							List<ProjectRelatedPersonnel> projectRelatedPersonnelListTemp  = projectRelatedPersonnels.stream()
+									.filter(e -> s.equals(e.getDutyTerritory())).collect(Collectors.toList());
+							if(projectRelatedPersonnelListTemp.size() != 0){
+								projectRelatedPersonnelList.addAll(projectRelatedPersonnelListTemp);
+							}
+						}
+//						List<ProjectRelatedPersonnel> projectRelatedPersonnelList = projectRelatedPersonnels.stream()
+//								.filter(e -> dutyTerritory.contains(e.getDutyTerritory())).collect(Collectors.toList());
+
+						List<String> lawEngineerList = projectRelatedPersonnelList.stream().map(ProjectRelatedPersonnel::getLawEngineer).distinct().collect(Collectors.toList()).stream().filter(e->StringUtils.isNotBlank(e)).collect(Collectors.toList());
+						List<String> engineeringInterfacePersonList = projectRelatedPersonnelList.stream().map(ProjectRelatedPersonnel::getEngineeringInterfacePerson).distinct().collect(Collectors.toList()).stream().filter(e->StringUtils.isNotBlank(e)).collect(Collectors.toList());
+						List<String> certificationEngineerList = projectRelatedPersonnelList.stream().map(ProjectRelatedPersonnel::getCertificationEngineer).distinct().collect(Collectors.toList()).stream().filter(e->StringUtils.isNotBlank(e)).collect(Collectors.toList());
+						List<String> lawEngineerListTemp = new ArrayList<>();
+						List<String> engineeringInterfacePersonListTemp = new ArrayList<>();
+						List<String> certificationEngineerListTemp = new ArrayList<>();
+
+						if(lawEngineerList.size() != 0){
+							for (String s : lawEngineerList) {
+								lawEngineerListTemp.addAll(Arrays.asList(s.split(",")));
+							}
+							lawEngineerListTemp = lawEngineerListTemp.stream().distinct().collect(Collectors.toList());
+						}
+						if(engineeringInterfacePersonList.size() != 0){
+							for (String s : engineeringInterfacePersonList) {
+								engineeringInterfacePersonListTemp.addAll(Arrays.asList(s.split(",")));
+							}
+							engineeringInterfacePersonListTemp = engineeringInterfacePersonListTemp.stream().distinct().collect(Collectors.toList());
+						}
+						if(certificationEngineerList.size() != 0){
+							for (String s : certificationEngineerList) {
+								certificationEngineerListTemp.addAll(Arrays.asList(s.split(",")));
+							}
+							certificationEngineerListTemp = certificationEngineerListTemp.stream().distinct().collect(Collectors.toList());
+						}
+
+						//法规工程师
+						if (StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerId()) && lawEngineerListTemp.size() == 1) {
+							List<String> finalLawEngineerList = lawEngineerListTemp;
+							List<ProjectRelatedPersonnel> collect = projectRelatedPersonnels.stream()
+									.filter(e -> finalLawEngineerList.contains(e.getLawEngineer())).collect(Collectors.toList());
+							if(collect.size() != 0){
+								String userId = ToGetAUserId(ProjectRoleEnum.REGULATI_ENGINEER.getValue(), collect.get(0),studioEngineer);
+								if(StringUtils.isNotEmpty(userId)){
+									projectLawsInventoryEO.setRegulationOwnerId(userId);
+								}
+							}
+						}
+
+						//认证工程师
+						if (StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerId()) && certificationEngineerListTemp.size() == 1) {
+							List<String> finalCertificationEngineerList = certificationEngineerListTemp;
+							List<ProjectRelatedPersonnel> collect = projectRelatedPersonnels.stream()
+									.filter(e -> finalCertificationEngineerList.contains(e.getCertificationEngineer())).collect(Collectors.toList());
+							if(collect.size() != 0){
+								String userId = ToGetAUserId(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue(), collect.get(0),studioEngineer);
+								if(StringUtils.isNotEmpty(userId)){
+									projectLawsInventoryEO.setHomologationEngineerId(userId);
+								}
+							}
+						}
+
+						//项目接口人
+						if (StringUtils.isEmpty(projectLawsInventoryEO.getEngineeringInterfacePerson()) && engineeringInterfacePersonListTemp.size() == 1) {
+							List<String> finalEngineeringInterfacePersonList = engineeringInterfacePersonListTemp;
+							List<ProjectRelatedPersonnel> collect = projectRelatedPersonnels.stream()
+									.filter(e -> finalEngineeringInterfacePersonList.contains(e.getEngineeringInterfacePerson())).collect(Collectors.toList());
+							if(collect.size() != 0){
+								String userId = ToGetAUserId(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue(), collect.get(0),studioEngineer);
+								if(StringUtils.isNotEmpty(userId)){
+									projectLawsInventoryEO.setEngineeringInterfacePerson(userId);
+								}
+							}
+						}
+					}*/
+
+					String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
+					if (StringUtils.isNotEmpty(dutyTerritory)) {
+						List<ProjectRelatedPersonnel> projectRelatedPersonnelTempList = projectRelatedPersonnels.stream().filter(relatedPersonnel -> {
+							boolean flag = false;
+							for (String duty : dutyTerritory.split(",")) {
+								if (StringUtils.equals(duty, relatedPersonnel.getDutyTerritory())) {
+									flag = true;
+								}
+							}
+							return flag;
+						}).collect(Collectors.toList());
+
+						if (CollectionUtils.isNotEmpty(projectRelatedPersonnelTempList)) {
+
+							LambdaUpdateWrapper<ProjectLawsInventoryEO> updateWrapper = new LambdaUpdateWrapper<>();
+
+							//法规工程师
+							if (StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerId())) {
+								String userId = ToGetAUserId(ProjectRoleEnum.REGULATI_ENGINEER.getValue(), projectRelatedPersonnelTempList, studioEngineer);
+								if (StringUtils.isNotEmpty(userId)) {
+									projectLawsInventoryEO.setRegulationOwnerId(userId);
+								}
+							} else {
+								String userId = ToGetAUserId(ProjectRoleEnum.REGULATI_ENGINEER.getValue(), projectRelatedPersonnelTempList, studioEngineer, projectLawsInventoryEO.getRegulationOwnerId());
+								if (StringUtils.isNotEmpty(userId)) {
+									projectLawsInventoryEO.setRegulationOwnerId(userId);
+								} else {
+									updateWrapper.set(ProjectLawsInventoryEO::getRegulationOwnerId, null);
+								}
+							}
+
+							//认证工程师
+							if (StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerId())) {
+								String userId = ToGetAUserId(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue(), projectRelatedPersonnelTempList, studioEngineer);
+								if (StringUtils.isNotEmpty(userId)) {
+									projectLawsInventoryEO.setHomologationEngineerId(userId);
+								}
+							} else {
+								String userId = ToGetAUserId(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue(), projectRelatedPersonnelTempList, studioEngineer, projectLawsInventoryEO.getHomologationEngineerId());
+								if (StringUtils.isNotEmpty(userId)) {
+									projectLawsInventoryEO.setHomologationEngineerId(userId);
+								} else {
+									updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerId, null);
+								}
+							}
+
+							//项目接口人
+							if (StringUtils.isEmpty(projectLawsInventoryEO.getEngineeringInterfacePerson())) {
+								String userId = ToGetAUserId(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue(), projectRelatedPersonnelTempList, studioEngineer);
+								if (StringUtils.isNotEmpty(userId)) {
+									projectLawsInventoryEO.setEngineeringInterfacePerson(userId);
+								}
+							} else {
+								String userId = ToGetAUserId(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue(), projectRelatedPersonnelTempList, studioEngineer, projectLawsInventoryEO.getEngineeringInterfacePerson());
+								if (StringUtils.isNotEmpty(userId)) {
+									projectLawsInventoryEO.setEngineeringInterfacePerson(userId);
+								} else {
+									updateWrapper.set(ProjectLawsInventoryEO::getEngineeringInterfacePerson, null);
+								}
+							}
+
+							//设计符合性确认
+							//发起人角色
+							String designInitiator = projectLawsInventoryEO.getDesignInitiator();
+							if (StringUtils.isNotEmpty(designInitiator)) {
+								if (StringUtils.isEmpty(projectLawsInventoryEO.getDesignInitiatorId())) {
+									String userId = ToGetAUserId(designInitiator, projectRelatedPersonnelTempList, studioEngineer);
+									if (StringUtils.isNotEmpty(userId)) {
+										projectLawsInventoryEO.setDesignInitiatorId(userId);
+									}
+								} else {
+									String userId = ToGetAUserId(designInitiator, projectRelatedPersonnelTempList, studioEngineer, projectLawsInventoryEO.getDesignInitiatorId());
+									if (StringUtils.isNotEmpty(userId)) {
+										projectLawsInventoryEO.setDesignInitiatorId(userId);
+									} else {
+										updateWrapper.set(ProjectLawsInventoryEO::getDesignInitiatorId, null);
+									}
+								}
+							}
+
+							//责任人角色
+							String designDuty = projectLawsInventoryEO.getDesignDuty();
+							if (StringUtils.isNotEmpty(designDuty)) {
+								if (StringUtils.isEmpty(projectLawsInventoryEO.getDesignDutyId())) {
+									String userId = ToGetAUserId(designDuty, projectRelatedPersonnelTempList, studioEngineer);
+									if (StringUtils.isNotEmpty(userId)) {
+										projectLawsInventoryEO.setDesignDutyId(userId);
+									}
+								} else {
+									String userId = ToGetAUserId(designDuty, projectRelatedPersonnelTempList, studioEngineer, projectLawsInventoryEO.getDesignDutyId());
+									if (StringUtils.isNotEmpty(userId)) {
+										projectLawsInventoryEO.setDesignDutyId(userId);
+									} else {
+										updateWrapper.set(ProjectLawsInventoryEO::getDesignDutyId, null);
+									}
+								}
+							}
+
+
+							//prehomo确认
+							//发起人角色
+							String prehomoInitiator = projectLawsInventoryEO.getPrehomoInitiator();
+							if (StringUtils.isNotEmpty(prehomoInitiator)) {
+								if (StringUtils.isEmpty(projectLawsInventoryEO.getPrehomoInitiatorId())) {
+									String userId = ToGetAUserId(prehomoInitiator, projectRelatedPersonnelTempList, studioEngineer);
+									if (StringUtils.isNotEmpty(userId)) {
+										projectLawsInventoryEO.setPrehomoInitiatorId(userId);
+									}
+								} else {
+									String userId = ToGetAUserId(prehomoInitiator, projectRelatedPersonnelTempList, studioEngineer, projectLawsInventoryEO.getPrehomoInitiatorId());
+									if (StringUtils.isNotEmpty(userId)) {
+										projectLawsInventoryEO.setPrehomoInitiatorId(userId);
+									} else {
+										updateWrapper.set(ProjectLawsInventoryEO::getPrehomoInitiatorId, null);
+									}
+								}
+							}
+
+							//责任人角色
+							String prehomoDuty = projectLawsInventoryEO.getPrehomoDuty();
+							if (StringUtils.isNotEmpty(prehomoDuty)) {
+								if (StringUtils.isEmpty(projectLawsInventoryEO.getPrehomoDutyId())) {
+									String userId = ToGetAUserId(prehomoDuty, projectRelatedPersonnelTempList, studioEngineer);
+									if (StringUtils.isNotEmpty(userId)) {
+										projectLawsInventoryEO.setPrehomoDutyId(userId);
+									}
+								} else {
+									String userId = ToGetAUserId(prehomoDuty, projectRelatedPersonnelTempList, studioEngineer, projectLawsInventoryEO.getPrehomoDutyId());
+									if (StringUtils.isNotEmpty(userId)) {
+										projectLawsInventoryEO.setPrehomoDutyId(userId);
+									} else {
+										updateWrapper.set(ProjectLawsInventoryEO::getPrehomoDutyId, null);
+									}
+								}
+							}
+
+							//验证符合性确认
+							//发起人角色
+							String verifyInitiator = projectLawsInventoryEO.getVerifyInitiator();
+							if (StringUtils.isNotEmpty(verifyInitiator)) {
+								if (StringUtils.isEmpty(projectLawsInventoryEO.getVerifyInitiatorId())) {
+									String userId = ToGetAUserId(verifyInitiator, projectRelatedPersonnelTempList, studioEngineer);
+									if (StringUtils.isNotEmpty(userId)) {
+										projectLawsInventoryEO.setVerifyInitiatorId(userId);
+									}
+								} else {
+									String userId = ToGetAUserId(verifyInitiator, projectRelatedPersonnelTempList, studioEngineer, projectLawsInventoryEO.getVerifyInitiatorId());
+									if (StringUtils.isNotEmpty(userId)) {
+										projectLawsInventoryEO.setVerifyInitiatorId(userId);
+									} else {
+										updateWrapper.set(ProjectLawsInventoryEO::getVerifyInitiatorId, null);
+									}
+								}
+							}
+
+							//责任人角色
+							String verifyDuty = projectLawsInventoryEO.getVerifyDuty();
+							if (StringUtils.isNotEmpty(verifyDuty)) {
+								if (StringUtils.isEmpty(projectLawsInventoryEO.getVerifyDutyId())) {
+									String userId = ToGetAUserId(verifyDuty, projectRelatedPersonnelTempList, studioEngineer);
+									if (StringUtils.isNotEmpty(userId)) {
+										projectLawsInventoryEO.setVerifyDutyId(userId);
+									}
+								} else {
+									String userId = ToGetAUserId(verifyDuty, projectRelatedPersonnelTempList, studioEngineer, projectLawsInventoryEO.getVerifyDutyId());
+									if (StringUtils.isNotEmpty(userId)) {
+										projectLawsInventoryEO.setVerifyDutyId(userId);
+									} else {
+										updateWrapper.set(ProjectLawsInventoryEO::getVerifyDutyId, null);
+									}
+								}
+							}
+							updateWrapper.eq(ProjectLawsInventoryEO::getId, projectLawsInventoryEO.getId());
+							super.update(projectLawsInventoryEO, updateWrapper);
+						}
+					}
+					//this.baseMapper.updateById(projectLawsInventoryEO);
+				}
+			} else {
+				throw new JeroBootException("当前项目中，未找到相关维护人员信息");
+			}
+		} else {
+			throw new JeroBootException("当前操作用户不是该项目的studio工程师，没有权限操作！");
+		}
+
+		//更新log
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		String username = sysUser.getUsername();
+		String contentLog = username + "带入了相关人员名单信息";
+		String enContentLog = username + " brought in the list information of relevant personnel.";
+		projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId, CutEnum.CN.getValue());
+		projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId, CutEnum.EN.getValue());
+
+		return new Result<>().success("带入成功！");
+	}
+
+	/**
+	 * 获取一个用户的id
+	 *
+	 * @param roleCode
+	 * @param projectRelatedPersonnelList
+	 * @return
+	 */
+	public String ToGetAUserId(String roleCode, List<ProjectRelatedPersonnel> projectRelatedPersonnelList, String studioEngineer) {
+		String resultUserId = "";
+		//法规工程师
+		if (StringUtils.equals(roleCode, ProjectRoleEnum.REGULATI_ENGINEER.getValue())) {
+			String lawEngineer = projectRelatedPersonnelList.stream().filter(relatedPersonnel -> {
+				boolean flag = false;
+				if (StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())) {
+					flag = true;
+				}
+				return flag;
+			}).map(ProjectRelatedPersonnel::getLawEngineer).distinct().collect(Collectors.joining(","));
+			if (StringUtils.isNotEmpty(lawEngineer)) {
+				String[] lawEngineerArr = lawEngineer.split(",");
+				if (lawEngineerArr.length == 1) {
+					resultUserId = lawEngineer;
+				}
+			}
+		}
+		//认证工程师
+		if (StringUtils.equals(roleCode, ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) {
+			String certificationEngineer = projectRelatedPersonnelList.stream().filter(relatedPersonnel -> {
+				boolean flag = false;
+				if (StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())) {
+					flag = true;
+				}
+				return flag;
+			}).map(ProjectRelatedPersonnel::getCertificationEngineer).distinct().collect(Collectors.joining(","));
+			if (StringUtils.isNotEmpty(certificationEngineer)) {
+				String[] certificationEngineerArr = certificationEngineer.split(",");
+				if (certificationEngineerArr.length == 1) {
+					resultUserId = certificationEngineer;
+				}
+			}
+		}
+		//工程接口人
+		if (StringUtils.equals(roleCode, ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue())) {
+			String engineeringInterfacePerson = projectRelatedPersonnelList.stream().filter(relatedPersonnel -> {
+				boolean flag = false;
+				if (StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())) {
+					flag = true;
+				}
+				return flag;
+			}).map(ProjectRelatedPersonnel::getEngineeringInterfacePerson).distinct().collect(Collectors.joining(","));
+			if (StringUtils.isNotEmpty(engineeringInterfacePerson)) {
+				String[] engineeringInterfacePersonArr = engineeringInterfacePerson.split(",");
+				if (engineeringInterfacePersonArr.length == 1) {
+					resultUserId = engineeringInterfacePerson;
+				}
+			}
+		}
+		//studio
+		if (StringUtils.equals(roleCode, ProjectRoleEnum.STUDIO_ENGINEER.getValue())) {
+			resultUserId = studioEngineer;
+		}
+		return resultUserId;
+	}
+
+	/**
+	 * 流程调用
+	 *
+	 * @param jsonObject
+	 * @return
+	 */
+	@Override
+	public Result<?> processCall(JSONObject jsonObject) {
+		String requestSource = jsonObject.getString("requestSource");
+		if (StringUtils.isEmpty(requestSource)) {
+			throw new JeroBootException("请求来源不能为空！");
+		}
+		if (!StringUtils.equals(requestSource, RequestSourceEnum.WORK_FLOW.getValue())) {
+			throw new JeroBootException("来源有误，没有权限调用该接口！");
+		}
+
+		String operatorType = jsonObject.getString("operatorType");
+		if (StringUtils.isEmpty(operatorType)) {
+			throw new JeroBootException("操作类型不能为空！");
+		}
+
+		if (StringUtils.equals(operatorType, OperatorTypeEnum.UPDATE_STATUS.getValue())) {
+			ProjectLawsInventoryEO projectLawsInventoryEO = JSONObject.parseObject(jsonObject.toString(), ProjectLawsInventoryEO.class);
+			this.baseMapper.updateById(projectLawsInventoryEO);
+		}
+		if (StringUtils.equals(operatorType, OperatorTypeEnum.ADD.getValue())) {
+
+		}
+		if (StringUtils.equals(operatorType, OperatorTypeEnum.DELETE.getValue())) {
+
+		}
+		if (StringUtils.equals(operatorType, OperatorTypeEnum.QUERY.getValue())) {
+			Result<ProjectLawsInventoryEO> objectResult = new Result<>();
+			try {
+				String projectLawsInventoryId = jsonObject.getString("projectLawsInventoryId");
+				QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
+				queryWrapper.lambda().eq(ProjectLawsInventoryEO::getId, projectLawsInventoryId);
+				ProjectLawsInventoryEO projectLawsInventoryEO = this.baseMapper.selectOne(queryWrapper);
+				objectResult.setResult(projectLawsInventoryEO);
+				objectResult.setSuccess(true);
+			} catch (Exception ex) {
+				objectResult.setSuccess(false);
+				ex.printStackTrace();
+				log.error("工作流后端查询法规清单失败：" + ex.getMessage());
+			}
+			return objectResult;
+		}
+		if (StringUtils.equals(operatorType, OperatorTypeEnum.SEND_MSG.getValue())) {
+			// workFlowSendMsg(jsonObject);
+			Map<String, Object> prarams = (Map<String, Object>) jsonObject.get("params");
+			String templateId = jsonObject.getString("templateId");
+
+			String projectLibraryId = (String) prarams.get("projectLibraryId");
+			ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+			if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
+				String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+				String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+				// 获取待办中心 - 飞书跳转链接
+				Map<String, Object> todoCenterParams = new HashMap<>();
+				todoCenterParams.put("projectNameCn", PRN_CN);
+				todoCenterParams.put("projectNameEn", PRN_EN);
+				Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
+				prarams.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN"));
+				prarams.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN"));
+
+				String projectLawsInventoryId = (String) prarams.get("id");
+				ProjectLawsInventoryEO projectLawsInventoryEO = this.baseMapper.selectById(projectLawsInventoryId);
+
+				//处理手机端飞书消息跳转
+				String flowType = jsonObject.getString("flowType");
+				String actiProcInstId = jsonObject.getString("actiProcInstId");
+				String taskDefinitionKey = jsonObject.getString("taskDefinitionKey");
+				if(StringUtils.isNotEmpty(flowType)){
+					if("Design".equals(flowType)){
+						String hrefFeishu_CN_P = this.editService.handlePhoneDesignLink(projectLawsInventoryEO,actiProcInstId,taskDefinitionKey);
+						prarams.put("hrefFeishu_CN_P", hrefFeishu_CN_P);
+					}else if("Verify".equals(flowType)){
+						String hrefFeishu_CN_P = this.editService.handlePhoneVerifyLink(projectLawsInventoryEO,actiProcInstId,taskDefinitionKey);
+						prarams.put("hrefFeishu_CN_P", hrefFeishu_CN_P);
+					}
+				}
+				String regulationOwnerId = projectLawsInventoryEO.getRegulationOwnerId();
+				List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+				String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+				prarams.put("Initiator", regulationOwnerUserName);
+
+				this.sendMessageByTemplateId(templateId, prarams);
+			}
+		}
+
+		// 将法规工程师的 法规清单确认待办中心任务转为已办
+		if (StringUtils.equals(operatorType, OperatorTypeEnum.TO_DO_CENTER_FG_CONVERT_TO_HAVE_DONE.getValue())) {
+			String projectLawsInventoryId = jsonObject.getString("id");
+			ProjectLawsInventoryEO projectLawsInventoryEO = this.baseMapper.selectById(projectLawsInventoryId);
+			if (StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+					|| StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())) {
+				// 如果该条法规清单的设计、验证符合性流程都发起了，将法规工程师在待办中心的待办任务转为已办
+				LambdaUpdateWrapper<ProcessInfoDetailEO> pidUpdateWrap = new LambdaUpdateWrapper<>();
+				pidUpdateWrap.eq(ProcessInfoDetailEO::getFlowType, FlowTypeEnum.QDQR.getValue());
+				pidUpdateWrap.eq(ProcessInfoDetailEO::getProjectLawsInventoryId, projectLawsInventoryId);
+				pidUpdateWrap.set(ProcessInfoDetailEO::getStatus, TaskStatusEnum.HAVE_DONE.getValue());
+				this.processInfoDetailEOService.update(pidUpdateWrap);
+			}
+		}
+
+		return new Result<>().success("调用成功！");
+	}
+
+	@Override
+	public List<ProjectLawsInventoryEO> queryProjectLawsInventoryInfoById(Map<String, Object> params) {
+
+		String id = (String) params.get("id");
+		if (StringUtils.isEmpty(id)) {
+			throw new JeroBootException("id不能为空");
+		}
+		String cut = (String) params.get("cut");
+		//String operatorType = (String) params.get("operatorType");
+
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = new ArrayList<>();
+		ProjectLawsInventoryEO byId = getById(id);
+		projectLawsInventoryEOList.add(byId);
+		if (CollectionUtils.isNotEmpty(projectLawsInventoryEOList)) {
+			int isProjectRole = this.checkUserRole(byId.getProjectLibraryId(), currentUser.getId(), id);
+			dataDispose(projectLawsInventoryEOList, currentUser, isProjectRole, cut);
+			dataDictDispose(projectLawsInventoryEOList, cut);
+
+			//result.put("projectLawsInventory",projectLawsInventoryEOList.get(0));
+			/*if (StringUtils.equals(operatorType, OperatorTypeEnum.TASK_AFFIRM_QUERY.getValue())) {
+				//设计符合性
+				Map<String,Object> designMap = new HashMap<>();
+				designMap.put("designDeliverableType",projectLawsInventoryEOList.get(0).getDesignDeliverableType());
+				designMap.put("designDeliverableTemplateName",projectLawsInventoryEOList.get(0).getDesignDeliverableType());
+				designMap.put("designInitiatorName",projectLawsInventoryEOList.get(0).getDesignInitiatorName());
+				designMap.put("designDutyName",projectLawsInventoryEOList.get(0).getDesignDutyName());
+				designMap.put("designDueDate",projectLawsInventoryEOList.get(0).getDesignDueDate());
+				result.put("design",designMap);
+				//prehomo
+				Map<String,Object> prehomoMap = new HashMap<>();
+				prehomoMap.put("prehomoDeliverableType",projectLawsInventoryEOList.get(0).getPrehomoDeliverableType());
+				prehomoMap.put("prehomoDeliverableTemplateName",projectLawsInventoryEOList.get(0).getPrehomoDeliverableTemplateName());
+				prehomoMap.put("prehomoInitiatorName",projectLawsInventoryEOList.get(0).getPrehomoInitiatorName());
+				prehomoMap.put("prehomoDutyName",projectLawsInventoryEOList.get(0).getPrehomoDutyName());
+				prehomoMap.put("prehomoDueDate",projectLawsInventoryEOList.get(0).getPrehomoDueDate());
+				result.put("prehomo",prehomoMap);
+				//验证符合性
+				Map<String,Object> verifyMap = new HashMap<>();
+				verifyMap.put("verifyDeliverableType",projectLawsInventoryEOList.get(0).getVerifyDeliverableType());
+				verifyMap.put("verifyDeliverableTemplateName",projectLawsInventoryEOList.get(0).getVerifyDeliverableTemplateName());
+				verifyMap.put("verifyInitiatorName",projectLawsInventoryEOList.get(0).getVerifyInitiatorName());
+				verifyMap.put("verifyDutyName",projectLawsInventoryEOList.get(0).getVerifyDutyName());
+				verifyMap.put("verifyDueDate",projectLawsInventoryEOList.get(0).getVerifyDueDate());
+				result.put("verify",verifyMap);
+			}*/
+		} else {
+			throw new JeroBootException("未找到该法规清单信息！");
+		}
+		return projectLawsInventoryEOList;
+	}
+
+	/**
+	 * 工作流发送消息
+	 *
+	 * @param jsonObject
+	 */
+	public void workFlowSendMsg(JSONObject jsonObject) {
+		String msgType = jsonObject.getString("msgType"); //发送消息类型
+		if (StringUtils.isEmpty(msgType)) {
+			throw new JeroBootException("发送消息类型不能为空，请检查！");
+		}
+		String id = jsonObject.getString("id"); //法规清单id
+		String currentUserId = jsonObject.getString("currentUserId"); //当前操作用户id
+		String taskAffirmDueDate = jsonObject.getString("taskAffirmDueDate"); //截止日期
+		//String serialNumber = jsonObject.getString("serialNumber"); //编号
+		String projectLibraryId = jsonObject.getString("projectLibraryId"); //项目库id
+		String engineeringInterfacePerson = jsonObject.getString("engineeringInterfacePerson"); //工程接口人id
+
+		ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectOne(new QueryWrapper<ProjectLibraryBase>()
+				.lambda().eq(ProjectLibraryBase::getId, projectLibraryId));
+
+		ProjectLawsInventoryEO projectLawsInventoryEO = this.baseMapper.selectOne(
+				new QueryWrapper<ProjectLawsInventoryEO>().lambda().eq(ProjectLawsInventoryEO::getId, id)
+		);
+
+		SysUser studioUserInfo = this.sysUserMapper.selectOne(
+				new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer())
+		);
+
+		QueryWrapper<ProjectNameInfoEO> projectNameInfoEOQueryWrapper = new QueryWrapper<>();
+		projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId());
+		ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
+
+		QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
+		projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId, projectLibraryBase.getYearNameId());
+		ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper);
+
+		SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, currentUserId));
+
+		//String msgContentEN = "";
+		String msgTitle = "";
+		List<String> userIdList = new ArrayList<>();
+
+		//FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
+
+		//MessageTypeEnum messageTypeEnum = null;
+		//String taskType = "";
+		String initiator = "";
+		String initiatorLark = "";
+		String cnContentUpper = "";//中文上部分
+		String cnContentLower = "";//中文下部分
+		String enContentUpper = "";//英文上部分
+		String enContentLower = "";//英文下部分
+		String color = "";//颜色
+
+		ProjectLibraryBase LibraryBase = projectLibraryBaseService.queryById(projectLibraryId, CutEnum.EN.getValue()).get(0);
+		String PRN = LibraryBase.getProjectName();//项目名称
+		String LAW_CN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle();//法规
+		BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(projectLawsInventoryEO.getStandId());
+		String LAW_EN = "";
+		if (ObjectUtils.isEmpty(bussDocumentLibraryEO)) {
+			LAW_EN = LAW_CN;
+		} else {
+			if (ObjectUtils.isEmpty(bussDocumentLibraryEO.getTitleEn())) {
+				LAW_EN = LAW_CN;
+			} else {
+				LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规
+			}
+		}
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+		if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_START_MSG.getValue())) {
+			userIdList.add(engineeringInterfacePerson);
+			//msgContentEN = sysUser.getUsername() + " initiated the regulation task confirmation of " + projectNameInfoEO.getProjectName()
+			//		+ ". The due date is " + taskAffirmDueDate + ". Please check and address it in a timely manner.";
+			//msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+			//		+ ": You have a regulation task confirmation to complete";
+
+			//feishuMsgVo.setContent("Hello! Please check and address this task in a timely manner.");
+
+			//messageTypeEnum = MessageTypeEnum.TASK_CONFIRMATION;
+			//taskType = "Regulation Task Confirmation";
+
+			//initiator = studioUserInfo.getUsername();
+			//initiatorLark = studioUserInfo.getUsername();
+
+			msgTitle = MessageType2Enum.REGULATION_TASK_CONFIRMATION.getCn() + "/" + MessageType2Enum.REGULATION_TASK_CONFIRMATION.getEn();
+			cnContentUpper = "您好，请及时查看处理此项任务，谢谢！";
+			cnContentLower = "项目: " + PRN +
+					"\n法规: " + LAW_CN +
+					"\n发起人: " + sysUser.getUsername() +
+					"\n截止时间: " + sdf.format(projectLawsInventoryEO.getTaskAffirmDueDate());
+			enContentUpper = "Hello! Please check and address the task in a timely manner. Thank you!";
+			enContentLower = "Project: " + PRN +
+					"\nRegulation No: " + LAW_EN +
+					"\nInitiator: " + sysUser.getUsername() +
+					"\nDue Date: " + sdf.format(projectLawsInventoryEO.getTaskAffirmDueDate());
+			color = MsgColorEnum.GREEN.getValue();
+
+
+		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ISSUE_DRE_MSG.getValue())) {
+			String dreUserId = jsonObject.getString("dreUserId"); //dre用户id
+			userIdList.add(dreUserId);
+			//msgContentEN = sysUser.getUsername() + " has assigned the regulation task confirmation of " + serialNumber + " in "+ projectNameInfoEO.getProjectName()
+			//		+ " to you. The due date is " +taskAffirmDueDate+ ". Please check and handle it in time.";
+			//msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+			//		+ ": You have a regulation task confirmation to complete";
+
+			//feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has assigned the task. Please check and and handle it in time.");
+
+			//messageTypeEnum = MessageTypeEnum.TASK_CONFIRMATION;
+			//taskType = "Regulation Task Confirmation";
+
+			//initiator = studioUserInfo.getUsername();
+			//initiatorLark = studioUserInfo.getUsername();
+
+
+			msgTitle = MessageType2Enum.REGULATION_TASK_CONFIRMATION.getCn() + "/" + MessageType2Enum.REGULATION_TASK_CONFIRMATION.getEn();
+			cnContentUpper = "您好，" + sysUser.getUsername() + "向您询问意见，请及时查看处理";
+			cnContentLower = "项目: " + PRN +
+					"\n法规: " + LAW_CN +
+					"\n发起人: " + sysUser.getUsername() +
+					"\n截止时间: " + sdf.format(projectLawsInventoryEO.getTaskAffirmDueDate());
+			enContentUpper = "Hello! " + sysUser.getUsername() + " asked you for opinion. Please check and address it in a timely manner";
+			enContentLower = "Project: " + PRN +
+					"\nRegulation No: " + LAW_EN +
+					"\nInitiator: " + sysUser.getUsername() +
+					"\nDue Date: " + sdf.format(projectLawsInventoryEO.getTaskAffirmDueDate());
+			color = MsgColorEnum.GREEN.getValue();
+
+		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_REJECTED.getValue())) {
+			userIdList.add(engineeringInterfacePerson);
+			//msgContentEN = sysUser.getUsername() + " has rejected the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+			//		+ ". The due date is " +taskAffirmDueDate+ ". Please check and handle it in time.";
+			//msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+			//		+ ": You have a regulation task confirmation to complete";
+
+			//feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has rejected the task. Please check and and handle it in time.");
+
+			//messageTypeEnum = MessageTypeEnum.TASK_CONFIRMATION;
+			//taskType = "Regulation Task Confirmation";
+
+			//initiator = studioUserInfo.getUsername();
+			//initiatorLark = studioUserInfo.getUsername();
+
+			msgTitle = MessageType2Enum.REGULATION_TASK_CONFIRMATION.getCn() + "/" + MessageType2Enum.REGULATION_TASK_CONFIRMATION.getEn();
+			cnContentUpper = "您好，该任务被" + sysUser.getUsername() + "退回，请及时查看处理";
+			cnContentLower = "项目: " + PRN +
+					"\n法规: " + LAW_CN +
+					"\n发起人: " + sysUser.getUsername() +
+					"\n截止时间: " + sdf.format(projectLawsInventoryEO.getTaskAffirmDueDate());
+			enContentUpper = "Hello! This task is rejected by " + sysUser.getUsername() + ". Please check and address it in a timely manner";
+			enContentLower = "Project: " + PRN +
+					"\nRegulation No: " + LAW_EN +
+					"\nInitiator: " + sysUser.getUsername() +
+					"\nDue Date: " + sdf.format(projectLawsInventoryEO.getTaskAffirmDueDate());
+			color = MsgColorEnum.GREEN.getValue();
+
+		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_ACCEPTED.getValue())) {
+			userIdList.add(engineeringInterfacePerson);
+			//msgContentEN = sysUser.getUsername() + " has submitted the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+			//		+ ". The due date is " +taskAffirmDueDate+ ". Please check and handle it in time.";
+			//msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+			//		+ ": You have a regulation task confirmation to complete";
+
+			//feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has submitted the task. Please check and and handle it in time.");
+
+			//messageTypeEnum = MessageTypeEnum.TASK_CONFIRMATION;
+			//taskType = "Regulation Task Confirmation";
+
+			//initiator = studioUserInfo.getUsername();
+			//initiatorLark = studioUserInfo.getUsername();
+
+			msgTitle = MessageType2Enum.REGULATION_TASK_CONFIRMATION.getCn() + "/" + MessageType2Enum.REGULATION_TASK_CONFIRMATION.getEn();
+			cnContentUpper = "您好，" + sysUser.getUsername() + "已向您提交回复，请及时查看处理";
+			cnContentLower = "项目: " + PRN +
+					"\n法规: " + LAW_CN +
+					"\n发起人: " + sysUser.getUsername() +
+					"\n截止时间: " + sdf.format(projectLawsInventoryEO.getTaskAffirmDueDate());
+			enContentUpper = "Hello! " + sysUser.getUsername() + " has replied to you. Please check and address it in a timely manner";
+			enContentLower = "Project: " + PRN +
+					"\nRegulation No: " + LAW_EN +
+					"\nInitiator: " + sysUser.getUsername() +
+					"\nDue Date: " + sdf.format(projectLawsInventoryEO.getTaskAffirmDueDate());
+			color = MsgColorEnum.GREEN.getValue();
+
+
+		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_REJECTED_MSG.getValue())) {
+			userIdList.add(projectLibraryBase.getStudioEngineer());
+			//msgContentEN = sysUser.getUsername() + " has rejected the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+			//		+ ". Please check and handle it in time.";
+			//msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+			//		+ ": You have a regulation task confirmation to complete";
+
+			//feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has rejected the task. Please check and and handle it in time.");
+
+			//messageTypeEnum = MessageTypeEnum.TASK_CONFIRMATION;
+			//taskType = "Regulation Task Confirmation";
+
+			//initiator = studioUserInfo.getUsername();
+			//initiatorLark = studioUserInfo.getUsername();
+
+			msgTitle = MessageType2Enum.REGULATION_TASK_CONFIRMATION.getCn() + "/" + MessageType2Enum.REGULATION_TASK_CONFIRMATION.getEn();
+			cnContentUpper = "您好，该任务被" + sysUser.getUsername() + "拒绝，请及时查看处理";
+			cnContentLower = "项目: " + PRN +
+					"\n法规: " + LAW_CN +
+					"\n发起人: " + sysUser.getUsername() +
+					"\n截止时间: " + sdf.format(projectLawsInventoryEO.getTaskAffirmDueDate());
+			enContentUpper = "Hello! This task is rejected by " + sysUser.getUsername() + ". Please check and address it in a timely manner";
+			enContentLower = "Project: " + PRN +
+					"\nRegulation No: " + LAW_EN +
+					"\nInitiator: " + sysUser.getUsername() +
+					"\nDue Date: " + sdf.format(projectLawsInventoryEO.getTaskAffirmDueDate());
+			color = MsgColorEnum.RED.getValue();
+
+
+		} /*else if(StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ACCEPTED_MSG.getValue())){
+			userIdList.add(projectLibraryBase.getStudioEngineer());
+			//msgContentEN = sysUser.getUsername() + " has accepted the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+			//		+ ". Please check and handle it in time.";
+			//msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+			//		+ ": You have a regulation task confirmation notification to check";
+
+			//feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has accepted the task. Please check and and handle it in time.");
+
+			//messageTypeEnum = MessageTypeEnum.TASK_CONFIRMATION;
+			//taskType = "Regulation Task Confirmation";
+
+			initiator = studioUserInfo.getUsername();
+			initiatorLark = studioUserInfo.getUsername();
+		} */ else if (StringUtils.equals(msgType, MsgTypeEnum.DESIGN_START_MSG.getValue())) {
+			String designDutyId = jsonObject.getString("designDutyId"); //设计符合性责任人id
+			userIdList.add(designDutyId);
+			//msgContentEN = "You recieved the design compliance task of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+			//		+ ". The due date is " + sdf.format(projectLawsInventoryEO.getDesignDueDate()) + ". Please check and address it in a timely manner.";
+			//msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+			//		+ ": You have a design compliance task to complete";
+
+			//feishuMsgVo.setContent("Hello! Please address the task in a timely manner.");
+
+			//messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
+			//taskType = "Design Compliance Confirmation";
+
+			//initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+			//SysUser initiatorLarkInfo = this.sysUserMapper.selectOne(
+			//		new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLawsInventoryEO.getDesignInitiatorId())
+			//);
+			//initiatorLark = initiatorLarkInfo.getUsername();
+
+			msgTitle = MessageType2Enum.DESIGN_COMPLIANCE_CONFIRMATION.getCn() + "/" + MessageType2Enum.DESIGN_COMPLIANCE_CONFIRMATION.getEn();
+			cnContentUpper = "您好，请及时查看处理此项任务，谢谢！";
+			cnContentLower = "项目: " + PRN +
+					"\n法规: " + LAW_CN +
+					"\n发起人: " + sysUser.getUsername() +
+					"\n截止时间: " + sdf.format(projectLawsInventoryEO.getDesignDueDate());
+			enContentUpper = "Hello! Please check and address the task in a timely manner. Thank you!";
+			enContentLower = "Project: " + PRN +
+					"\nRegulation No: " + LAW_EN +
+					"\nInitiator: " + sysUser.getUsername() +
+					"\nDue Date: " + sdf.format(projectLawsInventoryEO.getDesignDueDate());
+			color = MsgColorEnum.GREEN.getValue();
+
+		} else if (StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_START_MSG.getValue())) {
+			String prehomoDutyId = jsonObject.getString("prehomoDutyId"); //pre-Home责任人id
+			userIdList.add(prehomoDutyId);
+			//msgContentEN = "You recieved the Pre-Homo task of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+			//		+ ". The due date is " + sdf.format(projectLawsInventoryEO.getPrehomoDueDate()) + ". Please check and address it in a timely manner.";
+			//msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+			//		+ ": You have a Pre-Homo task to complete";
+
+			//feishuMsgVo.setContent("Hello! Please address the task in a timely manner.");
+
+			//messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
+			//taskType = "Pre-Homo Confirmation";
+
+			//initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+
+			//SysUser initiatorLarkInfo = this.sysUserMapper.selectOne(
+			//		new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLawsInventoryEO.getPrehomoInitiatorId())
+			//);
+			//initiatorLark = initiatorLarkInfo.getUsername();
+			msgTitle = MessageType2Enum.PRE_HOMO_CONFIRMATION.getCn() + "/" + MessageType2Enum.PRE_HOMO_CONFIRMATION.getEn();
+			cnContentUpper = "您好，请及时查看处理此项任务，谢谢！";
+			cnContentLower = "项目: " + PRN +
+					"\n法规: " + LAW_CN +
+					"\n发起人: " + sysUser.getUsername() +
+					"\n截止时间: " + sdf.format(projectLawsInventoryEO.getPrehomoDueDate());
+			enContentUpper = "Hello! Please check and address the task in a timely manner. Thank you!";
+			enContentLower = "Project: " + PRN +
+					"\nRegulation No: " + LAW_EN +
+					"\nInitiator: " + sysUser.getUsername() +
+					"\nDue Date: " + sdf.format(projectLawsInventoryEO.getPrehomoDueDate());
+			color = MsgColorEnum.GREEN.getValue();
+
+		} else if (StringUtils.equals(msgType, MsgTypeEnum.VERIFY_START_MSG.getValue())) {
+			String verifyDutyId = jsonObject.getString("verifyDutyId"); //验证符合性责任人id
+			userIdList.add(verifyDutyId);
+			//msgContentEN = "You recieved the validation compliance task of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+			//		+ ". The due date is " + sdf.format(projectLawsInventoryEO.getVerifyDueDate()) + ". Please check and address it in a timely manner.";
+			//msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+			//		+ ": You have a validation compliance task to complete";
+
+			//feishuMsgVo.setContent("Hello! Please address the task in a timely manner.");
+
+			//messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
+			//taskType = "Validation Compliance Confirmation";
+
+			//initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+			//SysUser initiatorLarkInfo = this.sysUserMapper.selectOne(
+			//		new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLawsInventoryEO.getVerifyInitiatorId())
+			//);
+			//initiatorLark = initiatorLarkInfo.getUsername();
+
+			msgTitle = MessageType2Enum.VALIDATION_COMPLIANCE_CONFIRMATION.getCn() + "/" + MessageType2Enum.VALIDATION_COMPLIANCE_CONFIRMATION.getEn();
+			cnContentUpper = "您好，请及时查看处理此项任务，谢谢！";
+			cnContentLower = "项目: " + PRN +
+					"\n法规: " + LAW_CN +
+					"\n发起人: " + sysUser.getUsername() +
+					"\n截止时间: " + sdf.format(projectLawsInventoryEO.getVerifyDueDate());
+			enContentUpper = "Hello! Please check and address the task in a timely manner. Thank you!";
+			enContentLower = "Project: " + PRN +
+					"\nRegulation No: " + LAW_EN +
+					"\nInitiator: " + sysUser.getUsername() +
+					"\nDue Date: " + sdf.format(projectLawsInventoryEO.getVerifyDueDate());
+			color = MsgColorEnum.GREEN.getValue();
+
+		} else if (StringUtils.equals(msgType, MsgTypeEnum.DESIGN_CHARGE_PERSON_SUBMIT_MSG.getValue())) {
+			String designInitiatorId = jsonObject.getString("designInitiatorId"); //设计符合性发起人id
+			userIdList.add(designInitiatorId);
+			//msgContentEN = sysUser.getUsername() + " has submitted the design compliance confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+			//		+ ". Please check and review it in time.";
+			//msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+			//		+ ": You have a design compliance task to complete";
+
+			//feishuMsgVo.setContent("Hello! The compliance confirmation has been submitted. Please check and review it in a timely manner.");
+
+			//messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
+			//taskType = "Design Compliance Confirmation";
+
+			//initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+
+			msgTitle = MessageType2Enum.DESIGN_COMPLIANCE_CONFIRMATION.getCn() + "/" + MessageType2Enum.DESIGN_COMPLIANCE_CONFIRMATION.getEn();
+			cnContentUpper = "您好，" + sysUser.getUsername() + "已完成任务，请审查";
+			cnContentLower = "项目: " + PRN +
+					"\n法规: " + LAW_CN +
+					"\n发起人: " + sysUser.getUsername() +
+					"\n截止时间: " + sdf.format(projectLawsInventoryEO.getDesignDueDate());
+			enContentUpper = "Hello! " + sysUser.getUsername() + " has completed the task. Please check and review it";
+			enContentLower = "Project: " + PRN +
+					"\nRegulation No: " + LAW_EN +
+					"\nInitiator: " + sysUser.getUsername() +
+					"\nDue Date: " + sdf.format(projectLawsInventoryEO.getDesignDueDate());
+			color = MsgColorEnum.GREEN.getValue();
+
+			//feishuMsgVo.setAssignee(sysUser.getUsername());
+//			SysUser initiatorLarkInfo = this.sysUserMapper.selectOne(
+//					new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLawsInventoryEO.getDesignInitiatorId())
+//			);
+//			initiatorLark = initiatorLarkInfo.getUsername();
+		} else if (StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_CHARGE_PERSON_SUBMIT_MSG.getValue())) {
+			String prehomoInitiatorId = jsonObject.getString("prehomoInitiatorId"); //pre-Home发起人id
+			userIdList.add(prehomoInitiatorId);
+			//msgContentEN = sysUser.getUsername() + " has submitted the Pre-Homo confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+			//		+ ". Please check and review it in time.";
+			//msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+			//		+ ": You have a Pre-Homo task to complete";
+
+			//feishuMsgVo.setContent("Hello! The compliance confirmation has been submitted. Please check and review it in a timely manner.");
+
+			//messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
+			//taskType = "Pre-Homo Confirmation";
+
+			//initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+
+			msgTitle = MessageType2Enum.PRE_HOMO_CONFIRMATION.getCn() + "/" + MessageType2Enum.PRE_HOMO_CONFIRMATION.getEn();
+			cnContentUpper = "您好，" + sysUser.getUsername() + "已完成任务，请审查";
+			cnContentLower = "项目: " + PRN +
+					"\n法规: " + LAW_CN +
+					"\n发起人: " + sysUser.getUsername() +
+					"\n截止时间: " + sdf.format(projectLawsInventoryEO.getPrehomoDueDate());
+			enContentUpper = "Hello! " + sysUser.getUsername() + " has completed the task. Please check and review it";
+			enContentLower = "Project: " + PRN +
+					"\nRegulation No: " + LAW_EN +
+					"\nInitiator: " + sysUser.getUsername() +
+					"\nDue Date: " + sdf.format(projectLawsInventoryEO.getPrehomoDueDate());
+			color = MsgColorEnum.GREEN.getValue();
+
+			//feishuMsgVo.setAssignee(sysUser.getUsername());
+//			SysUser initiatorLarkInfo = this.sysUserMapper.selectOne(
+//					new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLawsInventoryEO.getPrehomoInitiatorId())
+//			);
+//			initiatorLark = initiatorLarkInfo.getUsername();
+		} else if (StringUtils.equals(msgType, MsgTypeEnum.VERIFY_CHARGE_PERSON_SUBMIT_MSG.getValue())) {
+			String verifyInitiatorId = jsonObject.getString("verifyInitiatorId"); //验证符合性发起人id
+			userIdList.add(verifyInitiatorId);
+			//msgContentEN = sysUser.getUsername() + " has submitted the validation compliance confirmation " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+			//		+ ". Please check and review it in time.";
+			//msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+			//		+ ": You have a validation compliance task to complete";
+
+			//feishuMsgVo.setContent("Hello! The compliance confirmation has been submitted. Please check and review it in a timely manner.");
+
+			//messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
+			//taskType = "Validation Compliance Confirmation";
+
+			//initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+
+			msgTitle = MessageType2Enum.VALIDATION_COMPLIANCE_CONFIRMATION.getCn() + "/" + MessageType2Enum.VALIDATION_COMPLIANCE_CONFIRMATION.getEn();
+			cnContentUpper = "您好，" + sysUser.getUsername() + "已完成任务，请审查";
+			cnContentLower = "项目: " + PRN +
+					"\n法规: " + LAW_CN +
+					"\n发起人: " + sysUser.getUsername() +
+					"\n截止时间: " + sdf.format(projectLawsInventoryEO.getVerifyDueDate());
+			enContentUpper = "Hello! " + sysUser.getUsername() + " has completed the task. Please check and review it";
+			enContentLower = "Project: " + PRN +
+					"\nRegulation No: " + LAW_EN +
+					"\nInitiator: " + sysUser.getUsername() +
+					"\nDue Date: " + sdf.format(projectLawsInventoryEO.getVerifyDueDate());
+			color = MsgColorEnum.GREEN.getValue();
+
+			//feishuMsgVo.setAssignee(sysUser.getUsername());
+//			SysUser initiatorLarkInfo = this.sysUserMapper.selectOne(
+//					new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLawsInventoryEO.getVerifyInitiatorId())
+//			);
+//			initiatorLark = initiatorLarkInfo.getUsername();
+		} else if (StringUtils.equals(msgType, MsgTypeEnum.DESIGN_INITIATOR_ACCEPTED_MSG.getValue())) {
+			String designDutyId = jsonObject.getString("designDutyId"); //设计符合性责任人id
+			userIdList.add(designDutyId);
+			//msgContentEN = "The design compliance information of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+			//		+ " you submitted has been approved.";
+			//msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+			//		+ ": You have a design compliance task to complete";
+
+			//feishuMsgVo.setContent("Hello! The compliance information you submitted has been approved.");
+
+			//messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
+			//taskType = "Design Compliance Confirmation";
+
+			//initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+			//SysUser initiatorLarkInfo = this.sysUserMapper.selectOne(
+			//		new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLawsInventoryEO.getDesignInitiatorId())
+			//);
+			//initiatorLark = initiatorLarkInfo.getUsername();
+
+			msgTitle = MessageType2Enum.DESIGN_COMPLIANCE_CONFIRMATION.getCn() + "/" + MessageType2Enum.DESIGN_COMPLIANCE_CONFIRMATION.getEn();
+			cnContentUpper = "您好，该任务被发起人审查通过";
+			cnContentLower = "项目: " + PRN +
+					"\n法规: " + LAW_CN +
+					"\n发起人: " + sysUser.getUsername() +
+					"\n截止时间: " + sdf.format(projectLawsInventoryEO.getTaskAffirmDueDate());
+			enContentUpper = "Hello! The task has been approved by initiator";
+			enContentLower = "Project: " + PRN +
+					"\nRegulation No: " + LAW_EN +
+					"\nInitiator: " + sysUser.getUsername() +
+					"\nDue Date: " + sdf.format(projectLawsInventoryEO.getTaskAffirmDueDate());
+			color = MsgColorEnum.GREEN.getValue();
+
+		} else if (StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_INITIATOR_ACCEPTED_MSG.getValue())) {
+			String prehomoDutyId = jsonObject.getString("prehomoDutyId"); //pre-Home责任人id
+			userIdList.add(prehomoDutyId);
+			//msgContentEN = "The Pre-Homo confirmation information of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+			//		+ " you submitted has been approved.";
+			//msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+			//		+ ": You have a Pre-Homo task to complete";
+
+			//feishuMsgVo.setContent("Hello! The compliance information you submitted has been approved.");
+
+			//messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
+			//taskType = "Pre-Homo Confirmation";
+
+			//initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+			//SysUser initiatorLarkInfo = this.sysUserMapper.selectOne(
+			//		new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLawsInventoryEO.getPrehomoInitiatorId())
+			//);
+			//initiatorLark = initiatorLarkInfo.getUsername();
+			msgTitle = MessageType2Enum.PRE_HOMO_CONFIRMATION.getCn() + "/" + MessageType2Enum.PRE_HOMO_CONFIRMATION.getEn();
+			cnContentUpper = "您好，该任务被发起人审查通过";
+			cnContentLower = "项目: " + PRN +
+					"\n法规: " + LAW_CN +
+					"\n发起人: " + sysUser.getUsername() +
+					"\n截止时间: " + sdf.format(projectLawsInventoryEO.getTaskAffirmDueDate());
+			enContentUpper = "Hello! The task has been approved by initiator";
+			enContentLower = "Project: " + PRN +
+					"\nRegulation No: " + LAW_EN +
+					"\nInitiator: " + sysUser.getUsername() +
+					"\nDue Date: " + sdf.format(projectLawsInventoryEO.getTaskAffirmDueDate());
+			color = MsgColorEnum.GREEN.getValue();
+
+		} else if (StringUtils.equals(msgType, MsgTypeEnum.VERIFY_INITIATOR_ACCEPTED_MSG.getValue())) {
+			String verifyDutyId = jsonObject.getString("verifyDutyId"); //验证符合性责任人id
+			userIdList.add(verifyDutyId);
+			//msgContentEN = "The validation compliance information of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+			//		+ " you submitted has been approved.";
+			//msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+			//		+ ": You have a validation compliance task to complete";
+
+			//feishuMsgVo.setContent("Hello! The compliance information you submitted has been approved.");
+
+			//messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
+			//taskType = "Validation Compliance Confirmation";
+
+			//initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+			//SysUser initiatorLarkInfo = this.sysUserMapper.selectOne(
+			//		new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLawsInventoryEO.getVerifyInitiatorId())
+			//);
+			//initiatorLark = initiatorLarkInfo.getUsername();
+
+			msgTitle = MessageType2Enum.VALIDATION_COMPLIANCE_CONFIRMATION.getCn() + "/" + MessageType2Enum.VALIDATION_COMPLIANCE_CONFIRMATION.getEn();
+			cnContentUpper = "您好，该任务被发起人审查通过";
+			cnContentLower = "项目: " + PRN +
+					"\n法规: " + LAW_CN +
+					"\n发起人: " + sysUser.getUsername() +
+					"\n截止时间: " + sdf.format(projectLawsInventoryEO.getTaskAffirmDueDate());
+			enContentUpper = "Hello! The task has been approved by initiator";
+			enContentLower = "Project: " + PRN +
+					"\nRegulation No: " + LAW_EN +
+					"\nInitiator: " + sysUser.getUsername() +
+					"\nDue Date: " + sdf.format(projectLawsInventoryEO.getTaskAffirmDueDate());
+			color = MsgColorEnum.GREEN.getValue();
+		}
+
+		if (CollectionUtils.isNotEmpty(userIdList) && StringUtils.isNotEmpty(msgTitle)) {
+
+			//feishuMsgVo.setTaskType(taskType);
+			//feishuMsgVo.setRegulationNo(serialNumber);
+			//feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
+			//feishuMsgVo.setInitiator(initiatorLark);
+			//feishuMsgVo.setDueDate(taskAffirmDueDate);
+
+			//飞书跳转链接
+			String hrefFeishu = "";
+			//系统内部跳转链接
+			//String href = "";
+			if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_START_MSG.getValue())
+					|| StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ISSUE_DRE_MSG.getValue())
+					|| StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_REJECTED.getValue())
+					|| StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_ACCEPTED.getValue())
+					|| StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_REJECTED_MSG.getValue())
+					|| StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ACCEPTED_MSG.getValue())) {
+				hrefFeishu = backUrl
+						+ JumpLinkEnum.TASK_AFFIRM_LINK.getLink();
+				//href = "<a href='" + JumpLinkEnum.TASK_AFFIRM_LINK.getLink() + "'>" + " View details" + "</a>";
+			} else if (StringUtils.equals(msgType, MsgTypeEnum.DESIGN_START_MSG.getValue())
+					|| StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_START_MSG.getValue())
+					|| StringUtils.equals(msgType, MsgTypeEnum.VERIFY_START_MSG.getValue())
+					|| StringUtils.equals(msgType, MsgTypeEnum.DESIGN_CHARGE_PERSON_SUBMIT_MSG.getValue())
+					|| StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_CHARGE_PERSON_SUBMIT_MSG.getValue())
+					|| StringUtils.equals(msgType, MsgTypeEnum.VERIFY_CHARGE_PERSON_SUBMIT_MSG.getValue())
+					|| StringUtils.equals(msgType, MsgTypeEnum.DESIGN_INITIATOR_ACCEPTED_MSG.getValue())
+					|| StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_INITIATOR_ACCEPTED_MSG.getValue())
+					|| StringUtils.equals(msgType, MsgTypeEnum.VERIFY_INITIATOR_ACCEPTED_MSG.getValue())) {
+				hrefFeishu = backUrl
+						+ JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink()
+						+ projectLibraryBase.getId()
+						+ JumpLinkEnum.DESIGN_AFFIRM_LINK.getType()
+						+ "&projectName=" + PRN;
+				//href = "<a href='"
+				//		+ JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType()
+				//		+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
+				//		+ projectYearNameInfoEO.getYearName()
+				//		+ projectLibraryBase.getTargetMarket()
+				//		+ "'>" + " View details" + "</a>";
+			}
+
+			//String contentInfo = msgContentEN + " " + href;
+			//Map<String,Object> sendMessageMap = new HashMap<>();
+			//sendMessageMap.put("hrefFeishu",hrefFeishu);
+			//sendMessageMap.put("contentInfo",contentInfo);
+
+			//发送消息
+			//sendMessage(msgTitle, msgContentEN,userIdList,id,sendMessageMap, feishuMsgVo, messageTypeEnum,initiator);
+
+			List<SysUser> sysUsers = sysUserService.listByIds(userIdList);
+			List<String> thirdIdList = new ArrayList<>();
+			if (CollectionUtils.isNotEmpty(sysUsers)) {
+				thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList());
+			}
+			try {
+				FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+				feishuMsgVo.setTitle(msgTitle);
+				feishuMsgVo.setCnContentUpper(cnContentUpper);
+				feishuMsgVo.setCnContentLower(cnContentLower);
+				feishuMsgVo.setEnContentUpper(enContentUpper);
+				feishuMsgVo.setEnContentLower(enContentLower);
+				feishuMsgVo.setUrl(hrefFeishu);
+				feishuMsgVo.setColor(color); // 颜色
+				feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
+			} catch (IOException e) {
+				log.error("飞书消息推送失败");
+			}
+		}
+	}
+
+	@Override
+	public void copyInfoByIds(String ids, String operateType) {
+		if (StringUtils.isNotBlank(ids)) {
+			LambdaQueryWrapper<ProjectLawsInventoryEO> wrapper = new LambdaQueryWrapper<>();
+			wrapper.in(ProjectLawsInventoryEO::getId, Arrays.asList(ids.split(",")));
+			List<ProjectLawsInventoryEO> projectLawsInventoryEOList = this.list(wrapper);
+			List<ProjectTaskInventoryEO> projectTaskInventoryEOList = new ArrayList<>();
+			for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOList) {
+				String projectLawsInventoryId = UUID.randomUUID().toString().replace("-", "");
+				projectLawsInventoryEO.setId(projectLawsInventoryId);
+
+				projectLawsInventoryEO.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
+				projectLawsInventoryEO.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
+				projectLawsInventoryEO.setRegulationOwnerSubmitStatus(null);
+				projectLawsInventoryEO.setHomologationEngineerSubmitStatus(null);
+				projectLawsInventoryEO.setSendMsgFlag(null);
+				projectLawsInventoryEO.setSendMsgCurrentFlag(null);
+				// 2023-03-27 修改禅道67149问题，复制的时候将符合性流程的截至时间复制上。
+				/*projectLawsInventoryEO.setDesignDueDate(null);
+				projectLawsInventoryEO.setPrehomoDueDate(null);
+				projectLawsInventoryEO.setVerifyDueDate(null);*/
+				projectLawsInventoryEO.setInventoryAffirmDueDate(null);
+				projectLawsInventoryEO.setTaskAffirmDueDate(null);
+
+				// 修改UAT问题清单，122条，法规工程师复制，将流程状态设置为 待校核 -> 对应现在的 任务待发起
+				if (StringUtils.equals(operateType, OperatorTypeEnum.LAWS_INVENTORY_STUDIO_COPY.getValue())) {
+					projectLawsInventoryEO.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+					projectLawsInventoryEO.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+				} else if (StringUtils.equals(operateType, OperatorTypeEnum.LAWS_INVENTORY_REGULATION_OWNER_COPY.getValue())) {
+					projectLawsInventoryEO.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
+					projectLawsInventoryEO.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
+				}
+
+
+				ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
+				String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
+				projectTaskInventoryEO.setId(projectTaskInventoryId);
+				projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventoryId);
+				projectTaskInventoryEO.setStandId(projectLawsInventoryEO.getStandId());
+				projectTaskInventoryEO.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
+				projectTaskInventoryEOList.add(projectTaskInventoryEO);
+			}
+			this.saveBatch(projectLawsInventoryEOList);
+
+			//更新log
+			LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			String username = sysUser.getUsername();
+			String projectLibraryId = projectLawsInventoryEOList.get(0).getProjectLibraryId();
+			String serialNumber = projectLawsInventoryEOList.stream().map(e -> e.getSerialNumber()).collect(Collectors.joining(","));
+			String contentLog = username + "复制了“" + serialNumber + "”";
+			String enContentLog = username + " copied “" + serialNumber + "”";
+			projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId, CutEnum.CN.getValue());
+			projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId, CutEnum.EN.getValue());
+			this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
+			projectTaskInventoryEOList.forEach(taskInventory -> {
+				this.initConditionAssessmentEO(taskInventory.getProjectLawsInventoryId());
+			});
+		}
+
+	}
+
+	@Override
+	public void setBatch(ProjectLawsInventoryEO projectLawsInventoryEO) {
+		this.editService.setBatch(projectLawsInventoryEO);
+	}
+
+
+	private ProjectLawsInventoryEO dataCompare(ProjectLawsInventoryEO projectLawsInventoryEO, DummyInventoryInfoEO dummyInventoryInfoEO) {
+		//编号
+		if (StringUtils.isBlank(projectLawsInventoryEO.getSerialNumber())) {
+			projectLawsInventoryEO.setSendMsgFlag(dummyInventoryInfoEO.getSerialNumber());
+		}
+		//标题
+		if (StringUtils.isBlank(projectLawsInventoryEO.getTitle())) {
+			projectLawsInventoryEO.setTitle(dummyInventoryInfoEO.getTitle());
+		}
+		//子标题
+		if (StringUtils.isBlank(projectLawsInventoryEO.getSubtitle())) {
+			projectLawsInventoryEO.setSubtitle(dummyInventoryInfoEO.getSubtitle());
+		}
+		//WVTA ID
+		if (StringUtils.isBlank(projectLawsInventoryEO.getWvtaId())) {
+			projectLawsInventoryEO.setWvtaId(dummyInventoryInfoEO.getWvtaId());
+		}
+		//对应标准
+		if (StringUtils.isBlank(projectLawsInventoryEO.getCorrespondingStandard())) {
+			projectLawsInventoryEO.setCorrespondingStandard(dummyInventoryInfoEO.getCorrespondingStandard());
+		}
+		//实施类别
+		if (StringUtils.isBlank(projectLawsInventoryEO.getImplementType())) {
+			projectLawsInventoryEO.setImplementType(dummyInventoryInfoEO.getImplementType());
+		}
+		//适用地区
+		if (StringUtils.isBlank(projectLawsInventoryEO.getRegion())) {
+			projectLawsInventoryEO.setRegion(dummyInventoryInfoEO.getRegion());
+		}
+		//在产车实施日期
+		if (ObjectUtils.isEmpty(projectLawsInventoryEO.getImplementTime())) {
+			projectLawsInventoryEO.setImplementTime(dummyInventoryInfoEO.getImplementTime());
+		}
+		//新车型实施日期
+		if (ObjectUtils.isEmpty(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())) {
+			projectLawsInventoryEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1(dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1());
+		}
+		//认证类型
+		if (StringUtils.isBlank(projectLawsInventoryEO.getAttestationType())) {
+			projectLawsInventoryEO.setAttestationType(dummyInventoryInfoEO.getAttestationType());
+
+		}
+		//认证级别
+		if (StringUtils.isBlank(projectLawsInventoryEO.getAttestationRank())) {
+			projectLawsInventoryEO.setAttestationRank(dummyInventoryInfoEO.getAttestationRank());
+		}
+		//责任领域
+		if (StringUtils.isBlank(projectLawsInventoryEO.getDutyTerritory())) {
+			projectLawsInventoryEO.setDutyTerritory(dummyInventoryInfoEO.getDutyTerritory());
+		}
+		//备注
+		if (StringUtils.isBlank(projectLawsInventoryEO.getRemark())) {
+			projectLawsInventoryEO.setRemark(dummyInventoryInfoEO.getRemark());
+		}
+		//设计--交付物类型
+		if (StringUtils.isBlank(projectLawsInventoryEO.getDesignDeliverableType())) {
+			projectLawsInventoryEO.setDesignDeliverableType(dummyInventoryInfoEO.getDesignDeliverableType());
+
+		}
+		//设计--交付物模板
+		if (StringUtils.isBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())) {
+			projectLawsInventoryEO.setDesignDeliverableTemplate(dummyInventoryInfoEO.getDesignDeliverableTemplate());
+		}
+		//设计--发起人
+		if (StringUtils.isBlank(projectLawsInventoryEO.getDesignInitiator())) {
+			projectLawsInventoryEO.setDesignInitiator(dummyInventoryInfoEO.getDesignInitiator());
+		}
+		//设计--发起人责任人
+		if (StringUtils.isBlank(projectLawsInventoryEO.getDesignDuty())) {
+			projectLawsInventoryEO.setDesignDuty(dummyInventoryInfoEO.getDesignDuty());
+		}
+		//Pre--交付物类型
+		if (StringUtils.isBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) {
+			projectLawsInventoryEO.setPrehomoDeliverableType(dummyInventoryInfoEO.getPrehomoDeliverableType());
+		}
+		//Pre--交付物模板
+		if (StringUtils.isBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())) {
+			projectLawsInventoryEO.setPrehomoDeliverableTemplate(dummyInventoryInfoEO.getPrehomoDeliverableTemplate());
+		}
+		//Pre--发起人
+		if (StringUtils.isBlank(projectLawsInventoryEO.getPrehomoInitiator())) {
+			projectLawsInventoryEO.setPrehomoInitiator(dummyInventoryInfoEO.getPrehomoInitiator());
+		}
+		//Pre--发起人责任人
+		if (StringUtils.isBlank(projectLawsInventoryEO.getPrehomoDuty())) {
+			projectLawsInventoryEO.setPrehomoDuty(dummyInventoryInfoEO.getPrehomoDuty());
+		}
+		//验证--交付物类型
+		if (StringUtils.isBlank(projectLawsInventoryEO.getVerifyDeliverableType())) {
+			projectLawsInventoryEO.setVerifyDeliverableType(dummyInventoryInfoEO.getVerifyDeliverableType());
+		}
+		//验证--交付物模板
+		if (StringUtils.isBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())) {
+			projectLawsInventoryEO.setVerifyDeliverableTemplate(dummyInventoryInfoEO.getVerifyDeliverableTemplate());
+		}
+		//验证--发起人
+		if (StringUtils.isBlank(projectLawsInventoryEO.getVerifyInitiator())) {
+			projectLawsInventoryEO.setVerifyInitiator(dummyInventoryInfoEO.getVerifyInitiator());
+		}
+		//验证--发起人责任人
+		if (StringUtils.isBlank(projectLawsInventoryEO.getVerifyDuty())) {
+			projectLawsInventoryEO.setVerifyDuty(dummyInventoryInfoEO.getVerifyDuty());
+		}
+		return projectLawsInventoryEO;
+	}
+
+
+	@Override
+	public void exportTemplate(ProjectLawsInventoryEO projectLawsInventoryEO, HttpServletResponse response, HttpServletRequest request) {
+		OutputStream os = null;
+		HSSFWorkbook workbook = new HSSFWorkbook();
+		String fileOriName = "";
+		String sheetName = "";
+		if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+			fileOriName = "法规清单导入模板.xls";
+			sheetName = "法规清单导入模板";
+		} else if (StringUtils.equals(projectLawsInventoryEO.getCut(), CutEnum.EN.getValue())) {
+			fileOriName = "Regulatory List Import Template.xls";
+			sheetName = "Regulatory List Import Template";
+		}
+		String filePath = uploadpath + File.separator + fileOriName;
+		try {
+			String titleOne = "";
+			String titleTwo = "";
+			if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+				titleOne = "*编号,标题,子标题," +
+						"认证类型,*认证级别,适用增补件," +
+						"*责任领域,法规工程师,工程接口人," +
+						"备注," +
+						"设计符合性确认,验证符合性确认";
+				titleTwo = "交付物类型,交付物模板,责任人,截止时间,交付物说明," +
+						"交付物类型,交付物模板,责任人,截止时间,交付物说明";
+			} else {
+				titleOne = "*Number,Title,Sub-Title," +
+						"Certification Type,*Certification Level,Applicable Supplement," +
+						"*Responsible Field,Regulation Engineer,Engineering Interface," +
+						"Comments," +
+						"Design Compliance Check,Validation Compliance Check";
+				titleTwo = "Deliverable Type,Deliverable Template,Assignee,Due Date,Deliverable Description," +
+						"Deliverable Type,Deliverable Template,Assignee,Due Date,Deliverable Description";
+			}
+
+			List<String> list = Arrays.asList(titleOne.split(","));
+			int index = 0;
+			if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+				index = list.indexOf("备注") + 1;
+			} else {
+				index = list.indexOf("Comments") + 1;
+			}
+
+			//创建临时文件夹
+			File nowFile = new File(filePath);
+			if (nowFile.exists()) {
+				nowFile.delete();
+			}
+			nowFile.mkdirs();
+			HSSFSheet sheet = workbook.createSheet(sheetName);
+			sheet.setDefaultColumnWidth(16);//列宽
+			HSSFCellStyle cellStyle = workbook.createCellStyle();
+			cellStyle.setWrapText(true);//自动换行
+			cellStyle.setAlignment(HorizontalAlignment.CENTER);//垂直居中
+			cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//水平居中
+
+			HSSFCellStyle cellStyleTemp = workbook.createCellStyle();
+			cellStyleTemp.setWrapText(true);//自动换行
+
+
+			int count = 1;
+			int startLine = 0;
+			int endLine = 0;
+			int line = 4;
+			for (int i = 0; i < index; i++) {
+				//合并单元格
+				CellRangeAddress region1 =
+						new CellRangeAddress(0, 1, i, i);
+				sheet.addMergedRegion(region1);
+			}
+			for (int i = index; i < 16; i++) {
+				if (count > 1) {
+					startLine = startLine + line + 1;
+					endLine = startLine + line;
+				} else {
+					startLine = i;
+					endLine = i + line;
+				}
+				//合并单元格
+				CellRangeAddress region1 =
+						new CellRangeAddress(0, 0, startLine, endLine); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列
+				sheet.addMergedRegion(region1);
+				count++;
+			}
+			CellRangeAddress region =
+					new CellRangeAddress(2, 2, 0, 29); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列
+			sheet.addMergedRegion(region);
+			String explain = "";
+			if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+				explain = "填写说明\n" +
+						"1.导入数据从第四行开始\n" +
+						"2.所有带*号的字段必须填写\n" +
+						"3.实施类别,交付物类型,责任人,字段是单选属性,必须和系统中的对应字段选项相匹配\n" +
+						"4.认证类型,认证级别,责任领域,字段是多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文或中文逗号分割\n" +
+						"5.编号,子标题,WVTA ID,备注,填写文本内容\n" +
+						"6.交付物模板字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.docx,则应填写AAA/B.docx";
+			} else {
+				explain = "Filling explanation\n" +
+						"1.Import data starts at the fourth line\n" +
+						"2.All fields marked with * must be filled in\n" +
+						"3.Usage,Deliverable Type,Assignee,Fields are radio attributes that must match the corresponding field option in the system\n" +
+						"4.Certification type,Certification Level,Responsible Field, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
+						"5.Number,Sub-Title,WVTA ID,Comments,Fill in the text\n" +
+						"6.Deliverable Template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. diocx is stored under the AAA standard number, enter  AAA/B.docx";
+			}
+
+
+			for (int i = 0; i < 3; i++) {
+				//表头
+				Row row = sheet.createRow(i);//开始创建标题行
+				String[] headerArr = titleOne.split(",");
+				int lineTemp = index;
+				if (i == 0) {
+					for (int m = 0; m < headerArr.length; m++) {
+						if (m < index) {
+							row.createCell(m).setCellValue(headerArr[m]);
+						} else {
+							row.createCell(lineTemp).setCellValue(headerArr[m]);
+							Cell cell = row.getCell(lineTemp);
+							cell.setCellStyle(cellStyle);
+							lineTemp = lineTemp + 5;
+						}
+					}
+
+				} else if (i == 1) {
+					//titleTwo
+					String[] headerArrTwo = titleTwo.split(",");
+					for (int j = 0; j < headerArrTwo.length; j++) {
+						row.createCell(10 + j).setCellValue(headerArrTwo[j]);
+					}
+				} else {
+					short height = (short) (7 * 252);
+					row.setHeight((short) height);
+					Cell cell = row.createCell(0);
+					cell.setCellStyle(cellStyleTemp);
+					cell.setCellValue(new HSSFRichTextString(explain));
+				}
+			}
+			response.setHeader("Content-Disposition",
+					"attachment; filename=\"" + fileOriName + ".xls");
+			response.setContentType("application/force-download");
+			response.flushBuffer();
+			os = response.getOutputStream();
+			workbook.write(os);
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new JeroBootException("下载文件失败，请重试");
+		} finally {
+			IOUtils.closeQuietly(os);
+		}
+
+	}
+
+	@Override
+	public void exportData(HttpServletResponse response, HttpServletRequest request, ProjectLawsInventoryEO projectLawsInventoryEO) {
+		List<ProjectLawsInventoryEO> dataList = new ArrayList<>();
+		QueryWrapper<ProjectLawsInventoryEO> queryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO, request.getParameterMap());
+		queryWrapper.in("project_library_id", projectLawsInventoryEO.getProjectLibraryId());
+		if (StringUtils.isNotBlank(projectLawsInventoryEO.getIds())) {
+			queryWrapper.in("id", Arrays.asList(projectLawsInventoryEO.getIds().split(",")));
+		}
+		queryWrapper.orderByDesc("create_time", "serial_number");
+
+		int isProjectRole = Integer.parseInt(projectLawsInventoryEO.getRoleCode());
+		if (isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())
+				&& isProjectRole != Integer.parseInt(ProjectRoleEnum.MANAGER.getValue())
+				&& isProjectRole != Integer.parseInt(ProjectRoleEnum.ADMIN.getValue())) {
+			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			queryWrapper.and(q -> {
+				q.eq("regulation_owner_id", currentUser.getId()).
+						or().eq("homologation_engineer_id", currentUser.getId());
+			});
+		}
+		//导出的数据
+		dataList = this.list(queryWrapper);
+
+		//文件
+		List<OSSFile> fileInfos = getOssFiles(dataList);
+
+		//用户
+		List<String> userIdList = new ArrayList<>();
+		for (ProjectLawsInventoryEO lawsInventoryEO : dataList) {
+			getUserIdList(userIdList, lawsInventoryEO);
+		}
+		List<SysUser> sysUserList = new ArrayList<>();
+		if (CollectionUtils.isNotEmpty(userIdList)) {
+			userIdList = userIdList.stream().distinct().collect(Collectors.toList());
+			QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
+			sysUserQueryWrapper.select("id,username");
+			sysUserQueryWrapper.lambda().in(SysUser::getId, userIdList);
+			sysUserList = sysUserMapper.selectList(sysUserQueryWrapper);
+		}
+
+		//所有用户
+//		List<SysUser> sysUserList = sysUserService.list();
+		//数据转换(文件名称,对应标准)
+		dataTransition(dataList, fileInfos, sysUserList, projectLawsInventoryEO);
+
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		this.dataDispose(dataList, currentUser, Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue()), projectLawsInventoryEO.getCut());
+		OutputStream os = null;
+		try {
+			response.setContentType("application/force-download");
+			Workbook workbook = new XSSFWorkbook();
+			String path = uploadpath + "/tempZip";
+			File fileTemp = new File(path);
+			if (fileTemp.exists()) {
+				fileTemp.delete();
+			}
+			fileTemp.mkdirs();
+			//文件
+			exportFile(dataList, fileInfos);
+			String excelName = projectLawsInventoryEO.getExcelName() + ".xlsx";
+//			String excelName = "";
+//			if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
+//				excelName = "法规清单.xlsx";
+//			}else{
+//				excelName = "Regulation List.xlsx";
+//			}
+			//excel
+			OutputStream excelOS = new FileOutputStream(path + File.separator + excelName);
+			ExportParams exportParams = new ExportParams();
+			exportParams.setType(ExcelType.XSSF);
+			if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+				workbook = ExcelExportUtil.exportExcel(exportParams, ProjectLawsInventoryEO.class, dataList);
+			} else {
+				List<ProjectLawsInventoryEOEn> dataListEn = new ArrayList<>();
+				for (ProjectLawsInventoryEO projectLawsInventoryEOTemp : dataList) {
+					ProjectLawsInventoryEOEn ProjectLawsInventoryEOEn = new ProjectLawsInventoryEOEn();
+					BeanUtils.copyProperties(projectLawsInventoryEOTemp, ProjectLawsInventoryEOEn);
+					dataListEn.add(ProjectLawsInventoryEOEn);
+				}
+				//下拉选中英文转换
+				transition(dataListEn, projectLawsInventoryEO);
+				workbook = ExcelExportUtil.exportExcel(exportParams, ProjectLawsInventoryEOEn.class, dataListEn);
+			}
+
+			workbook.write(excelOS);
+			excelOS.flush();
+
+			ZipUtil.zip(path, path + ".zip");
+			//文件
+			FileInputStream fis = new FileInputStream(path + ".zip");
+			os = response.getOutputStream();
+
+			int len = 0;
+			while ((len = fis.read()) != -1) {
+				os.write(len);
+			}
+			os.flush();
+			fis.close();
+		} catch (IOException e) {
+			if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+				throw new JeroBootException("下载文件失败");
+			} else {
+				throw new JeroBootException("Failed to download file");
+			}
+		} finally {
+			IOUtils.closeQuietly(os);
+			File file = new File(uploadpath + "/tempZip");
+			FileUtil.deleteContents(file);
+		}
+
+	}
+
+	private void getUserIdList(List<String> userIdList, ProjectLawsInventoryEO lawsInventoryEO) {
+		//认证工程师id
+		if (StringUtils.isNotEmpty(lawsInventoryEO.getHomologationEngineerId())) {
+			userIdList.add(lawsInventoryEO.getHomologationEngineerId());
+		}
+		//法规工程师id
+		if (StringUtils.isNotEmpty(lawsInventoryEO.getRegulationOwnerId())) {
+			userIdList.add(lawsInventoryEO.getRegulationOwnerId());
+		}
+		//工程接口人id
+		if (StringUtils.isNotEmpty(lawsInventoryEO.getEngineeringInterfacePerson())) {
+			userIdList.add(lawsInventoryEO.getEngineeringInterfacePerson());
+		}
+
+		//设计符合性确认
+		//发起人
+		if (StringUtils.isNotEmpty(lawsInventoryEO.getDesignInitiatorId())) {
+			userIdList.add(lawsInventoryEO.getDesignInitiatorId());
+		}
+		//责任人
+		if (StringUtils.isNotEmpty(lawsInventoryEO.getDesignDutyId())) {
+			userIdList.add(lawsInventoryEO.getDesignDutyId());
+		}
+
+		//prehomo确认
+		//发起人
+		if (StringUtils.isNotEmpty(lawsInventoryEO.getPrehomoInitiatorId())) {
+			userIdList.add(lawsInventoryEO.getPrehomoInitiatorId());
+		}
+		//责任人
+		if (StringUtils.isNotEmpty(lawsInventoryEO.getPrehomoDutyId())) {
+			userIdList.add(lawsInventoryEO.getPrehomoDutyId());
+		}
+
+		//验证符合性确认
+		//发起人
+		if (StringUtils.isNotEmpty(lawsInventoryEO.getVerifyInitiatorId())) {
+			userIdList.add(lawsInventoryEO.getVerifyInitiatorId());
+		}
+		//责任人
+		if (StringUtils.isNotEmpty(lawsInventoryEO.getVerifyDutyId())) {
+			userIdList.add(lawsInventoryEO.getVerifyDutyId());
+		}
+	}
+
+
+	private void transition(List<ProjectLawsInventoryEOEn> dataListEn, ProjectLawsInventoryEO projectLawsInventoryEOTemp) {
+		//下拉选数据字典
+		List<SysCategory> sysCategoryList = sysCategoryService.list();
+
+		//技术领域数据字典
+		List<SysDictItem> sysDictItems = sysDictItemServiceImpl.selectItemsAll();
+		for (ProjectLawsInventoryEOEn projectLawsInventoryEOEn : dataListEn) {
+
+			//设计交付物类型   inventoryInfoEO
+			if (StringUtils.isNotBlank(projectLawsInventoryEOEn.getDesignDeliverableType())) {
+				StringBuilder sb = getStringBuilder(projectLawsInventoryEOTemp, sysCategoryList, projectLawsInventoryEOEn.getDesignDeliverableType());
+				if (StringUtils.isNotBlank(sb)) {
+					String substring = sb.substring(0, sb.length() - 1);
+					projectLawsInventoryEOEn.setDesignDeliverableType(substring);
+				}
+			}
+			//pre交付物类型
+			if (StringUtils.isNotBlank(projectLawsInventoryEOEn.getPrehomoDeliverableType())) {
+				StringBuilder sb = getStringBuilder(projectLawsInventoryEOTemp, sysCategoryList, projectLawsInventoryEOEn.getPrehomoDeliverableType());
+				if (StringUtils.isNotBlank(sb)) {
+					String substring = sb.substring(0, sb.length() - 1);
+					projectLawsInventoryEOEn.setPrehomoDeliverableType(substring);
+				}
+			}
+			//验证交付物类型
+			if (StringUtils.isNotBlank(projectLawsInventoryEOEn.getVerifyDeliverableType())) {
+				StringBuilder sb = getStringBuilder(projectLawsInventoryEOTemp, sysCategoryList, projectLawsInventoryEOEn.getVerifyDeliverableType());
+				if (StringUtils.isNotBlank(sb)) {
+					String substring = sb.substring(0, sb.length() - 1);
+					projectLawsInventoryEOEn.setVerifyDeliverableType(substring);
+				}
+			}
+
+
+			//适用地区
+			String region = projectLawsInventoryEOEn.getRegion();
+			String pullRegion = pull(sysDictItems, region, "region");
+			if (StringUtils.isNotBlank(pullRegion)) {
+				projectLawsInventoryEOEn.setRegion(pullRegion);
+			}
+			//适用范围shi4Yong4Fan4Wei2
+//			St
+
+			//状态state
+//			String state = projectLawsInventoryEOEn.getState();
+//			String pullState = pull(sysDictItems, state,"state");
+//			if(StringUtils.isNotBlank(pullState)){
+//				projectLawsInventoryEOEn.setState(pullState);
+//			}
+			///认证类型attestationType
+			String attestationType = projectLawsInventoryEOEn.getAttestationType();
+			String pullAttestationType = pull(sysDictItems, attestationType, "attestation_type");
+			if (StringUtils.isNotBlank(pullAttestationType)) {
+				projectLawsInventoryEOEn.setAttestationType(pullAttestationType);
+			}
+			//责任领域dutyTerritory
+			String dutyTerritory = projectLawsInventoryEOEn.getDutyTerritory();
+			String pullDutyTerritory = pull(sysDictItems, dutyTerritory, "duty_territory");
+			if (StringUtils.isNotBlank(pullDutyTerritory)) {
+				projectLawsInventoryEOEn.setDutyTerritory(pullDutyTerritory);
+			}
+			//认证级别attestationRank
+			String attestationRank = projectLawsInventoryEOEn.getAttestationRank();
+			String pullAttestationRank = pull(sysDictItems, attestationRank, "attestation_rank");
+			if (StringUtils.isNotBlank(pullAttestationRank)) {
+				projectLawsInventoryEOEn.setAttestationRank(pullAttestationRank);
+			}
+			//实施类别implementType
+			String implementType = projectLawsInventoryEOEn.getImplementType();
+			String pullImplementType = pull(sysDictItems, implementType, "implement_type");
+			if (StringUtils.isNotBlank(pullImplementType)) {
+				projectLawsInventoryEOEn.setImplementType(pullImplementType);
+			}
+			//设计交付物类型designDeliverableType
+			String designDeliverableType = projectLawsInventoryEOEn.getDesignDeliverableType();
+			String pullDesignDeliverableType = pull(sysDictItems, designDeliverableType, "deliverable_template");
+			if (StringUtils.isNotBlank(pullDesignDeliverableType)) {
+				projectLawsInventoryEOEn.setDesignDeliverableType(pullDesignDeliverableType);
+			}
+
+			//pre交付物类型prehomoDeliverableType
+			String prehomoDeliverableType = projectLawsInventoryEOEn.getPrehomoDeliverableType();
+			String pullPrehomoDeliverableType = pull(sysDictItems, prehomoDeliverableType, "deliverable_template");
+			if (StringUtils.isNotBlank(pullPrehomoDeliverableType)) {
+				projectLawsInventoryEOEn.setPrehomoDeliverableType(pullPrehomoDeliverableType);
+			}
+
+			//验证交付物类型verifyDeliverableType
+			String verifyDeliverableType = projectLawsInventoryEOEn.getVerifyDeliverableType();
+			String pullVerifyDeliverableType = pull(sysDictItems, verifyDeliverableType, "deliverable_template");
+			if (StringUtils.isNotBlank(pullVerifyDeliverableType)) {
+				projectLawsInventoryEOEn.setVerifyDeliverableType(pullVerifyDeliverableType);
+			}
+			//清单确认状态
+			String inventoryAffirmStatus = projectLawsInventoryEOEn.getInventoryAffirmStatus();
+			if (StringUtils.isNotBlank(inventoryAffirmStatus)) {
+				projectLawsInventoryEOEn.setInventoryAffirmStatusName(inventoryAffirmStatus);
+			}
+
+			//任务确认状态
+			String taskAffirmStatus = projectLawsInventoryEOEn.getTaskAffirmStatus();
+			if (StringUtils.isNotBlank(taskAffirmStatus)) {
+				projectLawsInventoryEOEn.setTaskAffirmStatusName(taskAffirmStatus);
+			}
+		}
+	}
+
+	private String pull(List<SysDictItem> sysDictItems, String field, String dictCode) {
+		if (StringUtils.isBlank(field)) {
+			return null;
+		}
+		StringBuilder sb = new StringBuilder();
+		for (String s : field.split(",")) {
+			List<SysDictItem> collect = sysDictItems.stream().filter(e -> dictCode.equals(e.getDictCode()) && s.equals(e.getItemValue())).collect(Collectors.toList());
+			if (collect.size() != 0) {
+				sb.append(collect.get(0).getEnName() + ",");
+			}
+		}
+		if (StringUtils.isNotBlank(sb)) {
+			String substring = sb.substring(0, sb.length() - 1);
+			return substring;
+		}
+		return null;
+	}
+
+	@SneakyThrows
+	@Override
+	public void importData(MultipartFile file, ProjectLawsInventoryEO projectLawsInventoryEO) {
+//		String title = "";
+//		if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
+//			title = "*编号,子标题,WVTA ID," +
+//					"实施类别,认证类型,*认证级别,适用增补件," +
+//					"*责任领域,法规工程师,认证工程师,工程接口人," +
+//					"备注," +
+//					"设计交付物类型,设计交付物模板,设计发起人,设计责任人,设计截止时间,设计交付物说明," +
+//					"pre交付物类型,pre交付物模板,pre发起人,pre责任人,pre截止时间,pre交付物说明," +
+//					"验证交付物类型,验证交付物模板,验证发起人,验证责任人,验证截止时间,验证交付物说明";
+//		}else{
+//			title = "*Number,Sub-Title,WVTA ID," +
+//					"Usage,Certification Type,*Certification Level,Applicable Supplement," +
+//					"*Responsible Field,Regulation Engineer,Homologation Engineer,Engineering Interface," +
+//					"Comments," +
+//					"design Deliverable Type,design Deliverable Template,design initiator,design Assignee,design Due Date,design Deliverable Description," +
+//					"pre Deliverable Type,pre Deliverable Template,pre initiator,pre Assignee,pre Due Date,pre Deliverable Description," +
+//					"verify Deliverable Type,verify Deliverable Template,verify initiator,verify Assignee,verify Due Date,verify Deliverable Description";
+//		}
+
+		int pos = file.getOriginalFilename().lastIndexOf(".");
+		String str = file.getOriginalFilename().substring(pos + 1).toLowerCase();
+		String filenameorg = file.getOriginalFilename().substring(0, pos);
+		//判断上传文件必须是zip
+		if (!str.equals("zip")) {
+			if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+				throw new JeroBootException("请上传zip格式的文件或rar格式的文件");
+			} else {
+				throw new JeroBootException("Please upload a zip file or rar file");
+			}
+
+		}
+		String path = uploadpath + File.separator + "modal" + File.separator + filenameorg + System.currentTimeMillis();
+		File saveDirectory = new File(path);
+		if (!saveDirectory.isDirectory()) {
+			saveDirectory.mkdir();
+		}
+		FileUtils.copyInputStreamToFile(file.getInputStream(), new File(path + File.separator + file.getOriginalFilename()));
+		//解压缩
+		String zipEntryName = "";
+		if (str.equals("zip")) {
+			zipEntryName = FileUnZip.unZipFiles(path + File.separator + file.getOriginalFilename(), path);
+		}
+
+
+		//判断压缩包下是否只有一个文件夹
+		File fileTemp = new File(path);
+		int length = fileTemp.listFiles().length;
+		if (length > 2) {
+			//删除原上传文件
+			FileUnZip.deleteDir(saveDirectory);
+			if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+				throw new JeroBootException("压缩包中必须有且仅有一个文件夹,请重新上传");
+			} else {
+				throw new JeroBootException("There must be only one folder in the compressed package Please upload it again");
+			}
+
+		}
+		File fileNew = new File(zipEntryName);
+		List<File> fileList = new ArrayList<>();
+		for (File file1 : fileNew.listFiles()) {
+			if (file1.getName().contains(".xls") || file1.getName().contains(".xlsx")) {
+				fileList.add(file1);
+			}
+		}
+		if (fileList.size() == 0) {
+			//删除原上传文件
+			FileUnZip.deleteDir(saveDirectory);
+			if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+				throw new JeroBootException("压缩包根目录下没有excel作为导入数据,请重新上传");
+			} else {
+				throw new JeroBootException("Excel does not exist in the root directory of the compressed package Please upload it again");
+			}
+
+		} else if (fileList.size() > 1) {
+			//删除原上传文件
+			FileUnZip.deleteDir(saveDirectory);
+			if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+				throw new JeroBootException("压缩包根目录下仅能存在一个excel为导入数据,请重新上传");
+			} else {
+				throw new JeroBootException("Only one Excel file can be imported in the compressed package root directory. Please upload data again");
+			}
+
+		}
+
+		// 数据相关处理,
+		// 1.获取其中的Excel,
+		List<File> excelfilelist = FileUnZip.readImpExcelFile(zipEntryName);
+		System.gc();
+		if (excelfilelist.size() < 1) {
+			//删除原上传文件
+			FileUnZip.deleteDir(saveDirectory);
+			if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+				throw new JeroBootException("压缩包内没有上传Excel数据");
+			} else {
+				throw new JeroBootException("No Excel data is uploaded in the compressed package");
+			}
+
+		} else if (excelfilelist.size() > 1) {
+			//删除原上传文件
+			FileUnZip.deleteDir(saveDirectory);
+			if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+				throw new JeroBootException("压缩包内有多个Excel数据源");
+			} else {
+				throw new JeroBootException("There are multiple Excel data sources in the zip package");
+			}
+
+		}
+		String title = "";
+		String dataSource = "";
+		List<ProjectLawsInventoryEO> datas = new ArrayList<>();
+		File excelFile = excelfilelist.get(0);
+		Workbook workbook = WorkbookFactory.create(excelFile);
+		List<Map<String, String>> dataList = new ArrayList<>();
+		if (workbook != null) {
+			DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+			Sheet sheet = workbook.getSheetAt(0);
+			if (sheet != null) {
+				StringBuilder headerSb = new StringBuilder();
+				int rowNos = sheet.getLastRowNum();// 得到excel的总记录条数
+				//以sheet页第一行的列数为标记,判断用的是导入模板还是用的列表导出的数据
+				short lastCellNum = sheet.getRow(0).getLastCellNum();
+				if (lastCellNum == 32) {
+					dataSource = DataSourceEnum.LIST_DATA.getValue();
+					if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+						title = "*编号,标题,子标题," +
+								"清单确认状态,任务确认状态,适用地区,对应标准," +
+								"实施类别,新车型实施日期,在产车实施日期,认证类型,*认证级别," +
+								"适用增补件,WVTA ID,*责任领域,法规工程师,认证工程师,工程接口人,备注," +
+								"设计交付物类型,设计交付物模板,设计发起人,设计责任人,设计截止时间,设计交付物说明," +
+								"pre交付物类型,pre交付物模板,pre发起人,pre责任人,pre截止时间,pre交付物说明," +
+								"验证交付物类型,验证交付物模板,验证发起人,验证责任人,验证截止时间,验证交付物说明";
+					} else {
+						title = "*Number,Title,Sub-Title," +
+								"List Confirmation Status,Task Confirmation Status,Area,Compare EU/CN," +
+								"Usage,New Type Execution Date,New Vehicle Execution Date,Certification Type," +
+								"*Certification Level,Applicable Supplement,WVTA ID,*Responsible Field," +
+								"Regulation Engineer,Homologation Engineer,Engineering Interface,Comments," +
+								"design Deliverable Type,design Deliverable Template,design Reviewer,design Assignee,design Due Date,design Deliverable Description," +
+								"pre Deliverable Type,pre Deliverable Template,pre Reviewer,pre Assignee,pre Due Date,pre Deliverable Description," +
+								"verify Deliverable Type,verify Deliverable Template,verify Reviewer,verify Assignee,verify Due Date,verify Deliverable Description";
+					}
+					//导入的数据为列表导出的数据
+					for (int i = 0; i <= rowNos; i++) {
+						Row row = sheet.getRow(i);
+						Row headerRow = sheet.getRow(i);
+						boolean isBlank = isRowEmpty(row);
+						String key = "";
+						if (row != null && !isBlank) {
+							int columNos = headerRow.getLastCellNum();// 表头总共的列数
+							Map<String, String> rowList = new LinkedHashMap<>();
+							for (int j = 0; j < columNos; j++) {
+								Cell cell = row.getCell(j);
+								Cell headerCell = headerRow.getCell(j);
+								if (cell != null) {
+									if (i == 0) {
+										cell.setCellType(HSSFCell.CELL_TYPE_STRING);
+										headerSb.append(cell.getStringCellValue() + ",");
+										if (j == 18) {
+											break;
+										}
+									} else if (i == 1) {
+										if (j > 18) {
+											String flag = "";
+											if (18 < j && j < 25) {
+												if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+													flag = "设计";
+												} else {
+													flag = "design ";
+												}
+												key = flag + headerCell.getStringCellValue();
+											}
+											if (24 < j && j < 31) {
+												if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+													flag = "pre";
+												} else {
+													flag = "pre ";
+												}
+												key = flag + headerCell.getStringCellValue();
+											}
+											if (30 < j && j < 37) {
+												if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+													flag = "验证";
+												} else {
+													flag = "verify ";
+												}
+												key = flag + headerCell.getStringCellValue();
+											}
+											headerSb.append(key + ",");
+										}
+									} else if (i > 1) {
+										List<String> headList = Arrays.asList(headerSb.toString().split(","));
+										String field = "";
+										if (HSSFCell.CELL_TYPE_NUMERIC == cell.getCellType() && HSSFDateUtil.isCellDateFormatted(cell)) {
+											Date d = cell.getDateCellValue();
+											field = fieldConvert(headList.get(j));
+											rowList.put(field, df.format(d));
+										} else {
+											field = fieldConvert(headList.get(j));
+											cell.setCellType(HSSFCell.CELL_TYPE_STRING);
+											String stringCellValue = cell.getStringCellValue();
+											if (StringUtils.isNotBlank(stringCellValue)) {
+												String replace = stringCellValue.replace("，", ",");
+												rowList.put(field, replace);
+											} else {
+												rowList.put(field, "");
+											}
+										}
+									}
+								}
+							}
+							if (i > 1) {
+								dataList.add(rowList);
+							}
+						}
+					}
+				} else {
+					if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+						title = "*编号,标题,子标题," +
+								"认证类型,*认证级别,适用增补件," +
+								"*责任领域,法规工程师,工程接口人," +
+								"备注," +
+								"设计交付物类型,设计交付物模板,设计责任人,设计截止时间,设计交付物说明," +
+								"验证交付物类型,验证交付物模板,验证责任人,验证截止时间,验证交付物说明";
+					} else {
+						title = "*Number,Title,Sub-Title," +
+								"Certification Type,*Certification Level,Applicable Supplement," +
+								"*Responsible Field,Regulation Engineer,Engineering Interface," +
+								"Comments," +
+								"design Deliverable Type,design Deliverable Template,design Assignee,design Due Date,design Deliverable Description," +
+								"verify Deliverable Type,verify Deliverable Template,verify Assignee,verify Due Date,verify Deliverable Description";
+					}
+					//导入的数据为填写模板的数据
+					for (int i = 0; i <= rowNos; i++) {
+						Row row = sheet.getRow(i);
+						Row headerRow = sheet.getRow(i);
+						boolean isBlank = isRowEmpty(row);
+						String key = "";
+						if (row != null && !isBlank) {
+							int columNos = headerRow.getLastCellNum();// 表头总共的列数
+							Map<String, String> rowList = new LinkedHashMap<>();
+							for (int j = 0; j < columNos; j++) {
+								Cell cell = row.getCell(j);
+								Cell headerCell = headerRow.getCell(j);
+								if (cell != null) {
+									if (i == 0) {
+										cell.setCellType(HSSFCell.CELL_TYPE_STRING);
+										headerSb.append(cell.getStringCellValue() + ",");
+										if (j == 9) {
+											break;
+										}
+									} else if (i == 1) {
+										if (j > 9) {
+											String flag = "";
+											if (9 < j && j < 15) {
+												if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+													flag = "设计";
+												} else {
+													flag = "design ";
+												}
+												key = flag + headerCell.getStringCellValue();
+											}
+											/*if(17 < j && j < 24){
+												if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
+													flag ="pre";
+												}else{
+													flag ="pre ";
+												}
+												key = flag + headerCell.getStringCellValue();
+											}*/
+											if (14 < j && j < 20) {
+												if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+													flag = "验证";
+												} else {
+													flag = "verify ";
+												}
+												key = flag + headerCell.getStringCellValue();
+											}
+											headerSb.append(key + ",");
+										}
+									} else if (i > 2) {
+										List<String> headList = Arrays.asList(headerSb.toString().split(","));
+										String field = "";
+										if (HSSFCell.CELL_TYPE_NUMERIC == cell.getCellType() && HSSFDateUtil.isCellDateFormatted(cell)) {
+											Date d = cell.getDateCellValue();
+											field = fieldConvert(headList.get(j));
+											rowList.put(field, df.format(d));
+										} else {
+											field = fieldConvert(headList.get(j));
+											cell.setCellType(HSSFCell.CELL_TYPE_STRING);
+											String stringCellValue = cell.getStringCellValue();
+											if (StringUtils.isNotBlank(stringCellValue)) {
+												String replace = stringCellValue.replace("，", ",");
+												rowList.put(field, replace);
+											} else {
+												rowList.put(field, "");
+											}
+										}
+									}
+								}
+							}
+							if (i > 2) {
+								dataList.add(rowList);
+							}
+						}
+					}
+				}
+
+
+				if (dataList.size() == 0) {
+					//删除原上传文件
+					FileUnZip.deleteDir(saveDirectory);
+					if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+						throw new JeroBootException("请填写必填字段内容,带*的为必填");
+					} else {
+						throw new JeroBootException("Please fill in the required fields marked with *");
+					}
+
+				} else {
+					//数据转换  JSON.parseObject(JSON.toJSONString(map), MyUser.class)
+					for (Map<String, String> stringStringMap : dataList) {
+						ProjectLawsInventoryEO projectLawsInventoryEOTemp = JSON.parseObject(JSON.toJSONString(stringStringMap), ProjectLawsInventoryEO.class);
+						projectLawsInventoryEOTemp.setCut(projectLawsInventoryEO.getCut());
+						projectLawsInventoryEOTemp.setProjectLibraryId(projectLawsInventoryEO.getProjectLibraryId());
+						projectLawsInventoryEOTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
+						projectLawsInventoryEOTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
+						projectLawsInventoryEOTemp.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+						projectLawsInventoryEOTemp.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+						datas.add(projectLawsInventoryEOTemp);
+					}
+				}
+				// 校验头部是否符合模板
+				String substring = headerSb.toString();
+				if (substring.endsWith(",") || substring.endsWith("，")) {
+					substring = headerSb.substring(0, headerSb.length() - 1);
+				}
+
+				String excelHeader = substring.toString();
+				if (!title.equals(excelHeader)) {
+					workbook.close();
+					//删除原上传文件
+					FileUnZip.deleteDir(saveDirectory);
+					if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+						throw new JeroBootException("读取失败，请严格按照模板文件导入数据");
+					} else {
+						throw new JeroBootException("The data fails to be read. Import data strictly according to the template file");
+					}
+
+				}
+			}
+		}
+		workbook.close();
+		List<SysCategory> categoryList = sysCategoryService.list();
+		//普通数据字典
+		List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
+		importDatas(datas, dictItemList, zipEntryName, saveDirectory, projectLawsInventoryEO, categoryList, dataSource);
+		//删除原上传文件
+		FileUnZip.deleteDir(saveDirectory);
+
+	}
+//	@SneakyThrows
+//	@Override
+//	public void importData(MultipartFile file, ProjectLawsInventoryEO projectLawsInventoryEO) {
+//		String title = "";
+//		if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
+//			title = "*编号,子标题,WVTA ID," +
+//					"实施类别,认证类型,*认证级别,适用增补件," +
+//					"*责任领域,法规工程师,认证工程师,工程接口人," +
+//					"备注," +
+//					"设计交付物类型,设计交付物模板,设计发起人,设计责任人,设计截止时间,设计交付物说明," +
+//					"pre交付物类型,pre交付物模板,pre发起人,pre责任人,pre截止时间,pre交付物说明," +
+//					"验证交付物类型,验证交付物模板,验证发起人,验证责任人,验证截止时间,验证交付物说明";
+//		}else{
+//			title = "*Number,Sub-Title,WVTA ID," +
+//					"Usage,Certification Type,*Certification Level,Applicable Supplement," +
+//					"*Responsible Field,Regulation Engineer,Homologation Engineer,Engineering Interface," +
+//					"Comments," +
+//					"design Deliverable Type,design Deliverable Template,design initiator,design Assignee,design Due Date,design Deliverable Description," +
+//					"pre Deliverable Type,pre Deliverable Template,pre initiator,pre Assignee,pre Due Date,pre Deliverable Description," +
+//					"verify Deliverable Type,verify Deliverable Template,verify initiator,verify Assignee,verify Due Date,verify Deliverable Description";
+//		}
+//
+//		int pos = file.getOriginalFilename().lastIndexOf(".");
+//		String str = file.getOriginalFilename().substring(pos + 1).toLowerCase();
+//		String filenameorg = file.getOriginalFilename().substring(0, pos);
+//		//判断上传文件必须是zip
+//		if (!str.equals("zip")) {
+//			if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
+//				throw new JeroBootException("请上传zip格式的文件或rar格式的文件");
+//			}else{
+//				throw new JeroBootException("Please upload a zip file or rar file");
+//			}
+//
+//		}
+//		String path = uploadpath + File.separator + "modal" + File.separator + filenameorg + System.currentTimeMillis();
+//		File saveDirectory = new File(path);
+//		if (!saveDirectory.isDirectory()) {
+//			saveDirectory.mkdir();
+//		}
+//		FileUtils.copyInputStreamToFile(file.getInputStream(), new File(path + File.separator + file.getOriginalFilename()));
+//		//解压缩
+//		String zipEntryName = "";
+//		if (str.equals("zip")) {
+//			zipEntryName = FileUnZip.unZipFiles(path + File.separator + file.getOriginalFilename(), path);
+//		}
+//
+//
+//		//判断压缩包下是否只有一个文件夹
+//		File fileTemp = new File(path);
+//		int length = fileTemp.listFiles().length;
+//		if (length > 2) {
+//			//删除原上传文件
+//			FileUnZip.deleteDir(saveDirectory);
+//			if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
+//				throw new JeroBootException("压缩包中必须有且仅有一个文件夹,请重新上传");
+//			}else{
+//				throw new JeroBootException("There must be only one folder in the compressed package Please upload it again");
+//			}
+//
+//		}
+//		File fileNew = new File(zipEntryName);
+//		List<File> fileList = new ArrayList<>();
+//		for (File file1 : fileNew.listFiles()) {
+//			if (file1.getName().contains(".xls") || file1.getName().contains(".xlsx")) {
+//				fileList.add(file1);
+//			}
+//		}
+//		if (fileList.size() == 0) {
+//			//删除原上传文件
+//			FileUnZip.deleteDir(saveDirectory);
+//			if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
+//				throw new JeroBootException("压缩包根目录下没有excel作为导入数据,请重新上传");
+//			}else{
+//				throw new JeroBootException("Excel does not exist in the root directory of the compressed package Please upload it again");
+//			}
+//
+//		} else if (fileList.size() > 1) {
+//			//删除原上传文件
+//			FileUnZip.deleteDir(saveDirectory);
+//			if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
+//				throw new JeroBootException("压缩包根目录下仅能存在一个excel为导入数据,请重新上传");
+//			}else{
+//				throw new JeroBootException("Only one Excel file can be imported in the compressed package root directory. Please upload data again");
+//			}
+//
+//		}
+//
+//		// 数据相关处理,
+//		// 1.获取其中的Excel,
+//		List<File> excelfilelist = FileUnZip.readImpExcelFile(zipEntryName);
+//		System.gc();
+//		if (excelfilelist.size() < 1) {
+//			//删除原上传文件
+//			FileUnZip.deleteDir(saveDirectory);
+//			if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
+//				throw new JeroBootException("压缩包内没有上传Excel数据");
+//			}else{
+//				throw new JeroBootException("No Excel data is uploaded in the compressed package");
+//			}
+//
+//		} else if (excelfilelist.size() > 1) {
+//			//删除原上传文件
+//			FileUnZip.deleteDir(saveDirectory);
+//			if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
+//				throw new JeroBootException("压缩包内有多个Excel数据源");
+//			}else{
+//				throw new JeroBootException("There are multiple Excel data sources in the zip package");
+//			}
+//
+//		}
+//		List<ProjectLawsInventoryEO> datas = new ArrayList<>();
+//		File excelFile = excelfilelist.get(0);
+//		Workbook workbook = WorkbookFactory.create(excelFile);
+//		List<Map<String, String>> dataList = new ArrayList<>();
+//		if (workbook != null) {
+//			DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+//			Sheet sheet = workbook.getSheetAt(0);
+//			if (sheet != null) {
+//				StringBuilder headerSb = new StringBuilder();
+//				int rowNos = sheet.getLastRowNum();// 得到excel的总记录条数
+//				for (int i = 0; i <= rowNos; i++) {
+//					Row row = sheet.getRow(i);
+//					Row headerRow = sheet.getRow(i);
+//					boolean isBlank = isRowEmpty(row);
+//					String key = "";
+//					if (row != null && !isBlank) {
+//						int columNos = headerRow.getLastCellNum();// 表头总共的列数
+//						Map<String, String> rowList = new LinkedHashMap<>();
+//						for (int j = 0; j < columNos; j++) {
+//							Cell cell = row.getCell(j);
+//							Cell headerCell = headerRow.getCell(j);
+//							if (cell != null) {
+//								if (i == 0) {
+//									cell.setCellType(HSSFCell.CELL_TYPE_STRING);
+//									headerSb.append(cell.getStringCellValue() + ",");
+//									if(j == 11){
+//										break;
+//									}
+//								}else if(i == 1){
+//									if(j > 11){
+//										String flag = "";
+//										if(11 < j && j < 18){
+//											if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
+//												flag ="设计";
+//											}else{
+//												flag ="design ";
+//											}
+//											key = flag + headerCell.getStringCellValue();
+//										}
+//										if(17 < j && j < 24){
+//											if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
+//												flag ="pre";
+//											}else{
+//												flag ="pre ";
+//											}
+//											key = flag + headerCell.getStringCellValue();
+//										}
+//										if(23 < j && j < 30){
+//											if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
+//												flag ="验证";
+//											}else{
+//												flag ="verify ";
+//											}
+//											key = flag + headerCell.getStringCellValue();
+//										}
+//										headerSb.append(key + ",");
+//									}
+//								} else if(i > 2){
+//									List<String> headList = Arrays.asList(headerSb.toString().split(","));
+//									String field ="";
+//									if (HSSFCell.CELL_TYPE_NUMERIC == cell.getCellType() && HSSFDateUtil.isCellDateFormatted(cell)) {
+//										Date d = cell.getDateCellValue();
+//										field = fieldConvert(headList.get(j));
+//										rowList.put(field, df.format(d));
+//									} else {
+//										field = fieldConvert(headList.get(j));
+//										cell.setCellType(HSSFCell.CELL_TYPE_STRING);
+//										String stringCellValue = cell.getStringCellValue();
+//										if (StringUtils.isNotBlank(stringCellValue)) {
+//											String replace = stringCellValue.replace("，", ",");
+//											rowList.put(field, replace);
+//										} else {
+//											rowList.put(field, "");
+//										}
+//									}
+//								}
+//							}
+//						}
+//						if (i > 2) {
+//							dataList.add(rowList);
+//						}
+//					}
+//				}
+//
+//				if (dataList.size() == 0) {
+//					//删除原上传文件
+//					FileUnZip.deleteDir(saveDirectory);
+//					if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
+//						throw new JeroBootException("请填写必填字段内容,带*的为必填");
+//					}else{
+//						throw new JeroBootException("Please fill in the required fields marked with *");
+//					}
+//
+//				}else{
+//					//数据转换  JSON.parseObject(JSON.toJSONString(map), MyUser.class)
+//					for (Map<String, String> stringStringMap : dataList) {
+//						ProjectLawsInventoryEO projectLawsInventoryEOTemp = JSON.parseObject(JSON.toJSONString(stringStringMap), ProjectLawsInventoryEO.class);
+//						projectLawsInventoryEOTemp.setCut(projectLawsInventoryEO.getCut());
+//						projectLawsInventoryEOTemp.setProjectLibraryId(projectLawsInventoryEO.getProjectLibraryId());
+//						projectLawsInventoryEOTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
+//						projectLawsInventoryEOTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
+//						datas.add(projectLawsInventoryEOTemp);
+//					}
+//				}
+//				// 校验头部是否符合模板
+//				String substring = headerSb.toString();
+//				if (substring.endsWith(",") || substring.endsWith("，")){
+//					substring = headerSb.substring(0, headerSb.length() - 1);
+//				}
+//
+//				String excelHeader = substring.toString();
+//				if (!title.equals(excelHeader)) {
+//					workbook.close();
+//					//删除原上传文件
+//					FileUnZip.deleteDir(saveDirectory);
+//					if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
+//						throw new JeroBootException("读取失败，请严格按照模板文件导入数据");
+//					}else{
+//						throw new JeroBootException("The data fails to be read. Import data strictly according to the template file");
+//					}
+//
+//				}
+//			}
+//		}
+//		workbook.close();
+//		List<SysCategory> categoryList = sysCategoryService.list();
+//		//普通数据字典
+//		List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
+//		importDatas(datas, dictItemList, zipEntryName,saveDirectory,projectLawsInventoryEO,categoryList);
+//		//删除原上传文件
+//		FileUnZip.deleteDir(saveDirectory);
+//
+//	}
+
+	@Override
+	@Transactional
+	public Result<?> change(JSONObject parmas) {
+		String ids = parmas.getString("ids");
+		String projectLibraryId = parmas.getString("projectLibraryId");
+		String operateType = parmas.getString("operateType");
+		if (StringUtils.isNotEmpty(ids)) {
+
+			List<String> piFlowTypeList = new ArrayList<>();
+
+			QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
+			queryWrapper.lambda().in(ProjectLawsInventoryEO::getId, Arrays.asList(ids.split(",")));
+			queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId, projectLibraryId);
+			List<ProjectLawsInventoryEO> projectLawsInventoryEOS = this.list(queryWrapper);
+
+			List<String> idList = Arrays.asList(ids.split(","));
+			String projectLawsInventoryIds = ids;
+			String pIds = "";
+
+			ProjectLawsInventoryEO projectLawsInventoryEO = new ProjectLawsInventoryEO();
+			projectLawsInventoryEO.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
+			projectLawsInventoryEO.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
+			//清单、任务确认初始化。
+			LambdaUpdateWrapper<ProjectLawsInventoryEO> updateWrapper = new LambdaUpdateWrapper<>();
+			updateWrapper.in(ProjectLawsInventoryEO::getId, idList);
+			updateWrapper.set(ProjectLawsInventoryEO::getRegulationOwnerSubmitStatus, null);
+			updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerSubmitStatus, null);
+			updateWrapper.set(ProjectLawsInventoryEO::getSendMsgFlag, null);
+			updateWrapper.set(ProjectLawsInventoryEO::getSendMsgCurrentFlag, null);
+			//updateWrapper.set(ProjectLawsInventoryEO::getDesignDueDate,null);
+			//updateWrapper.set(ProjectLawsInventoryEO::getPrehomoDueDate,null);
+			//updateWrapper.set(ProjectLawsInventoryEO::getVerifyDueDate,null);
+			updateWrapper.set(ProjectLawsInventoryEO::getInventoryAffirmDueDate, null);
+			updateWrapper.set(ProjectLawsInventoryEO::getTaskAffirmDueDate, null);
+
+			// 区分重置设计、验证、全部流程
+			if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_ALL_RESET_FLOW.getValue())){
+				updateWrapper.set(ProjectLawsInventoryEO::getDesignFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+				updateWrapper.set(ProjectLawsInventoryEO::getVerifyFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+				piFlowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue());
+				piFlowTypeList.add(FlowTypeEnum.YZFHXSCLC.getValue());
+				piFlowTypeList.add(FlowTypeEnum.SJ_XGJFWLC.getValue());
+				piFlowTypeList.add(FlowTypeEnum.YZ_XGJFWLC.getValue());
+			}else if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_DESIGN_RESET_FLOW.getValue())){
+				updateWrapper.set(ProjectLawsInventoryEO::getDesignFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+				piFlowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue());
+				piFlowTypeList.add(FlowTypeEnum.SJ_XGJFWLC.getValue());
+			}else if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_VERIFY_RESET_FLOW.getValue())){
+				updateWrapper.set(ProjectLawsInventoryEO::getVerifyFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+				piFlowTypeList.add(FlowTypeEnum.YZFHXSCLC.getValue());
+				piFlowTypeList.add(FlowTypeEnum.YZ_XGJFWLC.getValue());
+			}
+
+			super.update(projectLawsInventoryEO, updateWrapper);
+
+			QueryWrapper<ProcessInfoEO> processInfoQueryWrap = new QueryWrapper<>();
+			processInfoQueryWrap.lambda().in(ProcessInfoEO::getProjectLawsInventoryId, idList);
+			processInfoQueryWrap.lambda().in(ProcessInfoEO::getFlowType,piFlowTypeList);
+			List<ProcessInfoEO> processInfoEOList = this.processInfoEOService.list(processInfoQueryWrap);
+			List<String> actiProcInstIdList = processInfoEOList.stream().map(ProcessInfoEO::getActiProcInstId).distinct().collect(Collectors.toList());
+
+			pIds = actiProcInstIdList.stream().map(String::valueOf).collect(Collectors.joining(","));
+
+			/*QueryWrapper<ProjectTaskInventoryEO> taskInventoryQueryWrapper = new QueryWrapper<>();
+			taskInventoryQueryWrapper.lambda().in(ProjectTaskInventoryEO::getProjectLawsInventoryId,idList);
+			List<ProjectTaskInventoryEO> projectTaskInventoryList = this.projectTaskInventoryEOService.getBaseMapper().selectList(taskInventoryQueryWrapper);
+
+			//删除流程历史
+			if(CollectionUtils.isNotEmpty(projectTaskInventoryList)){
+				List<String> actiProcInstIdList = new ArrayList<>();
+				List<String> verifyPIdList = projectTaskInventoryList.stream().map(ProjectTaskInventoryEO::getVerifyPId).distinct().collect(Collectors.toList());
+				List<String> prehomoPIdList = projectTaskInventoryList.stream().map(ProjectTaskInventoryEO::getPrehomoPId).distinct().collect(Collectors.toList());
+				List<String> designPIdList = projectTaskInventoryList.stream().map(ProjectTaskInventoryEO::getDesignPId).distinct().collect(Collectors.toList());
+
+				actiProcInstIdList.addAll(verifyPIdList);
+				actiProcInstIdList.addAll(prehomoPIdList);
+				actiProcInstIdList.addAll(designPIdList);
+
+				actiProcInstIdList = actiProcInstIdList.stream().distinct().collect(Collectors.toList());;
+				if(CollectionUtils.isNotEmpty(actiProcInstIdList)){
+					QueryWrapper<ProcessHistoryEO> processHistoryDeleteWrapper = new QueryWrapper<>();
+					processHistoryDeleteWrapper.lambda().in(ProcessHistoryEO::getActiProcInstId,actiProcInstIdList);
+					processHistoryEOService.remove(processHistoryDeleteWrapper);
+				}
+				pIds = actiProcInstIdList.stream().map(String::valueOf).collect(Collectors.joining(","));
+			}
+
+			QueryWrapper<ProjectLawsInventoryEO> queryLawsInventoryWrapper = new QueryWrapper<>();
+			queryLawsInventoryWrapper.lambda().in(ProjectLawsInventoryEO::getId,idList);
+
+			List<ProjectTaskInventoryEO> projectTaskInventoryEOList = new ArrayList<>();
+			List<ProjectLawsInventoryEO> projectLawsInventoryEOList = this.baseMapper.selectList(queryLawsInventoryWrapper);
+			projectLawsInventoryEOList.forEach(projectLawsInventory -> {
+				ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
+				String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
+				projectTaskInventoryEO.setId(projectTaskInventoryId);
+				projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventory.getId());
+				projectTaskInventoryEO.setStandId(projectLawsInventory.getStandId());
+				projectTaskInventoryEO.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
+				projectTaskInventoryEOList.add(projectTaskInventoryEO);
+			});
+//			idList.forEach(id -> {
+//				ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
+//				String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
+//				projectTaskInventoryEO.setId(projectTaskInventoryId);
+//				projectTaskInventoryEO.setProjectLawsInventoryId(id);
+//				projectTaskInventoryEOList.add(projectTaskInventoryEO);
+//			});
+			//项目任务清单数据初始化。
+			this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(idList);
+			this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
+
+			//初始化项目状态评估
+			projectTaskInventoryEOList.forEach(taskInventory -> {
+				this.initConditionAssessmentEO(taskInventory.getProjectLawsInventoryId());
+			});
+
+			//删除该法规的任务明细数据
+			QueryWrapper<ProjectTaskInventoryDetailEO> deleteTaskInventoryDetailWrapper = new QueryWrapper<>();
+			deleteTaskInventoryDetailWrapper.lambda().in(ProjectTaskInventoryDetailEO::getProjectTaskInventoryId,idList);
+			this.projectTaskInventoryDetailEOService.remove(deleteTaskInventoryDetailWrapper);
+
+			//查询反馈意见表 获取id  用于删除 反馈意见历史数据。
+			QueryWrapper<ProjectTaskInventoryFeedbackEO> queryTaskInventoryFeedbackWrapper = new QueryWrapper<>();
+			queryTaskInventoryFeedbackWrapper.lambda().in(ProjectTaskInventoryFeedbackEO::getProjectTaskInventoryId,idList);
+			List<ProjectTaskInventoryFeedbackEO> projectTaskInventoryFeedbackEOList = projectTaskInventoryFeedbackEOService.getBaseMapper().selectList(queryTaskInventoryFeedbackWrapper);
+			List<String> feedbackIdList = projectTaskInventoryFeedbackEOList.stream().map(ProjectTaskInventoryFeedbackEO::getId).distinct().collect(Collectors.toList());
+			if(CollectionUtils.isNotEmpty(feedbackIdList)){
+				QueryWrapper<FeedbackHistory> deleteFeedbackHistoryWrapper = new QueryWrapper<>();
+				deleteFeedbackHistoryWrapper.lambda().in(FeedbackHistory::getFeedbackId,feedbackIdList);
+				feedbackHistoryService.remove(deleteFeedbackHistoryWrapper);
+			}
+
+			//删除反馈意见数据
+			QueryWrapper<ProjectTaskInventoryFeedbackEO> deleteTaskInventoryFeedbackWrapper = new QueryWrapper<>();
+			deleteTaskInventoryFeedbackWrapper.lambda().in(ProjectTaskInventoryFeedbackEO::getProjectTaskInventoryId,idList);
+			this.projectTaskInventoryFeedbackEOService.remove(deleteTaskInventoryFeedbackWrapper);
+
+			//删除当前项目状态表
+			QueryWrapper<ConditionAssessmentEO> deleteConditionAssessmentWrapper = new QueryWrapper<>();
+			deleteConditionAssessmentWrapper.lambda().in(ConditionAssessmentEO::getProjectLawsInventoryId,idList);
+			this.conditionAssessmentEOService.remove(deleteConditionAssessmentWrapper);*/
+
+			JSONObject params = new JSONObject();
+			params.put("projectLawsInventoryIds", projectLawsInventoryIds);
+			params.put("pIds", pIds);
+			//根据流程实例id 、 法规清单id  删除相关流程。
+//			workFlowFeignClient.deleteProcessInstanceByProjectLawsInventoryIds(params);
+
+			//清除流程中心对应的数据
+			params.put("ids", ids);
+			params.put("operateType", operateType);
+			this.processInfoEOService.change(params);
+
+			// 删除流程历史数据
+			this.processHistoryEOService.deleteBiActiProcInstIdList(actiProcInstIdList);
+
+			this.lawsInventoryEOListSortByInventoryAffirmDueDate(projectLawsInventoryEOS);
+			Date inventoryAffirmDueDate = projectLawsInventoryEOS.get(0).getInventoryAffirmDueDate();
+			String endTime = "";
+			if (inventoryAffirmDueDate != null) {
+				endTime = DateUtils.formatDate(inventoryAffirmDueDate);
+			}
+
+			// 给法规工程师发消息
+			List<String> userIdList = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getRegulationOwnerId).distinct().collect(Collectors.toList());
+			String serialNumbers = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(","));
+
+			Map<String, Object> paramsMsg = new HashMap<>();
+			paramsMsg.put("contentCn", "您好，该法规已被发起人撤回。");
+			paramsMsg.put("contentEn", "Hello! This regulation has been withdrawn by the initiator.");
+			paramsMsg.put("projectLibraryId", projectLibraryId);
+			paramsMsg.put("endTime", endTime);
+			paramsMsg.put("userIdList", userIdList);
+			paramsMsg.put("serialNumbers", serialNumbers);
+
+			ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+			if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
+				String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+				String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+				// 获取法规清单 - 飞书跳转链接
+				Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue());
+				paramsMsg.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN"));
+				paramsMsg.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN"));
+				paramsMsg.put("hrefFeishu_CN_P", (String) hrefFeishuMap.get("hrefFeishu_CN_P"));
+				paramsMsg.put("Initiator", projectLibraryBase.getStudioEngineerName());
+
+				this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(), paramsMsg);
+			}
+		}
+		return Result.OK("变更成功！");
+	}
+
+	private void importDatas(List<ProjectLawsInventoryEO> dataList,
+							 List<SysDictItem> dictItemList,
+							 String zipEntryName,
+							 File saveDirectory,
+							 ProjectLawsInventoryEO projectLawsInventoryEOTemp,
+							 List<SysCategory> categoryList,
+							 String dataSource) {
+		List<String> msgList = new ArrayList<>();
+		if (DataSourceEnum.LIST_DATA.getValue().equals(dataSource)) {
+			//列表数据验证
+			msgList = dataListVerify(dataList, dictItemList, zipEntryName, projectLawsInventoryEOTemp, categoryList, dataSource);
+		} else {
+			//模板数据验证
+			msgList = dataTemplateVerify(dataList, dictItemList, zipEntryName, projectLawsInventoryEOTemp, categoryList, dataSource);
+		}
+		if (msgList.size() > 0) {
+			//返回报错信息
+			String html = "";
+			for (String s : msgList) {
+				html += s + "</br>";
+			}
+			FileUnZip.deleteDir(saveDirectory);
+			if (StringUtils.isNotBlank(html)) {
+				html = html.substring(0, html.length() - 7);
+			}
+			throw new JeroBootException(html);
+		} else {
+			if (dataList.size() != 0) {
+				this.saveBatch(dataList);
+				//项目任务清单数据初始化。
+				List<ProjectTaskInventoryEO> projectTaskInventoryEOList = new ArrayList<>();
+				//权限添加
+				List<ProjectUserPermission> adds = new ArrayList<>();
+				Date now = new Date();
+				for (ProjectLawsInventoryEO projectLawsInventoryEO : dataList) {
+					ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
+					String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
+					projectTaskInventoryEO.setId(projectTaskInventoryId);
+					projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventoryEO.getId());
+					projectLawsInventoryEO.setStandId(projectLawsInventoryEO.getStandId());
+					projectTaskInventoryEO.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
+					projectTaskInventoryEOList.add(projectTaskInventoryEO);
+					//设置权限
+					if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId())) {
+						this.editService.setProjectLawsInventoryPermission(projectLawsInventoryEO.getRegulationOwnerId(), projectLawsInventoryEOTemp.getProjectLibraryId(), projectLawsInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_REGULATION.getValue());
+					}
+					if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId())) {
+						this.editService.setProjectLawsInventoryPermission(projectLawsInventoryEO.getHomologationEngineerId(), projectLawsInventoryEOTemp.getProjectLibraryId(), projectLawsInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_HOMOLOGATION.getValue());
+					}
+					if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getEngineeringInterfacePerson())) {
+						this.editService.setProjectLawsInventoryPermission(projectLawsInventoryEO.getEngineeringInterfacePerson(), projectLawsInventoryEOTemp.getProjectLibraryId(), projectLawsInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_INTERFACE.getValue());
+					}
+					if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getDesignInitiatorId())) {
+						this.editService.setProjectLawsInventoryPermission(projectLawsInventoryEO.getDesignInitiatorId(), projectLawsInventoryEOTemp.getProjectLibraryId(), projectLawsInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_DESIGN_INITIATOR.getValue());
+					}
+					if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getDesignDutyId())) {
+						this.editService.setProjectLawsInventoryPermission(projectLawsInventoryEO.getDesignDutyId(), projectLawsInventoryEOTemp.getProjectLibraryId(), projectLawsInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_DESIGN_DUTY.getValue());
+					}
+					if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoInitiatorId())) {
+						this.editService.setProjectLawsInventoryPermission(projectLawsInventoryEO.getPrehomoInitiatorId(), projectLawsInventoryEOTemp.getProjectLibraryId(), projectLawsInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_PREHOMO_INITIATOR.getValue());
+					}
+					if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoDutyId())) {
+						this.editService.setProjectLawsInventoryPermission(projectLawsInventoryEO.getPrehomoDutyId(), projectLawsInventoryEOTemp.getProjectLibraryId(), projectLawsInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_PREHOMO_DUTY.getValue());
+					}
+					if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getVerifyInitiatorId())) {
+						this.editService.setProjectLawsInventoryPermission(projectLawsInventoryEO.getVerifyInitiatorId(), projectLawsInventoryEOTemp.getProjectLibraryId(), projectLawsInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_VERIFY_INITIATOR.getValue());
+					}
+					if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getVerifyDutyId())) {
+						this.editService.setProjectLawsInventoryPermission(projectLawsInventoryEO.getVerifyDutyId(), projectLawsInventoryEOTemp.getProjectLibraryId(), projectLawsInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_VERIFY_DUTY.getValue());
+					}
+				}
+				if (ObjectUtils.isNotEmpty(adds)) {
+					projectUserPermissionService.saveBatch(adds);
+				}
+				this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
+				//初始化项目状态评估
+				projectTaskInventoryEOList.forEach(taskInventory -> {
+					this.initConditionAssessmentEO(taskInventory.getProjectLawsInventoryId());
+				});
+
+				//更新log
+				String serialNumber = dataList.stream().map(e -> e.getSerialNumber()).collect(Collectors.joining(","));
+				LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+				String username = sysUser.getUsername();
+				String contentLog = username + "向清单中导入了“" + serialNumber + "”";
+				String enContentLog = username + " imported “" + serialNumber + "” into the list.";
+				projectLawsInventoryLogEOService.updateLog(contentLog, dataList.get(0).getProjectLibraryId(), CutEnum.CN.getValue());
+				projectLawsInventoryLogEOService.updateLog(enContentLog, dataList.get(0).getProjectLibraryId(), CutEnum.EN.getValue());
+			}
+		}
+	}
+
+	/**
+	 * 列表数据验证
+	 *
+	 * @param dataList
+	 * @param dictItemList
+	 * @param zipEntryName
+	 * @param projectLawsInventoryEOTemp
+	 * @param categoryList
+	 * @param dataSource
+	 * @return
+	 */
+	@NotNull
+	private List<String> dataListVerify(List<ProjectLawsInventoryEO> dataList,
+										List<SysDictItem> dictItemList,
+										String zipEntryName,
+										ProjectLawsInventoryEO projectLawsInventoryEOTemp,
+										List<SysCategory> categoryList,
+										String dataSource) {
+		String dictId = sysCategoryMapper.getDictId("deliverable_template");
+		List<SysCategory> collect = categoryList.stream().filter(e -> e.getSysDictId().equals(dictId)).collect(Collectors.toList());
+		List<String> treeNameList = new ArrayList<>();
+		if (CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())) {
+			treeNameList = collect.stream().map(SysCategory::getName).collect(Collectors.toList());
+		} else {
+			treeNameList = collect.stream().map(SysCategory::getEnName).collect(Collectors.toList());
+		}
+		int i = 2;
+		List<String> msgList = new ArrayList<>();
+		String value = "";
+		boolean flag = true;
+
+		//编号验证
+		verifySerialNumber(dataList, projectLawsInventoryEOTemp, dataSource);
+		for (ProjectLawsInventoryEO projectLawsInventoryEO : dataList) {
+			i++;
+			String errorMsg = "";
+			if (CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())) {
+				errorMsg = "第" + i + "行：";
+			} else {
+				errorMsg = i + " line：";
+			}
+			//编号
+			String serialNumber = projectLawsInventoryEO.getSerialNumber();
+			//子标题subtitle
+			String subtitle = projectLawsInventoryEO.getSubtitle();
+			//WVTA ID
+			String wvtaId = projectLawsInventoryEO.getWvtaId();
+			//备注 remark
+			String remark = projectLawsInventoryEO.getRemark();
+			//认证级别
+			String attestationRank = projectLawsInventoryEO.getAttestationRank();
+			//责任领域
+			String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
+			//认证类型
+			String attestationType = projectLawsInventoryEO.getAttestationType();
+			//实施类别
+			String implementType = projectLawsInventoryEO.getImplementType();
+			//法规工程师regulationOwnerId
+			String regulationOwnerId = projectLawsInventoryEO.getRegulationOwnerId();
+
+			//认证工程师homologationEngineerId
+			String homologationEngineerId = projectLawsInventoryEO.getHomologationEngineerId();
+
+			//工程接口人engineeringInterfacePerson
+			String engineeringInterfacePerson = projectLawsInventoryEO.getEngineeringInterfacePerson();
+
+			//设计交付物类型
+			String designDeliverableType = projectLawsInventoryEO.getDesignDeliverableType();
+			//设计发起人
+			String designInitiator = projectLawsInventoryEO.getDesignInitiatorId();
+			//设计责任人
+			String designDuty = projectLawsInventoryEO.getDesignDutyId();
+			//设计截止时间designDueDate
+			Date designDueDate = projectLawsInventoryEO.getDesignDueDate();
+
+			//pre交付物类型
+			String prehomoDeliverableType = projectLawsInventoryEO.getPrehomoDeliverableType();
+			//pre发起人
+			String prehomoInitiator = projectLawsInventoryEO.getPrehomoInitiatorId();
+			//pre责任人
+			String prehomoDuty = projectLawsInventoryEO.getPrehomoDutyId();
+			//pre截止时间prehomoDueDate
+			Date prehomoDueDate = projectLawsInventoryEO.getPrehomoDueDate();
+
+			//确认交付物类型
+			String verifyDeliverableType = projectLawsInventoryEO.getVerifyDeliverableType();
+			//确认发起人
+			String verifyInitiator = projectLawsInventoryEO.getVerifyInitiatorId();
+			//确认责任人
+			String verifyDuty = projectLawsInventoryEO.getVerifyDutyId();
+			//确认截止时间verifyDueDate
+			Date verifyDueDate = projectLawsInventoryEO.getVerifyDueDate();
+			String applicableSupplement = projectLawsInventoryEO.getApplicableSupplement();
+
+			//文件
+			String designDeliverableTemplate = projectLawsInventoryEO.getDesignDeliverableTemplate();
+			String prehomoDeliverableTemplate = projectLawsInventoryEO.getPrehomoDeliverableTemplate();
+			String verifyDeliverableTemplate = projectLawsInventoryEO.getVerifyDeliverableTemplate();
+			//标题
+			String title = projectLawsInventoryEO.getTitle();
+			//清单确认状态
+			String inventoryAffirmStatus = projectLawsInventoryEO.getInventoryAffirmStatus();
+			//任务确认状态
+			String taskAffirmStatus = projectLawsInventoryEO.getTaskAffirmStatus();
+			//适用地区
+			String region = projectLawsInventoryEO.getRegion();
+			//对应标准
+			String correspondingStandard = projectLawsInventoryEO.getCorrespondingStandard();
+			//新车型实施日期
+			Date xin1Che1Xing2Shi2Shi1Ri4Qi1 = projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1();
+			//在产出实施日期
+			Date implementTime = projectLawsInventoryEO.getImplementTime();
+
+			//清单确认状态,任务确认状态默认为未发起
+//			//清单确认状态数据转换
+//			if(StringUtils.isNotBlank(inventoryAffirmStatus)){
+//				String textByName = InventoryAffirmStatusEnum.getTextByName(inventoryAffirmStatus);
+//				projectLawsInventoryEO.setInventoryAffirmStatus(textByName);
+//			}
+//			//任务确认状态数据转换
+//			if(StringUtils.isNotBlank(taskAffirmStatus)){
+//				String textByName = TaskAffirmStatusEnum.getTextByName(taskAffirmStatus);
+//				projectLawsInventoryEO.setTaskAffirmStatus(textByName);
+//			}
+			//适用地区数据转换
+			if (StringUtils.isNotBlank(region)) {
+				String regionTemp = pullMore(dictItemList, projectLawsInventoryEO, errorMsg, region, msgList, "适用地区", "Region", "region");
+				projectLawsInventoryEO.setRegion(regionTemp);
+			}
+			//新车型实施日期验证
+			flag = dateVerify(projectLawsInventoryEO, errorMsg, xin1Che1Xing2Shi2Shi1Ri4Qi1, msgList, "新车型实施日", "New Type Execution Date");
+			//在产车实施日期验证
+			flag = dateVerify(projectLawsInventoryEO, errorMsg, implementTime, msgList, "在产车实施日期", "New Vehicle Execution Date");
+
+
+			//编号(输入框必填)
+			flag = must(projectLawsInventoryEO, errorMsg, msgList, serialNumber, "编号", "Number");
+
+			//子标题
+			if (StringUtils.isNotBlank(subtitle)) {
+				if (subtitle.length() > 300) {
+					String message = "";
+					if (CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())) {
+						message = errorMsg + "子标题不能超过300个字符, ";
+					} else {
+						message = errorMsg + " Subheadings cannot be checked more than 300 characters, ";
+					}
+					msgList.add(message);
+				}
+			}
+			//WVTA ID
+			if (StringUtils.isNotBlank(wvtaId)) {
+				if (wvtaId.length() > 100) {
+					String message = "";
+					if (CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())) {
+						message = errorMsg + "WVTA ID不能超过100个字符, ";
+					} else {
+						message = errorMsg + " The WVTA ID cannot contain more than 100 characters, ";
+					}
+					msgList.add(message);
+				}
+			}
+			//备注 remark
+			if (StringUtils.isNotBlank(remark)) {
+				if (remark.length() > 1000) {
+					String message = "";
+					if (CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())) {
+						message = errorMsg + "备注不能超过1000个字符, ";
+					} else {
+						message = errorMsg + " Note The value cannot exceed 1000 characters, ";
+					}
+					msgList.add(message);
+				}
+			}
+
+			//实施类别(单选不必填)
+			value = pullSingle(dictItemList, projectLawsInventoryEO, errorMsg, implementType, msgList, "实施类别", "Usage", "implement_type");
+			if (StringUtils.isNotBlank(value)) {
+				projectLawsInventoryEO.setImplementType(value);
+			}
+			//认证类型(多选不必填)
+			value = pullMore(dictItemList, projectLawsInventoryEO, errorMsg, attestationType, msgList, "认证类型", "Certification Type", "attestation_type");
+			if (StringUtils.isNotBlank(value)) {
+				projectLawsInventoryEO.setAttestationType(value);
+			}
+
+			//认证级别(多选必填)
+//			flag = must(projectLawsInventoryEO, errorMsg, msgList, attestationRank,"认证级别","Certification Level");
+			if (StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationRank())) {
+				value = pullMore(dictItemList, projectLawsInventoryEO, errorMsg, attestationRank, msgList, "认证级别", "Certification Level", "attestation_rank");
+				if (StringUtils.isNotBlank(value)) {
+					projectLawsInventoryEO.setAttestationRank(value);
+				}
+			}
+
+			//责任领域(多选必填)
+//			flag = must(projectLawsInventoryEO, errorMsg, msgList, dutyTerritory,"责任领域","Responsible Field");
+			if (StringUtils.isNotBlank(projectLawsInventoryEO.getDutyTerritory())) {
+				value = pullMore(dictItemList, projectLawsInventoryEO, errorMsg, dutyTerritory, msgList, "责任领域", "Responsible Field", "duty_territory");
+				if (StringUtils.isNotBlank(value)) {
+					projectLawsInventoryEO.setDutyTerritory(value);
+				}
+			}
+			//工程接口人(责任领域下的工程接口人)
+			Map<String, Object> objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value);
+
+			//法规工程师
+			List<Map<String, String>> mapLawList = (List<Map<String, String>>) objectMap.get("lawEngineerList");
+			//认证工程师
+			List<Map<String, String>> mapCertificationList = (List<Map<String, String>>) objectMap.get("certificationEngineerList");
+			//工程接口人
+			List<Map<String, String>> mapPersonList = (List<Map<String, String>>) objectMap.get("engineeringInterfacePersonList");
+			//所有人
+			List<Map<String, String>> allPersonList = (List<Map<String, String>>) objectMap.get("allPersonList");
+
+			String nameCn = "";
+			String nameEn = "";
+			//法规工程师
+			if (StringUtils.isNotBlank(regulationOwnerId)) {
+				nameCn = "法规工程师";
+				nameEn = "regulatory engineer";
+				//验证人员是否存在
+				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, regulationOwnerId, mapLawList, nameCn, nameEn, ProjectRoleEnum.REGULATI_ENGINEER.getValue());
+			}
+
+			//认证工程师
+			if (StringUtils.isNotBlank(homologationEngineerId)) {
+				nameCn = "认证工程师";
+				nameEn = "certification engineer ";
+				//验证人员是否存在
+				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, homologationEngineerId, mapCertificationList, nameCn, nameEn, ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue());
+			}
+
+			//工程接口人
+			if (StringUtils.isNotBlank(engineeringInterfacePerson)) {
+				nameCn = "工程接口人";
+				nameEn = "Engineering Interface ";
+				//验证人员是否存在
+				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, engineeringInterfacePerson, mapPersonList, nameCn, nameEn, ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue());
+			}
+
+
+			//设计
+			//交付物类型
+			value = tree(categoryList, treeNameList, projectLawsInventoryEO, errorMsg, designDeliverableType, msgList, "交付物类型", "Deliverable Type", "deliverable_template");
+			if (StringUtils.isNotBlank(value)) {
+				String treeId = getTreeId(categoryList, projectLawsInventoryEOTemp, treeNameList, value);
+				projectLawsInventoryEO.setDesignDeliverableType(treeId);
+			}
+
+			//交付物模板
+			value = templateTransition(zipEntryName, projectLawsInventoryEO, errorMsg, designDeliverableTemplate, msgList, "交付物模板", "Deliverable Template", dataSource);
+			if (StringUtils.isNotBlank(value)) {
+				projectLawsInventoryEO.setDesignDeliverableTemplate(value);
+			}
+
+			//发起人
+			if (StringUtils.isNotBlank(designInitiator)) {
+				nameCn = "设计符合性确认发起人";
+				nameEn = "confirm design conformance initiator ";
+				//验证人员是否存在
+				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, designInitiator, allPersonList, nameCn, nameEn, ProjectRoleEnum.DESIGNINITIATOR.getValue());
+			}
+
+			//责任人
+			if (StringUtils.isNotBlank(designDuty)) {
+				nameCn = "设计符合性确认责任人";
+				nameEn = "confirm design conformance responsible";
+				//验证人员是否存在
+				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, designDuty, allPersonList, nameCn, nameEn, ProjectRoleEnum.DESIGNDUTY.getValue());
+			}
+
+			//截止时间
+			flag = dateVerify(projectLawsInventoryEO, errorMsg, designDueDate, msgList, "截止时间", "due date");
+			if (flag) {
+				projectLawsInventoryEO.setDesignDueDate(designDueDate);
+			}
+
+
+			//pre
+			//交付物类型
+			value = tree(categoryList, treeNameList, projectLawsInventoryEO, errorMsg, prehomoDeliverableType, msgList, "交付物类型", "Deliverable Type", "deliverable_template");
+			if (StringUtils.isNotBlank(value)) {
+				String treeId = getTreeId(categoryList, projectLawsInventoryEOTemp, treeNameList, value);
+				projectLawsInventoryEO.setPrehomoDeliverableType(treeId);
+			}
+
+			//交付物模板
+			value = templateTransition(zipEntryName, projectLawsInventoryEO, errorMsg, prehomoDeliverableTemplate, msgList, "交付物模板", "Deliverable Template", dataSource);
+			if (StringUtils.isNotBlank(value)) {
+				projectLawsInventoryEO.setPrehomoDeliverableTemplate(value);
+			}
+
+			//发起人
+			if (StringUtils.isNotBlank(prehomoInitiator)) {
+				nameCn = "Pre-homo确认发起人";
+				nameEn = "Pre-homo identifies the initiator ";
+				//验证人员是否存在
+				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, prehomoInitiator, allPersonList, nameCn, nameEn, ProjectRoleEnum.PREHOMOINITIATOR.getValue());
+			}
+
+			//责任人
+			if (StringUtils.isNotBlank(prehomoDuty)) {
+				nameCn = "Pre-homo确认责任人";
+				nameEn = "Pre-homo identifies the person responsible ";
+				//验证人员是否存在
+				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, prehomoDuty, allPersonList, nameCn, nameEn, ProjectRoleEnum.PREHOMODUTY.getValue());
+			}
+
+			//截止时间
+			flag = dateVerify(projectLawsInventoryEO, errorMsg, prehomoDueDate, msgList, "截止时间", "due date");
+			if (flag) {
+				projectLawsInventoryEO.setPrehomoDueDate(prehomoDueDate);
+			}
+
+			//确认
+			//交付物类型
+			value = tree(categoryList, treeNameList, projectLawsInventoryEO, errorMsg, verifyDeliverableType, msgList, "交付物类型", "Deliverable Type", "deliverable_template");
+			if (StringUtils.isNotBlank(value)) {
+				String treeId = getTreeId(categoryList, projectLawsInventoryEOTemp, treeNameList, value);
+				projectLawsInventoryEO.setVerifyDeliverableType(treeId);
+			}
+
+			//交付物模板
+			value = templateTransition(zipEntryName, projectLawsInventoryEO, errorMsg, verifyDeliverableTemplate, msgList, "交付物模板", "Deliverable Template", dataSource);
+			if (StringUtils.isNotBlank(value)) {
+				projectLawsInventoryEO.setVerifyDeliverableTemplate(value);
+			}
+
+
+			//发起人
+			if (StringUtils.isNotBlank(verifyInitiator)) {
+				nameCn = "验证符合性确认发起人";
+				nameEn = "verify conformance validates the originator ";
+				//验证人员是否存在
+				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, verifyInitiator, allPersonList, nameCn, nameEn, ProjectRoleEnum.VERIFYINITIATOR.getValue());
+			}
+
+			//责任人
+			if (StringUtils.isNotBlank(verifyDuty)) {
+				nameCn = "验证符合性确认责任人";
+				nameEn = "verify conformance to confirm the responsible person ";
+				//验证人员是否存在
+				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, verifyDuty, allPersonList, nameCn, nameEn, ProjectRoleEnum.VERIFYDUTY.getValue());
+			}
+
+
+			//截止时间
+			flag = dateVerify(projectLawsInventoryEO, errorMsg, verifyDueDate, msgList, "截止时间", "due date");
+			if (flag) {
+				projectLawsInventoryEO.setVerifyDueDate(verifyDueDate);
+			}
+		}
+		return msgList;
+	}
+
+	/**
+	 * 模板数据验证
+	 *
+	 * @param dataList
+	 * @param dictItemList
+	 * @param zipEntryName
+	 * @param projectLawsInventoryEOTemp
+	 * @param categoryList
+	 * @param dataSource
+	 * @return
+	 */
+	@NotNull
+	private List<String> dataTemplateVerify(List<ProjectLawsInventoryEO> dataList,
+											List<SysDictItem> dictItemList,
+											String zipEntryName,
+											ProjectLawsInventoryEO projectLawsInventoryEOTemp,
+											List<SysCategory> categoryList,
+											String dataSource) {
+		String dictId = sysCategoryMapper.getDictId("deliverable_template");
+		List<SysCategory> collect = categoryList.stream().filter(e -> e.getSysDictId().equals(dictId)).collect(Collectors.toList());
+		List<String> treeNameList = new ArrayList<>();
+		if (CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())) {
+			treeNameList = collect.stream().map(SysCategory::getName).collect(Collectors.toList());
+		} else {
+			treeNameList = collect.stream().map(SysCategory::getEnName).collect(Collectors.toList());
+		}
+		int i = 3;
+		List<String> msgList = new ArrayList<>();
+		String value = "";
+		boolean flag = true;
+
+		// List<SysDictItem> dutyTerritoryDictItemList = this.sysDictItemService.selectItemsByDictCode(DicCodeEnum.DUTY_TERRITORY.getCode());
+
+		List<String> userNameList = new ArrayList<>();
+		String designDutyIds = dataList.stream().map(ProjectLawsInventoryEO::getDesignDutyId).collect(Collectors.joining(","));
+		String verifyDutyIds = dataList.stream().map(ProjectLawsInventoryEO::getVerifyDutyId).collect(Collectors.joining(","));
+		userNameList.addAll(Arrays.asList(designDutyIds.split(",")));
+		userNameList.addAll(Arrays.asList(verifyDutyIds.split(",")));
+		List<SysUser> sysUserList = this.sysUserService.querySysUserByUserNameList(userNameList);
+
+		//编号验证
+		verifySerialNumber(dataList, projectLawsInventoryEOTemp, dataSource);
+		for (ProjectLawsInventoryEO projectLawsInventoryEO : dataList) {
+			i++;
+			String errorMsg = "";
+			if (CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())) {
+				errorMsg = "第" + i + "行：";
+			} else {
+				errorMsg = i + " line：";
+			}
+			//编号
+			String serialNumber = projectLawsInventoryEO.getSerialNumber();
+			//子标题subtitle
+			String subtitle = projectLawsInventoryEO.getSubtitle();
+			//WVTA ID
+			String wvtaId = projectLawsInventoryEO.getWvtaId();
+			//备注 remark
+			String remark = projectLawsInventoryEO.getRemark();
+			//认证级别
+			String attestationRank = projectLawsInventoryEO.getAttestationRank();
+			//责任领域
+			String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
+			//认证类型
+			String attestationType = projectLawsInventoryEO.getAttestationType();
+			//实施类别
+			String implementType = projectLawsInventoryEO.getImplementType();
+			//法规工程师regulationOwnerId
+			String regulationOwnerId = projectLawsInventoryEO.getRegulationOwnerId();
+
+			//认证工程师homologationEngineerId
+			String homologationEngineerId = projectLawsInventoryEO.getHomologationEngineerId();
+
+			//工程接口人engineeringInterfacePerson
+			String engineeringInterfacePerson = projectLawsInventoryEO.getEngineeringInterfacePerson();
+
+			//设计交付物类型
+			String designDeliverableType = projectLawsInventoryEO.getDesignDeliverableType();
+			//设计发起人
+			String designInitiator = projectLawsInventoryEO.getDesignInitiatorId();
+			//设计责任人
+			String designDuty = projectLawsInventoryEO.getDesignDutyId();
+			//设计截止时间designDueDate
+			Date designDueDate = projectLawsInventoryEO.getDesignDueDate();
+
+			//pre交付物类型
+			String prehomoDeliverableType = projectLawsInventoryEO.getPrehomoDeliverableType();
+			//pre发起人
+			String prehomoInitiator = projectLawsInventoryEO.getPrehomoInitiatorId();
+			//pre责任人
+			String prehomoDuty = projectLawsInventoryEO.getPrehomoDutyId();
+			//pre截止时间prehomoDueDate
+			Date prehomoDueDate = projectLawsInventoryEO.getPrehomoDueDate();
+
+			//确认交付物类型
+			String verifyDeliverableType = projectLawsInventoryEO.getVerifyDeliverableType();
+			//确认发起人
+			String verifyInitiator = projectLawsInventoryEO.getVerifyInitiatorId();
+			//确认责任人
+			String verifyDuty = projectLawsInventoryEO.getVerifyDutyId();
+			//确认截止时间verifyDueDate
+			Date verifyDueDate = projectLawsInventoryEO.getVerifyDueDate();
+
+			//文件
+			String designDeliverableTemplate = projectLawsInventoryEO.getDesignDeliverableTemplate();
+			String prehomoDeliverableTemplate = projectLawsInventoryEO.getPrehomoDeliverableTemplate();
+			String verifyDeliverableTemplate = projectLawsInventoryEO.getVerifyDeliverableTemplate();
+
+			//编号(输入框必填)
+			flag = must(projectLawsInventoryEO, errorMsg, msgList, serialNumber, "编号", "Number");
+
+			//子标题
+			if (StringUtils.isNotBlank(subtitle)) {
+				if (subtitle.length() > 300) {
+					String message = "";
+					if (CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())) {
+						message = errorMsg + "子标题不能超过300个字符, ";
+					} else {
+						message = errorMsg + " Subheadings cannot be checked more than 300 characters, ";
+					}
+					msgList.add(message);
+				}
+			}
+			//WVTA ID
+			if (StringUtils.isNotBlank(wvtaId)) {
+				if (wvtaId.length() > 100) {
+					String message = "";
+					if (CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())) {
+						message = errorMsg + "WVTA ID不能超过100个字符, ";
+					} else {
+						message = errorMsg + " The WVTA ID cannot contain more than 100 characters, ";
+					}
+					msgList.add(message);
+				}
+			}
+			//备注 remark
+			if (StringUtils.isNotBlank(remark)) {
+				if (remark.length() > 1000) {
+					String message = "";
+					if (CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())) {
+						message = errorMsg + "备注不能超过1000个字符, ";
+					} else {
+						message = errorMsg + " Note The value cannot exceed 1000 characters, ";
+					}
+					msgList.add(message);
+				}
+			}
+
+			//实施类别(单选不必填)
+			value = pullSingle(dictItemList, projectLawsInventoryEO, errorMsg, implementType, msgList, "实施类别", "Usage", "implement_type");
+			if (StringUtils.isNotBlank(value)) {
+				projectLawsInventoryEO.setImplementType(value);
+			}
+			//认证类型(单选不必填)
+			value = pullMore(dictItemList, projectLawsInventoryEO, errorMsg, attestationType, msgList, "认证类型", "Certification Type", "attestation_type");
+			if (StringUtils.isNotBlank(value)) {
+				projectLawsInventoryEO.setAttestationType(value);
+			}
+
+			//认证级别(多选必填)
+			flag = must(projectLawsInventoryEO, errorMsg, msgList, attestationRank, "认证级别", "Certification Level");
+			if (flag) {
+				value = pullMore(dictItemList, projectLawsInventoryEO, errorMsg, attestationRank, msgList, "认证级别", "Certification Level", "attestation_rank");
+				if (StringUtils.isNotBlank(value)) {
+					projectLawsInventoryEO.setAttestationRank(value);
+				}
+			}
+
+			String nameCn = "";
+			String nameEn = "";
+
+			//责任领域(多选必填)
+			flag = must(projectLawsInventoryEO, errorMsg, msgList, dutyTerritory, "责任领域", "Responsible Field");
+			if (flag) {
+				value = pullMore(dictItemList, projectLawsInventoryEO, errorMsg, dutyTerritory, msgList, "责任领域", "Responsible Field", DicCodeEnum.DUTY_TERRITORY.getCode());
+				if (StringUtils.isNotBlank(value)) {
+					//工程接口人(责任领域下的工程接口人)
+					Map<String, Object> objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value);
+
+					//法规工程师
+					List<Map<String, String>> mapLawList = (List<Map<String, String>>) objectMap.get("lawEngineerList");
+					//认证工程师
+					List<Map<String, String>> mapCertificationList = (List<Map<String, String>>) objectMap.get("certificationEngineerList");
+					//工程接口人
+					List<Map<String, String>> mapPersonList = (List<Map<String, String>>) objectMap.get("engineeringInterfacePersonList");
+					//所有人
+					List<Map<String, String>> allPersonList = (List<Map<String, String>>) objectMap.get("allPersonList");
+
+					projectLawsInventoryEO.setDutyTerritory(value);
+
+					// 如果责任领域存在，再匹配这些人员
+					//法规工程师
+					if (StringUtils.isNotBlank(regulationOwnerId)) {
+						nameCn = "法规工程师";
+						nameEn = "regulatory engineer";
+						//验证人员是否存在
+						personnelVerify(projectLawsInventoryEO, errorMsg, msgList, regulationOwnerId, mapLawList, nameCn, nameEn, ProjectRoleEnum.REGULATI_ENGINEER.getValue());
+					}
+
+					//认证工程师
+					if (StringUtils.isNotBlank(homologationEngineerId)) {
+						nameCn = "认证工程师";
+						nameEn = "certification engineer ";
+						//验证人员是否存在
+						personnelVerify(projectLawsInventoryEO, errorMsg, msgList, homologationEngineerId, mapCertificationList, nameCn, nameEn, ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue());
+					}
+
+					//工程接口人
+					if (StringUtils.isNotBlank(engineeringInterfacePerson)) {
+						nameCn = "工程接口人";
+						nameEn = "Engineering Interface ";
+						//验证人员是否存在
+						personnelVerify(projectLawsInventoryEO, errorMsg, msgList, engineeringInterfacePerson, mapPersonList, nameCn, nameEn, ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue());
+					}
+				}
+			}
+
+			//设计
+			//交付物类型
+			value = tree(categoryList, treeNameList, projectLawsInventoryEO, errorMsg, designDeliverableType, msgList, "交付物类型", "Deliverable Type", "deliverable_template");
+			if (StringUtils.isNotBlank(value)) {
+				String treeId = getTreeId(categoryList, projectLawsInventoryEOTemp, treeNameList, value);
+				projectLawsInventoryEO.setDesignDeliverableType(treeId);
+			}
+
+			//交付物模板
+			value = templateTransition(zipEntryName, projectLawsInventoryEO, errorMsg, designDeliverableTemplate, msgList, "交付物模板", "Deliverable Template", dataSource);
+			if (StringUtils.isNotBlank(value)) {
+				projectLawsInventoryEO.setDesignDeliverableTemplate(value);
+			}
+
+			//发起人
+			/*if(StringUtils.isNotBlank(designInitiator)){
+				nameCn = "设计符合性确认发起人";
+				nameEn = "confirm design conformance initiator ";
+				//验证人员是否存在
+				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, designInitiator, allPersonList,nameCn,nameEn,ProjectRoleEnum.DESIGNINITIATOR.getValue());
+			}*/
+
+			//责任人
+			if (StringUtils.isNotBlank(designDuty)) {
+				nameCn = "设计符合性确认责任人";
+				nameEn = "confirm design conformance responsible";
+				//验证人员是否存在
+				sysUserVerify(projectLawsInventoryEO, errorMsg, msgList, designDuty, sysUserList, nameCn, nameEn, ProjectRoleEnum.DESIGNDUTY.getValue());
+			}
+
+			//截止时间
+			flag = dateVerify(projectLawsInventoryEO, errorMsg, designDueDate, msgList, "截止时间", "due date");
+			if (flag) {
+				projectLawsInventoryEO.setDesignDueDate(designDueDate);
+			}
+
+
+			//pre
+			//交付物类型
+			value = tree(categoryList, treeNameList, projectLawsInventoryEO, errorMsg, prehomoDeliverableType, msgList, "交付物类型", "Deliverable Type", "deliverable_template");
+			if (StringUtils.isNotBlank(value)) {
+				String treeId = getTreeId(categoryList, projectLawsInventoryEOTemp, treeNameList, value);
+				projectLawsInventoryEO.setPrehomoDeliverableType(treeId);
+			}
+
+			//交付物模板
+			value = templateTransition(zipEntryName, projectLawsInventoryEO, errorMsg, prehomoDeliverableTemplate, msgList, "交付物模板", "Deliverable Template", dataSource);
+			if (StringUtils.isNotBlank(value)) {
+				projectLawsInventoryEO.setPrehomoDeliverableTemplate(value);
+			}
+
+			//发起人
+			/*if(StringUtils.isNotBlank(prehomoInitiator)){
+				nameCn = "Pre-homo确认发起人";
+				nameEn = "Pre-homo identifies the initiator ";
+				//验证人员是否存在
+				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, prehomoInitiator, allPersonList,nameCn,nameEn,ProjectRoleEnum.PREHOMOINITIATOR.getValue());
+			}
+
+			//责任人
+			if(StringUtils.isNotBlank(prehomoDuty)){
+				nameCn = "Pre-homo确认责任人";
+				nameEn = "Pre-homo identifies the person responsible ";
+				//验证人员是否存在
+				personnelVerify(projectLawsInventoryEO, errorMsg, msgList,prehomoDuty, allPersonList,nameCn,nameEn,ProjectRoleEnum.PREHOMODUTY.getValue());
+			}*/
+
+			//截止时间
+			flag = dateVerify(projectLawsInventoryEO, errorMsg, prehomoDueDate, msgList, "截止时间", "due date");
+			if (flag) {
+				projectLawsInventoryEO.setPrehomoDueDate(prehomoDueDate);
+			}
+
+			//确认
+			//交付物类型
+			value = tree(categoryList, treeNameList, projectLawsInventoryEO, errorMsg, verifyDeliverableType, msgList, "交付物类型", "Deliverable Type", "deliverable_template");
+			if (StringUtils.isNotBlank(value)) {
+				String treeId = getTreeId(categoryList, projectLawsInventoryEOTemp, treeNameList, value);
+				projectLawsInventoryEO.setVerifyDeliverableType(treeId);
+			}
+
+			//交付物模板
+			value = templateTransition(zipEntryName, projectLawsInventoryEO, errorMsg, verifyDeliverableTemplate, msgList, "交付物模板", "Deliverable Template", dataSource);
+			if (StringUtils.isNotBlank(value)) {
+				projectLawsInventoryEO.setVerifyDeliverableTemplate(value);
+			}
+
+
+			//发起人
+			/*if(StringUtils.isNotBlank(verifyInitiator)){
+				nameCn = "验证符合性确认发起人";
+				nameEn = "verify conformance validates the originator ";
+				//验证人员是否存在
+				personnelVerify(projectLawsInventoryEO, errorMsg, msgList,verifyInitiator, allPersonList,nameCn,nameEn,ProjectRoleEnum.VERIFYINITIATOR.getValue());
+			}*/
+
+			//责任人
+			if (StringUtils.isNotBlank(verifyDuty)) {
+				nameCn = "验证符合性确认责任人";
+				nameEn = "verify conformance to confirm the responsible person ";
+				//验证人员是否存在
+				sysUserVerify(projectLawsInventoryEO, errorMsg, msgList, verifyDuty, sysUserList, nameCn, nameEn, ProjectRoleEnum.VERIFYDUTY.getValue());
+			}
+
+
+			//截止时间
+			flag = dateVerify(projectLawsInventoryEO, errorMsg, verifyDueDate, msgList, "截止时间", "due date");
+			if (flag) {
+				projectLawsInventoryEO.setVerifyDueDate(verifyDueDate);
+			}
+		}
+		return msgList;
+	}
+//	private void importDatas(List<ProjectLawsInventoryEO> dataList,
+//							 List<SysDictItem> dictItemList,
+//							 String zipEntryName,
+//							 File saveDirectory,
+//							 ProjectLawsInventoryEO projectLawsInventoryEOTemp,
+//							 List<SysCategory> categoryList,
+//							 String dataSource) {
+//		String dictId = sysCategoryMapper.getDictId("deliverable_template");
+//		List<SysCategory> collect = categoryList.stream().filter(e -> e.getSysDictId().equals(dictId)).collect(Collectors.toList());
+//		List<String> treeNameList = new ArrayList<>();
+//		if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){
+//			treeNameList = collect.stream().map(SysCategory::getName).collect(Collectors.toList());
+//		}else{
+//			treeNameList = collect.stream().map(SysCategory::getEnName).collect(Collectors.toList());
+//		}
+//		int i = 3;
+//		List<String> msgList = new ArrayList<>();
+//		String value = "";
+//		boolean flag = true;
+//
+//		//编号验证
+//		verifySerialNumber(dataList,projectLawsInventoryEOTemp,dataSource);
+//		for (ProjectLawsInventoryEO projectLawsInventoryEO : dataList) {
+//			i++;
+//			String errorMsg = "";
+//			if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){
+//				errorMsg = "第" + i + "行：";
+//			}else{
+//				errorMsg = i + " line：";
+//			}
+//			//编号
+//			String serialNumber = projectLawsInventoryEO.getSerialNumber();
+//			//子标题subtitle
+//			String subtitle = projectLawsInventoryEO.getSubtitle();
+//			//WVTA ID
+//			String wvtaId = projectLawsInventoryEO.getWvtaId();
+//			//备注 remark
+//			String remark = projectLawsInventoryEO.getRemark();
+//			//认证级别
+//			String attestationRank = projectLawsInventoryEO.getAttestationRank();
+//			//责任领域
+//			String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
+//			//认证类型
+//			String attestationType = projectLawsInventoryEO.getAttestationType();
+//			//实施类别
+//			String implementType = projectLawsInventoryEO.getImplementType();
+//			//法规工程师regulationOwnerId
+//			String regulationOwnerId = projectLawsInventoryEO.getRegulationOwnerId();
+//
+//			//认证工程师homologationEngineerId
+//			String homologationEngineerId = projectLawsInventoryEO.getHomologationEngineerId();
+//
+//			//工程接口人engineeringInterfacePerson
+//			String engineeringInterfacePerson = projectLawsInventoryEO.getEngineeringInterfacePerson();
+//
+//			//设计交付物类型
+//			String designDeliverableType = projectLawsInventoryEO.getDesignDeliverableType();
+//			//设计发起人
+//			String designInitiator = projectLawsInventoryEO.getDesignInitiatorId();
+//			//设计责任人
+//			String designDuty = projectLawsInventoryEO.getDesignDutyId();
+//			//设计截止时间designDueDate
+//			Date designDueDate = projectLawsInventoryEO.getDesignDueDate();
+//
+//			//pre交付物类型
+//			String prehomoDeliverableType = projectLawsInventoryEO.getPrehomoDeliverableType();
+//			//pre发起人
+//			String prehomoInitiator = projectLawsInventoryEO.getPrehomoInitiatorId();
+//			//pre责任人
+//			String prehomoDuty = projectLawsInventoryEO.getPrehomoDutyId();
+//			//pre截止时间prehomoDueDate
+//			Date prehomoDueDate = projectLawsInventoryEO.getPrehomoDueDate();
+//
+//			//确认交付物类型
+//			String verifyDeliverableType = projectLawsInventoryEO.getVerifyDeliverableType();
+//			//确认发起人
+//			String verifyInitiator = projectLawsInventoryEO.getVerifyInitiatorId();
+//			//确认责任人
+//			String verifyDuty = projectLawsInventoryEO.getVerifyDutyId();
+//			//确认截止时间verifyDueDate
+//			Date verifyDueDate = projectLawsInventoryEO.getVerifyDueDate();
+//
+//			//文件
+//			String designDeliverableTemplate = projectLawsInventoryEO.getDesignDeliverableTemplate();
+//			String prehomoDeliverableTemplate = projectLawsInventoryEO.getPrehomoDeliverableTemplate();
+//			String verifyDeliverableTemplate = projectLawsInventoryEO.getVerifyDeliverableTemplate();
+//
+//			//编号(输入框必填)
+//			flag = must(projectLawsInventoryEO, errorMsg, msgList, serialNumber, "编号", "Number");
+//
+//			//子标题
+//			if(StringUtils.isNotBlank(subtitle)){
+//				if(subtitle.length() > 300){
+//					String message = "";
+//					if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){
+//						message = errorMsg + "子标题不能超过300个字符, ";
+//					}else{
+//						message = errorMsg + " Subheadings cannot be checked more than 300 characters, ";
+//					}
+//					msgList.add(message);
+//				}
+//			}
+//			//WVTA ID
+//			if(StringUtils.isNotBlank(wvtaId)){
+//				if(wvtaId.length() > 100){
+//					String message = "";
+//					if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){
+//						message = errorMsg + "WVTA ID不能超过100个字符, ";
+//					}else{
+//						message = errorMsg + " The WVTA ID cannot contain more than 100 characters, ";
+//					}
+//					msgList.add(message);
+//				}
+//			}
+//			//备注 remark
+//			if(StringUtils.isNotBlank(remark)){
+//				if(remark.length() > 1000){
+//					String message = "";
+//					if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){
+//						message = errorMsg + "备注不能超过1000个字符, ";
+//					}else{
+//						message = errorMsg + " Note The value cannot exceed 1000 characters, ";
+//					}
+//					msgList.add(message);
+//				}
+//			}
+//
+//			//实施类别(单选不必填)
+//			value = pullSingle(dictItemList, projectLawsInventoryEO, errorMsg, implementType,msgList,"实施类别","Usage","implement_type");
+//			if(StringUtils.isNotBlank(value)){
+//				projectLawsInventoryEO.setImplementType(value);
+//			}
+//			//认证类型(单选不必填)
+//			value = pullMore(dictItemList, projectLawsInventoryEO, errorMsg, attestationType,msgList,"认证类型","Certification Type","attestation_type");
+//			if(StringUtils.isNotBlank(value)){
+//				projectLawsInventoryEO.setAttestationType(value);
+//			}
+//
+//			//认证级别(多选必填)
+//			flag = must(projectLawsInventoryEO, errorMsg, msgList, attestationRank,"认证级别","Certification Level");
+//			if(flag){
+//				value = pullMore(dictItemList, projectLawsInventoryEO, errorMsg, attestationRank,msgList,"认证级别","Certification Level","attestation_rank");
+//				if(StringUtils.isNotBlank(value)){
+//					projectLawsInventoryEO.setAttestationRank(value);
+//				}
+//			}
+//
+//			//责任领域(多选必填)
+//			flag = must(projectLawsInventoryEO, errorMsg, msgList, dutyTerritory,"责任领域","Responsible Field");
+//			if(flag){
+//				value = pullMore(dictItemList, projectLawsInventoryEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field","duty_territory");
+//				if(StringUtils.isNotBlank(value)){
+//					projectLawsInventoryEO.setDutyTerritory(value);
+//				}
+//			}
+//			//工程接口人(责任领域下的工程接口人)
+//			Map<String, Object> objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value);
+//
+//			//法规工程师
+//			List<Map<String, String>> mapLawList = (List<Map<String, String>>) objectMap.get("lawEngineerList");
+//			//认证工程师
+//			List<Map<String, String>> mapCertificationList = (List<Map<String, String>>) objectMap.get("certificationEngineerList");
+//			//工程接口人
+//			List<Map<String, String>> mapPersonList = (List<Map<String, String>>) objectMap.get("engineeringInterfacePersonList");
+//			//所有人
+//			List<Map<String, String>> allPersonList = (List<Map<String, String>>) objectMap.get("allPersonList");
+//
+//			String nameCn = "";
+//			String nameEn = "";
+//			//法规工程师
+//			if(StringUtils.isNotBlank(regulationOwnerId)){
+//				nameCn = "法规工程师";
+//				nameEn = "regulatory engineer";
+//				//验证人员是否存在
+//				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, regulationOwnerId, mapLawList,nameCn,nameEn,ProjectRoleEnum.REGULATI_ENGINEER.getValue());
+//			}
+//
+//			//认证工程师
+//			if(StringUtils.isNotBlank(homologationEngineerId)){
+//				nameCn = "认证工程师";
+//				nameEn = "certification engineer ";
+//				//验证人员是否存在
+//				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, homologationEngineerId, mapCertificationList,nameCn,nameEn,ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue());
+//			}
+//
+//			//工程接口人
+//			if(StringUtils.isNotBlank(engineeringInterfacePerson)){
+//				nameCn = "工程接口人";
+//				nameEn = "Engineering Interface ";
+//				//验证人员是否存在
+//				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, engineeringInterfacePerson, mapPersonList,nameCn,nameEn,ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue());
+//			}
+//
+//
+//			//设计
+//			//交付物类型
+//			value = tree(categoryList,treeNameList, projectLawsInventoryEO, errorMsg, designDeliverableType,msgList,"交付物类型","Deliverable Type","deliverable_template");
+//			if(StringUtils.isNotBlank(value)){
+//				String treeId = getTreeId(categoryList, projectLawsInventoryEOTemp, treeNameList, value);
+//				projectLawsInventoryEO.setDesignDeliverableType(treeId);
+//			}
+//
+//			//交付物模板
+//			value = templateTransition(zipEntryName, projectLawsInventoryEO, errorMsg, designDeliverableTemplate,msgList,"交付物模板","Deliverable Template",dataSource);
+//			if(StringUtils.isNotBlank(value)){
+//				projectLawsInventoryEO.setDesignDeliverableTemplate(value);
+//			}
+//
+//			//发起人
+//			if(StringUtils.isNotBlank(designInitiator)){
+//				nameCn = "设计符合性确认发起人";
+//				nameEn = "confirm design conformance initiator ";
+//				//验证人员是否存在
+//				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, designInitiator, allPersonList,nameCn,nameEn,ProjectRoleEnum.DESIGNINITIATOR.getValue());
+//			}
+//
+//			//责任人
+//			if(StringUtils.isNotBlank(designDuty)){
+//				nameCn = "设计符合性确认责任人";
+//				nameEn = "confirm design conformance responsible";
+//				//验证人员是否存在
+//				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, designDuty, allPersonList,nameCn,nameEn,ProjectRoleEnum.DESIGNDUTY.getValue());
+//			}
+//
+//			//截止时间
+//			flag = dateVerify(projectLawsInventoryEO, errorMsg, designDueDate,msgList,"在产车实施日期","on the production vehicle implementation date");
+//			if(flag){
+//				projectLawsInventoryEO.setImplementTime(designDueDate);
+//			}
+//
+//
+//			//pre
+//			//交付物类型
+//			value = tree(categoryList, treeNameList,projectLawsInventoryEO, errorMsg, prehomoDeliverableType,msgList,"交付物类型","Deliverable Type","deliverable_template");
+//			if(StringUtils.isNotBlank(value)){
+//				String treeId = getTreeId(categoryList, projectLawsInventoryEOTemp, treeNameList, value);
+//				projectLawsInventoryEO.setPrehomoDeliverableType(treeId);
+//			}
+//
+//			//交付物模板
+//			value = templateTransition(zipEntryName, projectLawsInventoryEO, errorMsg, prehomoDeliverableTemplate,msgList,"交付物模板","Deliverable Template",dataSource);
+//			if(StringUtils.isNotBlank(value)){
+//				projectLawsInventoryEO.setPrehomoDeliverableTemplate(value);
+//			}
+//
+//			//发起人
+//			if(StringUtils.isNotBlank(prehomoInitiator)){
+//				nameCn = "Pre-homo确认发起人";
+//				nameEn = "Pre-homo identifies the initiator ";
+//				//验证人员是否存在
+//				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, prehomoInitiator, allPersonList,nameCn,nameEn,ProjectRoleEnum.PREHOMOINITIATOR.getValue());
+//			}
+//
+//			//责任人
+//			if(StringUtils.isNotBlank(prehomoDuty)){
+//				nameCn = "Pre-homo确认责任人";
+//				nameEn = "Pre-homo identifies the person responsible ";
+//				//验证人员是否存在
+//				personnelVerify(projectLawsInventoryEO, errorMsg, msgList,prehomoDuty, allPersonList,nameCn,nameEn,ProjectRoleEnum.PREHOMODUTY.getValue());
+//			}
+//
+//			//截止时间
+//			flag = dateVerify(projectLawsInventoryEO, errorMsg, prehomoDueDate,msgList,"在产车实施日期","on the production vehicle implementation date");
+//			if(flag){
+//				projectLawsInventoryEO.setPrehomoDueDate(prehomoDueDate);
+//			}
+//
+//			//确认
+//			//交付物类型
+//			value = tree(categoryList,treeNameList,projectLawsInventoryEO, errorMsg, verifyDeliverableType,msgList,"交付物类型","Deliverable Type","deliverable_template");
+//			if(StringUtils.isNotBlank(value)){
+//				String treeId = getTreeId(categoryList, projectLawsInventoryEOTemp, treeNameList, value);
+//				projectLawsInventoryEO.setVerifyDeliverableType(treeId);
+//			}
+//
+//			//交付物模板
+//			value = templateTransition(zipEntryName, projectLawsInventoryEO, errorMsg, verifyDeliverableTemplate,msgList,"交付物模板","Deliverable Template",dataSource);
+//			if(StringUtils.isNotBlank(value)){
+//				projectLawsInventoryEO.setVerifyDeliverableTemplate(value);
+//			}
+//
+//
+//			//发起人
+//			if(StringUtils.isNotBlank(verifyInitiator)){
+//				nameCn = "验证符合性确认发起人";
+//				nameEn = "verify conformance validates the originator ";
+//				//验证人员是否存在
+//				personnelVerify(projectLawsInventoryEO, errorMsg, msgList,verifyInitiator, allPersonList,nameCn,nameEn,ProjectRoleEnum.VERIFYINITIATOR.getValue());
+//			}
+//
+//			//责任人
+//			if(StringUtils.isNotBlank(verifyDuty)){
+//				nameCn = "验证符合性确认责任人";
+//				nameEn = "verify conformance to confirm the responsible person ";
+//				//验证人员是否存在
+//				personnelVerify(projectLawsInventoryEO, errorMsg, msgList,verifyDuty, allPersonList,nameCn,nameEn,ProjectRoleEnum.VERIFYDUTY.getValue());
+//			}
+//
+//
+//			//截止时间
+//			flag = dateVerify(projectLawsInventoryEO, errorMsg, verifyDueDate,msgList,"在产车实施日期","on the production vehicle implementation date");
+//			if(flag){
+//				projectLawsInventoryEO.setVerifyDueDate(verifyDueDate);
+//			}
+//		}
+//
+//		if (msgList.size() > 0) {
+//			//返回报错信息
+//			String html = "";
+//			for (String s : msgList) {
+//				html += s + "</br>";
+//			}
+//			FileUnZip.deleteDir(saveDirectory);
+//			throw new JeroBootException(html);
+//		} else {
+//			if (dataList.size() != 0) {
+//				this.saveBatch(dataList);
+//				//项目任务清单数据初始化。
+//				List<ProjectTaskInventoryEO> projectTaskInventoryEOList = new ArrayList<>();
+//				for (ProjectLawsInventoryEO projectLawsInventoryEO : dataList) {
+//					ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
+//					String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
+//					projectTaskInventoryEO.setId(projectTaskInventoryId);
+//					projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventoryEO.getId());
+//					projectLawsInventoryEO.setStandId(projectLawsInventoryEO.getStandId());
+//					projectTaskInventoryEOList.add(projectTaskInventoryEO);
+//				}
+//				this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
+//				//初始化项目状态评估
+//				projectTaskInventoryEOList.forEach(taskInventory -> {
+//					this.initConditionAssessmentEO(taskInventory.getProjectLawsInventoryId());
+//				});
+//
+//				//更新log
+//				String serialNumber = dataList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(","));
+//				LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//				String username = sysUser.getUsername();
+//				String contentLog = username+"向清单中导入了“"+serialNumber+"”";
+//				String enContentLog = username+" imported “"+serialNumber+"” into the list.";
+//				projectLawsInventoryLogEOService.updateLog(contentLog, dataList.get(0).getProjectLibraryId(),CutEnum.CN.getValue());
+//				projectLawsInventoryLogEOService.updateLog(enContentLog, dataList.get(0).getProjectLibraryId(),CutEnum.EN.getValue());
+//			}
+//		}
+//	}
+
+	private String tree(List<SysCategory> categoryList, List<String> nameList, ProjectLawsInventoryEO projectLawsInventoryEO,
+						String errorMsg, String value, List<String> msgList,
+						String nameCn, String nameEn, String dictCode) {
+		if (StringUtils.isNotBlank(value)) {
+			StringBuilder sb = new StringBuilder();
+			for (String s : value.split(",")) {
+				if (!nameList.contains(s)) {
+					sb.append(s + ",");
+				}
+			}
+			if (StringUtils.isNotBlank(sb)) {
+				String substring = sb.substring(0, sb.length() - 1);
+				if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+					errorMsg += nameCn + "中的" + substring + "与数据字典不匹配, ";
+				} else {
+					errorMsg += nameEn + " " + substring + " does not match the data dictionary, ";
+				}
+				msgList.add(errorMsg);
+			} else {
+				StringBuilder sbTemp = new StringBuilder();
+				for (String s : value.split(",")) {
+					List<SysCategory> collect = new ArrayList<>();
+					if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+						collect = categoryList.stream().filter(e -> s.equals(e.getName())).collect(Collectors.toList());
+						if (collect.size() != 0) {
+							sbTemp.append(collect.get(0).getName() + ",");
+						}
+					} else {
+						collect = categoryList.stream().filter(e -> s.equals(e.getEnName())).collect(Collectors.toList());
+						if (collect.size() != 0) {
+							sbTemp.append(collect.get(0).getEnName() + ",");
+						}
+					}
+				}
+				if (StringUtils.isNotBlank(sbTemp)) {
+					String substring = sbTemp.substring(0, sbTemp.length() - 1);
+					return substring;
+				}
+			}
+		}
+		return null;
+	}
+
+	private String getTreeId(List<SysCategory> categoryList,
+							 ProjectLawsInventoryEO projectLawsInventoryEOTemp, List<String> treeNameList, String value) {
+		StringBuilder sb = new StringBuilder();
+		for (String valueTemp : value.split(",")) {
+			if (treeNameList.contains(valueTemp)) {
+				List<SysCategory> sysCategoryList = new ArrayList<>();
+				if (CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())) {
+					sysCategoryList = categoryList.stream().filter(e -> e.getName().equals(valueTemp)).collect(Collectors.toList());
+				} else {
+					sysCategoryList = categoryList.stream().filter(e -> e.getEnName().equals(valueTemp)).collect(Collectors.toList());
+				}
+				if (sysCategoryList.size() != 0) {
+					sb.append(sysCategoryList.get(0).getId() + ",");
+				}
+			}
+		}
+		if (StringUtils.isNotBlank(sb)) {
+			String substring = sb.substring(0, sb.length() - 1);
+			return substring;
+		}
+		return null;
+	}
+
+	private void verifySerialNumber(List<ProjectLawsInventoryEO> dataList,
+									ProjectLawsInventoryEO projectLawsInventoryEOTemp,
+									String dataSource) {
+		//1. 验证标准号在文档库中是否存在
+		List<String> serialNumberList = dataList.stream().map(ProjectLawsInventoryEO::getSerialNumber).collect(Collectors.toList());
+		LambdaQueryWrapper<BussDocumentLibraryEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.in(BussDocumentLibraryEO::getSerialNumber, serialNumberList);
+		List<BussDocumentLibraryEO> bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapper);
+		//文档库中可能存在重复的标准号
+		List<String> serialNumberListTemp = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).distinct().collect(Collectors.toList());
+		if (serialNumberList.size() != serialNumberListTemp.size()) {
+			//存在文档库没有的数据
+			List<String> collect = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList());
+			List<String> serialNumbers = serialNumberList.stream().filter(e -> !collect.contains(e)).collect(Collectors.toList());
+			if (serialNumbers.size() > 0) {
+				if (CutEnum.CN.getValue().equals(dataList.get(0).getCut())) {
+					throw new JeroBootException(StringUtils.join(serialNumbers, ",") + "文档库中不存在,不能添加");
+				} else {
+					throw new JeroBootException(StringUtils.join(serialNumbers, ",") + " does not exist in the document library and cannot be added");
+				}
+			}
+		}
+		//导入数据为列表导出的数据时,不需要一下验证
+		if (!DataSourceEnum.LIST_DATA.getValue().equals(dataSource)) {
+			//2. 验证标准号在法规清单中是否添加过
+			LambdaQueryWrapper<ProjectLawsInventoryEO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+			lambdaQueryWrapper.in(ProjectLawsInventoryEO::getSerialNumber, serialNumberList).in(ProjectLawsInventoryEO::getProjectLibraryId, projectLawsInventoryEOTemp.getProjectLibraryId());
+			List<ProjectLawsInventoryEO> projectLawsInventoryEOList = this.list(lambdaQueryWrapper);
+			List<String> serialNumberTempList = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).collect(Collectors.toList());
+			if (projectLawsInventoryEOList.size() > 0) {
+				if (CutEnum.CN.getValue().equals(dataList.get(0).getCut())) {
+					throw new JeroBootException(StringUtils.join(serialNumberTempList, ",") + "已存在,不能重复添加");
+				} else {
+					throw new JeroBootException(StringUtils.join(serialNumberTempList, ",") + " already exists and cannot be added again");
+				}
+			}
+			//3. 通过编号将导入的数据与文档库进行关联
+			for (ProjectLawsInventoryEO projectLawsInventoryEO : dataList) {
+				List<BussDocumentLibraryEO> collect = bussDocumentLibraryEOList.stream()
+						.filter(e -> e.getSerialNumber().equals(projectLawsInventoryEO.getSerialNumber())).collect(Collectors.toList());
+				projectLawsInventoryEO.setTitle(collect.get(0).getTitle());//标题
+				projectLawsInventoryEO.setCorrespondingStandard(collect.get(0).getCorrespondingStandard());//对应标准
+				projectLawsInventoryEO.setRegion(collect.get(0).getRegion());//适用地区
+				projectLawsInventoryEO.setImplementTime(collect.get(0).getImplementTime());//在产车实施日期
+				projectLawsInventoryEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1(collect.get(0).getXin1Che1Xing2Shi2Shi1Ri4Qi1());//新车实施日期
+				projectLawsInventoryEO.setStandId(collect.get(0).getId());
+			}
+		} else {
+			//导入列表数据处理standId(用于点击标准号跳转)
+			for (ProjectLawsInventoryEO projectLawsInventoryEO : dataList) {
+				List<BussDocumentLibraryEO> collect = bussDocumentLibraryEOList.stream()
+						.filter(e -> e.getSerialNumber().equals(projectLawsInventoryEO.getSerialNumber())).collect(Collectors.toList());
+				projectLawsInventoryEO.setStandId(collect.get(0).getId());
+			}
+		}
+	}
+
+	private void personnelVerify(ProjectLawsInventoryEO projectLawsInventoryEO,
+								 String errorMsg, List<String> msgList,
+								 String regulationOwnerId,
+								 List<Map<String, String>> mapList,
+								 String nameCn, String nameEn,
+								 String fieldNumber) {
+		//单选
+		if (regulationOwnerId.contains(",")) {
+			if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+				errorMsg += nameCn + "导入只能填写一个用户名, ";
+			} else {
+				errorMsg += "Only one user name can be entered for" + nameEn + "import, ";
+			}
+			msgList.add(errorMsg);
+		}
+
+		if (mapList.size() != 0) {
+			int count = 0;
+			for (Map<String, String> stringStringMap : mapList) {
+				String name = stringStringMap.get("name");
+				if (regulationOwnerId.equals(name)) {
+					count++;
+					if (ProjectRoleEnum.REGULATI_ENGINEER.getValue().equals(fieldNumber)) {
+						projectLawsInventoryEO.setRegulationOwnerId(stringStringMap.get("value"));
+					} else if (ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(fieldNumber)) {
+						projectLawsInventoryEO.setHomologationEngineerId(stringStringMap.get("value"));
+					} else if (ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(fieldNumber)) {
+						projectLawsInventoryEO.setEngineeringInterfacePerson(stringStringMap.get("value"));
+					} else if (ProjectRoleEnum.DESIGNINITIATOR.getValue().equals(fieldNumber)) {
+						projectLawsInventoryEO.setDesignInitiatorId(stringStringMap.get("value"));
+					} else if (ProjectRoleEnum.DESIGNDUTY.getValue().equals(fieldNumber)) {
+						projectLawsInventoryEO.setDesignDutyId(stringStringMap.get("value"));
+					} else if (ProjectRoleEnum.PREHOMOINITIATOR.getValue().equals(fieldNumber)) {
+						projectLawsInventoryEO.setPrehomoInitiatorId(stringStringMap.get("value"));
+					} else if (ProjectRoleEnum.PREHOMODUTY.getValue().equals(fieldNumber)) {
+						projectLawsInventoryEO.setPrehomoDutyId(stringStringMap.get("value"));
+					} else if (ProjectRoleEnum.VERIFYINITIATOR.getValue().equals(fieldNumber)) {
+						projectLawsInventoryEO.setVerifyInitiatorId(stringStringMap.get("value"));
+					} else if (ProjectRoleEnum.VERIFYDUTY.getValue().equals(fieldNumber)) {
+						projectLawsInventoryEO.setVerifyDutyId(stringStringMap.get("value"));
+					}
+					break;
+				}
+			}
+			if (count == 0) {
+				if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+					errorMsg += nameCn + regulationOwnerId + "与相关人员名单中责任领域下的人员不匹配， ";
+				} else {
+					errorMsg += nameEn + regulationOwnerId + "does not match a person under the Responsible Field in the relevant person list, ";
+				}
+				msgList.add(errorMsg);
+			}
+		} else {
+			if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+				errorMsg += nameCn + regulationOwnerId + "与相关人员名单中责任领域下的人员不匹配， ";
+			} else {
+				errorMsg += nameEn + regulationOwnerId + "does not match a person under the Responsible Field in the relevant person list, ";
+			}
+			msgList.add(errorMsg);
+		}
+	}
+
+	private boolean dateVerify(ProjectLawsInventoryEO projectLawsInventoryEO, String errorMsg,
+							   Date field, List<String> msgList,
+							   String nameCn, String nameEn) {
+		//判断格式是否正确
+		boolean flag = true;
+		if (ObjectUtils.isNotEmpty(field)) {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			String format = sdf.format(field);
+			if (!DateUtils.isValidDate(format)) {
+				flag = false;
+				if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+					errorMsg += nameCn + "格式不正确, 正确格式如:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日";
+				} else {
+					errorMsg += nameEn + " Incorrect format correct format is:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日";
+				}
+				msgList.add(errorMsg);
+			}
+		}
+		return flag;
+	}
+
+	private boolean must(ProjectLawsInventoryEO projectLawsInventoryEO, String errorMsg,
+						 List<String> msgList, String serialNumber, String nameCn, String nameEn) {
+		int errorCount = 0;
+		if (StringUtils.isBlank(serialNumber)) {
+			errorCount++;
+			if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+				errorMsg += nameCn + "为必填项,不能为空, ";
+			} else {
+				errorMsg += nameEn + "This parameter is mandatory and cannot be empty, ";
+			}
+			msgList.add(errorMsg);
+		}
+		if (errorCount == 0) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	private String pullMore(List<SysDictItem> dictItemList, ProjectLawsInventoryEO projectLawsInventoryEO,
+							String errorMsg, String value, List<String> msgList,
+							String nameCn, String nameEn, String dictCode) {
+		List<String> valueList = new ArrayList<>();
+		if (StringUtils.isNotBlank(value)) {
+			List<String> list = Arrays.asList(value.split(","));
+			List<SysDictItem> sysDictItemList = new ArrayList<>();
+			if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+				sysDictItemList = dictItemList.stream().filter(e -> dictCode.equals(e.getDictCode()) && list.contains(e.getItemText())).collect(Collectors.toList());
+			} else {
+				sysDictItemList = dictItemList.stream().filter(e -> dictCode.equals(e.getDictCode()) && list.contains(e.getEnName())).collect(Collectors.toList());
+			}
+
+			if (list.size() == sysDictItemList.size()) {
+				valueList = sysDictItemList.stream().map(SysDictItem::getItemValue).collect(Collectors.toList());
+
+			} else {
+				//数据中有与数据字典不匹配的值
+				List<String> finalValueList = valueList;
+				List<String> diffList = list.stream().filter(e -> !finalValueList.contains(e)).collect(Collectors.toList());
+				if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+					errorMsg += nameCn + "中的" + StringUtils.join(diffList, ",") + "与数据字典不匹配, ";
+				} else {
+					errorMsg += nameEn + " " + StringUtils.join(diffList, ",") + " does not match the data dictionary, ";
+				}
+				msgList.add(errorMsg);
+			}
+		}
+		return StringUtils.join(valueList, ",");
+	}
+
+	private String pullSingle(List<SysDictItem> dictItemList, ProjectLawsInventoryEO projectLawsInventoryEO,
+							  String errorMsg, String value, List<String> msgList,
+							  String nameCn, String nameEn, String dictCode) {
+		if (StringUtils.isNotBlank(value)) {
+			if (value.contains(",")) {
+				if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+					errorMsg += nameCn + " 为单选项, ";
+				} else {
+					errorMsg += nameEn + " Is multiple choice, ";
+				}
+				msgList.add(errorMsg);
+			} else {
+				List<SysDictItem> sysDictItemList = new ArrayList<>();
+				if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+					sysDictItemList = dictItemList.stream().filter(e -> dictCode.equals(e.getDictCode()) && value.equals(e.getItemText())).collect(Collectors.toList());
+				} else {
+					sysDictItemList = dictItemList.stream().filter(e -> dictCode.equals(e.getDictCode()) && value.equals(e.getEnName())).collect(Collectors.toList());
+				}
+
+				if (sysDictItemList.size() == 0) {
+					if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+						errorMsg += nameCn + "中的" + value + "与数据字典不匹配, ";
+					} else {
+						errorMsg += nameEn + " " + value + " does not match the data dictionary, ";
+					}
+					msgList.add(errorMsg);
+				} else {
+					return sysDictItemList.get(0).getItemValue();
+				}
+			}
+		}
+		return null;
+	}
+
+	private String templateTransition(String zipEntryName, ProjectLawsInventoryEO projectLawsInventoryEO,
+									  String errorMsg, String designDeliverableTemplate, List<String> msgList,
+									  String nameCn, String nameEn, String dataSource) {
+		String value = "";
+		if (StringUtils.isNotBlank(designDeliverableTemplate)) {
+			StringBuilder sb = new StringBuilder();
+			for (String fileName : designDeliverableTemplate.split(",")) {
+				List<File> nowFileList = new ArrayList<>();
+				if (DataSourceEnum.LIST_DATA.getValue().equals(dataSource)) {
+					nowFileList = FileUnZip.readFileByFilenameDataList(zipEntryName, fileName, projectLawsInventoryEO.getCut(), errorMsg, msgList, nameCn, nameEn, projectLawsInventoryEO);
+				} else {
+					nowFileList = FileUnZip.readFileByFilename(zipEntryName, fileName, projectLawsInventoryEO.getCut(), errorMsg, msgList, nameCn, nameEn);
+				}
+				if (nowFileList.size() == 0) {
+//					if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
+//						errorMsg += "压缩包中没有" + fileName + "文件; ";
+//					}else{
+//						errorMsg += " Not in the zip package" + fileName + "file; ";
+//					}
+//					msgList.add(errorMsg);
+				} else {
+					try {
+						FileInputStream input = new FileInputStream(nowFileList.get(0));
+						MultipartFile multipartFile =
+								new MockMultipartFile(nowFileList.get(0).getName(), nowFileList.get(0).getName(), "text/plain", input);
+						//文件存入文件表
+						OSSFile ossFile = iOSSFileService.uploadLocalOfCos(multipartFile, "", null, null);
+						if (ObjectUtils.isNotEmpty(ossFile)) {
+							sb.append(ossFile.getId() + ",");
+						}
+					} catch (IOException e) {
+						log.error("虚拟清单导入" + e.getMessage());
+					}
+				}
+			}
+			if (StringUtils.isNotBlank(sb)) {
+				value = sb.substring(0, sb.length() - 1);
+			}
+		}
+		return value;
+	}
+
+	private String fieldConvert(String field) {
+		if (field == null) return null;
+		switch (field) {
+			case "*编号":
+				return "serialNumber";
+			case "*Number":
+				return "serialNumber";
+//			case "标题": return "title";
+			case "子标题":
+				return "subtitle";
+			case "Sub-Title":
+				return "subtitle";
+			case "适用范围":
+				return "shi4Yong4Fan4Wei2";
+			case "状态":
+				return "state";
+//			case "对应标准": return "correspondingStandard";
+			case "实施类别":
+				return "implementType";
+			case "Usage":
+				return "implementType";
+			case "新车实施日期":
+				return "xin1Che1Xing2Shi2Shi1Ri4Qi1";
+//			case "在产车实施日期": return "implementTime";
+			case "WVTA ID":
+				return "wvtaId";
+			case "认证类型":
+				return "attestationType";
+			case "Certification Type":
+				return "attestationType";
+			case "*认证级别":
+				return "attestationRank";
+			case "*Certification Level":
+				return "attestationRank";
+			case "适用增补件":
+				return "applicableSupplement";
+			case "Applicable Supplement":
+				return "applicableSupplement";
+			case "技术领域":
+				return "technologyTerritory";
+			case "*责任领域":
+				return "dutyTerritory";
+			case "*Responsible Field":
+				return "dutyTerritory";
+//			case "适用地区": return "region";
+			case "备注":
+				return "remark";
+			case "Comments":
+				return "remark";
+			case "法规工程师":
+				return "regulationOwnerId";
+			case "Regulation Engineer":
+				return "regulationOwnerId";
+			case "认证工程师":
+				return "homologationEngineerId";
+			case "Homologation Engineer":
+				return "homologationEngineerId";
+			case "工程接口人":
+				return "engineeringInterfacePerson";
+			case "Engineering Interface":
+				return "engineeringInterfacePerson";
+			case "设计交付物类型":
+				return "designDeliverableType";
+			case "design Deliverable Type":
+				return "designDeliverableType";
+			case "设计交付物模板":
+				return "designDeliverableTemplate";
+			case "design Deliverable Template":
+				return "designDeliverableTemplate";
+			case "设计发起人":
+				return "designInitiatorId";
+			case "design Reviewer":
+				return "designInitiatorId";
+			case "设计责任人":
+				return "designDutyId";
+			case "design Assignee":
+				return "designDutyId";
+			case "设计截止时间":
+				return "designDueDate";
+			case "design Due Date":
+				return "designDueDate";
+
+			case "设计交付物说明":
+				return "designRemark";
+			case "design Deliverable Description":
+				return "designRemark";
+
+			case "pre交付物类型":
+				return "prehomoDeliverableType";
+			case "pre Deliverable Type":
+				return "prehomoDeliverableType";
+			case "pre交付物模板":
+				return "prehomoDeliverableTemplate";
+			case "pre Deliverable Template":
+				return "prehomoDeliverableTemplate";
+			case "pre发起人":
+				return "prehomoInitiatorId";
+			case "pre Reviewer":
+				return "prehomoInitiatorId";
+			case "pre责任人":
+				return "prehomoDutyId";
+			case "pre Assignee":
+				return "prehomoDutyId";
+			case "pre截止时间":
+				return "prehomoDueDate";
+			case "pre Due Date":
+				return "prehomoDueDate";
+
+			case "pre交付物说明":
+				return "prehomoRemark";
+			case "pre Deliverable Description":
+				return "prehomoRemark";
+
+			case "验证交付物类型":
+				return "verifyDeliverableType";
+			case "verify Deliverable Type":
+				return "verifyDeliverableType";
+			case "验证交付物模板":
+				return "verifyDeliverableTemplate";
+			case "verify Deliverable Template":
+				return "verifyDeliverableTemplate";
+			case "验证发起人":
+				return "verifyInitiatorId";
+			case "verify Reviewer":
+				return "verifyInitiatorId";
+			case "验证责任人":
+				return "verifyDutyId";
+			case "verify Assignee":
+				return "verifyDutyId";
+			case "验证截止时间":
+				return "verifyDueDate";
+			case "verify Due Date":
+				return "verifyDueDate";
+
+			case "验证交付物说明":
+				return "verifyRemark";
+			case "verify Deliverable Description":
+				return "verifyRemark";
+
+			case "标题":
+				return "title";
+			case "Title":
+				return "title";
+
+			case "清单确认状态":
+				return "inventoryAffirmStatus";
+			case "List Confirmation Status":
+				return "inventoryAffirmStatus";
+
+			case "任务确认状态":
+				return "taskAffirmStatus";
+			case "Task Confirmation Status":
+				return "taskAffirmStatus";
+
+			case "适用地区":
+				return "region";
+			case "Area":
+				return "region";
+
+			case "对应标准":
+				return "correspondingStandard";
+			case "Compare EU/CN":
+				return "correspondingStandard";
+
+			case "新车型实施日期":
+				return "xin1Che1Xing2Shi2Shi1Ri4Qi1";
+			case "New Type Execution Date":
+				return "xin1Che1Xing2Shi2Shi1Ri4Qi1";
+
+			case "在产车实施日期":
+				return "implementTime";
+			case "New Vehicle Execution Date":
+				return "implementTime";
+
+			default:
+				return null;
+			//"Deliverable Type,Deliverable Template,initiator,Assignee,Due Date," +
+		}
+	}
+
+
+	//判断row是否为空  空返回true
+	public boolean isRowEmpty(Row row) {
+		if (null == row) {
+			return true;
+		}
+		int firstCellNum = row.getFirstCellNum();   //第一个列位置
+		int lastCellNum = row.getLastCellNum();     //最后一列位置
+		int nullCellNum = 0;    //空列数量
+		for (int c = firstCellNum; c < lastCellNum; c++) {
+			Cell cell = row.getCell(c);
+			if (null == cell) {
+				nullCellNum++;
+				continue;
+			}
+			String value = "";
+			switch (cell.getCellType()) {
+				case HSSFCell.CELL_TYPE_NUMERIC: // 数字
+					//如果为时间格式的内容
+					value = String.valueOf(cell.getNumericCellValue());
+					break;
+				case HSSFCell.CELL_TYPE_STRING: // 字符串
+					value = cell.getStringCellValue();
+					break;
+				case HSSFCell.CELL_TYPE_BOOLEAN: // Boolean
+					value = cell.getBooleanCellValue() + "";
+					break;
+				case HSSFCell.CELL_TYPE_FORMULA: // 公式
+					value = cell.getCellFormula() + "";
+					break;
+				default:
+					break;
+			}
+			if (org.apache.commons.lang.StringUtils.isEmpty(value)) {
+				nullCellNum++;
+			}
+		}
+		//所有列都为空
+		if (nullCellNum == (lastCellNum - firstCellNum)) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * 获取文件
+	 *
+	 * @param dataList
+	 * @return
+	 */
+	private List<OSSFile> getOssFiles(List<ProjectLawsInventoryEO> dataList) {
+		List<String> fileIdList = new ArrayList<>();
+		List<String> design = new ArrayList<>();
+		List<String> prehomo = new ArrayList<>();
+		List<String> verify = new ArrayList<>();
+		for (ProjectLawsInventoryEO projectLawsInventoryEO : dataList) {
+			if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())) {
+				design.add(projectLawsInventoryEO.getDesignDeliverableTemplate());
+			}
+			if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())) {
+				prehomo.add(projectLawsInventoryEO.getPrehomoDeliverableTemplate());
+			}
+			if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())) {
+				verify.add(projectLawsInventoryEO.getVerifyDeliverableTemplate());
+			}
+		}
+		if (design.size() != 0) {
+			fileIdList.addAll(design);
+		}
+		if (prehomo.size() != 0) {
+			fileIdList.addAll(prehomo);
+		}
+		if (verify.size() != 0) {
+			fileIdList.addAll(verify);
+		}
+		//查询所有的文件
+		List<OSSFile> fileInfos = new ArrayList<>();
+		if (fileIdList.size() != 0) {
+			fileInfos = iOSSFileService.getFileInfos(StringUtils.join(fileIdList, ","));
+		}
+		return fileInfos;
+	}
+
+	@NotNull
+	private StringBuilder getStringBuilder(ProjectLawsInventoryEO projectLawsInventoryEO, List<SysCategory> sysCategoryList, String technologyTerritory) {
+		StringBuilder sb = new StringBuilder();
+		for (String s : technologyTerritory.split(",")) {
+			List<SysCategory> collect = sysCategoryList.stream()
+					.filter(e -> s.equals(e.getId())).collect(Collectors.toList());
+			if (collect.size() != 0) {
+				if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+					sb.append(collect.get(0).getName() + ",");
+				} else {
+					sb.append(collect.get(0).getEnName() + ",");
+				}
+			}
+		}
+		return sb;
+	}
+
+	/**
+	 * 数据转换(文件名称,技术领域,对应标准)
+	 *
+	 * @param dataList
+	 * @param fileInfos
+	 */
+	private void dataTransition(List<ProjectLawsInventoryEO> dataList,
+								List<OSSFile> fileInfos,
+								List<SysUser> sysUserList,
+								ProjectLawsInventoryEO projectLawsInventoryEOTemp) {
+		List<SysCategory> sysCategoryList = sysCategoryService.list();
+
+		for (ProjectLawsInventoryEO projectLawsInventoryEO : dataList) {
+			//设计交付物类型   inventoryInfoEO
+			if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableType())) {
+				StringBuilder sb = getStringBuilder(projectLawsInventoryEOTemp, sysCategoryList, projectLawsInventoryEO.getDesignDeliverableType());
+				if (StringUtils.isNotBlank(sb)) {
+					String substring = sb.substring(0, sb.length() - 1);
+					projectLawsInventoryEO.setDesignDeliverableType(substring);
+				}
+			}
+			//pre交付物类型
+			if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) {
+				StringBuilder sb = getStringBuilder(projectLawsInventoryEOTemp, sysCategoryList, projectLawsInventoryEO.getPrehomoDeliverableType());
+				if (StringUtils.isNotBlank(sb)) {
+					String substring = sb.substring(0, sb.length() - 1);
+					projectLawsInventoryEO.setPrehomoDeliverableType(substring);
+				}
+			}
+			//验证交付物类型
+			if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) {
+				StringBuilder sb = getStringBuilder(projectLawsInventoryEOTemp, sysCategoryList, projectLawsInventoryEO.getVerifyDeliverableType());
+				if (StringUtils.isNotBlank(sb)) {
+					String substring = sb.substring(0, sb.length() - 1);
+					projectLawsInventoryEO.setVerifyDeliverableType(substring);
+				}
+			}
+
+
+			//清单确认状态  inventoryAffirmStatus
+			if (StringUtils.isNotBlank(projectLawsInventoryEO.getInventoryAffirmStatus())) {
+				String stateName = stateTransition(projectLawsInventoryEO.getInventoryAffirmStatus());
+				projectLawsInventoryEO.setInventoryAffirmStatusName(stateName);
+			}
+			//任务确认状态  taskAffirmStatus
+			if (StringUtils.isNotBlank(projectLawsInventoryEO.getTaskAffirmStatus())) {
+				String stateName = stateTransition(projectLawsInventoryEO.getTaskAffirmStatus());
+				projectLawsInventoryEO.setTaskAffirmStatusName(stateName);
+			}
+			//法规工程师 regulationOwnerId
+			if (StringUtils.isNotBlank(projectLawsInventoryEO.getRegulationOwnerId())) {
+				List<SysUser> collect = sysUserList.stream()
+						.filter(e -> e.getId().equals(projectLawsInventoryEO.getRegulationOwnerId())).collect(Collectors.toList());
+				if (collect.size() != 0) {
+					projectLawsInventoryEO.setRegulationOwnerName(collect.get(0).getUsername());
+				}
+			}
+
+			//认证工程师  homologationEngineerId
+			if (StringUtils.isNotBlank(projectLawsInventoryEO.getHomologationEngineerId())) {
+				List<SysUser> collect = sysUserList.stream()
+						.filter(e -> e.getId().equals(projectLawsInventoryEO.getHomologationEngineerId())).collect(Collectors.toList());
+				if (collect.size() != 0) {
+					projectLawsInventoryEO.setHomologationEngineerName(collect.get(0).getUsername());
+				}
+			}
+
+			//工程接口人  engineeringInterfacePerson
+			if (StringUtils.isNotBlank(projectLawsInventoryEO.getEngineeringInterfacePerson())) {
+				List<SysUser> collect = sysUserList.stream()
+						.filter(e -> e.getId().equals(projectLawsInventoryEO.getEngineeringInterfacePerson())).collect(Collectors.toList());
+				if (collect.size() != 0) {
+					projectLawsInventoryEO.setEngineeringInterfacePersonName(collect.get(0).getUsername());
+				}
+			}
+
+			//设计符合性确认发起人designInitiatorId
+			if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignInitiatorId())) {
+				List<SysUser> collect = sysUserList.stream()
+						.filter(e -> e.getId().equals(projectLawsInventoryEO.getDesignInitiatorId())).collect(Collectors.toList());
+				if (collect.size() != 0) {
+					projectLawsInventoryEO.setDesignInitiatorName(collect.get(0).getUsername());
+				}
+			}
+
+			//设计符合性确认责任人designDutyId
+			if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDutyId())) {
+				List<SysUser> collect = sysUserList.stream()
+						.filter(e -> e.getId().equals(projectLawsInventoryEO.getDesignDutyId())).collect(Collectors.toList());
+				if (collect.size() != 0) {
+					projectLawsInventoryEO.setDesignDutyIdName(collect.get(0).getUsername());
+				}
+			}
+
+			//PreHomo确认发起人prehomoInitiatorId
+			if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoInitiatorId())) {
+				List<SysUser> collect = sysUserList.stream()
+						.filter(e -> e.getId().equals(projectLawsInventoryEO.getPrehomoInitiatorId())).collect(Collectors.toList());
+				if (collect.size() != 0) {
+					projectLawsInventoryEO.setPrehomoInitiatorName(collect.get(0).getUsername());
+				}
+			}
+
+			//PreHomo确认责任人prehomoDutyId
+			if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDutyId())) {
+				List<SysUser> collect = sysUserList.stream()
+						.filter(e -> e.getId().equals(projectLawsInventoryEO.getPrehomoDutyId())).collect(Collectors.toList());
+				if (collect.size() != 0) {
+					projectLawsInventoryEO.setPrehomoDutyName(collect.get(0).getUsername());
+				}
+			}
+
+			//验证符合性确认发起人verifyInitiatorId
+			if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyInitiatorId())) {
+				List<SysUser> collect = sysUserList.stream()
+						.filter(e -> e.getId().equals(projectLawsInventoryEO.getVerifyInitiatorId())).collect(Collectors.toList());
+				if (collect.size() != 0) {
+					projectLawsInventoryEO.setVerifyInitiatorName(collect.get(0).getUsername());
+				}
+			}
+
+			//验证符合性确认责任人verifyDutyId
+			if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDutyId())) {
+				List<SysUser> collect = sysUserList.stream()
+						.filter(e -> e.getId().equals(projectLawsInventoryEO.getVerifyDutyId())).collect(Collectors.toList());
+				if (collect.size() != 0) {
+					projectLawsInventoryEO.setVerifyDutyIdName(collect.get(0).getUsername());
+				}
+			}
+
+			String designDeliverableTemplate = projectLawsInventoryEO.getDesignDeliverableTemplate();
+			String prehomoDeliverableTemplate = projectLawsInventoryEO.getPrehomoDeliverableTemplate();
+			String verifyDeliverableTemplate = projectLawsInventoryEO.getVerifyDeliverableTemplate();
+			//设计交付物模板
+			if (StringUtils.isNotBlank(designDeliverableTemplate)) {
+				String designDeliverableTemplateName = template(fileInfos, designDeliverableTemplate);
+				projectLawsInventoryEO.setDesignDeliverableTemplateName(designDeliverableTemplateName);
+			}
+			//设计交付物模板
+			if (StringUtils.isNotBlank(prehomoDeliverableTemplate)) {
+				String prehomoDeliverableTemplateName = template(fileInfos, prehomoDeliverableTemplate);
+				projectLawsInventoryEO.setPrehomoDeliverableTemplateName(prehomoDeliverableTemplateName);
+
+			}
+			//设计交付物模板
+			if (StringUtils.isNotBlank(verifyDeliverableTemplate)) {
+				String verifyDeliverableTemplateName = template(fileInfos, verifyDeliverableTemplate);
+				projectLawsInventoryEO.setVerifyDeliverableTemplateName(verifyDeliverableTemplateName);
+			}
+		}
+	}
+
+	private String stateTransition(String state) {
+		String result = "";
+		if (InventoryAffirmStatusEnum.NOT_STARTED.getValue().equals(state)) {
+			result = InventoryAffirmStatusEnum.NOT_STARTED.getName();
+
+		} else if (InventoryAffirmStatusEnum.LIST_TO_CONFIRM.getValue().equals(state)) {
+			result = InventoryAffirmStatusEnum.LIST_TO_CONFIRM.getName();
+
+		} else if (InventoryAffirmStatusEnum.ACCEPTED.getValue().equals(state)) {
+			result = InventoryAffirmStatusEnum.ACCEPTED.getName();
+
+		} else if (InventoryAffirmStatusEnum.REJECTED.getValue().equals(state)) {
+			result = InventoryAffirmStatusEnum.REJECTED.getName();
+		}
+		return result;
+	}
+
+	/**
+	 * 模板名称转换
+	 *
+	 * @param fileInfos
+	 * @param value
+	 * @return
+	 */
+	private String template(List<OSSFile> fileInfos, String value) {
+		StringBuilder sb = new StringBuilder();
+		for (String s : value.split(",")) {
+			List<OSSFile> collect = fileInfos.stream().filter(e -> s.equals(e.getId())).collect(Collectors.toList());
+			if (collect.size() != 0) {
+				sb.append(collect.get(0).getFileName() + ",");
+			}
+		}
+		String substring = "";
+		if (StringUtils.isNotBlank(sb)) {
+			substring = sb.substring(0, sb.length() - 1);
+		}
+		return substring;
+	}
+
+	private void exportFile(List<ProjectLawsInventoryEO> dataList, List<OSSFile> fileInfos) throws IOException {
+		if (fileInfos.size() != 0) {
+			for (ProjectLawsInventoryEO projectLawsInventoryEO : dataList) {
+				String designDeliverableTemplate = projectLawsInventoryEO.getDesignDeliverableTemplate();
+				String prehomoDeliverableTemplate = projectLawsInventoryEO.getPrehomoDeliverableTemplate();
+				String verifyDeliverableTemplate = projectLawsInventoryEO.getVerifyDeliverableTemplate();
+				String serialNumber = projectLawsInventoryEO.getSerialNumber();
+				if (StringUtils.isBlank(serialNumber)) {
+					continue;
+				}
+				List<OSSFile> designFileList = new ArrayList<>();
+				List<OSSFile> prehomoFileList = new ArrayList<>();
+				List<OSSFile> verifyFileList = new ArrayList<>();
+				List<OSSFile> oSSFileList = new ArrayList<>();
+				if (StringUtils.isNotBlank(designDeliverableTemplate)) {
+					designFileList = fileInfos.stream().filter(e -> designDeliverableTemplate.contains(e.getId())).collect(Collectors.toList());
+					oSSFileList.addAll(designFileList);
+				}
+				if (StringUtils.isNotBlank(prehomoDeliverableTemplate)) {
+					prehomoFileList = fileInfos.stream().filter(e -> prehomoDeliverableTemplate.contains(e.getId())).collect(Collectors.toList());
+					oSSFileList.addAll(prehomoFileList);
+				}
+				if (StringUtils.isNotBlank(verifyDeliverableTemplate)) {
+					verifyFileList = fileInfos.stream().filter(e -> verifyDeliverableTemplate.contains(e.getId())).collect(Collectors.toList());
+					oSSFileList.addAll(verifyFileList);
+				}
+
+				if (oSSFileList.size() != 0) {
+					if (serialNumber.contains("/")) {
+						serialNumber = serialNumber.replaceAll("/", "-");
+					}
+					String fileNowPath = uploadpath + "/tempZip/" + serialNumber;
+					File file = new File(fileNowPath);
+					if (file.exists()) {
+						file.delete();
+					}
+					file.mkdirs();
+					for (OSSFile ossFile : oSSFileList) {
+						String url = ossFile.getUrl();
+						if (StringUtils.isNotBlank(url)) {
+							//判断文件是否存在
+							boolean b = CosBootUtil.doesObjectExist(url);
+							if (b) {
+								InputStream download = CosBootUtil.download(url);
+								copyFile(download, fileNowPath + File.separator + ossFile.getFileName());
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * 验证用户是否是该项目的studio工程师。
+	 *
+	 * @param projectLibraryId
+	 * @param cut
+	 */
+	public void isStudio(String projectLibraryId, String cut) {
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		int roleCode = this.checkUserRole(projectLibraryId, currentUser.getId(), "");
+		if (roleCode != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())) {
+			String errorMessage = "";
+			if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+				errorMessage = "该用户不是这个项目的studio工程师，没有权限操作！";
+			} else {
+				errorMessage = "This user is not a studio engineer for this project and does not have permission to operate!";
+			}
+			throw new JeroBootException(errorMessage);
+		}
+	}
+
+	//表格高度
+	private static int high = 25;
+	//表格宽度
+	private static int widthPercentage = 100;
+
+	@Override
+	public void downloadReport(Map<String, Object> params, HttpServletRequest req, HttpServletResponse resp) throws DocumentException {
+		String filename = "法规清单报告";
+
+		File file = null;
+		InputStream fin = null;
+		ServletOutputStream out = null;
+
+		String filePar = null;
+		// 文件夹路径
+		filePar = exportPdfTempPath + new Date().getTime();
+		File myPath = new File(filePar);
+		file = new File(filePar + "/" + filename + new Date().getTime() + ".pdf");
+		if (!myPath.exists()) {
+			myPath.mkdirs();
+		}
+
+		/*******pdf文件内容生成开始*********/
+		Document document = new Document(PageSize.A4, 25, 25, 25, 25);
+
+		//设中文字体
+		BaseFont bfChinese = null;
+		try {
+			//bfChinese = BaseFont.createFont("STSong-Light", "UniGB-UCS2-H",BaseFont.NOT_EMBEDDED); // 该方式不好用。
+
+			//创建一个支持中文的字体,字体为本地下载的字体
+			bfChinese = BaseFont.createFont(simfangFontFilePath, BaseFont.IDENTITY_H, BaseFont.EMBEDDED);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		//创建标题  //size：26 一号字体
+		Font f26 = new Font(bfChinese, 18, Font.NORMAL);
+		//Font f10 = new Font(bfChinese, 10, Font.NORMAL);
+		//Font f12 = new Font(bfChinese, 12, Font.NORMAL);
+		Font f8 = new Font(bfChinese, 8, Font.NORMAL);
+		Paragraph title1 = new Paragraph("ComplianceReport-Template", f26);
+		title1.setAlignment(Element.ALIGN_CENTER);
+		title1.setAlignment(Element.ALIGN_CENTER);
+		Chapter chapter1 = new Chapter(title1, 1);
+		chapter1.setNumberDepth(0);
+		Section section1 = chapter1;
+
+		try {
+			PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream(file));
+		} catch (DocumentException e) {
+			e.printStackTrace();
+		} catch (FileNotFoundException e) {
+			e.printStackTrace();
+		}
+
+		document.open();
+
+		// 创建4列的表格
+		int colNumber = 4;
+		PdfPTable tableBasic = new PdfPTable(colNumber);
+		//设置段落上下空白
+		//tableBasic.setSpacingBefore(25);
+		//tableBasic.setSpacingAfter(25);
+
+		section1.add(tableBasic);
+		document.add(chapter1);
+
+		String cut = (String) params.get("cut");
+		String id = (String) params.get("id");//法规id
+
+		QueryWrapper<ProjectLawsInventoryEO> lawsInventoryQueryWrapper = new QueryWrapper<>();
+		lawsInventoryQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getId, id);
+		ProjectLawsInventoryEO projectLawsInventoryEO = this.baseMapper.selectOne(lawsInventoryQueryWrapper);
+		params.put("projectLawsInventoryEO", projectLawsInventoryEO);
+
+		QueryWrapper<ProjectTaskInventoryEO> taskInventoryQueryWrapper = new QueryWrapper<>();
+		taskInventoryQueryWrapper.lambda().eq(ProjectTaskInventoryEO::getProjectLawsInventoryId, id);
+		ProjectTaskInventoryEO projectTaskInventoryEO = projectTaskInventoryEOService.getBaseMapper().selectOne(taskInventoryQueryWrapper);
+		params.put("projectTaskInventoryEO", projectTaskInventoryEO);
+
+		QueryWrapper<ProjectLibraryBase> libraryBaseQueryWrapper = new QueryWrapper<>();
+		libraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId, projectLawsInventoryEO.getProjectLibraryId());
+		ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectOne(libraryBaseQueryWrapper);
+		params.put("projectLibraryBase", projectLibraryBase);
+
+		QueryWrapper<ProjectNameInfoEO> projectNameQueryWrapper = new QueryWrapper<>();
+		projectNameQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId());
+		ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameQueryWrapper);
+		params.put("projectNameInfoEO", projectNameInfoEO);
+
+		//设置ProgramInformation内容
+		setProgramInformation(tableBasic, document, f8, params);
+
+		//设置ComplianceAttachments 验证符合性流程里最后通过审批的 “ 工程确认 ” 中的附件  内容
+		setComplianceAttachments(new PdfPTable(2), document, f8);
+
+		//设置ComplianceResult 内容
+		setComplianceResult(new PdfPTable(2), document, f8, params);
+
+		//审核历史表头
+		String[] auditHistoryHead = new String[]{"Result", "Opinion", "Node", "Operator", "Datetime"};
+
+		//设置DesignComplianceCheckApprovals   （设计符合性确认的审批历史数据，没有就空着） 内容
+		setDesignComplianceCheckApprovals(new PdfPTable(auditHistoryHead.length), document, f8, auditHistoryHead, params);
+
+		//设置ValidationComplianceCheckApprovals   （验证符合性确认的审批历史数据，没有就空着） 内容
+		setValidationComplianceCheckApprovals(new PdfPTable(auditHistoryHead.length), document, f8, auditHistoryHead, params);
+
+		document.close();
+
+		try {
+			fin = new FileInputStream(file);
+			resp.setCharacterEncoding("utf-8");
+			resp.setContentType("application/pdf");
+
+			// 设置浏览器以下载的方式处理该文件
+			if (req.getHeader("User-Agent").toUpperCase().indexOf("MSIE") > 0) {
+				filename = URLEncoder.encode(filename, "UTF-8");
+			} else {
+				filename = new String(filename.getBytes("UTF-8"), "ISO8859-1");
+			}
+			resp.setHeader("Content-Disposition", "attachment;filename=" + filename + ".pdf");
+			out = resp.getOutputStream();
+
+			// 缓冲区
+			byte[] buffer = new byte[512];
+			int bytesToRead = -1;
+
+			// 通过循环将读入的Word文件的内容输出到浏览器中
+			while ((bytesToRead = fin.read(buffer)) != -1) {
+				out.write(buffer, 0, bytesToRead);
+			}
+		} catch (Exception ex) {
+			ex.printStackTrace();
+		} finally {
+			try {
+				if (fin != null) {
+					fin.close();
+				}
+				if (out != null) {
+					out.close();
+				}
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+
+			if (file != null) {
+				// 删除临时文件
+				file.delete();
+			}
+
+			if (myPath != null) {
+				// 删除临时文件夹
+				myPath.delete();
+			}
+		}
+	}
+
+	private PdfPCell pdfTableStyle(String content, Font font, int high, boolean isAlignCenter, boolean isAlignMidde) {
+		PdfPCell pdfPCell = new PdfPCell(new Phrase(content, font));
+		pdfPCell.setMinimumHeight(high);
+		pdfPCell.setUseAscender(true); // 设置可以居中
+		if (isAlignCenter) {
+			pdfPCell.setHorizontalAlignment(PdfPCell.ALIGN_CENTER); // 设置水平居中
+		}
+		if (isAlignMidde) {
+			pdfPCell.setVerticalAlignment(PdfPCell.ALIGN_MIDDLE); // 设置垂直居中
+		}
+		return pdfPCell;
+	}
+
+	public void setProgramInformation(PdfPTable tableBase, Document document, Font fontSize, Map<String, Object> params) throws DocumentException {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+		String cut = (String) params.get("cut");
+
+		ProjectLawsInventoryEO projectLawsInventoryEO = (ProjectLawsInventoryEO) params.get("projectLawsInventoryEO");
+		ProjectTaskInventoryEO projectTaskInventoryEO = (ProjectTaskInventoryEO) params.get("projectTaskInventoryEO");
+		ProjectLibraryBase projectLibraryBase = (ProjectLibraryBase) params.get("projectLibraryBase");
+		ProjectNameInfoEO projectNameInfoEO = (ProjectNameInfoEO) params.get("projectNameInfoEO");
+
+		tableBase.setHorizontalAlignment(Element.ALIGN_CENTER);// 居左
+		tableBase.setTotalWidth(500f);//表格的总宽度
+		tableBase.setWidthPercentage(100);// 表格的宽度百分比
+
+		PdfPTable tableName = new PdfPTable(1);
+		//设置段落上空白
+		tableName.setSpacingBefore(25);
+		//设置标题长度占纸张比例
+		tableName.setWidthPercentage(widthPercentage);
+		//给表格赋值
+		PdfPCell programInformation = pdfTableStyle("Program Information", fontSize, 10, false, false);
+		programInformation.disableBorderSide(15);
+		tableName.addCell(programInformation);
+		//将表格添加到文档对象中
+		document.add(tableName);
+
+		// cell 11 第一行  第一列
+		PdfPCell cell11 = pdfTableStyle("CR No.", fontSize, 50, true, true);
+		tableBase.addCell(cell11);
+		PdfPCell cell12 = pdfTableStyle("Xxx(自动生成NIO-日期-序号)NIO-2022041301", fontSize, 50, true, true);
+		tableBase.addCell(cell12);
+		PdfPCell cell13 = pdfTableStyle("CR Status", fontSize, 50, true, true);
+		tableBase.addCell(cell13);
+
+		String flowStatus = "";
+		if (StringUtils.isNotEmpty(projectTaskInventoryEO.getVerifyStatus())) {
+			flowStatus = projectTaskInventoryEO.getVerifyStatus() + ",";
+		}
+		if (StringUtils.isNotEmpty(projectTaskInventoryEO.getPrehomoStatus())) {
+			flowStatus += projectTaskInventoryEO.getPrehomoStatus() + ",";
+		}
+		if (StringUtils.isNotEmpty(projectTaskInventoryEO.getVerifyStatus())) {
+			flowStatus += projectTaskInventoryEO.getVerifyStatus() + ",";
+		}
+		if (StringUtils.isNotEmpty(flowStatus)) {
+			flowStatus = flowStatus.substring(0, flowStatus.length() - 1);
+		}
+		PdfPCell cell14 = pdfTableStyle(flowStatus, fontSize, 50, true, true);
+		tableBase.addCell(cell14);
+
+		// cell 21 第二行  第一列
+		PdfPCell cell21 = pdfTableStyle("Regulation", fontSize, 50, true, true);
+		tableBase.addCell(cell21);
+		PdfPCell cell22 = pdfTableStyle(projectLawsInventoryEO.getSerialNumber(), fontSize, 50, true, true);
+		tableBase.addCell(cell22);
+		PdfPCell cell23 = pdfTableStyle("Subject", fontSize, 50, true, true);
+		tableBase.addCell(cell23);
+		PdfPCell cell24 = pdfTableStyle(projectLawsInventoryEO.getTitle(), fontSize, 50, true, true);
+		tableBase.addCell(cell24);
+		// cell 31 第三行  第一列
+		PdfPCell cell31 = pdfTableStyle("Project", fontSize, 50, true, true);
+		tableBase.addCell(cell31);
+		PdfPCell cell32 = pdfTableStyle(projectNameInfoEO.getProjectName(), fontSize, 50, true, true);
+		tableBase.addCell(cell32);
+		PdfPCell cell33 = pdfTableStyle("Market", fontSize, 50, true, true);
+		tableBase.addCell(cell33);
+
+		List<SysDictItem> regionDictList = sysDictItemServiceImpl.selectItemsByDictCode("region");
+		List<String> marketList = new ArrayList<>();
+		if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+			marketList = regionDictList.stream().filter(e -> StringUtils.equals(e.getItemValue(), projectLibraryBase.getTargetMarket())).map(SysDictItem::getItemText).distinct().collect(Collectors.toList());
+		} else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
+			marketList = regionDictList.stream().filter(e -> StringUtils.equals(e.getItemValue(), projectLibraryBase.getTargetMarket())).map(SysDictItem::getEnName).distinct().collect(Collectors.toList());
+		}
+		String market = "";
+		if (CollectionUtils.isNotEmpty(marketList)) {
+			market = marketList.get(0);
+		}
+
+		PdfPCell cell34 = pdfTableStyle(market, fontSize, 50, true, true);
+		tableBase.addCell(cell34);
+		// cell 41 第四行  第一列
+		PdfPCell cell41 = pdfTableStyle("NT", fontSize, 50, true, true);
+		tableBase.addCell(cell41);
+		PdfPCell cell42 = pdfTableStyle("(取项目-数字平台)", fontSize, 50, true, true);
+		tableBase.addCell(cell42);
+		PdfPCell cell43 = pdfTableStyle("NP", fontSize, 50, true, true);
+		tableBase.addCell(cell43);
+		PdfPCell cell44 = pdfTableStyle("(取项目-车型平台)", fontSize, 50, true, true);
+		tableBase.addCell(cell44);
+
+		// cell 51 第五行  第一列
+		PdfPCell cell51 = pdfTableStyle("Completion Date", fontSize, 50, true, true);
+		tableBase.addCell(cell51);
+		String processEndTimeStr = "";
+		if (projectTaskInventoryEO.getProcessEndTime() != null) {
+			processEndTimeStr = sdf.format(projectTaskInventoryEO.getProcessEndTime());
+		}
+		PdfPCell cell52 = pdfTableStyle(processEndTimeStr, fontSize, 50, true, true);
+		tableBase.addCell(cell52);
+		PdfPCell cell53 = pdfTableStyle("Responsible Field", fontSize, 50, true, true);
+		tableBase.addCell(cell53);
+
+		String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
+		String finalDutyTerritory = dutyTerritory;
+		List<SysDictItem> dutyTerritoryDictItemList = sysDictItemServiceImpl.selectItemsByDictCode("duty_territory");
+		String dutyTerritoryName = "";
+		if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+			dutyTerritoryName = dutyTerritoryDictItemList.stream()
+					.filter(e -> finalDutyTerritory.contains(e.getItemValue()))
+					.map(SysDictItem::getItemText)
+					.collect(Collectors.joining(","));
+		} else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
+			dutyTerritoryName = dutyTerritoryDictItemList.stream()
+					.filter(e -> finalDutyTerritory.contains(e.getItemValue()))
+					.map(SysDictItem::getEnName)
+					.collect(Collectors.joining(","));
+		}
+		PdfPCell cell54 = pdfTableStyle(dutyTerritoryName, fontSize, 50, true, true);
+		tableBase.addCell(cell54);
+
+		// cell 61 第6行  第一列
+		PdfPCell cell61 = pdfTableStyle("R&H Studio Engineer", fontSize, 50, true, true);
+		tableBase.addCell(cell61);
+
+		String studioEngineer = projectLibraryBase.getStudioEngineer();
+		QueryWrapper<SysUser> queryStudioUserWrapper = new QueryWrapper<>();
+		queryStudioUserWrapper.lambda().eq(SysUser::getId, studioEngineer);
+		SysUser studioUserInfo = sysUserMapper.selectOne(queryStudioUserWrapper);
+		PdfPCell cell62 = pdfTableStyle(studioUserInfo.getUsername(), fontSize, 50, true, true);
+		tableBase.addCell(cell62);
+		PdfPCell cell63 = pdfTableStyle("Engineering Interface", fontSize, 50, true, true);
+		tableBase.addCell(cell63);
+
+		String engineeringInterfacePerson = projectLawsInventoryEO.getEngineeringInterfacePerson();
+		QueryWrapper<SysUser> queryEngineeringInterfaceUserWrapper = new QueryWrapper<>();
+		queryEngineeringInterfaceUserWrapper.lambda().eq(SysUser::getId, engineeringInterfacePerson);
+		SysUser engineeringInterfaceInfo = sysUserMapper.selectOne(queryEngineeringInterfaceUserWrapper);
+		PdfPCell cell64 = pdfTableStyle(engineeringInterfaceInfo.getUsername(), fontSize, 50, true, true);
+		tableBase.addCell(cell64);
+
+		// cell 71 第7行  第一列
+		PdfPCell cell71 = pdfTableStyle("Homologation Engineer", fontSize, 50, true, true);
+		tableBase.addCell(cell71);
+		String homologationEngineerId = projectLawsInventoryEO.getHomologationEngineerId();
+		QueryWrapper<SysUser> queryHomologationEngineerUserWrapper = new QueryWrapper<>();
+		queryHomologationEngineerUserWrapper.lambda().eq(SysUser::getId, homologationEngineerId);
+		SysUser homologationEngineerInfo = sysUserMapper.selectOne(queryHomologationEngineerUserWrapper);
+		PdfPCell cell72 = pdfTableStyle(homologationEngineerInfo.getUsername(), fontSize, 50, true, true);
+		tableBase.addCell(cell72);
+		PdfPCell cell73 = pdfTableStyle("Regulation Engineer", fontSize, 50, true, true);
+		tableBase.addCell(cell73);
+		String regulationOwnerId = projectLawsInventoryEO.getRegulationOwnerId();
+		QueryWrapper<SysUser> queryRegulationOwnerUserWrapper = new QueryWrapper<>();
+		queryRegulationOwnerUserWrapper.lambda().eq(SysUser::getId, regulationOwnerId);
+		SysUser regulationOwnerInfo = sysUserMapper.selectOne(queryRegulationOwnerUserWrapper);
+		PdfPCell cell74 = pdfTableStyle(regulationOwnerInfo.getUsername(), fontSize, 50, true, true);
+		tableBase.addCell(cell74);
+
+		// cell 81 第8行  第一列
+		PdfPCell cell81 = pdfTableStyle("           ", fontSize, 20, true, true);
+		tableBase.addCell(cell81);
+		PdfPCell cell82 = pdfTableStyle("           ", fontSize, 20, true, true);
+		tableBase.addCell(cell82);
+		PdfPCell cell83 = pdfTableStyle("           ", fontSize, 20, true, true);
+		tableBase.addCell(cell83);
+		PdfPCell cell84 = pdfTableStyle("           ", fontSize, 20, true, true);
+		tableBase.addCell(cell84);
+
+		document.add(tableBase);
+
+		PdfPTable cell9 = new PdfPTable(2);
+		// 定义表格的宽度  占比
+		float[] cell9Width = {0.25f, 0.75f};
+		try {
+			cell9.setWidths(cell9Width);
+		} catch (DocumentException e) {
+			e.printStackTrace();
+		}
+		cell9.setWidthPercentage(widthPercentage);  //设置标题长度占纸张比例
+		cell9.addCell(pdfTableStyle("Description", fontSize, 50, true, true));
+		cell9.addCell(pdfTableStyle("  ", fontSize, 50, true, true)); //（导出后自己填写)
+		document.add(cell9);
+	}
+
+	public void setComplianceAttachments(PdfPTable tableBase, Document document, Font fontSize) throws DocumentException {
+		// 定义表格的宽度
+		float[] cellsWidth = {0.45f, 0.55f};
+		try {
+			tableBase.setWidths(cellsWidth);
+		} catch (Exception ex) {
+			ex.printStackTrace();
+		}
+
+		tableBase.setTotalWidth(500f);//表格的总宽度
+		tableBase.setWidthPercentage(100);// 表格的宽度百分比
+
+		// 单元格宽度
+		PdfPTable tableName = new PdfPTable(1);
+		//设置段落上空白
+		tableName.setSpacingBefore(25);
+		tableName.setWidthPercentage(widthPercentage);  //设置标题长度占纸张比例
+		//给表格赋值
+		PdfPCell programInformation = pdfTableStyle("Compliance Attachments", fontSize, 10, false, false);
+		programInformation.disableBorderSide(15);
+		tableName.addCell(programInformation);
+		//将表格添加到文档对象中
+		document.add(tableName);
+
+		// cell 11 第一行  第一列
+		PdfPCell cell11 = pdfTableStyle("File Name", fontSize, 20, true, true);
+		tableBase.addCell(cell11);
+		PdfPCell cell12 = pdfTableStyle("catalogue", fontSize, 20, true, true);
+		tableBase.addCell(cell12);
+		// cell 21 第二行  第一列
+		PdfPCell cell21 = pdfTableStyle("Checklist.doc", fontSize, 20, true, true);
+		tableBase.addCell(cell21);
+		PdfPCell cell22 = pdfTableStyle("Xxx(显示文件所在的相对路径)", fontSize, 20, true, true);
+		tableBase.addCell(cell22);
+		// cell 31 第三行  第一列
+		PdfPCell cell31 = pdfTableStyle("CADreport.pdf", fontSize, 20, true, true);
+		tableBase.addCell(cell31);
+		PdfPCell cell32 = pdfTableStyle("Xxx(显示文件所在的相对路径)", fontSize, 20, true, true);
+		tableBase.addCell(cell32);
+
+		document.add(tableBase);
+	}
+
+	public void setComplianceResult(PdfPTable tableBase, Document document, Font fontSize, Map<String, Object> params) throws DocumentException {
+		String cut = (String) params.get("cut");
+		//法规id
+		String id = (String) params.get("id");
+		QueryWrapper<ProjectLawsInventoryEO> lawsInventoryQueryWrapper = new QueryWrapper<>();
+		lawsInventoryQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getId, id);
+		ProjectLawsInventoryEO projectLawsInventoryEO = this.baseMapper.selectOne(lawsInventoryQueryWrapper);
+
+		// 单元格宽度
+		float[] cellsWidth = {0.45f, 0.55f};
+		try {
+			tableBase.setWidths(cellsWidth);
+		} catch (Exception ex) {
+			ex.printStackTrace();
+		}
+
+		tableBase.setTotalWidth(500f);//表格的总宽度
+		tableBase.setWidthPercentage(100);// 表格的宽度百分比
+
+		PdfPTable tableName = new PdfPTable(1);
+		//设置段落上空白
+		tableName.setSpacingBefore(25);
+		tableName.setWidthPercentage(widthPercentage);  //设置标题长度占纸张比例
+		//给表格赋值
+		PdfPCell programInformation = pdfTableStyle("Compliance Result", fontSize, 10, false, false);
+		programInformation.disableBorderSide(15);
+		tableName.addCell(programInformation);
+		//将表格添加到文档对象中
+		document.add(tableName);
+
+		// cell 11 第一行  第一列
+		PdfPCell cell11 = pdfTableStyle("Subject", fontSize, 20, true, true);
+		tableBase.addCell(cell11);
+		PdfPCell cell12 = pdfTableStyle("Lamp " + projectLawsInventoryEO.getTitle(), fontSize, 20, true, true);
+		tableBase.addCell(cell12);
+		// cell 21 第二行  第一列
+		PdfPCell cell21 = pdfTableStyle("Conclusion", fontSize, 20, true, true);
+		tableBase.addCell(cell21);
+		PdfPCell cell22 = pdfTableStyle("", fontSize, 20, true, true); //（导出后自己填写）
+		tableBase.addCell(cell22);
+		// cell 31 第三行  第一列
+		PdfPCell cell31 = pdfTableStyle("DiscussionorComments", fontSize, 20, true, true);
+		tableBase.addCell(cell31);
+		PdfPCell cell32 = pdfTableStyle("", fontSize, 20, true, true); //（导出后自己填写）
+		tableBase.addCell(cell32);
+
+		document.add(tableBase);
+	}
+
+	public void setDesignComplianceCheckApprovals(PdfPTable tableBase, Document document, Font fontSize, String[] auditHistoryHead, Map<String, Object> params) throws DocumentException {
+		tableBase.setTotalWidth(500f);//表格的总宽度
+		tableBase.setWidthPercentage(100);// 表格的宽度百分比
+
+		PdfPTable tableName = new PdfPTable(1);
+		//设置段落上空白
+		tableName.setSpacingBefore(25);
+		tableName.setWidthPercentage(widthPercentage);  //设置标题长度占纸张比例
+		//给表格赋值
+		PdfPCell programInformation = pdfTableStyle("designComplianceCheckApprovals", fontSize, 10, false, false);
+		programInformation.disableBorderSide(15);
+		tableName.addCell(programInformation);
+		//将表格添加到文档对象中
+		document.add(tableName);
+
+
+		for (int i = 0; i < auditHistoryHead.length; i++) {
+			tableBase.addCell(new Paragraph(auditHistoryHead[i], fontSize));
+		}
+		document.add(tableBase);
+	}
+
+	public void setValidationComplianceCheckApprovals(PdfPTable tableBase, Document document, Font fontSize, String[] auditHistoryHead, Map<String, Object> params) throws DocumentException {
+		List<Map<String, Object>> list = new ArrayList<>();
+
+		Map<String, Object> map1 = new HashMap<>();
+		map1.put("Result", "");
+		map1.put("Opinion", "Opinion 1");
+		map1.put("Node", "Node 1");
+		map1.put("Operator", "Operator 1");
+		map1.put("Datetime", "Datetime 1");
+		list.add(map1);
+		Map<String, Object> map2 = new HashMap<>();
+		map2.put("Result", "Result 2 ");
+		map2.put("Opinion", "Opinion 2");
+		map2.put("Node", "");
+		map2.put("Operator", "Operator 2");
+		map2.put("Datetime", "Datetime 2");
+		list.add(map2);
+		Map<String, Object> map3 = new HashMap<>();
+		map3.put("Result", "Result 3 ");
+		map3.put("Opinion", "Opinion 3");
+		map3.put("Node", "Node 3");
+		map3.put("Operator", "Operator 3");
+		map3.put("Datetime", "Datetime 3");
+		list.add(map3);
+
+		tableBase.setTotalWidth(500f);//表格的总宽度
+		tableBase.setWidthPercentage(100);// 表格的宽度百分比
+
+		PdfPTable tableName = new PdfPTable(1);
+		//设置段落上空白
+		tableName.setSpacingBefore(25);
+		tableName.setWidthPercentage(widthPercentage);  //设置标题长度占纸张比例
+		//给表格赋值
+		PdfPCell programInformation = pdfTableStyle("validationComplianceCheckApprovals", fontSize, 10, false, false);
+		programInformation.disableBorderSide(15);
+		tableName.addCell(programInformation);
+		//将表格添加到文档对象中
+		document.add(tableName);
+
+		for (int i = 0; i < auditHistoryHead.length; i++) {
+			tableBase.addCell(new Paragraph(auditHistoryHead[i], fontSize));
+		}
+
+		for (Map<String, Object> map : list) {
+			tableBase.addCell(new Paragraph(map.get("Result").toString(), fontSize));
+			tableBase.addCell(new Paragraph(map.get("Opinion").toString(), fontSize));
+			tableBase.addCell(new Paragraph(map.get("Node").toString(), fontSize));
+			tableBase.addCell(new Paragraph(map.get("Operator").toString(), fontSize));
+			tableBase.addCell(new Paragraph(map.get("Datetime").toString(), fontSize));
+		}
+		document.add(tableBase);
+	}
+
+	/**
+	 * 下载docx报告
+	 *
+	 * @param params
+	 * @param req
+	 * @param resp
+	 */
+	@Override
+	public void downloadDocxReport(Map<String, Object> params, HttpServletRequest req, HttpServletResponse resp) {
+		File exportFile = null;
+		InputStream fin = null;
+		ServletOutputStream out = null;
+
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		//导出只有英文，去除中英文切换。
+		params.put("cut", CutEnum.EN.getValue());
+		String id = (String) params.get("id");
+		String cut = (String) params.get("cut");
+
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		log.debug("导出word报告，查询数据开始 =============================================================================");
+		//查询数据
+		QueryWrapper<ProjectLawsInventoryEO> lawsInventoryQueryWrapper = new QueryWrapper<>();
+		lawsInventoryQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getId, id);
+		ProjectLawsInventoryEO projectLawsInventory = this.baseMapper.selectOne(lawsInventoryQueryWrapper);
+		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = new ArrayList<>();
+		projectLawsInventoryEOList.add(projectLawsInventory);
+		this.dataDispose(
+				projectLawsInventoryEOList,
+				currentUser,
+				Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue()),
+				CutEnum.EN.getValue()
+		);
+
+		ProjectLawsInventoryEO projectLawsInventoryEO = projectLawsInventoryEOList.get(0);
+		params.put("projectLawsInventoryEO", projectLawsInventoryEO);
+
+		/*QueryWrapper<ProjectTaskInventoryEO> taskInventoryQueryWrapper = new QueryWrapper<>();
+		taskInventoryQueryWrapper.lambda().eq(ProjectTaskInventoryEO::getProjectLawsInventoryId,id);
+		ProjectTaskInventoryEO projectTaskInventoryEO = projectTaskInventoryEOService.getBaseMapper().selectOne(taskInventoryQueryWrapper);
+		params.put("projectTaskInventoryEO",projectTaskInventoryEO);*/
+
+		QueryWrapper<ProjectLibraryBase> libraryBaseQueryWrapper = new QueryWrapper<>();
+		libraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId, projectLawsInventoryEO.getProjectLibraryId());
+		ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectOne(libraryBaseQueryWrapper);
+		params.put("projectLibraryBase", projectLibraryBase);
+
+		QueryWrapper<ProjectNameInfoEO> projectNameQueryWrapper = new QueryWrapper<>();
+		projectNameQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId());
+		ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameQueryWrapper);
+		params.put("projectNameInfoEO", projectNameInfoEO);
+
+
+		final Map<String, String> dataMap = new HashMap<>();
+		//对应 CR No
+		dataMap.put("crNo", String.valueOf(new SimpleDateFormat("yyyyMMddHHmmssSSSS").format(new Date())));
+
+		String flowStatus = "";
+
+		if (StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyFlowStatusName())) {
+			flowStatus += projectLawsInventoryEO.getVerifyFlowStatusName() + ",";
+		}
+		if (StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignFlowStatusName())) {
+			flowStatus += projectLawsInventoryEO.getDesignFlowStatusName() + ",";
+		}
+		if (StringUtils.isNotEmpty(flowStatus)) {
+			flowStatus = flowStatus.substring(0, flowStatus.length() - 1);
+		}
+
+		//对应 crStatus
+		dataMap.put("FLOW_STATUS", StringUtils.isNotEmpty(flowStatus) ? flowStatus : "");
+		//对应 Regulation
+		dataMap.put("REGULATION", StringUtils.isNotEmpty(projectLawsInventoryEO.getSerialNumber()) ? projectLawsInventoryEO.getSerialNumber() : "");
+		//对应 Subject
+		dataMap.put("SUBJECT", StringUtils.isNotEmpty(projectLawsInventoryEO.getTitle()) ? projectLawsInventoryEO.getTitle() : "");
+		//对应 Project
+		dataMap.put("PROJECT_NAME", StringUtils.isNotEmpty(projectNameInfoEO.getProjectName()) ? projectNameInfoEO.getProjectName() : "");
+
+		List<SysDictItem> regionDictList = sysDictItemServiceImpl.selectItemsByDictCode("region");
+		String market = "";
+		if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+			market = regionDictList.stream()
+					.filter(e -> projectLibraryBase.getTargetMarket().contains(e.getItemValue()))
+					.map(SysDictItem::getItemText)
+					.collect(Collectors.joining(","));
+		} else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
+			market = regionDictList.stream()
+					.filter(e -> projectLibraryBase.getTargetMarket().contains(e.getItemValue()))
+					.map(SysDictItem::getEnName)
+					.collect(Collectors.joining(","));
+		}
+		//对应 Market
+		dataMap.put("MARKET", StringUtils.isNotEmpty(market) ? market : "");
+		//对应 nt 数字平台
+		dataMap.put("NT", StringUtils.isNotEmpty(projectNameInfoEO.getDigitalPlatform()) ? projectNameInfoEO.getDigitalPlatform() : "");
+		//对应 np 车型平台
+		dataMap.put("NP", StringUtils.isNotEmpty(projectNameInfoEO.getVehiclePlatform()) ? projectNameInfoEO.getVehiclePlatform() : "");
+		String processEndTimeStr = "";
+		// 流程最后结束的时间
+		if (projectLawsInventoryEO.getProcessEndTime() != null) {
+			processEndTimeStr = sdf.format(projectLawsInventoryEO.getProcessEndTime());
+		}
+		dataMap.put("COMPLETION_DATE", StringUtils.isNotEmpty(processEndTimeStr) ? processEndTimeStr : "");
+
+		String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
+		String finalDutyTerritory = dutyTerritory;
+		List<SysDictItem> dutyTerritoryDictItemList = sysDictItemServiceImpl.selectItemsByDictCode("duty_territory");
+		String dutyTerritoryName = "";
+		if (StringUtils.isNotEmpty(finalDutyTerritory)) {
+			if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+				dutyTerritoryName = dutyTerritoryDictItemList.stream()
+						.filter(e -> finalDutyTerritory.contains(e.getItemValue()))
+						.map(SysDictItem::getItemText)
+						.collect(Collectors.joining(","));
+			} else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
+				dutyTerritoryName = dutyTerritoryDictItemList.stream()
+						.filter(e -> finalDutyTerritory.contains(e.getItemValue()))
+						.map(SysDictItem::getEnName)
+						.collect(Collectors.joining(","));
+			}
+		}
+		dataMap.put("RESPONSIBLE_FIELD", StringUtils.isNotEmpty(dutyTerritoryName) ? dutyTerritoryName : "");
+
+		String studioEngineer = projectLibraryBase.getStudioEngineer();
+		QueryWrapper<SysUser> queryStudioUserWrapper = new QueryWrapper<>();
+		queryStudioUserWrapper.lambda().eq(SysUser::getId, studioEngineer);
+		SysUser studioUserInfo = sysUserMapper.selectOne(queryStudioUserWrapper);
+		dataMap.put("STUDIO", StringUtils.isNotEmpty(studioUserInfo.getUsername()) ? studioUserInfo.getUsername() : "");
+
+		String engineeringInterfacePerson = projectLawsInventoryEO.getEngineeringInterfacePerson();
+		String engineeringInterfaceName = "";
+		if (StringUtils.isNotEmpty(engineeringInterfacePerson)) {
+			QueryWrapper<SysUser> queryEngineeringInterfaceUserWrapper = new QueryWrapper<>();
+			queryEngineeringInterfaceUserWrapper.lambda().eq(SysUser::getId, engineeringInterfacePerson);
+			SysUser engineeringInterfaceInfo = sysUserMapper.selectOne(queryEngineeringInterfaceUserWrapper);
+			engineeringInterfaceName = engineeringInterfaceInfo.getUsername();
+		}
+
+		dataMap.put("ENGINEERING", StringUtils.isNotEmpty(engineeringInterfaceName) ? engineeringInterfaceName : "");
+
+		String homologationEngineerId = projectLawsInventoryEO.getHomologationEngineerId();
+		String homologationEngineerName = "";
+		if (StringUtils.isNotEmpty(homologationEngineerId)) {
+			QueryWrapper<SysUser> queryHomologationEngineerUserWrapper = new QueryWrapper<>();
+			queryHomologationEngineerUserWrapper.lambda().eq(SysUser::getId, homologationEngineerId);
+			SysUser homologationEngineerInfo = sysUserMapper.selectOne(queryHomologationEngineerUserWrapper);
+			homologationEngineerName = homologationEngineerInfo.getUsername();
+		}
+		dataMap.put("HOMOLOGATION", StringUtils.isNotEmpty(homologationEngineerName) ? homologationEngineerName : "");
+
+		String regulationOwnerId = projectLawsInventoryEO.getRegulationOwnerId();
+		String regulationOwnerName = "";
+		if (StringUtils.isNotEmpty(regulationOwnerId)) {
+			QueryWrapper<SysUser> queryRegulationOwnerUserWrapper = new QueryWrapper<>();
+			queryRegulationOwnerUserWrapper.lambda().eq(SysUser::getId, regulationOwnerId);
+			SysUser regulationOwnerInfo = sysUserMapper.selectOne(queryRegulationOwnerUserWrapper);
+			regulationOwnerName = regulationOwnerInfo.getUsername();
+		}
+		dataMap.put("REGULATION_ENG", StringUtils.isNotEmpty(regulationOwnerName) ? regulationOwnerName : "");
+		log.debug("导出word报告，查询数据结束 =============================================================================");
+		log.debug("导出word报告，获取模板开始 =============================================================================");
+		//File templateFile = new File(exportPdfTempPath + "temp/ComplianceReportTemplate.docx");
+		InputStream inputStream = PlatformProjectLawsInventoryEOServiceImpl.class.getClassLoader().getResourceAsStream("exportPdfTemp/ComplianceReportTemplate.docx");
+		/*try {
+			FileUtils.copyInputStreamToFile(inputStream, templateFile);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}*/
+
+
+		log.debug("导出word报告，获取模板结束 =============================================================================");
+		//if(templateFile != null){
+		if (inputStream != null) {
+			try {
+				String uuid = UUID.randomUUID().toString();
+				//final String TEMP_FILE_PATH = System.getProperty("os.name").toLowerCase().contains("windows") ? System.getProperty("user.dir") + File.separator : "/home/admin/tempfile/";
+				final String TEMP_FILE_PATH = exportPdfTempPath + "exportFile/";
+
+				File pathFile = new File(TEMP_FILE_PATH);
+				if (!pathFile.exists()) {
+					pathFile.mkdirs();
+				}
+				String outFile = TEMP_FILE_PATH + uuid + ".docx";
+				exportFile = new File(outFile);
+				FileOutputStream os = new FileOutputStream(outFile);
+				//WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.load(new FileInputStream(templateFile));
+				WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.load(inputStream);
+
+				//验证符合性流程实例id
+				String verifyPId = projectLawsInventoryEO.getVerifyPId();
+				//Compliance Attachments 验证符合性流程里最后通过审批的“工程确认”中的附件
+				setTableContent(1, wordMLPackage, params, verifyPId);
+				//Validation Compliance Check Approvals（验证符合性确认的审批历史数据）
+				setTableContent(4, wordMLPackage, params, verifyPId);
+
+				//设计符合性流程实例id
+				String designPId = projectLawsInventoryEO.getDesignPId();
+				//Design Compliance Check Approvals （设计符合性确认的审批历史数据)
+				setTableContent(3, wordMLPackage, params, designPId);
+
+				WordUtil.replaceVariable(wordMLPackage, dataMap);
+				Docx4J.save(wordMLPackage, os);
+
+				//将替换后的文档输出出去。
+				fin = new FileInputStream(outFile);
+				resp.setCharacterEncoding("utf-8");
+				resp.setContentType("application/docx");
+
+				String filename = "";
+				if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+					filename = "法规清单报告";
+				} else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
+					filename = "Compliance List report";
+				}
+				// 设置浏览器以下载的方式处理该文件
+				if (req.getHeader("User-Agent").toUpperCase().indexOf("MSIE") > 0) {
+					filename = URLEncoder.encode(filename, "UTF-8");
+				} else {
+					filename = new String(filename.getBytes("UTF-8"), "ISO8859-1");
+				}
+				resp.setHeader("Content-Disposition", "attachment;filename=" + filename + ".docx");
+				out = resp.getOutputStream();
+
+				// 缓冲区
+				byte[] buffer = new byte[512];
+				int bytesToRead = -1;
+
+				// 通过循环将读入的Word文件的内容输出到浏览器中
+				while ((bytesToRead = fin.read(buffer)) != -1) {
+					out.write(buffer, 0, bytesToRead);
+				}
+			} catch (IOException e) {
+				e.printStackTrace();
+			} catch (Exception e) {
+				e.printStackTrace();
+			} finally {
+				try {
+					if (fin != null) {
+						fin.close();
+					}
+					if (out != null) {
+						out.close();
+					}
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+
+				if (exportFile != null) {
+					// 删除导出去的文件
+					exportFile.delete();
+				}
+			}
+		} else {
+			throw new JeroBootException("路径 ：" + exportPdfTempPath + "temp/ComplianceReportTemplate.docx" + " 中没有找到文件");
+		}
+	}
+
+	/**
+	 * 设置表内容
+	 *
+	 * @param tableIndex    表的下标
+	 * @param wordMLPackage
+	 * @param params
+	 * @param pId           流程实例id
+	 */
+	public void setTableContent(int tableIndex, WordprocessingMLPackage wordMLPackage, Map<String, Object> params, String pId) {
+		try {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+			List<Map<String, Object>> dataList = new ArrayList<>();
+			// 设置数据
+			if (StringUtils.isNotEmpty(pId)) {
+				if (tableIndex == 1) {
+					/*QueryWrapper<ProjectTaskInventoryFeedbackEO> taskFeedbackQueryWrapper = new QueryWrapper<>();
+					taskFeedbackQueryWrapper.lambda().eq(ProjectTaskInventoryFeedbackEO::getActiProcInstId,pId);
+					List<ProjectTaskInventoryFeedbackEO> projectTaskInventoryFeedbackEOList = projectTaskInventoryFeedbackEOService.getBaseMapper().selectList(taskFeedbackQueryWrapper);
+					if(CollectionUtils.isNotEmpty(projectTaskInventoryFeedbackEOList)){
+						List<String> fileIdList = projectTaskInventoryFeedbackEOList.stream().map(ProjectTaskInventoryFeedbackEO::getFileId).distinct().collect(Collectors.toList());
+						String fileId = StringUtils.join(fileIdList,",");
+						List<OSSFile> fileList = iOSSFileService.getFileInfos(fileId);
+						if(CollectionUtils.isNotEmpty(fileList)){
+							fileList.forEach(file -> {
+								Map<String,Object> fileMap = new HashMap<>();
+								fileMap.put("ITEM_FILENAME", StringUtils.isNotEmpty(file.getFileName()) ? file.getFileName() : "");
+								fileMap.put("ITEM_FILEPATH", StringUtils.isNotEmpty(file.getUrl()) ? file.getUrl() : "");
+								*//*fileMap.put("item.fileName", file.getFileName());
+								fileMap.put("item.filePath", file.getUrl());*//*
+								dataList.add(fileMap);
+							});
+						}
+					}*/
+					params.put("actiProcInstId", pId);
+					List<ProcessHistoryEO> processHistoryEOList = processHistoryEOService.queryList(params);
+					if (CollectionUtils.isNotEmpty(processHistoryEOList)) {
+						List<String> fileIdList = processHistoryEOList.stream().map(ProcessHistoryEO::getApprovalFile).distinct().collect(Collectors.toList());
+						String fileId = StringUtils.join(fileIdList, ",");
+						List<OSSFile> fileList = iOSSFileService.getFileInfos(fileId);
+						if (CollectionUtils.isNotEmpty(fileList)) {
+							fileList.forEach(file -> {
+								Map<String, Object> fileMap = new HashMap<>();
+								fileMap.put("ITEM_FILENAME", StringUtils.isNotEmpty(file.getFileName()) ? file.getFileName() : "");
+								fileMap.put("ITEM_FILEPATH", StringUtils.isNotEmpty(file.getUrl()) ? file.getUrl() : "");
+								/*fileMap.put("item.fileName", file.getFileName());
+								fileMap.put("item.filePath", file.getUrl());*/
+								dataList.add(fileMap);
+							});
+						}
+					}
+				} else if (tableIndex == 3) {
+					params.put("actiProcInstId", pId);
+					List<ProcessHistoryEO> processHistoryEOList = processHistoryEOService.queryList(params);
+					if (CollectionUtils.isNotEmpty(processHistoryEOList)) {
+						processHistoryEOList.forEach(processHistory -> {
+							String createTime = sdf.format(processHistory.getCreateTime());
+
+							Map<String, Object> designMap = new HashMap<>();
+							designMap.put("DESIGN_RESULT", StringUtils.isNotEmpty(processHistory.getReviewResult()) ? processHistory.getReviewResult() : "");
+							designMap.put("DESIGN_OPINION", StringUtils.isNotEmpty(processHistory.getApprovalOpinion()) ? processHistory.getApprovalOpinion() : "");
+							designMap.put("DESIGN_NODE", StringUtils.isNotEmpty(processHistory.getName()) ? processHistory.getName() : "");
+							designMap.put("DESIGN_OPERATOR", StringUtils.isNotEmpty(processHistory.getAssignee()) ? processHistory.getAssignee() : "");
+							designMap.put("DESIGN_DATETIME", StringUtils.isNotEmpty(createTime) ? createTime : "");
+
+							/*designMap.put("design.result", processHistory.getReviewResult());
+							designMap.put("design.opinion", processHistory.getApprovalOpinion());
+							designMap.put("design.node", processHistory.getName());
+							designMap.put("design.operator", processHistory.getAssignee());
+							designMap.put("design.dateTime", createTime);*/
+							dataList.add(designMap);
+						});
+					}
+				} else if (tableIndex == 4) {
+					params.put("actiProcInstId", pId);
+					List<ProcessHistoryEO> processHistoryEOList = processHistoryEOService.queryList(params);
+					if (CollectionUtils.isNotEmpty(processHistoryEOList)) {
+						processHistoryEOList.forEach(processHistory -> {
+							String createTime = sdf.format(processHistory.getCreateTime());
+
+							Map<String, Object> verifyMap = new HashMap<>();
+							verifyMap.put("VERIFY_RESULT", StringUtils.isNotEmpty(processHistory.getReviewResult()) ? processHistory.getReviewResult() : "");
+							verifyMap.put("VERIFY_OPINION", StringUtils.isNotEmpty(processHistory.getApprovalOpinion()) ? processHistory.getApprovalOpinion() : "");
+							verifyMap.put("VERIFY_NODE", StringUtils.isNotEmpty(processHistory.getName()) ? processHistory.getName() : "");
+							verifyMap.put("VERIFY_OPERATOR", StringUtils.isNotEmpty(processHistory.getAssignee()) ? processHistory.getAssignee() : "");
+							verifyMap.put("VERIFY_DATETIME", StringUtils.isNotEmpty(createTime) ? createTime : "");
+
+							/*verifyMap.put("verify.result", processHistory.getReviewResult());
+							verifyMap.put("verify.opinion", processHistory.getApprovalOpinion());
+							verifyMap.put("verify.node", processHistory.getName());
+							verifyMap.put("verify.operator", processHistory.getAssignee());
+							verifyMap.put("verify.dateTime", createTime);*/
+							dataList.add(verifyMap);
+						});
+					}
+				}
+			}
+
+			//构造循环列表的数据
+			ClassFinder find = new ClassFinder(Tbl.class);
+			new TraversalUtil(wordMLPackage.getMainDocumentPart().getContent(), find);
+			Tbl table = (Tbl) find.results.get(tableIndex);
+			//第二行约定为模板
+			Tr dynamicTr = (Tr) table.getContent().get(1);
+			//获取模板行的xml数据
+			String dynamicTrXml = XmlUtils.marshaltoString(dynamicTr);
+
+			for (Map<String, Object> mapList : dataList) {
+				Tr newTr = (Tr) XmlUtils.unmarshallFromTemplate(dynamicTrXml, mapList);//填充模板行数据
+				table.getContent().add(newTr);
+			}
+			//删除模板行的占位行
+			table.getContent().remove(1);
+		} catch (Exception ex) {
+			ex.printStackTrace();
+		}
+	}
+
+	public static WordprocessingMLPackage getTemplate(String name) throws Docx4JException, FileNotFoundException {
+		WordprocessingMLPackage template = WordprocessingMLPackage.load(new FileInputStream(new File(name)));
+		return template;
+	}
+
+	/**
+	 * 催办
+	 *
+	 * @param json
+	 * @return
+	 */
+	@Override
+	public Result<?> expediting(JSONObject json) {
+		String cut = json.getString("cut");
+		String ids = json.getString("ids");
+		String projectLibraryId = json.getString("projectLibraryId");
+		String operateType = json.getString("operateType"); // 操作类型，判断是studio催办  还是法规工程师催办
+		if (StringUtils.isEmpty(ids)) {
+			if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+				throw new JeroBootException("请至少选择一条数据！");
+			} else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
+				throw new JeroBootException("Please select at least one data!");
+			}
+		}
+
+		//法规清单id数组
+		List<String> projectLawsInventoryIdList = Arrays.asList(ids.split(","));
+
+		QueryWrapper<ProjectLawsInventoryEO> lawsInventoryEOQueryWrapper = new QueryWrapper<>();
+		lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId, projectLibraryId);
+		lawsInventoryEOQueryWrapper.lambda().in(ProjectLawsInventoryEO::getId, projectLawsInventoryIdList);
+		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = this.baseMapper.selectList(lawsInventoryEOQueryWrapper);
+
+		// 催办类型 可以只催设计符合性  也可以只催验证符合性
+		String expeditingType = json.getString("expeditingType");
+		if (StringUtils.contains(expeditingType, OperatorTypeEnum.LAWS_INVENTORY_DESIGN_EXPEDITING.getValue())) {
+			// 只有studio催办的时候，才会给法规工程师发消息
+			if (StringUtils.equals(operateType, OperatorTypeEnum.LAWS_INVENTORY_STUDIO_EXPEDITING.getValue())) {
+				// 设计符合性 清单待校核状态数据催办。
+				this.designExpeditingToBeChecked(projectLibraryId, projectLawsInventoryEOList);
+				// 设计符合性 结果待审查状态数据催办。
+				this.designExpeditingToBeReviewed(projectLibraryId, projectLawsInventoryEOList);
+			}
+			// 设计符合性 清单待确认状态数据催办
+			this.designExpeditingToBeConfirmed(projectLibraryId, projectLawsInventoryEOList);
+			// 设计符合性 结果待提交状态数据催办
+			this.designExpeditingToBeSubmitted(projectLibraryId, projectLawsInventoryEOList);
+		}
+		if (StringUtils.contains(expeditingType, OperatorTypeEnum.LAWS_INVENTORY_VERIFY_EXPEDITING.getValue())) {
+			// 只有studio催办的时候，才会给法规工程师发消息
+			if (StringUtils.equals(operateType, OperatorTypeEnum.LAWS_INVENTORY_STUDIO_EXPEDITING.getValue())) {
+				// 验证符合性 清单待校核状态数据催办。
+				this.verifyExpeditingToBeChecked(projectLibraryId, projectLawsInventoryEOList);
+				// 验证符合性 结果待审查状态数据催办。
+				this.verifyExpeditingToBeReviewed(projectLibraryId, projectLawsInventoryEOList);
+			}
+			// 验证符合性 清单待确认状态数据催办
+			this.verifyExpeditingToBeConfirmed(projectLibraryId, projectLawsInventoryEOList);
+			// 验证符合性 结果待提交状态数据催办
+			this.verifyExpeditingToBeSubmitted(projectLibraryId, projectLawsInventoryEOList);
+		}
+
+		/*//获取已经发起的 任务确认流程信息（当前处理人）
+		JSONObject queryFlowCurrentTaskJson = new JSONObject();
+		queryFlowCurrentTaskJson.put("projectLawsInventoryIdList",projectLawsInventoryIdList);
+		queryFlowCurrentTaskJson.put("flowType",FlowTypeEnum.RWQRLC.getValue());
+		String result = this.taskFeignClient.queryFlowCurrentTask(queryFlowCurrentTaskJson);
+		JSONObject jsonObject = JSONObject.parseObject(result);
+
+		QueryWrapper<ProjectLibraryBase> libraryBaseQueryWrapper = new QueryWrapper<>();
+		libraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId,projectLibraryId);
+		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseMapper.selectOne(libraryBaseQueryWrapper);
+
+		SysUser studioUserInfo = this.sysUserMapper.selectOne(
+				new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer())
+		);
+
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		projectLawsInventoryEOList.forEach(projectLawsInventoryEO -> {
+
+			//如果清单确认状态为待确认的，进行催办
+			if(StringUtils.equals(projectLawsInventoryEO.getInventoryAffirmStatus(),InventoryAffirmStatusEnum.LIST_TO_CONFIRM.getValue())){
+				List<String> inventoryAffirmUserIdList = new ArrayList<>();
+
+				if(StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerSubmitStatus())){
+					//如果'认证工程师提交状态'为空，则代表认证工程师没提交过，给认证工程师发消息
+					inventoryAffirmUserIdList.add(projectLawsInventoryEO.getHomologationEngineerId());
+				}
+
+				if(StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerSubmitStatus())){
+					//如果'法规工程师提交状态'为空，则代表认证工程师没提交过，给认证工程师发消息
+					inventoryAffirmUserIdList.add(projectLawsInventoryEO.getRegulationOwnerId());
+				}
+
+				if(CollectionUtils.isNotEmpty(inventoryAffirmUserIdList)){
+					//如果清单确认 没办理的用户不为空，给这些人发送消息，清单确认催办
+					inventoryAffirmUserIdList = inventoryAffirmUserIdList.stream().distinct().collect(Collectors.toList());
+
+					log.debug("清单确认待办人员：" + inventoryAffirmUserIdList.toString());
+
+					QueryWrapper<ProjectNameInfoEO> projectNameInfoEOQueryWrapper = new QueryWrapper<>();
+					projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId());
+					ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
+
+					QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
+					projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId());
+					ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper);
+
+					//消息内容
+					//String msgContentEN = "Please address the regulation list confirmation process for "+ projectNameInfoEO.getProjectName() +" ASAP. ";
+					//String msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					//		+ ": You have a regulation task confirmation to complete";
+
+					//FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
+					//feishuMsgVo.setContent("Hello! Please address the regulation list confirmation process ASAP. ");
+					//feishuMsgVo.setTaskType("Regulation List Confirmation");
+					//feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
+
+							//飞书跳转链接
+					String hrefFeishu = backUrl
+							+ JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink()
+							+ projectLibraryId
+							+ JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType()
+							+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
+							+ projectYearNameInfoEO.getYearName()
+							+ "&targetMarket=" + projectLibraryBase.getTargetMarket();
+					//系统内部跳转链接
+					//String href = "<a href='"
+					//		+ JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryId + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType()
+					//		+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
+					//		+ projectYearNameInfoEO.getYearName()
+					//		+ "&targetMarket=" + projectLibraryBase.getTargetMarket()
+					//		+ "'>" + " View details" + "</a>";
+					//String contentInfo = msgContentEN + " " + href;
+					//Map<String,Object> sendMessageMap = new HashMap<>();
+					//sendMessageMap.put("hrefFeishu",hrefFeishu);
+					//sendMessageMap.put("contentInfo",contentInfo);
+
+					//发送消息
+					//sendMessage(msgTitle, msgContentEN,inventoryAffirmUserIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.LIST_CONFIRMATION,studioUserInfo.getUsername());
+
+					String projectVersion = (com.jero.modules.system.util.StringUtils.isBlank(projectLibraryBase.getParentId()) && com.jero.modules.system.util.StringUtils.isBlank(projectLibraryBase.getProjectVersion())) ? "00" : projectLibraryBase.getProjectVersion();
+					String PRN = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + "-" + projectLibraryBase.getTargetMarket() + "-" + projectVersion;
+
+					String dueDate = new SimpleDateFormat("yyyy-MM-dd").format(projectLawsInventoryEO.getInventoryAffirmDueDate());
+
+					List<String> thirdIdList = new ArrayList<>();
+					List<SysUser> sysUsers = sysUserService.listByIds(inventoryAffirmUserIdList);
+					if (ObjectUtils.isNotEmpty(sysUsers)) {
+						thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList());
+					}
+					try {
+						FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+						feishuMsgVo.setTitle(MessageType2Enum.REGULATION_LIST_CONFIRMATION.getCn() + "/" + MessageType2Enum.REGULATION_LIST_CONFIRMATION.getEn());
+						feishuMsgVo.setCnContentUpper("您好，请尽快查看处理此项任务，谢谢！");
+						feishuMsgVo.setCnContentLower("项目: " + PRN +
+								"\n发起人: " + currentUser.getUsername() +
+								"\n截止时间: " + dueDate);
+						feishuMsgVo.setEnContentUpper("Please check and address the task in a timely manner. Thank you!");
+						feishuMsgVo.setEnContentLower("Project: " + PRN +
+								"\nInitiator: " + currentUser.getUsername() +
+								"\nDue Date: "+ dueDate);
+						feishuMsgVo.setUrl(hrefFeishu);
+						feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
+						feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
+					} catch (IOException e) {
+						log.error("飞书消息推送失败");
+					}
+				}
+			}
+
+			//如果任务确认状态为待确认的，进行催办
+			if(StringUtils.equals(projectLawsInventoryEO.getTaskAffirmStatus(),TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue())){
+				List<String> taskAffirmUserIdList = new ArrayList<>();
+
+				List<Map<String,Object>> currentTaskList = (List<Map<String,Object>>) jsonObject.get("currentTaskList");
+
+				List<String> finalTaskAffirmUserIdList = new ArrayList<>();
+				currentTaskList.forEach(currentTask -> {
+					String projectLawsInventoryId = (String) currentTask.get("projectLawsInventoryId");
+					if(StringUtils.equals(projectLawsInventoryId,projectLawsInventoryEO.getId())){
+						List<Map<String,Object>> taskList = (List<Map<String,Object>>) currentTask.get("taskList");
+						taskList.forEach(task -> {
+							String assignee = (String) task.get("assignee");
+							finalTaskAffirmUserIdList.add(assignee);
+						});
+					}
+				});
+
+				if(CollectionUtils.isNotEmpty(finalTaskAffirmUserIdList)){
+					//如果任务确认 没办理的用户不为空，给这些人发送消息，任务确认催办
+					taskAffirmUserIdList = finalTaskAffirmUserIdList.stream().distinct().collect(Collectors.toList());
+					log.debug("任务确认待办人员：" + taskAffirmUserIdList.toString());
+
+					QueryWrapper<ProjectNameInfoEO> projectNameInfoEOQueryWrapper = new QueryWrapper<>();
+					projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId());
+					ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
+
+					QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
+					projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId());
+					ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper);
+
+					//消息内容
+					//String msgContentEN = "Please address the regulation task confirmation process for "+ projectNameInfoEO.getProjectName() +" ASAP. ";
+					//String msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					//		+ ": You have a regulation task confirmation to complete";
+
+					//FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
+					//feishuMsgVo.setContent("Hello! Please address the task ASAP. ");
+					//feishuMsgVo.setTaskType("Regulation List Confirmation");
+					//feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
+
+					//飞书跳转链接
+					String hrefFeishu = backUrl + JumpLinkEnum.TASK_AFFIRM_LINK.getLink();
+					//系统内部跳转链接
+					//String href = "<a href='" + JumpLinkEnum.TASK_AFFIRM_LINK.getLink() + "'>" + " View details" + "</a>";
+
+					//String contentInfo = msgContentEN + " " + href;
+					//Map<String,Object> sendMessageMap = new HashMap<>();
+					//sendMessageMap.put("hrefFeishu",hrefFeishu);
+					//sendMessageMap.put("contentInfo",contentInfo);
+
+					//发送消息
+					//sendMessage(msgTitle, msgContentEN,taskAffirmUserIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK_CONFIRMATION,studioUserInfo.getUsername());
+
+					String projectVersion = (com.jero.modules.system.util.StringUtils.isBlank(projectLibraryBase.getParentId()) && com.jero.modules.system.util.StringUtils.isBlank(projectLibraryBase.getProjectVersion())) ? "00" : projectLibraryBase.getProjectVersion();
+					String PRN = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + "-" + projectLibraryBase.getTargetMarket() + "-" + projectVersion;
+
+					String dueDate = new SimpleDateFormat("yyyy-MM-dd").format(projectLawsInventoryEO.getTaskAffirmDueDate());
+					//法规中英文
+					BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(projectLawsInventoryEO.getStandId());
+					String LAW_EN = "";
+					if (ObjectUtils.isEmpty(bussDocumentLibraryEO)) {
+						LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle();
+					} else {
+						if (ObjectUtils.isEmpty(bussDocumentLibraryEO.getTitleEn())) {
+							LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle();
+						} else {
+							LAW_EN = projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规
+						}
+					}
+
+					List<String> thirdIdList = new ArrayList<>();
+					List<SysUser> sysUsers = sysUserService.listByIds(taskAffirmUserIdList);
+					if (ObjectUtils.isNotEmpty(sysUsers)) {
+						thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList());
+					}
+					try {
+						FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+						feishuMsgVo.setTitle(MessageType2Enum.REGULATION_TASK_CONFIRMATION.getCn() + "/" + MessageType2Enum.REGULATION_TASK_CONFIRMATION.getEn());
+						feishuMsgVo.setCnContentUpper("您好，请尽快查看处理此项任务，谢谢！");
+						feishuMsgVo.setCnContentLower("项目: " + PRN +
+								"\n法规: " + projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle() +
+								"\n发起人: " + currentUser.getUsername() +
+								"\n截止时间: " + dueDate);
+						feishuMsgVo.setEnContentUpper("Hello! Please check and address the task ASAP. Thank you!");
+						feishuMsgVo.setEnContentLower("Project: " + PRN +
+								"\nRegulation No: " + LAW_EN +
+								"\nInitiator: " + currentUser.getUsername() +
+								"\nDue Date: "+ dueDate);
+						feishuMsgVo.setUrl(hrefFeishu);
+						feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
+						feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
+					} catch (IOException e) {
+						log.error("飞书消息推送失败");
+					}
+
+				}
+			}
+		});*/
+
+		return Result.OK();
+	}
+
+	/**
+	 * 验证符合性 结果待提交状态数据催办
+	 *
+	 * @param projectLibraryId
+	 * @param projectLawsInventoryEOList
+	 */
+	private void verifyExpeditingToBeSubmitted(String projectLibraryId, List<ProjectLawsInventoryEO> projectLawsInventoryEOList) {
+		// 催办验证符合性流程状态为 结果待提交的 责任人
+		List<ProjectLawsInventoryEO> toBeSubmitLawsInventoryList = projectLawsInventoryEOList.stream().filter(lawsInventory -> {
+			boolean flag = false;
+			if (StringUtils.equals(lawsInventory.getVerifyFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())) {
+				flag = true;
+			}
+			return flag;
+		}).collect(Collectors.toList());
+		if (CollectionUtils.isNotEmpty(toBeSubmitLawsInventoryList)) {
+			Map<String, List<ProjectLawsInventoryEO>> verifyDutyGroupMap = toBeSubmitLawsInventoryList.stream().collect(Collectors.groupingBy(ProjectLawsInventoryEO::getVerifyDutyId));
+			for (Map.Entry<String, List<ProjectLawsInventoryEO>> verifyDutyMap : verifyDutyGroupMap.entrySet()) {
+				String verifyDutyId = verifyDutyMap.getKey();
+				List<ProjectLawsInventoryEO> lawsInventoryEOList = verifyDutyMap.getValue();
+				if (StringUtils.isEmpty(verifyDutyId) || CollectionUtils.isEmpty(lawsInventoryEOList)) {
+					continue;
+				}
+				this.lawsInventoryEOListSortByVerifyDueDate(lawsInventoryEOList);
+
+				Date verifyDueDate = lawsInventoryEOList.get(0).getVerifyDueDate();
+				String endTime = "";
+				if (verifyDueDate != null) {
+					endTime = DateUtils.formatDate(verifyDueDate);
+				}
+				String serialNumbers = lawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(","));
+
+				List<String> userIdList = Arrays.asList(verifyDutyId.split(","));
+				// 给设计符合性流程责任人发消息
+				Map<String, Object> params = new HashMap<>();
+				params.put("contentCn", "您好，请尽快查看处理此项任务，谢谢！");
+				params.put("contentEn", "Hello! Please check and address the task ASAP. Thank you!");
+				params.put("projectLibraryId", projectLibraryId);
+				params.put("endTime", endTime);
+				params.put("userIdList", userIdList);
+				params.put("serialNumbers", serialNumbers);
+
+				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
+					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+					// 获取待办中心 - 飞书跳转链接
+					Map<String, Object> todoCenterParams = new HashMap<>();
+					todoCenterParams.put("projectNameCn", PRN_CN);
+					todoCenterParams.put("projectNameEn", PRN_EN);
+					Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
+					params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN"));
+					params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN"));
+					params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
+
+					String regulationOwnerId = lawsInventoryEOList.get(0).getRegulationOwnerId();
+					List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+					String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+					params.put("Initiator", regulationOwnerUserName);
+
+					this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(), params);
+				}
+			}
+		}
+	}
+
+	/**
+	 * 验证符合性 清单待确认状态数据催办
+	 *
+	 * @param projectLibraryId
+	 * @param projectLawsInventoryEOList
+	 */
+	private void verifyExpeditingToBeConfirmed(String projectLibraryId, List<ProjectLawsInventoryEO> projectLawsInventoryEOList) {
+		// 催办验证符合性流程状态为 清单待确认的 责任人
+		List<ProjectLawsInventoryEO> toBeConfirmedLawsInventoryList = projectLawsInventoryEOList.stream().filter(lawsInventory -> {
+			boolean flag = false;
+			if (StringUtils.equals(lawsInventory.getVerifyFlowStatus(), ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())) {
+				flag = true;
+			}
+			return flag;
+		}).collect(Collectors.toList());
+		if (CollectionUtils.isNotEmpty(toBeConfirmedLawsInventoryList)) {
+			Map<String, List<ProjectLawsInventoryEO>> verifyDutyGroupMap = toBeConfirmedLawsInventoryList.stream().collect(Collectors.groupingBy(ProjectLawsInventoryEO::getVerifyDutyId));
+			for (Map.Entry<String, List<ProjectLawsInventoryEO>> verifyDutyMap : verifyDutyGroupMap.entrySet()) {
+				String verifyDutyId = verifyDutyMap.getKey();
+				List<ProjectLawsInventoryEO> lawsInventoryEOList = verifyDutyMap.getValue();
+				if (StringUtils.isEmpty(verifyDutyId) || CollectionUtils.isEmpty(lawsInventoryEOList)) {
+					continue;
+				}
+
+				this.lawsInventoryEOListSortByVerifyDueDate(lawsInventoryEOList);
+				Date verifyDueDate = lawsInventoryEOList.get(0).getVerifyDueDate();
+				String endTime = "";
+				if (verifyDueDate != null) {
+					endTime = DateUtils.formatDate(verifyDueDate);
+				}
+				String serialNumbers = lawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(","));
+
+				List<String> userIdList = Arrays.asList(verifyDutyId.split(","));
+				// 给验证符合性流程责任人发消息
+				Map<String, Object> params = new HashMap<>();
+				params.put("contentCn", "您好，请及时查看确认以下任务要求，谢谢！");
+				params.put("contentEn", "Hello! Please check and confirm the following task requirement in a timely manner. Thank you!");
+				params.put("projectLibraryId", projectLibraryId);
+				params.put("endTime", endTime);
+				params.put("userIdList", userIdList);
+				params.put("serialNumbers", serialNumbers);
+				params.put("flowTypeCn","验证符合性流程");
+				params.put("flowTypeEn","Validation Compliance Process");
+
+				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
+					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+					// 获取待办中心 - 飞书跳转链接
+					Map<String, Object> todoCenterParams = new HashMap<>();
+					todoCenterParams.put("projectNameCn", PRN_CN);
+					todoCenterParams.put("projectNameEn", PRN_EN);
+					Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryId, todoCenterParams);
+					params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN"));
+					params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN"));
+					params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
+
+					String regulationOwnerId = lawsInventoryEOList.get(0).getRegulationOwnerId();
+					List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+					String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+					params.put("Initiator", regulationOwnerUserName);
+
+					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(), params);
+				}
+			}
+		}
+	}
+
+	/**
+	 * 验证符合性 结果待审查状态数据催办。
+	 *
+	 * @param projectLibraryId
+	 * @param projectLawsInventoryEOList
+	 */
+	private void verifyExpeditingToBeReviewed(String projectLibraryId, List<ProjectLawsInventoryEO> projectLawsInventoryEOList) {
+		// 如果验证符合性流程状态为 结果待审查，催办时就需要给这一条数据的法规工程师发消息
+		List<ProjectLawsInventoryEO> toBeReviewedLawsInventoryList = projectLawsInventoryEOList.stream().filter(lawsInventory -> {
+			boolean flag = false;
+			if (StringUtils.equals(lawsInventory.getVerifyFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())) {
+				flag = true;
+			}
+			return flag;
+		}).collect(Collectors.toList());
+
+		if (CollectionUtils.isNotEmpty(toBeReviewedLawsInventoryList)) {
+			Map<String, List<ProjectLawsInventoryEO>> regulationOwnerGroupMap = toBeReviewedLawsInventoryList.stream().collect(Collectors.groupingBy(ProjectLawsInventoryEO::getRegulationOwnerId));
+			for (Map.Entry<String, List<ProjectLawsInventoryEO>> regulationOwnerMap : regulationOwnerGroupMap.entrySet()) {
+				String regulationOwnerId = regulationOwnerMap.getKey();
+				List<ProjectLawsInventoryEO> lawsInventoryEOList = regulationOwnerMap.getValue();
+				if (StringUtils.isEmpty(regulationOwnerId) || CollectionUtils.isEmpty(lawsInventoryEOList)) {
+					continue;
+				}
+
+				this.lawsInventoryEOListSortByVerifyDueDate(lawsInventoryEOList);
+				Date verifyDueDate = lawsInventoryEOList.get(0).getVerifyDueDate();
+				String endTime = "";
+				if (verifyDueDate != null) {
+					endTime = DateUtils.formatDate(verifyDueDate);
+				}
+				String serialNumbers = lawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(","));
+
+				List<String> userIdList = Arrays.asList(regulationOwnerId.split(","));
+				// 给法规工程师发消息
+				Map<String, Object> params = new HashMap<>();
+				params.put("contentCn", "您好，请尽快查看处理此项任务，谢谢！");
+				params.put("contentEn", "Hello! Please check and address the task ASAP. Thank you!");
+				params.put("projectLibraryId", projectLibraryId);
+				params.put("endTime", endTime);
+				params.put("userIdList", userIdList);
+				params.put("serialNumbers", serialNumbers);
+
+				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
+					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+					// 获取待办中心 - 飞书跳转链接
+					Map<String, Object> todoCenterParams = new HashMap<>();
+					todoCenterParams.put("projectNameCn", PRN_CN);
+					todoCenterParams.put("projectNameEn", PRN_EN);
+					Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
+					params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN"));
+					params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN"));
+					params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
+
+					List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+					String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+					params.put("Initiator", regulationOwnerUserName);
+
+					this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(), params);
+				}
+			}
+		}
+	}
+
+	/**
+	 * 验证符合性 清单待校核状态数据催办。
+	 *
+	 * @param projectLibraryId
+	 * @param projectLawsInventoryEOList
+	 */
+	private void verifyExpeditingToBeChecked(String projectLibraryId, List<ProjectLawsInventoryEO> projectLawsInventoryEOList) {
+		// 如果验证符合性流程状态为 清单待校核，催办时就需要给这一条数据的法规工程师发消息
+		List<ProjectLawsInventoryEO> toBeCheckedLawsInventoryList = projectLawsInventoryEOList.stream().filter(lawsInventory -> {
+			boolean flag = false;
+			if (StringUtils.equals(lawsInventory.getVerifyFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())) {
+				flag = true;
+			}
+			return flag;
+		}).collect(Collectors.toList());
+
+		if (CollectionUtils.isNotEmpty(toBeCheckedLawsInventoryList)) {
+			Map<String, List<ProjectLawsInventoryEO>> regulationOwnerGroupMap = toBeCheckedLawsInventoryList.stream().collect(Collectors.groupingBy(ProjectLawsInventoryEO::getRegulationOwnerId));
+			for (Map.Entry<String, List<ProjectLawsInventoryEO>> regulationOwnerMap : regulationOwnerGroupMap.entrySet()) {
+				String regulationOwnerId = regulationOwnerMap.getKey();
+				List<ProjectLawsInventoryEO> lawsInventoryEOList = regulationOwnerMap.getValue();
+				if (StringUtils.isEmpty(regulationOwnerId) || CollectionUtils.isEmpty(lawsInventoryEOList)) {
+					continue;
+				}
+
+				this.lawsInventoryEOListSortByInventoryAffirmDueDate(lawsInventoryEOList);
+				Date inventoryAffirmDueDate = lawsInventoryEOList.get(0).getInventoryAffirmDueDate();
+				String endTime = "";
+				if (inventoryAffirmDueDate != null) {
+					endTime = DateUtils.formatDate(inventoryAffirmDueDate);
+				}
+				String serialNumbers = lawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(","));
+
+				List<String> userIdList = Arrays.asList(regulationOwnerId.split(","));
+				// 给法规工程师发消息
+				Map<String, Object> params = new HashMap<>();
+				params.put("contentCn", "您好，请及时校核法规清单内容并发起符合性流程，谢谢！");
+				params.put("contentEn", "Please check the content of the regulation list and initiate the compliance process in a timely manner. Thank you!");
+				params.put("projectLibraryId", projectLibraryId);
+				params.put("endTime", endTime);
+				params.put("userIdList", userIdList);
+				params.put("serialNumbers", serialNumbers);
+
+				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
+					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+					// 获取法规清单 - 飞书跳转链接
+					Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue());
+					params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN"));
+					params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN"));
+					params.put("hrefFeishu_CN_P", (String) hrefFeishuMap.get("hrefFeishu_CN_P"));
+					params.put("Initiator", projectLibraryBase.getStudioEngineerName());
+
+					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE1.getValue(), params);
+				}
+			}
+		}
+	}
+
+	/**
+	 * 设计符合性 结果待提交状态数据催办
+	 *
+	 * @param projectLibraryId
+	 * @param projectLawsInventoryEOList
+	 */
+	private void designExpeditingToBeSubmitted(String projectLibraryId, List<ProjectLawsInventoryEO> projectLawsInventoryEOList) {
+		// 催办设计符合性流程状态为 结果待提交的 责任人
+		List<ProjectLawsInventoryEO> toBeSubmitLawsInventoryList = projectLawsInventoryEOList.stream().filter(lawsInventory -> {
+			boolean flag = false;
+			if (StringUtils.equals(lawsInventory.getDesignFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())) {
+				flag = true;
+			}
+			return flag;
+		}).collect(Collectors.toList());
+		if (CollectionUtils.isNotEmpty(toBeSubmitLawsInventoryList)) {
+			Map<String, List<ProjectLawsInventoryEO>> designDutyGroupMap = toBeSubmitLawsInventoryList.stream().collect(Collectors.groupingBy(ProjectLawsInventoryEO::getVerifyDutyId));
+			for (Map.Entry<String, List<ProjectLawsInventoryEO>> designDutyMap : designDutyGroupMap.entrySet()) {
+				String designDutyId = designDutyMap.getKey();
+				List<ProjectLawsInventoryEO> lawsInventoryEOList = designDutyMap.getValue();
+				if (StringUtils.isEmpty(designDutyId) || CollectionUtils.isEmpty(lawsInventoryEOList)) {
+					continue;
+				}
+				this.lawsInventoryEOListSortByVerifyDueDate(lawsInventoryEOList);
+
+				Date designDueDate = lawsInventoryEOList.get(0).getDesignDueDate();
+				String endTime = "";
+				if (designDueDate != null) {
+					endTime = DateUtils.formatDate(designDueDate);
+				}
+				String serialNumbers = lawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(","));
+
+				List<String> userIdList = Arrays.asList(designDutyId.split(","));
+				// 给设计符合性流程责任人发消息
+				Map<String, Object> params = new HashMap<>();
+				params.put("contentCn", "您好，请尽快查看处理此项任务，谢谢！");
+				params.put("contentEn", "Hello! Please check and address the task ASAP. Thank you!");
+				params.put("projectLibraryId", projectLibraryId);
+				params.put("endTime", endTime);
+				params.put("userIdList", userIdList);
+				params.put("serialNumbers", serialNumbers);
+
+				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
+					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+					// 获取待办中心 - 飞书跳转链接
+					Map<String, Object> todoCenterParams = new HashMap<>();
+					todoCenterParams.put("projectNameCn", PRN_CN);
+					todoCenterParams.put("projectNameEn", PRN_EN);
+					Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
+					params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN"));
+					params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN"));
+					params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
+
+					String regulationOwnerId = lawsInventoryEOList.get(0).getRegulationOwnerId();
+					List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+					String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+					params.put("Initiator", regulationOwnerUserName);
+
+					this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(), params);
+				}
+			}
+		}
+	}
+
+	/**
+	 * 设计符合性 清单待确认状态数据催办
+	 *
+	 * @param projectLibraryId
+	 * @param projectLawsInventoryEOList
+	 */
+	private void designExpeditingToBeConfirmed(String projectLibraryId, List<ProjectLawsInventoryEO> projectLawsInventoryEOList) {
+		// 催办设计符合性流程状态为 清单待确认的 责任人
+		List<ProjectLawsInventoryEO> toBeConfirmedLawsInventoryList = projectLawsInventoryEOList.stream().filter(lawsInventory -> {
+			boolean flag = false;
+			if (StringUtils.equals(lawsInventory.getDesignFlowStatus(), ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())) {
+				flag = true;
+			}
+			return flag;
+		}).collect(Collectors.toList());
+		if (CollectionUtils.isNotEmpty(toBeConfirmedLawsInventoryList)) {
+			Map<String, List<ProjectLawsInventoryEO>> designDutyGroupMap = toBeConfirmedLawsInventoryList.stream().collect(Collectors.groupingBy(ProjectLawsInventoryEO::getDesignDutyId));
+			for (Map.Entry<String, List<ProjectLawsInventoryEO>> designDutyMap : designDutyGroupMap.entrySet()) {
+				String designDutyId = designDutyMap.getKey();
+				List<ProjectLawsInventoryEO> lawsInventoryEOList = designDutyMap.getValue();
+				if (StringUtils.isEmpty(designDutyId) || CollectionUtils.isEmpty(lawsInventoryEOList)) {
+					continue;
+				}
+
+				this.lawsInventoryEOListSortByDesignDueDate(lawsInventoryEOList);
+				Date designDueDate = lawsInventoryEOList.get(0).getDesignDueDate();
+				String endTime = "";
+				if (designDueDate != null) {
+					endTime = DateUtils.formatDate(designDueDate);
+				}
+				String serialNumbers = lawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(","));
+
+				List<String> userIdList = Arrays.asList(designDutyId.split(","));
+				// 给设计符合性流程责任人发消息
+				Map<String, Object> params = new HashMap<>();
+				params.put("contentCn", "您好，请及时查看确认以下任务要求，谢谢！");
+				params.put("contentEn", "Hello! Please check and confirm the following task requirement in a timely manner. Thank you!");
+				params.put("projectLibraryId", projectLibraryId);
+				params.put("endTime", endTime);
+				params.put("userIdList", userIdList);
+				params.put("serialNumbers", serialNumbers);
+				params.put("flowTypeCn","设计符合性流程");
+				params.put("flowTypeEn","Design Compliance Process");
+
+				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
+					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+					// 获取待办中心 - 飞书跳转链接
+					Map<String, Object> todoCenterParams = new HashMap<>();
+					todoCenterParams.put("projectNameCn", PRN_CN);
+					todoCenterParams.put("projectNameEn", PRN_EN);
+					Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryId, todoCenterParams);
+					params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN"));
+					params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN"));
+					params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
+
+					String regulationOwnerId = lawsInventoryEOList.get(0).getRegulationOwnerId();
+					List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+					String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+					params.put("Initiator", regulationOwnerUserName);
+
+					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(), params);
+				}
+			}
+		}
+	}
+
+	/**
+	 * 设计符合性 结果待审查状态数据催办
+	 *
+	 * @param projectLibraryId
+	 * @param projectLawsInventoryEOList
+	 */
+	private void designExpeditingToBeReviewed(String projectLibraryId, List<ProjectLawsInventoryEO> projectLawsInventoryEOList) {
+		// 如果设计符合性流程状态为 结果待审查，催办时就需要给这一条数据的法规工程师发消息
+		List<ProjectLawsInventoryEO> toBeReviewedLawsInventoryList = projectLawsInventoryEOList.stream().filter(lawsInventory -> {
+			boolean flag = false;
+			if (StringUtils.equals(lawsInventory.getDesignFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())) {
+				flag = true;
+			}
+			return flag;
+		}).collect(Collectors.toList());
+
+		if (CollectionUtils.isNotEmpty(toBeReviewedLawsInventoryList)) {
+			Map<String, List<ProjectLawsInventoryEO>> regulationOwnerGroupMap = toBeReviewedLawsInventoryList.stream().collect(Collectors.groupingBy(ProjectLawsInventoryEO::getRegulationOwnerId));
+			for (Map.Entry<String, List<ProjectLawsInventoryEO>> regulationOwnerMap : regulationOwnerGroupMap.entrySet()) {
+				String regulationOwnerId = regulationOwnerMap.getKey();
+				List<ProjectLawsInventoryEO> lawsInventoryEOList = regulationOwnerMap.getValue();
+				if (StringUtils.isEmpty(regulationOwnerId) || CollectionUtils.isEmpty(lawsInventoryEOList)) {
+					continue;
+				}
+
+				this.lawsInventoryEOListSortByDesignDueDate(lawsInventoryEOList);
+				Date designDueDate = lawsInventoryEOList.get(0).getDesignDueDate();
+				String endTime = "";
+				if (designDueDate != null) {
+					endTime = DateUtils.formatDate(designDueDate);
+				}
+				String serialNumbers = lawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(","));
+
+				List<String> userIdList = Arrays.asList(regulationOwnerId.split(","));
+				// 给法规工程师发消息
+				Map<String, Object> params = new HashMap<>();
+				params.put("contentCn", "您好，请尽快查看处理此项任务，谢谢！");
+				params.put("contentEn", "Hello! Please check and address the task ASAP. Thank you!");
+				params.put("projectLibraryId", projectLibraryId);
+				params.put("endTime", endTime);
+				params.put("userIdList", userIdList);
+				params.put("serialNumbers", serialNumbers);
+
+				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
+					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+					// 获取待办中心 - 飞书跳转链接
+					Map<String, Object> todoCenterParams = new HashMap<>();
+					todoCenterParams.put("projectNameCn", PRN_CN);
+					todoCenterParams.put("projectNameEn", PRN_EN);
+					Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
+					params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN"));
+					params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN"));
+					params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
+
+					List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+					String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+					params.put("Initiator", regulationOwnerUserName);
+
+					this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(), params);
+				}
+			}
+		}
+	}
+
+	/**
+	 * 设计符合性 清单待校核状态数据催办
+	 *
+	 * @param projectLibraryId
+	 * @param projectLawsInventoryEOList
+	 */
+	private void designExpeditingToBeChecked(String projectLibraryId, List<ProjectLawsInventoryEO> projectLawsInventoryEOList) {
+		// 如果设计符合性流程状态为 清单待校核，催办时就需要给这一条数据的法规工程师发消息
+		List<ProjectLawsInventoryEO> toBeCheckedLawsInventoryList = projectLawsInventoryEOList.stream().filter(lawsInventory -> {
+			boolean flag = false;
+			if (StringUtils.equals(lawsInventory.getDesignFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())) {
+				flag = true;
+			}
+			return flag;
+		}).collect(Collectors.toList());
+
+		if (CollectionUtils.isNotEmpty(toBeCheckedLawsInventoryList)) {
+			Map<String, List<ProjectLawsInventoryEO>> regulationOwnerGroupMap = toBeCheckedLawsInventoryList.stream().collect(Collectors.groupingBy(ProjectLawsInventoryEO::getRegulationOwnerId));
+			for (Map.Entry<String, List<ProjectLawsInventoryEO>> regulationOwnerMap : regulationOwnerGroupMap.entrySet()) {
+				String regulationOwnerId = regulationOwnerMap.getKey();
+				List<ProjectLawsInventoryEO> lawsInventoryEOList = regulationOwnerMap.getValue();
+				if (StringUtils.isEmpty(regulationOwnerId) || CollectionUtils.isEmpty(lawsInventoryEOList)) {
+					continue;
+				}
+
+				this.lawsInventoryEOListSortByInventoryAffirmDueDate(lawsInventoryEOList);
+				Date inventoryAffirmDueDate = lawsInventoryEOList.get(0).getInventoryAffirmDueDate();
+				String endTime = "";
+				if (inventoryAffirmDueDate != null) {
+					endTime = DateUtils.formatDate(inventoryAffirmDueDate);
+				}
+				String serialNumbers = lawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(","));
+
+				List<String> userIdList = Arrays.asList(regulationOwnerId.split(","));
+				// 给法规工程师发消息
+				Map<String, Object> params = new HashMap<>();
+				params.put("contentCn", "您好，请及时校核法规清单内容并发起符合性流程，谢谢！");
+				params.put("contentEn", "Please check the content of the regulation list and initiate the compliance process in a timely manner. Thank you!");
+				params.put("projectLibraryId", projectLibraryId);
+				params.put("endTime", endTime);
+				params.put("userIdList", userIdList);
+				params.put("serialNumbers", serialNumbers);
+
+				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
+					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+					// 获取法规清单 - 飞书跳转链接
+					Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue());
+					params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN"));
+					params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN"));
+					params.put("hrefFeishu_CN_P", (String) hrefFeishuMap.get("hrefFeishu_CN_P"));
+					params.put("Initiator", projectLibraryBase.getStudioEngineerName());
+
+					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE1.getValue(), params);
+				}
+			}
+		}
+	}
+
+
+	@Override
+	public List<SysRole> getRoleByUserId(String projectLibraryId, String cut) {
+		List<SysRole> sysRoles = new LinkedList<>();
+		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		//项目详情中取R&H Studio和认证工程师
+		List<ProjectLibraryBase> projectLibraryBases = projectLibraryBaseService.queryById(projectLibraryId, null);
+		String certificationEngineerName = "";
+		if (projectLibraryBases.size() != 0) {
+			certificationEngineerName = projectLibraryBases.get(0).getCertificationEngineerName();
+			String studioEngineerName = projectLibraryBases.get(0).getStudioEngineerName();
+			if (StringUtils.isNotBlank(studioEngineerName) && studioEngineerName.equals(loginUser.getUsername())) {
+				SysRole sysRole = new SysRole();
+				sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue());
+				if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+					sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.STUDIO_ENGINEER.getName());
+				} else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
+					sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.STUDIO_ENGINEER.getCode());
+				}
+
+				sysRoles.add(sysRole);
+			}
+
+			// 认证
+			if ((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername()))) {
+				SysRole sysRole = new SysRole();
+				sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue());
+				if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+					sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getName());
+				} else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
+					sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getCode());
+				}
+				sysRoles.add(sysRole);
+			}
+		}
+		//相关人员名单中取法规工程师
+		/*List<ProjectRelatedPersonnel> projectRelatedPersonnels = projectRelatedPersonnelService.queryPageList(projectLibraryId,null,null,null,null,null);
+		List<String> lawEngineerNameList = new ArrayList<>();
+		if(projectRelatedPersonnels.size() != 0){
+			for (ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels) {
+				String lawEngineerName = projectRelatedPersonnel.getLawEngineerName();
+				if(StringUtils.isNotBlank(lawEngineerName)){
+					lawEngineerName = lawEngineerName.replaceAll(" ","");
+					lawEngineerNameList.addAll(Arrays.asList(lawEngineerName.split(",")));
+				}
+			}
+		}
+		if(lawEngineerNameList.contains(loginUser.getUsername())){
+			SysRole sysRole = new SysRole();
+			sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue());
+			if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getName());
+			}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getCode());
+			}
+			sysRoles.add(sysRole);
+		}*/
+		/*List<String> certificationEngineerList = new ArrayList<>();
+		if(projectRelatedPersonnels.size() != 0){
+			for(ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels){
+				String certificationEngineerName1 = projectRelatedPersonnel.getCertificationEngineerName();
+				if(StringUtils.isNotBlank(certificationEngineerName1)){
+					certificationEngineerName1 = certificationEngineerName1.replaceAll(" ","");
+					certificationEngineerList.addAll(Arrays.asList(certificationEngineerName1.split(",")));
+				}
+			}
+		}
+		if((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername()))
+				|| certificationEngineerList.contains(loginUser.getUsername())){
+			SysRole sysRole = new SysRole();
+			sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue());
+			if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getName());
+			}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getCode());
+			}
+			sysRoles.add(sysRole);
+		}*/
+
+		/*List<String> engineeringInterfacePersonList = new ArrayList<>();
+		if(projectRelatedPersonnels.size() != 0){
+			for(ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels){
+				String engineeringInterfacePerson = projectRelatedPersonnel.getEngineeringInterfacePersonName();
+				if(StringUtils.isNotBlank(engineeringInterfacePerson)){
+					engineeringInterfacePerson = engineeringInterfacePerson.replaceAll(" ","");
+					engineeringInterfacePersonList.addAll(Arrays.asList(engineeringInterfacePerson.split(",")));
+				}
+			}
+		}
+		if(engineeringInterfacePersonList.contains(loginUser.getUsername())){
+			SysRole sysRole = new SysRole();
+			sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getValue());
+			if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getName());
+			}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getCode());
+			}
+			sysRoles.add(sysRole);
+		}*/
+
+//		if((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername()))
+//				|| lawEngineerNameList.contains(loginUser.getUsername())){
+//			SysRole sysRole = new SysRole();
+//			sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue());
+//			if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+//				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getName());
+//			}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+//				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getCode());
+//			}
+//			sysRoles.add(sysRole);
+//
+//		}
+
+		// 法规工程师
+		QueryWrapper<ProjectLawsInventoryEO> querylawEngineerCountWrap = new QueryWrapper<>();
+		querylawEngineerCountWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId, projectLibraryId);
+		querylawEngineerCountWrap.lambda().eq(ProjectLawsInventoryEO::getRegulationOwnerId, loginUser.getId());
+		Integer lawCount = this.baseMapper.selectCount(querylawEngineerCountWrap);
+		if (lawCount > 0) {
+			SysRole sysRole = new SysRole();
+			sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue());
+			if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getName());
+			} else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
+				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getCode());
+			}
+			sysRoles.add(sysRole);
+		}
+
+
+		// 工程接口人
+		QueryWrapper<ProjectLawsInventoryEO> queryEipCountWrap = new QueryWrapper<>();
+		queryEipCountWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId, projectLibraryId);
+		queryEipCountWrap.lambda().eq(ProjectLawsInventoryEO::getEngineeringInterfacePerson, loginUser.getId());
+		Integer eipCount = this.baseMapper.selectCount(queryEipCountWrap);
+		if (eipCount > 0) {
+			SysRole sysRole = new SysRole();
+			sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getValue());
+			if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getName());
+			} else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
+				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getCode());
+			}
+			sysRoles.add(sysRole);
+		}
+
+		// 责任人
+		QueryWrapper<ProjectLawsInventoryEO> queryDutyPersonCountWrap = new QueryWrapper<>();
+		queryDutyPersonCountWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId, projectLibraryId);
+		queryDutyPersonCountWrap.and(query -> {
+			query.lambda().eq(ProjectLawsInventoryEO::getDesignDutyId, loginUser.getId());
+			query.or().lambda().eq(ProjectLawsInventoryEO::getVerifyDutyId, loginUser.getId());
+		});
+		Integer dutyPersonCount = this.baseMapper.selectCount(queryDutyPersonCountWrap);
+		if (dutyPersonCount > 0) {
+			SysRole sysRole = new SysRole();
+			sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.PERSON_LIABLE1.getValue());
+			if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.PERSON_LIABLE1.getName());
+			} else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
+				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.PERSON_LIABLE1.getCode());
+			}
+			sysRoles.add(sysRole);
+		}
+
+
+		List<SysRole> roleList = sysRoleMapper.getRoleByUserId(loginUser.getId());
+		//studio角色,法规工程师/认证工程师,领导角色,管理员角色,Viewer
+		if (roleList.size() != 0) {
+			List<SysRole> manager = roleList.stream().filter(e -> com.jero.modules.system.enums.ProjectRoleEnum.MANAGER.getCode().equals(e.getRoleCode())).collect(Collectors.toList());
+			List<SysRole> admin = roleList.stream().filter(e -> com.jero.modules.system.enums.ProjectRoleEnum.ADMIN.getCode().equals(e.getRoleCode())).collect(Collectors.toList());
+			List<SysRole> Viewer = roleList.stream().filter(e -> com.jero.modules.system.enums.ProjectRoleEnum.VIEWER.getCode().equals(e.getRoleCode())).collect(Collectors.toList());
+			if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+				if (manager.size() != 0) {
+					manager.get(0).setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.MANAGER.getValue());
+					sysRoles.addAll(manager);
+				}
+				if (admin.size() != 0) {
+					admin.get(0).setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.ADMIN.getValue());
+					sysRoles.addAll(admin);
+				}
+				if (Viewer.size() != 0) {
+					Viewer.get(0).setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.VIEWER.getValue());
+					sysRoles.addAll(Viewer);
+				}
+			} else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
+				if (manager.size() != 0) {
+					manager.get(0).setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.MANAGER.getValue());
+					manager.get(0).setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.MANAGER.getCode());
+					sysRoles.addAll(manager);
+				}
+				if (admin.size() != 0) {
+					admin.get(0).setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.ADMIN.getValue());
+					admin.get(0).setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.ADMIN.getCode());
+					sysRoles.addAll(admin);
+				}
+				if (Viewer.size() != 0) {
+					Viewer.get(0).setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.VIEWER.getValue());
+					Viewer.get(0).setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.VIEWER.getCode());
+					sysRoles.addAll(Viewer);
+				}
+
+			}
+
+		}
+		return sysRoles;
+	}
+
+	/**
+	 * 获取一个用户的id
+	 * 例如：如果法规工程师不是空，判断当前这个法规工程师，是否在这个责任领域的数组里，
+	 * 1、如果在的话，不用管他；
+	 * 2、如果只有一个人，则把这个用户设置进来；
+	 * 3、如果不在，判断这个责任领域下是否有多个法规工程师，如果是，则把这个法规工程师设置为空；
+	 *
+	 * @param roleCode                    角色编码
+	 * @param projectRelatedPersonnelList 相关人员对象数组
+	 * @param studioEngineer              studioCode
+	 * @param engineersId                 现有的工程师id
+	 * @return
+	 */
+	public String ToGetAUserId(String roleCode, List<ProjectRelatedPersonnel> projectRelatedPersonnelList, String studioEngineer, String engineersId) {
+		String resultUserId = "";
+		//法规工程师
+		if (StringUtils.equals(roleCode, ProjectRoleEnum.REGULATI_ENGINEER.getValue())) {
+			String lawEngineer = projectRelatedPersonnelList.stream().filter(relatedPersonnel -> {
+				boolean flag = false;
+				if (StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())) {
+					flag = true;
+				}
+				return flag;
+			}).map(ProjectRelatedPersonnel::getLawEngineer).distinct().collect(Collectors.joining(","));
+			if (StringUtils.isNotEmpty(lawEngineer)) {
+				if (!StringUtils.contains(lawEngineer, engineersId)) {
+					String[] lawEngineerArr = lawEngineer.split(",");
+					if (lawEngineerArr.length == 1) {
+						resultUserId = lawEngineer;
+					}
+				} else {
+					resultUserId = engineersId;
+				}
+			}
+		}
+		//认证工程师
+		if (StringUtils.equals(roleCode, ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) {
+			String certificationEngineer = projectRelatedPersonnelList.stream().filter(relatedPersonnel -> {
+				boolean flag = false;
+				if (StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())) {
+					flag = true;
+				}
+				return flag;
+			}).map(ProjectRelatedPersonnel::getCertificationEngineer).distinct().collect(Collectors.joining(","));
+			if (StringUtils.isNotEmpty(certificationEngineer)) {
+				if (!StringUtils.contains(certificationEngineer, engineersId)) {
+					String[] certificationEngineerArr = certificationEngineer.split(",");
+					if (certificationEngineerArr.length == 1) {
+						resultUserId = certificationEngineer;
+					}
+				} else {
+					resultUserId = engineersId;
+				}
+			}
+		}
+		//工程接口人
+		if (StringUtils.equals(roleCode, ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue())) {
+			String engineeringInterfacePerson = projectRelatedPersonnelList.stream().filter(relatedPersonnel -> {
+				boolean flag = false;
+				if (StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())) {
+					flag = true;
+				}
+				return flag;
+			}).map(ProjectRelatedPersonnel::getEngineeringInterfacePerson).distinct().collect(Collectors.joining(","));
+			if (StringUtils.isNotEmpty(engineeringInterfacePerson)) {
+				if (!StringUtils.contains(engineeringInterfacePerson, engineersId)) {
+					String[] engineeringInterfacePersonArr = engineeringInterfacePerson.split(",");
+					if (engineeringInterfacePersonArr.length == 1) {
+						resultUserId = engineeringInterfacePerson;
+					}
+				} else {
+					resultUserId = engineersId;
+				}
+			}
+		}
+		//studio
+		if (StringUtils.equals(roleCode, ProjectRoleEnum.STUDIO_ENGINEER.getValue())) {
+			resultUserId = studioEngineer;
+		}
+		return resultUserId;
+	}
+
+	/**
+	 * 初始化 法规清单对应的 项目状态评估表
+	 *
+	 * @param projectLawsInventoryId
+	 */
+	public void initConditionAssessmentEO(String projectLawsInventoryId) {
+
+		QueryWrapper<ConditionAssessmentEO> removeWrapper = new QueryWrapper<>();
+		removeWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId, projectLawsInventoryId);
+		this.conditionAssessmentEOService.remove(removeWrapper);
+
+		ConditionAssessmentEO conditionAssessmentEO = new ConditionAssessmentEO();
+		conditionAssessmentEO.setRoleCode(ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue());
+		conditionAssessmentEO.setProjectLawsInventoryId(projectLawsInventoryId);
+		conditionAssessmentEO.setConditionAssessment(CurrentProjectStatusEnum.BLUE.getValue());
+		this.conditionAssessmentEOService.addOrUpdate(conditionAssessmentEO);
+	}
+
+	/**
+	 * 添加流程信息
+	 *
+	 * @param processInfoEO
+	 * @param projectLibraryId
+	 * @param endTime
+	 */
+	@Override
+	public void addProcessInfo(ProcessInfoEO processInfoEO, String projectLibraryId, Date endTime) {
+		String id = null;
+		//查询当前项目之前有没有启动过清单确认
+		QueryWrapper<ProcessInfoEO> processInfoQueryWrap = new QueryWrapper<>();
+		processInfoQueryWrap.lambda().eq(ProcessInfoEO::getProjectLibraryId, projectLibraryId);
+		processInfoQueryWrap.lambda().eq(ProcessInfoEO::getFlowType, FlowTypeEnum.QDQR.getValue());
+		List<ProcessInfoEO> processInfoEOList = this.processInfoEOService.list(processInfoQueryWrap);
+		if (CollectionUtils.isNotEmpty(processInfoEOList)) {
+			id = processInfoEOList.get(0).getId();
+			//删除之前创建的数据
+			this.processInfoEOService.remove(processInfoQueryWrap);
+		} else {
+			id = UUID.randomUUID().toString().replace("-", "");
+		}
+
+		processInfoEO.setId(id);
+		processInfoEO.setProjectLibraryId(projectLibraryId);
+
+		processInfoEO.setEndTime(endTime);
+		processInfoEO.setStatus(TodoCenterStatusEnum.LIST_TO_CONFIRM.getValue());
+		processInfoEO.setFlowType(FlowTypeEnum.QDQR.getValue());
+
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		processInfoEO.setCreateBy(currentUser.getId());
+		this.processInfoEOService.add(processInfoEO);
+	}
+
+	/**
+	 * 添加流程信息，用户的待办、已办信息。
+	 *
+	 * @param processInfoId
+	 * @param processInfoDetailEOList
+	 * @param endTime
+	 */
+	@Override
+	public void addProcessInfoDetail(String processInfoId, List<ProcessInfoDetailEO> processInfoDetailEOList, Date endTime) {
+		processInfoDetailEOList.forEach(detail -> {
+			detail.setProcessInfoId(processInfoId);
+			detail.setFlowType(FlowTypeEnum.QDQR.getValue());
+
+			QueryWrapper<ProcessInfoDetailEO> deleteDetailWrap = new QueryWrapper<>();
+			deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId, detail.getProjectLawsInventoryId());
+			deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getUserId, detail.getUserId());
+			this.processInfoDetailEOService.remove(deleteDetailWrap);
+		});
+
+		//删除studio在这个项目的清单确认已办任务。
+		/*QueryWrapper<ProcessInfoDetailEO> deleteStudioDetailWrap = new QueryWrapper<>();
+		deleteStudioDetailWrap.lambda().eq(ProcessInfoDetailEO::getTaskDefinitionKey,InventoryAffirmNodeEnum.INITIATED_BY_STUDIO_ENGINEERS.getKey());
+		deleteStudioDetailWrap.lambda().eq(ProcessInfoDetailEO::getProcessInfoId,processInfoId);
+		this.processInfoDetailEOService.remove(deleteStudioDetailWrap);*/
+
+		this.processInfoDetailEOService.saveBatch(processInfoDetailEOList);
+	}
+
+	/**
+	 * 更新流程信息，用户的待办、已办任务信息
+	 *
+	 * @param projeceLawsInventoryId
+	 */
+	public void updateProcessInfoDetail(String projeceLawsInventoryId) {
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		QueryWrapper<ProcessInfoDetailEO> detailQueryWrapper = new QueryWrapper<>();
+		detailQueryWrapper.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId, projeceLawsInventoryId);
+		detailQueryWrapper.lambda().eq(ProcessInfoDetailEO::getUserId, currentUser.getId());
+		detailQueryWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType, FlowTypeEnum.QDQR.getValue());
+		List<ProcessInfoDetailEO> detailEOList = this.processInfoDetailEOService.list(detailQueryWrapper);
+
+		if (CollectionUtils.isNotEmpty(detailEOList)) {
+			String processInfoId = detailEOList.get(0).getProcessInfoId();
+
+			detailEOList.forEach(detail -> {
+				detail.setSubmitTime(new Date());
+				detail.setStatus(TaskStatusEnum.HAVE_DONE.getValue());
+			});
+			this.processInfoDetailEOService.updateBatchById(detailEOList);
+
+			//查询当前项目下还有没有未完成的任务
+			QueryWrapper<ProcessInfoDetailEO> queryWrapper = new QueryWrapper<>();
+			queryWrapper.lambda().eq(ProcessInfoDetailEO::getProcessInfoId, processInfoId);
+			queryWrapper.lambda().eq(ProcessInfoDetailEO::getStatus, TaskStatusEnum.NOT_DONE.getValue());
+			int count = this.processInfoDetailEOService.count(queryWrapper);
+			//如果没有待办任务
+			if (count == 0) {
+				ProcessInfoEO processInfoEO = new ProcessInfoEO();
+				processInfoEO.setStatus(TodoCenterStatusEnum.COMPLETED.getValue());
+				processInfoEO.setId(processInfoId);
+				this.processInfoEOService.updateById(processInfoEO);
+			}
+		}
+	}
+
+	/**
+	 * 任务清单催办
+	 *
+	 * @param projectTaskUrgVo
+	 * @return
+	 */
+	@Override
+	public Result<?> taskUrg(ProjectTaskUrgVo projectTaskUrgVo) {
+		if (ObjectUtils.isEmpty(projectTaskUrgVo.getProjectLawsInventoryIds())) {
+			if (CutEnum.CN.getValue().equals(projectTaskUrgVo.getCut())) {
+				throw new JeroBootException("请选择至少一条数据");
+			} else {
+				throw new JeroBootException("Please select at least one piece of data");
+			}
+
+		}
+		if (ObjectUtils.isEmpty(projectTaskUrgVo.getType())) {
+			if (CutEnum.CN.getValue().equals(projectTaskUrgVo.getCut())) {
+				throw new JeroBootException("请选择催办类型");
+			} else {
+				throw new JeroBootException("Please select the type of reminder");
+			}
+		}
+
+		String title = "";
+
+		if (FlowTypeEnum.SJFHXSHLC.getValue().equals(projectTaskUrgVo.getType())) {
+			title = MessageType2Enum.DESIGN_COMPLIANCE_CONFIRMATION.getCn() + "/" + MessageType2Enum.DESIGN_COMPLIANCE_CONFIRMATION.getEn();
+		} else if (FlowTypeEnum.PREHOMOQRLC.getValue().equals(projectTaskUrgVo.getType())) {
+			title = MessageType2Enum.PRE_HOMO_CONFIRMATION.getCn() + "/" + MessageType2Enum.PRE_HOMO_CONFIRMATION.getEn();
+		} else if (FlowTypeEnum.YZFHXSCLC.getValue().equals(projectTaskUrgVo.getType())) {
+			title = MessageType2Enum.VALIDATION_COMPLIANCE_CONFIRMATION.getCn() + "/" + MessageType2Enum.VALIDATION_COMPLIANCE_CONFIRMATION.getEn();
+		} else {
+			if (CutEnum.CN.getValue().equals(projectTaskUrgVo.getCut())) {
+				throw new JeroBootException("请选择正确的催办类型");
+			} else {
+				throw new JeroBootException("Please select the correct type of reminder");
+			}
+		}
+		String[] ProjectLawsInventoryIds = projectTaskUrgVo.getProjectLawsInventoryIds().split(",");
+		ProjectLawsInventoryEO projectLawsInventoryEO = baseMapper.selectById(ProjectLawsInventoryIds[0]);
+		if (ObjectUtils.isEmpty(projectLawsInventoryEO)) {
+			if (CutEnum.CN.getValue().equals(projectTaskUrgVo.getCut())) {
+				throw new JeroBootException("程序异常，请刷新页面并重新操作");
+			} else {
+				throw new JeroBootException("The program is abnormal, please refresh the page and operate again");
+			}
+		}
+
+		ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectOne(new QueryWrapper<ProjectLibraryBase>()
+				.lambda().eq(ProjectLibraryBase::getId, projectLawsInventoryEO.getProjectLibraryId()));
+
+		QueryWrapper<ProjectNameInfoEO> projectNameInfoEOQueryWrapper = new QueryWrapper<>();
+		projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId());
+		ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
+
+		QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
+		projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId, projectLibraryBase.getYearNameId());
+		ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper);
+
+		//项目名称
+		String projectVersion = (com.jero.modules.system.util.StringUtils.isBlank(projectLibraryBase.getParentId()) && com.jero.modules.system.util.StringUtils.isBlank(projectLibraryBase.getProjectVersion())) ? "00" : projectLibraryBase.getProjectVersion();
+		String projectName = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + "-" + projectLibraryBase.getTargetMarket() + "-" + projectVersion;
+
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		//飞书跳转链接
+		String hrefFeishu = backUrl
+				+ JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink()
+				+ projectLibraryBase.getId()
+				+ JumpLinkEnum.DESIGN_AFFIRM_LINK.getType()
+				+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
+				+ projectYearNameInfoEO.getYearName()
+				+ "&targetMarket=" + projectLibraryBase.getTargetMarket();
+
+		for (String projectLawsInventoryId : ProjectLawsInventoryIds) {
+			ProjectLawsInventoryEO lawsInventoryEO = baseMapper.selectById(projectLawsInventoryId);
+			if (ObjectUtils.isEmpty(lawsInventoryEO)) {
+				if (CutEnum.CN.getValue().equals(projectTaskUrgVo.getCut())) {
+					throw new JeroBootException("程序异常，请刷新页面并重新操作");
+				} else {
+					throw new JeroBootException("The program is abnormal, please refresh the page and operate again");
+				}
+			}
+			String LAW_CN = lawsInventoryEO.getSerialNumber() + " " + lawsInventoryEO.getTitle();//法规
+			BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(lawsInventoryEO.getStandId());
+			String LAW_EN = lawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn();//法规
+
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+			String userId = "";
+			String dueDate = null;
+
+			QueryWrapper<ProjectTaskInventoryEO> queryProjectTaskInventoryWrapper = new QueryWrapper<>();
+			queryProjectTaskInventoryWrapper.isNotNull("design_p_id").or().isNotNull("verify_p_id");
+			queryProjectTaskInventoryWrapper.lambda().eq(ProjectTaskInventoryEO::getProjectLawsInventoryId, projectLawsInventoryId);
+			List<ProjectTaskInventoryEO> list = projectTaskInventoryEOService.list(queryProjectTaskInventoryWrapper);
+
+			if (FlowTypeEnum.SJFHXSHLC.getValue().equals(projectTaskUrgVo.getType())) {
+				dueDate = sdf.format(lawsInventoryEO.getDesignDueDate());
+				if (DesignComplianceStatusEnum.TO_REVIEW.getValue().equals(list.get(0).getDesignStatus())
+						|| DesignComplianceStatusEnum.REVIEW_COMPLETED.getValue().equals(list.get(0).getDesignStatus())) {
+					if (CutEnum.CN.getValue().equals(projectTaskUrgVo.getCut())) {
+						throw new JeroBootException(LAW_CN + "已经被确认，无法催办");
+					} else {
+						throw new JeroBootException(LAW_EN + "has been confirmed，can't be urged");
+					}
+				}
+				if (ObjectUtils.isNotEmpty(lawsInventoryEO.getDesignDutyId())) {
+					userId = lawsInventoryEO.getDesignDutyId();
+				}
+			} else if (FlowTypeEnum.PREHOMOQRLC.getValue().equals(projectTaskUrgVo.getType())) {
+				dueDate = sdf.format(lawsInventoryEO.getPrehomoDueDate());
+				if (DesignComplianceStatusEnum.TO_REVIEW.getValue().equals(list.get(0).getPrehomoStatus())
+						|| DesignComplianceStatusEnum.REVIEW_COMPLETED.getValue().equals(list.get(0).getPrehomoStatus())) {
+					if (CutEnum.CN.getValue().equals(projectTaskUrgVo.getCut())) {
+						throw new JeroBootException(LAW_CN + "已经被确认，无法催办");
+					} else {
+						throw new JeroBootException(LAW_EN + "has been confirmed，can't be urged");
+					}
+				}
+				if (ObjectUtils.isNotEmpty(lawsInventoryEO.getPrehomoDutyId())) {
+					userId = lawsInventoryEO.getPrehomoDutyId();
+				}
+			} else if (FlowTypeEnum.YZFHXSCLC.getValue().equals(projectTaskUrgVo.getType())) {
+				dueDate = sdf.format(lawsInventoryEO.getVerifyDueDate());
+				if (DesignComplianceStatusEnum.TO_REVIEW.getValue().equals(list.get(0).getVerifyStatus())
+						|| DesignComplianceStatusEnum.REVIEW_COMPLETED.getValue().equals(list.get(0).getVerifyStatus())) {
+					if (CutEnum.CN.getValue().equals(projectTaskUrgVo.getCut())) {
+						throw new JeroBootException(LAW_CN + "已经被确认，无法催办");
+					} else {
+						throw new JeroBootException(LAW_EN + "has been confirmed，can't be urged");
+					}
+				}
+				if (ObjectUtils.isNotEmpty(lawsInventoryEO.getVerifyDutyId())) {
+					userId = lawsInventoryEO.getVerifyDutyId();
+				}
+			}
+
+			String[] thirdId = new String[1];
+			if (ObjectUtils.isNotEmpty(userId)) {
+				SysUser user = sysUserMapper.selectById(userId);
+				if (ObjectUtils.isNotEmpty(user)) {
+					thirdId[0] = user.getThirdId();
+				}
+			}
+			try {
+				FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+				feishuMsgVo.setTitle(title);
+				feishuMsgVo.setCnContentUpper("您好，请尽快查看处理此项任务，谢谢！");
+				feishuMsgVo.setCnContentLower("项目: " + projectName +
+						"\n法规: " + LAW_CN +
+						"\n发起人: " + currentUser.getUsername() +
+						"\n截止时间: " + dueDate);
+				feishuMsgVo.setEnContentUpper("Hello! Please check and address the task ASAP. Thank you!");
+				feishuMsgVo.setEnContentLower("Project: " + projectName +
+						"\nRegulation No: " + LAW_EN +
+						"\nInitiator: " + currentUser.getUsername() +
+						"\nDue Date: " + dueDate);
+				feishuMsgVo.setUrl(hrefFeishu);
+				feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
+				feishuService.sendCard(thirdId, feishuMsgVo);
+			} catch (IOException e) {
+				log.error("飞书消息推送失败");
+			}
+		}
+		if (CutEnum.CN.getValue().equals(projectTaskUrgVo.getCut())) {
+			return new Result<>().success("催办成功！");
+		} else {
+			return new Result<>().success("Success of the urging！");
+		}
+
+	}
+
+	@Override
+	public Result<?> updateFlowInfoByProjectLibraryIds(String projectLibraryIds) {
+		if (StringUtils.isEmpty(projectLibraryIds)) {
+			throw new JeroBootException("项目库id不能为空");
+		}
+
+		List<String> projectLibraryIdList = Arrays.asList(projectLibraryIds.split(","));
+
+		QueryWrapper<ProjectLawsInventoryEO> lawsInventoryQueryWrap = new QueryWrapper<>();
+		lawsInventoryQueryWrap.lambda().in(ProjectLawsInventoryEO::getProjectLibraryId, projectLibraryIdList);
+		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = this.baseMapper.selectList(lawsInventoryQueryWrap);
+
+		projectLawsInventoryEOList.forEach(lawsInventoryEO -> {
+			this.updateFlowInfo(lawsInventoryEO);
+		});
+
+		return new Result<>().success("操作成功！");
+	}
+
+	@Override
+	public Result<?> studioPublish(JSONObject json) {
+		String projectLibraryId = json.getString("projectLibraryId");
+		String cut = json.getString("cut");
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		String ids = json.getString("ids");
+
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		//清单确认截止时间
+		String inventoryAffirmDueDate = json.getString("inventoryAffirmDueDate");
+		Date endTime = new Date();
+		try {
+			endTime = sdf.parse(inventoryAffirmDueDate);
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+
+		QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
+		if (StringUtils.isEmpty(ids)) {
+			throw new JeroBootException("至少选择一条数据进行操作！");
+		}
+		queryWrapper.lambda().in(ProjectLawsInventoryEO::getId, Arrays.asList(ids.split(",")));
+		queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId, projectLibraryId);
+		List<ProjectLawsInventoryEO> projectLawsInventoryEOS = this.baseMapper.selectList(queryWrapper);
+
+		List<String> userIdList = new ArrayList<>();
+		List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
+
+		//交付物类型为NA，写远了不好找，写在这里方便以后优化
+		String naType = "1645667531513237506";
+		for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOS) {
+			//未发起或拒绝 可以发起清单确认
+			boolean checkStatus = (StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
+					|| StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
+					|| StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
+					|| StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
+			);
+			//如果该数据的法规工程师不为空
+			boolean checkUser = (StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId()));
+			if (checkStatus && checkUser) {
+				//如果交付物为NA则流程状态直接为不涉及
+				if(StringUtils.equals(projectLawsInventoryEO.getDesignDeliverableType(),naType)){
+					projectLawsInventoryEO.setDesignFlowStatus(ComplianceFlowStatusEnum.UNINVOLVED.getValue());
+				}else if (StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
+						|| StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())) {
+					projectLawsInventoryEO.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
+				}
+				if(StringUtils.equals(projectLawsInventoryEO.getVerifyDeliverableType(),naType)){
+					projectLawsInventoryEO.setVerifyFlowStatus(ComplianceFlowStatusEnum.UNINVOLVED.getValue());
+				}else if (StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
+						|| StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())) {
+					projectLawsInventoryEO.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
+				}
+				projectLawsInventoryEO.setInventoryAffirmDueDate(endTime);
+
+				userIdList.add(projectLawsInventoryEO.getRegulationOwnerId());
+				//如果都是不涉及就不发待办
+				if (!projectLawsInventoryEO.getDesignFlowStatus().equals(ComplianceFlowStatusEnum.UNINVOLVED.getValue())
+						&& !projectLawsInventoryEO.getVerifyFlowStatus().equals(ComplianceFlowStatusEnum.UNINVOLVED.getValue())) {
+					ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
+					processInfoDetailEO.setProjectLawsInventoryId(projectLawsInventoryEO.getId());
+					processInfoDetailEO.setUserId(projectLawsInventoryEO.getRegulationOwnerId());
+					processInfoDetailEO.setTaskDefinitionKey(InventoryAffirmNodeEnum.REGULATION_OWNER_AUDIT.getKey());
+					processInfoDetailEO.setEndTime(endTime);
+					processInfoDetailEO.setCreateTime(new Date());
+					processInfoDetailEO.setCreateBy(currentUser.getId());
+					processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue());
+					processInfoDetailEOList.add(processInfoDetailEO);
+				}
+			}
+		}
+
+		this.updateBatchById(projectLawsInventoryEOS);
+
+		ProcessInfoEO processInfoEO = new ProcessInfoEO();
+		this.addProcessInfo(processInfoEO, projectLibraryId, endTime);
+		this.addProcessInfoDetail(processInfoEO.getId(), processInfoDetailEOList, endTime);
+
+		userIdList = userIdList.stream().distinct().collect(Collectors.toList());
+		// 给法规工程师发消息
+		Map<String, Object> params = new HashMap<>();
+		params.put("contentCn", "您好，请及时校核法规清单内容并发起符合性流程，谢谢！");
+		params.put("contentEn", "Please check the content of the regulation list and initiate the compliance process in a timely manner. Thank you!");
+		params.put("projectLibraryId", projectLibraryId);
+		params.put("endTime", inventoryAffirmDueDate);
+		params.put("userIdList", userIdList);
+
+		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+		if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
+			String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+			String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+			// 获取法规清单 - 飞书跳转链接
+			Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue());
+			params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN"));
+			params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN"));
+			params.put("hrefFeishu_CN_P", (String) hrefFeishuMap.get("hrefFeishu_CN_P"));
+			params.put("Initiator", projectLibraryBase.getStudioEngineerName());
+
+			this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE1.getValue(), params);
+		}
+
+		return Result.OK("发起清单确认成功！");
+	}
+
+	@Override
+	public Result<?> studioWithdrew(JSONObject json) {
+		String projectLibraryId = json.getString("projectLibraryId");
+		String cut = json.getString("cut");
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		String ids = json.getString("ids");
+		QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
+		if (StringUtils.isEmpty(ids)) {
+			throw new JeroBootException("至少选择一条数据进行操作！");
+		}
+		queryWrapper.lambda().in(ProjectLawsInventoryEO::getId, Arrays.asList(ids.split(",")));
+		queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId, projectLibraryId);
+		List<ProjectLawsInventoryEO> projectLawsInventoryEOS = this.baseMapper.selectList(queryWrapper);
+
+		projectLawsInventoryEOS = projectLawsInventoryEOS.stream().filter(lawsInventory -> {
+			boolean flag = false;
+			boolean toBeCheckedFlag = (
+					StringUtils.equals(lawsInventory.getDesignFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
+							|| StringUtils.equals(lawsInventory.getVerifyFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
+			);
+			boolean dutyPersonRejectedFlag = (
+					StringUtils.equals(lawsInventory.getDesignFlowStatus(), ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
+							|| StringUtils.equals(lawsInventory.getVerifyFlowStatus(), ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
+			);
+			if (toBeCheckedFlag || dutyPersonRejectedFlag) {
+				flag = true;
+			}
+			return flag;
+		}).collect(Collectors.toList());
+
+		// 将待办中心法规工程师的 清单确认 待办任务转为已办
+		QueryWrapper<ProcessInfoDetailEO> pidQueryWrap = new QueryWrapper<>();
+		pidQueryWrap.lambda().in(ProcessInfoDetailEO::getProjectLawsInventoryId, ids);
+		List<ProcessInfoDetailEO> pidList = this.processInfoDetailEOService.list(pidQueryWrap);
+		if (CollectionUtils.isNotEmpty(pidList)) {
+			pidList.forEach(pid -> {
+				pid.setStatus(TaskStatusEnum.HAVE_DONE.getValue());
+			});
+			this.processInfoDetailEOService.updateBatchById(pidList);
+		}
+
+
+		this.lawsInventoryEOListSortByInventoryAffirmDueDate(projectLawsInventoryEOS);
+		Date inventoryAffirmDueDate = projectLawsInventoryEOS.get(0).getInventoryAffirmDueDate();
+		String endTime = "";
+		if (inventoryAffirmDueDate != null) {
+			endTime = DateUtils.formatDate(inventoryAffirmDueDate);
+		}
+
+		for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOS) {
+			if (StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
+					|| StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())) {
+				projectLawsInventoryEO.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+			}
+			if (StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
+					|| StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())) {
+				projectLawsInventoryEO.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+			}
+		}
+
+		List<String> userIdList = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getRegulationOwnerId).distinct().collect(Collectors.toList());
+		String serialNumbers = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(","));
+
+		this.updateBatchById(projectLawsInventoryEOS);
+
+		// 给法规工程师发消息
+		Map<String, Object> params = new HashMap<>();
+		params.put("contentCn", "您好，该任务已被发起人撤回。");
+		params.put("contentEn", "Hello! This regulation has been withdrawn by the initiator.");
+		params.put("projectLibraryId", projectLibraryId);
+		params.put("endTime", endTime);
+		params.put("userIdList", userIdList);
+		params.put("serialNumbers", serialNumbers);
+
+		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+		if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
+			String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+			String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+			// 获取法规清单 - 飞书跳转链接
+			Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue());
+			params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN"));
+			params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN"));
+			params.put("hrefFeishu_CN_P", (String) hrefFeishuMap.get("hrefFeishu_CN_P"));
+			params.put("Initiator", projectLibraryBase.getStudioEngineerName());
+
+			this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(), params);
+		}
+
+		return Result.OK("撤回成功！");
+	}
+
+	@Override
+	public Result<?> regulationOwnerReturned(JSONObject json) {
+		String projectLibraryId = json.getString("projectLibraryId");
+		String cut = json.getString("cut");
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+		if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
+			String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+			String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+
+			// studio信息
+			SysUser studioUserInfo = this.sysUserMapper.selectOne(
+					new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer())
+			);
+
+			String ids = json.getString("ids");
+
+			QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
+			if (StringUtils.isEmpty(ids)) {
+				throw new JeroBootException("至少选择一条数据进行操作！");
+			}
+			queryWrapper.lambda().in(ProjectLawsInventoryEO::getId, Arrays.asList(ids.split(",")));
+			queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId, projectLibraryId);
+			List<ProjectLawsInventoryEO> projectLawsInventoryEOS = this.baseMapper.selectList(queryWrapper);
+			for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOS) {
+				if (StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
+						|| StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())) {
+					projectLawsInventoryEO.setDesignFlowStatus(ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue());
+				}
+				if (StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
+						|| StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())) {
+					projectLawsInventoryEO.setVerifyFlowStatus(ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue());
+				}
+			}
+
+			this.updateBatchById(projectLawsInventoryEOS);
+
+			this.lawsInventoryEOListSortByInventoryAffirmDueDate(projectLawsInventoryEOS);
+			Date inventoryAffirmDueDate = projectLawsInventoryEOS.get(0).getInventoryAffirmDueDate();
+			String endTime = "";
+			if (inventoryAffirmDueDate != null) {
+				endTime = DateUtils.formatDate(inventoryAffirmDueDate);
+			}
+			List<String> userIdList = Arrays.asList(studioUserInfo.getId().split(","));
+			String serialNumbers = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(","));
+
+			// 给studio发消息
+			Map<String, Object> params = new HashMap<>();
+			String contentCn = "您好，该任务被" + currentUser.getUsername() + "退回，请及时查看处理。";
+			String contentEn = "Hello! This task is rejected by " + currentUser.getUsername() + ". Please check and address it in a timely manner.";
+			params.put("contentCn", contentCn);
+			params.put("contentEn", contentEn);
+			params.put("projectLibraryId", projectLibraryId);
+			params.put("endTime", endTime);
+			params.put("userIdList", userIdList);
+			params.put("serialNumbers", serialNumbers);
+
+			// 获取法规清单 - 飞书跳转链接
+			Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue());
+			params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN"));
+			params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN"));
+			params.put("hrefFeishu_CN_P", (String) hrefFeishuMap.get("hrefFeishu_CN_P"));
+			params.put("Initiator", projectLibraryBase.getStudioEngineerName());
+
+			this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE3.getValue(), params);
+		}
+		return Result.OK("退回成功！");
+	}
+
+	@Override
+	public String getDeliverableTypeNameById(String projectLawsInventoryId, String cut, String flowType, List<ProjectLawsInventoryEO> projectLawsInventoryEOList, List<SysCategory> categoryList) {
+		String result = "";
+
+		for (ProjectLawsInventoryEO lawsInventory : projectLawsInventoryEOList) {
+			if (StringUtils.equals(projectLawsInventoryId, lawsInventory.getId())) {
+				if (StringUtils.equals(flowType, FlowTypeEnum.SJFHXSHLC.getValue())) {
+					List<String> designDeliverableTypeList = Arrays.asList(lawsInventory.getDesignDeliverableType().split(","));
+					result = this.getTreeName(cut, categoryList, designDeliverableTypeList);
+				} else if (StringUtils.equals(flowType, FlowTypeEnum.YZFHXSCLC.getValue())) {
+					lawsInventory.getVerifyDeliverableType();
+					List<String> verifyDeliverableTypeList = Arrays.asList(lawsInventory.getVerifyDeliverableType().split(","));
+					result = this.getTreeName(cut, categoryList, verifyDeliverableTypeList);
+				}
+			}
+		}
+		return result;
+	}
+
+	@Override
+	public String getDutyTerritoryNameById(String projectLawsInventoryId, String cut, List<ProjectLawsInventoryEO> projectLawsInventoryEOList, List<SysDictItem> sysDictItems, String dicCode) {
+		String result = "";
+		for (ProjectLawsInventoryEO lawsInventory : projectLawsInventoryEOList) {
+			if (StringUtils.equals(projectLawsInventoryId, lawsInventory.getId())) {
+				String dutyTerritory = lawsInventory.getDutyTerritory();
+				result = disposeShowDictItemValue(sysDictItems, dutyTerritory, cut, ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
+				break;
+			}
+		}
+		return result;
+	}
+
+	@Override
+	public void sendMessageByTemplateId(String templeteId, Map<String, Object> params) {
+		LoginUser currentUser = null;
+		try {
+			currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		} catch (Exception ex) {
+			log.error("获取当前用户信息失败！");
+		}
+
+		List<String> userIdList = (List<String>) params.get("userIdList");
+		if (CollectionUtils.isNotEmpty(userIdList)) {
+			List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
+
+			String projectLibraryId = (String) params.get("projectLibraryId");
+			String endTime = (String) params.get("endTime");
+			String Initiator = (String) params.get("Initiator");
+			String serialNumbers = (String) params.get("serialNumbers");
+			String contentCn = (String) params.get("contentCn");
+			String contentEn = (String) params.get("contentEn");
+			String flowTypeCn = (String) params.get("flowTypeCn");
+			String flowTypeEn = (String) params.get("flowTypeEn");
+			String hrefFeishu_CN = (String) params.get("hrefFeishu_CN");
+			String hrefFeishu_EN = (String) params.get("hrefFeishu_EN");
+			String hrefFeishu_CN_P = (String) params.get("hrefFeishu_CN_P");
+
+
+			ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+			if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
+				String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+				String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+
+				try {
+					for (String userId : userIdList) {
+						String thirdId = this.sysUserService.getUserThirdIdByUserId(userInfoList, userId);
+
+						if (StringUtils.isNotEmpty(thirdId)) {
+							// 根据结束时间进行排序，获取最近的时间，发消息时使用。
+							JSONObject larkMesJson = new JSONObject();
+							larkMesJson.put("template_id", templeteId);
+							larkMesJson.put("userIds", thirdId);
+
+							Map<String, Object> templateVariableMap = new HashMap<>();
+							templateVariableMap.put("contentCn", contentCn);
+							templateVariableMap.put("contentEn", contentEn);
+							templateVariableMap.put("projectNameCn", PRN_CN);
+							templateVariableMap.put("projectNameEn", PRN_EN);
+							templateVariableMap.put("Initiator", Initiator);
+							templateVariableMap.put("studioEngineerName", projectLibraryBase.getStudioEngineerName());
+							templateVariableMap.put("endTime", endTime);
+							templateVariableMap.put("viewBtnUrlCn", hrefFeishu_CN);
+							templateVariableMap.put("viewBtnUrlCnPhone", hrefFeishu_CN_P);
+							templateVariableMap.put("viewBtnUrlEn", hrefFeishu_EN);
+							templateVariableMap.put("operateUserName", ObjectUtils.isNotEmpty(currentUser) ? currentUser.getUsername() : projectLibraryBase.getStudioEngineerName());
+							templateVariableMap.put("standName", serialNumbers);
+							templateVariableMap.put("flowTypeCn", flowTypeCn);
+							templateVariableMap.put("flowTypeEn", flowTypeEn);
+
+							larkMesJson.put("templateVariableMap", templateVariableMap);
+							this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson);
+						}
+					}
+				} catch (Exception e) {
+					log.error("飞书消息推送失败");
+				}
+			}
+		}
+	}
+
+	@Override
+	public Map<String, Object> getProjectLawsInventoryLinkHrefFeishu(String projectLibraryId, String PRN_CN, String PRN_EN, String roleOpen) {
+		Map<String, Object> result = new HashMap<>();
+
+		String hrefFeishu_CN = backUrl
+				+ JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink()
+				+ projectLibraryId
+				+ JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType()
+				+ "&projectName=" + PRN_CN
+				+ "&roleOpen=" + roleOpen;
+
+		//飞书跳转链接
+		String hrefFeishu_EN = backUrl
+				+ JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink()
+				+ projectLibraryId
+				+ JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType()
+				+ "&projectName=" + PRN_EN
+				+ "&roleOpen=" + roleOpen;
+
+		//飞书手机跳转链接
+		String hrefFeishu_CN_P = backUrlPhone
+				+ JumpLinkEnum.TO_DO_CENTER_PHONE.getLink()+ "?keyWord=" + PRN_CN;
+
+		result.put("hrefFeishu_CN", URLUtil.encode(hrefFeishu_CN));
+		result.put("hrefFeishu_EN", URLUtil.encode(hrefFeishu_EN));
+		result.put("hrefFeishu_CN_P", URLUtil.encode(hrefFeishu_CN_P));
+		return result;
+	}
+
+	@Override
+	public Map<String, Object> getToDoCenterLinkHrefFeishu(String projectLibraryId, Map<String, Object> todoCenterParams) {
+		String projectNameCn = (String) todoCenterParams.get("projectNameCn");
+		String projectNameEn = (String) todoCenterParams.get("projectNameEn");
+
+//		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.getBaseMapper().selectProjectName(projectLibraryId);
+//		String projectNameCn = projectLibraryBase.getProjectName();
+
+		Map<String, Object> result = new HashMap<>();
+
+		String hrefFeishu_CN = backUrl
+				+ JumpLinkEnum.FGRW_TO_DO_CENTER_LINK.getLink() + "?projectName=" + projectNameCn;
+
+		//飞书跳转链接
+		String hrefFeishu_EN = backUrl
+				+ JumpLinkEnum.FGRW_TO_DO_CENTER_LINK.getLink() + "?projectName=" + projectNameEn;
+
+		//飞书手机端跳转链接
+		String hrefFeishu_CN_P = backUrlPhone
+				+ JumpLinkEnum.TO_DO_CENTER_PHONE.getLink() + "?keyWord=" + projectNameCn;
+
+		result.put("hrefFeishu_CN", URLUtil.encode(hrefFeishu_CN));
+		result.put("hrefFeishu_EN", URLUtil.encode(hrefFeishu_EN));
+		result.put("hrefFeishu_CN_P",URLUtil.encode(hrefFeishu_CN_P));
+		return result;
+	}
+
+	@Override
+	public void lawsInventoryEOListSortByInventoryAffirmDueDate(List<ProjectLawsInventoryEO> projectLawsInventoryEOS) {
+		Collections.sort(projectLawsInventoryEOS, new Comparator<ProjectLawsInventoryEO>() {
+			@Override
+			public int compare(ProjectLawsInventoryEO p1, ProjectLawsInventoryEO p2) {
+				if (p1.getInventoryAffirmDueDate() != null && p2.getInventoryAffirmDueDate() != null) {
+					return p1.getInventoryAffirmDueDate().compareTo(p2.getInventoryAffirmDueDate());
+				}
+				return 1;
+			}
+		});
+	}
+
+	@Override
+	public void lawsInventoryEOListSortByDesignDueDate(List<ProjectLawsInventoryEO> projectLawsInventoryEOS) {
+		Collections.sort(projectLawsInventoryEOS, new Comparator<ProjectLawsInventoryEO>() {
+			@Override
+			public int compare(ProjectLawsInventoryEO p1, ProjectLawsInventoryEO p2) {
+				if (p1.getDesignDueDate() != null && p2.getDesignDueDate() != null) {
+					return p1.getDesignDueDate().compareTo(p2.getDesignDueDate());
+				}
+				return 1;
+			}
+		});
+	}
+
+	@Override
+	public void lawsInventoryEOListSortByVerifyDueDate(List<ProjectLawsInventoryEO> projectLawsInventoryEOS) {
+		Collections.sort(projectLawsInventoryEOS, new Comparator<ProjectLawsInventoryEO>() {
+			@Override
+			public int compare(ProjectLawsInventoryEO p1, ProjectLawsInventoryEO p2) {
+				if (p1.getDesignDueDate() != null && p2.getDesignDueDate() != null) {
+					return p1.getDesignDueDate().compareTo(p2.getDesignDueDate());
+				}
+				return 1;
+			}
+		});
+	}
+
+	@Override
+	public void createQueryPermission(int isProjectRole, LoginUser currentUser, QueryWrapper<ProjectLawsInventoryEO> queryWrapper) {
+		// 如果是法规工程师，只能看到法规工程师是自己的数据
+		if (isProjectRole == Integer.parseInt(ProjectRoleEnum.REGULATI_ENGINEER.getValue())) {
+			queryWrapper.lambda().eq(ProjectLawsInventoryEO::getRegulationOwnerId, currentUser.getId());
+		}
+		// 如果是责任人，只能看到设计符合性或验证符合型 责任人是自己的数据。
+		if (isProjectRole == Integer.parseInt(com.jero.modules.system.enums.ProjectRoleEnum.PERSON_LIABLE1.getValue())) {
+			queryWrapper.and(query -> {
+				query.lambda().eq(ProjectLawsInventoryEO::getDesignDutyId, currentUser.getId());
+				query.or().lambda().eq(ProjectLawsInventoryEO::getVerifyDutyId, currentUser.getId());
+			});
+		}
+		// 如果是工程接口人，只能看到工程接口人是自己的数据。
+		if (isProjectRole == Integer.parseInt(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getValue())) {
+			queryWrapper.lambda().eq(ProjectLawsInventoryEO::getEngineeringInterfacePerson, currentUser.getId());
+		}
+	}
+
+	/**
+	 * 系统内所有用户验证
+	 *
+	 * @param projectLawsInventoryEO
+	 * @param errorMsg
+	 * @param msgList
+	 * @param regulationOwnerId
+	 * @param sysUserList
+	 * @param nameCn
+	 * @param nameEn
+	 * @param fieldNumber
+	 */
+	private void sysUserVerify(ProjectLawsInventoryEO projectLawsInventoryEO,
+							   String errorMsg, List<String> msgList,
+							   String userName,
+							   List<SysUser> sysUserList,
+							   String nameCn, String nameEn,
+							   String fieldNumber) {
+		//单选
+		if (userName.contains(",")) {
+			if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+				errorMsg += nameCn + "导入只能填写一个用户名, ";
+			} else {
+				errorMsg += "Only one user name can be entered for" + nameEn + "import, ";
+			}
+			msgList.add(errorMsg);
+		}
+
+		if (sysUserList.size() != 0) {
+			int count = 0;
+			for (SysUser sysUser : sysUserList) {
+				if (StringUtils.equals(userName, sysUser.getUsername())) {
+					count++;
+					if (ProjectRoleEnum.DESIGNDUTY.getValue().equals(fieldNumber)) {
+						projectLawsInventoryEO.setDesignDutyId(sysUser.getId());
+					} else if (ProjectRoleEnum.VERIFYDUTY.getValue().equals(fieldNumber)) {
+						projectLawsInventoryEO.setVerifyDutyId(sysUser.getId());
+					}
+					break;
+				}
+			}
+			if (count == 0) {
+				if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+					errorMsg += nameCn + userName + "在系统中不存在， ";
+				} else {
+					errorMsg += nameEn + userName + "Does not exist in the system, ";
+				}
+				msgList.add(errorMsg);
+			}
+		} else {
+			if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+				errorMsg += nameCn + userName + "在系统中不存在， ";
+			} else {
+				errorMsg += nameEn + userName + "Does not exist in the system, ";
+			}
+			msgList.add(errorMsg);
+		}
+	}
+
+
+	@Override
+	public Result<?> resetFlowTemp(JSONObject parmas) {
+		String ids = parmas.getString("ids");
+		String projectLibraryId = parmas.getString("projectLibraryId");
+		if (StringUtils.isNotEmpty(ids)) {
+
+			QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
+			queryWrapper.lambda().in(ProjectLawsInventoryEO::getId, Arrays.asList(ids.split(",")));
+			queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId, projectLibraryId);
+			List<ProjectLawsInventoryEO> projectLawsInventoryEOS = this.list(queryWrapper);
+
+			List<String> idList = Arrays.asList(ids.split(","));
+			String projectLawsInventoryIds = ids;
+			String pIds = "";
+
+			ProjectLawsInventoryEO projectLawsInventoryEO = new ProjectLawsInventoryEO();
+			projectLawsInventoryEO.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
+			projectLawsInventoryEO.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
+			//清单、任务确认初始化。
+			LambdaUpdateWrapper<ProjectLawsInventoryEO> updateWrapper = new LambdaUpdateWrapper<>();
+			updateWrapper.in(ProjectLawsInventoryEO::getId, idList);
+			updateWrapper.set(ProjectLawsInventoryEO::getRegulationOwnerSubmitStatus, null);
+			updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerSubmitStatus, null);
+			updateWrapper.set(ProjectLawsInventoryEO::getSendMsgFlag, null);
+			updateWrapper.set(ProjectLawsInventoryEO::getSendMsgCurrentFlag, null);
+			updateWrapper.set(ProjectLawsInventoryEO::getInventoryAffirmDueDate, null);
+			updateWrapper.set(ProjectLawsInventoryEO::getTaskAffirmDueDate, null);
+			updateWrapper.set(ProjectLawsInventoryEO::getDesignFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+			updateWrapper.set(ProjectLawsInventoryEO::getVerifyFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+			super.update(projectLawsInventoryEO, updateWrapper);
+
+			QueryWrapper<ProcessInfoEO> processInfoQueryWrap = new QueryWrapper<>();
+			processInfoQueryWrap.lambda().in(ProcessInfoEO::getProjectLawsInventoryId, idList);
+			List<ProcessInfoEO> processInfoEOList = this.processInfoEOService.list(processInfoQueryWrap);
+			List<String> actiProcInstIdList = processInfoEOList.stream().filter(processInfo -> {
+				boolean flag = false;
+				if (StringUtils.equals(processInfo.getFlowType(), FlowTypeEnum.SJFHXSHLC.getValue()) || StringUtils.equals(processInfo.getFlowType(), FlowTypeEnum.YZFHXSCLC.getValue())) {
+					flag = true;
+				}
+				return flag;
+			}).map(ProcessInfoEO::getActiProcInstId).distinct().collect(Collectors.toList());
+
+			pIds = actiProcInstIdList.stream().map(String::valueOf).collect(Collectors.joining(","));
+			JSONObject params = new JSONObject();
+			params.put("projectLawsInventoryIds", projectLawsInventoryIds);
+			params.put("pIds", pIds);
+			//根据流程实例id 、 法规清单id  删除相关流程。
+			workFlowFeignClient.deleteProcessInstanceByProjectLawsInventoryIds(params);
+
+			//清除流程中心对应的数据
+			params.put("ids", ids);
+			this.processInfoEOService.change(params);
+
+			// 删除流程历史数据
+			this.processHistoryEOService.deleteBiActiProcInstIdList(actiProcInstIdList);
+		}
+		return Result.OK("变更成功！");
+	}
+
+	@Override
+	public Result<?> updateFlowStatusBatch(JSONObject json) {
+		String flowStatus = json.getString("flowStatus");
+		JSONArray lawsInventoryArray = json.getJSONArray("lawsInventoryArray");
+		if (CollectionUtils.isNotEmpty(lawsInventoryArray)) {
+			List<Map<String, Object>> lawsInventoryMapList = new ArrayList<>();
+			Map<String, Object> lawsInventoryMap = null;
+			for (Object lawsInventory : lawsInventoryArray) {
+				lawsInventoryMap = JSONObject.parseObject(JSONObject.toJSONString(lawsInventory), Map.class);
+				lawsInventoryMapList.add(lawsInventoryMap);
+			}
+
+			List<String> lawsInventoryIdList = lawsInventoryMapList.stream().map(e -> (String) e.get("id")).distinct().collect(Collectors.toList());
+
+			QueryWrapper<ProjectLawsInventoryEO> pliQueryWrap = new QueryWrapper<>();
+			pliQueryWrap.lambda().in(ProjectLawsInventoryEO::getId, lawsInventoryIdList);
+			List<ProjectLawsInventoryEO> pliEoList = this.list(pliQueryWrap);
+			if (CollectionUtils.isNotEmpty(pliEoList) && CollectionUtils.isNotEmpty(lawsInventoryMapList)) {
+				for (Map<String, Object> map : lawsInventoryMapList) {
+					String id = (String) map.get("id");
+					String operateType = (String) map.get("operateType");
+					pliEoList.forEach(pliEo -> {
+						if (StringUtils.equals(id, pliEo.getId())) {
+							if (StringUtils.contains(operateType, OperatorTypeEnum.LAWS_INVENTORY_DESIGN_UPDATE_FLOW_STATUS.getValue())) {
+								pliEo.setDesignFlowStatus(flowStatus);
+							}
+							if (StringUtils.contains(operateType, OperatorTypeEnum.LAWS_INVENTORY_VERIFY_UPDATE_FLOW_STATUS.getValue())) {
+								pliEo.setVerifyFlowStatus(flowStatus);
+							}
+						}
+					});
+				}
+				this.updateBatchById(pliEoList);
+			}
+		}
+		return new Result<>().success("批量更新状态成功！");
+	}
+
+	@Override
+	public Result<?> citeDeliverable(JSONObject json) {
+		String cut = json.getString("cut");
+		String operateType = json.getString("operateType");
+		String flowType = "";
+		if (StringUtils.equals(operateType, OperatorTypeEnum.LAWS_INVENTORY_DESIGN_CITE_DELIVERABLE.getValue())) {
+			flowType = FlowTypeEnum.SJFHXSHLC.getValue();
+		} else if (StringUtils.equals(operateType, OperatorTypeEnum.LAWS_INVENTORY_VERIFY_CITE_DELIVERABLE.getValue())) {
+			flowType = FlowTypeEnum.YZFHXSCLC.getValue();
+		}
+
+		String resultMsg = "";
+		ProcessHistoryEO citePhEo = null;
+		if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+			resultMsg = "引用交付物成功！";
+		} else {
+			resultMsg = "Successfully referenced deliverables!";
+		}
+
+		String serialNumber = json.getString("serialNumber");
+		String dutyTerritory = json.getString("dutyTerritory");
+		String citeProjectLibraryId = json.getString("citeProjectLibraryId");
+		if (StringUtils.isEmpty(citeProjectLibraryId)) {
+			throw new JeroBootException("请选择引用的项目！");
+		}
+
+		// 符合性流程已完成的状态
+		List<String> complianceFlowStatusList = new ArrayList<>();
+		complianceFlowStatusList.add(ComplianceFlowStatusEnum.CONFORMITY.getValue());
+		complianceFlowStatusList.add(ComplianceFlowStatusEnum.INCONFORMITY.getValue());
+		complianceFlowStatusList.add(ComplianceFlowStatusEnum.TO_TRACK.getValue());
+		complianceFlowStatusList.add(ComplianceFlowStatusEnum.UNINVOLVED.getValue());
+
+		QueryWrapper<ProjectLawsInventoryEO> citePliQueryWrap = new QueryWrapper<>();
+		citePliQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId, citeProjectLibraryId);
+		if (StringUtils.equals(flowType, FlowTypeEnum.SJFHXSHLC.getValue())) {
+			citePliQueryWrap.lambda().in(ProjectLawsInventoryEO::getDesignFlowStatus, complianceFlowStatusList);
+		} else if (StringUtils.equals(flowType, FlowTypeEnum.YZFHXSCLC.getValue())) {
+			citePliQueryWrap.lambda().in(ProjectLawsInventoryEO::getVerifyFlowStatus, complianceFlowStatusList);
+		}
+		List<ProjectLawsInventoryEO> citePliEoList = this.list(citePliQueryWrap);
+		if (CollectionUtils.isNotEmpty(citePliEoList)) {
+			List<ProjectLawsInventoryEO> citePliEoListTemp = citePliEoList.stream().filter(citePliEo -> {
+				boolean serialNumberFlag = (StringUtils.equals(serialNumber, citePliEo.getSerialNumber()));
+				boolean dutyTerritoryFlag = Arrays.equals(dutyTerritory.split(","), citePliEo.getDutyTerritory().split(","));
+				boolean deliverableTypeFlag = false;
+
+				if (StringUtils.equals(operateType, OperatorTypeEnum.LAWS_INVENTORY_DESIGN_CITE_DELIVERABLE.getValue())) {
+					String designDeliverableType = json.getString("designDeliverableType");
+					deliverableTypeFlag = Arrays.equals(designDeliverableType.split(","), citePliEo.getDesignDeliverableType().split(","));
+				} else if (StringUtils.equals(operateType, OperatorTypeEnum.LAWS_INVENTORY_VERIFY_CITE_DELIVERABLE.getValue())) {
+					String verifyDeliverableType = json.getString("verifyDeliverableType");
+					deliverableTypeFlag = Arrays.equals(verifyDeliverableType.split(","), citePliEo.getVerifyDeliverableType().split(","));
+				}
+
+				return serialNumberFlag && dutyTerritoryFlag && deliverableTypeFlag;
+			}).collect(Collectors.toList());
+
+			if (CollectionUtils.isNotEmpty(citePliEoListTemp)) {
+				ProjectLawsInventoryEO citePliEo = citePliEoListTemp.get(0);
+				String citePliEoId = citePliEo.getId();
+
+				QueryWrapper<ProcessInfoEO> citePiQueryWrap = new QueryWrapper<>();
+				citePiQueryWrap.lambda().eq(ProcessInfoEO::getProjectLawsInventoryId, citePliEoId);
+				citePiQueryWrap.lambda().eq(ProcessInfoEO::getFlowType, flowType);
+				citePiQueryWrap.orderByDesc("create_time");
+				List<ProcessInfoEO> citePiEoList = this.processInfoEOService.list(citePiQueryWrap);
+				if (CollectionUtils.isNotEmpty(citePiEoList)) {
+					ProcessInfoEO citePiEo = citePiEoList.get(0);
+					String citePiEoActiProcInstId = citePiEo.getActiProcInstId();
+
+					List<String> taskDefinitionKeyList = new ArrayList<>();
+					if (StringUtils.equals(flowType, FlowTypeEnum.SJFHXSHLC.getValue())) {
+						taskDefinitionKeyList.add(DesignComplianceFlowNodeKeyEnum.ZRRTJJFW.getValue());
+						taskDefinitionKeyList.add(DesignComplianceFlowNodeKeyEnum.DEZRRTJJFW.getValue());
+					} else if (StringUtils.equals(flowType, FlowTypeEnum.YZFHXSCLC.getValue())) {
+						taskDefinitionKeyList.add(VerifyComplianceFlowNodeKeyEnum.ZRRTJJFW.getValue());
+						taskDefinitionKeyList.add(VerifyComplianceFlowNodeKeyEnum.DEZRRTJJFW.getValue());
+					}
+
+					QueryWrapper<ProcessHistoryEO> citePhQueryWrap = new QueryWrapper<>();
+					citePhQueryWrap.lambda().eq(ProcessHistoryEO::getActiProcInstId, citePiEoActiProcInstId);
+					citePhQueryWrap.lambda().in(ProcessHistoryEO::getTaskDefinitionKey, taskDefinitionKeyList);
+					citePhQueryWrap.orderByDesc("create_time");
+					List<ProcessHistoryEO> citePhEoList = this.processHistoryEOService.list(citePhQueryWrap);
+					if (CollectionUtils.isNotEmpty(citePhEoList)) {
+						citePhEo = citePhEoList.get(0);
+					}
+				}
+			}
+
+			if (ObjectUtils.isEmpty(citePhEo)) {
+				if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+					resultMsg = "所选引用项目中，没有匹配到数据，请重新选择！";
+				} else {
+					resultMsg = "There is no matching data in the selected reference project. Please reselect!";
+				}
+			}
+		} else {
+			if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+				resultMsg = "所选引用项目中流程完成数据为空，请重新选择！";
+			} else {
+				resultMsg = "The process completion data in the selected reference project is empty, please reselect!";
+			}
+		}
+		return Result.OK(resultMsg, citePhEo);
+	}
+
+	@Override
+	public Result<?> compulsoryTransfer(JSONObject json) {
+		String projectLibraryId = json.getString("projectLibraryId");
+		String ids = json.getString("ids");
+		if (StringUtils.isEmpty(ids)) {
+			throw new JeroBootException("请选择数据进行强制转办操作！");
+		}
+		List<String> projectLawsInventoryIdList = Arrays.asList(ids.split(","));
+
+		String designTransferUserId = json.getString("designTransferUserId");
+		String verifyTransferUserId = json.getString("verifyTransferUserId");
+
+		QueryWrapper<ProjectLawsInventoryEO> pliQueryWrap = new QueryWrapper<>();
+		pliQueryWrap.lambda().in(ProjectLawsInventoryEO::getId, projectLawsInventoryIdList);
+		List<ProjectLawsInventoryEO> pliEoList = this.list(pliQueryWrap);
+		if (CollectionUtils.isNotEmpty(pliEoList)) {
+			QueryWrapper<ProcessInfoEO> piQueryWrap = new QueryWrapper<>();
+			piQueryWrap.lambda().in(ProcessInfoEO::getProjectLawsInventoryId, projectLawsInventoryIdList);
+			List<ProcessInfoEO> piEoList = this.processInfoEOService.list(piQueryWrap);
+
+			if (CollectionUtils.isNotEmpty(piEoList)) {
+				if (StringUtils.isNotEmpty(designTransferUserId)) {
+					pliEoList.forEach(pliEo -> {
+						pliEo.setDesignDutyId(designTransferUserId);
+					});
+					// 设计符合性相关待办任务强制转办
+					this.designCompulsoryTransfer(projectLibraryId, designTransferUserId, pliEoList, piEoList);
+				}
+				if (StringUtils.isNotEmpty(verifyTransferUserId)) {
+					pliEoList.forEach(pliEo -> {
+						pliEo.setVerifyDutyId(verifyTransferUserId);
+					});
+					// 验证符合性相关待办任务强制转办
+					this.verifyCompulsoryTransfer(projectLibraryId, verifyTransferUserId, pliEoList, piEoList);
+				}
+
+				this.updateBatchById(pliEoList);
+			}
+		}
+		return Result.OK("强制转办成功！");
+	}
+
+	@Override
+	public List<Map<String, Object>> getTaskToConfirmStatistics(List<ProjectLawsInventoryEO> projectLawsInventoryEOList) {
+		List<Map<String,Object>> result = new ArrayList<>();
+
+		int notStartedCount = 0;
+		int toConfirmCount = 0;
+		int acceptedCount = 0;
+		int rejectedCount = 0;
+		if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
+			// 未发起
+			int designNotStartedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
+						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
+						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
+				);
+				return flag;
+			}).count();
+			int verifyNotStartedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
+				);
+				return flag;
+			}).count();
+			notStartedCount = designNotStartedCount + verifyNotStartedCount;
+
+			// 待确认
+			int designToConfirmCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+				);
+				return flag;
+			}).count();
+			int verifyToConfirmCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+				);
+				return flag;
+			}).count();
+			toConfirmCount = designToConfirmCount + verifyToConfirmCount;
+
+			// 接受
+			int designAcceptedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
+						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue())
+						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue())
+						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
+				);
+				return flag;
+			}).count();
+			int verifyAcceptedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
+				);
+				return flag;
+			}).count();
+			acceptedCount = designAcceptedCount + verifyAcceptedCount;
+
+			// 拒绝
+			int designRejectedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
+				);
+				return flag;
+			}).count();
+			int verifyRejectedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
+				);
+				return flag;
+			}).count();
+			rejectedCount = designRejectedCount + verifyRejectedCount;
+		}
+
+		Map<String,Object> notStartedMap = new HashMap<>();
+		Map<String,Object> toConfirmMap = new HashMap<>();
+		Map<String,Object> acceptedMap = new HashMap<>();
+		Map<String,Object> rejectedMap = new HashMap<>();
+
+		notStartedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue());
+		notStartedMap.put("taskAffirmStatusCount",notStartedCount);
+
+		toConfirmMap.put("taskAffirmStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue());
+		toConfirmMap.put("taskAffirmStatusCount",toConfirmCount);
+
+		acceptedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.ACCEPTED.getValue());
+		acceptedMap.put("taskAffirmStatusCount",acceptedCount);
+
+		rejectedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.REJECTED.getValue());
+		rejectedMap.put("taskAffirmStatusCount",rejectedCount);
+
+		result.add(notStartedMap);
+		result.add(toConfirmMap);
+		result.add(acceptedMap);
+		result.add(rejectedMap);
+		return result;
+	}
+
+	@Override
+	public List<Map<String, Object>> getDesignComplianceStatistice(List<ProjectLawsInventoryEO> projectLawsInventoryEOList) {
+		List<Map<String,Object>> result = new ArrayList<>();
+
+		int notStartedCount = 0;
+		int toConfirmCount = 0;
+		int complianceCount = 0;
+		int nonComplianceCount = 0;
+		if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
+			// 未发起
+			notStartedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
+								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
+								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
+								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
+								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+				);
+				return flag;
+			}).count();
+
+			// 待确认
+			toConfirmCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
+						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
+				);
+				return flag;
+			}).count();
+
+			// 符合
+			complianceCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue())
+				);
+				return flag;
+			}).count();
+
+			// 不符合
+			nonComplianceCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue())
+				);
+				return flag;
+			}).count();
+		}
+
+		Map<String,Object> notStartedMap = new HashMap<>();
+		Map<String,Object> toConfirmMap = new HashMap<>();
+		Map<String,Object> acceptedMap = new HashMap<>();
+		Map<String,Object> rejectedMap = new HashMap<>();
+
+		notStartedMap.put("designFlowTaskStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue());
+		notStartedMap.put("designFlowTaskStatusCount",notStartedCount);
+
+		toConfirmMap.put("designFlowTaskStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue());
+		toConfirmMap.put("designFlowTaskStatusCount",toConfirmCount);
+
+		acceptedMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.CONFORMITY.getValue());
+		acceptedMap.put("designFlowTaskStatusCount",complianceCount);
+
+		rejectedMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.INCONFORMITY.getValue());
+		rejectedMap.put("designFlowTaskStatusCount",nonComplianceCount);
+
+		result.add(notStartedMap);
+		result.add(toConfirmMap);
+		result.add(acceptedMap);
+		result.add(rejectedMap);
+		return result;
+	}
+
+	@Override
+	public List<Map<String, Object>> getVerifyComplianceStatistice(List<ProjectLawsInventoryEO> projectLawsInventoryEOList) {
+		List<Map<String,Object>> result = new ArrayList<>();
+
+		int notStartedCount = 0;
+		int toConfirmCount = 0;
+		int complianceCount = 0;
+		int nonComplianceCount = 0;
+		if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
+			// 未发起
+			notStartedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+				);
+				return flag;
+			}).count();
+
+			// 待确认
+			toConfirmCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
+				);
+				return flag;
+			}).count();
+
+			// 符合
+			complianceCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue())
+				);
+				return flag;
+			}).count();
+
+			// 不符合
+			nonComplianceCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue())
+				);
+				return flag;
+			}).count();
+		}
+
+		Map<String,Object> notStartedMap = new HashMap<>();
+		Map<String,Object> toConfirmMap = new HashMap<>();
+		Map<String,Object> acceptedMap = new HashMap<>();
+		Map<String,Object> rejectedMap = new HashMap<>();
+
+		notStartedMap.put("verifyFlowTaskStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue());
+		notStartedMap.put("verifyFlowTaskStatusCount",notStartedCount);
+
+		toConfirmMap.put("verifyFlowTaskStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue());
+		toConfirmMap.put("verifyFlowTaskStatusCount",toConfirmCount);
+
+		acceptedMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.CONFORMITY.getValue());
+		acceptedMap.put("verifyFlowTaskStatusCount",complianceCount);
+
+		rejectedMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.INCONFORMITY.getValue());
+		rejectedMap.put("verifyFlowTaskStatusCount",nonComplianceCount);
+
+		result.add(notStartedMap);
+		result.add(toConfirmMap);
+		result.add(acceptedMap);
+		result.add(rejectedMap);
+		return result;
+	}
+
+	@Override
+	public List<Map<String,Object>> queryNotComplianList(Map<String, Object> params) {
+		String cut = (String) params.get("cut");
+
+		List<String> complianceFlowStatusList = new ArrayList<>();
+		complianceFlowStatusList.add(ComplianceFlowStatusEnum.INCONFORMITY.getValue());
+		complianceFlowStatusList.add(ComplianceFlowStatusEnum.TO_TRACK.getValue());
+		params.put("complianceFlowStatusList",complianceFlowStatusList);
+		List<Map<String,Object>> result = this.baseMapper.queryNotComplianList(params);
+		if(CollectionUtils.isNotEmpty(result)){
+			List<SysDictItem> sysDictItems = sysDictItemServiceImpl.selectItemsAll();
+
+			List<String> userIdList = new ArrayList<>();
+
+			List<String> regulationOwnerIdList = result.stream().filter(
+					data -> StringUtils.isNotEmpty((String) data.get("regulationOwnerId"))
+			).map(e -> (String) e.get("regulationOwnerId")).distinct().collect(Collectors.toList());
+			if(CollectionUtils.isNotEmpty(regulationOwnerIdList)){
+				userIdList.addAll(regulationOwnerIdList);
+			}
+
+			List<String> dutyIdList = result.stream().filter(
+					data -> StringUtils.isNotEmpty((String) data.get("dutyId"))
+			).map(e -> (String) e.get("dutyId")).distinct().collect(Collectors.toList());
+			if(CollectionUtils.isNotEmpty(dutyIdList)){
+				userIdList.addAll(dutyIdList);
+			}
+			List<SysUser> userList = new ArrayList<>();
+			if(CollectionUtils.isNotEmpty(userIdList)){
+				userList = this.sysUserService.querySysUserListByIdList(userIdList);
+			}
+			//流程实例id
+			List<ProcessInfoDetailEO> processInfoDetailEOS = new ArrayList<>();
+			List<String> projectLawsInventoryIdList = result.stream().map(e -> (String) e.get("id")).collect(Collectors.toList());
+			List<ProcessHistoryEO> processHistoryEOList = new ArrayList<>();
+			if(ObjectUtils.isNotEmpty(projectLawsInventoryIdList)){
+				QueryWrapper<ProcessInfoDetailEO> processInfoDetailEOQueryWrapper = new QueryWrapper<>();
+				processInfoDetailEOQueryWrapper.lambda().in(ProcessInfoDetailEO::getProjectLawsInventoryId,projectLawsInventoryIdList);
+				processInfoDetailEOQueryWrapper.orderByDesc("create_time");
+				processInfoDetailEOS = this.processInfoDetailEOService.list(processInfoDetailEOQueryWrapper);
+				if(ObjectUtils.isNotEmpty(processInfoDetailEOS)){
+					List<String> actiProcInstIdList = processInfoDetailEOS.stream().map(ProcessInfoDetailEO::getActiProcInstId).collect(Collectors.toList());
+					if(ObjectUtils.isNotEmpty(actiProcInstIdList)){
+						QueryWrapper<ProcessHistoryEO> queryWrapper = new QueryWrapper<>();
+						queryWrapper.orderByAsc("create_time");
+						queryWrapper.lambda().in(ProcessHistoryEO::getActiProcInstId, actiProcInstIdList);
+						processHistoryEOList = processHistoryEOService.list(queryWrapper);
+						if(ObjectUtils.isNotEmpty(processHistoryEOList)){
+							this.processHistoryEOServiceImpl.disposeData(processHistoryEOList,cut);
+						}
+					}
+				}
+			}
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			for (Map<String, Object> dataMap : result) {
+				dataMap.put("uuid",dataMap.get("id"));
+				//相关法规
+				dataMap.put("lawsName",dataMap.get("serialNumber"));
+				//相关项目(旧数据的未符合项，都是属于这一个项目的)
+				dataMap.put("projectName",params.get("projectName"));
+				dataMap.put("projectid",params.get("projectLibraryId"));
+				//创建时间
+				dataMap.put("createTime",dataMap.get("createTime"));
+				//更新时间
+				dataMap.put("updateTime",dataMap.get("updateTime"));
+
+				String dutyTerritory = (String) dataMap.get("dutyTerritory");
+				if(StringUtils.isNotEmpty(dutyTerritory)){
+					if(StringUtils.isNotEmpty(dutyTerritory)){
+						String dutyTerritory_dictText = this.disposeShowDictItemValue(sysDictItems, dutyTerritory,cut,ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
+						dataMap.put("dutyTerritory_dictText",dutyTerritory_dictText);
+						//责任部门
+						dataMap.put("dutyTerritory",dutyTerritory_dictText);
+					}
+				}
+
+				String flowStatus = (String) dataMap.get("flowStatus");
+				String problemType_dictText = "";
+				if(StringUtils.isNotEmpty(flowStatus)){
+					String textByValue = ComplianceFlowStatusEnum.getTextByValue(flowStatus, cut);
+					if(ComplianceFlowStatusEnum.INCONFORMITY.getCnName().equals(textByValue)
+							|| ComplianceFlowStatusEnum.INCONFORMITY.getEnName().equals(textByValue)){
+						//问题类型
+						if(CutEnum.CN.getValue().equals(cut)){
+							problemType_dictText = ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getCnName();
+							dataMap.put("problemType_dictText",problemType_dictText);
+						}else{
+							problemType_dictText = ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getEnName();
+							dataMap.put("problemType_dictText",problemType_dictText);
+						}
+						//问题状态
+						dataMap.put("problemState", ColourEnum.RED.getName());
+					}
+					if(ComplianceFlowStatusEnum.TO_TRACK.getCnName().equals(textByValue)
+							||ComplianceFlowStatusEnum.TO_TRACK.getEnName().equals(textByValue)){
+						//问题类型
+						if(CutEnum.CN.getValue().equals(cut)){
+							problemType_dictText = ComplianceFlowStatusEnum.LAWS_TO_TRACK.getCnName();
+							dataMap.put("problemType_dictText",problemType_dictText);
+						}else{
+							problemType_dictText = ComplianceFlowStatusEnum.LAWS_TO_TRACK.getEnName();
+							dataMap.put("problemType_dictText",problemType_dictText);
+						}
+						//问题状态
+						dataMap.put("problemState",ColourEnum.YELLOW.getName());
+					}
+					dataMap.put("flowStatusName",ComplianceFlowStatusEnum.getTextByValue(flowStatus,cut));
+				}
+
+				if(CollectionUtils.isNotEmpty(userList)){
+					String regulationOwnerId = (String) dataMap.get("regulationOwnerId");
+					if(StringUtils.isNotEmpty(regulationOwnerId)){
+						String regulationOwnerIdName = this.sysUserService.getUsernameByUserId(userList,regulationOwnerId);
+						dataMap.put("regulationOwnerIdName",regulationOwnerIdName);
+					}
+					String dutyId = (String) dataMap.get("dutyId");
+					if(StringUtils.isNotEmpty(dutyId)){
+						String dutyIdName = this.sysUserService.getUsernameByUserId(userList,dutyId);
+						dataMap.put("dutyIdName",dutyIdName);
+						//创建人
+						dataMap.put("createBy",dutyIdName);
+					}
+				}
+
+				String flowType = (String) dataMap.get("flowType");
+				if(StringUtils.isNotEmpty(flowType)){
+					dataMap.put("flowTypeName",FlowTypeEnum.getTextByValue(flowType,cut));
+				}
+				//标题
+				if(CutEnum.CN.getValue().equals(cut)){
+					dataMap.put("title",(String) dataMap.get("flowTypeName") + problemType_dictText);
+				}else{
+					dataMap.put("title",(String) dataMap.get("flowTypeName") +" " + problemType_dictText);
+				}
+
+				dataMap.put("flag", DataEnum.OLD.getValue());
+
+				// 更新时间,创建时间
+				if(ObjectUtils.isNotEmpty(processInfoDetailEOS)){
+					List<ProcessInfoDetailEO> collect = processInfoDetailEOS.stream()
+							.filter(e -> StringUtils.isNotBlank(e.getFlowType()) && e.getFlowType().equals(flowType)).collect(Collectors.toList());
+					if(CollectionUtils.isNotEmpty(collect)){
+						dataMap.put("actiProcInstId",collect.get(0).getActiProcInstId());
+						if(ObjectUtils.isNotEmpty(processHistoryEOList)){
+							List<ProcessHistoryEO> processHistoryEOSTemp = processHistoryEOList.stream().filter(e -> StringUtils.isNotBlank(e.getActiProcInstId())
+									&& e.getActiProcInstId().equals(collect.get(0).getActiProcInstId())).collect(Collectors.toList());
+							//创建时间为任务节点为符合性审查，处理结果为不符合或待追踪的操作时间
+							//更新时间为最新的流程时间
+							if(!processHistoryEOSTemp.isEmpty()){
+								//更新时间
+								if(ObjectUtils.isNotEmpty(processHistoryEOSTemp.get(processHistoryEOSTemp.size()-1).getCreateTime())){
+									dataMap.put("updateTime",sdf.format(processHistoryEOSTemp.get(processHistoryEOSTemp.size()-1).getCreateTime()));
+								}
+								//创建时间
+								List<ProcessHistoryEO> processHistoryEOS = processHistoryEOSTemp.stream().filter(e -> StringUtils.isNotBlank(e.getTaskDefinitionKey())
+										&& DesignComplianceFlowNodeKeyEnum.FGGCSSH.getValue().equals(e.getTaskDefinitionKey())
+										&& (ComplianceFlowStatusEnum.INCONFORMITY.getValue().equals(e.getOperatorResult()) || ComplianceFlowStatusEnum.TO_TRACK.getValue().equals(e.getOperatorResult()))).collect(Collectors.toList());
+
+								if (CollectionUtils.isNotEmpty(processHistoryEOS)) {
+									if(ObjectUtils.isNotEmpty(processHistoryEOS.get(0).getCreateTime())){
+										dataMap.put("createTime",sdf.format(processHistoryEOS.get(0).getCreateTime()));
+									}
+								}
+							}
+						}
+					}
+				}
+//				QueryWrapper<ProcessInfoDetailEO> processInfoDetailEOQueryWrapper = new QueryWrapper<>();
+//				processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId,(String)dataMap.get("id"));
+//				processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType,flowType);
+//				processInfoDetailEOQueryWrapper.orderByDesc("create_time");
+//				List<ProcessInfoDetailEO> processInfoDetailEOS = this.processInfoDetailEOService.list(processInfoDetailEOQueryWrapper);
+//				if(CollectionUtils.isNotEmpty(processInfoDetailEOS)){
+//					dataMap.put("actiProcInstId",processInfoDetailEOS.get(0).getActiProcInstId());
+//				}
+			}
+
+
+
+		}
+		//新数据
+		List<Map<String, Object>> mapList = getNewData(params, cut);
+		if(ObjectUtils.isNotEmpty(mapList)){
+			result.addAll(mapList);
+		}
+		//条件查询
+		result = dataParameter(params, result);
+		//表头排序
+		heartSort(params, result);
+
+
+		return result;
+	}
+
+	private void heartSort(Map<String, Object> params, List<Map<String, Object>> result) {
+		Collator comparator = Collator.getInstance(Locale.CHINESE);
+		if ("title".equals(params.get("orderByField"))) {
+			if (OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("title")) ? String.valueOf(e1.get("title")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("title")) ? String.valueOf(e2.get("title")) : "";
+					return comparator.compare(e1Field, e2Field);
+				});
+			} else if (OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("title")) ? String.valueOf(e1.get("title")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("title")) ? String.valueOf(e2.get("title")) : "";
+					return comparator.compare(e2Field, e1Field);
+				});
+			}
+		}
+		if ("lawsName".equals(params.get("orderByField"))) {
+			if (OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("lawsName")) ? String.valueOf(e1.get("lawsName")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("lawsName")) ? String.valueOf(e2.get("lawsName")) : "";
+					return comparator.compare(e1Field, e2Field);
+				});
+			} else if (OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("lawsName")) ? String.valueOf(e1.get("lawsName")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("lawsName")) ? String.valueOf(e2.get("lawsName")) : "";
+					return comparator.compare(e2Field, e1Field);
+				});
+			}
+		}
+		if ("projectName".equals(params.get("orderByField"))) {
+			if (OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("projectName")) ? String.valueOf(e1.get("projectName")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("projectName")) ? String.valueOf(e2.get("projectName")) : "";
+					return comparator.compare(e1Field, e2Field);
+				});
+			} else if (OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("projectName")) ? String.valueOf(e1.get("projectName")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("projectName")) ? String.valueOf(e2.get("projectName")) : "";
+					return comparator.compare(e2Field, e1Field);
+				});
+			}
+		}
+		if ("problemType_dictText".equals(params.get("orderByField"))) {
+			if (OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("problemType_dictText")) ? String.valueOf(e1.get("problemType_dictText")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("problemType_dictText")) ? String.valueOf(e2.get("problemType_dictText")) : "";
+					return comparator.compare(e1Field, e2Field);
+				});
+			} else if (OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("problemType_dictText")) ? String.valueOf(e1.get("problemType_dictText")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("problemType_dictText")) ? String.valueOf(e2.get("problemType_dictText")) : "";
+					return comparator.compare(e2Field, e1Field);
+				});
+			}
+		}
+		if ("dutyTerritory".equals(params.get("orderByField"))) {
+			if (OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("dutyTerritory")) ? String.valueOf(e1.get("dutyTerritory")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("dutyTerritory")) ? String.valueOf(e2.get("dutyTerritory")) : "";
+					return comparator.compare(e1Field, e2Field);
+				});
+			} else if (OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("dutyTerritory")) ? String.valueOf(e1.get("dutyTerritory")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("dutyTerritory")) ? String.valueOf(e2.get("dutyTerritory")) : "";
+					return comparator.compare(e2Field, e1Field);
+				});
+			}
+		}
+		if ("createBy".equals(params.get("orderByField"))) {
+			if (OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("createBy")) ? String.valueOf(e1.get("createBy")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("createBy")) ? String.valueOf(e2.get("createBy")) : "";
+					return comparator.compare(e1Field, e2Field);
+				});
+			} else if (OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("createBy")) ? String.valueOf(e1.get("createBy")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("createBy")) ? String.valueOf(e2.get("createBy")) : "";
+					return comparator.compare(e2Field, e1Field);
+				});
+			}
+		}
+		if ("problemState".equals(params.get("orderByField"))) {
+			if (OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("problemState")) ? String.valueOf(e1.get("problemState")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("problemState")) ? String.valueOf(e2.get("problemState")) : "";
+					return comparator.compare(e1Field, e2Field);
+				});
+			} else if (OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("problemState")) ? String.valueOf(e1.get("problemState")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("problemState")) ? String.valueOf(e2.get("problemState")) : "";
+					return comparator.compare(e2Field, e1Field);
+				});
+			}
+		}
+		if ("createTime".equals(params.get("orderByField"))) {
+			if (OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					if (e1.get("createTime") == null || e2.get("createTime") == null) {
+						return 0;
+					}
+					return comparator.compare(e1.get("createTime"), e2.get("createTime"));
+				});
+			} else if (OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					if (e1.get("createTime") == null || e2.get("createTime") == null) {
+						return 0;
+					}
+					return comparator.compare(e2.get("createTime"), e1.get("createTime"));
+				});
+			}
+		}
+		if ("updateTime".equals(params.get("orderByField"))) {
+			if (OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					if (e1.get("updateTime") == null || e2.get("updateTime") == null) {
+						return 0;
+					}
+					return comparator.compare(e1.get("updateTime"), e2.get("updateTime"));
+				});
+			} else if (OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					if (e1.get("updateTime") == null || e2.get("updateTime") == null) {
+						return 0;
+					}
+					return comparator.compare(e2.get("updateTime"), e1.get("updateTime"));
+				});
+			}
+		}
+	}
+
+	@NotNull
+	private List<Map<String, Object>> getNewData(Map<String, Object> params, String cut) {
+		//新数据
+		LambdaQueryWrapper<ProblemManagementEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.like(ProblemManagementEO::getProjectId,params.get("projectLibraryId"));
+		List<ProblemManagementEO> managementEOList = problemManagementEOService.list(wrapper);
+		//法规
+		List<String> lawsIdList = managementEOList.stream()
+				.filter(e-> StringUtils.isNotBlank(e.getLawsId())).map(ProblemManagementEO::getLawsId).collect(Collectors.toList());
+		//项目
+		List<String> projectIdList = managementEOList.stream()
+				.filter(e->StringUtils.isNotBlank(e.getProjectId())).map(ProblemManagementEO::getProjectId).collect(Collectors.toList());
+		//相关文件
+		List<String> fileList = managementEOList.stream()
+				.filter(e -> StringUtils.isNotBlank(e.getFile())).map(ProblemManagementEO::getFile).collect(Collectors.toList());
+		//审批证据
+		List<String> approvalEvidenceList = managementEOList.stream()
+				.filter(e -> StringUtils.isNotBlank(e.getApprovalEvidence())).map(ProblemManagementEO::getApprovalEvidence).collect(Collectors.toList());
+		List<String> connectList = new ArrayList<>();
+		if(!fileList.isEmpty()){
+			connectList.addAll(fileList);
+		}
+		if(!approvalEvidenceList.isEmpty()){
+			connectList.addAll(approvalEvidenceList);
+		}
+		List<OSSFile> fileInfoList = new ArrayList<>();
+		if(!connectList.isEmpty()){
+			fileInfoList = iOSSFileService.getFileInfosByConnectId(StringUtils.join(connectList,","));
+		}
+
+		List<BussDocumentLibraryEO> documentLibraryEOList = new ArrayList<>();
+		if(!lawsIdList.isEmpty()){
+			Set<String> lawIdSet = new HashSet<>();
+			for (String lawIds : lawsIdList) {
+				lawIdSet.addAll(Arrays.asList(lawIds.split(",")));
+			}
+			if(!lawIdSet.isEmpty()){
+				LambdaQueryWrapper<BussDocumentLibraryEO> wrapperDocument = new LambdaQueryWrapper<>();
+				wrapperDocument.in(BussDocumentLibraryEO::getId, lawIdSet);
+				documentLibraryEOList = bussDocumentLibraryEOService.list(wrapperDocument);
+			}
+		}
+
+		List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
+		if(!projectIdList.isEmpty()){
+			Set<String> projectIdSet = new HashSet<>();
+			for (String projectIds : projectIdList) {
+				projectIdSet.addAll(Arrays.asList(projectIds.split(",")));
+			}
+			if(!projectIdSet.isEmpty()){
+				projectLibraryBaseList = problemManagementEOMapper.queryByIds(StringUtils.join(projectIdSet,","));
+			}
+		}
+		List<DictModel> problemTypeList = sysDictService.queryDictItemsByCode(DicCodeEnum.PROBLEM_TYPE.getCode());
+
+		List<NcrTrackVO> ncrTrackVOList = new ArrayList<>();
+		List<Map<String,Object>> mapList = new ArrayList<>();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		for (ProblemManagementEO problemManagementEO : managementEOList) {
+			Map<String,Object> map = new HashMap<>();
+			map.put("title",problemManagementEO.getTitle());
+			map.put("psIssue",problemManagementEO.getPsIssue());
+			map.put("dutyTerritory",problemManagementEO.getDutyTerritory());
+			map.put("problemState",problemManagementEO.getProblemState());
+			map.put("problemType",problemManagementEO.getProblemType());
+			map.put("description",problemManagementEO.getDescription());
+			map.put("conclusion",problemManagementEO.getConclusion());
+			map.put("createBy",problemManagementEO.getCreateBy());
+			map.put("createTime",sdf.format(problemManagementEO.getCreateTime()));
+			map.put("updateTime",sdf.format(problemManagementEO.getUpdateTime()));
+			map.put("uuid",problemManagementEO.getId());
+			map.put("id",problemManagementEO.getId());
+			map.put("flag",DataEnum.NEW.getValue());
+
+			List<DictModel> dictModelList = problemTypeList.stream().filter(e -> e.getValue().equals(problemManagementEO.getProblemType())).collect(Collectors.toList());
+
+			if(!dictModelList.isEmpty()){
+				if(CutEnum.CN.getValue().equals(cut)){
+					map.put("problemType_dictText",dictModelList.get(0).getText());
+				}else{
+					map.put("problemType_dictText",dictModelList.get(0).getTextEn());
+				}
+			}
+			//相关法规
+			if(StringUtils.isNotBlank(problemManagementEO.getLawsId())){
+				if(!documentLibraryEOList.isEmpty()){
+					List<BussDocumentLibraryEO> documentLibraryEOListTemp = documentLibraryEOList.stream()
+							.filter(e->StringUtils.isNotBlank(problemManagementEO.getLawsId())
+									&& problemManagementEO.getLawsId().contains(e.getId())).collect(Collectors.toList());
+					List<String> serialNumberList = documentLibraryEOListTemp.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList());
+					problemManagementEO.setLawsName(StringUtils.join(serialNumberList,","));
+					map.put("lawsName",StringUtils.join(serialNumberList,","));
+					map.put("lawsId",problemManagementEO.getLawsId());
+				}
+			}
+			//相关项目
+			if(StringUtils.isNotBlank(problemManagementEO.getProjectId())){
+				List<ProjectLibraryBase> projectLibraryBaseListTemp = projectLibraryBaseList.stream()
+						.filter(e->StringUtils.isNotBlank(problemManagementEO.getProjectId())
+								&& problemManagementEO.getProjectId().contains(e.getId())).collect(Collectors.toList());
+				//目标市场数据字典
+				List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
+				List<String> projectNameList = new ArrayList<>();
+				for (ProjectLibraryBase projectLibraryBase : projectLibraryBaseListTemp) {
+					//目标市场
+					String targetMarket = problemManagementEOService.getMarket(cut, targetMarketList, projectLibraryBase);
+					//主项目的版本号
+					String projectVersion = "";
+					if(com.jero.modules.system.util.StringUtils.isBlank(projectLibraryBase.getParentId())){
+						projectVersion = "00";
+					}else{
+						projectVersion = projectLibraryBase.getProjectVersion();
+					}
+					projectNameList.add(projectLibraryBase.getProjectName()
+							+ "-" + projectLibraryBase.getYearName()
+							+ "-" + targetMarket
+							+"-"+projectVersion);
+				}
+				if(!projectNameList.isEmpty()){
+					problemManagementEO.setProjectName(StringUtils.join(projectNameList,","));
+					map.put("projectName",StringUtils.join(projectNameList,","));
+					map.put("projectId",problemManagementEO.getProjectId());
+				}
+			}
+
+			//相关文件连接
+			if(StringUtils.isNotBlank(problemManagementEO.getFileLink())){
+				List<ProblemManagementVO> list = new ArrayList<>();
+				for (String fileLink : problemManagementEO.getFileLink().split(",")) {
+					ProblemManagementVO problemManagementVO = new ProblemManagementVO();
+					problemManagementVO.setFileLink(fileLink);
+					list.add(problemManagementVO);
+				}
+				problemManagementEO.setFileLinkList(list);
+				map.put("fileLinkList",list);
+			}
+
+			//审批证据连接
+			if(StringUtils.isNotBlank(problemManagementEO.getApprovalEvidenceLink())){
+				List<ProblemManagementVO> list = new ArrayList<>();
+				for (String approvalEvidenceLink : problemManagementEO.getApprovalEvidenceLink().split(",")) {
+					ProblemManagementVO problemManagementVO = new ProblemManagementVO();
+					problemManagementVO.setApprovalEvidenceLink(approvalEvidenceLink);
+					list.add(problemManagementVO);
+				}
+				problemManagementEO.setApprovalEvidenceLinkList(list);
+				map.put("approvalEvidenceLinkList",list);
+			}
+			//进度追踪
+			if(StringUtils.isNotBlank(problemManagementEO.getProgressTracking())){
+				List<ProblemManagementVO> list = new ArrayList<>();
+				for (String progressTracking : problemManagementEO.getProgressTracking().split(",")) {
+					ProblemManagementVO problemManagementVO = new ProblemManagementVO();
+					problemManagementVO.setProgressTracking(progressTracking);
+					list.add(problemManagementVO);
+				}
+				problemManagementEO.setProgressTrackingList(list);
+				map.put("progressTrackingList",list);
+			}
+			//相关文件
+			if(StringUtils.isNotBlank(problemManagementEO.getFile())){
+				List<OSSFile> collect = fileInfoList.stream()
+						.filter(e -> e.getConnectId().equals(problemManagementEO.getFile())).collect(Collectors.toList());
+				problemManagementEO.setFileList(collect);
+				map.put("fileList",collect);
+				map.put("file",problemManagementEO.getFile());
+			}
+			//审批证据
+			if(StringUtils.isNotBlank(problemManagementEO.getApprovalEvidence())){
+				List<OSSFile> collect = fileInfoList.stream()
+						.filter(e -> e.getConnectId().equals(problemManagementEO.getApprovalEvidence())).collect(Collectors.toList());
+				problemManagementEO.setApprovalEvidenceFileList(collect);
+				map.put("approvalEvidenceFileList",collect);
+				map.put("approvalEvidence",problemManagementEO.getApprovalEvidence());
+
+			}
+			mapList.add(map);
+			NcrTrackVO ncrTrackVOTemp = new NcrTrackVO();
+			BeanUtils.copyProperties(problemManagementEO,ncrTrackVOTemp);
+			ncrTrackVOTemp.setUuid(ncrTrackVOTemp.getId());
+			ncrTrackVOTemp.setFlag(DataEnum.NEW.getValue());
+			ncrTrackVOList.add(ncrTrackVOTemp);
+		}
+		return mapList;
+	}
+
+	private List<Map<String, Object>> dataParameter(Map<String, Object> params, List<Map<String, Object>> mapList) {
+		if(ObjectUtils.isNotEmpty(params.get("title"))){//标题
+			mapList = mapList.stream().filter(e->ObjectUtils.isNotEmpty(e.get("title"))
+					&& e.get("title").toString().contains(params.get("title").toString())).collect(Collectors.toList());
+		}
+		if(ObjectUtils.isNotEmpty(params.get("lawsName"))){//相关法规
+			mapList = mapList.stream().filter(e->ObjectUtils.isNotEmpty(e.get("lawsName"))
+					&& e.get("lawsName").toString().contains(params.get("lawsName").toString())).collect(Collectors.toList());
+		}
+		if(ObjectUtils.isNotEmpty(params.get("projectId"))){//相关项目
+			mapList = mapList.stream().filter(e->ObjectUtils.isNotEmpty(e.get("projectId"))
+					&& String.valueOf(e.get("projectId")).equals(String.valueOf(params.get("projectId")))).collect(Collectors.toList());
+		}
+		if(ObjectUtils.isNotEmpty(params.get("problemType_dictText"))){//问题类型
+			mapList = mapList.stream().filter(e->ObjectUtils.isNotEmpty(e.get("problemType_dictText"))
+					&& e.get("problemType_dictText").toString().equals(params.get("problemType_dictText").toString())).collect(Collectors.toList());
+		}
+		if(ObjectUtils.isNotEmpty(params.get("dutyTerritory"))){//责任领域
+			mapList = mapList.stream().filter(e->ObjectUtils.isNotEmpty(e.get("dutyTerritory"))
+					&& e.get("dutyTerritory").toString().contains(params.get("dutyTerritory").toString())).collect(Collectors.toList());
+		}
+		if(ObjectUtils.isNotEmpty(params.get("problemState"))){//问题状态
+			mapList = mapList.stream().filter(e->ObjectUtils.isNotEmpty(e.get("problemState"))
+					&& e.get("problemState").toString().contains(params.get("problemState").toString())).collect(Collectors.toList());
+		}
+		return mapList;
+	}
+
+	@Override
+	public void exportNotComplianList(HttpServletResponse response, HttpServletRequest request, Map<String, Object> params) {
+//		params.put("projectLibraryId","1546314907190935554");
+//		params.put("projectName","EDS1.2 EVO-G1.1-中国-00");
+//		params.put("cut","en");
+
+//		Map<String,Object> map1 = new HashMap<>();
+//		map1.put("id","e4a2fe2b042e4150943e82094250f54d");
+//		Map<String,Object> map2 = new HashMap<>();
+//		map2.put("id","e1d5b1aa19344abb8154deea15539daa");
+//		List<Map<String,Object>> ncrTrackVOList  =new ArrayList<>();
+//		ncrTrackVOList.add(map1);
+//		ncrTrackVOList.add(map2);
+//
+//		params.put("ncrTrackVOList",ncrTrackVOList);
+
+
+		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		SimpleDateFormat sdfTemp = new SimpleDateFormat("yyyy-MM-dd");
+		String cut = (String) params.get("cut");
+		String header = "";
+		String sheetName = "";
+		if (StringUtils.equals(cut,CutEnum.CN.getValue())) {
+			sheetName = "问题管理";
+			header = "标题,问题类型,PS_ISSUE,创建人,创建时间,相关法规,相关项目,责任部门,问题状态,描述和分析";
+		} else if (StringUtils.equals(cut,CutEnum.EN.getValue())) {
+			header = "Title,Issue Type,PS-ISSUE,Creator,Create Date,Related Regualtions,Related Project,Resonsible Field,Status,Description";
+			sheetName = "Problem management";
+		}
+
+		OutputStream os = null;
+		Workbook workbook = new XSSFWorkbook();
+		Sheet sheet = workbook.createSheet(sheetName);
+
+		List<Map<String, Object>> dataList = this.queryNotComplianList(params);
+
+		List<Map<String, Object>> expertDataList = new ArrayList<>();
+		if(ObjectUtils.allNotNull(dataList)){
+			List<Map<String, Object>> mapList = (List<Map<String, Object>>) params.get("ncrTrackVOList");
+			if(ObjectUtils.isNotEmpty(mapList)){
+				for (Map<String, Object> map : mapList) {
+					List<Map<String, Object>> collect = dataList.stream().filter(e -> ObjectUtils.isNotEmpty(e.get("id")) && e.get("id").equals(map.get("id"))).collect(Collectors.toList());
+					expertDataList.addAll(collect);
+				}
+				dataList = expertDataList;
+			}
+		}
+
+		CellStyle cellStyle = workbook.createCellStyle();
+		cellStyle.setAlignment(HorizontalAlignment.CENTER);
+		Row rowHeader = sheet.createRow(0);//开始创建标题行
+		if (com.jero.modules.system.util.StringUtils.isNotBlank(header)) {
+			String[] headerArr = header.split(",");
+			for (int i = 0; i < headerArr.length; i++) {
+				sheet.setColumnWidth(i, 5000); // 设置列宽度为5000
+				Cell cellHeader = rowHeader.createCell(i);
+				cellHeader.setCellStyle(cellStyle);
+				cellHeader.setCellValue(headerArr[i]);
+			}
+		}
+
+		if(CollectionUtils.isNotEmpty(dataList)){
+			for (int i = 0; i < dataList.size(); i++) {
+				Row row = sheet.createRow(i + 1);
+				row.createCell(0).setCellValue((String) dataList.get(i).get("title"));
+				row.createCell(1).setCellValue((String) dataList.get(i).get("problemType_dictText"));
+				row.createCell(2).setCellValue((String) dataList.get(i).get("psIssue"));
+				row.createCell(3).setCellValue((String) dataList.get(i).get("createBy"));
+				row.createCell(4).setCellValue((String) dataList.get(i).get("createTime"));
+				row.createCell(5).setCellValue((String) dataList.get(i).get("lawsName"));
+				row.createCell(6).setCellValue((String) dataList.get(i).get("projectName"));
+				row.createCell(7).setCellValue((String) dataList.get(i).get("dutyTerritory"));
+				row.createCell(8).setCellValue((String) dataList.get(i).get("problemState"));
+				row.createCell(9).setCellValue((String) dataList.get(i).get("description"));
+			}
+		}
+		try {
+			String path = uploadpath + "/tempZip";
+			File fileTemp = new File(path);
+			if (fileTemp.exists()) {
+				fileTemp.delete();
+			}
+			fileTemp.mkdirs();
+			String name = "";
+			if(CutEnum.CN.getValue().equals(cut)){
+				name = "问题管理";
+			}else{
+				name = "Problem management";
+			}
+			OutputStream excelOS = new FileOutputStream(path + File.separator + name + sdfTemp.format(new Date())+".xlsx");
+			workbook.write(excelOS);
+			excelOS.flush();
+
+			//处理文件
+			List<Object> connectIdList = new ArrayList<>();
+			List<Object> fileList = dataList.stream()
+					.filter(e -> ObjectUtils.isNotEmpty(e.get("file"))).map(e -> e.get("file")).collect(Collectors.toList());
+			List<Object> approvalEvidenceList = dataList.stream()
+					.filter(e -> ObjectUtils.isNotEmpty(e.get("approvalEvidence"))).map(e -> e.get("approvalEvidence")).collect(Collectors.toList());
+			if(!fileList.isEmpty()){
+				connectIdList.addAll(fileList);
+			}
+			if(!approvalEvidenceList.isEmpty()){
+				connectIdList.addAll(approvalEvidenceList);
+			}
+			if(!connectIdList.isEmpty()){
+				List<OSSFile> fileInfosList = iOSSFileService.getFileInfosByConnectId(StringUtils.join(connectIdList, ","));
+				for (Map<String, Object> map : dataList) {
+					String title = (String) map.get("title");
+					String createTime = "";
+					if(ObjectUtils.isNotEmpty(map.get("createTime"))){
+						createTime = String.valueOf(map.get("createTime")).split(" ")[0];
+					}
+					String folder = title+createTime;
+					List<String> connectIdListTemp = new ArrayList<>();
+					if(ObjectUtils.isNotEmpty(map.get("file"))){
+						connectIdListTemp.add((String) map.get("file"));
+					}
+					if(ObjectUtils.isNotEmpty(map.get("approvalEvidence"))){
+						connectIdListTemp.add((String) map.get("approvalEvidence"));
+					}
+					if(!connectIdListTemp.isEmpty()){
+						List<OSSFile> ossFileList = fileInfosList.stream().filter(e -> connectIdListTemp.contains(e.getConnectId())).collect(Collectors.toList());
+						if (ossFileList.size() != 0) {
+							String fileNowPath = path + File.separator + folder;
+							File file = new File(fileNowPath);
+							if (file.exists()) {
+								file.delete();
+							}
+							file.mkdirs();
+							for (OSSFile ossFile : ossFileList) {
+								String url = ossFile.getUrl();
+								//判断文件是否存在
+								if(StringUtils.isNotBlank(url)){
+									//判断文件是否存在
+									boolean b = CosBootUtil.doesObjectExist(url);
+									if(b){
+										InputStream download = CosBootUtil.download(url);
+										if(url.endsWith(".pdf") || url.endsWith(".PDF")){
+											String currentTime = sdf.format(new Date());
+											String waterContent = loginUser.getUsername() + " " + currentTime;
+											File newFile = PDFUtils.PDFWatermark(download,uploadpath,ossFile.getFileName(),waterContent);
+											download = new FileInputStream(newFile.getPath());
+										}
+										documentLibraryEOService.copyFile(download, fileNowPath + File.separator + ossFile.getFileName());
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			ZipUtil.zip(path, path + ".zip");
+			//文件
+			FileInputStream fis = new FileInputStream(path + ".zip");
+			os = response.getOutputStream();
+
+			int len = 0;
+			while ((len = fis.read()) != -1) {
+				os.write(len);
+			}
+			os.flush();
+			fis.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+			if(CutEnum.CN.getValue().equals(cut)){
+				throw new JeroBootException("导出失败");
+			}else{
+				throw new JeroBootException("Export failure");
+			}
+		}finally {
+			IOUtils.closeQuietly(os);
+			File file = new File(uploadpath + "/tempZip");
+			FileUtil.deleteContents(file);
+			File fileTemp = new File(uploadpath + "/tempZip.zip");
+			FileUtil.deleteContents(fileTemp);
+		}
+	}
+
+	/**
+	 * 设计符合性相关待办任务强制转办
+	 *
+	 * @param projectLibraryId
+	 * @param designTransferUserId
+	 * @param pliEoList
+	 * @param piEoList
+	 */
+	private void designCompulsoryTransfer(String projectLibraryId, String designTransferUserId, List<ProjectLawsInventoryEO> pliEoList, List<ProcessInfoEO> piEoList) {
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		List<ProcessInfoEO> designPiEoList = piEoList.stream().filter(piEo -> {
+			boolean flag = false;
+			if (StringUtils.equals(piEo.getFlowType(), FlowTypeEnum.SJFHXSHLC.getValue())) {
+				flag = true;
+			}
+			return flag;
+		}).collect(Collectors.toList());
+
+		List<String> taskDefinitionKeyList = new ArrayList<>();
+		taskDefinitionKeyList.add(DesignComplianceFlowNodeKeyEnum.ZRRQR.getValue());
+		taskDefinitionKeyList.add(DesignComplianceFlowNodeKeyEnum.DEZRRQR.getValue());
+		taskDefinitionKeyList.add(DesignComplianceFlowNodeKeyEnum.ZRRTJJFW.getValue());
+		taskDefinitionKeyList.add(DesignComplianceFlowNodeKeyEnum.DEZRRTJJFW.getValue());
+
+		List<String> actiProcInstIdList = designPiEoList.stream().map(ProcessInfoEO::getActiProcInstId).distinct().collect(Collectors.toList());
+		QueryWrapper<ProcessInfoDetailEO> pidQueryWrap = new QueryWrapper<>();
+		pidQueryWrap.lambda().in(ProcessInfoDetailEO::getActiProcInstId, actiProcInstIdList);
+		pidQueryWrap.lambda().eq(ProcessInfoDetailEO::getStatus, TaskStatusEnum.NOT_DONE.getValue());
+		pidQueryWrap.lambda().in(ProcessInfoDetailEO::getTaskDefinitionKey, taskDefinitionKeyList);
+		List<ProcessInfoDetailEO> pidEoList = this.processInfoDetailEOService.list(pidQueryWrap);
+
+		if (CollectionUtils.isNotEmpty(pidEoList)) {
+			pidEoList.forEach(pidEo -> {
+				pidEo.setUserId(designTransferUserId);
+			});
+			String taskIds = pidEoList.stream().map(ProcessInfoDetailEO::getTaskId).distinct().collect(Collectors.joining(","));
+			Result<String> changeAssigneeBatchResult = this.workFlowFeignClient.changeAssigneeBatch(taskIds, designTransferUserId);
+			if (changeAssigneeBatchResult.isSuccess()) {
+				this.processInfoDetailEOService.updateBatchById(pidEoList);
+
+				for (ProcessInfoDetailEO pidEo : pidEoList) {
+					List<ProcessInfoEO> piEoListTemp = piEoList.stream().filter(piEo -> {
+						boolean flag = false;
+						if (StringUtils.equals(piEo.getActiProcInstId(), pidEo.getActiProcInstId())) {
+							flag = true;
+						}
+						return flag;
+					}).collect(Collectors.toList());
+
+					if (CollectionUtils.isNotEmpty(piEoListTemp)) {
+						ProcessInfoEO piEoTemp = piEoListTemp.get(0);
+						String projectLawsInventoryId = piEoTemp.getProjectLawsInventoryId();
+
+						List<ProjectLawsInventoryEO> pliEoListTemp = pliEoList.stream().filter(pliEo -> {
+							boolean flag = false;
+							if (StringUtils.equals(pliEo.getId(), projectLawsInventoryId)) {
+								flag = true;
+							}
+							return flag;
+						}).collect(Collectors.toList());
+
+						if (CollectionUtils.isNotEmpty(pliEoListTemp)) {
+							ProjectLawsInventoryEO pliEoTemp = pliEoListTemp.get(0);
+
+							Map<String, Object> params = new HashMap<>();
+
+							String endTime = "";
+							String contentCn = "";
+							String contentEn = "";
+							String templateId = "";
+							String taskDefinitionKey = pidEo.getTaskDefinitionKey();
+							if (StringUtils.equals(taskDefinitionKey, DesignComplianceFlowNodeKeyEnum.ZRRQR.getValue())
+									|| StringUtils.equals(taskDefinitionKey, DesignComplianceFlowNodeKeyEnum.DEZRRQR.getValue())) {
+
+								params.put("flowTypeCn","设计符合性流程");
+								params.put("flowTypeEn","Design Compliance Process");
+								contentCn = "您好，请及时查看确认以下任务要求，谢谢！";
+								contentEn = "Hello! Please check and confirm the following task requirement in a timely manner. Thank you!";
+								templateId = TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue();
+								endTime = DateUtils.formatDate(pliEoTemp.getDesignDutyDueDate());
+							} else if (StringUtils.equals(taskDefinitionKey, DesignComplianceFlowNodeKeyEnum.ZRRTJJFW.getValue())
+									|| StringUtils.equals(taskDefinitionKey, DesignComplianceFlowNodeKeyEnum.DEZRRTJJFW.getValue())) {
+								contentCn = "您好，" + currentUser.getUsername() + "向您分发了该任务，请及时查看处理，谢谢！";
+								contentEn = "Hello!  " + currentUser.getUsername() + " has assigned the task to you. Please check and address it in a timely manner. Thank you!";
+								templateId = TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue();
+								endTime = DateUtils.formatDate(pliEoTemp.getDesignDueDate());
+							}
+
+							params.put("userIdList", Arrays.asList(designTransferUserId.split(",")));
+							params.put("projectLibraryId", projectLibraryId);
+							params.put("endTime", endTime);
+							params.put("serialNumbers", pliEoTemp.getSerialNumber());
+							params.put("contentCn", contentCn);
+							params.put("contentEn", contentEn);
+							params.put("id", projectLawsInventoryId);
+
+							JSONObject sendMsgJson = new JSONObject();
+							sendMsgJson.put("actiProcInstId",pidEo.getActiProcInstId());
+							sendMsgJson.put("taskDefinitionKey", taskDefinitionKey);
+							sendMsgJson.put("requestSource", RequestSourceEnum.WORK_FLOW.getValue());
+							sendMsgJson.put("operatorType", OperatorTypeEnum.SEND_MSG.getValue());
+							sendMsgJson.put("templateId", templateId);
+							sendMsgJson.put("flowType", "Design");
+							sendMsgJson.put("params", params);
+							this.processCall(sendMsgJson);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * 验证符合性相关待办任务强制转办
+	 *
+	 * @param projectLibraryId
+	 * @param verifyTransferUserId
+	 * @param pliEoList
+	 * @param piEoList
+	 */
+	private void verifyCompulsoryTransfer(String projectLibraryId, String verifyTransferUserId, List<ProjectLawsInventoryEO> pliEoList, List<ProcessInfoEO> piEoList) {
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		List<ProcessInfoEO> verifyPiEoList = piEoList.stream().filter(piEo -> {
+			boolean flag = false;
+			if (StringUtils.equals(piEo.getFlowType(), FlowTypeEnum.YZFHXSCLC.getValue())) {
+				flag = true;
+			}
+			return flag;
+		}).collect(Collectors.toList());
+
+		List<String> taskDefinitionKeyList = new ArrayList<>();
+		taskDefinitionKeyList.add(VerifyComplianceFlowNodeKeyEnum.ZRRQR.getValue());
+		taskDefinitionKeyList.add(VerifyComplianceFlowNodeKeyEnum.DEZRRQR.getValue());
+		taskDefinitionKeyList.add(VerifyComplianceFlowNodeKeyEnum.ZRRTJJFW.getValue());
+		taskDefinitionKeyList.add(VerifyComplianceFlowNodeKeyEnum.DEZRRTJJFW.getValue());
+
+		List<String> actiProcInstIdList = verifyPiEoList.stream().map(ProcessInfoEO::getActiProcInstId).distinct().collect(Collectors.toList());
+		QueryWrapper<ProcessInfoDetailEO> pidQueryWrap = new QueryWrapper<>();
+		pidQueryWrap.lambda().in(ProcessInfoDetailEO::getActiProcInstId, actiProcInstIdList);
+		pidQueryWrap.lambda().eq(ProcessInfoDetailEO::getStatus, TaskStatusEnum.NOT_DONE.getValue());
+		pidQueryWrap.lambda().in(ProcessInfoDetailEO::getTaskDefinitionKey, taskDefinitionKeyList);
+		List<ProcessInfoDetailEO> pidEoList = this.processInfoDetailEOService.list(pidQueryWrap);
+
+		if (CollectionUtils.isNotEmpty(pidEoList)) {
+			pidEoList.forEach(pidEo -> {
+				pidEo.setUserId(verifyTransferUserId);
+			});
+			String taskIds = pidEoList.stream().map(ProcessInfoDetailEO::getTaskId).distinct().collect(Collectors.joining(","));
+			Result<String> changeAssigneeBatchResult = this.workFlowFeignClient.changeAssigneeBatch(taskIds, verifyTransferUserId);
+			if (changeAssigneeBatchResult.isSuccess()) {
+				this.processInfoDetailEOService.updateBatchById(pidEoList);
+
+				for (ProcessInfoDetailEO pidEo : pidEoList) {
+					List<ProcessInfoEO> piEoListTemp = piEoList.stream().filter(piEo -> {
+						boolean flag = false;
+						if (StringUtils.equals(piEo.getActiProcInstId(), pidEo.getActiProcInstId())) {
+							flag = true;
+						}
+						return flag;
+					}).collect(Collectors.toList());
+
+					if (CollectionUtils.isNotEmpty(piEoListTemp)) {
+						ProcessInfoEO piEoTemp = piEoListTemp.get(0);
+						String projectLawsInventoryId = piEoTemp.getProjectLawsInventoryId();
+
+						List<ProjectLawsInventoryEO> pliEoListTemp = pliEoList.stream().filter(pliEo -> {
+							boolean flag = false;
+							if (StringUtils.equals(pliEo.getId(), projectLawsInventoryId)) {
+								flag = true;
+							}
+							return flag;
+						}).collect(Collectors.toList());
+
+						if (CollectionUtils.isNotEmpty(pliEoListTemp)) {
+							ProjectLawsInventoryEO pliEoTemp = pliEoListTemp.get(0);
+
+							Map<String, Object> params = new HashMap<>();
+
+							String endTime = "";
+							String contentCn = "";
+							String contentEn = "";
+							String templateId = "";
+							String taskDefinitionKey = pidEo.getTaskDefinitionKey();
+							if (StringUtils.equals(taskDefinitionKey, VerifyComplianceFlowNodeKeyEnum.ZRRQR.getValue())
+									|| StringUtils.equals(taskDefinitionKey, VerifyComplianceFlowNodeKeyEnum.DEZRRQR.getValue())) {
+								params.put("flowTypeCn","验证符合性流程");
+								params.put("flowTypeEn","Validation Compliance Process");
+
+								contentCn = "您好，请及时查看确认以下任务要求，谢谢！";
+								contentEn = "Hello! Please check and confirm the following task requirement in a timely manner. Thank you!";
+								templateId = TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue();
+								endTime = DateUtils.formatDate(pliEoTemp.getVerifyDutyDueDate());
+							} else if (StringUtils.equals(taskDefinitionKey, VerifyComplianceFlowNodeKeyEnum.ZRRTJJFW.getValue())
+									|| StringUtils.equals(taskDefinitionKey, VerifyComplianceFlowNodeKeyEnum.DEZRRTJJFW.getValue())) {
+								contentCn = "您好，" + currentUser.getUsername() + "向您分发了该任务，请及时查看处理，谢谢！";
+								contentEn = "Hello!  " + currentUser.getUsername() + "  has assigned the task to you. Please check and address it in a timely manner. Thank you!";
+								templateId = TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue();
+								endTime = DateUtils.formatDate(pliEoTemp.getVerifyDueDate());
+							}
+
+							params.put("userIdList", Arrays.asList(verifyTransferUserId.split(",")));
+							params.put("projectLibraryId", projectLibraryId);
+							params.put("endTime", endTime);
+							params.put("serialNumbers", pliEoTemp.getSerialNumber());
+							params.put("contentCn", contentCn);
+							params.put("contentEn", contentEn);
+							params.put("id", projectLawsInventoryId);
+
+							JSONObject sendMsgJson = new JSONObject();
+							sendMsgJson.put("actiProcInstId",pidEo.getActiProcInstId());
+							sendMsgJson.put("taskDefinitionKey", taskDefinitionKey);
+							sendMsgJson.put("requestSource", RequestSourceEnum.WORK_FLOW.getValue());
+							sendMsgJson.put("operatorType", OperatorTypeEnum.SEND_MSG.getValue());
+							sendMsgJson.put("templateId", templateId);
+							sendMsgJson.put("flowType", "Verify");
+							sendMsgJson.put("params", params);
+							this.processCall(sendMsgJson);
+						}
+					}
+				}
+			}
+		}
+	}
+
+
+	@Override
+	public Map<String, Object> groupByFGRwqrStatus(List<ProjectLawsInventoryEO> pliEos) {
+		Map<String,Object> result = new HashMap<>();
+
+		Map<String,Object> projectScheduleExportMap = new HashMap<>();
+		Map<String,Object> toBeReleasedMap = new HashMap<>();
+		Map<String,Object> toBeVerifiedMap = new HashMap<>();
+		Map<String,Object> toBeConfirmedMap = new HashMap<>();
+		Map<String,Object> acceptMap = new HashMap<>();
+		Map<String,Object> refuseMap = new HashMap<>();
+
+		double toBeReleasedCount = 0;
+		double toBeVerifiedCount = 0;
+		double toBeConfirmedCount = 0;
+		double acceptCount = 0;
+		double refuseCount = 0;
+		double count = 0;
+		// 计算百分比
+		double percentage = 0;
+		String percentageStr = "0";
+		if(CollectionUtils.isNotEmpty(pliEos)){
+			List<ProjectLawsInventoryEO> designToBeReleased = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
+								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+			List<ProjectLawsInventoryEO> verifyToBeReleased = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+			toBeReleasedMap.put("designToBeReleased",designToBeReleased);
+			toBeReleasedMap.put("verifyToBeReleased",verifyToBeReleased);
+
+			List<ProjectLawsInventoryEO> designToBeVerified = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+			List<ProjectLawsInventoryEO> verifyToBeVerified = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+			toBeVerifiedMap.put("designToBeVerified",designToBeVerified);
+			toBeVerifiedMap.put("verifyToBeVerified",verifyToBeVerified);
+
+			List<ProjectLawsInventoryEO> designToBeConfirmed = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+			List<ProjectLawsInventoryEO> verifyToBeConfirmed = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+			toBeConfirmedMap.put("designToBeConfirmed",designToBeConfirmed);
+			toBeConfirmedMap.put("verifyToBeConfirmed",verifyToBeConfirmed);
+
+			List<ProjectLawsInventoryEO> designAccept = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
+								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue())
+								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue())
+								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
+//								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.UNINVOLVED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+			List<ProjectLawsInventoryEO> verifyAccept = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
+//								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.UNINVOLVED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+			acceptMap.put("designAccept",designAccept);
+			acceptMap.put("verifyAccept",verifyAccept);
+
+			List<ProjectLawsInventoryEO> designRefuse = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+			List<ProjectLawsInventoryEO> verifyRefuse = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+			refuseMap.put("designRefuse",designRefuse);
+			refuseMap.put("verifyRefuse",verifyRefuse);
+
+			toBeReleasedCount = designToBeReleased.size() + verifyToBeReleased.size();
+			toBeVerifiedCount = designToBeVerified.size() + verifyToBeVerified.size();
+			toBeConfirmedCount = designToBeConfirmed.size() + verifyToBeConfirmed.size();
+			acceptCount = designAccept.size() + verifyAccept.size();
+			refuseCount = designRefuse.size() + verifyRefuse.size();
+			count = toBeReleasedCount + toBeVerifiedCount + toBeConfirmedCount + acceptCount + refuseCount;
+			if(count <= 0){
+				percentage = 0;
+			}else{
+				// 计算百分比
+				percentage = acceptCount / count * 100;
+			}
+			percentageStr = percentage != 0 ? df.format(percentage) : "0";
+		}
+		result.put(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue(),toBeReleasedMap);
+		result.put(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue(),toBeVerifiedMap);
+		result.put(ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue(),toBeConfirmedMap);
+		result.put(ComplianceFlowStatusEnum.CONFORMITY.getValue(),acceptMap);
+		result.put(ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue(),refuseMap);
+
+		projectScheduleExportMap.put("toBeReleased",toBeReleasedCount);
+		projectScheduleExportMap.put("toBeVerified",toBeVerifiedCount);
+		projectScheduleExportMap.put("toBeConfirmed",toBeConfirmedCount);
+		projectScheduleExportMap.put("accept",acceptCount);
+		projectScheduleExportMap.put("refuse",refuseCount);
+		projectScheduleExportMap.put("percentage",percentageStr + percentSign);
+		result.put("projectScheduleExportMap",projectScheduleExportMap);
+		return result;
+	}
+
+	@Override
+	public Map<String, Object> groupByDesignStatus(List<ProjectLawsInventoryEO> pliEos) {
+		Map<String,Object> result = new HashMap<>();
+
+		Map<String,Object> projectScheduleExportMap = new HashMap<>();
+
+		double notStartCount = 0;      // 未发起
+		double toBeSubmittedCount = 0; // 待提交
+		double toBeReviewedCount = 0;  // 待审查
+		double complianceCount = 0;    // 符合
+		double nonComplianceCount = 0; // 不符合
+		double toBeTrackedCount = 0;   // 待追踪
+		double notInvolvedCount = 0;   // 不涉及
+		double taskTerminationCount = 0;   // 任务终止
+		double count = 0;
+		// 计算百分比
+		double percentage = 0;
+		String percentageStr = "0";
+		if(CollectionUtils.isNotEmpty(pliEos)){
+			List<ProjectLawsInventoryEO> designNotStart = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
+								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
+								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
+								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+
+			List<ProjectLawsInventoryEO> designToBeSubmitted = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+
+			List<ProjectLawsInventoryEO> designToBeReviewed = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+
+			List<ProjectLawsInventoryEO> designCompliance = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+
+			List<ProjectLawsInventoryEO> designNonCompliance = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+
+			List<ProjectLawsInventoryEO> designToBeTracked = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+
+			List<ProjectLawsInventoryEO> designNotInvolved = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.UNINVOLVED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+
+			List<ProjectLawsInventoryEO> taskTermination = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TERMINATION_OF_TASK.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+
+			notStartCount = designNotStart.size();
+			toBeSubmittedCount = designToBeSubmitted.size();
+			toBeReviewedCount = designToBeReviewed.size();
+			complianceCount = designCompliance.size();
+			nonComplianceCount = designNonCompliance.size();
+			toBeTrackedCount = designToBeTracked.size();
+			notInvolvedCount = designNotInvolved.size();
+			taskTerminationCount = taskTermination.size();
+			count = notStartCount + toBeSubmittedCount + toBeReviewedCount + complianceCount + nonComplianceCount + toBeTrackedCount + taskTerminationCount;
+			// 计算百分比
+			if(count <= 0){
+				percentage = 0;
+			}else{
+				percentage = complianceCount / count * 100;
+			}
+			percentageStr = percentage != 0 ? df.format(percentage) : "0";
+		}
+
+		projectScheduleExportMap.put("notStart",notStartCount);
+		projectScheduleExportMap.put("toBeSubmitted",toBeSubmittedCount);
+		projectScheduleExportMap.put("toBeReviewed",toBeReviewedCount);
+		projectScheduleExportMap.put("compliance",complianceCount);
+		projectScheduleExportMap.put("nonCompliance",nonComplianceCount);
+		projectScheduleExportMap.put("toBeTracked",toBeTrackedCount);
+		projectScheduleExportMap.put("notInvolved",notInvolvedCount);
+		projectScheduleExportMap.put("taskTermination",taskTerminationCount);
+		projectScheduleExportMap.put("count",count);
+		projectScheduleExportMap.put("percentage",percentageStr + percentSign);
+		result.put("projectScheduleExportMap",projectScheduleExportMap);
+		return result;
+	}
+
+	@Override
+	public Map<String, Object> groupByVerifyStatus(List<ProjectLawsInventoryEO> pliEos) {
+		Map<String,Object> result = new HashMap<>();
+
+		Map<String,Object> projectScheduleExportMap = new HashMap<>();
+
+		double notStartCount = 0;      // 未发起
+		double toBeSubmittedCount = 0; // 待提交
+		double toBeReviewedCount = 0;  // 待审查
+		double complianceCount = 0;    // 符合
+		double nonComplianceCount = 0; // 不符合
+		double toBeTrackedCount = 0;   // 待追踪
+		double notInvolvedCount = 0;   // 不涉及
+		double taskTerminationCount = 0;   // 任务终止
+		double count = 0;
+		// 计算百分比
+		double percentage = 0;
+		String percentageStr = "0";
+		if(CollectionUtils.isNotEmpty(pliEos)){
+			List<ProjectLawsInventoryEO> verifyNotStart = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+
+			List<ProjectLawsInventoryEO> verifyToBeSubmitted = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+
+			List<ProjectLawsInventoryEO> verifyToBeReviewed = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+
+			List<ProjectLawsInventoryEO> verifyCompliance = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+
+			List<ProjectLawsInventoryEO> verifyNonCompliance = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+
+			List<ProjectLawsInventoryEO> verifyToBeTracked = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+
+			List<ProjectLawsInventoryEO> verifyNotInvolved = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.UNINVOLVED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+
+			List<ProjectLawsInventoryEO> taskTermination = pliEos.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TERMINATION_OF_TASK.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+
+			notStartCount = verifyNotStart.size();
+			toBeSubmittedCount = verifyToBeSubmitted.size();
+			toBeReviewedCount = verifyToBeReviewed.size();
+			complianceCount = verifyCompliance.size();
+			nonComplianceCount = verifyNonCompliance.size();
+			toBeTrackedCount = verifyToBeTracked.size();
+			notInvolvedCount = verifyNotInvolved.size();
+			taskTerminationCount = taskTermination.size();
+
+			count = notStartCount + toBeSubmittedCount + toBeReviewedCount + complianceCount + nonComplianceCount + toBeTrackedCount + taskTerminationCount;
+			if(count <= 0){
+				percentage = 0;
+			}else{
+				// 计算百分比
+				percentage = complianceCount / count * 100;
+			}
+			percentageStr = percentage != 0 ? df.format(percentage) : "0";
+		}
+
+		projectScheduleExportMap.put("notStart",notStartCount);
+		projectScheduleExportMap.put("toBeSubmitted",toBeSubmittedCount);
+		projectScheduleExportMap.put("toBeReviewed",toBeReviewedCount);
+		projectScheduleExportMap.put("compliance",complianceCount);
+		projectScheduleExportMap.put("nonCompliance",nonComplianceCount);
+		projectScheduleExportMap.put("toBeTracked",toBeTrackedCount);
+		projectScheduleExportMap.put("notInvolved",notInvolvedCount);
+		projectScheduleExportMap.put("taskTermination",taskTerminationCount);
+		projectScheduleExportMap.put("count",count);
+		projectScheduleExportMap.put("percentage",percentageStr + percentSign);
+		result.put("projectScheduleExportMap",projectScheduleExportMap);
+		return result;
+	}
+
+	@Override
+	public IPage<ProjectLawsInventoryEO> queryPage(ProjectLawsInventoryEO projectLawsInventoryEO, Integer pageNo, Integer pageSize, HttpServletRequest req) {
+		String dutyTerritoryStr = "";
+		if (StringUtils.isNotEmpty(projectLawsInventoryEO.getDutyTerritory())) {
+			dutyTerritoryStr = projectLawsInventoryEO.getDutyTerritory();
+			projectLawsInventoryEO.setDutyTerritory(null);
+		}
+		String designFlowStatusStr = "";
+		if (StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignFlowStatus())) {
+			designFlowStatusStr = projectLawsInventoryEO.getDesignFlowStatus();
+			projectLawsInventoryEO.setDesignFlowStatus(null);
+		}
+		String verifyFlowStatusStr = "";
+		if (StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyFlowStatus())) {
+			verifyFlowStatusStr = projectLawsInventoryEO.getVerifyFlowStatus();
+			projectLawsInventoryEO.setVerifyFlowStatus(null);
+		}
+
+		// 根据一级责任领域（统计节点），查询该一级责任领域下所有子责任领域的法规清单数据。
+		if(StringUtils.isNotEmpty(projectLawsInventoryEO.getFirstLevelDutyTerritory())){
+			List<SysDictItem> sysDictItems = this.sysDictItemServiceImpl.selectItemsAll();
+			List<SysDictItem> dutyTerritorys = new ArrayList<>();
+			Map<String, List<SysDictItem>> firstLevelDTMap = this.sysDictItemServiceImpl.getFirstLevelSysDictItemByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue(), sysDictItems);
+			String[] firstLevelDTArr = projectLawsInventoryEO.getFirstLevelDutyTerritory().split(",");
+			for (String firstLevelDT : firstLevelDTArr){
+				if(CollectionUtils.isNotEmpty(firstLevelDTMap.get(firstLevelDT))){
+					dutyTerritorys.addAll(firstLevelDTMap.get(firstLevelDT));
+				}
+			}
+			if(CollectionUtils.isNotEmpty(dutyTerritorys)){
+				dutyTerritoryStr = dutyTerritorys.stream().map(SysDictItem::getItemValue).distinct().collect(Collectors.joining(","));
+			}
+		}
+
+		QueryWrapper<ProjectLawsInventoryEO> queryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO, req.getParameterMap());
+		queryWrapper.orderByDesc("create_time","serial_number");
+
+		if (StringUtils.isNotEmpty(dutyTerritoryStr)) {
+			String finalDutyTerritoryStr = dutyTerritoryStr.replaceAll("\\*","");
+			queryWrapper.and(query -> {
+				query.lambda().like(ProjectLawsInventoryEO::getDutyTerritory, finalDutyTerritoryStr);
+				if(StringUtils.contains(finalDutyTerritoryStr,",")){
+					String[] dutyTerritoryArr = finalDutyTerritoryStr.split(",");
+					for (String duty : dutyTerritoryArr) {
+						query.or(q -> {
+							q.like("duty_territory",duty);
+						});
+					}
+				}
+			});
+		}
+
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		int isProjectRole = Integer.parseInt(projectLawsInventoryEO.getRoleCode());
+		if (isProjectRole == Integer.parseInt(ProjectRoleEnum.VIEWER.getValue())) {
+			//查当前用户Viewer对应责任领域
+			List<String> dutyTerritoryList = this.projectUserDutyTerritoryService.queryDutyTerritoryByUserId(currentUser.getId());
+			if (ObjectUtils.isNotEmpty(dutyTerritoryList)) {
+				queryWrapper.and(query -> {
+					for (String duty : dutyTerritoryList) {
+						query.or(q -> {
+							q.like("duty_territory", duty);
+						});
+					}
+				});
+			}
+		}
+		if (StringUtils.isNotEmpty(designFlowStatusStr)) {
+			String finalDesignFlowStatusStr = designFlowStatusStr.replaceAll("\\*","");
+			queryWrapper.and(query -> {
+				query.lambda().like(ProjectLawsInventoryEO::getDesignFlowStatus, finalDesignFlowStatusStr);
+				if(StringUtils.contains(finalDesignFlowStatusStr,",")){
+					String[] designFlowStatusArr = finalDesignFlowStatusStr.split(",");
+					for (String dsf : designFlowStatusArr) {
+						query.or(q -> {
+							q.like("design_flow_status",dsf);
+						});
+					}
+				}
+			});
+		}
+		if (StringUtils.isNotEmpty(verifyFlowStatusStr)) {
+			String finalVerifyFlowStatusStr = verifyFlowStatusStr.replaceAll("\\*","");
+			queryWrapper.and(query -> {
+				query.lambda().like(ProjectLawsInventoryEO::getVerifyFlowStatus, finalVerifyFlowStatusStr);
+				if(StringUtils.contains(finalVerifyFlowStatusStr,",")){
+					String[] verifyFlowStatusArr = finalVerifyFlowStatusStr.split(",");
+					for (String vsf : verifyFlowStatusArr) {
+						query.or(q -> {
+							q.like("verify_flow_status",vsf);
+						});
+					}
+				}
+			});
+		}
+
+		if(isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())
+				&& isProjectRole != Integer.parseInt(ProjectRoleEnum.MANAGER.getValue())
+				&& isProjectRole != Integer.parseInt(ProjectRoleEnum.ADMIN.getValue())
+				&& isProjectRole != Integer.parseInt(ProjectRoleEnum.VIEWER.getValue())){
+			// 创建查询权限
+			this.createQueryPermission(isProjectRole,currentUser,queryWrapper);
+		}
+
+		Page<ProjectLawsInventoryEO> page = new Page<ProjectLawsInventoryEO>(pageNo, pageSize);
+		IPage<ProjectLawsInventoryEO> pageList = this.page(page, queryWrapper);
+		List<ProjectLawsInventoryEO> result = pageList.getRecords();
+
+		this.dataDispose(result,currentUser,isProjectRole,projectLawsInventoryEO.getCut());
+		this.dataDictDispose(result,projectLawsInventoryEO.getCut());
+		//表头排序
+		result = this.hearSort(projectLawsInventoryEO, result);
+		return pageList;
+	}
+
+	@Override
+	public Result<?> finalizationVerify(Map<String, Object> params) {
+		boolean result = false; // 返回true，可以定版，返回false 不能定版
+		String projectLibraryId = (String) params.get("projectLibraryId");
+		if(StringUtils.isEmpty(projectLibraryId)){
+			throw new JeroBootException("项目库id不能为空，请检查！");
+		}
+		QueryWrapper<ProjectLawsInventoryEO> pliQueryWrap = new QueryWrapper<>();
+		pliQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
+		List<ProjectLawsInventoryEO> pliEoList = this.list(pliQueryWrap);
+		if(CollectionUtils.isNotEmpty(pliEoList)){
+			for (ProjectLawsInventoryEO pliEo : pliEoList) {
+				String designFlowStatus = pliEo.getDesignFlowStatus();
+				String verifyFlowStatus = pliEo.getVerifyFlowStatus();
+				boolean designFlowStatusFlag = (
+						StringUtils.equals(designFlowStatus,ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+								|| StringUtils.equals(designFlowStatus,ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
+								|| StringUtils.equals(designFlowStatus,ComplianceFlowStatusEnum.CONFORMITY.getValue())
+								|| StringUtils.equals(designFlowStatus,ComplianceFlowStatusEnum.INCONFORMITY.getValue())
+								|| StringUtils.equals(designFlowStatus,ComplianceFlowStatusEnum.TO_TRACK.getValue())
+								|| StringUtils.equals(designFlowStatus,ComplianceFlowStatusEnum.UNINVOLVED.getValue())
+				);
+				boolean verifyFlowStatusFlag = (
+						StringUtils.equals(verifyFlowStatus,ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+								|| StringUtils.equals(verifyFlowStatus,ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
+								|| StringUtils.equals(verifyFlowStatus,ComplianceFlowStatusEnum.CONFORMITY.getValue())
+								|| StringUtils.equals(verifyFlowStatus,ComplianceFlowStatusEnum.INCONFORMITY.getValue())
+								|| StringUtils.equals(verifyFlowStatus,ComplianceFlowStatusEnum.TO_TRACK.getValue())
+								|| StringUtils.equals(verifyFlowStatus,ComplianceFlowStatusEnum.UNINVOLVED.getValue())
+				);
+				if(designFlowStatusFlag && verifyFlowStatusFlag){
+					result = true;
+				}else {
+					result = false;
+					break;
+				}
+			}
+		}
+		return Result.OK(result);
+	}
+
+	@Override
+	public Map<String, List<Map<String, Object>>> queryDutyPersonByProjectId(Map<String, Object> params) {
+		Map<String, List<Map<String, Object>>> result = new HashMap<>();
+		String projectLibraryId = (String) params.get("projectLibraryId");
+		if(StringUtils.isNotEmpty(projectLibraryId)){
+			LambdaQueryWrapper<ProjectLawsInventoryEO> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper.eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
+			List<ProjectLawsInventoryEO> pliList = this.list(queryWrapper);
+			List<String> designDutyList = new ArrayList<>();
+			List<String> verifyDutyList = new ArrayList<>();
+			for (ProjectLawsInventoryEO pli: pliList) {
+				if(StringUtils.isNotEmpty(pli.getDesignDutyId())){
+					designDutyList.add(pli.getDesignDutyId());
+				}
+				if(StringUtils.isNotEmpty(pli.getVerifyDutyId())){
+					verifyDutyList.add(pli.getVerifyDutyId());
+				}
+			}
+			if(CollectionUtils.isNotEmpty(designDutyList)){
+				List<Map<String, Object>> resList = new ArrayList<>();
+				List<SysUser> userList = this.sysUserService.querySysUserListByIdList(designDutyList);
+				if(CollectionUtils.isNotEmpty(userList)){
+					for (SysUser user : userList) {
+						Map<String,Object> userMap = new HashMap<>();
+						userMap.put("id",user.getId());
+						userMap.put("userName",user.getUsername());
+						resList.add(userMap);
+					}
+				}
+				result.put("designDutyList",resList);
+			}
+
+			if(CollectionUtils.isNotEmpty(verifyDutyList)){
+				List<Map<String, Object>> resList = new ArrayList<>();
+				List<SysUser> userList = this.sysUserService.querySysUserListByIdList(verifyDutyList);
+				if(CollectionUtils.isNotEmpty(userList)){
+					for (SysUser user : userList) {
+						Map<String,Object> userMap = new HashMap<>();
+						userMap.put("id",user.getId());
+						userMap.put("userName",user.getUsername());
+						resList.add(userMap);
+					}
+				}
+				result.put("verifyDutyList",resList);
+			}
+		}
+		return result;
+	}
+
+	@Override
+	public List<SysDictItem> getUserDutyTerritoryList(Map<String, Object> params) {
+		List<SysDictItem> result = new ArrayList<>();
+		String userId = (String) params.get("userId");
+		String projectLibraryId = (String) params.get("projectLibraryId");
+		List<SysDictItem> dutyTerritorySdiList = (List<SysDictItem>) params.get("dutyTerritorySdiList");
+
+		QueryWrapper<ProjectLawsInventoryEO> pliQueryWrap = new QueryWrapper<>();
+		pliQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
+		pliQueryWrap.and(pliQuery -> {
+			pliQuery.lambda().eq(ProjectLawsInventoryEO::getRegulationOwnerId,userId)
+					.or().eq(ProjectLawsInventoryEO::getDesignDutyId,userId)
+					.or().eq(ProjectLawsInventoryEO::getVerifyDutyId,userId);
+		});
+		List<ProjectLawsInventoryEO> pliEoList = this.list(pliQueryWrap);
+		if(CollectionUtils.isNotEmpty(pliEoList)){
+			List<String> dutyTerritoryIdList = Arrays.asList(
+					pliEoList.stream().map(ProjectLawsInventoryEO::getDutyTerritory).collect(Collectors.joining(",")).split(",")
+			).stream().distinct().collect(Collectors.toList());
+
+			result = dutyTerritorySdiList.stream().filter(dutyTerritory -> {
+				boolean flag = false;
+				for (String dutyTerritoryId : dutyTerritoryIdList) {
+					if (StringUtils.equals(dutyTerritoryId, dutyTerritory.getItemValue())) {
+						flag = true;
+						break;
+					}
+				}
+				return flag;
+			}).collect(Collectors.toList());
+		}
+
+		return result;
+	}
+	@Override
+	public void replacementUser(JSONObject json) {
+		String userId = json.getString("userId");
+		String projectLibraryId = json.getString("projectLibraryId");
+		List<Map<String, Object>> replacementUserList = (List<Map<String, Object>>) json.get("replacementUserList");
+
+		QueryWrapper<ProjectLawsInventoryEO> pliQueryWrap = new QueryWrapper<>();
+		pliQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId, projectLibraryId);
+		List<ProjectLawsInventoryEO> pliEoList = this.list(pliQueryWrap);
+
+		// 根据法规清单id，获取该法规清单在待办中心的任务明细。
+		List<String> oldPliEoIdList = pliEoList.stream().map(ProjectLawsInventoryEO::getId).distinct().collect(Collectors.toList());
+		QueryWrapper<ProcessInfoDetailEO> pidEoQueryWrap = new QueryWrapper<>();
+		pidEoQueryWrap.lambda().in(ProcessInfoDetailEO::getProjectLawsInventoryId, oldPliEoIdList);
+		List<ProcessInfoDetailEO> pidEoList = this.processInfoDetailEOService.list(pidEoQueryWrap);
+
+		List<ProjectLawsInventoryEO> updateEoList = new ArrayList<>();
+		for (Map<String, Object> replacementUserMap : replacementUserList) {
+			String dutyTerritory = (String) replacementUserMap.get("dutyTerritory");
+			String newUserId = (String) replacementUserMap.get("newUserId");
+			if (StringUtils.isNotEmpty(newUserId)) {
+				for (ProjectLawsInventoryEO pliEo : pliEoList) {
+					if (StringUtils.contains(pliEo.getDutyTerritory(), dutyTerritory)) {
+//						QueryWrapper<ProjectLawsInventoryEO> oldPliQueryWrap = new QueryWrapper<>();
+//						oldPliQueryWrap.lambda().eq(ProjectLawsInventoryEO::getId,pliEo.getId());
+//						List<ProjectLawsInventoryEO> oldPliEoList = this.list(oldPliQueryWrap);
+						// 过滤出来修改之前的法规清单数据
+						List<ProjectLawsInventoryEO> oldPliEoList = pliEoList.stream().filter(p -> StringUtils.equals(p.getId(),pliEo.getId())).distinct().collect(Collectors.toList());
+						ProjectLawsInventoryEO newPliEo = new ProjectLawsInventoryEO();
+
+						if (StringUtils.equals(pliEo.getRegulationOwnerId(), userId)) {
+							newPliEo.setRegulationOwnerId(newUserId);
+							// 处理编辑法规工程师的逻辑
+							this.editService.updateRegulationOwner(newPliEo, oldPliEoList,pidEoList);
+							pliEo.setRegulationOwnerId(newUserId);
+						}
+						if (StringUtils.equals(pliEo.getEngineeringInterfacePerson(), userId)) {
+							pliEo.setEngineeringInterfacePerson(newUserId);
+						}
+
+						if(StringUtils.equals(pliEo.getDesignDutyId(), userId) || StringUtils.equals(pliEo.getVerifyDutyId(), userId)){
+							if (StringUtils.equals(pliEo.getDesignDutyId(), userId)) {
+								newPliEo.setDesignDutyId(newUserId);
+							}
+							if (StringUtils.equals(pliEo.getVerifyDutyId(), userId)) {
+								newPliEo.setVerifyDutyId(newUserId);
+							}
+							// 处理编辑责任人的逻辑
+							this.editService.updateDutyPerson(newPliEo, oldPliEoList,pidEoList);
+							if (StringUtils.equals(pliEo.getDesignDutyId(), userId)) {
+								pliEo.setDesignDutyId(newUserId);
+							}
+							if (StringUtils.equals(pliEo.getVerifyDutyId(), userId)) {
+								pliEo.setVerifyDutyId(newUserId);
+							}
+						}
+						updateEoList.add(pliEo);
+					}
+				}
+			}
+		}
+
+		if (CollectionUtils.isNotEmpty(updateEoList)) {
+			this.updateBatchById(updateEoList);
+		}
+	}
+
+
+	/**
+	 * 验证用户在该项目中的角色
+	 *
+	 * @param projectLibraryId 项目库id
+	 * @param currentUserId    登录人id
+	 * @param lawsInventoryId  法规清单id
+	 * @return
+	 */
+	@Override
+	public int checkUserRole(String projectLibraryId, String currentUserId, String lawsInventoryId) {
+		int result = -1;
+		try {
+			QueryWrapper<ProjectLibraryBase> projectLibraryBaseQueryWrapper = new QueryWrapper<>();
+			projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId, projectLibraryId);
+			projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getStudioEngineer, currentUserId);
+			Integer projectLibrayBaseCount = projectLibraryBaseMapper.selectCount(projectLibraryBaseQueryWrapper);
+			if (projectLibrayBaseCount > 0) {
+				result = Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue());
+			} else {
+				if (StringUtils.isNotEmpty(lawsInventoryId)) {
+					//查询用户是否是法规工程师
+					QueryWrapper<ProjectLawsInventoryEO> queryWrapperFG = new QueryWrapper<>();
+					queryWrapperFG.lambda().eq(ProjectLawsInventoryEO::getRegulationOwnerId, currentUserId);
+					queryWrapperFG.lambda().eq(ProjectLawsInventoryEO::getId, lawsInventoryId);
+					Integer lawsInventoryCountFG = super.baseMapper.selectCount(queryWrapperFG);
+
+					QueryWrapper<ProjectLawsInventoryEO> queryWrapperRZ = new QueryWrapper<>();
+					queryWrapperRZ.lambda().eq(ProjectLawsInventoryEO::getHomologationEngineerId, currentUserId);
+					queryWrapperRZ.lambda().eq(ProjectLawsInventoryEO::getId, lawsInventoryId);
+					Integer lawsInventoryCountRZ = super.baseMapper.selectCount(queryWrapperRZ);
+
+					//如果两个工程师都是这个用户
+					if (lawsInventoryCountFG > 0 && lawsInventoryCountRZ > 0) {
+						result = Integer.parseInt(ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue());
+					} else if (lawsInventoryCountFG > 0) {
+						result = Integer.parseInt(ProjectRoleEnum.REGULATI_ENGINEER.getValue());
+					} else if (lawsInventoryCountRZ > 0) {
+						result = Integer.parseInt(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue());
+					}
+				}
+			}
+		} catch (Exception ex) {
+			log.error("验证用户在该项目中的角色失败：" + ex.getMessage());
+			throw new JeroBootException("验证用户在该项目中的角色失败！");
+		}
+		return result;
+	}
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/ProjectPlatformServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
similarity index 99%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/ProjectPlatformServiceImpl.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
index e328bc564..3cded8721 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/ProjectPlatformServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
@@ -55,7 +55,6 @@ import com.jero.modules.project.mapper.ProjectTaskInventoryEOMapper;
 import com.jero.modules.project.mapper.ProjectUserPermissionMapper;
 import com.jero.modules.project.service.IConditionAssessmentEOService;
 import com.jero.modules.project.service.IProjectCertificationInventoryEOService;
-import com.jero.modules.project.service.IProjectLibraryBaseService;
 import com.jero.modules.project.service.IProjectLibraryRoleRelEOService;
 import com.jero.modules.project.service.IProjectLibraryStatisticsService;
 import com.jero.modules.project.service.IProjectUserPermissionService;
@@ -65,8 +64,8 @@ import com.jero.modules.project.service.impl.ProjectNameInfoEOServiceImpl;
 import com.jero.modules.project.service.impl.ProjectRelatedPersonnelServiceImpl;
 import com.jero.modules.project.service.impl.ProjectTaskPlanningServiceImpl;
 import com.jero.modules.project.vo.TimeNodeVO;
-import com.jero.modules.projectPlatform.mapper.ProjectPlatformMapper;
-import com.jero.modules.projectPlatform.service.IProjectPlatformService;
+import com.jero.modules.projectPlatform.mapper.PlatformProjectLibraryBaseMapper;
+import com.jero.modules.projectPlatform.service.IPlatformIProjectLibraryBaseService;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.enums.DicCodeEnum;
@@ -129,7 +128,7 @@ import java.util.stream.Collectors;
  * @Version: V1.0
  */
 @Service
-public class ProjectPlatformServiceImpl extends ServiceImpl<ProjectPlatformMapper, ProjectLibraryBase> implements IProjectPlatformService {
+public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformProjectLibraryBaseMapper, ProjectLibraryBase> implements IPlatformIProjectLibraryBaseService {
 	@Autowired
 	private ProjectLibraryBaseMapper projectLibraryBaseMapper;
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/PlatformProjectNameInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/PlatformProjectNameInfoEOServiceImpl.java
new file mode 100644
index 000000000..3d7ea9c7f
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/PlatformProjectNameInfoEOServiceImpl.java
@@ -0,0 +1,382 @@
+package com.jero.modules.projectPlatform.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.system.vo.DictModel;
+import com.jero.modules.project.entity.ProjectLibraryBase;
+import com.jero.modules.project.entity.ProjectNameInfoEO;
+import com.jero.modules.project.entity.ProjectYearNameInfoEO;
+import com.jero.modules.project.mapper.ProblemManagementEOMapper;
+import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
+import com.jero.modules.project.service.impl.ProblemManagementEOServiceImpl;
+import com.jero.modules.project.service.impl.ProjectYearNameInfoEOServiceImpl;
+import com.jero.modules.projectPlatform.mapper.PlatpromProjectNameInfoEOMapper;
+import com.jero.modules.projectPlatform.service.IPlatformProjectNameInfoEOService;
+import com.jero.modules.space.service.SpaceServiceImpl;
+import com.jero.modules.system.enums.DicCodeEnum;
+import com.jero.modules.system.service.ISysDictService;
+import com.jero.modules.system.util.StringUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description: 项目名信息表
+ * @Author: jero-boot
+ * @Date:   2022-04-18
+ * @Version: V1.0
+ */
+@Service
+public class PlatformProjectNameInfoEOServiceImpl extends ServiceImpl<PlatpromProjectNameInfoEOMapper, ProjectNameInfoEO> implements IPlatformProjectNameInfoEOService {
+	@Autowired
+	private ProjectNameInfoEOMapper projectNameInfoEOMapper;
+
+	@Autowired
+	private SpaceServiceImpl spaceService;
+
+	@Autowired
+	private ProjectYearNameInfoEOServiceImpl projectYearNameInfoEOService;
+	@Autowired
+	private ProblemManagementEOMapper problemManagementEOMapper;
+	@Autowired
+	private ISysDictService sysDictService;
+	@Autowired
+	private ProblemManagementEOServiceImpl problemManagementEOService;
+	/**
+	 * 保存
+	 *
+	 * @param projectNameInfoEO
+	 * @return
+	 */
+	@Override
+	public void add(ProjectNameInfoEO projectNameInfoEO) {
+		Date now = new Date();
+		projectNameInfoEO.setCreateTime(now);
+		projectNameInfoEO.setUpdateTime(now);
+		save(projectNameInfoEO);
+	}
+
+	/**
+	 * 更新
+	 *
+	 * @param projectNameInfoEO
+	 * @return
+	 */
+	@Override
+	public void editById(ProjectNameInfoEO projectNameInfoEO) {
+		Date now = new Date();
+		projectNameInfoEO.setUpdateTime(now);
+		saveOrUpdate(projectNameInfoEO);
+	}
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public void deleteById(String id) {
+		removeById(id);
+	}
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+	public void deleteByIds(List<String> ids) {
+		removeByIds(ids);
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public ProjectNameInfoEO queryById(String id) {
+		return getById(id);
+	}
+
+	/**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+	public List<ProjectNameInfoEO> queryList() {
+		QueryWrapper<ProjectNameInfoEO> nameInfoEOQueryWrapper = new QueryWrapper<>();
+		List<ProjectNameInfoEO> projectNameInfoEOList = list(nameInfoEOQueryWrapper);
+//		List<String> projectNameInfoIdList = projectNameInfoEOList.stream().map(e -> e.getId()).collect(Collectors.toList());
+		for (ProjectNameInfoEO projectNameInfoEO : projectNameInfoEOList){
+			QueryWrapper<ProjectYearNameInfoEO> yearNameInfoEOQueryWrapper = new QueryWrapper<>();
+			yearNameInfoEOQueryWrapper.eq("project_name_id",projectNameInfoEO.getId());
+			List<ProjectYearNameInfoEO> yearNameInfoDataList = projectYearNameInfoEOService.list(yearNameInfoEOQueryWrapper);
+			if(CollectionUtils.isNotEmpty(yearNameInfoDataList)) {
+				projectNameInfoEO.setYearNameDataList(yearNameInfoDataList);
+			}
+		}
+
+//		List<ProjectNameInfoEO> projectNameAndYear = projectNameInfoEOMapper.selectProjectNameAndYear();
+		return projectNameInfoEOList;
+	}
+	/**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+	public List<ProjectLibraryBase> queryProjectNameList(String cut) {
+		List<ProjectLibraryBase> projectLibraryBaseList = problemManagementEOMapper.queryByIds(null);
+		//目标市场数据字典
+		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
+		for (ProjectLibraryBase projectLibraryBase : projectLibraryBaseList) {
+			//目标市场
+			String targetMarket = problemManagementEOService.getMarket(cut, targetMarketList, projectLibraryBase);
+			//主项目的版本号
+			String projectVersion = "";
+			if(StringUtils.isBlank(projectLibraryBase.getParentId())){
+				projectVersion = "00";
+			}else{
+				projectVersion = projectLibraryBase.getProjectVersion();
+			}
+			if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){
+				projectLibraryBase.setProjectName(projectLibraryBase.getProjectName()
+						+ "-" + projectLibraryBase.getYearName()
+						+ "-" + targetMarket
+						+"-"+projectVersion);
+			}
+		}
+		return projectLibraryBaseList;
+	}
+
+/*	@Override
+	public void getSpaceInfo(String cut){
+		String jsonData ="";
+		try {
+			jsonData = spaceService.getSign();
+			if(StringUtils.isNotBlank(jsonData)) {
+				//静态测试数据
+		*//*	jsonData = "{\n" +
+					"    \"resultData\": [\n" +
+					"        {\n" +
+					"            \"modelCode\": \"ES8_00\",\n" +
+					"            \"modelName\": \"ES8\",\n" +
+					"            \"hardwarePltCode\": \"mhp_npa\",\n" +
+					"            \"hardwarePltName\": \"NPA\",\n" +
+					"            \"softwarePltCode\": \"msp_nt1\",\n" +
+					"            \"softwarePltName\": \"NT1\",\n" +
+					"            \"modelYearInfoList\": [\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.1\",\n" +
+					"                    \"yearName\": \"G1.1\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.2\",\n" +
+					"                    \"yearName\": \"G1.2\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.3\",\n" +
+					"                    \"yearName\": \"G1.3\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.f\",\n" +
+					"                    \"yearName\": \"G1.F\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.f.e\",\n" +
+					"                    \"yearName\": \"G1.F.E\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_my2018\",\n" +
+					"                    \"yearName\": \"MY2018\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.5\",\n" +
+					"                    \"yearName\": \"G1.5\"\n" +
+					"                }\n" +
+					"            ]\n" +
+					"        },\n" +
+					"        {\n" +
+					"            \"modelCode\": \"FURY_00\",\n" +
+					"            \"modelName\": \"FURY\",\n" +
+					"            \"hardwarePltCode\": \"mhp_npa\",\n" +
+					"            \"hardwarePltName\": \"NPA\",\n" +
+					"            \"softwarePltCode\": \"msp_nt1\",\n" +
+					"            \"softwarePltName\": \"NT1\",\n" +
+					"            \"modelYearInfoList\": [\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.1\",\n" +
+					"                    \"yearName\": \"G1.1\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.2\",\n" +
+					"                    \"yearName\": \"G1.2\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.3\",\n" +
+					"                    \"yearName\": \"G1.3\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.f\",\n" +
+					"                    \"yearName\": \"G1.F\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.6\",\n" +
+					"                    \"yearName\": \"G1.6\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.5\",\n" +
+					"                    \"yearName\": \"G1.5\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.1.e\",\n" +
+					"                    \"yearName\": \"G1.1.E\"\n" +
+					"                }\n" +
+					"            ]\n" +
+					"        },\n" +
+					"        {\n" +
+					"            \"modelCode\": \"FORCE_00\",\n" +
+					"            \"modelName\": \"FORCE\",\n" +
+					"            \"hardwarePltCode\": \"mhp_npb\",\n" +
+					"            \"hardwarePltName\": \"NPB\",\n" +
+					"            \"softwarePltCode\": \"msp_nt2\",\n" +
+					"            \"softwarePltName\": \"NT2\",\n" +
+					"            \"modelYearInfoList\": [\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.1\",\n" +
+					"                    \"yearName\": \"G1.1\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.1.e\",\n" +
+					"                    \"yearName\": \"G1.1.E\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.2\",\n" +
+					"                    \"yearName\": \"G1.2\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.3\",\n" +
+					"                    \"yearName\": \"G1.3\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.f\",\n" +
+					"                    \"yearName\": \"G1.F\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.6\",\n" +
+					"                    \"yearName\": \"G1.6\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.5\",\n" +
+					"                    \"yearName\": \"G1.5\"\n" +
+					"                }\n" +
+					"            ]\n" +
+					"        },\n" +
+					"        {\n" +
+					"            \"modelCode\": \"Gemini_00\",\n" +
+					"            \"modelName\": \"Gemini\",\n" +
+					"            \"hardwarePltCode\": \"mhp_npa\",\n" +
+					"            \"hardwarePltName\": \"NPA\",\n" +
+					"            \"softwarePltCode\": \"msp_nt2\",\n" +
+					"            \"softwarePltName\": \"NT2\",\n" +
+					"            \"modelYearInfoList\": [\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.1\",\n" +
+					"                    \"yearName\": \"G1.1\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.1.e\",\n" +
+					"                    \"yearName\": \"G1.1.E\"\n" +
+					"                }\n" +
+					"            ]\n" +
+					"        },\n" +
+					"        {\n" +
+					"            \"modelCode\": \"Pegasus_00\",\n" +
+					"            \"modelName\": \"Pegasus\",\n" +
+					"            \"hardwarePltCode\": \"mhp_npc\",\n" +
+					"            \"hardwarePltName\": \"NPC\",\n" +
+					"            \"softwarePltCode\": \"msp_nt2\",\n" +
+					"            \"softwarePltName\": \"NT2\",\n" +
+					"            \"modelYearInfoList\": [\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.1\",\n" +
+					"                    \"yearName\": \"G1.1\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.1.e\",\n" +
+					"                    \"yearName\": \"G1.1.E\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_G1.1.RH\",\n" +
+					"                    \"yearName\": \"G1.1.RH\"\n" +
+					"                }\n" +
+					"            ]\n" +
+					"        }\n" +
+					"    ],\n" +
+					"    \"resultCode\": \"WL-0000\",\n" +
+					"    \"resultDesc\": \"Success\"\n" +
+					"}";*//*
+
+				JSONObject result = (JSONObject) JSON.parse(jsonData);
+				JSONArray resultData = result.getJSONArray("resultData");
+
+				String modelName = "";//项目名称
+				String hardwarePltName = "";//车型平台
+				String softwarePltName = "";//数字平台
+
+				//获取resultData中所需的数据
+				for (int i = 0; i < resultData.size(); i++) {
+					JSONObject jsonObject = resultData.getJSONObject(i);
+					modelName = jsonObject.getString("modelName");//项目名称
+					hardwarePltName = jsonObject.getString("hardwarePltName");//车型平台
+					softwarePltName = jsonObject.getString("softwarePltName");//数字平台
+					String nameInfoId = UUID.randomUUID().toString().replace("-", "");
+
+					ProjectNameInfoEO projectNameInfoEO = new ProjectNameInfoEO();
+					projectNameInfoEO.setId(nameInfoId);
+					projectNameInfoEO.setProjectName(modelName);
+					projectNameInfoEO.setVehiclePlatform(hardwarePltName);
+					projectNameInfoEO.setDigitalPlatform(softwarePltName);
+					//保存
+					save(projectNameInfoEO);
+
+					//设置年款名
+					JSONArray modelYearInfoJson = jsonObject.getJSONArray("modelYearInfoList");
+					for (int j = 0; j < modelYearInfoJson.size(); j++) {
+						JSONObject modelYearInfo = modelYearInfoJson.getJSONObject(j);
+						String yearName = modelYearInfo.getString("yearName");
+
+						ProjectYearNameInfoEO projectYearNameInfoEO = new ProjectYearNameInfoEO();
+						projectYearNameInfoEO.setProjectNameId(nameInfoId);
+						projectYearNameInfoEO.setYearName(yearName);
+						//保存
+						projectYearNameInfoEOService.save(projectYearNameInfoEO);
+
+					}
+					if(CutEnum.CN.getValue().equals(cut)) {
+						throw new JeroBootException("从Space获取项目名称相关数据,成功保存");
+					}else{
+						throw new JeroBootException("Get the data related to the project name from Space and save it successfully.");
+					}
+				}
+			}else{
+				if(CutEnum.CN.getValue().equals(cut)) {
+					throw new JeroBootException("从Space获取项目名称相关数据为空");
+				}else{
+					throw new JeroBootException("Data related to obtaining project name from Space is empty.");
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}*/
+
+}

From 10b796c793c2e619e1ff185da58232739ef34520 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 13 Sep 2023 13:47:29 +0800
Subject: [PATCH 008/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ectCertificationInventoryEOController.java |  376 +
 ...ProjectCertificationInventoryEOMapper.java |   14 +
 ...mProjectCertificationInventoryEOMapper.xml |   31 +
 ...rojectCertificationInventoryEOService.java |  341 +
 ...ctCertificationInventoryEOServiceImpl.java | 6847 +++++++++++++++++
 5 files changed, 7609 insertions(+)
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/PlatformProjectCertificationInventoryEOController.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/PlatformProjectCertificationInventoryEOMapper.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/PlatformProjectCertificationInventoryEOMapper.xml
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IPlatformProjectCertificationInventoryEOService.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/PlatformProjectCertificationInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/PlatformProjectCertificationInventoryEOController.java
new file mode 100644
index 000000000..153f33036
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/PlatformProjectCertificationInventoryEOController.java
@@ -0,0 +1,376 @@
+package com.jero.modules.projectPlatform.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
+import com.jero.modules.projectPlatform.service.IPlatformProjectCertificationInventoryEOService;
+import com.jero.modules.system.entity.SysRole;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+* @Description: 项目库-认证清单表
+* @Author: jero-boot
+* @Date:   2023-03-03
+* @Version: V1.0
+*/
+@Api(tags="平台件项目库-认证清单表")
+@RestController
+@RequestMapping("/project/platformProjectCertificationInventoryEO")
+@Slf4j
+public class PlatformProjectCertificationInventoryEOController extends JeroController<ProjectCertificationInventoryEO, IPlatformProjectCertificationInventoryEOService> {
+   @Autowired
+   private IPlatformProjectCertificationInventoryEOService platformProjectCertificationInventoryEOService;
+
+   /**
+    * 分页列表查询
+    *
+    * @param projectCertificationInventoryEO
+    * @param pageNo
+    * @param pageSize
+    * @param req
+    * @return
+    */
+   @AutoLog(value = "项目库-认证清单表-分页列表查询")
+   @ApiOperation(value="项目库-认证清单表-分页列表查询", notes="项目库-认证清单表-分页列表查询")
+   @GetMapping(value = "/page")
+   public Result<?> queryPageList(ProjectCertificationInventoryEO projectCertificationInventoryEO,
+                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                  @RequestParam(name="cut", defaultValue="cn") String cut,
+                                  HttpServletRequest req) {
+       String flowStatusStr = "";
+       if (StringUtils.isNotEmpty(projectCertificationInventoryEO.getFlowStatus())) {
+           flowStatusStr = projectCertificationInventoryEO.getFlowStatus();
+           projectCertificationInventoryEO.setFlowStatus(null);
+       }
+       QueryWrapper<ProjectCertificationInventoryEO> queryWrapper = QueryGenerator.initQueryWrapper(projectCertificationInventoryEO, req.getParameterMap());
+       if (StringUtils.isNotEmpty(flowStatusStr)) {
+           String finalflowStatusStr = flowStatusStr.replaceAll("\\*","");
+           queryWrapper.and(query -> {
+               query.lambda().like(ProjectCertificationInventoryEO::getFlowStatus, finalflowStatusStr);
+               if(StringUtils.contains(finalflowStatusStr,",")){
+                   String[] flowStatusArr = finalflowStatusStr.split(",");
+                   for (String fs : flowStatusArr) {
+                       query.or(q -> {
+                           q.like("flow_status",fs);
+                       });
+                   }
+               }
+           });
+       }
+       queryWrapper.orderByDesc("create_time");
+       Page<ProjectCertificationInventoryEO> page = new Page<ProjectCertificationInventoryEO>(pageNo, pageSize);
+       IPage<ProjectCertificationInventoryEO> pageList = this.platformProjectCertificationInventoryEOService.queryPage(queryWrapper,page,projectCertificationInventoryEO,cut);
+       return Result.OK(cut,pageList);
+   }
+
+   /**
+    * 列表查询
+    *
+    * @return
+    */
+   @AutoLog(value = "项目库-认证清单表-列表查询")
+   @ApiOperation(value="项目库-认证清单表-列表查询", notes="项目库-认证清单表-列表查询")
+   @GetMapping(value = "/list")
+   public Result<List<ProjectCertificationInventoryEO>> queryList() {
+       List<ProjectCertificationInventoryEO> list = platformProjectCertificationInventoryEOService.queryList();
+       return Result.OK(list);
+   }
+
+   /**
+    *   添加
+    *
+    * @param projectCertificationInventoryEO
+    * @return
+    */
+   @AutoLog(value = "项目库-认证清单表-添加")
+   @ApiOperation(value="项目库-认证清单表-添加", notes="项目库-认证清单表-添加")
+   @PostMapping(value = "/add")
+   public Result<?> add(@Validated @RequestBody ProjectCertificationInventoryEO projectCertificationInventoryEO) {
+       platformProjectCertificationInventoryEOService.add(projectCertificationInventoryEO);
+       return Result.OK("添加成功！");
+   }
+
+   /**
+    *  编辑
+    *
+    * @param projectCertificationInventoryEO
+    * @return
+    */
+   @AutoLog(value = "项目库-认证清单表-编辑")
+   @ApiOperation(value="项目库-认证清单表-编辑", notes="项目库-认证清单表-编辑")
+   @PutMapping(value = "/edit")
+   public Result<?> edit(@Validated @RequestBody ProjectCertificationInventoryEO projectCertificationInventoryEO) {
+       platformProjectCertificationInventoryEOService.editById(projectCertificationInventoryEO);
+       return Result.OK("编辑成功!");
+   }
+
+   /**
+    *   通过id删除
+    *
+    * @param id
+    * @return
+    */
+   @AutoLog(value = "项目库-认证清单表-通过id删除")
+   @ApiOperation(value="项目库-认证清单表-通过id删除", notes="项目库-认证清单表-通过id删除")
+   @DeleteMapping(value = "/delete")
+   public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+       platformProjectCertificationInventoryEOService.deleteById(id);
+       return Result.OK("删除成功!");
+   }
+
+   /**
+    *  批量删除
+    *
+    * @param ids
+    * @return
+    */
+   @AutoLog(value = "项目库-认证清单表-批量删除")
+   @ApiOperation(value="项目库-认证清单表-批量删除", notes="项目库-认证清单表-批量删除")
+   @DeleteMapping(value = "/deleteBatch")
+   public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+       this.platformProjectCertificationInventoryEOService.deleteByIds(Arrays.asList(ids.split(",")));
+       return Result.OK("批量删除成功!");
+   }
+
+   /**
+    * 通过id查询
+    *
+    * @param id
+    * @return
+    */
+   @AutoLog(value = "项目库-认证清单表-通过id查询")
+   @ApiOperation(value="项目库-认证清单表-通过id查询", notes="项目库-认证清单表-通过id查询")
+   @GetMapping(value = "/queryById")
+   public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+       ProjectCertificationInventoryEO projectCertificationInventoryEO = platformProjectCertificationInventoryEOService.queryById(id);
+       if(projectCertificationInventoryEO==null) {
+           return Result.error("未找到对应数据");
+       }
+       return Result.OK(projectCertificationInventoryEO);
+   }
+
+   /**
+   * 导出excel
+   *
+   * @param request
+   * @param projectCertificationInventoryEO
+   */
+   @RequestMapping(value = "/exportXls")
+   public ModelAndView exportXls(HttpServletRequest request, ProjectCertificationInventoryEO projectCertificationInventoryEO) {
+       return super.exportXls(request, projectCertificationInventoryEO, ProjectCertificationInventoryEO.class, "项目库-认证清单表");
+   }
+
+   /**
+     * 通过excel导入数据
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+   @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+   public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+       return super.importExcel(request, response, ProjectCertificationInventoryEO.class);
+   }
+
+    @AutoLog(value = "项目库-认证清单表-批量添加")
+    @ApiOperation(value="项目库-认证清单表-批量添加", notes="项目库-认证清单表-批量添加")
+    @PostMapping(value = "/batchAdd")
+    public Result<?> batchAdd(@RequestBody JSONObject json) {
+        return this.platformProjectCertificationInventoryEOService.batchAdd(json);
+    }
+
+    @AutoLog(value = "项目库-认证清单表-批量设置")
+    @ApiOperation(value="项目库-认证清单表-批量设置", notes="项目库-认证清单表-批量设置")
+    @PostMapping(value = "/setBatch")
+    public Result<?> setBatch(@RequestBody ProjectCertificationInventoryEO projectCertificationInventoryEO) {
+        return this.platformProjectCertificationInventoryEOService.setBatch(projectCertificationInventoryEO);
+    }
+
+    @AutoLog(value = "项目库-认证清单表-studio发布")
+    @ApiOperation(value="项目库-认证清单表-studio发布", notes="项目库-认证清单表-studio发布")
+    @PostMapping(value = "/issue")
+    public Result<?> issue(@RequestBody JSONObject json) {
+        return this.platformProjectCertificationInventoryEOService.issue(json);
+    }
+
+    @AutoLog(value = "项目库-认证清单表-当前登录用户角色")
+    @ApiOperation(value="项目库-认证清单表-当前登录用户角色", notes="项目库-认证清单表-当前登录用户角色")
+    @GetMapping(value = "/getRoleByUserId")
+    public Result<List<SysRole>> getRoleByUserId(@RequestParam Map<String,Object> params) {
+        return this.platformProjectCertificationInventoryEOService.getRoleByUserId(params);
+    }
+
+    @AutoLog(value = "项目库-认证清单表-获取流程状态列表")
+    @ApiOperation(value="项目库-认证清单表-获取流程状态列表", notes="项目库-认证清单表-获取流程状态列表")
+    @GetMapping(value = "/getFlowStatusList")
+    public Result<?> getFlowStatusList(@RequestParam("cut") String cut) {
+        return this.platformProjectCertificationInventoryEOService.getFlowStatusList(cut);
+    }
+
+    @AutoLog(value = "项目库-认证清单表-认证流程统一提交任务接口")
+    @ApiOperation(value="项目库-认证清单表-认证流程统一提交任务接口", notes="项目库-认证清单表-认证流程统一提交任务接口")
+    @PostMapping(value = "/submitTask")
+    public Result<?> submitTask(@RequestBody JSONObject json) {
+        return this.platformProjectCertificationInventoryEOService.submitTask(json);
+    }
+
+    @AutoLog(value = "项目库-认证清单表-批量保存")
+    @ApiOperation(value="项目库-认证清单表-批量保存", notes="项目库-认证清单表-批量保存")
+    @PostMapping(value = "/saveBatch")
+    public Result<?> saveBatch(@RequestBody JSONObject json) {
+        return this.platformProjectCertificationInventoryEOService.saveBatch(json);
+    }
+
+    @AutoLog(value = "项目库-认证清单表-流程重置")
+    @ApiOperation(value="项目库-认证清单表-流程重置", notes="项目库-认证清单表-流程重置")
+    @PostMapping(value = "/resetFlow")
+    public Result<?> resetFlow(@RequestBody JSONObject json) {
+        return this.platformProjectCertificationInventoryEOService.resetFlow(json);
+    }
+
+    @AutoLog(value = "项目库-认证清单表-转办")
+    @ApiOperation(value="项目库-认证清单表-转办", notes="项目库-认证清单表-转办")
+    @PostMapping(value = "/transferTask")
+    public Result<?> transferTask(@RequestBody JSONObject json) {
+        return this.platformProjectCertificationInventoryEOService.transferTask(json);
+    }
+
+    @AutoLog(value = "项目库-认证清单表-催办")
+    @ApiOperation(value="项目库-认证清单表-催办", notes="项目库-认证清单表-催办")
+    @PostMapping(value = "/expediting")
+    public Result<?> expediting(@RequestBody JSONObject json) {
+        return this.platformProjectCertificationInventoryEOService.expediting(json);
+    }
+
+    @AutoLog(value = "项目库-认证清单表-批量修改配置项")
+    @ApiOperation(value="项目库-认证清单表-批量修改配置项", notes="项目库-认证清单表-批量修改配置项")
+    @PostMapping(value = "/updateConfigItemBatch")
+    public Result<?> updateConfigItemBatch(@RequestBody JSONObject json) {
+        return this.platformProjectCertificationInventoryEOService.updateConfigItemBatch(json);
+    }
+
+    @ApiOperation(value="项目库-认证清单表-模板下载", notes="项目库-认证清单表-模板下载")
+    @GetMapping(value = "/exportTemplate")
+    public void exportTemplate(ProjectCertificationInventoryEO projectCertificationInventoryEO, HttpServletResponse response, HttpServletRequest request) throws Exception {
+        platformProjectCertificationInventoryEOService.exportTemplate(projectCertificationInventoryEO,response,request);
+    }
+
+    /**
+     * 导入数据
+     *
+     * @param file
+     * @param projectCertificationInventoryEO
+     * @return
+     */
+    @ApiOperation(value="项目库-认证清单表-导入数据", notes="项目库-认证清单表-导入数据")
+    @RequestMapping(value = "/importData", method = RequestMethod.POST)
+    public Result<?> importData(@RequestParam(value = "file", required = false) MultipartFile file,
+                                ProjectCertificationInventoryEO projectCertificationInventoryEO) {
+        platformProjectCertificationInventoryEOService.importData(file,projectCertificationInventoryEO);
+        return Result.OK("导入成功");
+    }
+    /**
+     * 导出数据
+     *  @param request
+     * @param projectCertificationInventoryEO
+     */
+    @ApiOperation(value="项目库-认证清单表-导出数据", notes="项目库-认证清单表-导出数据")
+    @RequestMapping(value = "/exportData",method = RequestMethod.GET)
+//	 @RequiresPermissions("projectLawsInventory:exportData")
+    public void exportData(HttpServletResponse response,
+                           HttpServletRequest request,
+                           ProjectCertificationInventoryEO projectCertificationInventoryEO) {
+        platformProjectCertificationInventoryEOService.exportData(response,request, projectCertificationInventoryEO);
+    }
+
+    @AutoLog(value = "项目库-认证清单表-调取添加")
+    @ApiOperation(value="项目库-认证清单表-调取添加", notes="项目库-认证清单表-调取添加")
+    @PostMapping(value = "/callAdd")
+    public Result<?> callAdd(@RequestBody JSONObject json) {
+        return this.platformProjectCertificationInventoryEOService.callAdd(json);
+    }
+
+    @AutoLog(value = "项目库-认证清单表-引用交付物")
+    @ApiOperation(value="项目库-认证清单表-引用交付物", notes="项目库-认证清单表-引用交付物")
+    @PostMapping(value = "/citeDeliverable")
+    public Result<?> citeDeliverable(@RequestBody JSONObject json) {
+        return this.platformProjectCertificationInventoryEOService.citeDeliverable(json);
+    }
+
+    /**
+     *  批量更新法规清单状态
+     * @param json
+     * @return
+     */
+    @AutoLog(value = "项目库-认证清单表-批量更新流程状态")
+    @ApiOperation(value="项目库-认证清单表-批量更新流程状态", notes="项目库-认证清单表-批量更新流程状态")
+    @PostMapping(value = "/updateStatusBatch")
+    public Result<?> updateStatusBatch(@RequestBody JSONObject json) {
+        return this.platformProjectCertificationInventoryEOService.updateStatusBatch(json);
+    }
+
+    /**
+     * 添加配置 等同于 复制
+     * @param json
+     * @return
+     */
+    @AutoLog(value = "项目库-认证清单表-添加配置")
+    @ApiOperation(value="项目库-认证清单表-添加配置", notes="项目库-认证清单表-添加配置")
+    @PostMapping(value = "/addConfigByIds")
+    public Result<?> addConfigByIds(@RequestBody JSONObject json) {
+        return this.platformProjectCertificationInventoryEOService.addConfigByIds(json);
+    }
+
+    /**
+     * 获取责任人和接口人
+     * @return
+     */
+    @AutoLog(value = "项目库-认证清单表-获取责任人和接口人")
+    @ApiOperation(value="项目库-认证清单表-获取责任人和接口人", notes="项目库-认证清单表-获取责任人和接口人")
+    @GetMapping(value = "/queryDutyPersonByProjectId")
+    public Result<?> queryDutyPersonByProjectId(@RequestParam Map<String,Object> params) {
+        return Result.OK(this.platformProjectCertificationInventoryEOService.queryDutyPersonByProjectId(params));
+    }
+
+    /**
+     * 匹配相关人员
+     * @param params
+     * @return
+     */
+    @AutoLog(value = "项目库-认证清单表-匹配相关人员")
+    @ApiOperation(value="项目库-认证清单表-匹配相关人员", notes="项目库-法规清单表-匹配相关人员")
+    @PostMapping(value = "/matchRelevantPeople")
+    public Result<?> matchRelevantPeople(@RequestBody Map<String,Object> params){
+        return this.platformProjectCertificationInventoryEOService.matchRelevantPeople(params);
+    }
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/PlatformProjectCertificationInventoryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/PlatformProjectCertificationInventoryEOMapper.java
new file mode 100644
index 000000000..ccf496fab
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/PlatformProjectCertificationInventoryEOMapper.java
@@ -0,0 +1,14 @@
+package com.jero.modules.projectPlatform.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
+
+/**
+ * @Description: 项目库-认证清单表
+ * @Author: jero-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+public interface PlatformProjectCertificationInventoryEOMapper extends BaseMapper<ProjectCertificationInventoryEO> {
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/PlatformProjectCertificationInventoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/PlatformProjectCertificationInventoryEOMapper.xml
new file mode 100644
index 000000000..2a72281e0
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/PlatformProjectCertificationInventoryEOMapper.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.projectPlatform.mapper.PlatformProjectCertificationInventoryEOMapper">
+    <resultMap id="ProjectCertificationInventoryEOResultMap" type="com.jero.modules.project.entity.ProjectCertificationInventoryEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="category" property="category" />
+        <result column="inspection_item" property="inspectionItem" />
+        <result column="config_item" property="configItem" />
+        <result column="wvta_id" property="wvtaId" />
+        <result column="serial_number" property="serialNumber" />
+        <result column="duty_territory" property="dutyTerritory" />
+        <result column="deliverable" property="deliverable" />
+        <result column="buss_document_library_id" property="bussDocumentLibraryId" />
+        <result column="sdt" property="sdt" />
+        <result column="duty_person" property="dutyPerson" />
+        <result column="deliverable_type" property="deliverableType" />
+        <result column="deliverable_template" property="deliverableTemplate" />
+        <result column="delivery_result" property="deliveryResult" />
+        <result column="end_time" property="endTime" />
+        <result column="flow_status" property="flowStatus" />
+        <result column="report_number" property="reportNumber" />
+        <result column="product_model" property="productModel" />
+        <result column="production_enterprise_name" property="productionEnterpriseName" />
+        <result column="certification_progress" property="certificationProgress" />
+    </resultMap>
+</mapper>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IPlatformProjectCertificationInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IPlatformProjectCertificationInventoryEOService.java
new file mode 100644
index 000000000..fb9be3985
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IPlatformProjectCertificationInventoryEOService.java
@@ -0,0 +1,341 @@
+package com.jero.modules.projectPlatform.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.common.api.vo.Result;
+import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
+import com.jero.modules.system.entity.SysCategory;
+import com.jero.modules.system.entity.SysDictItem;
+import com.jero.modules.system.entity.SysRole;
+import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
+import com.jero.modules.todoCenter.entity.ProcessInfoEO;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 项目库-认证清单表
+ * @Author: jero-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+public interface IPlatformProjectCertificationInventoryEOService extends IService<ProjectCertificationInventoryEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param projectCertificationInventoryEO
+	 * @return
+	 */
+    void add(ProjectCertificationInventoryEO projectCertificationInventoryEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param projectCertificationInventoryEO
+	 * @return
+	 */
+    void editById(ProjectCertificationInventoryEO projectCertificationInventoryEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ProjectCertificationInventoryEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ProjectCertificationInventoryEO> queryList();
+
+	/**
+	 * 批量添加
+	 * @param json
+	 * @return
+	 */
+    Result<?> batchAdd(JSONObject json);
+
+	/**
+	 * 批量设置
+	 * @param projectCertificationInventoryEO
+	 * @return
+	 */
+	Result<?> setBatch(ProjectCertificationInventoryEO projectCertificationInventoryEO);
+
+	/**
+	 * 处理数据
+	 * @param datas
+	 * @param cut
+	 */
+	void disposeData(List<ProjectCertificationInventoryEO> datas, String cut);
+
+	/**
+	 * 导入时的数据处理
+	 * @param datas
+	 * @param cut
+	 */
+	void importDisposeData(List<ProjectCertificationInventoryEO> datas, String cut);
+
+	String getTreeNameImport(String cut, List<SysCategory> categoryList, List<String> technologyTerritoryList);
+
+	String getTreeName(String cut, List<SysCategory> categoryList, List<String> technologyTerritoryList);
+
+	/**
+	 * studio发布
+	 * @param json
+	 * @return
+	 */
+	Result<?> issue(JSONObject json);
+
+	void addProcessInfoEO(ProcessInfoEO processInfoEO, String projectLibraryId);
+
+	void addProcessInfoDetailEO(List<ProcessInfoDetailEO> processInfoDetailEOList, String processInfoId, String taskDefinitionKey);
+
+	Result<List<SysRole>> getRoleByUserId(Map<String, Object> params);
+
+	Result<?> getFlowStatusList(String cut);
+
+	IPage<ProjectCertificationInventoryEO> queryPage(QueryWrapper<ProjectCertificationInventoryEO> queryWrapper,
+													 Page<ProjectCertificationInventoryEO> page,
+													 ProjectCertificationInventoryEO projectCertificationInventoryEO,
+													 String cut);
+
+	void createQueryPermission(QueryWrapper<ProjectCertificationInventoryEO> queryWrapper, String roleCode);
+
+	/**
+	 * 认证流程统一提交任务
+	 * @param json
+	 * @return
+	 */
+	Result<?> submitTask(JSONObject json);
+
+	/**
+	 * 认证工程师发起任务
+	 * @param json
+	 * @return
+	 */
+	Result<?> certificationInitiatingTask(JSONObject json);
+
+	/**
+	 * 批量保存
+	 * @param json
+	 * @return
+	 */
+	Result<?> saveBatch(JSONObject json);
+
+	/**
+	 * 流程重置
+	 * @param json
+	 * @return
+	 */
+    Result<?> resetFlow(JSONObject json);
+
+	/**
+	 * 转办任务
+	 * @param json
+	 * @return
+	 */
+    Result<?> transferTask(JSONObject json);
+
+	/**
+	 * 催办任务
+	 * @param json
+	 * @return
+	 */
+	Result<?> expediting(JSONObject json);
+
+	Map<String,Object> getCertificationInventoryLinkHrefFeishu(String projectLibraryId,String PRN_CN,String PRN_EN);
+
+	Map<String,Object> getStandNameAndItemName(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList);
+
+	/**
+	 * 模板下载
+	 * @param projectCertificationInventoryEO
+	 * @param response
+	 * @param request
+	 */
+	void exportTemplate(ProjectCertificationInventoryEO projectCertificationInventoryEO, HttpServletResponse response, HttpServletRequest request);
+
+	/**
+	 * 批量修改配置项
+	 * @param json
+	 * @return
+	 */
+	Result<?> updateConfigItemBatch(JSONObject json);
+
+	/**
+	 * 调取添加
+	 * @param json
+	 * @return
+	 */
+	Result<?> callAdd(JSONObject json);
+
+	/**
+	 * 导入数据
+	 * @param file
+	 * @param projectCertificationInventoryEO
+	 */
+	void importData(MultipartFile file, ProjectCertificationInventoryEO projectCertificationInventoryEO);
+
+	/**
+	 * projectCertificationInventoryEO
+	 * @param response
+	 * @param request
+	 * @param projectCertificationInventoryEO
+	 */
+	void exportData(HttpServletResponse response, HttpServletRequest request, ProjectCertificationInventoryEO projectCertificationInventoryEO);
+
+	/**
+	 * 引用交付物
+	 * @param json
+	 * @return
+	 */
+	Result<?> citeDeliverable(JSONObject json);
+
+	/**
+	 * 根据模板返送消息
+	 * @param projectCertificationInventoryEOS
+	 * @param templeteId
+	 * @param userIdList
+	 * @param userInfoList
+	 */
+	void sendMessageByTemplateId(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOS, String templeteId, List<String> userIdList, List<SysUser> userInfoList, Date endTimeString, String taskDefinitionKey);
+
+	/**
+	 * 数据唯一校验。
+	 * @param projectCertificationInventoryEOList
+	 * @param cut
+	 * @return
+	 */
+	List<ProjectCertificationInventoryEO> dataUniqueCheck(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList, String cut,List<String> result,String projectLibraryId);
+
+	/**
+	 *
+	 * @param json
+	 * @return
+	 */
+    Result<?> updateStatusBatch(JSONObject json);
+
+	/**
+	 * 添加配置
+	 * @param json
+	 * @return
+	 */
+    Result<?> addConfigByIds(JSONObject json);
+	String handlePhoneLink(String id, String prn_cn, String key);
+	void certificationInventoryEOListSortByEndTimeAsc(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList);
+	void certificationInventoryEOListSortByInventoryVerifyEndTimeAsc(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList);
+	void certificationInventoryEOListSortByTaskConfirmEndTimeAsc(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList);
+	Map<String, List<Map<String, Object>>> queryDutyPersonByProjectId(Map<String, Object> params);
+
+	/**
+	 * 获取任务确认统计信息
+	 * @param pciEoList
+	 * @return
+	 */
+    List<Map<String, Object>> getTaskToConfirmStatistics(List<ProjectCertificationInventoryEO> pciEoList);
+
+	/**
+	 * 获取Pre-Homo统计信息
+	 * @param pciEoList
+	 * @return
+	 */
+    List<Map<String, Object>> getPrehomoStatistice(List<ProjectCertificationInventoryEO> pciEoList);
+
+	/**
+	 * 获取认证进度统计信息 全部
+	 * @param pciEoList
+	 * @return
+	 */
+	List<Map<String, Object>> getAllCertificationProgressStatistics(List<ProjectCertificationInventoryEO> pciEoList);
+
+	/**
+	 * 获取认证进度统计信息 整车
+	 * @param pciEoList
+	 * @return
+	 */
+	List<Map<String, Object>> getCarCertificationProgressStatistics(List<ProjectCertificationInventoryEO> pciEoList);
+
+	/**
+	 * 获取认证进度统计信息  零部件
+	 * @param pciEoList
+	 * @return
+	 */
+	List<Map<String, Object>> getPartCertificationProgressStatistics(List<ProjectCertificationInventoryEO> pciEoList);
+
+	/**
+	 * 按照认证任务确认状态分组
+	 * @param pciEos
+	 * @return
+	 */
+	Map<String, Object> groupByFGRwqrStatus(List<ProjectCertificationInventoryEO> pciEos);
+
+	/**
+	 * 按照preHomo确认状态分组
+	 * @param pciEos
+	 * @return
+	 */
+	Map<String, Object> groupByPreHomoStatus(List<ProjectCertificationInventoryEO> pciEos);
+
+	/**
+	 * 根据认证进度分组
+	 * @param pciEos
+	 * @return
+	 */
+	Map<String, Object> groupByCertificationProgress(List<ProjectCertificationInventoryEO> pciEos);
+
+	/**
+	 * 同步待办中心明细数据-认证清单 截止日期
+	 * @param endTime
+	 * @param editEndTimeCertificationInventoryEOS
+	 */
+	void syncProcessInfoDetailEndTime(Date endTime, List<ProjectCertificationInventoryEO> editEndTimeCertificationInventoryEOS);
+
+	/**
+	 * 获取用户的责任领域数组
+	 * @param params
+	 * @return
+	 */
+	List<SysDictItem> getUserDutyTerritoryList(Map<String, Object> params);
+
+	/**
+	 * 替换用户
+	 * @param json
+	 */
+    void replacementUser(JSONObject json);
+
+	/**
+	 * 匹配相关人员
+	 * @param params
+	 * @return
+	 */
+	Result<?> matchRelevantPeople(Map<String, Object> params);
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
new file mode 100644
index 000000000..5341e45f3
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
@@ -0,0 +1,6847 @@
+package com.jero.modules.projectPlatform.service.impl;
+
+import cn.hutool.core.util.URLUtil;
+import cn.hutool.core.util.ZipUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.utils.IOUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.api.vo.Result;
+import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.exception.JeroBootException;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.common.system.vo.LoginUser;
+import com.jero.common.util.DateUtils;
+import com.jero.common.util.oss.CosBootUtil;
+import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO;
+import com.jero.modules.authDummy.service.IAuthDummyInventoryBaseEOService;
+import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService;
+import com.jero.modules.document.entity.BussDocumentLibraryEO;
+import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper;
+import com.jero.modules.document.service.IBussDocumentLibraryEOService;
+import com.jero.modules.dummy.enums.OrderEnum;
+import com.jero.modules.enums.DictCodeEnum;
+import com.jero.modules.feishu.enums.TemplateInfoEnum2;
+import com.jero.modules.feishu.service.IFeishuService;
+import com.jero.modules.oss.entity.OSSFile;
+import com.jero.modules.oss.service.IOSSFileService;
+import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEO;
+import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOEn;
+import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
+import com.jero.modules.project.entity.ProjectCertificationInventoryEOEn;
+import com.jero.modules.project.entity.ProjectCertificationInventoryLogEO;
+import com.jero.modules.project.entity.ProjectLawsInventoryEO;
+import com.jero.modules.project.entity.ProjectLibraryBase;
+import com.jero.modules.project.entity.ProjectLibraryRoleRelEO;
+import com.jero.modules.project.entity.ProjectRelatedPersonnel;
+import com.jero.modules.project.entity.ProjectUserPermission;
+import com.jero.modules.project.enums.CertificationFlowNodeEnum;
+import com.jero.modules.project.enums.CertificationInventoryFlowStatusEnum;
+import com.jero.modules.project.enums.CertificationProgressEnum;
+import com.jero.modules.project.enums.JumpLinkEnum;
+import com.jero.modules.project.enums.OperatorTypeEnum;
+import com.jero.modules.project.enums.PermissionDescriptionEnum;
+import com.jero.modules.project.enums.ProjectInventoryFieldEnum;
+import com.jero.modules.project.enums.ProjectMessageEnum;
+import com.jero.modules.project.enums.ProjectUserLocationEnum;
+import com.jero.modules.project.enums.ReviewResultEnum;
+import com.jero.modules.project.enums.RoleRelModelTypeEnum;
+import com.jero.modules.project.enums.TaskAffirmStatusEnum;
+import com.jero.modules.project.enums.TaskStatusEnum;
+import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
+import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper;
+import com.jero.modules.project.service.IProjectCertificationInventoryLogEOService;
+import com.jero.modules.project.service.IProjectLibraryBaseService;
+import com.jero.modules.project.service.IProjectLibraryRoleRelEOService;
+import com.jero.modules.project.service.IProjectRelatedPersonnelService;
+import com.jero.modules.project.service.IProjectUserPermissionService;
+import com.jero.modules.projectPlatform.mapper.PlatformProjectCertificationInventoryEOMapper;
+import com.jero.modules.projectPlatform.service.IPlatformProjectCertificationInventoryEOService;
+import com.jero.modules.projectPlatform.service.IPlatformProjectLawsInventoryEOService;
+import com.jero.modules.split.common.FileUnZip;
+import com.jero.modules.system.entity.SysCategory;
+import com.jero.modules.system.entity.SysDictItem;
+import com.jero.modules.system.entity.SysRole;
+import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.enums.ProjectRoleEnum;
+import com.jero.modules.system.enums.SysCategoryValueTypeEnum;
+import com.jero.modules.system.mapper.SysCategoryMapper;
+import com.jero.modules.system.mapper.SysRoleMapper;
+import com.jero.modules.system.mapper.SysUserMapper;
+import com.jero.modules.system.service.IProjectUserDutyTerritoryService;
+import com.jero.modules.system.service.ISysCategoryService;
+import com.jero.modules.system.service.ISysDictItemService;
+import com.jero.modules.system.service.ISysUserService;
+import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
+import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
+import com.jero.modules.todoCenter.entity.ProcessInfoEO;
+import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService;
+import com.jero.modules.todoCenter.service.IProcessInfoEOService;
+import com.jero.modules.wkflow.enums.FlowTypeEnum;
+import com.jero.modules.wkflow.service.IProcessHistoryEOService;
+import lombok.SneakyThrows;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import org.apache.poi.hssf.usermodel.HSSFDateUtil;
+import org.apache.poi.hssf.usermodel.HSSFRichTextString;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.WorkbookFactory;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.apache.shiro.SecurityUtils;
+import org.aspectj.util.FileUtil;
+import org.jeecgframework.poi.excel.ExcelExportUtil;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.text.Collator;
+import java.text.DateFormat;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import static com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl.copyFile;
+
+/**
+ * @Description: 项目库-认证清单表
+ * @Author: jero-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+@Service
+@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
+public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceImpl<PlatformProjectCertificationInventoryEOMapper, ProjectCertificationInventoryEO> implements IPlatformProjectCertificationInventoryEOService {
+
+	private static DecimalFormat df = new DecimalFormat("#.00");
+	private static String percentSign = "%";
+
+	@Autowired
+	private ISysUserService sysUserService;
+	@Autowired
+	private ISysCategoryService sysCategoryService;
+	@Autowired
+	private ISysDictItemService sysDictItemService;
+	@Autowired
+	private SysDictItemServiceImpl sysDictItemServiceImpl;
+	@Autowired
+	private IProjectLibraryBaseService projectLibraryBaseService;
+	@Autowired
+	private IProcessInfoEOService processInfoEOService;
+	@Autowired
+	private IProcessInfoDetailEOService processInfoDetailEOService;
+	@Autowired
+	private IProjectRelatedPersonnelService projectRelatedPersonnelService;
+	@Autowired
+	private ProjectRelatedPersonnelMapper projectRelatedPersonnelMapper;
+	@Autowired
+	private SysRoleMapper sysRoleMapper;
+	@Autowired
+	private IFeishuService feishuService;
+	@Autowired
+	private IAuthDummyInventoryBaseEOService authDummyInventoryBaseEOService;
+	@Autowired
+	private IAuthDummyInventoryInfoEOService authDummyInventoryInfoEOService;
+	@Autowired
+	private IProjectCertificationInventoryLogEOService projectCertificationInventoryLogEOService;
+	@Autowired
+	private IPlatformProjectCertificationInventoryEOService platformProjectCertificationInventoryEOService;
+	@Autowired
+	private IProjectUserDutyTerritoryService projectUserDutyTerritoryService;
+
+	@Autowired
+	private BussDocumentLibraryEOMapper bussDocumentLibraryEOMapper;
+	@Autowired
+	private IProjectUserPermissionService projectUserPermissionService;
+	@Autowired
+	private IPlatformProjectLawsInventoryEOService platformProjectLawsInventoryEOService;
+
+	@Autowired
+	private ProjectLibraryBaseMapper projectLibraryBaseMapper;
+
+
+	@Value(value = "${jero.backUrl}")
+	private String backUrl;
+	@Value(value = "${jero.backUrlPhone}")
+	private String backUrlPhone;
+
+	@Value(value = "${jero.path.upload}")
+	private String uploadpath;
+	@Autowired
+	private IOSSFileService ossFileService;
+
+	@Autowired
+	SysCategoryMapper sysCategoryMapper;
+	@Autowired
+	private IBussDocumentLibraryEOService iBussDocumentLibraryEOService;
+	@Autowired
+	private IProjectRelatedPersonnelService iProjectRelatedPersonnelService;
+	@Autowired
+	private IOSSFileService iOSSFileService;
+	@Autowired
+	private SysUserMapper sysUserMapper;
+	@Autowired
+	private IProjectLibraryRoleRelEOService projectLibraryRoleRelEOService;
+	@Autowired
+	private IProcessHistoryEOService processHistoryEOService;
+
+	/**
+	 * 保存
+	 *
+	 * @param projectCertificationInventoryEO
+	 * @return
+	 */
+	@Override
+    public void add(ProjectCertificationInventoryEO projectCertificationInventoryEO) {
+        Date now = new Date();
+        projectCertificationInventoryEO.setCreateTime(now);
+        projectCertificationInventoryEO.setUpdateTime(now);
+        save(projectCertificationInventoryEO);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param projectCertificationInventoryEO
+	 * @return
+	 */
+	@Override
+    public void editById(ProjectCertificationInventoryEO projectCertificationInventoryEO) {
+		//获取当前用户
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		QueryWrapper<ProjectCertificationInventoryEO> certificationQueryWrap = new QueryWrapper<>();
+		certificationQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getId,projectCertificationInventoryEO.getId());
+		List<ProjectCertificationInventoryEO> oldPciEoList = this.list(certificationQueryWrap);
+		if (StringUtils.isNotEmpty(projectCertificationInventoryEO.getSdt())) {
+			// 编辑工程接口人处理逻辑
+			this.editSdt(projectCertificationInventoryEO, oldPciEoList, currentUser);
+		}
+		if (StringUtils.isNotEmpty(projectCertificationInventoryEO.getDutyPerson())) {
+			// 编辑责任人处理逻辑
+			this.editDutyPerson(projectCertificationInventoryEO, oldPciEoList, currentUser);
+		}
+		if (projectCertificationInventoryEO.getEndTime() != null) {
+			// 编辑截至日期处理逻辑
+			this.editEndTime(projectCertificationInventoryEO, oldPciEoList, currentUser);
+		}
+		if (StringUtils.isNotEmpty(projectCertificationInventoryEO.getDeliverableType())) {
+			// 编辑交付物类型逻辑
+			this.editDeliverableType(projectCertificationInventoryEO, oldPciEoList, currentUser);
+		}
+		if (StringUtils.isNotEmpty(projectCertificationInventoryEO.getDeliverableTemplate())) {
+			// 编辑交付物模板逻辑
+			this.editDeliverableTemplate(projectCertificationInventoryEO, oldPciEoList, currentUser);
+
+		}
+
+		// 获取编辑前的数据
+		ProjectCertificationInventoryEO editBeforePciEo = this.queryById(projectCertificationInventoryEO.getId());
+		Map<String,Object> savePciLogParams = new HashMap<>();
+		List<ProjectCertificationInventoryEO> editBeforePciList = new ArrayList<>();
+		editBeforePciList.add(editBeforePciEo);
+		List<ProjectCertificationInventoryEO> editAfterPciList = new ArrayList<>();
+		editAfterPciList.add(projectCertificationInventoryEO);
+		savePciLogParams.put("editBeforePciList",editBeforePciList);
+		savePciLogParams.put("editAfterPciList",editAfterPciList);
+		savePciLogParams.put("operatorType",OperatorTypeEnum.CERTIFICATION_INVENTORY_EDIT.getValue());
+		this.saveProjectCertificationInventoryLog(savePciLogParams);
+
+		Date now = new Date();
+        projectCertificationInventoryEO.setUpdateTime(now);
+    	saveOrUpdate(projectCertificationInventoryEO);
+
+
+		//获取当前的projectId
+		String projectId = projectCertificationInventoryEO.getProjectLibraryId();
+		String cut = projectCertificationInventoryEO.getCut();
+		Map<String,Object> params = new HashMap<>();
+		params.put("projectLibraryId",projectId);
+		params.put("userId",currentUser.getId());
+		params.put("modelType",RoleRelModelTypeEnum.CERTIFICATION_INVENTORY.getValue());
+		ProjectLibraryRoleRelEO projectLibraryRoleRelEO = projectLibraryRoleRelEOService.queryByProjectLibraryIdAndUserId(params);
+		String roleCode = projectLibraryRoleRelEO.getRoleCode();
+
+//		//判断当前用户与studio工程师是否一致，一致的话具有studio角色的切换
+//		if(studionList.contains(currentUser)){
+//			//用户有studio工程师的操作
+//		}
+
+		//获取当前的责任人
+		String dutyPerson = projectCertificationInventoryEO.getDutyPerson();
+		//获取当前的责任领域
+		List<String> dutyTerritoryList = new ArrayList<>();
+		dutyTerritoryList = Arrays.asList(projectCertificationInventoryEO.getDutyTerritory().split(","));
+		dutyTerritoryList = dutyTerritoryList.stream().distinct().collect(Collectors.toList());
+
+		//根据责任领域个projectId去查相关人员名单
+		List<ProjectRelatedPersonnel> projectRelatedPersonnelList = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritoy(projectId, dutyTerritoryList);
+
+		List<String> allList = new ArrayList<>();
+		List<String> enginnerList = new ArrayList<>();
+		List<String> lawEnginnerList = new ArrayList<>();
+		List<String> enginnerLawSetList = new ArrayList<>();
+		List<String> enginnerAttSetList = new ArrayList<>();
+		//根据相关人员名单获取的工程接口人
+		for(ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList){
+			String enginneringInterfacePerson = relatedPersonnel.getEngineeringInterfacePerson();
+			if(!StringUtils.isEmpty(enginneringInterfacePerson)){
+				enginnerList = Arrays.stream(enginneringInterfacePerson.split(",")).collect(Collectors.toList());
+				allList.addAll(enginnerList);
+			}
+		}
+		//获取相关人员名单中的法规工程师
+		for(ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList){
+			String lawEngineer = relatedPersonnel.getLawEngineer();
+			if(!StringUtils.isEmpty(lawEngineer)){
+				lawEnginnerList = Arrays.stream(lawEngineer.split(",")).collect(Collectors.toList());
+				allList.addAll(lawEnginnerList);
+			}
+		}
+		//获取相关人员名单中的工程接口-法规工程师设置
+		for(ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList){
+			String engineerLawSet = relatedPersonnel.getEngineerLawSet();
+			if(!StringUtils.isEmpty(engineerLawSet)){
+				enginnerLawSetList = Arrays.stream(engineerLawSet.split(",")).collect(Collectors.toList());
+				allList.addAll(enginnerLawSetList);
+			}
+		}
+		//获取相关人员名单中的工程接口-认证工程师设置
+		for(ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList){
+			String engineerAttSet = relatedPersonnel.getEngineerAttSet();
+			if(!StringUtils.isEmpty(engineerAttSet)){
+				enginnerAttSetList = Arrays.stream(engineerAttSet.split(",")).collect(Collectors.toList());
+				allList.addAll(enginnerAttSetList);
+			}
+		}
+		//获取当前项目库id的studio工程师和认证工程师
+		List<String> studionList = new ArrayList<>();
+		List<String> certificationEngineerList = new ArrayList<>();
+		List<ProjectLibraryBase> projectLibraryBases = projectLibraryBaseService.queryById(projectId, cut);
+		for(ProjectLibraryBase projectLibraryBase : projectLibraryBases){
+			studionList.add(projectLibraryBase.getStudioEngineer());
+
+			String certificationEngineer = projectLibraryBase.getCertificationEngineer();
+			if(!StringUtils.isEmpty(certificationEngineer)){
+				certificationEngineerList = Arrays.stream(certificationEngineer.split(",")).collect(Collectors.toList());
+				allList.addAll(certificationEngineerList);
+			}
+		}
+//		studionList = studionList.stream().distinct().collect(Collectors.toList());
+//		certificationEngineerList = certificationEngineerList.stream().distinct().collect(Collectors.toList());
+
+		allList = allList.stream().filter(all -> {
+			return StringUtils.isNotBlank(all);
+		}).distinct().collect(Collectors.toList());
+		/**
+		for(String all : allList){
+			if(all.equals("")){
+				allList.remove(all);
+			}
+		}
+		*/
+		//遍历所有人alllist中是否包含责任人,如果包含，不用操作。
+		//-------如果不包含,再去判断当前用户的角色是studio、法规还是认证
+		for(ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList){
+			if(allList.size()>0){
+				if(!allList.contains(dutyPerson)){
+					if (StringUtils.isNotEmpty(roleCode)) {
+						if(roleCode.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())){
+							if(relatedPersonnel.getEngineeringInterfacePerson() != null){
+								String engineeringInterfacePerson = dutyPerson+","+relatedPersonnel.getEngineeringInterfacePerson();
+								relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson);
+							}else {
+								relatedPersonnel.setEngineeringInterfacePerson(dutyPerson);
+							}
+						}else if(roleCode.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())){
+							if(relatedPersonnel.getEngineerLawSet() != null){
+								String engineerLawSet = dutyPerson+","+relatedPersonnel.getEngineerLawSet();
+								relatedPersonnel.setEngineerLawSet(engineerLawSet);
+							}else {
+								relatedPersonnel.setEngineerLawSet(dutyPerson);
+							}
+						}else if(roleCode.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){
+							if(relatedPersonnel.getEngineerAttSet() !=null){
+								String engineerAttSet = dutyPerson+","+relatedPersonnel.getEngineerAttSet();
+								relatedPersonnel.setEngineerAttSet(engineerAttSet);
+							}else {
+								relatedPersonnel.setEngineerAttSet(dutyPerson);
+							}
+						}
+					}
+				}
+			}
+		}
+//		for(ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList){
+//			//如果工程接口人不为空的话
+//			if(enginnerList.size()>0){
+//				//判断哪个不存在 再去去存入
+//				if(!enginnerList.contains(dutyPerson)){
+//					relatedPersonnel.setEngineerAttSet(dutyPerson);
+////					projectRelatedPersonnelService.editById(relatedPersonnel);
+//				}
+//			}else {
+//				//工程接口人为空的话，直接将责任设置到认证工程师下
+//				relatedPersonnel.setEngineerAttSet(dutyPerson);
+////				projectRelatedPersonnelService.editById(relatedPersonnel);
+//			}
+//		}
+
+		this.projectRelatedPersonnelService.updateBatchById(projectRelatedPersonnelList);
+
+		//设置权限 先删后加
+		List<ProjectUserPermission> adds = new ArrayList<>();
+		if (ObjectUtils.isNotEmpty(projectCertificationInventoryEO.getSdt())) {
+			setProjectCertificationInventoryPermission(projectCertificationInventoryEO.getSdt(), projectCertificationInventoryEO.getProjectLibraryId(), projectCertificationInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_SDT.getValue());
+		}
+		if (ObjectUtils.isNotEmpty(projectCertificationInventoryEO.getDutyPerson())) {
+			setProjectCertificationInventoryPermission(projectCertificationInventoryEO.getDutyPerson(), projectCertificationInventoryEO.getProjectLibraryId(), projectCertificationInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_DP.getValue());
+		}
+		if (ObjectUtils.isNotEmpty(adds)) {
+			projectUserPermissionService.saveBatch(adds);
+		}
+    }
+
+	private void editDeliverableTemplate(ProjectCertificationInventoryEO newPciEo, List<ProjectCertificationInventoryEO> oldPciEoList, LoginUser currentUser) {
+		String newDeliverableTemplate = newPciEo.getDeliverableTemplate();
+		List<ProjectCertificationInventoryEO> oldPciEos = oldPciEoList.stream().filter(pldPciEo -> {
+			boolean flag = (
+					!newDeliverableTemplate.equals(pldPciEo.getDeliverableTemplate())
+							&& (
+							StringUtils.equals(pldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+									|| StringUtils.equals(pldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+									|| StringUtils.equals(pldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())
+					)
+			);
+			return flag;
+		}).collect(Collectors.toList());
+
+		if(CollectionUtils.isNotEmpty(oldPciEos)){
+			ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId());
+			if(ObjectUtils.isNotEmpty(projectLibraryBase)){
+				int role = checkUserRole(oldPciEos.get(0).getProjectLibraryId(),currentUser.getId());
+				for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) {
+					String msgTitleCn = "";
+					String msgTitleEn = "";
+					String taskDefinitionKey = "";
+					if (StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())) {
+						msgTitleCn = ProjectMessageEnum.RZRWQR.getCnName();
+						msgTitleEn = ProjectMessageEnum.RZRWQR.getEnName();
+						taskDefinitionKey = CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey();
+					}else if(StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+							|| StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())) {
+						msgTitleCn = ProjectMessageEnum.PREHOMEQR.getCnName();
+						msgTitleEn = ProjectMessageEnum.PREHOMEQR.getEnName();
+						taskDefinitionKey = CertificationFlowNodeEnum.TASK_HANDLING.getKey();
+					}
+					List<String> userIdList = new ArrayList<>();
+					userIdList.add(oldPciEo.getDutyPerson());
+					if(role == ProjectRoleEnum.STUDIO_ENGINEER.getIntValue()){
+						userIdList.addAll(Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")));
+					}
+					List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
+					oldPciEo.setEndTime(newPciEo.getEndTime());
+					List<ProjectCertificationInventoryEO> PciEoList = new ArrayList<>();
+					PciEoList.add(oldPciEo);
+					this.sendMessageByTemplateId(
+							PciEoList,
+							TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(),
+							userIdList,
+							userInfoList,
+							oldPciEo.getEndTime(),
+							taskDefinitionKey,
+							msgTitleCn,
+							msgTitleEn,
+							ProjectMessageEnum.RZRWJFWMBBXG.getCnName(),
+							ProjectMessageEnum.RZRWJFWMBBXG.getEnName()
+					);
+				}
+			}
+		}
+	}
+
+	private void editDeliverableType(ProjectCertificationInventoryEO newPciEo, List<ProjectCertificationInventoryEO> oldPciEoList, LoginUser currentUser) {
+		String newDeliverableType = newPciEo.getDeliverableType();
+		List<ProjectCertificationInventoryEO> oldPciEos = oldPciEoList.stream().filter(pldPciEo -> {
+			boolean flag = (
+					!newDeliverableType.equals(pldPciEo.getDeliverableType())
+							&& (
+							StringUtils.equals(pldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+									|| StringUtils.equals(pldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+									|| StringUtils.equals(pldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())
+					)
+			);
+			return flag;
+		}).collect(Collectors.toList());
+
+		if(CollectionUtils.isNotEmpty(oldPciEos)){
+			ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId());
+			if(ObjectUtils.isNotEmpty(projectLibraryBase)){
+				int role = checkUserRole(oldPciEos.get(0).getProjectLibraryId(),currentUser.getId());
+				for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) {
+					String msgTitleCn = "";
+					String msgTitleEn = "";
+					String taskDefinitionKey = "";
+					if (StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())) {
+						msgTitleCn = ProjectMessageEnum.RZRWQR.getCnName();
+						msgTitleEn = ProjectMessageEnum.RZRWQR.getEnName();
+						taskDefinitionKey = CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey();
+					}else if(StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+							|| StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())) {
+						msgTitleCn = ProjectMessageEnum.PREHOMEQR.getCnName();
+						msgTitleEn = ProjectMessageEnum.PREHOMEQR.getEnName();
+						taskDefinitionKey = CertificationFlowNodeEnum.TASK_HANDLING.getKey();
+					}
+					List<String> userIdList = new ArrayList<>();
+					userIdList.add(oldPciEo.getDutyPerson());
+					if(role == ProjectRoleEnum.STUDIO_ENGINEER.getIntValue()){
+						userIdList.addAll(Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")));
+					}
+					List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
+					oldPciEo.setEndTime(newPciEo.getEndTime());
+					List<ProjectCertificationInventoryEO> PciEoList = new ArrayList<>();
+					PciEoList.add(oldPciEo);
+					this.sendMessageByTemplateId(
+							PciEoList,
+							TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(),
+							userIdList,
+							userInfoList,
+							oldPciEo.getEndTime(),
+							taskDefinitionKey,
+							msgTitleCn,
+							msgTitleEn,
+							ProjectMessageEnum.RZRWJFWLXBXG.getCnName(),
+							ProjectMessageEnum.RZRWJFWLXBXG.getEnName()
+					);
+				}
+			}
+		}
+	}
+
+	/**
+	 * 编辑工程接口人处理逻辑
+	 */
+	private void editSdt(ProjectCertificationInventoryEO pciEo, List<ProjectCertificationInventoryEO> oldPciEoList,LoginUser currentUser) {
+		// 过滤出来，旧数据的接口人与新修改的接口人不是同一个人
+		List<ProjectCertificationInventoryEO> oldPciEos = oldPciEoList.stream().filter(oldPciEo -> {
+			boolean flag = (
+					!StringUtils.equals(oldPciEo.getDutyPerson(), pciEo.getDutyPerson())
+							&& (
+							StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+									|| StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+									|| StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())
+					)
+			);
+			return flag;
+		}).collect(Collectors.toList());
+		for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) {
+			List<String> userIdList = new ArrayList<>();
+			userIdList.add(oldPciEo.getSdt());
+			List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
+
+			List<ProjectCertificationInventoryEO> PciEoList = new ArrayList<>();
+			PciEoList.add(oldPciEo);
+			if (StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())) {
+				this.sendMessageByTemplateId(
+						PciEoList,
+						TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(),
+						userIdList,
+						userInfoList,
+						pciEo.getEndTime(),
+						CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey(),
+						ProjectMessageEnum.RZRWQR.getCnName(),
+						ProjectMessageEnum.RZRWQR.getEnName(),
+						ProjectMessageEnum.RWBFQRCH.getCnName(),
+						ProjectMessageEnum.RWBFQRCH.getEnName()
+				);
+			}else if(StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+					|| StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())){
+				this.sendMessageByTemplateId(
+						PciEoList,
+						TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(),
+						userIdList,
+						userInfoList,
+						pciEo.getEndTime(),
+						CertificationFlowNodeEnum.TASK_HANDLING.getKey(),
+						ProjectMessageEnum.PREHOMEQR.getCnName(),
+						ProjectMessageEnum.PREHOMEQR.getEnName(),
+						ProjectMessageEnum.RWBFQRCH.getCnName(),
+						ProjectMessageEnum.RWBFQRCH.getEnName()
+				);
+			}
+		}
+		if (CollectionUtils.isNotEmpty(oldPciEos)) {
+			List<String> userIdList = oldPciEos.stream().map(ProjectCertificationInventoryEO::getSdt).distinct().collect(Collectors.toList());
+			List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
+			if (StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())) {
+				this.sendMessageByTemplateId(
+						oldPciEos,
+						TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(),
+						userIdList,
+						userInfoList,
+						pciEo.getEndTime(),
+						CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey(),
+						ProjectMessageEnum.RZRWQR.getCnName(),
+						ProjectMessageEnum.RZRWQR.getEnName(),
+						ProjectMessageEnum.RZQRRWYQ.getCnName(),
+						ProjectMessageEnum.RZQRRWYQ.getEnName()
+				);
+			}else if(StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+					|| StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())){
+				this.sendMessageByTemplateId(
+						oldPciEos,
+						TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(),
+						userIdList,
+						userInfoList,
+						pciEo.getEndTime(),
+						CertificationFlowNodeEnum.TASK_HANDLING.getKey(),
+						ProjectMessageEnum.PREHOMEQR.getCnName(),
+						ProjectMessageEnum.PREHOMEQR.getEnName(),
+						ProjectMessageEnum.RZQRRWYQ.getCnName(),
+						ProjectMessageEnum.RZQRRWYQ.getEnName()
+				);
+			}
+		}
+	}
+
+	/**
+	 * 编辑责任人处理逻辑
+	 * @param pciEo
+	 */
+	private void editDutyPerson(ProjectCertificationInventoryEO pciEo,List<ProjectCertificationInventoryEO> oldPciEoList,LoginUser currentUser) {
+		// 过滤出来，旧数据的责任人与新修改的责任人不是同一个人，并且流程状态是 任务待确认、结果待提交、审查退回的数据，这三个状态的流程数据在责任人节点。
+		List<ProjectCertificationInventoryEO> oldPciEos = oldPciEoList.stream().filter(oldPciEo -> {
+			boolean flag = (
+					!StringUtils.equals(oldPciEo.getDutyPerson(), pciEo.getDutyPerson())
+							&& (
+							StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+									|| StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+									|| StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())
+					)
+			);
+			return flag;
+		}).collect(Collectors.toList());
+		for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) {
+			List<String> userIdList = new ArrayList<>();
+			userIdList.add(oldPciEo.getDutyPerson());
+			List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
+			List<ProjectCertificationInventoryEO> PciEoList = new ArrayList<>();
+			PciEoList.add(oldPciEo);
+			if (StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())) {
+				this.sendMessageByTemplateId(
+						PciEoList,
+						TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(),
+						userIdList,
+						userInfoList,
+						pciEo.getEndTime(),
+						CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey(),
+						ProjectMessageEnum.RZRWQR.getCnName(),
+						ProjectMessageEnum.RZRWQR.getEnName(),
+						ProjectMessageEnum.RWBFQRCH.getCnName(),
+						ProjectMessageEnum.RWBFQRCH.getEnName()
+				);
+			}else if(StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+					|| StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())){
+				this.sendMessageByTemplateId(
+						PciEoList,
+						TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(),
+						userIdList,
+						userInfoList,
+						pciEo.getEndTime(),
+						CertificationFlowNodeEnum.TASK_HANDLING.getKey(),
+						ProjectMessageEnum.PREHOMEQR.getCnName(),
+						ProjectMessageEnum.PREHOMEQR.getEnName(),
+						ProjectMessageEnum.RWBFQRCH.getCnName(),
+						ProjectMessageEnum.RWBFQRCH.getEnName()
+				);
+			}
+		}
+		if (CollectionUtils.isNotEmpty(oldPciEos)) {
+			List<String> userIdList = oldPciEos.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList());
+			List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
+			if (StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())) {
+				this.sendMessageByTemplateId(
+						oldPciEos,
+						TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(),
+						userIdList,
+						userInfoList,
+						pciEo.getEndTime(),
+						CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey(),
+						ProjectMessageEnum.RZRWQR.getCnName(),
+						ProjectMessageEnum.RZRWQR.getEnName(),
+						ProjectMessageEnum.RZQRRWYQ.getCnName(),
+						ProjectMessageEnum.RZQRRWYQ.getEnName()
+				);
+			}else if(StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+					|| StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())){
+				this.sendMessageByTemplateId(
+						oldPciEos,
+						TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(),
+						userIdList,
+						userInfoList,
+						pciEo.getEndTime(),
+						CertificationFlowNodeEnum.TASK_HANDLING.getKey(),
+						ProjectMessageEnum.PREHOMEQR.getCnName(),
+						ProjectMessageEnum.PREHOMEQR.getEnName(),
+						ProjectMessageEnum.RZQRRWYQ.getCnName(),
+						ProjectMessageEnum.RZQRRWYQ.getEnName()
+				);
+			}
+
+			// 如果责任人有变更，将之前责任人的待办中心任务，移交给新的责任人。
+			QueryWrapper<ProcessInfoDetailEO> detailQueryWrap = new QueryWrapper<>();
+			List<String> idList = Arrays.asList(pciEo.getId().split(","));
+			detailQueryWrap.lambda().in(ProcessInfoDetailEO::getProjectLawsInventoryId, idList);
+			detailQueryWrap.lambda().eq(ProcessInfoDetailEO::getFlowType, FlowTypeEnum.CERTIFICATION_LC.getValue());
+			detailQueryWrap.lambda().eq(ProcessInfoDetailEO::getStatus, TaskStatusEnum.NOT_DONE.getValue());
+			List<String> taskDefinitionKeyList = new ArrayList<>();
+			taskDefinitionKeyList.add(CertificationFlowNodeEnum.ZRRJSRW.getKey());
+			taskDefinitionKeyList.add(CertificationFlowNodeEnum.ZRRTJRW.getKey());
+			detailQueryWrap.lambda().in(ProcessInfoDetailEO::getTaskDefinitionKey, taskDefinitionKeyList);
+
+			List<ProcessInfoDetailEO> processInfoDetailEOList = this.processInfoDetailEOService.list(detailQueryWrap);
+			if (CollectionUtils.isNotEmpty(processInfoDetailEOList)) {
+				processInfoDetailEOList.forEach(detail -> {
+					detail.setUserId(pciEo.getDutyPerson());
+				});
+				this.processInfoDetailEOService.updateBatchById(processInfoDetailEOList);
+			}
+		}
+	}
+
+	/**
+	 * 编辑截止日期处理逻辑
+	 * @param newPciEo		最新编辑的认证清单信息
+	 * @param oldPciEoList	旧的认证清单数组
+	 */
+	private void editEndTime(ProjectCertificationInventoryEO newPciEo, List<ProjectCertificationInventoryEO> oldPciEoList,LoginUser currentUser) {
+		Date newEndTime = newPciEo.getEndTime();
+		// 过滤出来，旧的截止日期不等于更改后的新截止日期，并且数据状态为 任务待确认、结果待提交、审查退回的数据。
+		List<ProjectCertificationInventoryEO> oldPciEos = oldPciEoList.stream().filter(pldPciEo -> {
+			boolean flag = (
+					!newEndTime.equals(pldPciEo.getEndTime())
+							&& (
+							StringUtils.equals(pldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+									|| StringUtils.equals(pldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+									|| StringUtils.equals(pldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())
+					)
+			);
+			return flag;
+		}).collect(Collectors.toList());
+
+		if(CollectionUtils.isNotEmpty(oldPciEos)){
+			ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId());
+			if(ObjectUtils.isNotEmpty(projectLibraryBase)){
+				// 同步更新待办中心-流程明细截止日期
+				this.syncProcessInfoDetailEndTime(newEndTime, oldPciEos);
+				int role = checkUserRole(oldPciEos.get(0).getProjectLibraryId(),currentUser.getId());
+				for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) {
+					String msgTitleCn = "";
+					String msgTitleEn = "";
+					String taskDefinitionKey = "";
+					if (StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())) {
+						msgTitleCn = ProjectMessageEnum.RZRWQR.getCnName();
+						msgTitleEn = ProjectMessageEnum.RZRWQR.getEnName();
+						taskDefinitionKey = CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey();
+					}else if(StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+						|| StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())) {
+						msgTitleCn = ProjectMessageEnum.PREHOMEQR.getCnName();
+						msgTitleEn = ProjectMessageEnum.PREHOMEQR.getEnName();
+						taskDefinitionKey = CertificationFlowNodeEnum.TASK_HANDLING.getKey();
+					}
+					List<String> userIdList = new ArrayList<>();
+					userIdList.add(oldPciEo.getDutyPerson());
+					if(role == ProjectRoleEnum.STUDIO_ENGINEER.getIntValue()){
+						userIdList.addAll(Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")));
+					}else if(role == ProjectRoleEnum.HOMOLOGATION_ENGINEER.getIntValue()){
+						userIdList.add(projectLibraryBase.getStudioEngineer());
+					}
+					List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
+					oldPciEo.setEndTime(newPciEo.getEndTime());
+					List<ProjectCertificationInventoryEO> PciEoList = new ArrayList<>();
+					PciEoList.add(oldPciEo);
+					this.sendMessageByTemplateId(
+							PciEoList,
+							TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(),
+							userIdList,
+							userInfoList,
+							oldPciEo.getEndTime(),
+							taskDefinitionKey,
+							msgTitleCn,
+							msgTitleEn,
+							ProjectMessageEnum.RZRWJZSJBXG.getCnName(),
+							ProjectMessageEnum.RZRWJZSJBXG.getEnName()
+					);
+				}
+			}
+		}
+	}
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public void deleteById(String id) {
+        removeById(id);
+
+		QueryWrapper<ProcessInfoDetailEO> detailRemoveWrap = new QueryWrapper<>();
+		detailRemoveWrap.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId,id);
+		this.processInfoDetailEOService.remove(detailRemoveWrap);
+    }
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+    public void deleteByIds(List<String> ids) {
+		QueryWrapper<ProjectCertificationInventoryEO> queryWrap = new QueryWrapper<>();
+		queryWrap.lambda().in(ProjectCertificationInventoryEO::getId,ids);
+		List<ProjectCertificationInventoryEO> list = this.list(queryWrap);
+		removeByIds(ids);
+
+		QueryWrapper<ProcessInfoDetailEO> detailRemoveWrap = new QueryWrapper<>();
+		detailRemoveWrap.lambda().in(ProcessInfoDetailEO::getProjectLawsInventoryId,ids);
+		detailRemoveWrap.lambda().eq(ProcessInfoDetailEO::getProcessInfoId,list.get(0).getProjectLibraryId());
+		this.processInfoDetailEOService.remove(detailRemoveWrap);
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public ProjectCertificationInventoryEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<ProjectCertificationInventoryEO> queryList() {
+        return list();
+    }
+
+	@Override
+	public Result<?> batchAdd(JSONObject json) {
+		String cut = json.getString("cut");
+		List<String> result = new ArrayList<>();
+		if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+			result.add("添加成功！");
+		}else {
+			result.add("Successfully added！");
+		}
+		try {
+			String serialNumber = json.getString("serialNumber");
+			String wvtaId = json.getString("wvtaId");
+			String bussDocumentLibraryId = json.getString("bussDocumentLibraryId");
+			String projectLibraryId = json.getString("projectLibraryId");
+
+
+			JSONArray dataList = json.getJSONArray("dataList");
+			List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = new ArrayList<>();
+			ProjectCertificationInventoryEO projectCertificationInventoryEO = null;
+			for (Object data : dataList) {
+				projectCertificationInventoryEO = JSONObject.parseObject(JSONObject.toJSONString(data),ProjectCertificationInventoryEO.class);
+				projectCertificationInventoryEO.setSerialNumber(serialNumber);
+				projectCertificationInventoryEO.setWvtaId(wvtaId);
+				projectCertificationInventoryEO.setBussDocumentLibraryId(bussDocumentLibraryId);
+				projectCertificationInventoryEO.setProjectLibraryId(projectLibraryId);
+				projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+				projectCertificationInventoryEO.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
+				projectCertificationInventoryEOList.add(projectCertificationInventoryEO);
+			}
+			// 处理提示信息， 类别+检验项目+配置项+编号+责任领域  作为唯一检验
+			// List<ProjectCertificationInventoryEO> saveDataList = this.dataUniqueCheck(projectCertificationInventoryEOList,cut,result,projectLibraryId);
+
+			if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOList)){
+				this.saveBatch(projectCertificationInventoryEOList);
+				this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_ADD.getValue());
+
+				Date now = new Date();
+				//设置权限 先删后加
+				List<ProjectUserPermission> adds = new ArrayList<>();
+				for (ProjectCertificationInventoryEO pci: projectCertificationInventoryEOList) {
+					if (ObjectUtils.isNotEmpty(pci.getSdt())) {
+						setProjectCertificationInventoryPermission(pci.getSdt(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_SDT.getValue());
+					}
+					if (ObjectUtils.isNotEmpty(pci.getDutyPerson())) {
+						setProjectCertificationInventoryPermission(pci.getDutyPerson(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_DP.getValue());
+					}
+				}
+				if (ObjectUtils.isNotEmpty(adds)) {
+					projectUserPermissionService.saveBatch(adds);
+				}
+			}
+		}catch (Exception ex){
+			ex.printStackTrace();
+			log.error("批量添加认证清单失败：" + ex.getMessage());
+			throw new JeroBootException("添加失败！");
+		}
+		return Result.OK(result);
+	}
+
+	@Override
+	public Result<?> setBatch(ProjectCertificationInventoryEO projectCertificationInventoryEO) {
+		//获取当前用户
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		String ids = projectCertificationInventoryEO.getIds();
+		if(StringUtils.isEmpty(ids)){
+			throw new JeroBootException("至少选择一条数据进行批量设置！");
+		}
+		try {
+			List<String> idList = Arrays.asList(ids.split(","));
+
+			QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
+			pciQueryWrap.lambda().in(ProjectCertificationInventoryEO::getId,idList);
+			List<ProjectCertificationInventoryEO> pciEoList = this.list(pciQueryWrap);
+
+			List<ProjectCertificationInventoryEO> updateList = new ArrayList<>();
+			for (String id : idList) {
+				ProjectCertificationInventoryEO updateProjectCertificationInventoryEO = new ProjectCertificationInventoryEO();
+				BeanUtils.copyProperties(projectCertificationInventoryEO,updateProjectCertificationInventoryEO);
+				updateProjectCertificationInventoryEO.setId(id);
+
+				/**
+				 * 2023-03-30 17.36新增该需求。
+				 * 如果用户批量设置了工程接口人字段
+				 * 那就需要判断所选数据中责任人是否为空
+				 * 如果责任人字段为空时  需要将工程接口人带入到所选数据的责任人字段中
+				 */
+				if(StringUtils.isNotBlank(projectCertificationInventoryEO.getSdt())){
+					List<ProjectCertificationInventoryEO> pciEoListTemp = pciEoList.stream().filter(pciEo -> {
+						boolean flag = false;
+						if (StringUtils.equals(pciEo.getId(), id)) {
+							flag = true;
+						}
+						return flag;
+					}).collect(Collectors.toList());
+
+					if(CollectionUtils.isNotEmpty(pciEoListTemp)){
+						ProjectCertificationInventoryEO pciEo = pciEoListTemp.get(0);
+						if(StringUtils.isEmpty(pciEo.getDutyPerson())){
+							updateProjectCertificationInventoryEO.setDutyPerson(projectCertificationInventoryEO.getSdt());
+						}
+					}
+				}
+
+				updateList.add(updateProjectCertificationInventoryEO);
+			}
+			if(StringUtils.isNotEmpty(projectCertificationInventoryEO.getSdt())){
+				// 编辑工程接口人处理逻辑
+				this.editSdt(projectCertificationInventoryEO,pciEoList,currentUser);
+			}
+			if(StringUtils.isNotEmpty(projectCertificationInventoryEO.getDutyPerson())){
+				// 编辑责任人处理逻辑
+				this.editDutyPerson(projectCertificationInventoryEO,pciEoList,currentUser);
+			}
+			if(projectCertificationInventoryEO.getEndTime() != null){
+				// 编辑截至日期处理逻辑
+				this.editEndTime(projectCertificationInventoryEO, pciEoList,currentUser);
+			}
+			if(StringUtils.isNotEmpty(projectCertificationInventoryEO.getDeliverableType()) ){
+				// 编辑交付物类型逻辑
+				this.editDeliverableType(projectCertificationInventoryEO, pciEoList, currentUser);
+			}
+			if(StringUtils.isNotEmpty(projectCertificationInventoryEO.getDeliverableTemplate())){
+				// 编辑交付物模板逻辑
+				this.editDeliverableTemplate(projectCertificationInventoryEO, pciEoList, currentUser);
+			}
+
+//			List<String> flowStatusList = new ArrayList<>();
+//			flowStatusList.add(CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue());
+//
+//			QueryWrapper<ProjectCertificationInventoryEO> certificationQueryWrap = new QueryWrapper<>();
+//			certificationQueryWrap.lambda().in(ProjectCertificationInventoryEO::getId,idList);
+////			certificationQueryWrap.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList);
+//			List<ProjectCertificationInventoryEO> projectCertificationInventoryEOS = this.list(certificationQueryWrap);
+//
+//			if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOS)){
+//				List<ProjectCertificationInventoryEO> pciEoListTemp = projectCertificationInventoryEOS.stream().filter(certificationInventory -> {
+//					boolean flag = false;
+//					if(StringUtils.equals(certificationInventory.getFlowStatus(),CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())){
+//						if(projectCertificationInventoryEO.getEndTime() != null && certificationInventory.getEndTime() != null){
+//							if(!projectCertificationInventoryEO.getEndTime().equals(certificationInventory.getEndTime())){
+//								flag = true;
+//							}
+//						}
+//					}
+//					return flag;
+//				}).collect(Collectors.toList());
+//
+//				if (CollectionUtils.isNotEmpty(pciEoListTemp)) {
+//					ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(pciEoListTemp.get(0).getProjectLibraryId());
+//					if(ObjectUtils.isNotEmpty(projectLibraryBase)){
+//						List<String> userIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
+//						List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
+//
+//						this.sendMessageByTemplateId(
+//								pciEoListTemp,
+//								TemplateInfoEnum2.CERTIFICATION_MESSAGE14.getValue(),
+//								userIdList,
+//								userInfoList,
+//								projectCertificationInventoryEO.getEndTime(),""
+//						);
+//					}
+//				}
+//
+//				this.syncProcessInfoDetailEndTime(projectCertificationInventoryEO.getEndTime(),projectCertificationInventoryEOS);
+//			}
+			if(CollectionUtils.isNotEmpty(updateList)){
+				this.updateBatchById(updateList);
+			}
+
+			Date now = new Date();
+			//设置权限 先删后加
+			List<ProjectUserPermission> adds = new ArrayList<>();
+			for (ProjectCertificationInventoryEO pci: updateList) {
+				if (ObjectUtils.isNotEmpty(pci.getSdt())) {
+					setProjectCertificationInventoryPermission(pci.getSdt(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_SDT.getValue());
+				}
+				if (ObjectUtils.isNotEmpty(pci.getDutyPerson())) {
+					setProjectCertificationInventoryPermission(pci.getDutyPerson(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_DP.getValue());
+				}
+			}
+			if (ObjectUtils.isNotEmpty(adds)) {
+				projectUserPermissionService.saveBatch(adds);
+			}
+		}catch (Exception ex){
+			ex.printStackTrace();
+			log.error("批量设置失败:" + ex.getMessage());
+			throw new JeroBootException("批量设置失败！");
+		}
+		return Result.OK("批量设置成功！");
+	}
+
+	/**
+	 * 根据模板发送消息
+	 */
+	@Override
+	public void sendMessageByTemplateId(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOS,
+										String templeteId,
+										List<String> userIdList,
+										List<SysUser> userInfoList,
+										Date endTime,
+										String taskDefinitionKey){
+		this.sendMessageByTemplateId(projectCertificationInventoryEOS,templeteId,userIdList,userInfoList,endTime,taskDefinitionKey,"","","","");
+	}
+
+	/**
+	 * 根据模板发送消息(可发送公共消息)
+	 */
+	private void sendMessageByTemplateId(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOS,
+										String templeteId,
+										List<String> userIdList,
+										List<SysUser> userInfoList,
+										Date endTime,
+										String taskDefinitionKey,
+										String msgTitleCn,
+										String msgTitleEn,
+										String contentCn,
+										String contentEn){
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectCertificationInventoryEOS.get(0).getProjectLibraryId());
+		if(ObjectUtils.isNotEmpty(projectLibraryBase)){
+			String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+			String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+
+			// 获取认证清单 - 飞书跳转链接
+			Map<String, Object> hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN);
+			String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN");
+			String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN");
+			String hrefFeishu_CN_P = (String) hrefFeishuMap.get("hrefFeishu_CN_P");
+			if(StringUtils.isNotEmpty(taskDefinitionKey)){
+				hrefFeishu_CN_P = this.handlePhoneLink(projectLibraryBase.getId(),PRN_CN,taskDefinitionKey);
+			}
+
+			Map<String, Object> standNameAndItemName = this.platformProjectCertificationInventoryEOService.getStandNameAndItemName(projectCertificationInventoryEOS);
+			String standName = (String) standNameAndItemName.get("standName");
+			String itemName = (String) standNameAndItemName.get("itemName");
+
+			try {
+				for (String userId : userIdList) {
+					String thirdId = this.sysUserService.getUserThirdIdByUserId(userInfoList,userId);
+
+					if(StringUtils.isNotEmpty(thirdId)){
+						// 根据结束时间进行排序，获取最近的时间，发消息时使用。
+//					this.certificationInventoryEOListSortByEndTimeAsc(projectCertificationInventoryEOS);
+//					Date endTime = projectCertificationInventoryEOS.get(0).getEndTime();
+
+						JSONObject larkMesJson = new JSONObject();
+						larkMesJson.put("template_id", templeteId);
+						larkMesJson.put("userIds",thirdId);
+
+						Map<String,Object> templateVariableMap = new HashMap<>();
+						if(StringUtils.isNotEmpty(msgTitleCn)){
+							templateVariableMap.put("msgTitleCn",msgTitleCn);
+						}
+						if(StringUtils.isNotEmpty(msgTitleEn)){
+							templateVariableMap.put("msgTitleEn",msgTitleEn);
+						}
+						if(StringUtils.isNotEmpty(contentCn)){
+							templateVariableMap.put("contentCn",contentCn);
+						}
+						if(StringUtils.isNotEmpty(contentEn)){
+							templateVariableMap.put("contentEn",contentEn);
+						}
+						templateVariableMap.put("projectNameCn",PRN_CN);
+						templateVariableMap.put("projectNameEn",PRN_EN);
+						templateVariableMap.put("standName",standName);
+						templateVariableMap.put("itemName",itemName);
+						templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName());
+						templateVariableMap.put("endTime",DateUtils.formatDate(endTime));
+						templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
+						templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
+						templateVariableMap.put("viewBtnUrlCnPhone",hrefFeishu_CN_P);
+
+						templateVariableMap.put("operateUserName",currentUser.getUsername());
+
+						larkMesJson.put("templateVariableMap",templateVariableMap);
+						this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson);
+					}
+				}
+			} catch (Exception e) {
+				log.error("飞书消息推送失败");
+			}
+		}
+	}
+
+	/**
+	 * 处理提示信息
+	 * @param projectCertificationInventoryEOList
+	 * @param cut
+	 * @param result
+	 */
+	@Override
+	public List<ProjectCertificationInventoryEO> dataUniqueCheck(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList, String cut,List<String> result,String projectLibraryId) {
+		List<ProjectCertificationInventoryEO> pciSaveList = new ArrayList<>();
+
+		QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
+		pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId);
+		List<ProjectCertificationInventoryEO> allDataList = this.list(pciQueryWrap);
+		// 重复数据数组
+		List<ProjectCertificationInventoryEO> duplicateDataList = allDataList.stream().filter(data -> {
+			boolean flag = false;
+			for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
+				boolean categoryFlag = StringUtils.equals(projectCertificationInventoryEO.getCategory(), data.getCategory());
+				boolean inspectionItemFlag = StringUtils.equals(projectCertificationInventoryEO.getInspectionItem(), data.getInspectionItem());
+				boolean configItemFlag = StringUtils.equals(projectCertificationInventoryEO.getConfigItem(), data.getConfigItem());
+				boolean serialNumberFlag = StringUtils.equals(projectCertificationInventoryEO.getSerialNumber(), data.getSerialNumber());
+				boolean dutyTerritoryFlag = StringUtils.equals(projectCertificationInventoryEO.getDutyTerritory(), data.getDutyTerritory());
+				// 类别+检验项目+配置项+编号+责任领域  作为唯一检验
+				if(categoryFlag && inspectionItemFlag && configItemFlag && serialNumberFlag && dutyTerritoryFlag){
+					flag = true;
+				}
+			}
+			return flag;
+		}).collect(Collectors.toList());
+		if(CollectionUtils.isNotEmpty(duplicateDataList)){
+			if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+				result.add("您所选的数据中包含当前项目中已包含的条目信息，已为您过滤添加。");
+			}else {
+				result.add("The data you have selected contains item information already included in the current project, which has been filtered and added for you.");
+			}
+		}
+
+		// 过滤重复的数据
+		pciSaveList = projectCertificationInventoryEOList.stream().filter(pciEO -> {
+			boolean flag = true;
+			for (ProjectCertificationInventoryEO allData : allDataList) {
+				boolean categoryFlag = StringUtils.equals(pciEO.getCategory(), allData.getCategory());
+				boolean inspectionItemFlag = StringUtils.equals(pciEO.getInspectionItem(), allData.getInspectionItem());
+				boolean configItemFlag = StringUtils.equals(pciEO.getConfigItem(), allData.getConfigItem());
+				boolean serialNumberFlag = StringUtils.equals(pciEO.getSerialNumber(), allData.getSerialNumber());
+				boolean dutyTerritoryFlag = StringUtils.equals(pciEO.getDutyTerritory(), allData.getDutyTerritory());
+				// 类别+检验项目+配置项+编号+责任领域  作为唯一检验
+				if(categoryFlag && inspectionItemFlag && configItemFlag && serialNumberFlag && dutyTerritoryFlag){
+					flag = false;
+					break;
+				}
+			}
+			return flag;
+		}).collect(Collectors.toList());
+		return pciSaveList;
+	}
+
+	@Override
+	public Result<?> updateStatusBatch(JSONObject json) {
+		String ids = json.getString("ids");
+		String flowStatus = json.getString("flowStatus");
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		if(StringUtils.isNotEmpty(ids)){
+			QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
+			pciQueryWrap.lambda().in(ProjectCertificationInventoryEO::getId,Arrays.asList(ids.split(",")));
+			List<ProjectCertificationInventoryEO> pciEoList = this.list(pciQueryWrap);
+			if(CollectionUtils.isNotEmpty(pciEoList)){
+				pciEoList.forEach(pciEo -> {
+					pciEo.setFlowStatus(flowStatus);
+					processHistoryEOService.add(pciEo.getId(),CertificationFlowNodeEnum.TASK_SS.getKey(),currentUser.getId(),null,null,null);
+				});
+				this.updateBatchById(pciEoList);
+
+				// 如果是责任人操作补充提交按钮。给责任人生成对应待办中心的待办任务。
+				if(StringUtils.equals(flowStatus,CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())){
+					List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
+					pciEoList.forEach(pciEo -> {
+						ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
+						processInfoDetailEO.setUserId(pciEo.getDutyPerson());
+						processInfoDetailEO.setEndTime(pciEo.getEndTime());
+						processInfoDetailEO.setProjectLawsInventoryId(pciEo.getId());
+						processInfoDetailEOList.add(processInfoDetailEO);
+					});
+
+					// 给责任人分配待办中心的任务 (待提交)
+					this.addProcessInfoDetailEO(processInfoDetailEOList,pciEoList.get(0).getProjectLibraryId(),CertificationFlowNodeEnum.ZRRTJRW.getKey());
+				}
+			}
+		}
+		return new Result<>().success("批量更新状态成功！");
+	}
+
+	@Override
+	public void importDisposeData(List<ProjectCertificationInventoryEO> datas, String cut) {
+		if(CollectionUtils.isNotEmpty(datas)){
+			List<SysCategory> categoryList = this.sysCategoryService.list();
+			List<SysDictItem> sysDictItems = this.sysDictItemServiceImpl.getBaseMapper().selectItemsAll();
+
+			List<String> userNameList = new ArrayList<>();
+
+			userNameList.addAll(datas.stream().map(ProjectCertificationInventoryEO::getSdtName).collect(Collectors.toList()));
+			userNameList.addAll(datas.stream().map(ProjectCertificationInventoryEO::getDutyPersonName).collect(Collectors.toList()));
+			List<SysUser> sysUserList = this.sysUserService.queryUserIdListByNameList(userNameList);
+
+			for(ProjectCertificationInventoryEO data : datas){
+				//通过工程接口人名字获取sdt
+				if(StringUtils.isNotEmpty(data.getSdtName())){
+					String sdt = sysUserList.stream().filter(sysUser -> {
+						boolean flag = false;
+						if (StringUtils.equals(sysUser.getUsername(), data.getSdtName())) {
+							flag = true;
+						}
+						return flag;
+					}).map(SysUser::getId).collect(Collectors.joining(","));
+					data.setSdt(sdt);
+				}
+				//通过责任人的名字获取dutyperson
+				if(StringUtils.isNotEmpty(data.getDutyPersonName())){
+					String dutyPerson = sysUserList.stream().filter(sysUser -> {
+						boolean flag = false;
+						if (StringUtils.equals(sysUser.getUsername(), data.getDutyPersonName())) {
+							flag = true;
+						}
+						return flag;
+					}).map(SysUser::getId).collect(Collectors.joining(","));
+					data.setDutyPerson(dutyPerson);
+				}
+				//交付物类型
+				if(CutEnum.CN.getValue().equals(cut)){
+					if(StringUtils.isNotEmpty(data.getDeliverableTypeName())){
+						String deliverableType = this.getTreeNameImport(cut, categoryList, Arrays.asList(data.getDeliverableTypeName().split(",")));
+						data.setDeliverableType(deliverableType);
+
+						String valueType = categoryList.stream().filter(category -> {
+							boolean flag = false;
+							if (StringUtils.equals(data.getDeliverableTypeName(), category.getName())) {
+								flag = true;
+							}
+							return flag;
+						}).map(SysCategory::getValueType).distinct().collect(Collectors.joining(","));
+						data.setValueType(valueType);
+					}
+				}else {
+					if(StringUtils.isNotEmpty(data.getDeliverableTypeNameEn())){
+
+						String deliverableType = this.getTreeNameImport(CutEnum.EN.getValue(), categoryList, Arrays.asList(data.getDeliverableTypeNameEn().split(",")));
+						data.setDeliverableType(deliverableType);
+
+						String valueType = categoryList.stream().filter(category -> {
+							boolean flag = false;
+							if (StringUtils.equals(data.getDeliverableTypeNameEn(), category.getEnName())) {
+								flag = true;
+							}
+							return flag;
+						}).map(SysCategory::getValueType).distinct().collect(Collectors.joining(","));
+						data.setValueType(valueType);
+					}
+				}
+				//责任领域
+				if(StringUtils.isNotEmpty(data.getDutyTerritoryName())){
+					String dutyTerritory = this.sysDictItemService.disposeShowDictItemText(sysDictItems,data.getDutyTerritoryName(),cut, ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
+					data.setDutyTerritory(dutyTerritory);
+				}
+				//通过编号查找文档库的id
+				if(StringUtils.isNotEmpty(data.getSerialNumber())){
+					BussDocumentLibraryEO bySerialNumber = bussDocumentLibraryEOMapper.getBySerialNumber(data.getSerialNumber());
+					data.setBussDocumentLibraryId(bySerialNumber.getId());
+				}
+				List<ProjectCertificationInventoryEO> list = new ArrayList<>();
+				list.add(data);
+				if (list!=null&&list.size()>0) {
+					platformProjectCertificationInventoryEOService.saveBatch(list);
+				}
+				Date now = new Date();
+				//设置权限 先删后加
+				List<ProjectUserPermission> adds = new ArrayList<>();
+				for (ProjectCertificationInventoryEO pci: list) {
+					if (ObjectUtils.isNotEmpty(pci.getSdt())) {
+						setProjectCertificationInventoryPermission(pci.getSdt(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_SDT.getValue());
+					}
+					if (ObjectUtils.isNotEmpty(pci.getDutyPerson())) {
+						setProjectCertificationInventoryPermission(pci.getDutyPerson(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_DP.getValue());
+					}
+				}
+				if (ObjectUtils.isNotEmpty(adds)) {
+					projectUserPermissionService.saveBatch(adds);
+				}
+			}
+		}
+	}
+
+	@Override
+	public String getTreeNameImport(String cut, List<SysCategory> categoryList, List<String> technologyTerritoryList) {
+		StringBuilder sb = new StringBuilder();
+		for (String technologyTerritory : technologyTerritoryList) {
+			List<SysCategory> collect = new ArrayList<>();
+			if(CutEnum.CN.getValue().equals(cut)){
+				collect = categoryList.stream().filter(e -> technologyTerritory.equals(e.getName())).collect(Collectors.toList());
+			}else {
+				collect = categoryList.stream().filter(e -> technologyTerritory.equals(e.getEnName())).collect(Collectors.toList());
+			}
+			if(collect!=null&&collect.size()>0){
+				sb.append(collect.get(0).getId());
+			}
+		}
+		String technologyTerritoryId = "";
+		if (StringUtils.isNotBlank(sb)) {
+			technologyTerritoryId = sb.substring(0, sb.length()-0);
+		}
+		return technologyTerritoryId;
+	}
+
+	@Override
+	public void disposeData(List<ProjectCertificationInventoryEO> datas, String cut) {
+		if (CollectionUtils.isNotEmpty(datas)) {
+			List<SysCategory> categoryList = this.sysCategoryService.list();
+			List<SysDictItem> sysDictItems = this.sysDictItemServiceImpl.getBaseMapper().selectItemsAll();
+			List<SysDictItem> certificationProgress = this.sysDictItemServiceImpl.selectItemsByDictCode("certification_progress");
+
+			List<String> userIdList = new ArrayList<>();
+
+			userIdList.addAll(datas.stream().map(ProjectCertificationInventoryEO::getSdt).collect(Collectors.toList()));
+			userIdList.addAll(datas.stream().map(ProjectCertificationInventoryEO::getDutyPerson).collect(Collectors.toList()));
+			List<SysUser> sysUserList = this.sysUserService.querySysUserListByIdList(userIdList);
+
+			for (ProjectCertificationInventoryEO data : datas) {
+				if(StringUtils.isNotEmpty(data.getSdt())){
+					String sdtName = sysUserList.stream().filter(sysUser -> {
+						boolean flag = false;
+						if (StringUtils.equals(sysUser.getId(), data.getSdt())) {
+							flag = true;
+						}
+						return flag;
+					}).map(SysUser::getUsername).collect(Collectors.joining(","));
+					data.setSdtName(sdtName);
+				}
+				if(StringUtils.isNotEmpty(data.getDutyPerson())){
+					String dutyPersonName = sysUserList.stream().filter(sysUser -> {
+						boolean flag = false;
+						if (StringUtils.equals(sysUser.getId(), data.getDutyPerson())) {
+							flag = true;
+						}
+						return flag;
+					}).map(SysUser::getUsername).collect(Collectors.joining(","));
+					data.setDutyPersonName(dutyPersonName);
+				}
+				if(StringUtils.isNotEmpty(data.getFlowStatus())){
+					data.setFlowStatusName(CertificationInventoryFlowStatusEnum.getTextByValue(data.getFlowStatus(),cut));
+				}
+				if(StringUtils.isNotEmpty(data.getDeliverableType())){
+					String deliverableTypeName = this.getTreeName(cut, categoryList, Arrays.asList(data.getDeliverableType().split(",")));
+					data.setDeliverableTypeName(deliverableTypeName);
+
+					String deliverableTypeNameEn = this.getTreeName(CutEnum.EN.getValue(), categoryList, Arrays.asList(data.getDeliverableType().split(",")));
+					data.setDeliverableTypeNameEn(deliverableTypeNameEn);
+
+					String valueType = categoryList.stream().filter(category -> {
+						boolean flag = false;
+						if (StringUtils.equals(data.getDeliverableType(), category.getId())) {
+							flag = true;
+						}
+						return flag;
+					}).map(SysCategory::getValueType).distinct().collect(Collectors.joining(","));
+					data.setValueType(valueType);
+				}
+				if(StringUtils.isNotEmpty(data.getDutyTerritory())){
+					String dutyTerritoryName = this.sysDictItemService.disposeShowDictItemValue(sysDictItems,data.getDutyTerritory(),cut, ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
+					data.setDutyTerritoryName(dutyTerritoryName);
+				}
+				if(StringUtils.isNotEmpty(data.getCertificationProgress())){
+					String certificationProgress_dictText = "";
+					List<SysDictItem> collect = certificationProgress.stream()
+							.filter(dict -> StringUtils.equals(dict.getItemValue(), data.getCertificationProgress()))
+							.collect(Collectors.toList());
+					if(CollectionUtils.isNotEmpty(collect)){
+						if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+							certificationProgress_dictText = collect.get(0).getItemText();
+						}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+							certificationProgress_dictText = collect.get(0).getEnName();
+						}
+					}
+					data.setCertificationProgress_dictText(certificationProgress_dictText);
+				}
+//				String GetEndTime = String.valueOf(data.getEndTime());
+//				if(StringUtils.isNotEmpty(GetEndTime)){
+//					Date endTime = new Date();
+//					if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+//						endTime = data.getEndTime();
+//					}else {
+//						endTime = data.getEndTime();
+//					}
+//					data.setEndTimeStr(String.valueOf(endTime));
+//				}
+				if(StringUtils.isNotEmpty(data.getAttestationType())){
+					String attestationTypeName = this.sysDictItemService.disposeShowDictItemValue(sysDictItems,data.getAttestationType(),cut, "ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2");
+					data.setAttestationTypeName(attestationTypeName);
+				}
+
+				if(StringUtils.isNotEmpty(data.getCertificationProgress())){
+					String cpNumber = CertificationProgressEnum.getNumberByValue(data.getCertificationProgress());
+					data.setCertificationProgressNumber(cpNumber);
+				}
+			}
+		}
+	}
+
+
+
+	@Override
+	public String getTreeName(String cut, List<SysCategory> categoryList, List<String> technologyTerritoryList) {
+		StringBuilder sb = new StringBuilder();
+		for (String technologyTerritory : technologyTerritoryList) {
+			List<SysCategory> collect = categoryList.stream().filter(e -> technologyTerritory.equals(e.getId())).collect(Collectors.toList());
+			if(collect.size() != 0){
+				if (CutEnum.CN.getValue().equals(cut)) {
+					sb.append(collect.get(0).getName() + ",");
+				} else {
+					sb.append(collect.get(0).getEnName()+ ",");
+				}
+			}
+		}
+		String technologyTerritoryName = "";
+		if (StringUtils.isNotBlank(sb)) {
+			technologyTerritoryName = sb.substring(0, sb.length() - 1);
+		}
+		return technologyTerritoryName;
+	}
+
+
+	/**
+	 * 发布
+	 * @param json
+	 * @return
+	 */
+	@Override
+	public Result<?> issue(JSONObject json) {
+		String ids = json.getString("ids");
+		String projectLibraryId = json.getString("projectLibraryId");
+		if(StringUtils.isEmpty(ids)){
+			throw new JeroBootException("至少选择一条数据进行发布！");
+		}
+		String inventoryVerifyEndTimeStr = json.getString("inventoryVerifyEndTime");
+		Date inventoryVerifyEndTime = DateUtils.str2Date(inventoryVerifyEndTimeStr, DateUtils.date_sdf.get());
+
+		String cut = json.getString("cut");
+
+		List<String> idList = Arrays.asList(ids.split(","));
+
+		List<String> flowStatusList = new ArrayList<>();
+		flowStatusList.add(CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+		flowStatusList.add(CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue());
+
+		// 根据页面选择的认证清单数据id，查询出状态为’清单待发布‘的数据，进行发布处理
+		QueryWrapper<ProjectCertificationInventoryEO> certificationQueryWrap = new QueryWrapper<>();
+		certificationQueryWrap.lambda().in(ProjectCertificationInventoryEO::getId,idList);
+		certificationQueryWrap.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList);
+		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.list(certificationQueryWrap);
+
+		if(CollectionUtils.isEmpty(projectCertificationInventoryEOList)){
+			if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+				throw new JeroBootException("Select at least one data flow whose status is' List to be released or Certification returned '!");
+			}else {
+				throw new JeroBootException("至少选择一条数据流程状态为'清单待发布 或 认证退回'的数据！");
+			}
+
+		}
+		List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
+			// 将数据的状态更新为：清单待校核，更新截止时间。等待认证工程师进行操作。
+			projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
+			projectCertificationInventoryEO.setInventoryVerifyEndTime(inventoryVerifyEndTime);
+			processHistoryEOService.add(projectCertificationInventoryEO.getId(),CertificationFlowNodeEnum.LIST_CONFIRMATION.getKey(),currentUser.getId(),null,null,null);
+		}
+
+		this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_ISSUE.getValue());
+
+		this.updateBatchById(projectCertificationInventoryEOList);
+
+		// 根据项目库id查询当前项目认证清单数据，获取清单校核截止时间 最早的一个时间
+		flowStatusList.clear();
+		flowStatusList.add(CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
+		flowStatusList.add(CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue());
+		QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
+		pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId);
+		pciQueryWrap.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList);
+		List<ProjectCertificationInventoryEO> pciEoList = this.list(pciQueryWrap);
+		if(CollectionUtils.isNotEmpty(pciEoList)){
+			List<Date> inventoryVerifyEndTimeList = pciEoList.stream().map(ProjectCertificationInventoryEO::getInventoryVerifyEndTime).distinct().collect(Collectors.toList());
+			inventoryVerifyEndTimeList.add(inventoryVerifyEndTime);
+			Collections.sort(inventoryVerifyEndTimeList, (d1, d2) -> d1.compareTo(d2)); // 根据时间顺序排序
+			inventoryVerifyEndTime = inventoryVerifyEndTimeList.get(0);
+		}
+
+		// 获取项目信息，获取认证工程师，给认证工程师分配待办任务
+		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+		if(ObjectUtils.isNotEmpty(projectLibraryBase)){
+			String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+			String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+			if(ObjectUtils.isEmpty(projectLibraryBase)){
+				throw new JeroBootException("无法获取项目信息，请稍后重试！");
+			}
+			String certificationEngineer = projectLibraryBase.getCertificationEngineer();
+			if(StringUtils.isEmpty(certificationEngineer)){
+				if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+					throw new JeroBootException("There is no certified engineer in this project. Please maintain the certified engineer first!");
+				}else {
+					throw new JeroBootException("该项目中认证工程师为空，请先维护认证工程师！");
+				}
+			}
+
+			List<String> certificationEngineerIdList = Arrays.asList(certificationEngineer.split(","));
+			// 给认证工程师分配任务
+			for (String userId : certificationEngineerIdList) {
+				ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
+				processInfoDetailEO.setUserId(userId);
+				processInfoDetailEO.setTaskDefinitionKey(CertificationFlowNodeEnum.RZGCSJSRW.getKey());
+				processInfoDetailEO.setCreateTime(new Date());
+				processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue());
+				processInfoDetailEO.setProcessInfoId(projectLibraryId);
+				processInfoDetailEO.setActiProcInstId(projectLibraryId);
+				processInfoDetailEO.setFlowType(FlowTypeEnum.CERTIFICATION_LC.getValue());
+				processInfoDetailEO.setEndTime(inventoryVerifyEndTime);
+				processInfoDetailEOList.add(processInfoDetailEO);
+			}
+
+			ProcessInfoEO processInfoEO = new ProcessInfoEO();
+			this.addProcessInfoEO(processInfoEO,projectLibraryId);
+
+			// 删除该项目数据的待办任务，key为 认证工程师接受任务的数据
+			QueryWrapper<ProcessInfoDetailEO> deleteDetailWrap = new QueryWrapper<>();
+			deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getProcessInfoId,processInfoEO.getId());
+			deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getTaskDefinitionKey,CertificationFlowNodeEnum.RZGCSJSRW.getKey());
+			deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.CERTIFICATION_LC.getValue());
+			this.processInfoDetailEOService.remove(deleteDetailWrap);
+			this.processInfoDetailEOService.saveBatch(processInfoDetailEOList);
+
+			// 获取认证清单 - 飞书跳转链接
+			Map<String, Object> hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryId, PRN_CN, PRN_EN);
+			String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN");
+			String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN");
+			String hrefFeishu_CN_P = (String) hrefFeishuMap.get("hrefFeishu_CN_P");
+
+
+			List<SysUser> certificationEngineerUserInfoList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList);
+			Date finalInventoryVerifyEndTime = inventoryVerifyEndTime;
+			certificationEngineerIdList.forEach(userId -> {
+				try {
+					String thirdId = this.sysUserService.getUserThirdIdByUserId(certificationEngineerUserInfoList,userId);
+
+					if(StringUtils.isNotEmpty(thirdId)){
+						JSONObject larkMesJson = new JSONObject();
+						larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE2.getValue());
+						larkMesJson.put("userIds",thirdId);
+
+						Map<String,Object> templateVariableMap = new HashMap<>();
+						templateVariableMap.put("projectNameCn",PRN_CN);
+						templateVariableMap.put("projectNameEn",PRN_EN);
+						templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName());
+						templateVariableMap.put("endTime",DateUtils.formatDate(finalInventoryVerifyEndTime));
+						templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
+						templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
+						templateVariableMap.put("viewBtnUrlCnPhone",hrefFeishu_CN_P);
+
+
+						larkMesJson.put("templateVariableMap",templateVariableMap);
+						this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson);
+					}
+				} catch (Exception e) {
+					log.error("飞书消息推送失败");
+				}
+			});
+		}
+
+		return Result.OK("发布成功！");
+	}
+
+
+	/**
+	 * 添加流程信息
+	 * @param processInfoEO
+	 * @param projectLibraryId
+	 */
+	@Override
+	public void addProcessInfoEO(ProcessInfoEO processInfoEO,String projectLibraryId){
+		processInfoEO.setId(projectLibraryId);
+		processInfoEO.setProjectLibraryId(projectLibraryId);
+		processInfoEO.setActiProcInstId(projectLibraryId);
+		processInfoEO.setFlowType(FlowTypeEnum.CERTIFICATION_LC.getValue());
+		// processInfoEO.setStatus(TodoCenterStatusEnum.LIST_TO_CONFIRM.getValue());
+
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		processInfoEO.setCreateBy(currentUser.getId());
+
+		QueryWrapper<ProcessInfoEO> deleteWrap = new QueryWrapper<>();
+		deleteWrap.lambda().eq(ProcessInfoEO::getId,projectLibraryId);
+		this.processInfoEOService.remove(deleteWrap);
+		this.processInfoEOService.add(processInfoEO);
+	}
+
+	/**
+	 * 添加流程信息，用户的待办信息。
+	 * @param processInfoDetailEOList
+	 * @param processInfoId
+	 */
+	@Override
+	public void addProcessInfoDetailEO(List<ProcessInfoDetailEO> processInfoDetailEOList,String processInfoId,String taskDefinitionKey){
+		processInfoDetailEOList.forEach(detail -> {
+			detail.setActiProcInstId(processInfoId);
+			detail.setProcessInfoId(processInfoId);
+			detail.setFlowType(FlowTypeEnum.CERTIFICATION_LC.getValue());
+			detail.setTaskDefinitionKey(taskDefinitionKey);
+			detail.setStatus(TaskStatusEnum.NOT_DONE.getValue());
+			detail.setCreateTime(new Date());
+		});
+
+		List<String> userIdList = processInfoDetailEOList.stream().map(ProcessInfoDetailEO::getUserId).distinct().collect(Collectors.toList());
+		QueryWrapper<ProcessInfoDetailEO> removeWrap = new QueryWrapper<>();
+		removeWrap.lambda().eq(ProcessInfoDetailEO::getProcessInfoId,processInfoId);
+		removeWrap.lambda().in(ProcessInfoDetailEO::getUserId,userIdList);
+		removeWrap.lambda().eq(ProcessInfoDetailEO::getTaskDefinitionKey,taskDefinitionKey);
+		if(!StringUtils.equals(taskDefinitionKey,CertificationFlowNodeEnum.RZGCSSC.getKey())){
+			List<String> dataIdList = processInfoDetailEOList.stream().map(ProcessInfoDetailEO::getProjectLawsInventoryId).distinct().collect(Collectors.toList());
+			removeWrap.lambda().in(ProcessInfoDetailEO::getProjectLawsInventoryId,dataIdList);
+		}
+		// 删除用户在这个认证清单流程中其它的待办任务
+		this.processInfoDetailEOService.remove(removeWrap);
+
+		this.processInfoDetailEOService.saveBatch(processInfoDetailEOList);
+	}
+
+	@Override
+	public Result<List<SysRole>> getRoleByUserId(Map<String, Object> params) {
+		Result<List<SysRole>> result = new Result<>();
+		String projectLibraryId = (String) params.get("projectLibraryId");
+		String cut = (String) params.get("cut");
+
+		List<SysRole> sysRoles = new LinkedList<>();
+		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		//项目详情中取R&H Studio和认证工程师
+		List<ProjectLibraryBase> projectLibraryBases = projectLibraryBaseService.queryById(projectLibraryId,null);
+		String certificationEngineerName = "";
+		if(projectLibraryBases.size() != 0){
+			certificationEngineerName = projectLibraryBases.get(0).getCertificationEngineerName();
+			String studioEngineerName = projectLibraryBases.get(0).getStudioEngineerName();
+			// studio
+			if(StringUtils.isNotBlank(studioEngineerName) && studioEngineerName.equals(loginUser.getUsername())){
+				SysRole sysRole = new SysRole();
+				sysRole.setRoleCode(ProjectRoleEnum.STUDIO_ENGINEER.getValue());
+				if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+					sysRole.setRoleName(ProjectRoleEnum.STUDIO_ENGINEER.getName());
+				}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+					sysRole.setRoleName(ProjectRoleEnum.STUDIO_ENGINEER.getCode());
+				}
+
+				sysRoles.add(sysRole);
+			}
+
+			// 认证
+			if((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername()))){
+				SysRole sysRole = new SysRole();
+				sysRole.setRoleCode(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue());
+				if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+					sysRole.setRoleName(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getName());
+				}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+					sysRole.setRoleName(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getCode());
+				}
+				sysRoles.add(sysRole);
+			}
+
+			// 法规
+			//相关人员名单中取法规工程师
+			List<ProjectRelatedPersonnel> projectRelatedPersonnels = this.projectRelatedPersonnelService.queryPageList(projectLibraryId,null,null,null,null,null,null);
+			List<String> lawEngineerNameList = new ArrayList<>();
+			if(projectRelatedPersonnels.size() != 0){
+				for (ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels) {
+					String lawEngineerName = projectRelatedPersonnel.getLawEngineerName();
+					if(StringUtils.isNotBlank(lawEngineerName)){
+						lawEngineerName = lawEngineerName.replaceAll(" ","");
+						lawEngineerNameList.addAll(Arrays.asList(lawEngineerName.split(",")));
+					}
+				}
+
+				if(lawEngineerNameList.contains(loginUser.getUsername())){
+					SysRole sysRole = new SysRole();
+					sysRole.setRoleCode(ProjectRoleEnum.REGULATI_ENGINEER.getValue());
+					if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+						sysRole.setRoleName(ProjectRoleEnum.REGULATI_ENGINEER.getName());
+					}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+						sysRole.setRoleName(ProjectRoleEnum.REGULATI_ENGINEER.getCode());
+					}
+					sysRoles.add(sysRole);
+				}
+			}
+
+			// 接口人
+			QueryWrapper<ProjectCertificationInventoryEO> querySdtCountWrap = new QueryWrapper<>();
+			querySdtCountWrap.lambda().eq(ProjectCertificationInventoryEO::getSdt,loginUser.getId());
+			querySdtCountWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId);
+			Integer sdtCount = this.baseMapper.selectCount(querySdtCountWrap);
+			if(sdtCount > 0){
+				SysRole sysRole = new SysRole();
+				sysRole.setRoleCode(ProjectRoleEnum.INTERFACE_PERSON.getValue());
+				if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+					sysRole.setRoleName(ProjectRoleEnum.INTERFACE_PERSON.getName());
+				}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+					sysRole.setRoleName(ProjectRoleEnum.INTERFACE_PERSON.getCode());
+				}
+				sysRoles.add(sysRole);
+			}
+
+			// 责任人
+			QueryWrapper<ProjectCertificationInventoryEO> queryDutyPersonCountWrap = new QueryWrapper<>();
+			queryDutyPersonCountWrap.lambda().eq(ProjectCertificationInventoryEO::getDutyPerson,loginUser.getId());
+			queryDutyPersonCountWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId);
+			Integer dutyPersonCount = this.baseMapper.selectCount(queryDutyPersonCountWrap);
+			if(dutyPersonCount > 0){
+				SysRole sysRole = new SysRole();
+				sysRole.setRoleCode(ProjectRoleEnum.PERSON_LIABLE.getValue());
+				if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+					sysRole.setRoleName(ProjectRoleEnum.PERSON_LIABLE.getName());
+				}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+					sysRole.setRoleName(ProjectRoleEnum.PERSON_LIABLE.getCode());
+				}
+				sysRoles.add(sysRole);
+			}
+		}
+
+		// 领导、系统管理员、Viewer、品牌管理员 处理
+		List<SysRole> roleList = this.sysRoleMapper.getRoleByUserId(loginUser.getId());
+		if (roleList.size() != 0) {
+			List<SysRole> manager = roleList.stream().filter(e -> ProjectRoleEnum.MANAGER.getCode().equals(e.getRoleCode())).collect(Collectors.toList());
+			List<SysRole> admin = roleList.stream().filter(e -> ProjectRoleEnum.ADMIN.getCode().equals(e.getRoleCode())).collect(Collectors.toList());
+			List<SysRole> Viewer = roleList.stream().filter(e -> ProjectRoleEnum.VIEWER.getCode().equals(e.getRoleCode())).collect(Collectors.toList());
+			List<SysRole> brandAdministrator = roleList.stream().filter(e -> ProjectRoleEnum.BRAND_ADMINISTRATOR.getCode().equals(e.getRoleCode())).collect(Collectors.toList());
+			if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+				if (manager.size() != 0) {
+					manager.get(0).setRoleCode(ProjectRoleEnum.MANAGER.getValue());
+					sysRoles.addAll(manager);
+				}
+				if (admin.size() != 0) {
+					admin.get(0).setRoleCode(ProjectRoleEnum.ADMIN.getValue());
+					sysRoles.addAll(admin);
+				}
+				if (Viewer.size() != 0) {
+					Viewer.get(0).setRoleCode(ProjectRoleEnum.VIEWER.getValue());
+					sysRoles.addAll(Viewer);
+				}
+				if (brandAdministrator.size() != 0) {
+					brandAdministrator.get(0).setRoleCode(ProjectRoleEnum.BRAND_ADMINISTRATOR.getValue());
+					sysRoles.addAll(brandAdministrator);
+				}
+			}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+				if (manager.size() != 0) {
+					manager.get(0).setRoleCode(ProjectRoleEnum.MANAGER.getValue());
+					manager.get(0).setRoleName(ProjectRoleEnum.MANAGER.getCode());
+					sysRoles.addAll(manager);
+				}
+				if (admin.size() != 0) {
+					admin.get(0).setRoleCode(ProjectRoleEnum.ADMIN.getValue());
+					admin.get(0).setRoleName(ProjectRoleEnum.ADMIN.getCode());
+					sysRoles.addAll(admin);
+				}
+				if (Viewer.size() != 0) {
+					Viewer.get(0).setRoleCode(ProjectRoleEnum.VIEWER.getValue());
+					Viewer.get(0).setRoleName(ProjectRoleEnum.VIEWER.getCode());
+					sysRoles.addAll(Viewer);
+				}
+				if (brandAdministrator.size() != 0) {
+					brandAdministrator.get(0).setRoleCode(ProjectRoleEnum.BRAND_ADMINISTRATOR.getValue());
+					brandAdministrator.get(0).setRoleName(ProjectRoleEnum.BRAND_ADMINISTRATOR.getCode());
+					sysRoles.addAll(brandAdministrator);
+				}
+
+			}
+
+		}
+
+		if(sysRoles==null||sysRoles.size()<=0) {
+			result.error500("未找到角色信息");
+		}else {
+			result.setResult(sysRoles);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+	@Override
+	public Result<?> getFlowStatusList(String cut) {
+		List<Map<String,Object>> result = new ArrayList<>();
+		CertificationInventoryFlowStatusEnum[] values = CertificationInventoryFlowStatusEnum.values();
+		for (CertificationInventoryFlowStatusEnum value : values) {
+			Map<String,Object> flowStatusMap = new HashMap<>();
+			String name = value.getCnName();
+			if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+				name = value.getEnName();
+			}
+			flowStatusMap.put("name",name);
+			flowStatusMap.put("value",value.getValue());
+			result.add(flowStatusMap);
+		}
+		return Result.OK(result);
+	}
+
+	@Override
+	public IPage<ProjectCertificationInventoryEO> queryPage(QueryWrapper<ProjectCertificationInventoryEO> queryWrapper,
+															Page<ProjectCertificationInventoryEO> page,
+															ProjectCertificationInventoryEO projectCertificationInventoryEO,
+															String cut) {
+
+		String roleCode = projectCertificationInventoryEO.getRoleCode();
+		// 创建查询权限
+		this.createQueryPermission(queryWrapper,roleCode);
+		// 根据一级责任领域（统计节点），查询该一级责任领域下所有子责任领域的法规清单数据。
+		String dutyTerritoryStr = "";
+		if(StringUtils.isNotEmpty(projectCertificationInventoryEO.getFirstLevelDutyTerritory())){
+			List<SysDictItem> sysDictItems = this.sysDictItemServiceImpl.selectItemsAll();
+			List<SysDictItem> dutyTerritorys = new ArrayList<>();
+			Map<String, List<SysDictItem>> firstLevelDTMap = this.sysDictItemServiceImpl.getFirstLevelSysDictItemByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue(), sysDictItems);
+			String[] firstLevelDTArr = projectCertificationInventoryEO.getFirstLevelDutyTerritory().split(",");
+			for (String firstLevelDT : firstLevelDTArr){
+				if(CollectionUtils.isNotEmpty(firstLevelDTMap.get(firstLevelDT))){
+					dutyTerritorys.addAll(firstLevelDTMap.get(firstLevelDT));
+				}
+			}
+			if(CollectionUtils.isNotEmpty(dutyTerritorys)){
+				dutyTerritoryStr = dutyTerritorys.stream().map(SysDictItem::getItemValue).distinct().collect(Collectors.joining(","));
+			}
+		}
+		if (StringUtils.isNotEmpty(dutyTerritoryStr)) {
+			String finalDutyTerritoryStr = dutyTerritoryStr.replaceAll("\\*","");
+			queryWrapper.and(query -> {
+				query.lambda().like(ProjectCertificationInventoryEO::getDutyTerritory, finalDutyTerritoryStr);
+				if(StringUtils.contains(finalDutyTerritoryStr,",")){
+					String[] dutyTerritoryArr = finalDutyTerritoryStr.split(",");
+					for (String duty : dutyTerritoryArr) {
+						query.or(q -> {
+							q.like("duty_territory",duty);
+						});
+					}
+				}
+			});
+		}
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		int isProjectRole = Integer.parseInt(roleCode);
+		if (isProjectRole == Integer.parseInt(com.jero.modules.project.enums.ProjectRoleEnum.VIEWER.getValue())) {
+			//查当前用户Viewer对应责任领域
+			List<String> dutyTerritoryList = this.projectUserDutyTerritoryService.queryDutyTerritoryByUserId(currentUser.getId());
+			if (ObjectUtils.isNotEmpty(dutyTerritoryList)) {
+				queryWrapper.and(query -> {
+					for (String duty : dutyTerritoryList) {
+						query.or(q -> {
+							q.like("duty_territory", duty);
+						});
+					}
+				});
+			}
+		}
+		IPage<ProjectCertificationInventoryEO> pageList = this.page(page, queryWrapper);
+		this.disposeData(pageList.getRecords(),cut);
+		List<ProjectCertificationInventoryEO> records = this.hearSort(projectCertificationInventoryEO, pageList.getRecords());
+		pageList.setRecords(records);
+		return pageList;
+	}
+
+	/**
+	 * 表头排序
+	 * @param pciEo
+	 * @param datas
+	 * @return
+	 */
+	private List<ProjectCertificationInventoryEO> hearSort(ProjectCertificationInventoryEO pciEo, List<ProjectCertificationInventoryEO> datas) {
+		String orderBy = pciEo.getOrderBy();
+		String orderByField = pciEo.getOrderByField();
+		if(ObjectUtils.isNotEmpty(orderByField)){
+			Collator comparator = Collator.getInstance(Locale.CHINESE);
+			// 类别  category
+			if(StringUtils.equals("category",orderByField)){
+				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1, e2)->{
+						String e1Category = (StringUtils.isNotEmpty(e1.getCategory()) ? e1.getCategory() : "");
+						String e2Category = (StringUtils.isNotEmpty(e2.getCategory()) ? e2.getCategory() : "");
+						return comparator.compare(e1Category,e2Category);
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1,e2)->{
+						String e1Category = (StringUtils.isNotEmpty(e1.getCategory()) ? e1.getCategory() : "");
+						String e2Category = (StringUtils.isNotEmpty(e2.getCategory()) ? e2.getCategory() : "");
+						return comparator.compare(e2Category,e1Category);
+					});
+				}
+			}
+
+			// 检验项目 inspectionItem
+			if(StringUtils.equals("inspectionItem",orderByField)){
+				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1, e2)->{
+						String e1InspectionItem = (StringUtils.isNotEmpty(e1.getInspectionItem()) ? e1.getInspectionItem() : "");
+						String e2InspectionItem = (StringUtils.isNotEmpty(e2.getInspectionItem()) ? e2.getInspectionItem() : "");
+						return comparator.compare(e1InspectionItem,e2InspectionItem);
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1,e2)->{
+						String e1InspectionItem = (StringUtils.isNotEmpty(e1.getInspectionItem()) ? e1.getInspectionItem() : "");
+						String e2InspectionItem = (StringUtils.isNotEmpty(e2.getInspectionItem()) ? e2.getInspectionItem() : "");
+						return comparator.compare(e2InspectionItem,e1InspectionItem);
+					});
+				}
+			}
+
+			// 认证类型 attestationTypeName
+			if(StringUtils.equals("attestationTypeName",orderByField)){
+				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1, e2)->{
+						String e1AttestationTypeName = (StringUtils.isNotEmpty(e1.getAttestationTypeName()) ? e1.getAttestationTypeName() : "");
+						String e2AttestationTypeName = (StringUtils.isNotEmpty(e2.getAttestationTypeName()) ? e2.getAttestationTypeName() : "");
+						return comparator.compare(e1AttestationTypeName,e2AttestationTypeName);
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1,e2)->{
+						String e1AttestationTypeName = (StringUtils.isNotEmpty(e1.getAttestationTypeName()) ? e1.getAttestationTypeName() : "");
+						String e2AttestationTypeName = (StringUtils.isNotEmpty(e2.getAttestationTypeName()) ? e2.getAttestationTypeName() : "");
+						return comparator.compare(e2AttestationTypeName,e1AttestationTypeName);
+					});
+				}
+			}
+
+			// WVTA ID wvtaId
+			if(StringUtils.equals("wvtaId",orderByField)){
+				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1, e2)->{
+						String e1WvtaId = (StringUtils.isNotEmpty(e1.getWvtaId()) ? e1.getWvtaId() : "");
+						String e2WvtaId = (StringUtils.isNotEmpty(e2.getWvtaId()) ? e2.getWvtaId() : "");
+						return comparator.compare(e1WvtaId,e2WvtaId);
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1,e2)->{
+						String e1WvtaId = (StringUtils.isNotEmpty(e1.getWvtaId()) ? e1.getWvtaId() : "");
+						String e2WvtaId = (StringUtils.isNotEmpty(e2.getWvtaId()) ? e2.getWvtaId() : "");
+						return comparator.compare(e2WvtaId,e1WvtaId);
+					});
+				}
+			}
+
+			// 标准编号 serialNumber
+			if(StringUtils.equals("serialNumber",orderByField)){
+				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1, e2)->{
+						String e1SerialNumber = (StringUtils.isNotEmpty(e1.getSerialNumber()) ? e1.getSerialNumber() : "");
+						String e2SerialNumber = (StringUtils.isNotEmpty(e2.getSerialNumber()) ? e2.getSerialNumber() : "");
+						return comparator.compare(e1SerialNumber,e2SerialNumber);
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1,e2)->{
+						String e1SerialNumber = (StringUtils.isNotEmpty(e1.getSerialNumber()) ? e1.getSerialNumber() : "");
+						String e2SerialNumber = (StringUtils.isNotEmpty(e2.getSerialNumber()) ? e2.getSerialNumber() : "");
+						return comparator.compare(e2SerialNumber,e1SerialNumber);
+					});
+				}
+			}
+
+			// 责任领域 dutyTerritoryName
+			if(StringUtils.equals("dutyTerritoryName",orderByField)){
+				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1, e2)->{
+						String e1DutyTerritoryName = (StringUtils.isNotEmpty(e1.getDutyTerritoryName()) ? e1.getDutyTerritoryName() : "");
+						String e2DutyTerritoryName = (StringUtils.isNotEmpty(e2.getDutyTerritoryName()) ? e2.getDutyTerritoryName() : "");
+						return comparator.compare(e1DutyTerritoryName,e2DutyTerritoryName);
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1,e2)->{
+						String e1DutyTerritoryName = (StringUtils.isNotEmpty(e1.getDutyTerritoryName()) ? e1.getDutyTerritoryName() : "");
+						String e2DutyTerritoryName = (StringUtils.isNotEmpty(e2.getDutyTerritoryName()) ? e2.getDutyTerritoryName() : "");
+						return comparator.compare(e2DutyTerritoryName,e1DutyTerritoryName);
+					});
+				}
+			}
+
+			// 工程接口人 sdtName
+			if(StringUtils.equals("sdtName",orderByField)){
+				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1, e2)->{
+						String e1SdtName = (StringUtils.isNotEmpty(e1.getSdtName()) ? e1.getSdtName() : "");
+						String e2SdtName = (StringUtils.isNotEmpty(e2.getSdtName()) ? e2.getSdtName() : "");
+						return comparator.compare(e1SdtName,e2SdtName);
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1,e2)->{
+						String e1SdtName = (StringUtils.isNotEmpty(e1.getSdtName()) ? e1.getSdtName() : "");
+						String e2SdtName = (StringUtils.isNotEmpty(e2.getSdtName()) ? e2.getSdtName() : "");
+						return comparator.compare(e2SdtName,e1SdtName);
+					});
+				}
+			}
+
+			// 责任人 dutyPersonName
+			if(StringUtils.equals("dutyPersonName",orderByField)){
+				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1, e2)->{
+						String e1DutyPersonName = (StringUtils.isNotEmpty(e1.getDutyPersonName()) ? e1.getDutyPersonName() : "");
+						String e2DutyPersonName = (StringUtils.isNotEmpty(e2.getDutyPersonName()) ? e2.getDutyPersonName() : "");
+						return comparator.compare(e1DutyPersonName,e2DutyPersonName);
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1,e2)->{
+						String e1DutyPersonName = (StringUtils.isNotEmpty(e1.getDutyPersonName()) ? e1.getDutyPersonName() : "");
+						String e2DutyPersonName = (StringUtils.isNotEmpty(e2.getDutyPersonName()) ? e2.getDutyPersonName() : "");
+						return comparator.compare(e2DutyPersonName,e1DutyPersonName);
+					});
+				}
+			}
+
+			// 交付物类型 deliverableTypeName
+			if(StringUtils.equals("deliverableTypeName",orderByField)){
+				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1, e2)->{
+						String e1DeliverableTypeName = (StringUtils.isNotEmpty(e1.getDeliverableTypeName()) ? e1.getDeliverableTypeName() : "");
+						String e2DeliverableTypeName = (StringUtils.isNotEmpty(e2.getDeliverableTypeName()) ? e2.getDeliverableTypeName() : "");
+						return comparator.compare(e1DeliverableTypeName,e2DeliverableTypeName);
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1,e2)->{
+						String e1DeliverableTypeName = (StringUtils.isNotEmpty(e1.getDeliverableTypeName()) ? e1.getDeliverableTypeName() : "");
+						String e2DeliverableTypeName = (StringUtils.isNotEmpty(e2.getDeliverableTypeName()) ? e2.getDeliverableTypeName() : "");
+						return comparator.compare(e2DeliverableTypeName,e1DeliverableTypeName);
+					});
+				}
+			}
+
+			// 截止日期 endTime
+			if(StringUtils.equals("endTime",orderByField)){
+				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1, e2)->{
+						String e1EndTime = (e1.getEndTime() != null ? DateUtils.formatDate(e1.getEndTime()) : "");
+						String e2EndTime = (e2.getEndTime() != null ? DateUtils.formatDate(e2.getEndTime()) : "");
+						return comparator.compare(e1EndTime,e2EndTime);
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1,e2)->{
+						String e1EndTime = (e1.getEndTime() != null ? DateUtils.formatDate(e1.getEndTime()) : "");
+						String e2EndTime = (e2.getEndTime() != null ? DateUtils.formatDate(e2.getEndTime()) : "");
+						return comparator.compare(e2EndTime,e1EndTime);
+					});
+				}
+			}
+
+			// 流程状态 flowStatusName
+			if(StringUtils.equals("flowStatusName",orderByField)){
+				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1, e2)->{
+						String e1FlowStatusName = (StringUtils.isNotEmpty(e1.getFlowStatusName()) ? e1.getFlowStatusName() : "");
+						String e2FlowStatusName = (StringUtils.isNotEmpty(e2.getFlowStatusName()) ? e2.getFlowStatusName() : "");
+						return comparator.compare(e1FlowStatusName,e2FlowStatusName);
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1,e2)->{
+						String e1FlowStatusName = (StringUtils.isNotEmpty(e1.getFlowStatusName()) ? e1.getFlowStatusName() : "");
+						String e2FlowStatusName = (StringUtils.isNotEmpty(e2.getFlowStatusName()) ? e2.getFlowStatusName() : "");
+						return comparator.compare(e2FlowStatusName,e1FlowStatusName);
+					});
+				}
+			}
+
+			// 认证进度 certificationProgress
+			if(StringUtils.equals("certificationProgress",orderByField)){
+				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1, e2)->{
+						String e1CertificationProgressNumber = (StringUtils.isNotEmpty(e1.getCertificationProgressNumber()) ? e1.getCertificationProgressNumber() : "");
+						String e2CertificationProgressNumber = (StringUtils.isNotEmpty(e2.getCertificationProgressNumber()) ? e2.getCertificationProgressNumber() : "");
+						return comparator.compare(e1CertificationProgressNumber,e2CertificationProgressNumber);
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1,e2)->{
+						String e1CertificationProgressNumber = (StringUtils.isNotEmpty(e1.getCertificationProgressNumber()) ? e1.getCertificationProgressNumber() : "");
+						String e2CertificationProgressNumber = (StringUtils.isNotEmpty(e2.getCertificationProgressNumber()) ? e2.getCertificationProgressNumber() : "");
+						return comparator.compare(e2CertificationProgressNumber,e1CertificationProgressNumber);
+					});
+				}
+			}
+		}
+		return datas;
+	}
+
+	@Override
+	public void createQueryPermission(QueryWrapper<ProjectCertificationInventoryEO> queryWrapper, String roleCode) {
+		/**
+		 * 处理查询权限
+		 * 		studio、法规工程师、领导、系统管理员、Viewer、品牌管理员: 可以查询所有数据
+		 * 	    认证工程师：可以查询所有数据
+		 * 	    接口人：可查看所有接口人为自己的数据
+		 * 	    责任人：可以查看流程状态为：任务待确认、结果待提交 、审查通过（并且责任人为自己）
+		 */
+		ProjectRoleEnum projectRoleEnum = ProjectRoleEnum.getByValue(roleCode);
+		if(ObjectUtils.isEmpty(projectRoleEnum)){
+			throw new JeroBootException("当前用户角色有误，请重新选择后角色进行操作！");
+		}
+
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		switch (projectRoleEnum){
+			case STUDIO_ENGINEER:
+				break;
+			case REGULATI_ENGINEER:
+				break;
+			case MANAGER:
+				break;
+			case ADMIN:
+				break;
+			case VIEWER:
+				break;
+			case BRAND_ADMINISTRATOR:
+				break;
+			case HOMOLOGATION_ENGINEER:
+				break;
+			case INTERFACE_PERSON:
+				queryWrapper.lambda().eq(ProjectCertificationInventoryEO::getSdt,currentUser.getId());
+				break;
+			case PERSON_LIABLE:
+				/*List<String> flowStatusList = new ArrayList<>();
+				flowStatusList.add(CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue());
+				flowStatusList.add(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue());
+				flowStatusList.add(CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue());
+
+				queryWrapper.lambda().and(queryWrap -> {
+					queryWrap.and(query -> {
+						query.eq(ProjectCertificationInventoryEO::getDutyPerson,currentUser.getId());
+						query.in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList);
+					}).or(query -> {
+						query.eq(ProjectCertificationInventoryEO::getSdt,currentUser.getId());
+						query.eq(ProjectCertificationInventoryEO::getFlowStatus,CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue());
+					});
+				});*/
+				// 修改UAT问题清单 82条
+				queryWrapper.lambda().eq(ProjectCertificationInventoryEO::getDutyPerson,currentUser.getId());
+				break;
+			default:
+				throw new JeroBootException("当前用户角色有误，请重新选择后角色进行操作！");
+		}
+	}
+
+
+	@Override
+	public Result<?> submitTask(JSONObject json) {
+		if (!json.containsKey("nodeKey")) {
+			throw new JeroBootException("nodeKey不能为空，请联系管理员！");
+		}
+
+		String nodeKey = json.getString("nodeKey");
+
+		CertificationFlowNodeEnum flowNodeEnum = CertificationFlowNodeEnum.getEnumByKey(nodeKey);
+		if(ObjectUtils.isEmpty(flowNodeEnum)){
+			throw new JeroBootException("根据" + nodeKey + " 的操作节点没有获取到节点信息，请联系管理员！");
+		}
+
+		String projectLibraryId = json.getString("projectLibraryId");
+		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+		if(ObjectUtils.isEmpty(projectLibraryBase)){
+			throw new JeroBootException("无法获取项目库信息，项目库id为：" + projectLibraryId + " 请联系管理员！");
+		}
+		json.put("projectLibraryBase",projectLibraryBase);
+
+
+		switch (flowNodeEnum){
+			case RZGCSJSRW:
+				return this.certificationInitiatingTask(json);
+			case RZGCSTHRW:
+				return this.certificationReturnedStudioTask(json);
+			case ZRRJSRW:
+				return this.dutyPersonAcceptTask(json);
+			case ZRRJJRW:
+				return this.dutyPersonRejectTask(json);
+			case ZRRTJRW:
+				return this.dutyPersonSubmitTask(json);
+			case RZGCSSC:
+
+				break;
+			case RZGCSSC_TG:
+				return this.certificationReviewThrough(json);
+			case RZGCSSC_TH:
+				return this.certificationReviewReturned(json);
+			default:
+				throw new JeroBootException(nodeKey + " 的操作节点传递有误，请联系管理员！");
+		}
+
+		return Result.OK("提交任务成功！");
+	}
+
+	/**
+	 * 认证工程师审查退回
+	 * @param json
+	 * @return
+	 */
+	private Result<?> certificationReviewReturned(JSONObject json) {
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		String ids = json.getString("ids");
+		if(StringUtils.isEmpty(ids)){
+			throw new JeroBootException("至少选择一条数据进行操作！");
+		}
+		String reasonForReturn = json.getString("reasonForReturn");
+
+		List<String> idList = Arrays.asList(ids.split(","));
+
+		List<String> flowStatusList = new ArrayList<>();
+		flowStatusList.add(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue());
+		flowStatusList.add(CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue());
+
+		QueryWrapper<ProjectCertificationInventoryEO> queryWrapper = new QueryWrapper<>();
+		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getId,idList);
+		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList);
+		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.list(queryWrapper);
+
+		if(CollectionUtils.isEmpty(projectCertificationInventoryEOList)){
+			throw new JeroBootException("至少选择一条数据流程状态为'结果待审查'的数据！");
+		}
+		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
+			projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue());
+			projectCertificationInventoryEO.setReasonForReturn(reasonForReturn);
+			processHistoryEOService.add(projectCertificationInventoryEO.getId(),CertificationFlowNodeEnum.TASK_REVIEW.getKey(),currentUser.getId(),ReviewResultEnum.RETURNED.getValue(),reasonForReturn,null);
+		}
+
+		this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_RETURNED.getValue());
+
+		ProjectLibraryBase projectLibraryBase = JSONObject.parseObject(JSONObject.toJSONString(json.get("projectLibraryBase")), ProjectLibraryBase.class);
+		List<String> dutyPersonIdList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList());
+		List<SysUser> dutyPersonList = this.sysUserService.querySysUserListByIdList(dutyPersonIdList);
+
+		// 获取当前项目下，认证清单，截止日期最早的一个，更新到流程明细表中，认证工程师审查任务节点的截止时间中
+		flowStatusList.clear();
+		flowStatusList.add(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue());
+		this.updateProcessInfoDetailEndTime(
+				flowStatusList,
+				CertificationFlowNodeEnum.RZGCSSC.getKey(),
+				projectLibraryBase,
+				"end_time",
+				idList
+		);
+		try {
+			// 给责任人分配待办中心的任务
+			List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
+			for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
+				ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
+				processInfoDetailEO.setUserId(projectCertificationInventoryEO.getDutyPerson());
+				processInfoDetailEO.setEndTime(projectCertificationInventoryEO.getEndTime());
+				processInfoDetailEO.setProjectLawsInventoryId(projectCertificationInventoryEO.getId());
+				processInfoDetailEOList.add(processInfoDetailEO);
+			}
+			this.addProcessInfoDetailEO(processInfoDetailEOList,projectLibraryBase.getId(),CertificationFlowNodeEnum.ZRRTJRW.getKey());
+
+			// 更新数据状态为 审查退回
+			this.updateBatchById(projectCertificationInventoryEOList);
+
+			List<String> flowStatus = new ArrayList<>();
+			flowStatus.add(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue());
+
+			// 更新该项目认证流程中，认证工程师的任务状态。
+			// 如果还有 结果待审查 的数据，不做操作，如果没有 将这个项目认证流程的所有认证工程师待办任务转为已办 flowStatus
+			this.updateProcessInfoDetailStatus(projectLibraryBase,CertificationFlowNodeEnum.RZGCSSC.getKey(),flowStatus);
+
+			this.certificationInventoryEOListSortByEndTimeAsc(projectCertificationInventoryEOList);
+			this.sendMessageByTemplateId(
+					projectCertificationInventoryEOList,
+					TemplateInfoEnum2.CERTIFICATION_MESSAGE24.getValue(),
+					dutyPersonIdList,
+					dutyPersonList,
+					projectCertificationInventoryEOList.get(0).getEndTime(),
+					CertificationFlowNodeEnum.TASK_HANDLING.getKey()
+			);
+		}catch (Exception ex){
+			ex.printStackTrace();
+			log.error("认证工程师-审批退回失败：" + ex.getMessage());
+			throw new JeroBootException("审批退回失败！");
+		}
+
+		return Result.OK("审批退回成功！");
+	}
+
+	/**
+	 * 认证工程师审查通过
+	 * @param json
+	 * @return
+	 */
+	private Result<?> certificationReviewThrough(JSONObject json) {
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		String ids = json.getString("ids");
+		if(StringUtils.isEmpty(ids)){
+			throw new JeroBootException("至少选择一条数据进行操作！");
+		}
+		List<String> idList = Arrays.asList(ids.split(","));
+
+		List<String> flowStatusList = new ArrayList<>();
+		flowStatusList.add(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue());
+
+		QueryWrapper<ProjectCertificationInventoryEO> queryWrapper = new QueryWrapper<>();
+		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getId,idList);
+		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList);
+		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.list(queryWrapper);
+
+		if(CollectionUtils.isEmpty(projectCertificationInventoryEOList)){
+			throw new JeroBootException("至少选择一条数据流程状态为'结果待审查'的数据！");
+		}
+
+		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
+			projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue());
+			processHistoryEOService.add(projectCertificationInventoryEO.getId(),CertificationFlowNodeEnum.TASK_REVIEW.getKey(),currentUser.getId(),null,null,null);
+
+		}
+
+		this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_THROUGH.getValue());
+
+		ProjectLibraryBase projectLibraryBase = JSONObject.parseObject(JSONObject.toJSONString(json.get("projectLibraryBase")), ProjectLibraryBase.class);
+		List<String> dutyPersonIdList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList());
+		List<SysUser> dutyPersonList = this.sysUserService.querySysUserListByIdList(dutyPersonIdList);
+
+		// 获取当前项目下，认证清单，截止日期最早的一个，更新到流程明细表中，认证工程师审查任务节点的截止时间中
+		this.updateProcessInfoDetailEndTime(
+				flowStatusList,
+				CertificationFlowNodeEnum.RZGCSSC.getKey(),
+				projectLibraryBase,
+				"end_time",
+				idList
+		);
+		try {
+			// 更新数据状态为 审查通过
+			this.updateBatchById(projectCertificationInventoryEOList);
+
+			List<String> flowStatus = new ArrayList<>();
+			flowStatus.add(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue());
+
+			// 更新该项目认证流程中，认证工程师的任务状态。
+			// 如果还有 结果待审查 的数据，不做操作，如果没有 将这个项目认证流程的所有认证工程师待办任务转为已办 flowStatus
+			this.updateProcessInfoDetailStatus(projectLibraryBase,CertificationFlowNodeEnum.RZGCSSC.getKey(),flowStatus);
+
+			this.certificationInventoryEOListSortByEndTimeAsc(projectCertificationInventoryEOList);
+			this.sendMessageByTemplateId(
+					projectCertificationInventoryEOList,
+					TemplateInfoEnum2.CERTIFICATION_MESSAGE25.getValue(),
+					dutyPersonIdList,
+					dutyPersonList,
+					projectCertificationInventoryEOList.get(0).getEndTime(),""
+			);
+		}catch (Exception ex){
+			ex.printStackTrace();
+			log.error("认证工程师-审批通过失败：" + ex.getMessage());
+			throw new JeroBootException("审批通过失败！");
+		}
+
+
+		return Result.OK("审批通过成功！");
+	}
+
+	/**
+	 * 更新截止日期
+	 * @param flowStatusList
+	 * @param taskDefinitionKey
+	 * @param projectLibraryBase
+	 */
+	private void updateProcessInfoDetailEndTime(List<String> flowStatusList,
+												String taskDefinitionKey,
+												ProjectLibraryBase projectLibraryBase,
+												String orderByField,
+												List<String> excludeIdList) {
+		QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
+		pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId, projectLibraryBase.getId());
+		pciQueryWrap.lambda().in(ProjectCertificationInventoryEO::getFlowStatus, flowStatusList);
+		if(CollectionUtils.isNotEmpty(excludeIdList)){
+			pciQueryWrap.lambda().notIn(ProjectCertificationInventoryEO::getId, excludeIdList);
+		}
+		pciQueryWrap.orderByAsc(orderByField);
+		List<ProjectCertificationInventoryEO> pciEoList = this.list(pciQueryWrap);
+		if(CollectionUtils.isNotEmpty(pciEoList)){
+			Date endTime = null;
+			if(StringUtils.equals("inventory_verify_end_time",orderByField)){
+				endTime = pciEoList.get(0).getInventoryVerifyEndTime();
+			} else if(StringUtils.equals("end_time",orderByField)){
+				endTime = pciEoList.get(0).getEndTime();
+			}
+
+			QueryWrapper<ProcessInfoDetailEO> detailQueryWrapper = new QueryWrapper<>();
+			detailQueryWrapper.lambda().eq(ProcessInfoDetailEO::getProcessInfoId, projectLibraryBase.getId());
+			detailQueryWrapper.lambda().eq(ProcessInfoDetailEO::getTaskDefinitionKey,taskDefinitionKey);
+			List<ProcessInfoDetailEO> detailEOList = this.processInfoDetailEOService.list(detailQueryWrapper);
+			Date finalEndTime = endTime;
+			detailEOList.forEach(detailEO -> {
+				detailEO.setEndTime(finalEndTime);
+			});
+			this.processInfoDetailEOService.updateBatchById(detailEOList);
+		}
+	}
+
+	/**
+	 * 更新任务状态为已办
+	 * @param projectLibraryBase
+	 */
+	private void updateProcessInfoDetailStatus(ProjectLibraryBase projectLibraryBase,String taskDefinitionKey,List<String> flowStatusList) {
+
+		QueryWrapper<ProjectCertificationInventoryEO> queryCountWrap = new QueryWrapper<>();
+		queryCountWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId, projectLibraryBase.getId());
+		queryCountWrap.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList);
+		int notDoneCount = this.count(queryCountWrap);
+
+		if(notDoneCount == 0){
+			QueryWrapper<ProcessInfoDetailEO> detailQueryWrapper = new QueryWrapper<>();
+			detailQueryWrapper.lambda().eq(ProcessInfoDetailEO::getProcessInfoId, projectLibraryBase.getId());
+			detailQueryWrapper.lambda().eq(ProcessInfoDetailEO::getTaskDefinitionKey,taskDefinitionKey);
+			List<ProcessInfoDetailEO> detailEOList = this.processInfoDetailEOService.list(detailQueryWrapper);
+
+			for (ProcessInfoDetailEO processInfoDetailEO : detailEOList) {
+				processInfoDetailEO.setStatus(TaskStatusEnum.HAVE_DONE.getValue());
+			}
+
+			this.processInfoDetailEOService.updateBatchById(detailEOList);
+		}
+	}
+
+
+	/**
+	 * 责任人提交任务
+	 * @param json
+	 * @return
+	 */
+	private Result<?> dutyPersonSubmitTask(JSONObject json) {
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		String ids = json.getString("ids");
+		if(StringUtils.isEmpty(ids)){
+			throw new JeroBootException("至少选择一条数据进行操作！");
+		}
+		List<String> idList = Arrays.asList(ids.split(","));
+
+		List<String> flowStatusList = new ArrayList<>();
+		flowStatusList.add(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue());
+		flowStatusList.add(CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue());
+
+		QueryWrapper<ProjectCertificationInventoryEO> queryWrapper = new QueryWrapper<>();
+		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getId,idList);
+		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList);
+		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.list(queryWrapper);
+		this.disposeData(projectCertificationInventoryEOList,CutEnum.CN.getValue());
+
+		if(CollectionUtils.isEmpty(projectCertificationInventoryEOList)){
+			throw new JeroBootException("至少选择一条数据流程状态为'结果待提交 或 审查退回'的数据！");
+		}
+		this.certificationInventoryEOListSortByEndTimeAsc(projectCertificationInventoryEOList);
+
+		ProjectLibraryBase projectLibraryBase = JSONObject.parseObject(JSONObject.toJSONString(json.get("projectLibraryBase")), ProjectLibraryBase.class);
+
+		// 给认证工程师分配待办中心的任务
+		String certificationEngineer = projectLibraryBase.getCertificationEngineer();
+		if(StringUtils.isEmpty(certificationEngineer)){
+			throw new JeroBootException("该项目中认证工程师为空，请先维护认证工程师！");
+		}
+
+		// 根据项目库id查询当前项目认证清单数据，获取数据状态为 结果待审查的 截止时间 最早的一个时间
+		Date endTime = null;
+		QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
+		pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryBase.getId());
+		pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getFlowStatus,CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue());
+		pciQueryWrap.lambda().isNotNull(ProjectCertificationInventoryEO::getEndTime);
+		List<ProjectCertificationInventoryEO> pciEoList = this.list(pciQueryWrap);
+		if(CollectionUtils.isNotEmpty(pciEoList) || CollectionUtils.isNotEmpty(projectCertificationInventoryEOList)){
+			List<Date> endTimeList = new ArrayList<>();
+			// 本次提交之前数据库里面存在的截止时间
+			List<Date> oldEndTimeList = pciEoList.stream().map(ProjectCertificationInventoryEO::getEndTime).distinct().collect(Collectors.toList());
+			endTimeList.addAll(oldEndTimeList);
+			// 当前要提交的数据截止时间
+			List<Date> newEndTimeList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getEndTime).distinct().collect(Collectors.toList());
+			endTimeList.addAll(newEndTimeList);
+
+			endTimeList = endTimeList.stream().distinct().collect(Collectors.toList());
+			Collections.sort(endTimeList, (d1, d2) -> d1.compareTo(d2)); // 根据时间顺序排序
+			endTime = endTimeList.get(0);
+		}
+
+		List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
+		List<String> certificationEngineerList = Arrays.asList(certificationEngineer.split(","));
+		// 给认证工程师分配任务
+		for (String userId : certificationEngineerList) {
+			ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
+			processInfoDetailEO.setUserId(userId);
+			processInfoDetailEO.setTaskDefinitionKey(CertificationFlowNodeEnum.RZGCSSC.getKey());
+			processInfoDetailEO.setCreateTime(new Date());
+			processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue());
+			processInfoDetailEO.setProcessInfoId(projectLibraryBase.getId());
+			processInfoDetailEO.setActiProcInstId(projectLibraryBase.getId());
+			processInfoDetailEO.setFlowType(FlowTypeEnum.CERTIFICATION_LC.getValue());
+			processInfoDetailEO.setEndTime(endTime);
+			processInfoDetailEOList.add(processInfoDetailEO);
+		}
+		// 数据更新为结果待审查
+		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
+			projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue());
+			processHistoryEOService.add(projectCertificationInventoryEO.getId(),CertificationFlowNodeEnum.TASK_HANDLING.getKey(),currentUser.getId(),null,null,projectCertificationInventoryEO.getDeliveryResult());
+
+		}
+
+		this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_SUBMIT_TASK.getValue());
+
+		List<SysUser> certificationEngineers = this.sysUserService.querySysUserListByIdList(certificationEngineerList);
+
+		try {
+			this.updateBatchById(projectCertificationInventoryEOList);
+
+			List<String> certificationIdList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getId).distinct().collect(Collectors.toList());
+
+			// 将当前责任人的待办任务转为已办
+			LambdaUpdateWrapper<ProcessInfoDetailEO> detailUpdateWrap = new LambdaUpdateWrapper<>();
+			detailUpdateWrap.eq(ProcessInfoDetailEO::getProcessInfoId,projectLibraryBase.getId());
+			detailUpdateWrap.eq(ProcessInfoDetailEO::getUserId,currentUser.getId());
+			detailUpdateWrap.eq(ProcessInfoDetailEO::getTaskDefinitionKey,CertificationFlowNodeEnum.ZRRTJRW.getKey());
+			detailUpdateWrap.in(ProcessInfoDetailEO::getProjectLawsInventoryId,certificationIdList);
+			detailUpdateWrap.set(ProcessInfoDetailEO::getStatus,TaskStatusEnum.HAVE_DONE.getValue());
+			detailUpdateWrap.set(ProcessInfoDetailEO::getUpdateTime,new Date());
+			detailUpdateWrap.set(ProcessInfoDetailEO::getUpdateBy,currentUser.getUsername());
+			this.processInfoDetailEOService.update(detailUpdateWrap);
+
+			// 给认证工程师分配待办中心的任务  认证工程师审查
+			this.addProcessInfoDetailEO(processInfoDetailEOList,projectLibraryBase.getId(),CertificationFlowNodeEnum.RZGCSSC.getKey());
+			this.sendMessageByTemplateId(
+					projectCertificationInventoryEOList,
+					TemplateInfoEnum2.CERTIFICATION_MESSAGE23.getValue(),
+					certificationEngineerList,
+					certificationEngineers,
+					endTime,
+					CertificationFlowNodeEnum.TASK_REVIEW.getKey()
+			);
+		}catch (Exception ex){
+			ex.printStackTrace();
+			log.error("责任人-提交任务失败：" + ex.getMessage());
+			throw new JeroBootException("提交任务失败！");
+		}
+
+		return Result.OK("提交任务成功！");
+	}
+
+	/**
+	 * 责任人接受任务
+	 * @param json
+	 * @return
+	 */
+	private Result<?> dutyPersonAcceptTask(JSONObject json) {
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		String ids = json.getString("ids");
+		if(StringUtils.isEmpty(ids)){
+			throw new JeroBootException("至少选择一条数据进行操作！");
+		}
+		List<String> idList = Arrays.asList(ids.split(","));
+
+		List<String> flowStatusList = new ArrayList<>();
+		flowStatusList.add(CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue());
+
+		QueryWrapper<ProjectCertificationInventoryEO> queryWrapper = new QueryWrapper<>();
+		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getId,idList);
+		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList);
+		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.list(queryWrapper);
+
+		if(CollectionUtils.isEmpty(projectCertificationInventoryEOList)){
+			throw new JeroBootException("至少选择一条数据流程状态为'任务待确认'的数据！");
+		}
+
+		ProjectLibraryBase projectLibraryBase = JSONObject.parseObject(JSONObject.toJSONString(json.get("projectLibraryBase")), ProjectLibraryBase.class);
+		String certificationEngineer = projectLibraryBase.getCertificationEngineer();
+		if(StringUtils.isEmpty(certificationEngineer)){
+			throw new JeroBootException("该项目中认证工程师为空，请先维护认证工程师！");
+		}
+
+		List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
+		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
+			projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue());
+
+			ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
+			processInfoDetailEO.setUserId(projectCertificationInventoryEO.getDutyPerson());
+			processInfoDetailEO.setEndTime(projectCertificationInventoryEO.getEndTime());
+			processInfoDetailEO.setProjectLawsInventoryId(projectCertificationInventoryEO.getId());
+			processInfoDetailEOList.add(processInfoDetailEO);
+			processHistoryEOService.add(projectCertificationInventoryEO.getId(),CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey(),currentUser.getId(),ReviewResultEnum.ACCEPTED.getValue(),null,null);
+
+		}
+
+		this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_ACCEPT_TASK.getValue());
+
+		String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+		String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+
+		// 获取认证清单 - 飞书跳转链接
+		Map<String, Object> hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN);
+		String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN");
+		String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN");
+		String hrefFeishu_CN_P = this.handlePhoneLink(projectLibraryBase.getId(),PRN_CN,CertificationFlowNodeEnum.TASK_HANDLING.getKey());
+
+		Map<String, Object> standNameAndItemName = this.platformProjectCertificationInventoryEOService.getStandNameAndItemName(projectCertificationInventoryEOList);
+		String standName = (String) standNameAndItemName.get("standName");
+		String itemName = (String) standNameAndItemName.get("itemName");
+
+		try {
+			List<String> certificationIdList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getId).distinct().collect(Collectors.toList());
+			// 将当前责任人的待办任务转为已办
+			LambdaUpdateWrapper<ProcessInfoDetailEO> detailUpdateWrap = new LambdaUpdateWrapper<>();
+			detailUpdateWrap.eq(ProcessInfoDetailEO::getProcessInfoId,projectLibraryBase.getId());
+			detailUpdateWrap.eq(ProcessInfoDetailEO::getUserId,currentUser.getId());
+			detailUpdateWrap.eq(ProcessInfoDetailEO::getTaskDefinitionKey,CertificationFlowNodeEnum.ZRRJSRW.getKey());
+			detailUpdateWrap.in(ProcessInfoDetailEO::getProjectLawsInventoryId,certificationIdList);
+			detailUpdateWrap.set(ProcessInfoDetailEO::getStatus,TaskStatusEnum.HAVE_DONE.getValue());
+			detailUpdateWrap.set(ProcessInfoDetailEO::getUpdateTime,new Date());
+			detailUpdateWrap.set(ProcessInfoDetailEO::getUpdateBy,currentUser.getUsername());
+			this.processInfoDetailEOService.update(detailUpdateWrap);
+
+			// 给责任人分配待办中心的任务 (待提交)
+			this.addProcessInfoDetailEO(processInfoDetailEOList,projectLibraryBase.getId(),CertificationFlowNodeEnum.ZRRTJRW.getKey());
+
+			// 责任人接受任务，将数据的状态更新为 结果待提交。
+			this.updateBatchById(projectCertificationInventoryEOList);
+
+
+			List<String> certificationEngineerList = Arrays.asList(certificationEngineer.split(","));
+			List<SysUser> certificationEngineers = this.sysUserService.querySysUserListByIdList(certificationEngineerList);
+			try {
+				for (String userId : certificationEngineerList) {
+					String thirdId = this.sysUserService.getUserThirdIdByUserId(certificationEngineers,userId);
+
+					if(StringUtils.isNotEmpty(thirdId)){
+						// 根据结束时间进行排序，获取最近的时间，发消息时使用。
+						this.certificationInventoryEOListSortByEndTimeAsc(projectCertificationInventoryEOList);
+						Date endTime = projectCertificationInventoryEOList.get(0).getEndTime();
+
+						JSONObject larkMesJson = new JSONObject();
+						larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE12.getValue());
+						larkMesJson.put("userIds",thirdId);
+
+						Map<String,Object> templateVariableMap = new HashMap<>();
+						templateVariableMap.put("projectNameCn",PRN_CN);
+						templateVariableMap.put("projectNameEn",PRN_EN);
+						templateVariableMap.put("standName",standName);
+						templateVariableMap.put("itemName",itemName);
+						templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName());
+						templateVariableMap.put("endTime",DateUtils.formatDate(endTime));
+						templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
+						templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
+						templateVariableMap.put("viewBtnUrlCnPhone",hrefFeishu_CN_P);
+						templateVariableMap.put("operateUserName",currentUser.getUsername());
+
+
+						larkMesJson.put("templateVariableMap",templateVariableMap);
+						this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson);
+					}
+				}
+			} catch (Exception e) {
+				log.error("飞书消息推送失败");
+			}
+		}catch (Exception ex){
+			ex.printStackTrace();
+			log.error("责任人-接受任务失败：" + ex.getMessage());
+			throw new JeroBootException("接受任务失败！");
+		}
+
+		return Result.OK("接受任务成功！");
+	}
+
+	/**
+	 * 责任人拒绝任务
+	 * @param json
+	 * @return
+	 */
+	private Result<?> dutyPersonRejectTask(JSONObject json) {
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		String ids = json.getString("ids");
+		if(StringUtils.isEmpty(ids)){
+			throw new JeroBootException("至少选择一条数据进行操作！");
+		}
+		String reasonForReturn = json.getString("reasonForReturn");
+
+		List<String> idList = Arrays.asList(ids.split(","));
+
+		List<String> flowStatusList = new ArrayList<>();
+		flowStatusList.add(CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue());
+
+		QueryWrapper<ProjectCertificationInventoryEO> queryWrapper = new QueryWrapper<>();
+		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getId,idList);
+		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList);
+		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.list(queryWrapper);
+
+		if(CollectionUtils.isEmpty(projectCertificationInventoryEOList)){
+			throw new JeroBootException("至少选择一条数据流程状态为'任务待确认'的数据！");
+		}
+
+		ProjectLibraryBase projectLibraryBase = JSONObject.parseObject(JSONObject.toJSONString(json.get("projectLibraryBase")), ProjectLibraryBase.class);
+
+		// 给认证工程师分配待办中心的任务
+		String certificationEngineer = projectLibraryBase.getCertificationEngineer();
+		if(StringUtils.isEmpty(certificationEngineer)){
+			throw new JeroBootException("该项目中认证工程师为空，请先维护认证工程师！");
+		}
+
+		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
+			projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue());
+			projectCertificationInventoryEO.setReasonForReturn(reasonForReturn);
+			processHistoryEOService.add(projectCertificationInventoryEO.getId(),CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey(),currentUser.getId(),ReviewResultEnum.REJECTED.getValue(),reasonForReturn,null);
+
+		}
+
+		this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_REJECT_TASK.getValue());
+
+		String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+		String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+
+		// 获取认证清单 - 飞书跳转链接
+		Map<String, Object> hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN);
+		String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN");
+		String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN");
+		String hrefFeishu_CN_P = (String) hrefFeishuMap.get("hrefFeishu_CN_P");
+
+		Map<String, Object> standNameAndItemName = this.platformProjectCertificationInventoryEOService.getStandNameAndItemName(projectCertificationInventoryEOList);
+		String standName = (String) standNameAndItemName.get("standName");
+		String itemName = (String) standNameAndItemName.get("itemName");
+
+		try {
+			List<String> certificationIdList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getId).distinct().collect(Collectors.toList());
+			// 将当前责任人的待办任务转为已办
+			LambdaUpdateWrapper<ProcessInfoDetailEO> detailUpdateWrap = new LambdaUpdateWrapper<>();
+			detailUpdateWrap.eq(ProcessInfoDetailEO::getProcessInfoId,projectLibraryBase.getId());
+			detailUpdateWrap.eq(ProcessInfoDetailEO::getUserId,currentUser.getId());
+			detailUpdateWrap.eq(ProcessInfoDetailEO::getTaskDefinitionKey,CertificationFlowNodeEnum.ZRRJSRW.getKey());
+			detailUpdateWrap.in(ProcessInfoDetailEO::getProjectLawsInventoryId,certificationIdList);
+			detailUpdateWrap.set(ProcessInfoDetailEO::getStatus,TaskStatusEnum.HAVE_DONE.getValue());
+			detailUpdateWrap.set(ProcessInfoDetailEO::getUpdateTime,new Date());
+			detailUpdateWrap.set(ProcessInfoDetailEO::getUpdateBy,currentUser.getUsername());
+			this.processInfoDetailEOService.update(detailUpdateWrap);
+
+			this.certificationInventoryEOListSortByInventoryVerifyEndTimeAsc(projectCertificationInventoryEOList);
+
+			List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
+			List<String> certificationEngineerList = Arrays.asList(certificationEngineer.split(","));
+			// 给认证工程师分配任务
+			for (String userId : certificationEngineerList) {
+				ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
+				processInfoDetailEO.setUserId(userId);
+				processInfoDetailEO.setTaskDefinitionKey(CertificationFlowNodeEnum.RZGCSJSRW.getKey());
+				processInfoDetailEO.setCreateTime(new Date());
+				processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue());
+				processInfoDetailEO.setProcessInfoId(projectLibraryBase.getId());
+				processInfoDetailEO.setActiProcInstId(projectLibraryBase.getId());
+				processInfoDetailEO.setFlowType(FlowTypeEnum.CERTIFICATION_LC.getValue());
+				processInfoDetailEO.setEndTime(projectCertificationInventoryEOList.get(0).getInventoryVerifyEndTime());
+				processInfoDetailEOList.add(processInfoDetailEO);
+			}
+
+			// 删除该项目数据的待办任务，key为 认证工程师接受任务的数据
+			QueryWrapper<ProcessInfoDetailEO> deleteDetailWrap = new QueryWrapper<>();
+			deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getProcessInfoId,projectLibraryBase.getId());
+			deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getTaskDefinitionKey,CertificationFlowNodeEnum.RZGCSJSRW.getKey());
+			deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.CERTIFICATION_LC.getValue());
+			this.processInfoDetailEOService.remove(deleteDetailWrap);
+			this.processInfoDetailEOService.saveBatch(processInfoDetailEOList);
+
+			// 责任人接受任务，将数据的状态更新为 结果待提交。
+			this.updateBatchById(projectCertificationInventoryEOList);
+
+			List<SysUser> certificationEngineers = this.sysUserService.querySysUserListByIdList(certificationEngineerList);
+			try {
+				for (String userId : certificationEngineerList) {
+					String thirdId = this.sysUserService.getUserThirdIdByUserId(certificationEngineers,userId);
+
+					if(StringUtils.isNotEmpty(thirdId)){
+						// 根据结束时间进行排序，获取最近的时间，发消息时使用。
+//						this.certificationInventoryEOListSortByEndTimeAsc(projectCertificationInventoryEOList);
+						Date endTime = projectCertificationInventoryEOList.get(0).getInventoryVerifyEndTime();
+
+						JSONObject larkMesJson = new JSONObject();
+						larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE11.getValue());
+						larkMesJson.put("userIds",thirdId);
+
+						Map<String,Object> templateVariableMap = new HashMap<>();
+						templateVariableMap.put("projectNameCn",PRN_CN);
+						templateVariableMap.put("projectNameEn",PRN_EN);
+						templateVariableMap.put("standName",standName);
+						templateVariableMap.put("itemName",itemName);
+						templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName());
+						templateVariableMap.put("endTime",DateUtils.formatDate(endTime));
+						templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
+						templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
+						templateVariableMap.put("viewBtnUrlCnPhone",hrefFeishu_CN_P);
+
+						templateVariableMap.put("operateUserName",currentUser.getUsername());
+
+						larkMesJson.put("templateVariableMap",templateVariableMap);
+						this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson);
+					}
+				}
+			} catch (Exception e) {
+				log.error("飞书消息推送失败");
+			}
+		}catch (Exception ex){
+			ex.printStackTrace();
+			log.error("责任人-拒绝任务失败：" + ex.getMessage());
+			throw new JeroBootException("拒绝任务失败！");
+		}
+		return Result.OK("拒绝任务成功！");
+	}
+
+	/**
+	 * 认证工程师退回至studio任务
+	 * @param json
+	 * @return
+	 */
+	private Result<?> certificationReturnedStudioTask(JSONObject json) {
+		String ids = json.getString("ids");
+		if(StringUtils.isEmpty(ids)){
+			throw new JeroBootException("至少选择一条数据进行操作！");
+		}
+		String reasonForReturn = json.getString("reasonForReturn");
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		List<String> idList = Arrays.asList(ids.split(","));
+		List<String> flowStatusList = new ArrayList<>();
+		flowStatusList.add(CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
+		flowStatusList.add(CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue());
+
+		QueryWrapper<ProjectCertificationInventoryEO> queryWrapper = new QueryWrapper<>();
+		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getId,idList);
+		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList);
+		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.list(queryWrapper);
+
+		if(CollectionUtils.isEmpty(projectCertificationInventoryEOList)){
+			throw new JeroBootException("至少选择一条数据流程状态为'清单待校核 或 责任人拒绝的数据'！");
+		}
+
+		ProjectLibraryBase projectLibraryBase = JSONObject.parseObject(JSONObject.toJSONString(json.get("projectLibraryBase")), ProjectLibraryBase.class);
+		if (StringUtils.isEmpty(projectLibraryBase.getStudioEngineer())) {
+			throw new JeroBootException("该项目的studio为空，请维护studio后再进行退回操作！");
+		}
+
+		List<SysUser> studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(Arrays.asList(projectLibraryBase.getStudioEngineer().split(",")));
+
+		String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+		String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+
+		// 获取认证清单 - 飞书跳转链接
+		Map<String, Object> hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN);
+		String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN");
+		String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN");
+		String hrefFeishu_CN_P = (String) hrefFeishuMap.get("hrefFeishu_CN_P");
+
+		// 给studio分配待办中心任务
+		/*List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
+		ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
+		processInfoDetailEO.setUserId(projectLibraryBase.getStudioEngineer());
+		processInfoDetailEOList.add(processInfoDetailEO);
+		this.addProcessInfoDetailEO(processInfoDetailEOList,projectLibraryBase.getId(),CertificationFlowNodeEnum.STUDIOFQ.getKey());*/
+
+		// 根据结束时间进行排序，获取最近的时间，发消息时使用。
+		Collections.sort(projectCertificationInventoryEOList, new Comparator<ProjectCertificationInventoryEO>() {
+			@Override
+			public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) {
+				if(p1.getEndTime() != null && p2.getEndTime() != null){
+					return p1.getEndTime().compareTo(p2.getEndTime());
+				}
+				return 1;
+			}
+		});
+
+		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
+			projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue());
+		}
+
+		for (ProjectCertificationInventoryEO pciEo : projectCertificationInventoryEOList) {
+			pciEo.setReasonForReturn(reasonForReturn);
+			processHistoryEOService.add(pciEo.getId(),CertificationFlowNodeEnum.CHECKLIST_VERIFICATION.getKey(),currentUser.getId(),ReviewResultEnum.RETURNED.getValue(),reasonForReturn,null);
+
+		}
+		this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_RETURNED_STUDIO_TASK.getValue());
+
+		Map<String, Object> standNameAndItemName = this.getStandNameAndItemName(projectCertificationInventoryEOList);
+		String standName = (String) standNameAndItemName.get("standName");
+		String itemName = (String) standNameAndItemName.get("itemName");
+
+		try {
+			// 认证工程师退回任务到studio，将数据的状态更新为 认证退回
+			this.updateBatchById(projectCertificationInventoryEOList);
+
+			// 更新该项目认证流程中，认证工程师的任务状态。
+			// 如果还有 清单待校核、责任人拒绝 状态的数据，不做操作，如果没有 将这个项目认证流程的所有认证工程师待办任务转为已办
+			this.updateProcessInfoDetailStatus(projectLibraryBase,CertificationFlowNodeEnum.RZGCSJSRW.getKey(),flowStatusList);
+
+			try {
+				String thirdId = this.sysUserService.getUserThirdIdByUserId(studioEngineerUserInfo,projectLibraryBase.getStudioEngineer());
+
+				if(StringUtils.isNotEmpty(thirdId)){
+					// 根据结束时间进行排序，获取最近的时间，发消息时使用。
+					/*Collections.sort(projectCertificationInventoryEOList, new Comparator<ProjectCertificationInventoryEO>() {
+						@Override
+						public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) {
+							if(p1.getEndTime() != null && p2.getEndTime() != null){
+								return p1.getEndTime().compareTo(p2.getEndTime());
+							}
+							return 1;
+						}
+					});
+					Date endTime = projectCertificationInventoryEOList.get(0).getEndTime();*/
+					this.certificationInventoryEOListSortByInventoryVerifyEndTimeAsc(projectCertificationInventoryEOList);
+					Date endTime = projectCertificationInventoryEOList.get(0).getInventoryVerifyEndTime();
+
+					JSONObject larkMesJson = new JSONObject();
+					larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE3.getValue());
+					larkMesJson.put("userIds",thirdId);
+
+					Map<String,Object> templateVariableMap = new HashMap<>();
+					templateVariableMap.put("projectNameCn",PRN_CN);
+					templateVariableMap.put("projectNameEn",PRN_EN);
+					templateVariableMap.put("standName",standName);
+					templateVariableMap.put("itemName",itemName);
+					templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName());
+					templateVariableMap.put("endTime",DateUtils.formatDate(endTime));
+					templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
+					templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
+					templateVariableMap.put("viewBtnUrlCnPhone",hrefFeishu_CN_P);
+
+					templateVariableMap.put("certificationEngineer",currentUser.getUsername());
+
+					larkMesJson.put("templateVariableMap",templateVariableMap);
+					this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson);
+				}
+			} catch (Exception e) {
+				log.error("飞书消息推送失败");
+			}
+		}catch (Exception ex){
+			ex.printStackTrace();
+			log.error("认证工程师-退回认证清单任务失败：" + ex.getMessage());
+			throw new JeroBootException("退回任务失败！");
+		}
+
+		return Result.OK("退回任务成功！");
+	}
+
+	/**
+	 * 认证工程师发起任务
+	 * @param json
+	 * @return
+	 */
+	@Override
+	public Result<?> certificationInitiatingTask(JSONObject json) {
+		String ids = json.getString("ids");
+		if(StringUtils.isEmpty(ids)){
+			throw new JeroBootException("至少选择一条数据进行操作！");
+		}
+		String taskConfirmEndTimeStr = json.getString("taskConfirmEndTime");
+		Date taskConfirmEndTime = DateUtils.str2Date(taskConfirmEndTimeStr, DateUtils.date_sdf.get());
+
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		List<String> idList = Arrays.asList(ids.split(","));
+		List<String> flowStatusList = new ArrayList<>();
+		flowStatusList.add(CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
+		flowStatusList.add(CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue());
+
+		QueryWrapper<ProjectCertificationInventoryEO> queryWrapper = new QueryWrapper<>();
+		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getId,idList);
+		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList);
+		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.list(queryWrapper);
+
+		if(CollectionUtils.isEmpty(projectCertificationInventoryEOList)){
+			throw new JeroBootException("至少选择一条数据流程状态为'清单待校核 或 责任人拒绝的数据'！");
+		}
+
+		ProjectLibraryBase projectLibraryBase = JSONObject.parseObject(JSONObject.toJSONString(json.get("projectLibraryBase")), ProjectLibraryBase.class);
+		if (ObjectUtils.isEmpty(projectLibraryBase)) {
+			throw new JeroBootException("无法获取项目库信息");
+		}
+
+		String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+		String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+
+		// 获取认证清单 - 飞书跳转链接
+		Map<String, Object> hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN);
+		String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN");
+		String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN");
+		//飞书手机跳转链接
+		String hrefFeishu_CN_P = this.handlePhoneLink(projectLibraryBase.getId(),PRN_CN,CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey());
+
+		Map<String, List<ProjectCertificationInventoryEO>> certifycationInventoryListByDutyPersonMap = projectCertificationInventoryEOList.stream().collect(Collectors.groupingBy(ProjectCertificationInventoryEO::getDutyPerson));
+		try {
+			// 给责任人分配待办中心的任务
+			List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
+			for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
+				projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue());
+				projectCertificationInventoryEO.setTaskConfirmEndTime(taskConfirmEndTime);
+
+				ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
+				processInfoDetailEO.setUserId(projectCertificationInventoryEO.getDutyPerson());
+				processInfoDetailEO.setEndTime(taskConfirmEndTime);
+				processInfoDetailEO.setProjectLawsInventoryId(projectCertificationInventoryEO.getId());
+				processInfoDetailEOList.add(processInfoDetailEO);
+
+				processHistoryEOService.add(projectCertificationInventoryEO.getId(),CertificationFlowNodeEnum.CHECKLIST_VERIFICATION.getKey(),currentUser.getId(),null,null,null);
+
+			}
+
+			this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_INITIATING_TASK.getValue());
+
+			this.addProcessInfoDetailEO(processInfoDetailEOList,projectLibraryBase.getId(),CertificationFlowNodeEnum.ZRRJSRW.getKey());
+
+			// 认证工程师发起任务，将数据的状态更新为 任务待确认。
+			this.updateBatchById(projectCertificationInventoryEOList);
+
+			// 获取当前项目下，认证清单，清单校核截止日期最早的一个，更新到流程明细表中，认证工程师接受任务节点的截止时间中
+			this.updateProcessInfoDetailEndTime(
+					flowStatusList,
+					CertificationFlowNodeEnum.RZGCSJSRW.getKey(),
+					projectLibraryBase,
+					"inventory_verify_end_time",
+					idList
+			);
+
+			// 更新该项目认证流程中，认证工程师的任务状态。
+			// 如果还有 清单待校核、责任人拒绝 状态的数据，不做操作，如果没有 将这个项目认证流程的所有认证工程师待办任务转为已办
+			this.updateProcessInfoDetailStatus(projectLibraryBase,CertificationFlowNodeEnum.RZGCSJSRW.getKey(),flowStatusList);
+
+			List<String> dutyPersonIdList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList());
+			List<SysUser> dutyPersonList = this.sysUserService.querySysUserListByIdList(dutyPersonIdList);
+
+			for (Map.Entry<String, List<ProjectCertificationInventoryEO>> dataByDutyPersonMap : certifycationInventoryListByDutyPersonMap.entrySet()) {
+				String dutyPersonUserId = dataByDutyPersonMap.getKey();
+				List<ProjectCertificationInventoryEO> dutyPersonDataList = dataByDutyPersonMap.getValue();
+				if(CollectionUtils.isEmpty(dutyPersonDataList)){
+					continue;
+				}
+
+				Map<String, Object> standNameAndItemName = this.platformProjectCertificationInventoryEOService.getStandNameAndItemName(dutyPersonDataList);
+				String standName = (String) standNameAndItemName.get("standName");
+				String itemName = (String) standNameAndItemName.get("itemName");
+				try {
+					String thirdId = this.sysUserService.getUserThirdIdByUserId(dutyPersonList,dutyPersonUserId);
+
+					if(StringUtils.isNotEmpty(thirdId)){
+						// 根据结束时间进行排序，获取最近的时间，发消息时使用。
+//						this.certificationInventoryEOListSortByEndTimeAsc(projectCertificationInventoryEOList);
+//						Date endTime = projectCertificationInventoryEOList.get(0).getEndTime();
+
+						JSONObject larkMesJson = new JSONObject();
+						larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE10.getValue());
+						larkMesJson.put("userIds",thirdId);
+
+						Map<String,Object> templateVariableMap = new HashMap<>();
+						templateVariableMap.put("projectNameCn",PRN_CN);
+						templateVariableMap.put("projectNameEn",PRN_EN);
+						templateVariableMap.put("standName",standName);
+						templateVariableMap.put("itemName",itemName);
+						templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName());
+						templateVariableMap.put("endTime",DateUtils.formatDate(taskConfirmEndTime));
+						templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
+						templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
+						templateVariableMap.put("viewBtnUrlCnPhone",hrefFeishu_CN_P);
+
+						templateVariableMap.put("certificationEngineer",currentUser.getUsername());
+
+						larkMesJson.put("templateVariableMap",templateVariableMap);
+						this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson);
+					}
+				} catch (Exception e) {
+					log.error("飞书消息推送失败");
+				}
+			}
+
+		}catch (Exception ex){
+			ex.printStackTrace();
+			log.error("认证工程师-发起认证清单任务失败：" + ex.getMessage());
+			throw new JeroBootException("发起任务失败！");
+		}
+
+		return Result.OK("发起任务成功！");
+	}
+
+	@Override
+	public String handlePhoneLink(String id, String prn_cn, String key) {
+		String hrefFeishu_CN_P = backUrlPhone
+				+ JumpLinkEnum.PRE_TASK_HANDING_PHONE.getLink() + "?isDisplay=false&projectLibraryId=" + id
+				+ "&projectName=" + prn_cn + "&taskDefinitionKey=" + key + "&TaskKeyName="+CertificationFlowNodeEnum.getTextByValue(key, CutEnum.CN.getValue());
+		;
+		return URLUtil.encode(hrefFeishu_CN_P);
+	}
+
+	/**
+	 * 认证清单数据排序，根据截至时间顺序排序
+	 * @param projectCertificationInventoryEOList
+	 */
+	@Override
+	public void certificationInventoryEOListSortByEndTimeAsc(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList) {
+		Collections.sort(projectCertificationInventoryEOList, new Comparator<ProjectCertificationInventoryEO>() {
+			@Override
+			public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) {
+				if(p1.getEndTime() != null && p2.getEndTime() != null){
+					return p1.getEndTime().compareTo(p2.getEndTime());
+				}
+				return 1;
+			}
+		});
+	}
+
+	/**
+	 * 认证清单数据排序，根据清单校核截至时间顺序排序
+	 * @param pciEoList
+	 */
+	@Override
+	public void certificationInventoryEOListSortByInventoryVerifyEndTimeAsc(List<ProjectCertificationInventoryEO> pciEoList) {
+		Collections.sort(pciEoList, new Comparator<ProjectCertificationInventoryEO>() {
+			@Override
+			public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) {
+				if(p1.getInventoryVerifyEndTime() != null && p2.getInventoryVerifyEndTime() != null){
+					return p1.getInventoryVerifyEndTime().compareTo(p2.getInventoryVerifyEndTime());
+				}
+				return 1;
+			}
+		});
+	}
+	/**
+	 * 认证清单数据排序，根据任务确认截至时间顺序排序
+	 * @param pciEoList
+	 */
+	@Override
+	public void certificationInventoryEOListSortByTaskConfirmEndTimeAsc(List<ProjectCertificationInventoryEO> pciEoList) {
+		Collections.sort(pciEoList, new Comparator<ProjectCertificationInventoryEO>() {
+			@Override
+			public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) {
+				if(p1.getTaskConfirmEndTime() != null && p2.getTaskConfirmEndTime() != null){
+					return p1.getTaskConfirmEndTime().compareTo(p2.getTaskConfirmEndTime());
+				}
+				return 1;
+			}
+		});
+	}
+
+	@Override
+	public List<Map<String, Object>> getTaskToConfirmStatistics(List<ProjectCertificationInventoryEO> pciEoList) {
+		List<Map<String,Object>> result = new ArrayList<>();
+
+		int notStartedCount = 0;
+		int toConfirmCount = 0;
+		int acceptedCount = 0;
+		int rejectedCount = 0;
+		if(CollectionUtils.isNotEmpty(pciEoList)){
+			// 未发起
+			notStartedCount = (int) pciEoList.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
+								|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue())
+								|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
+				);
+				return flag;
+			}).count();
+			// 待确认
+			toConfirmCount = (int) pciEoList.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+				);
+				return flag;
+			}).count();
+			// 接受
+			acceptedCount = (int) pciEoList.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+								|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
+								|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue())
+								|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())
+				);
+				return flag;
+			}).count();
+			// 拒绝
+			rejectedCount = (int) pciEoList.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue())
+				);
+				return flag;
+			}).count();
+		}
+		Map<String,Object> notStartedMap = new HashMap<>();
+		Map<String,Object> toConfirmMap = new HashMap<>();
+		Map<String,Object> acceptedMap = new HashMap<>();
+		Map<String,Object> rejectedMap = new HashMap<>();
+
+		notStartedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue());
+		notStartedMap.put("taskAffirmStatusCount",notStartedCount);
+
+		toConfirmMap.put("taskAffirmStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue());
+		toConfirmMap.put("taskAffirmStatusCount",toConfirmCount);
+
+		acceptedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.ACCEPTED.getValue());
+		acceptedMap.put("taskAffirmStatusCount",acceptedCount);
+
+		rejectedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.REJECTED.getValue());
+		rejectedMap.put("taskAffirmStatusCount",rejectedCount);
+
+		result.add(notStartedMap);
+		result.add(toConfirmMap);
+		result.add(acceptedMap);
+		result.add(rejectedMap);
+		return result;
+	}
+
+	@Override
+	public List<Map<String, Object>> getPrehomoStatistice(List<ProjectCertificationInventoryEO> pciEoList) {
+		List<Map<String,Object>> result = new ArrayList<>();
+
+		int notStartedCount = 0;
+		int toConfirmCount = 0;
+		int acceptedCount = 0;
+		int rejectedCount = 0;
+		if(CollectionUtils.isNotEmpty(pciEoList)){
+			// 未发起
+			notStartedCount = (int) pciEoList.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
+								|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue())
+								|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
+								|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+								|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue())
+				);
+				return flag;
+			}).count();
+			// 待确认
+			toConfirmCount = (int) pciEoList.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+								|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
+				);
+				return flag;
+			}).count();
+			// 审查通过
+			acceptedCount = (int) pciEoList.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue())
+				);
+				return flag;
+			}).count();
+			// 审查退回
+			rejectedCount = (int) pciEoList.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())
+				);
+				return flag;
+			}).count();
+		}
+		Map<String,Object> notStartedMap = new HashMap<>();
+		Map<String,Object> toConfirmMap = new HashMap<>();
+		Map<String,Object> acceptedMap = new HashMap<>();
+		Map<String,Object> rejectedMap = new HashMap<>();
+
+		notStartedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue());
+		notStartedMap.put("taskAffirmStatusCount",notStartedCount);
+
+		toConfirmMap.put("taskAffirmStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue());
+		toConfirmMap.put("taskAffirmStatusCount",toConfirmCount);
+
+		acceptedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue());
+		acceptedMap.put("taskAffirmStatusCount",acceptedCount);
+
+		rejectedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue());
+		rejectedMap.put("taskAffirmStatusCount",rejectedCount);
+
+		result.add(notStartedMap);
+		result.add(toConfirmMap);
+		result.add(acceptedMap);
+		result.add(rejectedMap);
+		return result;
+	}
+
+	@Override
+	public List<Map<String, Object>> getAllCertificationProgressStatistics(List<ProjectCertificationInventoryEO> pciEoList) {
+		List<Map<String,Object>> result = new ArrayList<>();
+
+		int notStartedCount = 0;
+		int inProgressCount = 0;
+		int testPassedCount = 0;
+		int testFailedCount = 0;
+		if(CollectionUtils.isNotEmpty(pciEoList)){
+			// 未开始
+			notStartedCount = (int) pciEoList.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getCertificationProgress(),CertificationProgressEnum.NOT_START.getValue())
+				);
+				return flag;
+			}).count();
+			// 进行中
+			inProgressCount = (int) pciEoList.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getCertificationProgress(),CertificationProgressEnum.IN_PROGRESS.getValue())
+								|| StringUtils.equals(pciEo.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue())
+				);
+				return flag;
+			}).count();
+			// 实验通过
+			testPassedCount = (int) pciEoList.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getCertificationProgress(),CertificationProgressEnum.TEST_PASSED.getValue())
+								|| StringUtils.equals(pciEo.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue())
+								|| StringUtils.equals(pciEo.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue())
+				);
+				return flag;
+			}).count();
+			// 实验失败
+			testFailedCount = (int) pciEoList.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getCertificationProgress(),CertificationProgressEnum.TEST_FAILED.getValue())
+				);
+				return flag;
+			}).count();
+		}
+		Map<String,Object> notStartedMap = new HashMap<>();
+		Map<String,Object> inProgressMap = new HashMap<>();
+		Map<String,Object> testPassedMap = new HashMap<>();
+		Map<String,Object> testFailedMap = new HashMap<>();
+
+		notStartedMap.put("certificationProgress",CertificationProgressEnum.NOT_START.getValue());
+		notStartedMap.put("certificationProgressCount",notStartedCount);
+
+		inProgressMap.put("certificationProgress",CertificationProgressEnum.IN_PROGRESS.getValue());
+		inProgressMap.put("certificationProgressCount",inProgressCount);
+
+		testPassedMap.put("certificationProgress",CertificationProgressEnum.TEST_PASSED.getValue());
+		testPassedMap.put("certificationProgressCount",testPassedCount);
+
+		testFailedMap.put("certificationProgress",CertificationProgressEnum.TEST_FAILED.getValue());
+		testFailedMap.put("certificationProgressCount",testFailedCount);
+
+		result.add(notStartedMap);
+		result.add(inProgressMap);
+		result.add(testPassedMap);
+		result.add(testFailedMap);
+		return result;
+	}
+
+	@Override
+	public List<Map<String, Object>> getCarCertificationProgressStatistics(List<ProjectCertificationInventoryEO> pciEoList) {
+		List<Map<String,Object>> result = new ArrayList<>();
+
+		int notStartedCount = 0;
+		int inProgressCount = 0;
+		int testPassedCount = 0;
+		int testFailedCount = 0;
+		if(CollectionUtils.isNotEmpty(pciEoList)){
+			// 未开始
+			notStartedCount = (int) pciEoList.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getCertificationProgress(),CertificationProgressEnum.NOT_START.getValue())
+				);
+				return flag;
+			}).count();
+			// 进行中
+			inProgressCount = (int) pciEoList.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getCertificationProgress(),CertificationProgressEnum.IN_PROGRESS.getValue())
+				);
+				return flag;
+			}).count();
+			// 实验通过
+			testPassedCount = (int) pciEoList.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getCertificationProgress(),CertificationProgressEnum.TEST_PASSED.getValue())
+				);
+				return flag;
+			}).count();
+			// 实验失败
+			testFailedCount = (int) pciEoList.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getCertificationProgress(),CertificationProgressEnum.TEST_FAILED.getValue())
+				);
+				return flag;
+			}).count();
+		}
+		Map<String,Object> notStartedMap = new HashMap<>();
+		Map<String,Object> inProgressMap = new HashMap<>();
+		Map<String,Object> testPassedMap = new HashMap<>();
+		Map<String,Object> testFailedMap = new HashMap<>();
+
+		notStartedMap.put("certificationProgress",CertificationProgressEnum.NOT_START.getValue());
+		notStartedMap.put("certificationProgressCount",notStartedCount);
+
+		inProgressMap.put("certificationProgress",CertificationProgressEnum.IN_PROGRESS.getValue());
+		inProgressMap.put("certificationProgressCount",inProgressCount);
+
+		testPassedMap.put("certificationProgress",CertificationProgressEnum.TEST_PASSED.getValue());
+		testPassedMap.put("certificationProgressCount",testPassedCount);
+
+		testFailedMap.put("certificationProgress",CertificationProgressEnum.TEST_FAILED.getValue());
+		testFailedMap.put("certificationProgressCount",testFailedCount);
+
+		result.add(notStartedMap);
+		result.add(inProgressMap);
+		result.add(testPassedMap);
+		result.add(testFailedMap);
+		return result;
+	}
+
+	@Override
+	public List<Map<String, Object>> getPartCertificationProgressStatistics(List<ProjectCertificationInventoryEO> pciEoList) {
+		List<Map<String,Object>> result = new ArrayList<>();
+
+		int notSubmitCount = 0;
+		int reportSubmitCount = 0;
+		int storedCount = 0;
+		if(CollectionUtils.isNotEmpty(pciEoList)){
+			// 部件报告未提交
+			notSubmitCount = (int) pciEoList.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue())
+				);
+				return flag;
+			}).count();
+			// 部件报告已提交
+			reportSubmitCount = (int) pciEoList.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue())
+				);
+				return flag;
+			}).count();
+			// 部件报告已入库
+			storedCount = (int) pciEoList.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue())
+				);
+				return flag;
+			}).count();
+		}
+		Map<String,Object> notSubmitMap = new HashMap<>();
+		Map<String,Object> reportSubmitMap = new HashMap<>();
+		Map<String,Object> storedMap = new HashMap<>();
+
+		notSubmitMap.put("certificationProgress",CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue());
+		notSubmitMap.put("certificationProgressCount",notSubmitCount);
+
+		reportSubmitMap.put("certificationProgress",CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue());
+		reportSubmitMap.put("certificationProgressCount",reportSubmitCount);
+
+		storedMap.put("certificationProgress",CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue());
+		storedMap.put("certificationProgressCount",storedCount);
+
+		result.add(notSubmitMap);
+		result.add(reportSubmitMap);
+		result.add(storedMap);
+		return result;
+	}
+
+	@Override
+	public Result<?> saveBatch(JSONObject json) {
+		Date now = new Date();
+		if (!json.containsKey("dataList")) {
+			throw new JeroBootException("无法获取需要保存的数据，请检查！");
+		}
+		JSONArray dataList = json.getJSONArray("dataList");
+		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = new ArrayList<>();
+		ProjectCertificationInventoryEO projectCertificationInventoryEO = null;
+		//设置权限 先删后加
+		List<ProjectUserPermission> adds = new ArrayList<>();
+		for (Object data : dataList) {
+			projectCertificationInventoryEO = JSONObject.parseObject(JSONObject.toJSONString(data),ProjectCertificationInventoryEO.class);
+			projectCertificationInventoryEOList.add(projectCertificationInventoryEO);
+			if(ObjectUtils.isNotEmpty(projectCertificationInventoryEO.getSdt())){
+				setProjectCertificationInventoryPermission(projectCertificationInventoryEO.getSdt(), projectCertificationInventoryEO.getProjectLibraryId(), projectCertificationInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_SDT.getValue());
+			}
+			if(ObjectUtils.isNotEmpty(projectCertificationInventoryEO.getDutyPerson())){
+				setProjectCertificationInventoryPermission(projectCertificationInventoryEO.getDutyPerson(), projectCertificationInventoryEO.getProjectLibraryId(), projectCertificationInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_DP.getValue());
+			}
+		}
+		if (ObjectUtils.isNotEmpty(adds)) {
+			projectUserPermissionService.saveBatch(adds);
+		}
+		if(CollectionUtils.isEmpty(projectCertificationInventoryEOList)){
+			throw new JeroBootException("无法获取需要保存的数据，请检查！");
+		}
+		this.updateBatchById(projectCertificationInventoryEOList);
+		return Result.OK("保存成功！");
+	}
+
+	@Override
+	public Result<?> resetFlow(JSONObject json) {
+		String ids = json.getString("ids");
+		if(StringUtils.isEmpty(ids)){
+			throw new JeroBootException("至少选择一条数据进行流程重置！");
+		}
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		String operatorType = json.getString("operatorType");
+
+		String projectLibraryId = json.getString("projectLibraryId");
+		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+		if(ObjectUtils.isEmpty(projectLibraryBase)){
+			throw new JeroBootException("无法获取项目库信息，项目库id为：" + projectLibraryId + " 请联系管理员！");
+		}
+
+		List<String> certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
+		List<SysUser> certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList);
+		String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+		String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+
+		// 获取认证清单 - 飞书跳转链接
+		Map<String, Object> hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryId, PRN_CN, PRN_EN);
+		String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN");
+		String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN");
+		String hrefFeishu_CN_P = (String) hrefFeishuMap.get("hrefFeishu_CN_P");
+
+
+		List<String> idList = Arrays.asList(ids.split(","));
+
+		QueryWrapper<ProjectCertificationInventoryEO> queryWrapper = new QueryWrapper<>();
+		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getId,idList);
+		queryWrapper.lambda().ne(ProjectCertificationInventoryEO::getFlowStatus,CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.list(queryWrapper);
+
+		// 根据结束时间进行排序，获取最近的时间，发消息时使用。
+		Collections.sort(projectCertificationInventoryEOList, new Comparator<ProjectCertificationInventoryEO>() {
+			@Override
+			public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) {
+				if(p1.getEndTime() != null && p2.getEndTime() != null){
+					return p1.getEndTime().compareTo(p2.getEndTime());
+				}
+				return 1;
+			}
+		});
+
+		Map<String, Object> standNameAndItemName = this.getStandNameAndItemName(projectCertificationInventoryEOList);
+		String standName = (String) standNameAndItemName.get("standName");
+		String itemName = (String) standNameAndItemName.get("itemName");
+
+		try {
+			for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
+				// 把交付结果、截止日期清空，流程状态 设置为 清单待发布
+				LambdaUpdateWrapper<ProjectCertificationInventoryEO> updateWrap = new LambdaUpdateWrapper<>();
+				updateWrap.set(ProjectCertificationInventoryEO::getDeliveryResult,null);
+				// 流程重置，清空截止日期， 撤回不清空。 对应禅道问题：67048
+				if(StringUtils.equals(operatorType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_RESET.getValue())){
+					updateWrap.set(ProjectCertificationInventoryEO::getEndTime,null);
+				}
+
+				updateWrap.set(ProjectCertificationInventoryEO::getFlowStatus,CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+				updateWrap.eq(ProjectCertificationInventoryEO::getId,projectCertificationInventoryEO.getId());
+				this.update(updateWrap);
+			}
+			processHistoryEOService.deleteByPId(ids);
+			this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,operatorType);
+
+	// 处理待办中心相关数据
+		// 更新该项目认证流程中，认证工程师的任务状态。
+			// 认证工程师接受任务节点
+			List<String> rzgcsjsrwFlowStatusList = new ArrayList<>();
+			rzgcsjsrwFlowStatusList.add(CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
+			rzgcsjsrwFlowStatusList.add(CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue());
+			this.updateProcessInfoDetailStatus(projectLibraryBase,CertificationFlowNodeEnum.RZGCSJSRW.getKey(),rzgcsjsrwFlowStatusList);
+
+			// 认证工程师审查节点 如果还有 结果待审查 的数据，不做操作，如果没有 将这个项目认证流程的所有认证工程师待办任务转为已办
+			List<String> rzgcsscFlowStatusList = new ArrayList<>();
+			rzgcsscFlowStatusList.add(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue());
+			this.updateProcessInfoDetailStatus(projectLibraryBase,CertificationFlowNodeEnum.RZGCSSC.getKey(),rzgcsscFlowStatusList);
+
+		// 删除其它用户的待办任务
+			QueryWrapper<ProcessInfoDetailEO> detailRemoveWrap = new QueryWrapper<>();
+			detailRemoveWrap.lambda().eq(ProcessInfoDetailEO::getProcessInfoId,projectLibraryBase.getId());
+			detailRemoveWrap.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.CERTIFICATION_LC.getValue());
+			detailRemoveWrap.lambda().in(ProcessInfoDetailEO::getProjectLawsInventoryId,idList);
+			this.processInfoDetailEOService.remove(detailRemoveWrap);
+
+			try {
+				if(CollectionUtils.isNotEmpty(certificationEngineerList)){
+					for (String certificationEngineerId : certificationEngineerIdList) {
+						String thirdId = this.sysUserService.getUserThirdIdByUserId(certificationEngineerList,certificationEngineerId);
+
+						if(StringUtils.isNotEmpty(thirdId)){
+							// 根据结束时间进行排序，获取最近的时间，发消息时使用。
+							Collections.sort(projectCertificationInventoryEOList, new Comparator<ProjectCertificationInventoryEO>() {
+								@Override
+								public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) {
+									if(p1.getEndTime() != null && p2.getEndTime() != null){
+										return p1.getEndTime().compareTo(p2.getEndTime());
+									}
+									return 1;
+								}
+							});
+							Date endTime = projectCertificationInventoryEOList.get(0).getEndTime();
+
+							JSONObject larkMesJson = new JSONObject();
+							if(StringUtils.equals(operatorType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_WITHDRAW.getValue())){
+								this.certificationInventoryEOListSortByInventoryVerifyEndTimeAsc(projectCertificationInventoryEOList);
+								endTime = projectCertificationInventoryEOList.get(0).getInventoryVerifyEndTime();
+								larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE4.getValue());
+							}else if(StringUtils.equals(operatorType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_RESET.getValue())){
+								larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE5.getValue());
+							}
+							larkMesJson.put("userIds",thirdId);
+
+							Map<String,Object> templateVariableMap = new HashMap<>();
+							templateVariableMap.put("projectNameCn",PRN_CN);
+							templateVariableMap.put("projectNameEn",PRN_EN);
+							templateVariableMap.put("standName",standName);
+							templateVariableMap.put("itemName",itemName);
+							templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName());
+							templateVariableMap.put("endTime",DateUtils.formatDate(endTime));
+							templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
+							templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
+							templateVariableMap.put("viewBtnUrlCnPhone",hrefFeishu_CN_P);
+
+							larkMesJson.put("templateVariableMap",templateVariableMap);
+							this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson);
+						}
+					}
+				}
+			} catch (Exception e) {
+				log.error("飞书消息推送失败");
+			}
+
+		}catch (Exception ex){
+			ex.printStackTrace();
+			log.error("studio-流程重置失败：" + ex.getMessage());
+			throw new JeroBootException("流程重置失败！");
+		}
+		return Result.OK("流程重置成功！");
+	}
+
+	@Override
+	public Result<?> transferTask(JSONObject json) {
+		String ids = json.getString("ids");
+		if(StringUtils.isEmpty(ids)){
+			throw new JeroBootException("至少选择一条数据进行操作！");
+		}
+
+		String projectLibraryId = json.getString("projectLibraryId");
+		String transferUserId = json.getString("transferUserId");
+		SysUser transferUserInfo = this.sysUserService.getById(transferUserId);
+
+		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+		if(ObjectUtils.isEmpty(projectLibraryBase)){
+			throw new JeroBootException("无法获取项目库信息，项目库id为：" + projectLibraryId + " 请联系管理员！");
+		}
+		String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+		String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		List<String> idList = Arrays.asList(ids.split(","));
+
+		// 流程状态为  任务待确认、待提交、 审查退回 。 能转办
+		List<String> flowStatusList = new ArrayList<>();
+		flowStatusList.add(CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue());
+		flowStatusList.add(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue());
+		flowStatusList.add(CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue());
+
+		QueryWrapper<ProjectCertificationInventoryEO> queryWrapper = new QueryWrapper<>();
+		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getId,idList);
+		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList);
+		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getDutyPerson,currentUser.getId());
+		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.list(queryWrapper);
+
+		if(CollectionUtils.isEmpty(projectCertificationInventoryEOList)){
+			throw new JeroBootException("至少选择一条数据流程状态为'任务待确认 或 结果待提交 或 审查退回'的数据进行转办操作！");
+		}
+
+		List<ProjectCertificationInventoryLogEO> projectCertificationInventoryLogEOList = new ArrayList<>();
+		projectCertificationInventoryEOList.forEach(certificationInventory -> {
+			certificationInventory.setDutyPerson(transferUserId);
+
+			String contentCn = "\"" + currentUser.getUsername() + "\"" +"将流程发送至" +"\""+ transferUserInfo.getUsername() + "\"办理" ;
+			String contentEn = "\"" + currentUser.getUsername() + "\"" +" sends the process to "+"\""+ transferUserInfo.getUsername() + "\" for handling" ;
+			ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO();
+			projectCertificationInventoryLogEO.setProjectCertificationInventoryId(certificationInventory.getId());
+			projectCertificationInventoryLogEO.setContentCn(contentCn);
+			projectCertificationInventoryLogEO.setContentEn(contentEn);
+			projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_TRANSFER_TASK.getValue());
+			projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO);
+			if(certificationInventory.getFlowStatus().equals(CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())){
+				processHistoryEOService.add(certificationInventory.getId(),CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey(),currentUser.getId(),ReviewResultEnum.TRANSFER.getValue(),null,null);
+			}else{
+				processHistoryEOService.add(certificationInventory.getId(),CertificationFlowNodeEnum.TASK_HANDLING.getKey(),currentUser.getId(),ReviewResultEnum.TRANSFER.getValue(),null,null);
+			}
+		});
+
+		if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){
+			this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList);
+		}
+
+		this.updateBatchById(projectCertificationInventoryEOList);
+		//设置权限 先删后加
+		Date now = new Date();
+		List<ProjectUserPermission> adds = new ArrayList<>();
+		for (ProjectCertificationInventoryEO pci:projectCertificationInventoryEOList) {
+			if (ObjectUtils.isNotEmpty(pci.getSdt())) {
+				setProjectCertificationInventoryPermission(pci.getSdt(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_SDT.getValue());
+			}
+			if (ObjectUtils.isNotEmpty(pci.getDutyPerson())) {
+				setProjectCertificationInventoryPermission(pci.getDutyPerson(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_DP.getValue());
+			}
+		}
+		if (ObjectUtils.isNotEmpty(adds)) {
+			projectUserPermissionService.saveBatch(adds);
+		}
+
+		Collections.sort(projectCertificationInventoryEOList, new Comparator<ProjectCertificationInventoryEO>() {
+			@Override
+			public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) {
+				if(p1.getEndTime() != null && p2.getEndTime() != null){
+					return p1.getEndTime().compareTo(p2.getEndTime());
+				}
+				return 1;
+			}
+		});
+
+		QueryWrapper<ProcessInfoDetailEO> detailQueryWrap = new QueryWrapper<>();
+		detailQueryWrap.lambda().eq(ProcessInfoDetailEO::getProcessInfoId,projectLibraryId);
+		detailQueryWrap.lambda().eq(ProcessInfoDetailEO::getUserId,currentUser.getId());
+		detailQueryWrap.lambda().in(ProcessInfoDetailEO::getProjectLawsInventoryId,idList);
+		List<ProcessInfoDetailEO> processInfoDetailEOList = this.processInfoDetailEOService.list(detailQueryWrap);
+		if(CollectionUtils.isNotEmpty(processInfoDetailEOList)){
+			processInfoDetailEOList.forEach(detail -> {
+				detail.setUserId(transferUserId);
+			});
+			this.processInfoDetailEOService.updateBatchById(processInfoDetailEOList);
+		}
+
+		List<String> userIdList = Arrays.asList(transferUserId.split(","));
+		List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
+		this.sendMessageByTemplateId(
+				projectCertificationInventoryEOList,
+				TemplateInfoEnum2.CERTIFICATION_MESSAGE17.getValue(),
+				userIdList,
+				userInfoList,
+				projectCertificationInventoryEOList.get(0).getEndTime(),
+				CertificationFlowNodeEnum.TASK_HANDLING.getKey()
+		);
+
+		// 获取认证清单 - 飞书跳转链接
+		// 2023-03-15 去掉此消息
+		/*Map<String, Object> hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN);
+		String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN");
+		String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN");
+
+		Map<String, Object> standNameAndItemName = this.getStandNameAndItemName(projectCertificationInventoryEOList);
+		String standName = (String) standNameAndItemName.get("standName");
+		String itemName = (String) standNameAndItemName.get("itemName");
+
+		SysUser sysUser = this.sysUserService.getBaseMapper().selectById(transferUserId);
+		if (StringUtils.isNotEmpty(sysUser.getThirdId())) {
+			try {
+				JSONObject larkMesJson = new JSONObject();
+				larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE9.getValue());
+				larkMesJson.put("userIds",sysUser.getThirdId());
+
+				Map<String,Object> templateVariableMap = new HashMap<>();
+				templateVariableMap.put("projectNameCn", PRN_CN);
+				templateVariableMap.put("projectNameEn", PRN_EN);
+				templateVariableMap.put("standName",standName);
+				templateVariableMap.put("itemName",itemName);
+				templateVariableMap.put("Initiator", projectLibraryBase.getStudioEngineerName());
+				templateVariableMap.put("endTime", DateUtils.formatDate(projectCertificationInventoryEOList.get(0).getEndTime()));
+				templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
+				templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
+
+				larkMesJson.put("templateVariableMap",templateVariableMap);
+				this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson);
+			} catch (Exception e) {
+				log.error("飞书消息推送失败");
+			}
+		}*/
+
+		return Result.OK("转办成功！");
+	}
+
+	@Override
+	public Result<?> expediting(JSONObject json) {
+		String ids = json.getString("ids");
+		if(StringUtils.isEmpty(ids)){
+			throw new JeroBootException("至少选择一条数据进行操作！");
+		}
+
+		String projectLibraryId = json.getString("projectLibraryId");
+		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+		String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+		String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+		if(ObjectUtils.isEmpty(projectLibraryBase)){
+			throw new JeroBootException("无法获取项目库信息，项目库id为：" + projectLibraryId + " 请联系管理员！");
+		}
+
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		List<String> idList = Arrays.asList(ids.split(","));
+
+		QueryWrapper<ProjectCertificationInventoryEO> queryWrapper = new QueryWrapper<>();
+		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getId,idList);
+//		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getDutyPerson,currentUser.getId());
+		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.list(queryWrapper);
+
+		if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOList)){
+			// 获取认证清单 - 飞书跳转链接
+			Map<String, Object> hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryId, PRN_CN, PRN_EN);
+			String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN");
+			String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN");
+			String hrefFeishu_CN_P = (String) hrefFeishuMap.get("hrefFeishu_CN_P");
+
+			/**
+			 * studio催办：除了 清单待发布、审查通过、认证退回 的  催办当前办理人
+			 * 认证工程师催办：任务待确认、结果待提交、审查退回  的 催办当前办理人
+			 * 接口人催办：任务待确认 、结果待提交、审查退回 的 催办当前办理人
+			 */
+			String operatorType = json.getString("operatorType");
+			if(StringUtils.equals(operatorType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_EXPEDITING.getValue())){
+				// 结果待审查
+				List<ProjectCertificationInventoryEO> toBeReviewedCiEoList = projectCertificationInventoryEOList.stream().filter(data -> {
+					return (StringUtils.equals(data.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()));
+				}).collect(Collectors.toList());
+
+				if(CollectionUtils.isNotEmpty(toBeReviewedCiEoList)){
+					String certificationEngineerIds = projectLibraryBase.getCertificationEngineer();
+					if(StringUtils.isNotEmpty(certificationEngineerIds)){
+						List<String> certificationEngineerIdList = Arrays.asList(certificationEngineerIds.split(","));
+
+						List<SysUser> certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList);
+
+						// 根据结束时间进行排序，获取最近的时间，发消息时使用。
+						Collections.sort(toBeReviewedCiEoList, new Comparator<ProjectCertificationInventoryEO>() {
+							@Override
+							public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) {
+								if(p1.getEndTime() != null && p2.getEndTime() != null){
+									return p1.getEndTime().compareTo(p2.getEndTime());
+								}
+								return 1;
+							}
+						});
+						Date endTime = toBeReviewedCiEoList.get(0).getEndTime();
+
+						Map<String, Object> standNameAndItemName = this.getStandNameAndItemName(toBeReviewedCiEoList);
+						String standName = (String) standNameAndItemName.get("standName");
+						String itemName = (String) standNameAndItemName.get("itemName");
+
+						if(CollectionUtils.isNotEmpty(certificationEngineerList)){
+							for (String certificationEngineerId : certificationEngineerIdList) {
+								String thirdId = this.sysUserService.getUserThirdIdByUserId(certificationEngineerList,certificationEngineerId);
+
+								if(StringUtils.isNotEmpty(thirdId)){
+									try {
+										JSONObject larkMesJson = new JSONObject();
+										larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE1.getValue());
+										larkMesJson.put("userIds",thirdId);
+
+										Map<String,Object> templateVariableMap = new HashMap<>();
+										templateVariableMap.put("projectNameCn",PRN_CN);
+										templateVariableMap.put("projectNameEn",PRN_EN);
+										templateVariableMap.put("standName",standName);
+										templateVariableMap.put("itemName",itemName);
+										templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName());
+										templateVariableMap.put("endTime",DateUtils.formatDate(endTime));
+
+										templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
+										templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
+										templateVariableMap.put("viewBtnUrlEnPhone",hrefFeishu_CN_P);
+
+										larkMesJson.put("templateVariableMap",templateVariableMap);
+										this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson);
+									} catch (Exception e) {
+										log.error("飞书消息推送失败");
+									}
+								}
+							}
+						}
+					}
+				}
+
+				// 清单待校核、责任人拒绝
+				List<ProjectCertificationInventoryEO> toBeCheckedCiEoList = projectCertificationInventoryEOList.stream().filter(data -> {
+					return (StringUtils.equals(data.getFlowStatus(), CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
+							|| StringUtils.equals(data.getFlowStatus(), CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue()));
+				}).collect(Collectors.toList());
+				if (CollectionUtils.isNotEmpty(toBeCheckedCiEoList)) {
+					String certificationEngineerIds = projectLibraryBase.getCertificationEngineer();
+					if(StringUtils.isNotEmpty(certificationEngineerIds)){
+						List<String> certificationEngineerIdList = Arrays.asList(certificationEngineerIds.split(","));
+
+						List<SysUser> certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList);
+
+						// 根据结束时间进行排序，获取最近的时间，发消息时使用。
+						Collections.sort(toBeCheckedCiEoList, new Comparator<ProjectCertificationInventoryEO>() {
+							@Override
+							public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) {
+								if(p1.getInventoryVerifyEndTime() != null && p2.getInventoryVerifyEndTime() != null){
+									return p1.getInventoryVerifyEndTime().compareTo(p2.getInventoryVerifyEndTime());
+								}
+								return 1;
+							}
+						});
+						Date inventoryVerifyEndTime = toBeCheckedCiEoList.get(0).getInventoryVerifyEndTime();
+
+						Map<String, Object> standNameAndItemName = this.getStandNameAndItemName(toBeCheckedCiEoList);
+						String standName = (String) standNameAndItemName.get("standName");
+						String itemName = (String) standNameAndItemName.get("itemName");
+
+						if(CollectionUtils.isNotEmpty(certificationEngineerList)){
+							for (String certificationEngineerId : certificationEngineerIdList) {
+								String thirdId = this.sysUserService.getUserThirdIdByUserId(certificationEngineerList,certificationEngineerId);
+
+								if(StringUtils.isNotEmpty(thirdId)){
+									try {
+										JSONObject larkMesJson = new JSONObject();
+										larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE1.getValue());
+										larkMesJson.put("userIds",thirdId);
+
+										Map<String,Object> templateVariableMap = new HashMap<>();
+										templateVariableMap.put("projectNameCn",PRN_CN);
+										templateVariableMap.put("projectNameEn",PRN_EN);
+										templateVariableMap.put("standName",standName);
+										templateVariableMap.put("itemName",itemName);
+										templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName());
+										templateVariableMap.put("endTime",DateUtils.formatDate(inventoryVerifyEndTime));
+										templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
+										templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
+										templateVariableMap.put("viewBtnUrlEnPhone",hrefFeishu_CN_P);
+
+										larkMesJson.put("templateVariableMap",templateVariableMap);
+										this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson);
+									} catch (Exception e) {
+										log.error("飞书消息推送失败");
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+
+			List<String> dutyPersonIdList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList());
+			List<SysUser> dutyPersonList = this.sysUserService.querySysUserListByIdList(dutyPersonIdList);
+
+			Map<String, List<ProjectCertificationInventoryEO>> certifycationInventoryListByDutyPersonMap = projectCertificationInventoryEOList.stream().filter(data -> {
+				return (StringUtils.equals(data.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+						|| StringUtils.equals(data.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+						|| StringUtils.equals(data.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue()));
+			}).collect(Collectors.groupingBy(ProjectCertificationInventoryEO::getDutyPerson));
+
+			if(!ObjectUtils.isEmpty(certifycationInventoryListByDutyPersonMap) && CollectionUtils.isNotEmpty(dutyPersonList)){
+				for (Map.Entry<String, List<ProjectCertificationInventoryEO>> map : certifycationInventoryListByDutyPersonMap.entrySet()) {
+					String key = map.getKey();
+					List<String> userIdList = Arrays.asList(key.split(","));
+
+					// 任务待确认状态的数据：发送认证任务确认的催办消息
+					List<ProjectCertificationInventoryEO> toBeConfirmedPciEoList = map.getValue().stream().filter(pciEo -> {
+						boolean flag = false;
+						if(StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())){
+							flag = true;
+						}
+						return flag;
+					}).collect(Collectors.toList());
+					this.certificationInventoryEOListSortByTaskConfirmEndTimeAsc(toBeConfirmedPciEoList);
+					if (CollectionUtils.isNotEmpty(toBeConfirmedPciEoList)) {
+						Date taskConfirmEndTime = toBeConfirmedPciEoList.get(0).getTaskConfirmEndTime();
+						// 给责任人发消息
+						this.sendMessageByTemplateId(
+								toBeConfirmedPciEoList,
+								TemplateInfoEnum2.CERTIFICATION_MESSAGE16.getValue(),
+								userIdList,
+								dutyPersonList,
+								taskConfirmEndTime,
+								CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey()
+						);
+					}
+
+					List<ProjectCertificationInventoryEO> toBeSubmitOrReturnPciEoList = map.getValue().stream().filter(pciEo -> {
+						boolean flag = false;
+						if(StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+								|| StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())){
+							flag = true;
+						}
+						return flag;
+					}).collect(Collectors.toList());
+
+					if (CollectionUtils.isNotEmpty(toBeSubmitOrReturnPciEoList)) {
+						this.certificationInventoryEOListSortByTaskConfirmEndTimeAsc(toBeSubmitOrReturnPciEoList);
+						// 给责任人发消息
+						this.sendMessageByTemplateId(
+								toBeSubmitOrReturnPciEoList,
+								TemplateInfoEnum2.CERTIFICATION_MESSAGE18.getValue(),
+								userIdList,
+								dutyPersonList,
+								toBeSubmitOrReturnPciEoList.get(0).getTaskConfirmEndTime(),
+								CertificationFlowNodeEnum.TASK_HANDLING.getKey()
+						);
+					}
+
+					/*// 待提交数据  单独发消息
+					List<ProjectCertificationInventoryEO> toBeSubmitDataList = value.stream().filter(v -> {
+						boolean flag = false;
+						if(StringUtils.equals(v.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())){
+							flag = true;
+						}
+						return flag;
+					}).collect(Collectors.toList());
+					if (CollectionUtils.isNotEmpty(toBeSubmitDataList)) {
+
+						this.sendMessageByTemplateId(
+								toBeSubmitDataList,
+								TemplateInfoEnum2.CERTIFICATION_MESSAGE18.getValue(),
+								userIdList,
+								dutyPersonList
+						);
+					}*/
+
+					/*String thirdId = this.sysUserService.getUserThirdIdByUserId(dutyPersonList,key);
+
+					if(StringUtils.isNotEmpty(thirdId)){
+						// 过滤掉 待提交的数据，正常发消息
+						value = value.stream().filter(v -> {
+							boolean flag = false;
+							if(!StringUtils.equals(v.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())){
+								flag = true;
+							}
+							return flag;
+						}).collect(Collectors.toList());
+
+						// 根据结束时间进行排序，获取最近的时间，发消息时使用。
+						Collections.sort(value, new Comparator<ProjectCertificationInventoryEO>() {
+							@Override
+							public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) {
+								if(p1.getEndTime() != null && p2.getEndTime() != null){
+									return p1.getEndTime().compareTo(p2.getEndTime());
+								}
+								return 1;
+							}
+						});
+						Map<String, Object> standNameAndItemName = this.getStandNameAndItemName(value);
+						String standName = (String) standNameAndItemName.get("standName");
+						String itemName = (String) standNameAndItemName.get("itemName");
+
+						Date endTime = value.get(0).getEndTime();
+
+						try {
+							JSONObject larkMesJson = new JSONObject();
+
+							String templateId = TemplateInfoEnum2.CERTIFICATION_MESSAGE1.getValue();
+							if(StringUtils.equals(operatorType,OperatorTypeEnum.CERTIFICATION_INVENTORY_CERTIFICATION_ENGINEER_EXPEDITING.getValue())){
+								templateId = TemplateInfoEnum2.CERTIFICATION_MESSAGE16.getValue();
+							}
+
+							larkMesJson.put("template_id", templateId);
+							larkMesJson.put("userIds",thirdId);
+
+							Map<String,Object> templateVariableMap = new HashMap<>();
+							templateVariableMap.put("projectNameCn",PRN_CN);
+							templateVariableMap.put("projectNameEn",PRN_EN);
+							templateVariableMap.put("standName",standName);
+							templateVariableMap.put("itemName",itemName);
+							templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName());
+							templateVariableMap.put("endTime",DateUtils.formatDate(endTime));
+							templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
+							templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
+
+							larkMesJson.put("templateVariableMap",templateVariableMap);
+							this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson);
+						} catch (Exception e) {
+							log.error("飞书消息推送失败");
+						}
+					}*/
+				}
+			}
+		}
+
+		return Result.OK("催办成功！");
+	}
+
+	/**
+	 * 获取标准编号和检验项目   发飞书消息使用
+	 * @param projectCertificationInventoryEOList
+	 * @return
+	 */
+	@Override
+	public Map<String,Object> getStandNameAndItemName(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList){
+		Map<String,Object> result = new HashMap<>();
+		StringBuilder standNameSb = new StringBuilder();
+		StringBuilder itemNameSb = new StringBuilder();
+		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
+			if(StringUtils.isNotEmpty(projectCertificationInventoryEO.getInspectionItem())){
+				itemNameSb.append(projectCertificationInventoryEO.getInspectionItem()).append(",");
+			}
+			if(StringUtils.isNotEmpty(projectCertificationInventoryEO.getSerialNumber())){
+				standNameSb.append(projectCertificationInventoryEO.getSerialNumber()).append(",");
+			}
+		}
+
+		String standName = "";
+		if(StringUtils.isNotEmpty(standNameSb.toString())){
+			standName = standNameSb.toString().substring(0,standNameSb.toString().length()-1);
+		}
+		String itemName = "";
+		if(StringUtils.isNotEmpty(itemNameSb.toString())){
+			itemName = itemNameSb.toString().substring(0,itemNameSb.toString().length()-1);
+		}
+
+		result.put("standName",standName);
+		result.put("itemName",itemName);
+		return result;
+	}
+
+	/**
+	 * 获取认证清单飞书跳转链接
+	 * @param projectLibraryId
+	 * @param PRN_CN
+	 * @param PRN_EN
+	 * @return
+	 */
+	@Override
+	public Map<String,Object> getCertificationInventoryLinkHrefFeishu(String projectLibraryId,String PRN_CN,String PRN_EN){
+		Map<String,Object> result = new HashMap<>();
+
+		String hrefFeishu_CN = backUrl
+				+ JumpLinkEnum.CERTIFICATION_INVENTORY_LINK.getLink()
+				+ projectLibraryId
+				+ JumpLinkEnum.CERTIFICATION_INVENTORY_LINK.getType()
+				+ "&projectName=" + PRN_CN;
+
+		//飞书跳转链接
+		String hrefFeishu_EN = backUrl
+				+ JumpLinkEnum.CERTIFICATION_INVENTORY_LINK.getLink()
+				+ projectLibraryId
+				+ JumpLinkEnum.CERTIFICATION_INVENTORY_LINK.getType()
+				+ "&projectName=" + PRN_EN;
+
+		//飞书手机跳转链接
+		String hrefFeishu_CN_P = backUrlPhone
+				+ JumpLinkEnum.TO_DO_CENTER_PHONE.getLink()+ "?keyWord=" + PRN_CN;
+
+
+		result.put("hrefFeishu_CN", URLUtil.encode(hrefFeishu_CN));
+		result.put("hrefFeishu_EN",URLUtil.encode(hrefFeishu_EN));
+		result.put("hrefFeishu_CN_P",URLUtil.encode(hrefFeishu_CN_P));
+		return result;
+	}
+
+
+	@Override
+	public Result<?> updateConfigItemBatch(JSONObject json) {
+		String ids = json.getString("ids");
+		if(StringUtils.isEmpty(ids)){
+			throw new JeroBootException("至少选择一条数据进行操作！");
+		}
+
+		String configItem = json.getString("configItem");
+		if(StringUtils.isEmpty(ids)){
+			throw new JeroBootException("请选择一个配置！");
+		}
+		QueryWrapper<ProjectCertificationInventoryEO> queryWrap = new QueryWrapper<>();
+		queryWrap.lambda().in(ProjectCertificationInventoryEO::getId,ids.split(","));
+		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.list(queryWrap);
+		projectCertificationInventoryEOList.forEach(certificationInventoryEO -> {
+			certificationInventoryEO.setConfigItem(configItem);
+		});
+
+		this.updateBatchById(projectCertificationInventoryEOList);
+		return Result.OK("修改配置成功！");
+	}
+
+	@Override
+	public Result<?> callAdd(JSONObject json) {
+		String cut = json.getString("cut");
+		List<String> result = new ArrayList<>();
+		if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+			result.add("调取成功!");
+		}else {
+			result.add("Successfully retrieved!");
+		}
+
+		String authDummyInventoryBaseId = json.getString("authDummyInventoryBaseId");
+		if(StringUtils.isEmpty(authDummyInventoryBaseId)){
+			throw new JeroBootException("请选择一个认证虚拟清单进行操作！");
+		}
+
+		String authDummyInventoryInfoIds = json.getString("authDummyInventoryInfoIds");
+		if(StringUtils.isEmpty(authDummyInventoryInfoIds)){
+			throw new JeroBootException("至少选择一条数据进行调取！");
+		}
+
+		String projectLibraryId = json.getString("projectLibraryId");
+
+		QueryWrapper<AuthDummyInventoryInfoEO> authDummyInfoQueryWrap = new QueryWrapper<>();
+		authDummyInfoQueryWrap.lambda().in(AuthDummyInventoryInfoEO::getId,authDummyInventoryInfoIds.split(","));
+		List<AuthDummyInventoryInfoEO> authDummyInventoryInfoEOList = this.authDummyInventoryInfoEOService.list(authDummyInfoQueryWrap);
+
+		if(CollectionUtils.isNotEmpty(authDummyInventoryInfoEOList)){
+			// 获取该项目相关人员名单信息，用于根据责任领域配置数据 自动设置责任人、接口人。
+			QueryWrapper<ProjectRelatedPersonnel> prpQueryWrap = new QueryWrapper<>();
+			prpQueryWrap.lambda().eq(ProjectRelatedPersonnel::getProjectId,projectLibraryId);
+			List<ProjectRelatedPersonnel> prpEoList = this.projectRelatedPersonnelService.list(prpQueryWrap);
+
+			QueryWrapper<ProjectLawsInventoryEO> lawsInventoryEOQueryWrap = new QueryWrapper<>();
+			lawsInventoryEOQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
+			List<ProjectLawsInventoryEO> projectLawsInventoryEOList = this.platformProjectLawsInventoryEOService.list(lawsInventoryEOQueryWrap);
+
+			List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = new ArrayList<>();
+
+			List<String> noSerialNumberList = new ArrayList<>();
+
+			for (AuthDummyInventoryInfoEO authDummyInventoryInfoEO : authDummyInventoryInfoEOList) {
+				if(CollectionUtils.isEmpty(projectLawsInventoryEOList)){
+					break;
+				}
+
+				// 根据选择调取的数据法规编号，跟当前项目中 法规清单数据法规编号对比，如果有，则加入，如果没有，则不加入。
+				List<ProjectLawsInventoryEO> lawsInventoryEOListTemp = projectLawsInventoryEOList.stream().filter(lawsInventoryEO -> {
+					boolean flag = false;
+					String adiSn = authDummyInventoryInfoEO.getSerialNumber();
+					BussDocumentLibraryEO bl = iBussDocumentLibraryEOService.getBySerialNumber(adiSn);
+					if(ObjectUtils.isNotEmpty(bl)){
+						if (StringUtils.equals(bl.getId(), lawsInventoryEO.getStandId())) {
+							flag = true;
+						}
+					}
+
+					return flag;
+				}).collect(Collectors.toList());
+
+				if(CollectionUtils.isNotEmpty(lawsInventoryEOListTemp)){
+					ProjectCertificationInventoryEO projectCertificationInventoryEOTemp = new ProjectCertificationInventoryEO();
+					BeanUtils.copyProperties(authDummyInventoryInfoEO,projectCertificationInventoryEOTemp);
+
+					String dutyTerritory = projectCertificationInventoryEOTemp.getDutyTerritory();
+					if(StringUtils.isNotEmpty(dutyTerritory)){
+						if(CollectionUtils.isNotEmpty(prpEoList)){
+							List<ProjectRelatedPersonnel> prpEoListTemp = prpEoList.stream().filter(prpEo -> {
+								boolean flag = false;
+								if (StringUtils.equals(prpEo.getDutyTerritory(), dutyTerritory)) {
+									flag = true;
+								}
+								return flag;
+							}).collect(Collectors.toList());
+
+							if(CollectionUtils.isNotEmpty(prpEoListTemp)){
+								List<String> engineeringInterfacePersonIdList = new ArrayList<>();
+								ProjectRelatedPersonnel prpEo = prpEoListTemp.get(0);
+								if(StringUtils.isNotBlank(prpEo.getEngineeringInterfacePerson())){
+									List<String> engineeringInterfacePersonList = Arrays.asList(prpEo.getEngineeringInterfacePerson().split(","));
+									engineeringInterfacePersonIdList.addAll(engineeringInterfacePersonList);
+								}
+								if(StringUtils.isNotBlank(prpEo.getEngineerAttSet())){
+									List<String> engineerAttSetList = Arrays.asList(prpEo.getEngineerAttSet().split(","));
+									engineeringInterfacePersonIdList.addAll(engineerAttSetList);
+								}
+								if(StringUtils.isNotBlank(prpEo.getEngineerLawSet())){
+									List<String> engineerLawSetList = Arrays.asList(prpEo.getEngineerLawSet().split(","));
+									engineeringInterfacePersonIdList.addAll(engineerLawSetList);
+								}
+
+								engineeringInterfacePersonIdList = engineeringInterfacePersonIdList.stream().distinct().collect(Collectors.toList());
+								if(CollectionUtils.isNotEmpty(engineeringInterfacePersonIdList) && engineeringInterfacePersonIdList.size() == 1){
+									projectCertificationInventoryEOTemp.setSdt(engineeringInterfacePersonIdList.get(0));
+									projectCertificationInventoryEOTemp.setDutyPerson(engineeringInterfacePersonIdList.get(0));
+								}
+							}
+						}
+					}
+
+					projectCertificationInventoryEOTemp.setId(UUID.randomUUID().toString().replace("-", ""));
+					projectCertificationInventoryEOTemp.setProjectLibraryId(projectLibraryId);
+					projectCertificationInventoryEOTemp.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+					projectCertificationInventoryEOTemp.setCreateTime(new Date());
+					projectCertificationInventoryEOTemp.setUpdateTime(new Date());
+					projectCertificationInventoryEOTemp.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
+					projectCertificationInventoryEOList.add(projectCertificationInventoryEOTemp);
+				}else {
+					noSerialNumberList.add(authDummyInventoryInfoEO.getSerialNumber());
+				}
+			}
+
+
+			if(CollectionUtils.isNotEmpty(noSerialNumberList)){
+				// 判断调取的数据中，是否有 在当前项目库法规清单中  没有的编号
+				if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+					result.add("您所选的数据中包含当前项目中不包含的法规编号信息，已为您过滤添加。");
+				}else {
+					result.add("The data you have selected contains regulatory number information that is not included in the current project, and has been filtered and added for you.");
+				}
+			}
+
+//			List<ProjectCertificationInventoryEO> saveDataList = this.dataUniqueCheck(projectCertificationInventoryEOList, cut, result, projectLibraryId);
+
+			this.saveBatch(projectCertificationInventoryEOList);
+
+			// 设置历史log（修改历史）
+			this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_CALL_ADD.getValue());
+
+			Date now = new Date();
+			//设置权限 先删后加
+			List<ProjectUserPermission> adds = new ArrayList<>();
+			for (ProjectCertificationInventoryEO pci: projectCertificationInventoryEOList) {
+				if (ObjectUtils.isNotEmpty(pci.getSdt())) {
+					setProjectCertificationInventoryPermission(pci.getSdt(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_SDT.getValue());
+				}
+				if (ObjectUtils.isNotEmpty(pci.getDutyPerson())) {
+					setProjectCertificationInventoryPermission(pci.getDutyPerson(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_DP.getValue());
+				}
+			}
+			if (ObjectUtils.isNotEmpty(adds)) {
+				projectUserPermissionService.saveBatch(adds);
+			}
+		}
+
+		return Result.OK(result);
+	}
+
+	/**
+	 * 数据导入
+	 * @param file
+	 * @param projectCertificationInventoryEO
+	 */
+	@SneakyThrows
+	@Override
+	public void importData(MultipartFile file, ProjectCertificationInventoryEO projectCertificationInventoryEO) {
+		String title = "";
+		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";
+		}
+
+		int pos = file.getOriginalFilename().lastIndexOf(".");
+		String str = file.getOriginalFilename().substring(pos + 1).toLowerCase();
+		String filenameorg = file.getOriginalFilename().substring(0, pos);
+		//判断上传文件必须是zip
+		if (!str.equals("zip")) {
+			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+				throw new JeroBootException("请上传zip格式的文件或rar格式的文件");
+			}else{
+				throw new JeroBootException("Please upload a zip file or rar file");
+			}
+
+		}
+		String path = uploadpath + File.separator + "modal" + File.separator + filenameorg + System.currentTimeMillis();
+		File saveDirectory = new File(path);
+		if (!saveDirectory.isDirectory()) {
+			saveDirectory.mkdir();
+		}
+		FileUtils.copyInputStreamToFile(file.getInputStream(), new File(path + File.separator + file.getOriginalFilename()));
+		//解压缩
+		String zipEntryName = "";
+		if (str.equals("zip")) {
+			zipEntryName = FileUnZip.unZipFiles(path + File.separator + file.getOriginalFilename(), path);
+		}
+
+
+		//判断压缩包下是否只有一个文件夹
+		File fileTemp = new File(path);
+		int length = fileTemp.listFiles().length;
+		if (length > 2) {
+			//删除原上传文件
+			FileUnZip.deleteDir(saveDirectory);
+			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+				throw new JeroBootException("压缩包中必须有且仅有一个文件夹,请重新上传");
+			}else{
+				throw new JeroBootException("There must be only one folder in the compressed package Please upload it again");
+			}
+
+		}
+		File fileNew = new File(zipEntryName);
+		List<File> fileList = new ArrayList<>();
+		for (File file1 : fileNew.listFiles()) {
+			if (file1.getName().contains(".xls") || file1.getName().contains(".xlsx")) {
+				fileList.add(file1);
+			}
+		}
+		if (fileList.size() == 0) {
+			//删除原上传文件
+			FileUnZip.deleteDir(saveDirectory);
+			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+				throw new JeroBootException("压缩包根目录下没有excel作为导入数据,请重新上传");
+			}else{
+				throw new JeroBootException("Excel does not exist in the root directory of the compressed package Please upload it again");
+			}
+
+		} else if (fileList.size() > 1) {
+			//删除原上传文件
+			FileUnZip.deleteDir(saveDirectory);
+			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+				throw new JeroBootException("压缩包根目录下仅能存在一个excel为导入数据,请重新上传");
+			}else{
+				throw new JeroBootException("Only one Excel file can be imported in the compressed package root directory. Please upload data again");
+			}
+
+		}
+
+		// 数据相关处理,
+		// 1.获取其中的Excel,
+		List<File> excelfilelist = FileUnZip.readImpExcelFile(zipEntryName);
+		System.gc();
+		if (excelfilelist.size() < 1) {
+			//删除原上传文件
+			FileUnZip.deleteDir(saveDirectory);
+			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+				throw new JeroBootException("压缩包内没有上传Excel数据");
+			}else{
+				throw new JeroBootException("No Excel data is uploaded in the compressed package");
+			}
+
+		} else if (excelfilelist.size() > 1) {
+			//删除原上传文件
+			FileUnZip.deleteDir(saveDirectory);
+			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+				throw new JeroBootException("压缩包内有多个Excel数据源");
+			}else{
+				throw new JeroBootException("There are multiple Excel data sources in the zip package");
+			}
+
+		}
+		List<ProjectCertificationInventoryEO> datas = new ArrayList<>();
+		File excelFile = excelfilelist.get(0);
+		Workbook workbook = WorkbookFactory.create(excelFile);
+		List<Map<String, String>> dataList = new ArrayList<>();
+		if (workbook != null) {
+			DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+			Sheet sheet = workbook.getSheetAt(0);
+			if (sheet != null) {
+				StringBuilder headerSb = new StringBuilder();
+				int rowNos = sheet.getLastRowNum();// 得到excel的总记录条数
+				for (int i = 0; i <= rowNos; i++) {
+					Row row = sheet.getRow(i);
+					Row headerRow = sheet.getRow(i);
+					boolean isBlank = isRowEmpty(row);
+					String key = "";
+					if (row != null && !isBlank) {
+						int columNos = headerRow.getLastCellNum();// 表头总共的列数
+						Map<String, String> rowList = new LinkedHashMap<>();
+						for (int j = 0; j < columNos; j++) {
+							Cell cell = row.getCell(j);
+							Cell headerCell = headerRow.getCell(j);
+							if (cell != null) {
+								if (i == 0) {
+									cell.setCellType(HSSFCell.CELL_TYPE_STRING);
+									headerSb.append(cell.getStringCellValue() + ",");
+									if(j == 15){
+										break;
+									}
+								} else if(i > 1){
+									List<String> headList = Arrays.asList(headerSb.toString().split(","));
+									String field ="";
+									if (HSSFCell.CELL_TYPE_NUMERIC == cell.getCellType() && HSSFDateUtil.isCellDateFormatted(cell)) {
+										Date d = cell.getDateCellValue();
+										field = fieldConvert(headList.get(j));
+										rowList.put(field, df.format(d));
+									} else {
+										field = fieldConvert(headList.get(j));
+										cell.setCellType(HSSFCell.CELL_TYPE_STRING);
+										String stringCellValue = cell.getStringCellValue();
+										if (StringUtils.isNotBlank(stringCellValue)) {
+											String replace = stringCellValue.replace("，", ",");
+											rowList.put(field, replace);
+										} else {
+											rowList.put(field, "");
+										}
+									}
+								}
+							}
+						}
+						if (i > 1) {
+							dataList.add(rowList);
+						}
+					}
+				}
+				if (dataList.size() == 0) {
+					//删除原上传文件
+					FileUnZip.deleteDir(saveDirectory);
+					if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+						throw new JeroBootException("请填写必填字段内容,带*的为必填");
+					}else{
+						throw new JeroBootException("Please fill in the required fields marked with *");
+					}
+
+				}else{
+					//数据转换  JSON.parseObject(JSON.toJSONString(map), MyUser.class)
+					for (Map<String, String> stringStringMap : dataList) {
+						ProjectCertificationInventoryEO projectCertificationInventoryEOTemp = JSON.parseObject(JSON.toJSONString(stringStringMap), ProjectCertificationInventoryEO.class);
+						projectCertificationInventoryEOTemp.setCut(projectCertificationInventoryEO.getCut());
+						projectCertificationInventoryEOTemp.setProjectLibraryId(projectCertificationInventoryEO.getProjectLibraryId());
+						projectCertificationInventoryEOTemp.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+						projectCertificationInventoryEOTemp.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
+						datas.add(projectCertificationInventoryEOTemp);
+					}
+				}
+				// 校验头部是否符合模板
+				String substring = headerSb.toString();
+				if (substring.endsWith(",") || substring.endsWith("，")){
+					substring = headerSb.substring(0, headerSb.length() - 1);
+				}
+
+				String excelHeader = substring.toString();
+				if (!title.equals(excelHeader)) {
+					workbook.close();
+					//删除原上传文件
+					FileUnZip.deleteDir(saveDirectory);
+					if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+						throw new JeroBootException("读取失败，请严格按照模板文件导入数据");
+					}else{
+						throw new JeroBootException("The data fails to be read. Import data strictly according to the template file");
+					}
+				}
+				//必填项校验
+				if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+					for(int k = 0 ; k <datas.size(); k++){
+						if(((datas.get(k).getCategory() == null)||(StringUtils.equals("",datas.get(k).getCategory()))) ||
+								((datas.get(k).getInspectionItem() == null)||(StringUtils.equals("",datas.get(k).getInspectionItem()))) ||
+								((datas.get(k).getConfigItem() == null)||(StringUtils.equals("",datas.get(k).getConfigItem()))) ||
+								((datas.get(k).getWvtaId() == null)||(StringUtils.equals("",datas.get(k).getWvtaId()))) ||
+								((datas.get(k).getSerialNumber() == null)||(StringUtils.equals("",datas.get(k).getSerialNumber()))) ||
+								((datas.get(k).getDutyTerritoryName() == null)||(StringUtils.equals("",datas.get(k).getDutyTerritoryName()))) ||
+								((datas.get(k).getSdtName() == null)||(StringUtils.equals("",datas.get(k).getSdtName()))) ||
+								((datas.get(k).getDutyPersonName() == null)||(StringUtils.equals("",datas.get(k).getDutyPersonName()))) ||
+								((datas.get(k).getDeliverableTypeName() == null)||(StringUtils.equals("",datas.get(k).getDeliverableTypeName()))) ||
+								((datas.get(k).getEndTimeStr() == null)||(StringUtils.equals("",datas.get(k).getEndTimeStr())))){
+							//删除原上传文件
+							FileUnZip.deleteDir(saveDirectory);
+							if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+								throw new JeroBootException("请填写必填字段内容,带*的为必填");
+							}else{
+								throw new JeroBootException("Please fill in the required fields marked with *");
+							}
+						}
+					}
+				}else {
+					for(int k = 0 ; k <datas.size(); k++){
+						if(((datas.get(k).getCategory() == null)||(StringUtils.equals("",datas.get(k).getCategory()))) ||
+								((datas.get(k).getInspectionItem() == null)||(StringUtils.equals("",datas.get(k).getInspectionItem()))) ||
+								((datas.get(k).getConfigItem() == null)||(StringUtils.equals("",datas.get(k).getConfigItem()))) ||
+								((datas.get(k).getWvtaId() == null)||(StringUtils.equals("",datas.get(k).getWvtaId()))) ||
+								((datas.get(k).getSerialNumber() == null)||(StringUtils.equals("",datas.get(k).getSerialNumber()))) ||
+								((datas.get(k).getDutyTerritoryName() == null)||(StringUtils.equals("",datas.get(k).getDutyTerritoryName()))) ||
+								((datas.get(k).getSdtName() == null)||(StringUtils.equals("",datas.get(k).getSdtName()))) ||
+								((datas.get(k).getDutyPersonName() == null)||(StringUtils.equals("",datas.get(k).getDutyPersonName()))) ||
+								((datas.get(k).getDeliverableTypeNameEn() == null)||(StringUtils.equals("",datas.get(k).getDeliverableTypeNameEn()))) ||
+								((datas.get(k).getEndTimeStr() == null)||(StringUtils.equals("",datas.get(k).getEndTimeStr())))){
+							//删除原上传文件
+							FileUnZip.deleteDir(saveDirectory);
+							if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+								throw new JeroBootException("请填写必填字段内容,带*的为必填");
+							}else{
+								throw new JeroBootException("Please fill in the required fields marked with *");
+							}
+						}
+					}
+				}
+			}
+		}
+		workbook.close();
+		List<SysCategory> categoryList = sysCategoryService.list();
+		//普通数据字典
+		List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
+		importDatas(datas, dictItemList, zipEntryName,saveDirectory,projectCertificationInventoryEO,categoryList);
+//		String cut = projectCertificationInventoryEO.getCut();
+//		importDisposeData(datas,cut);
+		//删除原上传文件
+		FileUnZip.deleteDir(saveDirectory);
+
+	}
+
+	private void importDatas(List<ProjectCertificationInventoryEO> datas,
+							 List<SysDictItem> dictItemList, String zipEntryName,
+							 File saveDirectory, ProjectCertificationInventoryEO projectCertificationInventoryEOTemp,
+							 List<SysCategory> categoryList) {
+		List<String> msgList = new ArrayList<>();
+		//模板数据验证
+		msgList = dataTemplateVerify(datas, dictItemList, zipEntryName, projectCertificationInventoryEOTemp, categoryList);
+
+		if (msgList.size() > 0) {
+			//返回报错信息
+			String html = "";
+			for (String s : msgList) {
+				html += s + "</br>";
+			}
+			FileUnZip.deleteDir(saveDirectory);
+			throw new JeroBootException(html);
+		}else {
+			if (datas.size() != 0) {
+				this.saveBatch(datas);
+
+				this.saveProjectCertificationInventoryLog(datas,OperatorTypeEnum.CERTIFICATION_INVENTORY_IMPORT_ADD.getValue());
+
+				Date now = new Date();
+				//设置权限 先删后加
+				List<ProjectUserPermission> adds = new ArrayList<>();
+				for (ProjectCertificationInventoryEO pci: datas) {
+					if (ObjectUtils.isNotEmpty(pci.getSdt())) {
+						setProjectCertificationInventoryPermission(pci.getSdt(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_SDT.getValue());
+					}
+					if (ObjectUtils.isNotEmpty(pci.getDutyPerson())) {
+						setProjectCertificationInventoryPermission(pci.getDutyPerson(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_DP.getValue());
+					}
+				}
+				if (ObjectUtils.isNotEmpty(adds)) {
+					projectUserPermissionService.saveBatch(adds);
+				}
+			}
+		}
+	}
+
+	//模板数据验证
+	private List<String> dataTemplateVerify(List<ProjectCertificationInventoryEO> datas,
+											List<SysDictItem> dictItemList, String zipEntryName,
+											ProjectCertificationInventoryEO projectCertificationInventoryEOTemp,
+											List<SysCategory> categoryList) {
+		String dictId = sysCategoryMapper.getDictId("ren4_zheng4_-_jiao1_fu4_wu4_lei4_xing2");
+		List<SysCategory> collect = categoryList.stream().filter(e -> e.getSysDictId().equals(dictId)).collect(Collectors.toList());
+		List<String> treeNameList = new ArrayList<>();
+		if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
+			treeNameList = collect.stream().map(SysCategory::getName).collect(Collectors.toList());
+		}else{
+			treeNameList = collect.stream().map(SysCategory::getEnName).collect(Collectors.toList());
+		}
+		int i = 2;
+		List<String> msgList = new ArrayList<>();
+		String value = "";
+		boolean flag = true;
+
+//		List<SysUser> listUserName = new ArrayList<>();
+//		listUserName = sysUserMapper.getListUserName();
+//		listUserName = listUserName.stream().distinct().collect(Collectors.toList());
+
+		List<String> userNameList = datas.stream().map(ProjectCertificationInventoryEO::getDutyPersonName).distinct().collect(Collectors.toList());
+		List<SysUser> listUserName = this.sysUserService.querySysUserByUserNameList(userNameList);
+
+		//编号验证
+		verifySerialNumber(datas,projectCertificationInventoryEOTemp);
+		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : datas) {
+			i++;
+			String errorMsg = "";
+			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
+				errorMsg = "第" + i + "行：";
+			}else{
+				errorMsg = i + " line：";
+			}
+			//类别
+			String category = projectCertificationInventoryEO.getCategory();
+			//检验项目
+			String inspectionItem = projectCertificationInventoryEO.getInspectionItem();
+			//配置项
+			String configItem = projectCertificationInventoryEO.getConfigItem();
+			//WVTA ID
+			String wvtaId = projectCertificationInventoryEO.getWvtaId();
+			//标准编号
+			String serialNumber = projectCertificationInventoryEO.getSerialNumber();
+			//责任领域
+			String dutyTerritory = projectCertificationInventoryEO.getDutyTerritoryName();
+			//工程接口人engineeringInterfacePerson
+			String sdt = projectCertificationInventoryEO.getSdtName();
+			//责任人
+			String dutyPerson =  projectCertificationInventoryEO.getDutyPersonName();;
+			//交付物类型
+			String deliverableType = "";
+			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+				deliverableType = projectCertificationInventoryEO.getDeliverableTypeName();
+			}else {
+				deliverableType = projectCertificationInventoryEO.getDeliverableTypeNameEn();
+			}
+
+			//截止时间
+			String endTime = projectCertificationInventoryEO.getEndTimeStr();
+			//报告编号
+			String reportNumber = projectCertificationInventoryEO.getReportNumber();
+			//产品型号
+			String productModel = projectCertificationInventoryEO.getProductModel();
+			//生产企业名称
+			String productionEnterpriseName = projectCertificationInventoryEO.getProductionEnterpriseName();
+
+			//文件
+			//交付物模板
+			String deliverableTemplate = projectCertificationInventoryEO.getDeliverableTemplateName();
+
+			// 认证类型
+			String attestationTypeName = projectCertificationInventoryEO.getAttestationTypeName();
+
+
+
+
+			//编号必填
+//			flag = must(projectCertificationInventoryEO, errorMsg, msgList, serialNumber, "编号", "Standard No");
+
+
+
+			//类别
+			if(StringUtils.isNotBlank(category)){
+				if(category.length() > 300){
+					String message = "";
+					if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
+						message = errorMsg + "类别不能超过300个字符";
+					}else{
+						message = errorMsg + " The Category cannot contain more than 300 characters";
+					}
+					msgList.add(message);
+				}
+			}
+			//检验项目
+			if(StringUtils.isNotBlank(inspectionItem)){
+				if(inspectionItem.length() > 300){
+					String message = "";
+					if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
+						message = errorMsg + "检验项目不能超过300个字符";
+					}else{
+						message = errorMsg + " The InspectionItem cannot contain more than 300 characters";
+					}
+					msgList.add(message);
+				}
+			}
+			//配置项
+			if(StringUtils.isNotBlank(configItem)){
+				if(configItem.length() > 300){
+					String message = "";
+					if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
+						message = errorMsg + "配置项不能超过300个字符";
+					}else{
+						message = errorMsg + " The ConfigItem cannot contain more than 300 characters";
+					}
+					msgList.add(message);
+				}
+			}
+			//WVTA ID
+			if(StringUtils.isNotBlank(wvtaId)){
+				if(wvtaId.length() > 300){
+					String message = "";
+					if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
+						message = errorMsg + "WVTA ID不能超过300个字符";
+					}else{
+						message = errorMsg + " The WVTA ID cannot contain more than 300 characters";
+					}
+					msgList.add(message);
+				}
+			}
+
+			//责任领域
+			if(StringUtils.isNotBlank(dutyTerritory)){
+				value = pullMore(dictItemList, projectCertificationInventoryEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field","duty_territory");
+				if(StringUtils.isNotBlank(value)){
+					projectCertificationInventoryEO.setDutyTerritory(value);
+				}
+			}
+			//工程接口人(责任领域下的工程接口人)
+			Map<String, Object> objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectCertificationInventoryEOTemp.getProjectLibraryId(), value);
+
+			//工程接口人
+			List<Map<String, String>> mapPersonList = (List<Map<String, String>>) objectMap.get("engineeringInterfacePersonList");
+
+
+			String nameCn = "";
+			String nameEn = "";
+			//工程接口人
+			if(StringUtils.isNotBlank(sdt)){
+				nameCn = "工程接口人";
+				nameEn = "Eng. Interface ";
+				//验证人员是否存在
+				personnelVerify(projectCertificationInventoryEO, errorMsg, msgList, sdt, mapPersonList,nameCn,nameEn, com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue());
+			}
+
+			//责任人
+			if(StringUtils.isNotBlank(dutyPerson)){
+				nameCn = "责任人";
+				nameEn = "Assignee";
+				//验证人员是否存在
+				personDutyPerson(projectCertificationInventoryEO, errorMsg, msgList, dutyPerson, listUserName,nameCn,nameEn);
+			}
+
+			//交付物模板
+			value = templateTransition(zipEntryName, projectCertificationInventoryEO, errorMsg, deliverableTemplate,msgList,"交付物模板","Deliverable Template");
+			if(StringUtils.isNotBlank(value)){
+				projectCertificationInventoryEO.setDeliverableTemplate(value);
+			}
+
+			//交付物类型
+			if(StringUtils.isNotEmpty(deliverableType)){
+				value = tree(categoryList,treeNameList, projectCertificationInventoryEO, errorMsg, deliverableType,msgList,"交付物类型","Deliverable Type","deliverable_template");
+				if(StringUtils.isNotBlank(value)){
+					String treeId = getTreeId(categoryList, projectCertificationInventoryEOTemp, treeNameList, value);
+					projectCertificationInventoryEO.setDeliverableType(treeId);
+				}
+			}
+
+			//截止时间
+//			SimpleDateFormat sd = new SimpleDateFormat();
+//			String endTimeStr = sd.format(endTime);
+
+			flag = dateVerify(projectCertificationInventoryEO, errorMsg, endTime,msgList,"截止日期","Due Date");
+			if(flag){
+				SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
+				Date date = null;
+				try {
+					if(!endTime.contains("-")){
+						endTime = DateUtils.coverDate(endTime);
+					}
+					date = sd.parse(endTime);
+				} catch (ParseException e) {
+					e.printStackTrace();
+				}
+				projectCertificationInventoryEO.setEndTime(date);
+			}
+
+			//报告编号
+			if(StringUtils.isNotBlank(reportNumber)){
+				if(reportNumber.length() > 200){
+					String message = "";
+					if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
+						message = errorMsg + "报告编号不能超过200个字符";
+					}else{
+						message = errorMsg + " The Report No cannot contain more than 200 characters";
+					}
+					msgList.add(message);
+				}
+			}
+			//产品型号
+			if(StringUtils.isNotBlank(productModel)){
+				if(productModel.length() > 200){
+					String message = "";
+					if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
+						message = errorMsg + "产品型号不能超过200个字符";
+					}else{
+						message = errorMsg + " The Product Model cannot contain more than 200 characters";
+					}
+					msgList.add(message);
+				}
+			}
+			//生产企业名称
+			if(StringUtils.isNotBlank(productionEnterpriseName)){
+				if(productionEnterpriseName.length() > 200){
+					String message = "";
+					if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
+						message = errorMsg + "生产企业名称不能超过200个字符";
+					}else{
+						message = errorMsg + " The Name Of Manufacturer cannot contain more than 200 characters";
+					}
+					msgList.add(message);
+				}
+			}
+
+			if (StringUtils.isNotEmpty(attestationTypeName)) {
+				value = pullMore(dictItemList, projectCertificationInventoryEO, errorMsg, attestationTypeName,msgList,"认证类型","Certification Type","ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2");
+				if(StringUtils.isNotBlank(value)){
+					projectCertificationInventoryEO.setAttestationType(value);
+				}
+			}
+
+		}
+		return msgList;
+	}
+	//必填
+	private boolean must(ProjectCertificationInventoryEO projectCertificationInventoryEO, String errorMsg,
+						 List<String> msgList, String serialNumber,String nameCn,String nameEn) {
+		int errorCount = 0;
+		if(StringUtils.isBlank(serialNumber)){
+			errorCount ++;
+			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+				errorMsg += nameCn + "为必填项,不能为空, ";
+			}else{
+				errorMsg += nameEn + "This parameter is mandatory and cannot be empty, ";
+			}
+			msgList.add(errorMsg);
+		}
+		if(errorCount == 0){
+			return true;
+		}else{
+			return false;
+		}
+	}
+
+	private boolean dateVerify(ProjectCertificationInventoryEO projectCertificationInventoryEO,
+							   String errorMsg, String field, List<String> msgList, String nameCn, String nameEn) {
+
+		//判断格式是否正确
+		boolean flag = true;
+		if(ObjectUtils.isNotEmpty(field)){
+//			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+//			String format = sdf.format(field);
+			if (!DateUtils.isValidDate(field)) {
+				flag = false;
+				if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+					errorMsg += nameCn + "格式不正确, 正确格式如:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日";
+				}else{
+					errorMsg += nameEn + " Incorrect format correct format is:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日";
+				}
+				msgList.add(errorMsg);
+			}else{
+				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+				Date now = new Date();
+				String nowStr = sdf.format(now);
+//				String fieldStr = sdf.format(field);
+				Date now1 = null;
+				Date field1 = null;
+				try {
+					if(!field.contains("-")){
+						field = DateUtils.coverDate(field);
+					}
+					now1 = sdf.parse(nowStr);
+					field1 = sdf.parse(field);
+					long day = now1.getTime()-field1.getTime();
+					if(day>0){
+						flag = false;
+						if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+							errorMsg += nameCn + "不能导入今天之前的日期";
+						}else{
+							errorMsg += nameEn + " Cannot import dates before today";
+						}
+						msgList.add(errorMsg);
+					}
+				} catch (ParseException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+		return flag;
+	}
+
+	private String templateTransition(String zipEntryName,
+									  ProjectCertificationInventoryEO projectCertificationInventoryEO,
+									  String errorMsg, String deliverableTemplate, List<String> msgList,
+									  String nameCn, String nameEn) {
+		String value = "";
+		if (StringUtils.isNotBlank(deliverableTemplate)) {
+			StringBuilder sb = new StringBuilder();
+			for (String fileName : deliverableTemplate.split(",")) {
+				List<File> nowFileList = new ArrayList<>();
+
+				nowFileList = FileUnZip.readFileByFilename(zipEntryName, fileName,projectCertificationInventoryEO.getCut(),errorMsg,msgList,nameCn,nameEn);
+
+				if (nowFileList.size() == 0) {
+//					if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+//						errorMsg += "压缩包中没有" + fileName + "文件; ";
+//					}else{
+//						errorMsg += " Not in the zip package" + fileName + "file; ";
+//					}
+//					msgList.add(errorMsg);
+				} else {
+					try {
+						FileInputStream input = new FileInputStream(nowFileList.get(0));
+						MultipartFile multipartFile =
+								new MockMultipartFile(nowFileList.get(0).getName(), nowFileList.get(0).getName(), "text/plain", input);
+						//文件存入文件表
+						OSSFile ossFile = iOSSFileService.uploadLocalOfCos(multipartFile, "", null,null);
+						if (ObjectUtils.isNotEmpty(ossFile)) {
+							sb.append(ossFile.getId() + ",");
+						}
+					} catch (IOException e) {
+						log.error("认证清单导入"+e.getMessage());
+					}
+				}
+			}
+			if (StringUtils.isNotBlank(sb)) {
+				value = sb.substring(0, sb.length() - 1);
+			}
+		}
+		return value;
+	}
+
+	private String getTreeId(List<SysCategory> categoryList,
+							 ProjectCertificationInventoryEO projectCertificationInventoryEOTemp,
+							 List<String> treeNameList, String value) {
+		StringBuilder sb = new StringBuilder();
+		for (String valueTemp : value.split(",")) {
+			if (treeNameList.contains(valueTemp)) {
+				List<SysCategory> sysCategoryList = new ArrayList<>();
+				if (CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())) {
+					sysCategoryList = categoryList.stream().filter(e -> e.getName().equals(valueTemp)).collect(Collectors.toList());
+				} else {
+					sysCategoryList = categoryList.stream().filter(e -> e.getEnName().equals(valueTemp)).collect(Collectors.toList());
+				}
+				if (sysCategoryList.size() != 0) {
+					sb.append(sysCategoryList.get(0).getId() + ",");
+				}
+			}
+		}
+		if (StringUtils.isNotBlank(sb)) {
+			String substring = sb.substring(0, sb.length() - 1);
+			return substring;
+		}
+		return null;
+	}
+
+	private String tree(List<SysCategory> categoryList, List<String> nameList,
+						ProjectCertificationInventoryEO projectCertificationInventoryEO,
+						String errorMsg, String value, List<String> msgList,
+						String nameCn, String nameEn, String dictCode) {
+		if (StringUtils.isNotBlank(value)) {
+			StringBuilder sb = new StringBuilder();
+			for (String s : value.split(",")) {
+				if(!nameList.contains(s)){
+					sb.append(s+",");
+				}
+			}
+			if(StringUtils.isNotBlank(sb)){
+				String substring = sb.substring(0, sb.length() - 1);
+				if (CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())) {
+					errorMsg += nameCn + "中的" + substring + "与数据字典不匹配";
+				} else {
+					errorMsg += nameEn + " " + substring + " does not match the data dictionary";
+				}
+				msgList.add(errorMsg);
+			}else{
+				StringBuilder sbTemp = new StringBuilder();
+				for (String s : value.split(",")) {
+					List<SysCategory> collect = new ArrayList<>();
+					if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+						collect = categoryList.stream().filter(e -> s.equals(e.getName())).collect(Collectors.toList());
+						if(collect.size() != 0){
+							sbTemp.append(collect.get(0).getName()+",");
+						}
+					}else{
+						collect = categoryList.stream().filter(e -> s.equals(e.getEnName())).collect(Collectors.toList());
+						if(collect.size() != 0){
+							sbTemp.append(collect.get(0).getEnName()+",");
+						}
+					}
+				}
+				if(StringUtils.isNotBlank(sbTemp)){
+					String substring = sbTemp.substring(0, sbTemp.length() - 1);
+					return substring;
+				}
+			}
+		}
+		return null;
+	}
+	private void personDutyPerson(ProjectCertificationInventoryEO projectCertificationInventoryEO,
+								  String errorMsg, List<String> msgList, String regulationOwnerId,
+								  List<SysUser> listUserName ,String nameCn, String nameEn){
+		//单选
+		if(regulationOwnerId.contains(",")){
+			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+				errorMsg += nameCn + "导入只能填写一个用户名, ";
+			}else{
+				errorMsg += "Only one user name can be entered for"+ nameEn +"import, ";
+			}
+			msgList.add(errorMsg);
+		}
+
+		int count =0;
+		for(SysUser name : listUserName){
+			if(StringUtils.isNotEmpty(name.getUsername())){
+				if(name.getUsername().equals(regulationOwnerId)){
+					count++;
+					String id = name.getId();
+					projectCertificationInventoryEO.setDutyPerson(id);
+					break;
+				}
+			}
+		}
+		if(count==0){
+			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+				errorMsg += nameCn+regulationOwnerId+"与所有人员名单不匹配, ";
+			}else{
+				errorMsg += nameEn+regulationOwnerId+"does not match a person with all person list, ";
+			}
+			msgList.add(errorMsg);
+		}
+	}
+	private void personnelVerify(ProjectCertificationInventoryEO projectCertificationInventoryEO,
+								 String errorMsg, List<String> msgList, String regulationOwnerId,
+								 List<Map<String, String>> mapList, String nameCn, String nameEn, String fieldNumber) {
+		//单选
+		if(regulationOwnerId.contains(",")){
+			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+				errorMsg += nameCn + "导入只能填写一个用户名";
+			}else{
+				errorMsg += "Only one user name can be entered for"+ nameEn +"import";
+			}
+			msgList.add(errorMsg);
+		}
+
+		if(mapList.size() != 0){
+			int count = 0;
+			for (Map<String, String> stringStringMap : mapList) {
+				String name = stringStringMap.get("name");
+				if(regulationOwnerId.equals(name)){
+					count ++;
+					if(com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(fieldNumber)){
+						projectCertificationInventoryEO.setSdt(stringStringMap.get("value"));
+					}
+					break;
+				}
+			}
+			if(count == 0){
+				if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+					errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配";
+				}else{
+					errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list";
+				}
+				msgList.add(errorMsg);
+			}
+		}else{
+			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+				errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配";
+			}else{
+				errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list";
+			}
+			msgList.add(errorMsg);
+		}
+	}
+
+	private String pullMore(List<SysDictItem> dictItemList, ProjectCertificationInventoryEO projectCertificationInventoryEO,
+							String errorMsg, String value, List<String> msgList,
+							String nameCn, String nameEn, String dictCode) {
+		List<String> valueList = new ArrayList<>();
+		if (StringUtils.isNotBlank(value)) {
+			List<String> list = Arrays.asList(value.split(","));
+			List<SysDictItem> sysDictItemList = new ArrayList<>();
+			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+				sysDictItemList = dictItemList.stream().filter(e ->dictCode.equals(e.getDictCode()) && list.contains(e.getItemText())).collect(Collectors.toList());
+			}else{
+				sysDictItemList = dictItemList.stream().filter(e ->dictCode.equals(e.getDictCode()) && list.contains(e.getEnName())).collect(Collectors.toList());
+			}
+
+			if(list.size() == sysDictItemList.size()){
+				valueList = sysDictItemList.stream().map(SysDictItem::getItemValue).collect(Collectors.toList());
+
+			}else{
+				//数据中有与数据字典不匹配的值
+				List<String> finalValueList = valueList;
+				List<String> diffList = list.stream().filter(e -> !finalValueList.contains(e)).collect(Collectors.toList());
+				if (CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())) {
+					errorMsg += nameCn + "中的" + StringUtils.join(diffList,",") + "与数据字典不匹配";
+				} else {
+					errorMsg += nameEn + " " + StringUtils.join(diffList,",") + " does not match the data dictionary";
+				}
+				msgList.add(errorMsg);
+			}
+		}
+		return StringUtils.join(valueList,",");
+	}
+
+
+	//编号验证
+	private void verifySerialNumber(List<ProjectCertificationInventoryEO> datas,
+									ProjectCertificationInventoryEO projectCertificationInventoryEOTemp) {
+
+
+		List<String> serialNumberList = datas.stream().map(ProjectCertificationInventoryEO::getSerialNumber).collect(Collectors.toList());
+		//1. 验证标准号在文档库中是否存在
+		LambdaQueryWrapper<BussDocumentLibraryEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.in(BussDocumentLibraryEO::getSerialNumber,serialNumberList);
+		List<BussDocumentLibraryEO> bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapper);
+		//文档库中可能存在重复的标准号
+		List<String> serialNumberListTemp = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).distinct().collect(Collectors.toList());
+		if(serialNumberList.size() != serialNumberListTemp.size()){
+			//存在文档库没有的数据
+			List<String> collect = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList());
+			List<String> serialNumbers = serialNumberList.stream().filter(e -> !collect.contains(e)).collect(Collectors.toList());
+			if(serialNumbers.size() > 0){
+				if(CutEnum.CN.getValue().equals(datas.get(0).getCut())){
+					throw new JeroBootException(StringUtils.join(serialNumbers,",")+"文档库中不存在,不能添加");
+				}else{
+					throw new JeroBootException(StringUtils.join(serialNumbers,",")+" does not exist in the document library and cannot be added");
+				}
+			}
+		}else{
+			//验证编号在法规清单中是否存在
+			LambdaQueryWrapper<ProjectLawsInventoryEO> lwrapper = new LambdaQueryWrapper<>();
+			lwrapper.in(ProjectLawsInventoryEO::getSerialNumber,serialNumberList);
+			List<ProjectLawsInventoryEO> projectLawsInventoryEOList = platformProjectLawsInventoryEOService.list(lwrapper);
+			List<String> LawSerialNumberListTemp = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.toList());
+			if(serialNumberList.size() != LawSerialNumberListTemp.size()){
+				//存在法规清单中没有的数据
+				List<String> collect = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).collect(Collectors.toList());
+				List<String> serialNumbers = serialNumberList.stream().filter(e -> !collect.contains(e)).collect(Collectors.toList());
+				if(serialNumbers.size() > 0){
+					if(CutEnum.CN.getValue().equals(datas.get(0).getCut())){
+						throw new JeroBootException(StringUtils.join(serialNumbers,",")+"法规清单中不存在,不能添加");
+					}else{
+						throw new JeroBootException(StringUtils.join(serialNumbers,",")+" does not exist in the project laws and cannot be added");
+					}
+				}
+			}
+//			else{
+//				for (ProjectCertificationInventoryEO projectCertificationInventoryEO : datas) {
+//					List<BussDocumentLibraryEO> collect = bussDocumentLibraryEOList.stream()
+//							.filter(e -> e.getSerialNumber().equals(projectCertificationInventoryEO.getSerialNumber())).collect(Collectors.toList());
+//					projectCertificationInventoryEO.setBussDocumentLibraryId(collect.get(0).getId());
+//				}
+//			}
+		}
+
+	}
+	public static <T> List<ProjectCertificationInventoryDutyEnginnerEO> copy(List<ProjectCertificationInventoryEO> list,
+																 Class<ProjectCertificationInventoryDutyEnginnerEO> clazz) {
+		String oldOb = JSON.toJSONString(list);
+		return JSON.parseArray(oldOb, clazz);
+	}
+
+
+	/**
+	 * 导出数据
+	 * @param response
+	 * @param request
+	 * @param projectCertificationInventoryEO
+	 */
+	@Override
+	public void exportData(HttpServletResponse response, HttpServletRequest request, ProjectCertificationInventoryEO projectCertificationInventoryEO) {
+		List<ProjectCertificationInventoryEO> dataList = new ArrayList<>();
+		QueryWrapper<ProjectCertificationInventoryEO> queryWrapper = QueryGenerator.initQueryWrapper(projectCertificationInventoryEO,request.getParameterMap());
+		queryWrapper.in("project_library_id",projectCertificationInventoryEO.getProjectLibraryId());
+		if(StringUtils.isNotBlank(projectCertificationInventoryEO.getIds())){
+			queryWrapper.in("id",Arrays.asList(projectCertificationInventoryEO.getIds().split(",")));
+		}
+		queryWrapper.orderByDesc("create_time");
+		//获取当前的projectId
+		String projectId = projectCertificationInventoryEO.getProjectLibraryId();
+		//获取当前用户
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		Map<String,Object> params = new HashMap<>();
+		params.put("projectLibraryId",projectId);
+		params.put("userId",currentUser.getId());
+		params.put("modelType",RoleRelModelTypeEnum.CERTIFICATION_INVENTORY.getValue());
+		ProjectLibraryRoleRelEO projectLibraryRoleRelEO = projectLibraryRoleRelEOService.queryByProjectLibraryIdAndUserId(params);
+		String roleCode = projectLibraryRoleRelEO.getRoleCode();
+		// 创建查询权限
+		this.createQueryPermission(queryWrapper,roleCode);
+		//导出的数据
+		dataList = this.list(queryWrapper);
+		//文件
+		List<OSSFile> fileInfos = getOssFiles(dataList);
+		//处理文件名称
+
+		String fileName = "";
+		for (int i = 0; i < dataList.size(); i++) {
+			if(StringUtils.isNotEmpty(dataList.get(i).getDeliverableTemplate())){
+				String deliverableTemplateName = template(fileInfos, dataList.get(i).getDeliverableTemplate());
+				dataList.get(i).setDeliverableTemplateName(deliverableTemplateName);
+			}
+		}
+		String cut = projectCertificationInventoryEO.getCut();
+		disposeData(dataList,cut);
+		List<ProjectCertificationInventoryDutyEnginnerEO> copy = copy(dataList,ProjectCertificationInventoryDutyEnginnerEO.class);
+
+
+
+		OutputStream os = null;
+		try {
+			response.setContentType("application/force-download");
+			Workbook workbook = new XSSFWorkbook();
+			String path = uploadpath + "/tempZip";
+			File fileTemp = new File(path);
+			if (fileTemp.exists()) {
+				fileTemp.delete();
+			}
+			fileTemp.mkdirs();
+			//文件
+			exportFile(dataList,fileInfos);
+
+
+			for(int i =0 ;i<dataList.size();i++){
+				if(dataList.get(i).getValueType()!=null){
+					if(dataList.get(i).getValueType().equals(SysCategoryValueTypeEnum.FILE.getValue())){
+						if(StringUtils.isNotEmpty(dataList.get(i).getDeliveryResult())){
+							fileName = ossFileService.getFileInfos(dataList.get(i).getDeliveryResult()).stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(","));
+							dataList.get(i).setDeliveryResult(fileName);
+
+						}
+					}else if(dataList.get(i).getValueType().equals(SysCategoryValueTypeEnum.TEXT.getValue())){
+						if(StringUtils.isNotEmpty(dataList.get(i).getDeliveryResult())){
+							fileName = dataList.get(i).getDeliveryResult();
+							dataList.get(i).setDeliveryResult(fileName);
+						}
+					}else if(dataList.get(i).getValueType().equals(SysCategoryValueTypeEnum.NA.getValue())){
+						fileName = "";
+						dataList.get(i).setDeliveryResult(fileName);
+					}else if(dataList.get(i).getValueType().equals(SysCategoryValueTypeEnum.SELECT.getValue())) {
+						if (StringUtils.isNotEmpty(dataList.get(i).getDeliveryResult())) {
+							fileName = dataList.get(i).getDeliveryResult();
+							if(fileName.equals("1")){
+								fileName = "是";
+							}else if(fileName.equals("2")){
+								fileName = "否";
+							}
+							dataList.get(i).setDeliveryResult(fileName);
+						}
+					}
+				}
+
+			}
+
+
+
+			String excelName = projectCertificationInventoryEO.getExcelName()+".xlsx";
+//			String excelName = "";
+//			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+//				excelName = "认证清单.xlsx";
+//			}else{
+//				excelName = "Certification List.xlsx";
+//			}
+			//excel
+			OutputStream excelOS = new FileOutputStream(path + File.separator + excelName);
+			ExportParams exportParams = new ExportParams();
+			exportParams.setType(ExcelType.XSSF);
+			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+				if(ProjectRoleEnum.INTERFACE_PERSON.getValue().equals(roleCode) ||
+						ProjectRoleEnum.PERSON_LIABLE.getValue().equals(roleCode)){
+					workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryDutyEnginnerEO.class, copy);
+				}else{
+					workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryEO.class, dataList);
+				}
+			}else{
+				if(ProjectRoleEnum.INTERFACE_PERSON.getValue().equals(roleCode) ||
+						ProjectRoleEnum.PERSON_LIABLE.getValue().equals(roleCode)){
+					List<ProjectCertificationInventoryDutyEnginnerEOEn> copyEn = new ArrayList<>();
+					for (ProjectCertificationInventoryDutyEnginnerEO projectCertificationInventoryDutyEnginnerEOTemp : copy) {
+						ProjectCertificationInventoryDutyEnginnerEOEn projectCertificationInventoryDutyEnginnerEOEn = new ProjectCertificationInventoryDutyEnginnerEOEn();
+						BeanUtils.copyProperties(projectCertificationInventoryDutyEnginnerEOTemp,projectCertificationInventoryDutyEnginnerEOEn);
+						copyEn.add(projectCertificationInventoryDutyEnginnerEOEn);
+					}
+					workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryDutyEnginnerEOEn.class, copyEn);
+				}else{
+					List<ProjectCertificationInventoryEOEn> dataListEn = new ArrayList<>();
+					for (ProjectCertificationInventoryEO projectCertificationInventoryEOTemp : dataList) {
+						ProjectCertificationInventoryEOEn projectCertificationInventoryEOEn = new ProjectCertificationInventoryEOEn();
+						BeanUtils.copyProperties(projectCertificationInventoryEOTemp,projectCertificationInventoryEOEn);
+						dataListEn.add(projectCertificationInventoryEOEn);
+					}
+					//下拉选中英文转换
+//				transition(dataListEn,projectCertificationInventoryEO);
+					workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryEOEn.class, dataListEn);
+				}
+			}
+			workbook.write(excelOS);
+			excelOS.flush();
+
+			ZipUtil.zip(path, path + ".zip");
+			//文件
+			FileInputStream fis = new FileInputStream(path + ".zip");
+			os = response.getOutputStream();
+
+			int len = 0;
+			while ((len = fis.read()) != -1) {
+				os.write(len);
+			}
+			os.flush();
+			fis.close();
+		} catch (IOException e) {
+			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+				throw new JeroBootException("下载文件失败");
+			}else{
+				throw new JeroBootException("Failed to download file");
+			}
+		} finally {
+			IOUtils.closeQuietly(os);
+			File file = new File(uploadpath + "/tempZip");
+			FileUtil.deleteContents(file);
+		}
+
+	}
+
+	private void exportFile(List<ProjectCertificationInventoryEO> dataList, List<OSSFile> fileInfos) throws IOException{
+		if(fileInfos.size() != 0){
+			for(ProjectCertificationInventoryEO projectCertificationInventoryEO : dataList){
+				String deliverableTemplate = projectCertificationInventoryEO.getDeliverableTemplate();
+				String serialNumber = projectCertificationInventoryEO.getSerialNumber();
+				String deliveryResult = projectCertificationInventoryEO.getDeliveryResult();
+				if(StringUtils.isBlank(serialNumber)){
+					continue;
+				}
+				List<OSSFile> deliverableTemplateFileList = new ArrayList<>();
+				List<OSSFile> deliveryResultList = new ArrayList<>();
+				List<OSSFile> oSSFileList = new ArrayList<>();
+				if(StringUtils.isNotBlank(deliverableTemplate)){
+					deliverableTemplateFileList = fileInfos.stream().filter(e -> deliverableTemplate.contains(e.getId())).collect(Collectors.toList());
+					oSSFileList.addAll(deliverableTemplateFileList);
+				}
+				if(StringUtils.isNotBlank(deliveryResult) && projectCertificationInventoryEO.getValueType().equals(SysCategoryValueTypeEnum.FILE.getValue())){
+					deliveryResultList = fileInfos.stream().filter(e -> deliveryResult.contains(e.getId())).collect(Collectors.toList());
+					oSSFileList.addAll(deliveryResultList);
+
+				}
+				if(oSSFileList.size() != 0){
+					if(serialNumber.contains("/")){
+						serialNumber = serialNumber.replaceAll("/","-");
+					}
+					String fileNowPath = uploadpath + "/tempZip/" + serialNumber;
+					File file = new File(fileNowPath);
+					if (file.exists()) {
+						file.delete();
+					}
+					file.mkdirs();
+					for (OSSFile ossFile : oSSFileList) {
+						String url = ossFile.getUrl();
+						if(StringUtils.isNotBlank(url)){
+							//判断文件是否存在
+							boolean b = CosBootUtil.doesObjectExist(url);
+							if(b){
+								InputStream download = CosBootUtil.download(url);
+								copyFile(download, fileNowPath + File.separator + ossFile.getFileName());
+							}
+						}
+					}
+				}
+			}
+
+		}
+	}
+
+	private String template(List<OSSFile> fileInfos, String value) {
+		StringBuilder sb = new StringBuilder();
+		for (String s : value.split(",")) {
+			List<OSSFile> collect = fileInfos.stream().filter(e -> s.equals(e.getId())).collect(Collectors.toList());
+			if(collect.size() != 0){
+				sb.append(collect.get(0).getFileName()+",");
+			}
+		}
+		String substring = "";
+		if(StringUtils.isNotBlank(sb)){
+			substring = sb.substring(0, sb.length() - 1);
+		}
+		return substring;
+	}
+
+	private List<OSSFile> getOssFiles(List<ProjectCertificationInventoryEO> dataList) {
+		List<String> fileIdList = new ArrayList<>();
+		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : dataList) {
+			if(StringUtils.isNotBlank(projectCertificationInventoryEO.getDeliverableTemplate())){
+				fileIdList.add(projectCertificationInventoryEO.getDeliverableTemplate());
+			}
+			if(StringUtils.isNotBlank(projectCertificationInventoryEO.getDeliveryResult())){
+				fileIdList.add(projectCertificationInventoryEO.getDeliveryResult());
+			}
+		}
+		//查询所有的文件
+		List<OSSFile> fileInfos = new ArrayList<>();
+		if(fileIdList.size() != 0){
+			fileInfos = iOSSFileService.getFileInfos(StringUtils.join(fileIdList, ","));
+		}
+		return fileInfos;
+	}
+
+	private String pull(List<SysDictItem> sysDictItems, String field,String dictCode) {
+		if(StringUtils.isBlank(field)){
+			return null;
+		}
+		StringBuilder sb = new StringBuilder();
+		for (String s : field.split(",")) {
+			List<SysDictItem> collect = sysDictItems.stream().filter(e -> dictCode.equals(e.getDictCode()) && s.equals(e.getItemValue())).collect(Collectors.toList());
+			if(collect.size() != 0){
+				sb.append(collect.get(0).getEnName() + ",");
+			}
+		}
+		if(StringUtils.isNotBlank(sb)){
+			String substring = sb.substring(0, sb.length() - 1);
+			return substring;
+		}
+		return null;
+	}
+
+
+	//判断row是否为空  空返回true
+	public boolean isRowEmpty(Row row) {
+		if (null == row) {
+			return true;
+		}
+		int firstCellNum = row.getFirstCellNum();   //第一个列位置
+		int lastCellNum = row.getLastCellNum();     //最后一列位置
+		int nullCellNum = 0;    //空列数量
+		for (int c = firstCellNum; c < lastCellNum; c++) {
+			Cell cell = row.getCell(c);
+			if (null == cell) {
+				nullCellNum++;
+				continue;
+			}
+			String value = "";
+			switch (cell.getCellType()) {
+				case HSSFCell.CELL_TYPE_NUMERIC: // 数字
+					//如果为时间格式的内容
+					value = String.valueOf(cell.getNumericCellValue());
+					break;
+				case HSSFCell.CELL_TYPE_STRING: // 字符串
+					value = cell.getStringCellValue();
+					break;
+				case HSSFCell.CELL_TYPE_BOOLEAN: // Boolean
+					value = cell.getBooleanCellValue() + "";
+					break;
+				case HSSFCell.CELL_TYPE_FORMULA: // 公式
+					value = cell.getCellFormula() + "";
+					break;
+				default:
+					break;
+			}
+			if (org.apache.commons.lang.StringUtils.isEmpty(value)) {
+				nullCellNum++;
+			}
+		}
+		//所有列都为空
+		if (nullCellNum == (lastCellNum - firstCellNum)) {
+			return true;
+		}
+		return false;
+	}
+
+	private String fieldConvert(String field){
+		if (field == null) return null;
+		switch (field) {
+			case "*类别": return "category";
+			case "*检验项目": return "inspectionItem";
+			case "*配置项": return "configItem";
+			case "*WVTA ID": return "wvtaId";
+			case "*标准编号": return "serialNumber";
+			case "*责任领域": return "dutyTerritoryName";
+			case "*认证类型": return "attestationTypeName";
+			case "*工程接口人": return "sdtName";
+			case "*责任人": return "dutyPersonName";
+			case "*交付物类型": return "deliverableTypeName";
+			case "交付物模板": return "deliverableTemplateName";
+			case "交付结果": return "deliveryResult";
+			case "截止日期": return "endTime";
+			case "*截止日期": return "endTimeStr";
+			case "流程状态": return "flowStatus";
+			case "报告编号": return "reportNumber";
+			case "产品型号": return "productModel";
+			case "生产企业名称": return "productionEnterpriseName";
+			case "认证进度": return "certificationProgress";
+
+			case "*Category": return "category";
+			case "*Inspection Items": return "inspectionItem";
+			case "*Configuration Item": return "configItem";
+			case "*Standard No": return "serialNumber";
+			case "*Responsible Field": return "dutyTerritoryName";
+			case "*Certification Type": return "attestationTypeName";
+			case "*Eng. Interface": return "sdtName";
+			case "*Assignee": return "dutyPersonName";
+			case "*Deliverable Type": return "deliverableTypeNameEn";
+			case "Deliverable Template": return "deliverableTemplateName";
+			case "Deliverables Result": return "deliveryResult";
+			case "Due Date": return "endTime";
+			case "*Due Date": return "endTimeStr";
+			case "Process Status": return "flowStatus";
+			case "Report No": return "reportNumber";
+			case "Product Model": return "productModel";
+			case "Name Of Manufacturer": return "productionEnterpriseName";
+			case "Homologation Progress": return "certificationProgress";
+
+			default: return null;
+			//"Deliverable Type,Deliverable Template,initiator,Assignee,Due Date," +
+		}
+	}
+
+	/**
+	 * 模板下载
+	 * @param projectCertificationInventoryEO
+	 * @param response
+	 * @param request
+	 */
+	@Override
+	public void exportTemplate(ProjectCertificationInventoryEO projectCertificationInventoryEO, HttpServletResponse response, HttpServletRequest request) {
+		OutputStream os = null;
+		HSSFWorkbook workbook = new HSSFWorkbook();
+		String fileOriName = "认证清单导入模板.xls";
+		String filePath = uploadpath + File.separator + fileOriName;
+
+		try {
+			String title = "";
+			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";
+			}
+
+			List<String> list = Arrays.asList(title.split(","));
+			int index = 0;
+			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+				index = list.indexOf("生产企业名称") + 1;
+			}else{
+				index = list.indexOf("Name Of Manufacturer") + 1;
+			}
+
+			//创建临时文件夹
+			File nowFile = new File(filePath);
+			if (nowFile.exists()) {
+				nowFile.delete();
+			}
+			nowFile.mkdirs();
+			HSSFSheet sheet = workbook.createSheet("认证清单导入模板");
+			sheet.setDefaultColumnWidth(16);//列宽
+
+			HSSFCellStyle cellStyle = workbook.createCellStyle();
+			cellStyle.setDataFormat((short) 49);
+			sheet.setDefaultColumnStyle(10,cellStyle);
+
+//			cellStyle.setWrapText(true);//自动换行
+//			cellStyle.setAlignment(HorizontalAlignment.CENTER);//垂直居中
+//			cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//水平居中
+
+			HSSFCellStyle cellStyleTemp = workbook.createCellStyle();
+			cellStyleTemp.setWrapText(true);//自动换行
+
+			CellRangeAddress region =
+					new CellRangeAddress(1, 1, 0, 13); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列
+			sheet.addMergedRegion(region);
+			String explain= "";
+			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+				explain = "填写说明\n" +
+						"1.导入数据从第三行开始\n" +
+						"2.所有带*号的字段必须填写\n"+
+						"3.责任人,交付物类型,工程接口人,编号,责任领域,字段是单选属性,必须和系统中的对应字段选项相匹配\n" +
+						"4.类别,WVTA ID,检验项目,配置项,填写文本内容\n" +
+						"5.交付物模板字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.docx,则应填写AAA/B.docx";
+			}else{
+				explain = "Filling explanation\n" +
+						"1.Import data starts at the third line\n" +
+						"2.All fields marked with * must be filled in\n"+
+						"3.Assignee,Deliverable Type,Eng. Interface,Standard No,Responsible Field,Fields are radio attributes that must match the corresponding field option in the system\n" +
+						"4.Category,WVTA ID,Configuration Item,Inspection Items,Fill in the text\n" +
+						"5.Deliverable Template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. docx is stored under the AAA standard number, enter AAA/B. docx";
+			}
+			for(int i = 0; i < 2; i++){
+				//表头
+				Row row = sheet.createRow(i);//开始创建标题行
+				String[] headerArr = title.split(",");
+				if(i == 0 ){
+					for (int m = 0; m < headerArr.length; m++) {
+						if(m < index){
+							row.createCell(m).setCellValue(headerArr[m]);
+						}else {
+							break;
+						}
+					}
+				}else {
+					short height = (short) (6 * 252);
+					row.setHeight((short) height);
+					Cell cell = row.createCell(0);
+					cell.setCellStyle(cellStyleTemp);
+					cell.setCellValue(new HSSFRichTextString(explain));
+				}
+			}
+			response.setHeader("Content-Disposition",
+					"attachment; filename=\"" + fileOriName + ".xls");
+			response.setContentType("application/force-download");
+			response.flushBuffer();
+			os = response.getOutputStream();
+			workbook.write(os);
+		}catch (Exception e){
+			e.printStackTrace();
+			throw new JeroBootException("下载文件失败，请重试");
+		}finally {
+			IOUtils.closeQuietly(os);
+		}
+	}
+
+
+	@Override
+	public Result<?> citeDeliverable(JSONObject json) {
+		String cut = json.getString("cut");
+		String resultMsg = "";
+		if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+			resultMsg = "引用交付物成功！";
+		}else {
+			resultMsg = "Successfully referenced deliverables!";
+		}
+
+
+		String projectCertificationInventoryIds = json.getString("projectCertificationInventoryIds");
+		if(StringUtils.isEmpty(projectCertificationInventoryIds)){
+			throw new JeroBootException("请选择需要引用的认证清单数据！");
+		}
+		String projectLibraryId = json.getString("projectLibraryId");
+
+		String citeProjectLibraryId = json.getString("citeProjectLibraryId");
+		if(StringUtils.isEmpty(citeProjectLibraryId)){
+			throw new JeroBootException("请选择引用的项目！");
+		}
+
+		QueryWrapper<ProjectCertificationInventoryEO> queryWrapper = new QueryWrapper<>();
+		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getId,projectCertificationInventoryIds.split(","));
+		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.list(queryWrapper);
+
+		if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOList)){
+			QueryWrapper<ProjectCertificationInventoryEO> citeQueryWrapper = new QueryWrapper<>();
+			citeQueryWrapper.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,citeProjectLibraryId);
+			citeQueryWrapper.lambda().eq(ProjectCertificationInventoryEO::getFlowStatus,CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue());
+			List<ProjectCertificationInventoryEO> citeProjectCertificationInventoryEOList = this.baseMapper.selectList(citeQueryWrapper);
+
+			if(CollectionUtils.isNotEmpty(citeProjectCertificationInventoryEOList)){
+
+
+//				citeProjectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getInspectionItem).distinct().collect(Collectors.joining(","));
+//				return Result.OK("所选检验项目"+""+"暂未维护，需要进行手动填写。");
+				//The review passed data in the selected reference project is empty, please reselect!
+				// 没有引用的数据 检验项目集合，给到前端进行展示。
+				List<String> noCiteInspectionItem = new ArrayList<>();
+				for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
+					String deliveryResult = "";
+					for (ProjectCertificationInventoryEO citeProjectCertificationInventoryEO : citeProjectCertificationInventoryEOList) {
+						// 匹配数据  类别、检验项目、配置项、标准编号、交付物类型完全一致，并且数据的状态为 审查完成
+						boolean flag = (
+								StringUtils.equals(projectCertificationInventoryEO.getCategory(),citeProjectCertificationInventoryEO.getCategory())
+								&& StringUtils.equals(projectCertificationInventoryEO.getInspectionItem(),citeProjectCertificationInventoryEO.getInspectionItem())
+								&& StringUtils.equals(projectCertificationInventoryEO.getConfigItem(),citeProjectCertificationInventoryEO.getConfigItem())
+								&& StringUtils.equals(projectCertificationInventoryEO.getSerialNumber(),citeProjectCertificationInventoryEO.getSerialNumber())
+								&& StringUtils.equals(projectCertificationInventoryEO.getDeliverableType(),citeProjectCertificationInventoryEO.getDeliverableType())
+						);
+
+						if(flag){
+							deliveryResult = citeProjectCertificationInventoryEO.getDeliveryResult();
+							break;
+						}
+					}
+					if(StringUtils.isNotBlank(deliveryResult)){
+						projectCertificationInventoryEO.setDeliveryResult(deliveryResult);
+					}else {
+						noCiteInspectionItem.add(projectCertificationInventoryEO.getInspectionItem() + "-" +projectCertificationInventoryEO.getConfigItem());
+					}
+				}
+
+				this.updateBatchById(projectCertificationInventoryEOList);
+
+				// 如果有 （没有引用的数据 检验项目集合，给到前端进行展示。）
+				if(CollectionUtils.isNotEmpty(noCiteInspectionItem)){
+					String noCiteInspectionItemStr = noCiteInspectionItem.stream().distinct().collect(Collectors.joining(","));
+					if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+						resultMsg = "所选检验项目"+noCiteInspectionItemStr+"暂未维护，需要进行手动填写。";
+					}else {
+						resultMsg = "The selected inspection characteristic "+noCiteInspectionItemStr+" is not currently maintained and needs to be manually filled in.";
+					}
+				}
+			}else {
+				// 如果引用的项目中没有审查完成的数据 ，提示用户。
+				if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+					resultMsg = "所选引用项目中审查通过数据为空，请重新选择！";
+				}else {
+					resultMsg = "The review passed data in the selected reference project is empty, please reselect!";
+				}
+			}
+		}
+
+		return Result.OK(resultMsg);
+	}
+
+	private void setProjectCertificationInventoryPermission(String userId, String projectId,String certificationInventoryId,Date now, List<ProjectUserPermission> adds, String belong) {
+		QueryWrapper<ProjectUserPermission> del = new QueryWrapper<>();
+		del.eq("project_id", projectId)
+				.eq("belong", belong)
+				.eq("description", PermissionDescriptionEnum.PROJECT_CERTIFICATION_INVENTORY.getValue() + certificationInventoryId);
+		projectUserPermissionService.remove(del);
+
+		ProjectUserPermission permission = new ProjectUserPermission();
+		permission.setProjectId(projectId);
+		permission.setUserId(userId);
+		permission.setBelong(belong);
+		permission.setDescription(PermissionDescriptionEnum.PROJECT_CERTIFICATION_INVENTORY.getValue() + certificationInventoryId);
+		permission.setCreateTime(now);
+		permission.setUpdateTime(now);
+		adds.add(permission);
+	}
+
+	/**
+	 * 保存认证清单修改历史
+	 * @param pciList
+	 * @param operateType
+	 */
+	public void saveProjectCertificationInventoryLog(List<ProjectCertificationInventoryEO> pciList,String operateType){
+		if(CollectionUtils.isNotEmpty(pciList)){
+			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			String projectLibraryId = pciList.get(0).getProjectLibraryId();
+			ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+			if(ObjectUtils.isNotEmpty(projectLibraryBase)){
+				List<SysUser> studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(Arrays.asList(projectLibraryBase.getStudioEngineer().split(",")));
+
+				String certificationEngineerUserNames = "";
+				if(StringUtils.isNotBlank(projectLibraryBase.getCertificationEngineer())){
+					List<String> certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
+					List<SysUser> certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList);
+					certificationEngineerUserNames = certificationEngineerList.stream().map(SysUser::getUsername).distinct().collect(Collectors.joining(","));
+				}
+
+				List<ProjectCertificationInventoryLogEO> pciLogEOList = new ArrayList<>();
+				for (ProjectCertificationInventoryEO pci : pciList) {
+					StringBuilder contentCnSb = new StringBuilder();
+					StringBuilder contentEnSb = new StringBuilder();
+					if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_ADD.getValue())){
+						contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 ");
+						contentCnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
+						contentCnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
+						contentCnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
+						contentCnSb.append("\"").append(pci.getSerialNumber()).append("\"").append(" ");
+
+						contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added ");
+						contentEnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
+						contentEnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
+						contentEnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
+						contentEnSb.append("\"").append(pci.getSerialNumber()).append("\"");
+					} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_ISSUE.getValue())){
+						contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("发布了认证清单");
+						contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" has published a certification list");
+					} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_RETURNED.getValue())){
+						contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("审核退回");
+						contentCnSb.append("，退回原因:\"").append(pci.getReasonForReturn()).append("\"");
+						contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" review and returned");
+						contentEnSb.append(",Reason for return:\"").append(pci.getReasonForReturn()).append("\"");
+					} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_THROUGH.getValue())){
+						contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("审核通过");
+						contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" pass the audit");
+					} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_SUBMIT_TASK.getValue())){
+						if (StringUtils.equals(pci.getValueType(), SysCategoryValueTypeEnum.FILE.getValue())) {
+							String fileName = "N/A";
+							if (StringUtils.isNotEmpty(pci.getDeliveryResult())) {
+								fileName = this.ossFileService.getFileInfos(pci.getDeliveryResult()).stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(","));
+							}
+							contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("提交了附件 ").append(fileName);
+							contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" submitted attachment ").append(fileName);
+						}else {
+							String deliveryResult = (StringUtils.isNotEmpty(pci.getDeliveryResult()) ? pci.getDeliveryResult() : "N/A");
+							contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("提交了交付结果为").append(deliveryResult);
+							contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" submitted a delivery result of ").append(deliveryResult);
+						}
+					} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_ACCEPT_TASK.getValue())){
+						contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("接受了任务信息");
+						contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" accepts the task information");
+					} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_REJECT_TASK.getValue())){
+						contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("退回了任务信息");
+						contentCnSb.append("，拒绝原因:\"").append(pci.getReasonForReturn()).append("\"");
+						contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" returned the task information");
+						contentEnSb.append(",Reject for Reason:\"").append(pci.getReasonForReturn()).append("\"");
+					} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_RETURNED_STUDIO_TASK.getValue())){
+						contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("拒绝，流程退回至")
+								.append("\"").append(studioEngineerUserInfo.get(0).getUsername()).append("\"");
+						contentCnSb.append("，退回原因:\"").append(pci.getReasonForReturn()).append("\"");
+						contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" refuses, and the process returns to ")
+								.append("\"").append(studioEngineerUserInfo.get(0).getUsername()).append("\"");
+						contentEnSb.append(",Reason for return:\"").append(pci.getReasonForReturn()).append("\"");
+					} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_INITIATING_TASK.getValue())){
+						contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("发起了Pre-Homo流程");
+						contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" initiates the Pre-Homo process");
+					} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_RESET.getValue())){
+						contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("操作了流程重置功能");
+						contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" has operated the process reset function");
+					} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_WITHDRAW.getValue())){
+						contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("从").append("\"").append(certificationEngineerUserNames).append("\"撤回了流程");
+						contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" withdrew the process from \"").append(certificationEngineerUserNames).append("\"");
+					} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_CALL_ADD.getValue())){
+						contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 ");
+						contentCnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
+						contentCnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
+						contentCnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
+						contentCnSb.append("\"").append(pci.getSerialNumber()).append("\"").append(" ");
+
+						contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added ");
+						contentEnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
+						contentEnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
+						contentEnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
+						contentEnSb.append("\"").append(pci.getSerialNumber()).append("\"");
+					} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_IMPORT_ADD.getValue())){
+						contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 ");
+						contentCnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
+						contentCnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
+						contentCnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
+						contentCnSb.append("\"").append(pci.getSerialNumber()).append("\"").append(" ");
+
+						contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added ");
+						contentEnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
+						contentEnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
+						contentEnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
+						contentEnSb.append("\"").append(pci.getSerialNumber()).append("\"");
+					} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_ADD_CONFIG.getValue())){
+						contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 ");
+						contentCnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
+						contentCnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
+						contentCnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
+						contentCnSb.append("\"").append(pci.getSerialNumber()).append("\"").append(" ");
+
+						contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added ");
+						contentEnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
+						contentEnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
+						contentEnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
+						contentEnSb.append("\"").append(pci.getSerialNumber()).append("\"");
+					}
+
+					ProjectCertificationInventoryLogEO pciLogEO = new ProjectCertificationInventoryLogEO();
+					pciLogEO.setProjectCertificationInventoryId(pci.getId());
+					pciLogEO.setContentCn(contentCnSb.toString());
+					pciLogEO.setContentEn(contentEnSb.toString());
+					pciLogEO.setOperatorType(operateType);
+					pciLogEOList.add(pciLogEO);
+				}
+
+				if(CollectionUtils.isNotEmpty(pciLogEOList)){
+					this.projectCertificationInventoryLogEOService.insertBatch(pciLogEOList);
+				}
+			}
+		}
+	}
+
+	/**
+	 * 保存认证清单修改历史（编辑、批量设置专用）
+	 * @param params
+	 */
+	public void saveProjectCertificationInventoryLog(Map<String,Object> params){
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		List<ProjectCertificationInventoryEO> editBeforePciList = (List<ProjectCertificationInventoryEO>) params.get("editBeforePciList");
+		List<ProjectCertificationInventoryEO> editAfterPciList = (List<ProjectCertificationInventoryEO>) params.get("editAfterPciList");
+		String operatorType = (String) params.get("operatorType");
+
+		if(CollectionUtils.isNotEmpty(editBeforePciList) && CollectionUtils.isNotEmpty(editAfterPciList)){
+			List<SysCategory> categoryList = this.sysCategoryService.list();
+			List<SysDictItem> sysDictItems = this.sysDictItemServiceImpl.getBaseMapper().selectItemsAll();
+
+			List<String> beforeSdtUserIdList = editBeforePciList.stream().map(ProjectCertificationInventoryEO::getSdt).distinct().collect(Collectors.toList());
+			List<String> beforeDutyPersonUserIdList = editBeforePciList.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList());
+
+			List<String> afterSdtUserIdList = editAfterPciList.stream().map(ProjectCertificationInventoryEO::getSdt).distinct().collect(Collectors.toList());
+			List<String> afterDutyPersonUserIdList = editAfterPciList.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList());
+			List<String> userIdList = new ArrayList<>();
+			userIdList.addAll(beforeSdtUserIdList);
+			userIdList.addAll(beforeDutyPersonUserIdList);
+			userIdList.addAll(afterSdtUserIdList);
+			userIdList.addAll(afterDutyPersonUserIdList);
+			List<SysUser> userList = this.sysUserService.querySysUserListByIdList(userIdList);
+
+			List<String> beforeDeliverableTemplateIdList = editBeforePciList.stream().map(ProjectCertificationInventoryEO::getDeliverableTemplate).distinct().collect(Collectors.toList());
+			List<String> afterDeliverableTemplateIdList = editAfterPciList.stream().map(ProjectCertificationInventoryEO::getDeliverableTemplate).distinct().collect(Collectors.toList());
+			List<String> allDeliverableTemplateIdList = new ArrayList<>();
+			allDeliverableTemplateIdList.addAll(beforeDeliverableTemplateIdList);
+			allDeliverableTemplateIdList.addAll(afterDeliverableTemplateIdList);
+			List<OSSFile> allDeliverableTemplateList = this.ossFileService.getFileInfos(allDeliverableTemplateIdList.stream().distinct().collect(Collectors.joining(",")));
+
+			List<ProjectCertificationInventoryLogEO> pciLogEOList = new ArrayList<>();
+
+			for (ProjectCertificationInventoryEO editAfterPciEo : editAfterPciList) {
+				List<ProjectCertificationInventoryEO> editBeforePciListTemp = editBeforePciList.stream().filter(editBeforePciEo -> {
+					boolean flag = false;
+					if (StringUtils.equals(editAfterPciEo.getId(), editBeforePciEo.getId())) {
+						flag = true;
+					}
+					return flag;
+				}).collect(Collectors.toList());
+
+				if(CollectionUtils.isNotEmpty(editBeforePciListTemp)){
+					boolean savePciLogFlag = false;
+					ProjectCertificationInventoryEO editBeforePciEo = editBeforePciListTemp.get(0);
+
+					if(ObjectUtils.isNotEmpty(editBeforePciEo)){
+						StringBuilder contentCnSb = new StringBuilder();
+						contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("将");
+						StringBuilder contentEnSb = new StringBuilder();
+						contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" changes the ");
+
+						if(!StringUtils.equals(editBeforePciEo.getWvtaId(),editAfterPciEo.getWvtaId())){
+							contentCnSb.append("\"").append("WVTA ID").append("\" ")
+									.append(StringUtils.isNotEmpty(editBeforePciEo.getWvtaId()) ? editBeforePciEo.getWvtaId() : "空")
+									.append(" 修改为 ")
+									.append(StringUtils.isNotEmpty(editAfterPciEo.getWvtaId()) ? editAfterPciEo.getWvtaId() : "空")
+									.append(",");
+
+							contentEnSb.append("\"").append("WVTA ID").append("\" ")
+									.append(StringUtils.isNotEmpty(editBeforePciEo.getWvtaId()) ? editBeforePciEo.getWvtaId() : "null")
+									.append(" to ")
+									.append(StringUtils.isNotEmpty(editAfterPciEo.getWvtaId()) ? editAfterPciEo.getWvtaId() : "null")
+									.append(",");
+
+							savePciLogFlag = true;
+						}
+						if(!StringUtils.equals(editBeforePciEo.getCategory(),editAfterPciEo.getCategory())){
+							contentCnSb.append("\"").append("类别").append("\" ")
+									.append(StringUtils.isNotEmpty(editBeforePciEo.getCategory()) ? editBeforePciEo.getCategory() : "空")
+									.append(" 修改为 ")
+									.append(StringUtils.isNotEmpty(editAfterPciEo.getCategory()) ? editAfterPciEo.getCategory() : "空")
+									.append(",");
+
+							contentEnSb.append("\"").append("Category").append("\" ")
+									.append(StringUtils.isNotEmpty(editBeforePciEo.getCategory()) ? editBeforePciEo.getCategory() : "null")
+									.append(" to ")
+									.append(StringUtils.isNotEmpty(editAfterPciEo.getCategory()) ? editAfterPciEo.getCategory() : "null")
+									.append(",");
+
+							savePciLogFlag = true;
+						}
+						if(!StringUtils.equals(editBeforePciEo.getInspectionItem(),editAfterPciEo.getInspectionItem())){
+							contentCnSb.append("\"").append("检验项目").append("\" ")
+									.append(StringUtils.isNotEmpty(editBeforePciEo.getInspectionItem()) ? editBeforePciEo.getInspectionItem() : "空")
+									.append(" 修改为 ")
+									.append(StringUtils.isNotEmpty(editAfterPciEo.getInspectionItem()) ? editAfterPciEo.getInspectionItem() : "空")
+									.append(",");
+
+							contentEnSb.append("\"").append("Inspection Items").append("\" ")
+									.append(StringUtils.isNotEmpty(editBeforePciEo.getInspectionItem()) ? editBeforePciEo.getInspectionItem() : "null")
+									.append(" to ")
+									.append(StringUtils.isNotEmpty(editAfterPciEo.getInspectionItem()) ? editAfterPciEo.getInspectionItem() : "null")
+									.append(",");
+
+							savePciLogFlag = true;
+						}
+						if(!StringUtils.equals(editBeforePciEo.getConfigItem(),editAfterPciEo.getConfigItem())){
+							contentCnSb.append("\"").append("配置项").append("\" ")
+									.append(StringUtils.isNotEmpty(editBeforePciEo.getConfigItem()) ? editBeforePciEo.getConfigItem() : "空")
+									.append(" 修改为 ")
+									.append(StringUtils.isNotEmpty(editAfterPciEo.getConfigItem()) ? editAfterPciEo.getConfigItem() : "空")
+									.append(",");
+
+							contentEnSb.append("\"").append("Configuration Item").append("\" ")
+									.append(StringUtils.isNotEmpty(editBeforePciEo.getConfigItem()) ? editBeforePciEo.getConfigItem() : "null")
+									.append(" to ")
+									.append(StringUtils.isNotEmpty(editAfterPciEo.getConfigItem()) ? editAfterPciEo.getConfigItem() : "null")
+									.append(",");
+
+							savePciLogFlag = true;
+						}
+						if(!StringUtils.equals(editBeforePciEo.getDutyTerritory(),editAfterPciEo.getDutyTerritory())){
+							String beforeDutyTerritoryNameCn = this.sysDictItemService.disposeShowDictItemValue(
+									sysDictItems,
+									editBeforePciEo.getDutyTerritory(),
+									CutEnum.CN.getValue(),
+									ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue()
+							);
+							String beforeDutyTerritoryNameEn = this.sysDictItemService.disposeShowDictItemValue(
+									sysDictItems,
+									editBeforePciEo.getDutyTerritory(),
+									CutEnum.EN.getValue(),
+									ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue()
+							);
+
+							String afterDutyTerritoryNameCn = this.sysDictItemService.disposeShowDictItemValue(
+									sysDictItems,
+									editAfterPciEo.getDutyTerritory(),
+									CutEnum.CN.getValue(),
+									ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue()
+							);
+							String afterDutyTerritoryNameEn = this.sysDictItemService.disposeShowDictItemValue(
+									sysDictItems,
+									editAfterPciEo.getDutyTerritory(),
+									CutEnum.EN.getValue(),
+									ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue()
+							);
+
+							contentCnSb.append("\"").append("责任领域").append("\" ")
+									.append(StringUtils.isNotEmpty(beforeDutyTerritoryNameCn) ? beforeDutyTerritoryNameCn : "空")
+									.append(" 修改为 ")
+									.append(StringUtils.isNotEmpty(afterDutyTerritoryNameCn) ? afterDutyTerritoryNameCn : "空")
+									.append(",");
+
+							contentEnSb.append("\"").append("Responsible Field").append("\" ")
+									.append(StringUtils.isNotEmpty(beforeDutyTerritoryNameEn) ? beforeDutyTerritoryNameEn : "null")
+									.append(" to ")
+									.append(StringUtils.isNotEmpty(afterDutyTerritoryNameEn) ? afterDutyTerritoryNameEn : "null")
+									.append(",");
+
+							savePciLogFlag = true;
+						}
+						if(!StringUtils.equals(editBeforePciEo.getDeliverableType(),editAfterPciEo.getDeliverableType())){
+							String beforeDeliverableTypeNameCn = this.getTreeName(CutEnum.CN.getValue(), categoryList, Arrays.asList(editBeforePciEo.getDeliverableType().split(",")));
+							String beforeDeliverableTypeNameEn = this.getTreeName(CutEnum.EN.getValue(), categoryList, Arrays.asList(editBeforePciEo.getDeliverableType().split(",")));
+
+							String afterDeliverableTypeNameCn = this.getTreeName(CutEnum.CN.getValue(), categoryList, Arrays.asList(editAfterPciEo.getDeliverableType().split(",")));
+							String afterDeliverableTypeNameEn = this.getTreeName(CutEnum.EN.getValue(), categoryList, Arrays.asList(editAfterPciEo.getDeliverableType().split(",")));
+
+							contentCnSb.append("\"").append("交付物类型").append("\" ")
+									.append(StringUtils.isNotEmpty(beforeDeliverableTypeNameCn) ? beforeDeliverableTypeNameCn : "空")
+									.append(" 修改为 ")
+									.append(StringUtils.isNotEmpty(afterDeliverableTypeNameCn) ? afterDeliverableTypeNameCn : "空")
+									.append(",");
+
+							contentEnSb.append("\"").append("Deliverable Type").append("\" ")
+									.append(StringUtils.isNotEmpty(beforeDeliverableTypeNameEn) ? beforeDeliverableTypeNameEn : "null")
+									.append(" to ")
+									.append(StringUtils.isNotEmpty(afterDeliverableTypeNameEn) ? afterDeliverableTypeNameEn : "null")
+									.append(",");
+
+							savePciLogFlag = true;
+						}
+						if(!StringUtils.equals(editBeforePciEo.getDeliverableTemplate(),editAfterPciEo.getDeliverableTemplate())){
+							String[] beforeDeliverableTemplateArr = StringUtils.isNotEmpty(editBeforePciEo.getDeliverableTemplate()) ? editBeforePciEo.getDeliverableTemplate().split(",") : null;
+							String[] afterDeliverableTemplateArr = StringUtils.isNotEmpty(editAfterPciEo.getDeliverableTemplate()) ? editAfterPciEo.getDeliverableTemplate().split(",") : null;
+
+							String beforeDeliverableTemplateName = allDeliverableTemplateList.stream().filter(file -> {
+								boolean flag = false;
+								if(beforeDeliverableTemplateArr != null){
+									for (String beforeDeliverableTemplate : beforeDeliverableTemplateArr) {
+										if(StringUtils.equals(file.getId(),beforeDeliverableTemplate)){
+											flag = true;
+										}
+									}
+								}
+								return flag;
+							}).map(OSSFile::getFileName).collect(Collectors.joining(","));
+
+							String afterDeliverableTemplateName = allDeliverableTemplateList.stream().filter(file -> {
+								boolean flag = false;
+								if(afterDeliverableTemplateArr != null){
+									for (String afterDeliverableTemplate : afterDeliverableTemplateArr) {
+										if(StringUtils.equals(file.getId(),afterDeliverableTemplate)){
+											flag = true;
+										}
+									}
+								}
+								return flag;
+							}).map(OSSFile::getFileName).collect(Collectors.joining(","));
+
+							contentCnSb.append("\"").append("交付物模板").append("\" ")
+									.append(StringUtils.isNotEmpty(beforeDeliverableTemplateName) ? beforeDeliverableTemplateName : "空")
+									.append(" 修改为 ")
+									.append(StringUtils.isNotEmpty(afterDeliverableTemplateName) ? afterDeliverableTemplateName : "空")
+									.append(",");
+
+							contentEnSb.append("\"").append("Deliverable Template").append("\" ")
+									.append(StringUtils.isNotEmpty(beforeDeliverableTemplateName) ? beforeDeliverableTemplateName : "null")
+									.append(" to ")
+									.append(StringUtils.isNotEmpty(afterDeliverableTemplateName) ? afterDeliverableTemplateName : "null")
+									.append(",");
+
+							savePciLogFlag = true;
+						}
+						if(!StringUtils.equals(editBeforePciEo.getSdt(),editAfterPciEo.getSdt())){
+							String beforeSdtUserName = this.sysUserService.getUsernameByUserId(userList,editBeforePciEo.getSdt());
+							String afterSdtUserName = this.sysUserService.getUsernameByUserId(userList,editAfterPciEo.getSdt());
+
+							contentCnSb.append("\"").append("工程接口人").append("\" ")
+									.append(StringUtils.isNotEmpty(beforeSdtUserName) ? beforeSdtUserName : "空")
+									.append(" 修改为 ")
+									.append(StringUtils.isNotEmpty(afterSdtUserName) ? afterSdtUserName : "空")
+									.append(",");
+
+							contentEnSb.append("\"").append("Eng. Interface").append("\" ")
+									.append(StringUtils.isNotEmpty(beforeSdtUserName) ? beforeSdtUserName : "null")
+									.append(" to ")
+									.append(StringUtils.isNotEmpty(afterSdtUserName) ? afterSdtUserName : "null")
+									.append(",");
+
+							savePciLogFlag = true;
+						}
+						String beforeEndTimeStr = "";
+						if(editBeforePciEo.getEndTime() != null){
+							beforeEndTimeStr = DateUtils.formatDate(editBeforePciEo.getEndTime());
+						}
+						String afterEndTimeStr = "";
+						if(editAfterPciEo.getEndTime() != null){
+							afterEndTimeStr = DateUtils.formatDate(editAfterPciEo.getEndTime());
+						}
+						if(!StringUtils.equals(beforeEndTimeStr,afterEndTimeStr)){
+							contentCnSb.append("\"").append("截止日期").append("\" ")
+									.append(StringUtils.isNotEmpty(beforeEndTimeStr) ? beforeEndTimeStr : "空")
+									.append(" 修改为 ")
+									.append(StringUtils.isNotEmpty(afterEndTimeStr) ? afterEndTimeStr : "空")
+									.append(",");
+
+							contentEnSb.append("\"").append("Due Date").append("\" ")
+									.append(StringUtils.isNotEmpty(beforeEndTimeStr) ? beforeEndTimeStr : "null")
+									.append(" to ")
+									.append(StringUtils.isNotEmpty(afterEndTimeStr) ? afterEndTimeStr : "null")
+									.append(",");
+
+							savePciLogFlag = true;
+						}
+						if(!StringUtils.equals(editBeforePciEo.getDutyPerson(),editAfterPciEo.getDutyPerson())){
+							String beforeDutyPersonUserName = this.sysUserService.getUsernameByUserId(userList,editBeforePciEo.getDutyPerson());
+							String afterDutyPersonUserName = this.sysUserService.getUsernameByUserId(userList,editAfterPciEo.getDutyPerson());
+
+							contentCnSb.append("\"").append("责任人").append("\" ")
+									.append(StringUtils.isNotEmpty(beforeDutyPersonUserName) ? beforeDutyPersonUserName : "空")
+									.append(" 修改为 ")
+									.append(StringUtils.isNotEmpty(afterDutyPersonUserName) ? afterDutyPersonUserName : "空")
+									.append(",");
+
+							contentEnSb.append("\"").append("Assignee").append("\" ")
+									.append(StringUtils.isNotEmpty(beforeDutyPersonUserName) ? beforeDutyPersonUserName : "null")
+									.append(" to ")
+									.append(StringUtils.isNotEmpty(afterDutyPersonUserName) ? afterDutyPersonUserName : "null")
+									.append(",");
+
+							savePciLogFlag = true;
+						}
+
+						if(savePciLogFlag){
+							ProjectCertificationInventoryLogEO pciLogEO = new ProjectCertificationInventoryLogEO();
+							pciLogEO.setProjectCertificationInventoryId(editAfterPciEo.getId());
+							pciLogEO.setContentCn(contentCnSb.toString().substring(0,contentCnSb.toString().length()-1));
+							pciLogEO.setContentEn(contentEnSb.toString().substring(0,contentEnSb.toString().length()-1));
+							pciLogEO.setOperatorType(operatorType);
+							pciLogEOList.add(pciLogEO);
+						}
+					}
+				}
+			}
+			if(CollectionUtils.isNotEmpty(pciLogEOList)){
+				this.projectCertificationInventoryLogEOService.insertBatch(pciLogEOList);
+			}
+		}
+	}
+
+
+	@Override
+	public Result<?> addConfigByIds(JSONObject json) {
+		String ids = json.getString("ids");
+		String configItem = json.getString("configItem");
+		if (StringUtils.isEmpty(ids)) {
+			throw new JeroBootException("至少选择一条数据进行添加配置操作！");
+		}
+		List<ProjectCertificationInventoryEO> addConfigPciEoList = new ArrayList<>();
+
+		QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
+		pciQueryWrap.lambda().in(ProjectCertificationInventoryEO::getId,Arrays.asList(ids.split(",")));
+		List<ProjectCertificationInventoryEO> pciEoList = this.list(pciQueryWrap);
+
+		pciEoList.forEach(pciEo -> {
+			ProjectCertificationInventoryEO addConfigPciEo = new ProjectCertificationInventoryEO();
+			BeanUtils.copyProperties(pciEo,addConfigPciEo);
+			addConfigPciEo.setId(UUID.randomUUID().toString().replace("-",""));
+			addConfigPciEo.setConfigItem(configItem);
+			addConfigPciEoList.add(addConfigPciEo);
+		});
+
+		if(CollectionUtils.isNotEmpty(addConfigPciEoList)){
+			this.saveBatch(addConfigPciEoList);
+
+			// 设置历史log（修改历史）
+			this.saveProjectCertificationInventoryLog(addConfigPciEoList,OperatorTypeEnum.CERTIFICATION_INVENTORY_ADD_CONFIG.getValue());
+
+			Date now = new Date();
+			//设置权限 先删后加
+			List<ProjectUserPermission> adds = new ArrayList<>();
+			for (ProjectCertificationInventoryEO pci: addConfigPciEoList) {
+				if (ObjectUtils.isNotEmpty(pci.getSdt())) {
+					setProjectCertificationInventoryPermission(pci.getSdt(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_SDT.getValue());
+				}
+				if (ObjectUtils.isNotEmpty(pci.getDutyPerson())) {
+					setProjectCertificationInventoryPermission(pci.getDutyPerson(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_DP.getValue());
+				}
+			}
+			if (ObjectUtils.isNotEmpty(adds)) {
+				projectUserPermissionService.saveBatch(adds);
+			}
+		}
+
+		return Result.OK("添加配置成功！");
+	}
+
+	@Override
+	public Map<String, Object> groupByFGRwqrStatus(List<ProjectCertificationInventoryEO> pciEos) {
+		Map<String, Object> result = new HashMap<>();
+		Map<String,Object> projectScheduleExportMap = new HashMap<>();
+
+		double toBeReleasedCount = 0;
+		double toBeVerifiedCount = 0;
+		double toBeConfirmedCount = 0;
+		double acceptCount = 0;
+		double refuseCount = 0;
+		double count = 0;
+		// 计算百分比
+		double percentage = 0;
+		String percentageStr = "0";
+		if(CollectionUtils.isNotEmpty(pciEos)){
+			List<ProjectCertificationInventoryEO> toBeReleased = pciEos.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
+								|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+
+			List<ProjectCertificationInventoryEO> toBeVerified = pciEos.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+
+			List<ProjectCertificationInventoryEO> toBeConfirmed = pciEos.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+
+			List<ProjectCertificationInventoryEO> accept = pciEos.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+								|| StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
+								|| StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue())
+								|| StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+
+			List<ProjectCertificationInventoryEO> refuse = pciEos.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+
+			toBeReleasedCount = toBeReleased.size();
+			toBeVerifiedCount = toBeVerified.size();
+			toBeConfirmedCount = toBeConfirmed.size();
+			acceptCount = accept.size();
+			refuseCount = refuse.size();
+
+			count = toBeReleasedCount + toBeVerifiedCount + toBeConfirmedCount + acceptCount + refuseCount;
+			if(count <= 0){
+				percentage = 0;
+			}else{
+				// 计算百分比
+				percentage = acceptCount / count * 100;
+			}
+			percentageStr = percentage != 0 ? df.format(percentage) : "0";
+		}
+
+		projectScheduleExportMap.put("toBeReleased",toBeReleasedCount);
+		projectScheduleExportMap.put("toBeVerified",toBeVerifiedCount);
+		projectScheduleExportMap.put("toBeConfirmed",toBeConfirmedCount);
+		projectScheduleExportMap.put("accept",acceptCount);
+		projectScheduleExportMap.put("refuse",refuseCount);
+		projectScheduleExportMap.put("percentage",percentageStr + percentSign);
+		result.put("projectScheduleExportMap",projectScheduleExportMap);
+		return result;
+	}
+
+	@Override
+	public Map<String, Object> groupByPreHomoStatus(List<ProjectCertificationInventoryEO> pciEos) {
+		Map<String, Object> result = new HashMap<>();
+		Map<String,Object> projectScheduleExportMap = new HashMap<>();
+
+		double notStartCount = 0;         // 未发起
+		double toBeSubmittedCount = 0;    // 待提交
+		double toBeReviewedCount = 0;     // 待审查
+		double acceptCount = 0;           // 审查通过
+		double refuseCount = 0;           // 审查退回
+		double taskTerminationCount = 0;  // 任务终止
+		double count = 0;
+		// 计算百分比
+		double percentage = 0;
+		String percentageStr = "0";
+		if(CollectionUtils.isNotEmpty(pciEos)){
+			List<ProjectCertificationInventoryEO> notStart = pciEos.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
+								|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue())
+								|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
+								|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+								|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+
+			List<ProjectCertificationInventoryEO> toBeSubmitted = pciEos.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+
+			List<ProjectCertificationInventoryEO> toBeReviewed = pciEos.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+
+			List<ProjectCertificationInventoryEO> accept = pciEos.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+
+			List<ProjectCertificationInventoryEO> refuse = pciEos.stream().filter(pciEo -> {
+				boolean flag = (
+						StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+
+			notStartCount = notStart.size();
+			toBeSubmittedCount = toBeSubmitted.size();
+			toBeReviewedCount = toBeReviewed.size();
+			acceptCount = accept.size();
+			refuseCount = refuse.size();
+
+			count = notStartCount + toBeSubmittedCount + toBeReviewedCount + acceptCount + refuseCount;
+			if(count <= 0){
+				percentage = 0;
+			}else{
+				// 计算百分比
+				percentage = acceptCount / count * 100;
+			}
+			percentageStr = percentage != 0 ? df.format(percentage) : "0";
+		}
+
+		projectScheduleExportMap.put("notStartCount",notStartCount);
+		projectScheduleExportMap.put("toBeSubmittedCount",toBeSubmittedCount);
+		projectScheduleExportMap.put("toBeReviewedCount",toBeReviewedCount);
+		projectScheduleExportMap.put("accept",acceptCount);
+		projectScheduleExportMap.put("refuse",refuseCount);
+		projectScheduleExportMap.put("percentage",percentageStr + percentSign);
+		result.put("projectScheduleExportMap",projectScheduleExportMap);
+		return result;
+	}
+
+	@Override
+	public Map<String, Object> groupByCertificationProgress(List<ProjectCertificationInventoryEO> pciEos) {
+		Map<String, Object> result = new HashMap<>();
+		Map<String,Object> projectScheduleExportMap = new HashMap<>();
+
+		double notStartCount = 0;      // 待开始
+		double inProgressCount = 0;    // 进行中
+		double testPassedCount = 0;    // 实验通过
+		double testFailedCount = 0;    // 实验失败
+		double notSubmitCount = 0;     // 部件报告未上传
+		double reportSubmitCount = 0;  // 部件报告已上传
+		double storedCount = 0;        // 部件报告已入库
+		double count = 0;
+		// 计算百分比
+		double percentage = 0;
+		String percentageStr = "0";
+
+		if(CollectionUtils.isNotEmpty(pciEos)){
+			// 未开始
+			List<ProjectCertificationInventoryEO> notStartPciEoList = pciEos.stream().filter(data -> {
+				boolean flag = (
+						StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.NOT_START.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+			notStartCount = (double) notStartPciEoList.size();
+
+			// 进行中
+			List<ProjectCertificationInventoryEO> inProgressPciEoList = pciEos.stream().filter(data -> {
+				boolean flag = (
+						StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.IN_PROGRESS.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+			inProgressCount = (double) inProgressPciEoList.size();
+
+			// 实验通过
+			List<ProjectCertificationInventoryEO> testPassedPciEoList = pciEos.stream().filter(data -> {
+				boolean flag = (
+						StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.TEST_PASSED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+			testPassedCount = (double) testPassedPciEoList.size();
+
+			// 实验失败
+			List<ProjectCertificationInventoryEO> testFailedPciEoList = pciEos.stream().filter(data -> {
+				boolean flag = (
+						StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.TEST_FAILED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+			testFailedCount = (double) testFailedPciEoList.size();
+
+			// 部件报告未提交
+			List<ProjectCertificationInventoryEO> notSubmitPciEoList = pciEos.stream().filter(data -> {
+				boolean flag = (
+						StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+			notSubmitCount = (double) notSubmitPciEoList.size();
+
+			// 部件报告已提交
+			List<ProjectCertificationInventoryEO> reportSubmitPciEoList = pciEos.stream().filter(data -> {
+				boolean flag = (
+						StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+			reportSubmitCount = (double) reportSubmitPciEoList.size();
+
+			// 部件报告已入库
+			List<ProjectCertificationInventoryEO> storedPciEoList = pciEos.stream().filter(data -> {
+				boolean flag = (
+						StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue())
+				);
+				return flag;
+			}).collect(Collectors.toList());
+			storedCount = (double) storedPciEoList.size();
+
+			count = notStartCount + inProgressCount + testPassedCount + testFailedCount + testFailedCount + notSubmitCount + reportSubmitCount + storedCount;
+			if(count<=0){
+				percentage = 0;
+			}else {
+				// 计算百分比
+				percentage = testPassedCount / count * 100;
+			}
+			percentageStr = percentage != 0 ? df.format(percentage) : "0";
+		}
+		projectScheduleExportMap.put("notStartCount",notStartCount);
+		projectScheduleExportMap.put("inProgressCount",inProgressCount);
+		projectScheduleExportMap.put("testPassedCount",testPassedCount);
+		projectScheduleExportMap.put("testFailedCount",testFailedCount);
+		projectScheduleExportMap.put("notSubmitCount",notSubmitCount);
+		projectScheduleExportMap.put("reportSubmitCount",reportSubmitCount);
+		projectScheduleExportMap.put("storedCount",storedCount);
+		projectScheduleExportMap.put("count",count);
+		projectScheduleExportMap.put("percentage",percentageStr + percentSign);
+		result.put("projectScheduleExportMap",projectScheduleExportMap);
+		return result;
+	}
+
+	@Override
+	public void syncProcessInfoDetailEndTime(Date newEndTime, List<ProjectCertificationInventoryEO> pciEoList) {
+		pciEoList = pciEoList.stream().filter(pciEo -> {
+			boolean flag = false;
+			if(null != newEndTime && !newEndTime.equals(pciEo.getEndTime())){
+				flag = true;
+			}
+			return flag;
+		}).collect(Collectors.toList());
+
+		if(CollectionUtils.isNotEmpty(pciEoList)){
+			List<String> pciIdList = pciEoList.stream().map(ProjectCertificationInventoryEO::getId).distinct().collect(Collectors.toList());
+
+			QueryWrapper<ProcessInfoDetailEO> pidQueryWrap = new QueryWrapper<>();
+			pidQueryWrap.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.CERTIFICATION_LC.getValue());
+			pidQueryWrap.lambda().in(ProcessInfoDetailEO::getProjectLawsInventoryId,pciIdList);
+			List<ProcessInfoDetailEO> pidEoList = this.processInfoDetailEOService.list(pidQueryWrap);
+
+			if(CollectionUtils.isNotEmpty(pidEoList)){
+				List<ProcessInfoDetailEO> updatePidEoList = new ArrayList<>();
+				for (ProjectCertificationInventoryEO pciEo : pciEoList) {
+					String pciEoId = pciEo.getId();
+					String flowStatus = pciEo.getFlowStatus();
+					// 如果该数据为  结果待提交或审查退回的时候
+					if (StringUtils.equals(flowStatus,CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+							|| StringUtils.equals(flowStatus,CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue()) ) {
+						List<ProcessInfoDetailEO> pidEoListTemp = pidEoList.stream().filter(pidEo -> {
+							boolean flag = (
+									StringUtils.equals(pidEo.getProjectLawsInventoryId(),pciEoId)
+											&& StringUtils.equals(pidEo.getStatus(),TaskStatusEnum.NOT_DONE.getValue())
+											&& StringUtils.equals(pidEo.getTaskDefinitionKey(),CertificationFlowNodeEnum.ZRRTJRW.getKey())
+							);
+							return flag;
+						}).collect(Collectors.toList());
+						updatePidEoList.addAll(pidEoListTemp);
+					}else if(StringUtils.equals(flowStatus,CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())){
+						List<ProcessInfoDetailEO> pidEoListTemp = pidEoList.stream().filter(pidEo -> {
+							boolean flag = (
+									StringUtils.equals(pidEo.getProjectLawsInventoryId(),pciEoId)
+											&& StringUtils.equals(flowStatus,TaskStatusEnum.NOT_DONE.getValue())
+											&& StringUtils.equals(pidEo.getTaskDefinitionKey(),CertificationFlowNodeEnum.RZGCSSC.getKey())
+							);
+							return flag;
+						}).collect(Collectors.toList());
+						updatePidEoList.addAll(pidEoListTemp);
+					}
+				}
+
+				if(CollectionUtils.isNotEmpty(updatePidEoList)){
+					updatePidEoList.forEach(pidEo -> pidEo.setEndTime(newEndTime));
+					this.processInfoDetailEOService.updateBatchById(updatePidEoList);
+				}
+			}
+		}
+	}
+
+	@Override
+	public Map<String, List<Map<String, Object>>> queryDutyPersonByProjectId(Map<String, Object> params) {
+		Map<String, List<Map<String, Object>>> result = new HashMap<>();
+		String projectLibraryId = (String) params.get("projectLibraryId");
+		if(StringUtils.isNotEmpty(projectLibraryId)) {
+			LambdaQueryWrapper<ProjectCertificationInventoryEO> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper.eq(ProjectCertificationInventoryEO::getProjectLibraryId, projectLibraryId);
+			List<ProjectCertificationInventoryEO> pciList = this.list(queryWrapper);
+			List<String> dutyList = new ArrayList<>();
+			List<String> interfaceList = new ArrayList<>();
+			for (ProjectCertificationInventoryEO pci : pciList) {
+				if(StringUtils.isNotEmpty(pci.getDutyPerson())){
+					dutyList.add(pci.getDutyPerson());
+				}
+				if(StringUtils.isNotEmpty(pci.getSdt())){
+					interfaceList.add(pci.getSdt());
+				}
+			}
+			if(CollectionUtils.isNotEmpty(dutyList)){
+				List<Map<String, Object>> resList = new ArrayList<>();
+				List<SysUser> userList = this.sysUserService.querySysUserListByIdList(dutyList);
+				if(CollectionUtils.isNotEmpty(userList)){
+					for (SysUser user : userList) {
+						Map<String,Object> userMap = new HashMap<>();
+						userMap.put("id",user.getId());
+						userMap.put("userName",user.getUsername());
+						resList.add(userMap);
+					}
+				}
+				result.put("dutyList",resList);
+			}
+
+			if(CollectionUtils.isNotEmpty(interfaceList)){
+				List<Map<String, Object>> resList = new ArrayList<>();
+				List<SysUser> userList = this.sysUserService.querySysUserListByIdList(interfaceList);
+				if(CollectionUtils.isNotEmpty(userList)){
+					for (SysUser user : userList) {
+						Map<String,Object> userMap = new HashMap<>();
+						userMap.put("id",user.getId());
+						userMap.put("userName",user.getUsername());
+						resList.add(userMap);
+					}
+				}
+				result.put("interfaceList",resList);
+			}
+		}
+		return result;
+	}
+
+	@Override
+	public List<SysDictItem> getUserDutyTerritoryList(Map<String, Object> params) {
+		List<SysDictItem> result = new ArrayList<>();
+		String userId = (String) params.get("userId");
+		String projectLibraryId = (String) params.get("projectLibraryId");
+		List<SysDictItem> dutyTerritorySdiList = (List<SysDictItem>) params.get("dutyTerritorySdiList");
+
+		QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
+		pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId);
+		pciQueryWrap.and(pciQuery -> {
+			pciQuery.lambda().eq(ProjectCertificationInventoryEO::getDutyPerson,userId)
+					.or().eq(ProjectCertificationInventoryEO::getSdt,userId);
+		});
+		List<ProjectCertificationInventoryEO> pciEoList = this.list(pciQueryWrap);
+
+		if(CollectionUtils.isNotEmpty(pciEoList)){
+			List<String> dutyTerritoryIdList = Arrays.asList(
+					pciEoList.stream().map(ProjectCertificationInventoryEO::getDutyTerritory).collect(Collectors.joining(",")).split(",")
+			).stream().distinct().collect(Collectors.toList());
+
+			result = dutyTerritorySdiList.stream().filter(dutyTerritory -> {
+				boolean flag = false;
+				for (String dutyTerritoryId : dutyTerritoryIdList) {
+					if (StringUtils.equals(dutyTerritoryId, dutyTerritory.getItemValue())) {
+						flag = true;
+						break;
+					}
+				}
+				return flag;
+			}).collect(Collectors.toList());
+		}
+
+		return result;
+	}
+
+	@Override
+	public void replacementUser(JSONObject json) {
+		//获取当前用户
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		String userId = json.getString("userId");
+		String projectLibraryId = json.getString("projectLibraryId");
+		List<Map<String, Object>> replacementUserList = (List<Map<String, Object>>) json.get("replacementUserList");
+
+		QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
+		pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId, projectLibraryId);
+		List<ProjectCertificationInventoryEO> pciEoList = this.list(pciQueryWrap);
+
+		List<ProjectCertificationInventoryEO> updateEoList = new ArrayList<>();
+		for (Map<String, Object> replacementUserMap : replacementUserList) {
+			String dutyTerritory = (String) replacementUserMap.get("dutyTerritory");
+			String newUserId = (String) replacementUserMap.get("newUserId");
+			if (StringUtils.isNotEmpty(newUserId)) {
+				for (ProjectCertificationInventoryEO pciEo : pciEoList) {
+					if (StringUtils.equals(pciEo.getDutyTerritory(), dutyTerritory)) {
+						if (StringUtils.equals(pciEo.getDutyPerson(), userId)) {
+							ProjectCertificationInventoryEO newPciEo = new ProjectCertificationInventoryEO();
+							newPciEo.setId(pciEo.getId());
+							newPciEo.setDutyPerson(newUserId);
+
+//							QueryWrapper<ProjectCertificationInventoryEO> certificationQueryWrap = new QueryWrapper<>();
+//							certificationQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getId,pciEo.getId());
+//							List<ProjectCertificationInventoryEO> oldPciEoList = this.list(certificationQueryWrap);
+							List<ProjectCertificationInventoryEO> oldPciEoList = pciEoList.stream().filter(p -> StringUtils.equals(p.getId(),pciEo.getId())).distinct().collect(Collectors.toList());
+							// 编辑责任人处理逻辑
+							this.editDutyPerson(newPciEo, oldPciEoList,currentUser);
+
+							pciEo.setDutyPerson(newUserId);
+						}
+						if (StringUtils.equals(pciEo.getSdt(), userId)) {
+							pciEo.setSdt(newUserId);
+						}
+						updateEoList.add(pciEo);
+					}
+				}
+			}
+		}
+
+		if (CollectionUtils.isNotEmpty(updateEoList)) {
+			this.updateBatchById(updateEoList);
+		}
+	}
+
+
+	/**
+	 * 匹配相关人员
+	 *
+	 * @param params
+	 * @return
+	 */
+	@Override
+	public Result<?> matchRelevantPeople(Map<String, Object> params) {
+		String projectLibraryId = (String) params.get("projectLibraryId");//项目id
+
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		int isProjectRole = this.checkUserRole(projectLibraryId, currentUser.getId());
+		//验证用户是否是该项目的studio工程师，或者认证工程师，才能匹配相关人员
+		if (isProjectRole == Integer.parseInt(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())
+		||isProjectRole == Integer.parseInt(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) {
+			//获取当前项目中的相关人员信息
+			QueryWrapper<ProjectRelatedPersonnel> queryProjectPerson = new QueryWrapper<>();
+			queryProjectPerson.lambda().eq(ProjectRelatedPersonnel::getProjectId, projectLibraryId);
+			List<ProjectRelatedPersonnel> projectRelatedPersonnels = this.projectRelatedPersonnelMapper.selectList(queryProjectPerson);
+
+			if (CollectionUtils.isNotEmpty(projectRelatedPersonnels)) {
+				QueryWrapper<ProjectCertificationInventoryEO> queryWrapper = new QueryWrapper<>();
+				queryWrapper.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId);
+				List<ProjectCertificationInventoryEO> certificationInventoryEOs = this.list(queryWrapper);
+				List<ProjectCertificationInventoryEO> updateList = new ArrayList<>();
+				for (ProjectCertificationInventoryEO certificationInventoryEO : certificationInventoryEOs) {
+					//只留下清单状态为 未发起、认证退回的认证清单。
+					if(CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue().equals(certificationInventoryEO.getFlowStatus())
+							||CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue().equals(certificationInventoryEO.getFlowStatus())){
+						String dutyTerritory = certificationInventoryEO.getDutyTerritory();
+						if (StringUtils.isNotEmpty(dutyTerritory)) {
+							List<ProjectRelatedPersonnel> projectRelatedPersonnelTempList = projectRelatedPersonnels.stream().filter(relatedPersonnel -> {
+								boolean flag = false;
+								for (String duty : dutyTerritory.split(",")) {
+									if (StringUtils.equals(duty, relatedPersonnel.getDutyTerritory())) {
+										flag = true;
+									}
+								}
+								return flag;
+							}).collect(Collectors.toList());
+							if (CollectionUtils.isNotEmpty(projectRelatedPersonnelTempList)) {
+								List<String> relatedPerson = new ArrayList<>();
+								for (ProjectRelatedPersonnel prp : projectRelatedPersonnelTempList) {
+									String engineeringInterfacePerson = prp.getEngineeringInterfacePerson();
+									if (StringUtils.isNotEmpty(engineeringInterfacePerson)) {
+										for (String eip : engineeringInterfacePerson.split(",")) {
+											if (StringUtils.isNotEmpty(eip)) {
+												relatedPerson.add(eip);
+											}
+										}
+									}
+								}
+								if (CollectionUtils.isNotEmpty(relatedPerson) && relatedPerson.size() == 1) {
+									certificationInventoryEO.setSdt(relatedPerson.get(0));
+									certificationInventoryEO.setDutyPerson(relatedPerson.get(0));
+									updateList.add(certificationInventoryEO);
+								}
+							}
+						}
+					}
+				}
+				if(CollectionUtils.isNotEmpty(updateList)) {
+					this.updateBatchById(updateList);
+				}
+			} else {
+				throw new JeroBootException("当前项目中，未找到相关维护人员信息");
+			}
+		} else {
+			throw new JeroBootException("当前操作用户不是该项目的studio工程师或认证工程师，没有权限操作！");
+		}
+
+		//更新log
+//		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//		String username = sysUser.getUsername();
+//		String contentLog = username + "带入了相关人员名单信息";
+//		String enContentLog = username + " brought in the list information of relevant personnel.";
+//		projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId, CutEnum.CN.getValue());
+//		projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId, CutEnum.EN.getValue());
+
+		return new Result<>().success("带入成功！");
+	}
+
+	/**
+	 * 验证用户在该项目中的角色
+	 *
+	 * @param projectLibraryId 项目库id
+	 * @param currentUserId    登录人id
+	 * @return
+	 */
+	public int checkUserRole(String projectLibraryId, String currentUserId) {
+		int result = -1;
+		try {
+			QueryWrapper<ProjectLibraryBase> projectLibraryBaseQueryWrapper = new QueryWrapper<>();
+			projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId, projectLibraryId);
+			projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getStudioEngineer, currentUserId);
+			Integer projectLibrayBaseCount = projectLibraryBaseMapper.selectCount(projectLibraryBaseQueryWrapper);
+			if (projectLibrayBaseCount > 0) {
+				result = Integer.parseInt(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue());
+				if(result == -1){
+					result = Integer.parseInt(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue());
+				}
+			}
+		} catch (Exception ex) {
+			log.error("验证用户在该项目中的角色失败：" + ex.getMessage());
+			throw new JeroBootException("验证用户在该项目中的角色失败！");
+		}
+		return result;
+	}
+
+}

From d314228b4bbdf2821bc1ca3d27dc24219af45dfe Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 13 Sep 2023 13:54:42 +0800
Subject: [PATCH 009/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E6=9B=B4?=
 =?UTF-8?q?=E6=8D=A2=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...PlatformProjectCertificationInventoryEOController.java | 6 +++---
 .../PlatformProjectLawsInventoryEOController.java         | 6 +++---
 .../controller/PlatformProjectLibraryBaseController.java  | 6 +++---
 .../controller/platformProjectNameInfoEOController.java   | 4 ++--
 .../PlatformProjectCertificationInventoryEOMapper.java    | 2 +-
 .../mapper/PlatformProjectLawsInventoryEOMapper.java      | 2 +-
 .../mapper/PlatformProjectLibraryBaseMapper.java          | 2 +-
 .../mapper/PlatpromProjectNameInfoEOMapper.java           | 2 +-
 .../xml/PlatformProjectCertificationInventoryEOMapper.xml | 2 +-
 .../mapper/xml/PlatformProjectLawsInventoryEOMapper.xml   | 2 +-
 .../mapper/xml/PlatformProjectLibraryBaseMapper.xml       | 2 +-
 .../mapper/xml/PlatformProjectNameInfoEOMapper.xml        | 2 +-
 .../service/IPlatformIProjectLibraryBaseService.java      | 2 +-
 .../IPlatformProjectCertificationInventoryEOService.java  | 2 +-
 .../service/IPlatformProjectLawsInventoryEOService.java   | 2 +-
 .../service/IPlatformProjectNameInfoEOService.java        | 2 +-
 ...latformProjectCertificationInventoryEOServiceImpl.java | 8 ++++----
 .../impl/PlatformProjectLawsInventoryEOServiceImpl.java   | 6 +++---
 .../impl/PlatformProjectLibraryBaseServiceImpl.java       | 6 +++---
 .../impl/PlatformProjectNameInfoEOServiceImpl.java        | 6 +++---
 20 files changed, 36 insertions(+), 36 deletions(-)
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{projectPlatform => platform}/controller/PlatformProjectCertificationInventoryEOController.java (98%)
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{projectPlatform => platform}/controller/PlatformProjectLawsInventoryEOController.java (99%)
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{projectPlatform => platform}/controller/PlatformProjectLibraryBaseController.java (98%)
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{projectPlatform => platform}/controller/platformProjectNameInfoEOController.java (98%)
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{projectPlatform => platform}/mapper/PlatformProjectCertificationInventoryEOMapper.java (88%)
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{projectPlatform => platform}/mapper/PlatformProjectLawsInventoryEOMapper.java (97%)
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{projectPlatform => platform}/mapper/PlatformProjectLibraryBaseMapper.java (95%)
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{projectPlatform => platform}/mapper/PlatpromProjectNameInfoEOMapper.java (93%)
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{projectPlatform => platform}/mapper/xml/PlatformProjectCertificationInventoryEOMapper.xml (94%)
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{projectPlatform => platform}/mapper/xml/PlatformProjectLawsInventoryEOMapper.xml (98%)
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{projectPlatform => platform}/mapper/xml/PlatformProjectLibraryBaseMapper.xml (99%)
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{projectPlatform => platform}/mapper/xml/PlatformProjectNameInfoEOMapper.xml (89%)
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{projectPlatform => platform}/service/IPlatformIProjectLibraryBaseService.java (98%)
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{projectPlatform => platform}/service/IPlatformProjectCertificationInventoryEOService.java (99%)
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{projectPlatform => platform}/service/IPlatformProjectLawsInventoryEOService.java (99%)
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{projectPlatform => platform}/service/IPlatformProjectNameInfoEOService.java (95%)
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{projectPlatform => platform}/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java (99%)
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{projectPlatform => platform}/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java (99%)
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{projectPlatform => platform}/service/impl/PlatformProjectLibraryBaseServiceImpl.java (99%)
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{projectPlatform => platform}/service/impl/PlatformProjectNameInfoEOServiceImpl.java (98%)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/PlatformProjectCertificationInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectCertificationInventoryEOController.java
similarity index 98%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/PlatformProjectCertificationInventoryEOController.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectCertificationInventoryEOController.java
index 153f33036..624af347b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/PlatformProjectCertificationInventoryEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectCertificationInventoryEOController.java
@@ -1,4 +1,4 @@
-package com.jero.modules.projectPlatform.controller;
+package com.jero.modules.platform.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,7 +9,7 @@ import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
-import com.jero.modules.projectPlatform.service.IPlatformProjectCertificationInventoryEOService;
+import com.jero.modules.platform.service.IPlatformProjectCertificationInventoryEOService;
 import com.jero.modules.system.entity.SysRole;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -44,7 +44,7 @@ import java.util.Map;
 */
 @Api(tags="平台件项目库-认证清单表")
 @RestController
-@RequestMapping("/project/platformProjectCertificationInventoryEO")
+@RequestMapping("/platform/projectCertificationInventoryEO")
 @Slf4j
 public class PlatformProjectCertificationInventoryEOController extends JeroController<ProjectCertificationInventoryEO, IPlatformProjectCertificationInventoryEOService> {
    @Autowired
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/PlatformProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLawsInventoryEOController.java
similarity index 99%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/PlatformProjectLawsInventoryEOController.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLawsInventoryEOController.java
index 817b54f74..b481d4c60 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/PlatformProjectLawsInventoryEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLawsInventoryEOController.java
@@ -1,4 +1,4 @@
-package com.jero.modules.projectPlatform.controller;
+package com.jero.modules.platform.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,7 +18,7 @@ import com.jero.modules.dummy.service.IDummyInventoryBaseEOService;
 import com.jero.modules.project.entity.ProjectLawsInventoryEO;
 import com.jero.modules.project.service.IProjectLawsInventoryEOService;
 import com.jero.modules.project.vo.ProjectTaskUrgVo;
-import com.jero.modules.projectPlatform.service.IPlatformProjectLawsInventoryEOService;
+import com.jero.modules.platform.service.IPlatformProjectLawsInventoryEOService;
 import com.jero.modules.system.entity.SysRole;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -54,7 +54,7 @@ import java.util.Map;
  */
 @Api(tags="平台件项目库-法规清单表")
 @RestController
-@RequestMapping("/project/platformProjectLawsInventoryEO")
+@RequestMapping("/platform/projectLawsInventoryEO")
 @Slf4j
 public class PlatformProjectLawsInventoryEOController extends JeroController<ProjectLawsInventoryEO, IProjectLawsInventoryEOService> {
 	@Autowired
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/PlatformProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLibraryBaseController.java
similarity index 98%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/PlatformProjectLibraryBaseController.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLibraryBaseController.java
index 286ff33bb..0752c1b6a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/PlatformProjectLibraryBaseController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLibraryBaseController.java
@@ -1,4 +1,4 @@
-package com.jero.modules.projectPlatform.controller;
+package com.jero.modules.platform.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -8,7 +8,7 @@ import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.vo.DictModel;
 import com.jero.modules.project.entity.ProjectLibraryBase;
-import com.jero.modules.projectPlatform.service.IPlatformIProjectLibraryBaseService;
+import com.jero.modules.platform.service.IPlatformIProjectLibraryBaseService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -42,7 +42,7 @@ import java.util.Map;
  */
 @Api(tags="平台件项目库")
 @RestController
-@RequestMapping("/project/platformProjectLibraryBase")
+@RequestMapping("/platform/projectLibraryBase")
 @Slf4j
 public class PlatformProjectLibraryBaseController extends JeroController<ProjectLibraryBase, IPlatformIProjectLibraryBaseService> {
 	@Autowired
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/platformProjectNameInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/platformProjectNameInfoEOController.java
similarity index 98%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/platformProjectNameInfoEOController.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/platformProjectNameInfoEOController.java
index ec820e3d4..5436884d1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/controller/platformProjectNameInfoEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/platformProjectNameInfoEOController.java
@@ -1,4 +1,4 @@
-package com.jero.modules.projectPlatform.controller;
+package com.jero.modules.platform.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -40,7 +40,7 @@ import java.util.List;
  */
 @Api(tags="平台件-项目名信息表")
 @RestController
-@RequestMapping("/project/platformProjectNameInfoEO")
+@RequestMapping("/platform/projectNameInfoEO")
 @Slf4j
 public class platformProjectNameInfoEOController extends JeroController<ProjectNameInfoEO, IProjectNameInfoEOService> {
 	@Autowired
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/PlatformProjectCertificationInventoryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatformProjectCertificationInventoryEOMapper.java
similarity index 88%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/PlatformProjectCertificationInventoryEOMapper.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatformProjectCertificationInventoryEOMapper.java
index ccf496fab..4294baa50 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/PlatformProjectCertificationInventoryEOMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatformProjectCertificationInventoryEOMapper.java
@@ -1,4 +1,4 @@
-package com.jero.modules.projectPlatform.mapper;
+package com.jero.modules.platform.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/PlatformProjectLawsInventoryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatformProjectLawsInventoryEOMapper.java
similarity index 97%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/PlatformProjectLawsInventoryEOMapper.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatformProjectLawsInventoryEOMapper.java
index 511fd032f..9b09e8bb8 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/PlatformProjectLawsInventoryEOMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatformProjectLawsInventoryEOMapper.java
@@ -1,4 +1,4 @@
-package com.jero.modules.projectPlatform.mapper;
+package com.jero.modules.platform.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jero.modules.project.entity.ProjectLawsInventoryEO;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/PlatformProjectLibraryBaseMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatformProjectLibraryBaseMapper.java
similarity index 95%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/PlatformProjectLibraryBaseMapper.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatformProjectLibraryBaseMapper.java
index c08f2214f..049396638 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/PlatformProjectLibraryBaseMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatformProjectLibraryBaseMapper.java
@@ -1,4 +1,4 @@
-package com.jero.modules.projectPlatform.mapper;
+package com.jero.modules.platform.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jero.modules.project.entity.ProjectLibraryBase;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/PlatpromProjectNameInfoEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatpromProjectNameInfoEOMapper.java
similarity index 93%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/PlatpromProjectNameInfoEOMapper.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatpromProjectNameInfoEOMapper.java
index 5af436747..34b3274bf 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/PlatpromProjectNameInfoEOMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatpromProjectNameInfoEOMapper.java
@@ -1,4 +1,4 @@
-package com.jero.modules.projectPlatform.mapper;
+package com.jero.modules.platform.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jero.modules.project.entity.ProjectNameInfoEO;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/PlatformProjectCertificationInventoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectCertificationInventoryEOMapper.xml
similarity index 94%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/PlatformProjectCertificationInventoryEOMapper.xml
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectCertificationInventoryEOMapper.xml
index 2a72281e0..a2946df5a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/PlatformProjectCertificationInventoryEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectCertificationInventoryEOMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jero.modules.projectPlatform.mapper.PlatformProjectCertificationInventoryEOMapper">
+<mapper namespace="com.jero.modules.platform.mapper.PlatformProjectCertificationInventoryEOMapper">
     <resultMap id="ProjectCertificationInventoryEOResultMap" type="com.jero.modules.project.entity.ProjectCertificationInventoryEO">
         <id column="id" property="id" />
         <result column="create_by" property="createBy" />
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/PlatformProjectLawsInventoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectLawsInventoryEOMapper.xml
similarity index 98%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/PlatformProjectLawsInventoryEOMapper.xml
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectLawsInventoryEOMapper.xml
index 6051afa8c..4d2e84cbc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/PlatformProjectLawsInventoryEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectLawsInventoryEOMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jero.modules.projectPlatform.mapper.PlatformProjectLawsInventoryEOMapper">
+<mapper namespace="com.jero.modules.platform.mapper.PlatformProjectLawsInventoryEOMapper">
     <resultMap id="ProjectLawsInventoryEOResultMap" type="com.jero.modules.project.entity.ProjectLawsInventoryEO">
         <id column="id" property="id" />
         <result column="create_by" property="createBy" />
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/PlatformProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectLibraryBaseMapper.xml
similarity index 99%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/PlatformProjectLibraryBaseMapper.xml
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectLibraryBaseMapper.xml
index 69a29afee..950018869 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/PlatformProjectLibraryBaseMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectLibraryBaseMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jero.modules.projectPlatform.mapper.PlatformProjectLibraryBaseMapper">
+<mapper namespace="com.jero.modules.platform.mapper.PlatformProjectLibraryBaseMapper">
     <resultMap id="ProjectLibraryBaseResultMap" type="com.jero.modules.project.entity.ProjectLibraryBase">
         <id column="id" property="id" />
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/PlatformProjectNameInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectNameInfoEOMapper.xml
similarity index 89%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/PlatformProjectNameInfoEOMapper.xml
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectNameInfoEOMapper.xml
index b48883b20..6c40aa4a0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/mapper/xml/PlatformProjectNameInfoEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectNameInfoEOMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jero.modules.projectPlatform.mapper.PlatpromProjectNameInfoEOMapper">
+<mapper namespace="com.jero.modules.platform.mapper.PlatpromProjectNameInfoEOMapper">
     <resultMap id="ProjectNameInfoEOResultMap" type="com.jero.modules.project.entity.ProjectNameInfoEO">
         <id column="id" property="id" />
         <result column="create_by" property="createBy" />
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IPlatformIProjectLibraryBaseService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformIProjectLibraryBaseService.java
similarity index 98%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IPlatformIProjectLibraryBaseService.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformIProjectLibraryBaseService.java
index 61bb66498..76b51e0d9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IPlatformIProjectLibraryBaseService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformIProjectLibraryBaseService.java
@@ -1,4 +1,4 @@
-package com.jero.modules.projectPlatform.service;
+package com.jero.modules.platform.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IPlatformProjectCertificationInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectCertificationInventoryEOService.java
similarity index 99%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IPlatformProjectCertificationInventoryEOService.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectCertificationInventoryEOService.java
index fb9be3985..28f988d02 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IPlatformProjectCertificationInventoryEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectCertificationInventoryEOService.java
@@ -1,4 +1,4 @@
-package com.jero.modules.projectPlatform.service;
+package com.jero.modules.platform.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IPlatformProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectLawsInventoryEOService.java
similarity index 99%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IPlatformProjectLawsInventoryEOService.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectLawsInventoryEOService.java
index 5114ece63..e12e83503 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IPlatformProjectLawsInventoryEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectLawsInventoryEOService.java
@@ -1,4 +1,4 @@
-package com.jero.modules.projectPlatform.service;
+package com.jero.modules.platform.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IPlatformProjectNameInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectNameInfoEOService.java
similarity index 95%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IPlatformProjectNameInfoEOService.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectNameInfoEOService.java
index 6ab834589..d0505f985 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/IPlatformProjectNameInfoEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectNameInfoEOService.java
@@ -1,4 +1,4 @@
-package com.jero.modules.projectPlatform.service;
+package com.jero.modules.platform.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.project.entity.ProjectLibraryBase;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
similarity index 99%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
index 5341e45f3..775043f28 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
@@ -1,4 +1,4 @@
-package com.jero.modules.projectPlatform.service.impl;
+package com.jero.modules.platform.service.impl;
 
 import cn.hutool.core.util.URLUtil;
 import cn.hutool.core.util.ZipUtil;
@@ -61,9 +61,9 @@ import com.jero.modules.project.service.IProjectLibraryBaseService;
 import com.jero.modules.project.service.IProjectLibraryRoleRelEOService;
 import com.jero.modules.project.service.IProjectRelatedPersonnelService;
 import com.jero.modules.project.service.IProjectUserPermissionService;
-import com.jero.modules.projectPlatform.mapper.PlatformProjectCertificationInventoryEOMapper;
-import com.jero.modules.projectPlatform.service.IPlatformProjectCertificationInventoryEOService;
-import com.jero.modules.projectPlatform.service.IPlatformProjectLawsInventoryEOService;
+import com.jero.modules.platform.mapper.PlatformProjectCertificationInventoryEOMapper;
+import com.jero.modules.platform.service.IPlatformProjectCertificationInventoryEOService;
+import com.jero.modules.platform.service.IPlatformProjectLawsInventoryEOService;
 import com.jero.modules.split.common.FileUnZip;
 import com.jero.modules.system.entity.SysCategory;
 import com.jero.modules.system.entity.SysDictItem;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
similarity index 99%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index e8180761f..06edf9d70 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -1,4 +1,4 @@
-package com.jero.modules.projectPlatform.service.impl;
+package com.jero.modules.platform.service.impl;
 
 import cn.hutool.core.util.URLUtil;
 import cn.hutool.core.util.ZipUtil;
@@ -110,8 +110,8 @@ import com.jero.modules.project.util.WordUtil;
 import com.jero.modules.project.vo.NcrTrackVO;
 import com.jero.modules.project.vo.ProblemManagementVO;
 import com.jero.modules.project.vo.ProjectTaskUrgVo;
-import com.jero.modules.projectPlatform.mapper.PlatformProjectLawsInventoryEOMapper;
-import com.jero.modules.projectPlatform.service.IPlatformProjectLawsInventoryEOService;
+import com.jero.modules.platform.mapper.PlatformProjectLawsInventoryEOMapper;
+import com.jero.modules.platform.service.IPlatformProjectLawsInventoryEOService;
 import com.jero.modules.split.common.FileUnZip;
 import com.jero.modules.system.entity.SysAnnouncement;
 import com.jero.modules.system.entity.SysCategory;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
similarity index 99%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
index 3cded8721..89b26b5ba 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
@@ -1,4 +1,4 @@
-package com.jero.modules.projectPlatform.service.impl;
+package com.jero.modules.platform.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -64,8 +64,8 @@ import com.jero.modules.project.service.impl.ProjectNameInfoEOServiceImpl;
 import com.jero.modules.project.service.impl.ProjectRelatedPersonnelServiceImpl;
 import com.jero.modules.project.service.impl.ProjectTaskPlanningServiceImpl;
 import com.jero.modules.project.vo.TimeNodeVO;
-import com.jero.modules.projectPlatform.mapper.PlatformProjectLibraryBaseMapper;
-import com.jero.modules.projectPlatform.service.IPlatformIProjectLibraryBaseService;
+import com.jero.modules.platform.mapper.PlatformProjectLibraryBaseMapper;
+import com.jero.modules.platform.service.IPlatformIProjectLibraryBaseService;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.enums.DicCodeEnum;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/PlatformProjectNameInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectNameInfoEOServiceImpl.java
similarity index 98%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/PlatformProjectNameInfoEOServiceImpl.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectNameInfoEOServiceImpl.java
index 3d7ea9c7f..ad7302c15 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/projectPlatform/service/impl/PlatformProjectNameInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectNameInfoEOServiceImpl.java
@@ -1,4 +1,4 @@
-package com.jero.modules.projectPlatform.service.impl;
+package com.jero.modules.platform.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -10,8 +10,8 @@ import com.jero.modules.project.mapper.ProblemManagementEOMapper;
 import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
 import com.jero.modules.project.service.impl.ProblemManagementEOServiceImpl;
 import com.jero.modules.project.service.impl.ProjectYearNameInfoEOServiceImpl;
-import com.jero.modules.projectPlatform.mapper.PlatpromProjectNameInfoEOMapper;
-import com.jero.modules.projectPlatform.service.IPlatformProjectNameInfoEOService;
+import com.jero.modules.platform.mapper.PlatpromProjectNameInfoEOMapper;
+import com.jero.modules.platform.service.IPlatformProjectNameInfoEOService;
 import com.jero.modules.space.service.SpaceServiceImpl;
 import com.jero.modules.system.enums.DicCodeEnum;
 import com.jero.modules.system.service.ISysDictService;

From bd8d3572999425d0384cee4d33373e4479646d78 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 13 Sep 2023 14:11:29 +0800
Subject: [PATCH 010/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6--=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformProjectLibraryBaseController.java |  44 +++----
 ...a => PlatformProjectNameInfoEOMapper.java} |   2 +-
 .../xml/PlatformProjectNameInfoEOMapper.xml   |   2 +-
 ...PlatformProjectLibraryBaseServiceImpl.java | 123 ++++++++----------
 .../PlatformProjectNameInfoEOServiceImpl.java |   4 +-
 5 files changed, 79 insertions(+), 96 deletions(-)
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/{PlatpromProjectNameInfoEOMapper.java => PlatformProjectNameInfoEOMapper.java} (91%)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLibraryBaseController.java
index 0752c1b6a..42453f1de 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLibraryBaseController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLibraryBaseController.java
@@ -46,7 +46,7 @@ import java.util.Map;
 @Slf4j
 public class PlatformProjectLibraryBaseController extends JeroController<ProjectLibraryBase, IPlatformIProjectLibraryBaseService> {
 	@Autowired
-	private IPlatformIProjectLibraryBaseService projectPlatformService;
+	private IPlatformIProjectLibraryBaseService platformIProjectLibraryBaseService;
 
 	/**
 	 * 分页列表查询
@@ -57,8 +57,8 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
 	@ApiOperation(value="项目库基础表-分页列表查询", notes="项目库基础表-分页列表查询")
 	@PostMapping(value = "/page")
 	public Result<?> queryPageList(@RequestBody Map<String,Object> params) {
-		List<ProjectLibraryBase> pageList= projectPlatformService.queryPageList(params);
-		Page pages = projectPlatformService.getPages(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()), pageList);
+		List<ProjectLibraryBase> pageList= platformIProjectLibraryBaseService.queryPageList(params);
+		Page pages = platformIProjectLibraryBaseService.getPages(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()), pageList);
 		return Result.OK(params.get("cut").toString(),pages);
 	}
 
@@ -71,7 +71,7 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
     @ApiOperation(value="项目库基础表-列表查询", notes="项目库基础表-列表查询")
 	@GetMapping(value = "/list")
 	public Result<List<ProjectLibraryBase>> queryList(ProjectLibraryBase projectLibraryBase) {
-        List<ProjectLibraryBase> list = projectPlatformService.getList(projectLibraryBase);
+        List<ProjectLibraryBase> list = platformIProjectLibraryBaseService.getList(projectLibraryBase);
         return Result.OK(list);
 	}
 
@@ -86,7 +86,7 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
 	@RequiresPermissions("projectLibraryBase:add")
 	@PostMapping(value = "/add")
 	public Result<?> add(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) throws ParseException {
-		projectPlatformService.add(projectLibraryBase);
+		platformIProjectLibraryBaseService.add(projectLibraryBase);
 		return Result.OK("添加成功！");
 	}
 	/**
@@ -100,7 +100,7 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
 	@RequiresPermissions("projectLibraryBase:add")
 	@PostMapping(value = "/addChild")
 	public Result<?> addChild(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) throws ParseException {
-		projectPlatformService.addChild(projectLibraryBase);
+		platformIProjectLibraryBaseService.addChild(projectLibraryBase);
 		return Result.OK("添加成功！");
 	}
 
@@ -115,7 +115,7 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
 	@RequiresPermissions("projectLibraryBase:edit")
 	@PutMapping(value = "/edit")
 	public Result<?> edit(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) {
-		projectPlatformService.editById(projectLibraryBase);
+		platformIProjectLibraryBaseService.editById(projectLibraryBase);
 		return Result.OK("编辑成功!");
 	}
 
@@ -131,7 +131,7 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id,
 							@RequestParam(name="cut",required=true) String cut) {
-		projectPlatformService.deleteById(id,cut);
+		platformIProjectLibraryBaseService.deleteById(id,cut);
 		return Result.OK("删除成功!");
 	}
 
@@ -147,7 +147,7 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids,
 								 @RequestParam(name="cut",required=true) String cut) {
-		this.projectPlatformService.deleteByIds(Arrays.asList(ids.split(",")),cut);
+		this.platformIProjectLibraryBaseService.deleteByIds(Arrays.asList(ids.split(",")),cut);
 		return Result.OK("批量删除成功!");
 	}
 
@@ -163,7 +163,7 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
 	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id",required=true) String id,
 							   @RequestParam(name="cut",required=true) String cut) {
-		List<ProjectLibraryBase> data = projectPlatformService.queryById(id,cut);
+		List<ProjectLibraryBase> data = platformIProjectLibraryBaseService.queryById(id,cut);
 			if(data==null) {
 			return Result.error("未找到对应数据");
 		}
@@ -203,7 +203,7 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
 	@GetMapping(value = "/getProjectDetailsStatistics")
 	public Result<?> getProjectDetailsStatistics(@RequestParam(name="id",required=true) String id,
 							   @RequestParam(name="cut",required=true) String cut) {
-		Map<String,Object> data = projectPlatformService.getProjectDetailsStatistics(id);
+		Map<String,Object> data = platformIProjectLibraryBaseService.getProjectDetailsStatistics(id);
 		return Result.OK(cut,data);
 	}
 
@@ -215,7 +215,7 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
 	@ApiOperation(value="项目详情-统计接口-根据领域分组", notes="项目详情-统计接口-根据领域分组")
 	@GetMapping(value = "/getProjectDetailsStatisticsGroupByTerritory")
 	public Result<?> getProjectDetailsStatisticsGroupByTerritory(@RequestParam Map<String,Object> params) {
-		Map<String,Object> data = projectPlatformService.getProjectDetailsStatisticsGroupByTerritory(params);
+		Map<String,Object> data = platformIProjectLibraryBaseService.getProjectDetailsStatisticsGroupByTerritory(params);
 		return Result.OK((String)params.get("cut"),data);
 	}
 
@@ -227,7 +227,7 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
 	 */
 	@RequestMapping(value = "/exportProjectDetailsStatisticsGroupByTerritoryXls")
 	public void exportProjectDetailsStatisticsGroupByTerritoryXls(HttpServletResponse response,HttpServletRequest request, @RequestParam Map<String,Object> params) {
-		projectPlatformService.exportProjectDetailsStatisticsGroupByTerritoryXls(response,request, params);
+		platformIProjectLibraryBaseService.exportProjectDetailsStatisticsGroupByTerritoryXls(response,request, params);
 	}
 
 
@@ -241,7 +241,7 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
 	@ApiOperation(value="项目置顶,取消置顶(只置顶主项目)", notes="项目置顶,取消置顶(只置顶主项目)")
 	@GetMapping(value = "/top")
 	public Result<?> top(String id,String flag) {
-		projectPlatformService.top(id,flag);
+		platformIProjectLibraryBaseService.top(id,flag);
 		return Result.OK("编辑成功!");
 	}
 
@@ -254,7 +254,7 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
 	@ApiOperation(value="获取项目所有的版本(主版本和子版本的集合)", notes="获取项目所有的版本(主版本和子版本的集合)")
 	@GetMapping(value = "/getVersionsInfo")
 	public Result<?> getVersionsInfo(String id) {
-		List<String> versionsInfoList = projectPlatformService.getVersionsInfo(id);
+		List<String> versionsInfoList = platformIProjectLibraryBaseService.getVersionsInfo(id);
 		return Result.OK(versionsInfoList);
 	}
 
@@ -266,8 +266,8 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
 	@ApiOperation(value="版本统计)", notes="版本统计")
 	@PostMapping(value = "/versionStatistics")
 	public Result<?> versionStatistics(@RequestBody Map<String,Object> params) {
-		List<ProjectLibraryBase> projectLibraryBasesList = projectPlatformService.versionStatistics(String.valueOf(params.get("id")));
-		Page pages = projectPlatformService.getPages(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()), projectLibraryBasesList);
+		List<ProjectLibraryBase> projectLibraryBasesList = platformIProjectLibraryBaseService.versionStatistics(String.valueOf(params.get("id")));
+		Page pages = platformIProjectLibraryBaseService.getPages(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()), projectLibraryBasesList);
 		return Result.OK(pages);
 	}
 
@@ -275,7 +275,7 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
 	@ApiOperation(value="对接火山引擎接口-获取项目统计信息1", notes="对接火山引擎接口-获取项目统计信息1")
 	@PostMapping(value = "/getProjectInfo")
 	public Result<?> getProjectInfo(){
-		JSONArray resList = projectPlatformService.getProjectInfo();
+		JSONArray resList = platformIProjectLibraryBaseService.getProjectInfo();
 		return Result.OK(resList);
 	}
 
@@ -283,21 +283,21 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
 	@ApiOperation(value="对接火山引擎接口-获取项目统计信息2", notes="对接火山引擎接口-获取项目统计信息2")
 	@PostMapping(value = "/getProjectProgressInfo")
 	public Result<?> getProjectProgressInfo(){
-		JSONArray resList = this.projectPlatformService.getProjectProgressInfo();
+		JSONArray resList = this.platformIProjectLibraryBaseService.getProjectProgressInfo();
 		return Result.OK(resList);
 	}
 
 	// 导出项目进度统计(状态导出)
 	@RequestMapping(value = "/exportProjectProgressStatisticsXls")
 	public void exportProjectProgressStatisticsXls(HttpServletResponse response,HttpServletRequest request, @RequestParam Map<String,Object> params) {
-		this.projectPlatformService.exportProjectProgressStatisticsXls(response,request, params);
+		this.platformIProjectLibraryBaseService.exportProjectProgressStatisticsXls(response,request, params);
 	}
 
 	@AutoLog(value = "获取用户在该项目中所有的责任领域")
 	@ApiOperation(value="获取用户在该项目中所有的责任领域", notes="获取用户在该项目中所有的责任领域")
 	@GetMapping(value = "/getUserAllDutyTerritoryList")
 	public Result<List<DictModel>> getUserAllDutyTerritoryList(@RequestParam Map<String,Object> params){
-		List<DictModel> resList = this.projectPlatformService.getUserAllDutyTerritoryList(params);
+		List<DictModel> resList = this.platformIProjectLibraryBaseService.getUserAllDutyTerritoryList(params);
 		return Result.OK(resList);
 	}
 
@@ -305,6 +305,6 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
 	@ApiOperation(value="全局替换用户", notes="全局替换用户")
 	@PostMapping(value = "/overallReplacementUser")
 	public Result<?> overallReplacementUser(@RequestBody JSONObject json){
-		return this.projectPlatformService.overallReplacementUser(json);
+		return this.platformIProjectLibraryBaseService.overallReplacementUser(json);
 	}
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatpromProjectNameInfoEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatformProjectNameInfoEOMapper.java
similarity index 91%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatpromProjectNameInfoEOMapper.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatformProjectNameInfoEOMapper.java
index 34b3274bf..3e0b0008b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatpromProjectNameInfoEOMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatformProjectNameInfoEOMapper.java
@@ -12,7 +12,7 @@ import java.util.List;
  * @Date:   2022-04-18
  * @Version: V1.0
  */
-public interface PlatpromProjectNameInfoEOMapper extends BaseMapper<ProjectNameInfoEO> {
+public interface PlatformProjectNameInfoEOMapper extends BaseMapper<ProjectNameInfoEO> {
     @Select("select pni.id,pni.project_name,pyni.id as year_id,pyni.year_name,pni.vehicle_platform,pni.digital_platform\n" +
             "from project_name_info as pni\n" +
             "left join project_year_name_info as pyni on pni.id=pyni.project_name_id;")
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectNameInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectNameInfoEOMapper.xml
index 6c40aa4a0..7063f6552 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectNameInfoEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectNameInfoEOMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jero.modules.platform.mapper.PlatpromProjectNameInfoEOMapper">
+<mapper namespace="com.jero.modules.platform.mapper.PlatformProjectNameInfoEOMapper">
     <resultMap id="ProjectNameInfoEOResultMap" type="com.jero.modules.project.entity.ProjectNameInfoEO">
         <id column="id" property="id" />
         <result column="create_by" property="createBy" />
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
index 89b26b5ba..27329d286 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
@@ -23,6 +23,10 @@ import com.jero.modules.dummy.enums.OrderEnum;
 import com.jero.modules.enums.DictCodeEnum;
 import com.jero.modules.feishu.enums.TemplateInfoEnum2;
 import com.jero.modules.ota.service.impl.OtaManageApplyEOServiceImpl;
+import com.jero.modules.platform.mapper.PlatformProjectLawsInventoryEOMapper;
+import com.jero.modules.platform.mapper.PlatformProjectLibraryBaseMapper;
+import com.jero.modules.platform.service.IPlatformIProjectLibraryBaseService;
+import com.jero.modules.platform.service.IPlatformProjectCertificationInventoryEOService;
 import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
 import com.jero.modules.project.entity.ProjectLawsInventoryEO;
 import com.jero.modules.project.entity.ProjectLawsInventoryLogEO;
@@ -47,29 +51,19 @@ import com.jero.modules.project.enums.RoleRelModelTypeEnum;
 import com.jero.modules.project.enums.TaskAffirmStatusEnum;
 import com.jero.modules.project.enums.TaskStatusEnum;
 import com.jero.modules.project.enums.TopEnum;
-import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper;
-import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
-import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
 import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper;
 import com.jero.modules.project.mapper.ProjectTaskInventoryEOMapper;
 import com.jero.modules.project.mapper.ProjectUserPermissionMapper;
-import com.jero.modules.project.service.IConditionAssessmentEOService;
-import com.jero.modules.project.service.IProjectCertificationInventoryEOService;
 import com.jero.modules.project.service.IProjectLibraryRoleRelEOService;
 import com.jero.modules.project.service.IProjectLibraryStatisticsService;
 import com.jero.modules.project.service.IProjectUserPermissionService;
-import com.jero.modules.project.service.impl.ProjectLawsInventoryEOServiceImpl;
 import com.jero.modules.project.service.impl.ProjectLawsInventoryLogEOServiceImpl;
-import com.jero.modules.project.service.impl.ProjectNameInfoEOServiceImpl;
 import com.jero.modules.project.service.impl.ProjectRelatedPersonnelServiceImpl;
 import com.jero.modules.project.service.impl.ProjectTaskPlanningServiceImpl;
 import com.jero.modules.project.vo.TimeNodeVO;
-import com.jero.modules.platform.mapper.PlatformProjectLibraryBaseMapper;
-import com.jero.modules.platform.service.IPlatformIProjectLibraryBaseService;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.enums.DicCodeEnum;
-import com.jero.modules.system.mapper.SysDictItemMapper;
 import com.jero.modules.system.mapper.SysRoleMapper;
 import com.jero.modules.system.mapper.SysUserMapper;
 import com.jero.modules.system.service.IProjectUserBrandService;
@@ -130,10 +124,7 @@ import java.util.stream.Collectors;
 @Service
 public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformProjectLibraryBaseMapper, ProjectLibraryBase> implements IPlatformIProjectLibraryBaseService {
 	@Autowired
-	private ProjectLibraryBaseMapper projectLibraryBaseMapper;
-
-	@Autowired
-	private SysDictItemMapper sysDictItemMapper;
+	private PlatformProjectLibraryBaseMapper platformProjectLibraryBaseMapper;
 
 	@Autowired
 	private SysUserMapper sysUserMapper;
@@ -144,27 +135,19 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 	private ProjectTaskPlanningServiceImpl projectTaskPlanningService;
 
 	@Autowired
-	private ProjectLawsInventoryEOMapper projectLawsInventoryEOMapper;
+	private PlatformProjectLawsInventoryEOMapper platformProjectLawsInventoryEOMapper;
 
 	@Autowired
 	private ProjectTaskInventoryEOMapper projectTaskInventoryEOMapper;
 
-	@Autowired
-	private IConditionAssessmentEOService conditionAssessmentEOService;
-
 	@Autowired
 	private SysDictItemServiceImpl sysDictItemServiceImpl;
 
-	@Autowired
-	private ProjectNameInfoEOMapper projectNameInfoEOMapper;
-	@Autowired
-	private ProjectNameInfoEOServiceImpl projectNameInfoEOService;
-
 	@Autowired
 	private IProjectLibraryRoleRelEOService projectLibraryRoleRelEOService;
 
 	@Autowired
-	private ProjectLawsInventoryEOServiceImpl projectLawsInventoryEOService;
+	private PlatformProjectLawsInventoryEOServiceImpl platformProjectLawsInventoryEOService;
 
 	@Autowired
 	private ProjectLawsInventoryLogEOServiceImpl projectLawsInventoryLogEOService;
@@ -197,7 +180,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 	private ITopProjectEOService iTopProjectEOService;
 
 	@Autowired
-	private IProjectCertificationInventoryEOService projectCertificationInventoryEOService;
+	private IPlatformProjectCertificationInventoryEOService platformProjectCertificationInventoryEOService;
 
 	@Autowired
 	private IProcessInfoDetailEOService processInfoDetailEOService;
@@ -450,7 +433,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 		if(StringUtils.isNotBlank(projectLibraryBase.getId())){
 			queryWrapper.ne("id",projectLibraryBase.getId());
 		}
-		Integer count = projectLibraryBaseMapper.selectCount(queryWrapper);
+		Integer count = platformProjectLibraryBaseMapper.selectCount(queryWrapper);
 		if (count > 0) {
 			if(CutEnum.CN.getValue().equals(projectLibraryBase.getCut())) {
 				throw new JeroBootException("已存在车型名称,年款号,目标市场均同的数据");
@@ -620,7 +603,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 
 		QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("project_library_id", projectLibraryBase.getId());
-		List<ProjectLawsInventoryEO> list = projectLawsInventoryEOService.list(queryWrapper);
+		List<ProjectLawsInventoryEO> list = platformProjectLawsInventoryEOService.list(queryWrapper);
 		if (ObjectUtils.isNotEmpty(list)) {
 			for (ProjectLawsInventoryEO lawsInventoryEO : list) {
 				boolean boo = false;
@@ -734,11 +717,11 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 			QueryWrapper<ProjectCertificationInventoryEO> certificationInventoryEOQueryWrapper = new QueryWrapper<>();
 			certificationInventoryEOQueryWrapper.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId, newPlbEO.getId());
 			certificationInventoryEOQueryWrapper.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList);
-			List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.projectCertificationInventoryEOService.list(certificationInventoryEOQueryWrapper);
+			List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.platformProjectCertificationInventoryEOService.list(certificationInventoryEOQueryWrapper);
 			if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOList)){
-				this.projectCertificationInventoryEOService.certificationInventoryEOListSortByEndTimeAsc(projectCertificationInventoryEOList);
+				this.platformProjectCertificationInventoryEOService.certificationInventoryEOListSortByEndTimeAsc(projectCertificationInventoryEOList);
 				List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(oldCertificationEngineerIdList);
-				this.projectCertificationInventoryEOService.sendMessageByTemplateId(
+				this.platformProjectCertificationInventoryEOService.sendMessageByTemplateId(
 						projectCertificationInventoryEOList,
 						TemplateInfoEnum2.CERTIFICATION_MESSAGE13.getValue(),
 						oldCertificationEngineerIdList,
@@ -760,7 +743,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 			List<String> certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
 			QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
 			pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId, projectLibraryBase.getId());
-			List<ProjectCertificationInventoryEO> pciEOList = this.projectCertificationInventoryEOService.list(pciQueryWrap);
+			List<ProjectCertificationInventoryEO> pciEOList = this.platformProjectCertificationInventoryEOService.list(pciQueryWrap);
 
 			if(CollectionUtils.isNotEmpty(pciEOList)){
 				// 清单待校核的数据
@@ -786,7 +769,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 					}
 
 					// 获取责任确认截止时间 最早的时间
-					this.projectCertificationInventoryEOService.certificationInventoryEOListSortByTaskConfirmEndTimeAsc(pciToBeCheckedList);
+					this.platformProjectCertificationInventoryEOService.certificationInventoryEOListSortByTaskConfirmEndTimeAsc(pciToBeCheckedList);
 					Date endTime = pciToBeCheckedList.get(0).getInventoryVerifyEndTime();
 					if(ObjectUtils.isEmpty(endTime)){
 						endTime = pidEoList.get(0).getEndTime();
@@ -828,7 +811,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 					List<ProcessInfoDetailEO> pidEoList = this.processInfoDetailEOService.list(pidQueryWrap);
 
 					// 获取截止日期最早的一天。
-					this.projectCertificationInventoryEOService.certificationInventoryEOListSortByEndTimeAsc(pciToBeReviewEDList);
+					this.platformProjectCertificationInventoryEOService.certificationInventoryEOListSortByEndTimeAsc(pciToBeReviewEDList);
 					Date endTime = pciToBeReviewEDList.get(0).getEndTime();
 					if(CollectionUtils.isNotEmpty(pidEoList)){
 						endTime = pidEoList.get(0).getEndTime();
@@ -895,7 +878,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 		//关联删除-法规清单
 		QueryWrapper<ProjectLawsInventoryEO> lawsInventoryEOQueryWrapper = new QueryWrapper<>();
 		lawsInventoryEOQueryWrapper.eq("project_library_id ",id);
-		projectLawsInventoryEOService.remove(lawsInventoryEOQueryWrapper);
+		platformProjectLawsInventoryEOService.remove(lawsInventoryEOQueryWrapper);
 
 		//关联删除-法规清单log
 		QueryWrapper<ProjectLawsInventoryLogEO> logEOQueryWrapper = new QueryWrapper<>();
@@ -927,7 +910,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 		}
 		QueryWrapper<ProjectLawsInventoryEO> lawsInventoryQueryWrapper = new QueryWrapper<>();
 		lawsInventoryQueryWrapper.eq("project_library_id",id);
-		List<ProjectLawsInventoryEO> lawsInventoryRecords = projectLawsInventoryEOMapper.selectList(lawsInventoryQueryWrapper);
+		List<ProjectLawsInventoryEO> lawsInventoryRecords = platformProjectLawsInventoryEOMapper.selectList(lawsInventoryQueryWrapper);
 		for(ProjectLawsInventoryEO projectLawsInventoryEO : lawsInventoryRecords){
 			String inventoryAffirmStatus = projectLawsInventoryEO.getInventoryAffirmStatus();//清单确认状态
 			//清单确认状态(未发起、接受、拒绝）
@@ -1000,7 +983,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 	 */
 	@Override
 	public List<ProjectLibraryBase> queryById(String id,String cut) {
-		List<ProjectLibraryBase> records = projectLibraryBaseMapper.queryById(id);
+		List<ProjectLibraryBase> records = platformProjectLibraryBaseMapper.queryById(id);
 		disposeData(records,"",false);
 		//目标市场数据字典
 		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
@@ -1040,7 +1023,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 	 */
 	@Override
 	public List<ProjectLibraryBase> getList(ProjectLibraryBase projectLibraryBase) {
-		List<ProjectLibraryBase> list = projectLibraryBaseMapper.getList(projectLibraryBase);
+		List<ProjectLibraryBase> list = platformProjectLibraryBaseMapper.getList(projectLibraryBase);
 		return list;
 	}
 
@@ -1071,7 +1054,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 			}
 		}
 
-		List<ProjectLibraryBase> result = projectLibraryBaseMapper.queryPageList(params);
+		List<ProjectLibraryBase> result = platformProjectLibraryBaseMapper.queryPageList(params);
 		disposeData(result,"",false);
 		//目标市场
 		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
@@ -1128,7 +1111,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 		}
 
 		//所有主项目
-		List<ProjectLibraryBase> projectLibraryBaseListParent = projectLibraryBaseMapper.queryMaimList();
+		List<ProjectLibraryBase> projectLibraryBaseListParent = platformProjectLibraryBaseMapper.queryMaimList();
 		disposeData(projectLibraryBaseListParent,"",false);
 		for(ProjectLibraryBase projectLibraryBase: projectLibraryBaseListParent){
 			//目标市场
@@ -1361,7 +1344,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 //	 */
 //	@Override
 //	public List<ProjectLibraryBase> queryPageList(Map<String,Object> params) {
-//		List<ProjectLibraryBase> result = projectLibraryBaseMapper.queryPageList(params);
+//		List<ProjectLibraryBase> result = platformProjectLibraryBaseMapper.queryPageList(params);
 //		disposeData(result,"",false);
 //		//目标市场
 //		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
@@ -1486,7 +1469,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 //		Integer pageNo = Integer.parseInt(params.get("pageNo").toString());
 //		Integer pageSize = Integer.parseInt(params.get("pageSize").toString());
 //		IPage page = new Page(pageNo, pageSize);
-//		IPage<ProjectLibraryBase> result = projectLibraryBaseMapper.queryPageList(page, params);
+//		IPage<ProjectLibraryBase> result = platformProjectLibraryBaseMapper.queryPageList(page, params);
 //		List<ProjectLibraryBase> records = result.getRecords();
 //		disposeData(records,"",false);
 //		for(ProjectLibraryBase projectLibraryBase: records){
@@ -1585,18 +1568,18 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 		Map<String,Object> rzTaskToConfirmMap = new HashMap<>();
 
 		//清单确认统计
-		/*List<Map<String,Object>> listingToConfirmMapList = this.projectLawsInventoryEOMapper.getlistingToConfirmStatistics(id);
+		/*List<Map<String,Object>> listingToConfirmMapList = this.platformProjectLawsInventoryEOMapper.getlistingToConfirmStatistics(id);
 		listingToConfirmMap.put("listingToConfirmMapList",listingToConfirmMapList);
 		result.put("listingToConfirmMap",listingToConfirmMap);*/
 
 		QueryWrapper<ProjectLawsInventoryEO> lawsInventoryEOQueryWrapper = new QueryWrapper<>();
 		lawsInventoryEOQueryWrapper.lambda().in(ProjectLawsInventoryEO::getProjectLibraryId,Arrays.asList(id.split(",")));
-		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = projectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper);
+		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = platformProjectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper);
 		if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
 			List<String> projectLawsInventoryIdList = projectLawsInventoryEOList.stream().distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList());
 
 			//任务确认统计
-			List<Map<String,Object>> taskToConfirmMapList = this.projectLawsInventoryEOService.getTaskToConfirmStatistics(projectLawsInventoryEOList);
+			List<Map<String,Object>> taskToConfirmMapList = this.platformProjectLawsInventoryEOService.getTaskToConfirmStatistics(projectLawsInventoryEOList);
 			int taskAffirmStatusCount = 0;
 			if(CollectionUtils.isNotEmpty(taskToConfirmMapList)){
 				//taskAffirmStatusCount
@@ -1635,7 +1618,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 			result.put("currentProjectStatusMap",currentProjectStatusMap);*/
 
 			//设计符合性
-			List<Map<String,Object>> designComplianceMapList = this.projectLawsInventoryEOService.getDesignComplianceStatistice(projectLawsInventoryEOList);
+			List<Map<String,Object>> designComplianceMapList = this.platformProjectLawsInventoryEOService.getDesignComplianceStatistice(projectLawsInventoryEOList);
 			int designFlowTaskStatusCount = 0;
 			if(CollectionUtils.isNotEmpty(designComplianceMapList)){
 				for (Map<String, Object> designCompliance : designComplianceMapList) {
@@ -1647,7 +1630,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 			result.put("designComplianceMap",designComplianceMap);
 
 			//验证符合性
-			List<Map<String,Object>> verifyComplianceMapList = this.projectLawsInventoryEOService.getVerifyComplianceStatistice(projectLawsInventoryEOList);
+			List<Map<String,Object>> verifyComplianceMapList = this.platformProjectLawsInventoryEOService.getVerifyComplianceStatistice(projectLawsInventoryEOList);
 			int verifyFlowTaskStatusCount = 0;
 			if(CollectionUtils.isNotEmpty(verifyComplianceMapList)){
 				for (Map<String, Object> verifyCompliance : verifyComplianceMapList) {
@@ -1691,7 +1674,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 
 		QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
 		pciQueryWrap.lambda().in(ProjectCertificationInventoryEO::getProjectLibraryId,Arrays.asList(id.split(",")));
-		List<ProjectCertificationInventoryEO> pciEoList = this.projectCertificationInventoryEOService.list(pciQueryWrap).stream().filter(pciEo -> {
+		List<ProjectCertificationInventoryEO> pciEoList = this.platformProjectCertificationInventoryEOService.list(pciQueryWrap).stream().filter(pciEo -> {
 			boolean flag = false;
 			if (!StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.UNINVOLVED.getValue())) {
 				flag = true;
@@ -1700,7 +1683,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 		}).distinct().collect(Collectors.toList());
 		if(CollectionUtils.isNotEmpty(pciEoList)){
 			// 认证清单-任务确认统计
-			List<Map<String,Object>> rzTaskToConfirmMapList = this.projectCertificationInventoryEOService.getTaskToConfirmStatistics(pciEoList);
+			List<Map<String,Object>> rzTaskToConfirmMapList = this.platformProjectCertificationInventoryEOService.getTaskToConfirmStatistics(pciEoList);
 			int taskAffirmStatusCount = 0;
 			if(CollectionUtils.isNotEmpty(rzTaskToConfirmMapList)){
 				for (Map<String, Object> rzTaskToConfirm : rzTaskToConfirmMapList) {
@@ -1712,7 +1695,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 			result.put("rzTaskToConfirmMap",rzTaskToConfirmMap);
 
 			// Pre-Homo 统计
-			List<Map<String,Object>> prehomoMapList = this.projectCertificationInventoryEOService.getPrehomoStatistice(pciEoList);
+			List<Map<String,Object>> prehomoMapList = this.platformProjectCertificationInventoryEOService.getPrehomoStatistice(pciEoList);
 			int preHomoCount = 0;
 			if (CollectionUtils.isNotEmpty(prehomoMapList)) {
 				for (Map<String, Object> prehomo : prehomoMapList) {
@@ -1724,9 +1707,9 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 			result.put("prehomoMap",prehomoMap);
 
 			// 认证进度 统计
-			List<Map<String,Object>> allMapList = this.projectCertificationInventoryEOService.getAllCertificationProgressStatistics(pciEoList);
-			List<Map<String,Object>> carMapList = this.projectCertificationInventoryEOService.getCarCertificationProgressStatistics(pciEoList);
-			List<Map<String,Object>> partMapList = this.projectCertificationInventoryEOService.getPartCertificationProgressStatistics(pciEoList);
+			List<Map<String,Object>> allMapList = this.platformProjectCertificationInventoryEOService.getAllCertificationProgressStatistics(pciEoList);
+			List<Map<String,Object>> carMapList = this.platformProjectCertificationInventoryEOService.getCarCertificationProgressStatistics(pciEoList);
+			List<Map<String,Object>> partMapList = this.platformProjectCertificationInventoryEOService.getPartCertificationProgressStatistics(pciEoList);
 			certificationProgressMap.put("allMapList",allMapList);// 全部
 			certificationProgressMap.put("carMapList",carMapList);// 整车
 			certificationProgressMap.put("partMapList",partMapList);// 零部件
@@ -1777,12 +1760,12 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 //		Map<String,Object> certificationProgressMap = new HashMap<>();
 //
 //		//清单确认统计
-//		List<Map<String,Object>> listingToConfirmMapList = this.projectLawsInventoryEOMapper.getlistingToConfirmStatistics(id);
+//		List<Map<String,Object>> listingToConfirmMapList = this.platformProjectLawsInventoryEOMapper.getlistingToConfirmStatistics(id);
 //		listingToConfirmMap.put("listingToConfirmMapList",listingToConfirmMapList);
 //		result.put("listingToConfirmMap",listingToConfirmMap);
 //
 //		//任务确认统计
-//		List<Map<String,Object>> taskToConfirmMapList = this.projectLawsInventoryEOMapper.getTaskToConfirmStatistics(id);
+//		List<Map<String,Object>> taskToConfirmMapList = this.platformProjectLawsInventoryEOMapper.getTaskToConfirmStatistics(id);
 //		taskToConfirmMap.put("taskToConfirmMapList",taskToConfirmMapList);
 //		result.put("taskToConfirmMap",taskToConfirmMap);
 //
@@ -1790,7 +1773,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 //		lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,id);
 //		//lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getInventoryAffirmStatus, InventoryAffirmStatusEnum.ACCEPTED.getValue());
 //		//lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getTaskAffirmStatus, TaskAffirmStatusEnum.ACCEPTED.getValue());
-//		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = projectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper);
+//		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = platformProjectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper);
 //		if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
 //			List<String> projectLawsInventoryIdList = projectLawsInventoryEOList.stream().distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList());
 //
@@ -1887,7 +1870,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 
 		QueryWrapper<ProjectLawsInventoryEO> lawsInventoryEOQueryWrapper = new QueryWrapper<>();
 		lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
-		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = projectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper);
+		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = platformProjectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper);
 
 		List<SysDictItem> sysDictItems = new ArrayList<>();
 		// 法规清单所有的责任领域
@@ -1989,13 +1972,13 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 //			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_LISTING_TO_CONFIRM_STATISTICS.getValue(),operatorType)){
 //				//清单确认 状态
 //				String inventoryAffirmStatus = (String) params.get("inventoryAffirmStatus");
-//				List<Map<String,Object>> listingToConfirmList = this.projectLawsInventoryEOMapper.getListingToConfirmStatisticsGroupByTerritory(projectLibraryId,inventoryAffirmStatus);
+//				List<Map<String,Object>> listingToConfirmList = this.platformProjectLawsInventoryEOMapper.getListingToConfirmStatisticsGroupByTerritory(projectLibraryId,inventoryAffirmStatus);
 //				disposeData(listingToConfirmList,cut);
 //				result.put("dataList",listingToConfirmList);
 //			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_TASK_TO_CONFIRM_STATISTICS.getValue(),operatorType)){
 //				//任务确认 状态
 //				String taskAffirmStatus = (String) params.get("taskAffirmStatus");
-//				List<Map<String,Object>> taskToConfirmList = this.projectLawsInventoryEOMapper.getTaskToConfirmStatisticsGroupByTerritory(projectLibraryId,taskAffirmStatus);
+//				List<Map<String,Object>> taskToConfirmList = this.platformProjectLawsInventoryEOMapper.getTaskToConfirmStatisticsGroupByTerritory(projectLibraryId,taskAffirmStatus);
 //				disposeData(taskToConfirmList,cut);
 //				result.put("dataList",taskToConfirmList);
 //			}else if(StringUtils.equals(OperatorTypeEnum.QUERY_DESIGN_STATISTICS.getValue(),operatorType)){
@@ -2053,7 +2036,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 		Map<String,Object> pciEoMap = new HashMap<>();
 		QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
 		pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId);
-		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.projectCertificationInventoryEOService.list(pciQueryWrap);
+		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.platformProjectCertificationInventoryEOService.list(pciQueryWrap);
 		String pciDutyTerritoryStr = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getDutyTerritory).collect(Collectors.joining(","));
 		if (StringUtils.isNotEmpty(pciDutyTerritoryStr)) {
 			List<String> pciDutyTerritoryList = Arrays.asList(pciDutyTerritoryStr.split(",")).stream().distinct().collect(Collectors.toList());
@@ -2467,7 +2450,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 	@Override
 	public ProjectLibraryBase selectById(String projectLibraryId) {
 		ProjectLibraryBase result = null;
-		List<ProjectLibraryBase> records = this.projectLibraryBaseMapper.queryById(projectLibraryId);
+		List<ProjectLibraryBase> records = this.platformProjectLibraryBaseMapper.queryById(projectLibraryId);
 		if(CollectionUtils.isNotEmpty(records)){
 			List<String> studioEngineerUserIdList = records.stream().map(ProjectLibraryBase::getStudioEngineer).distinct().collect(Collectors.toList());
 			List<SysUser> studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(studioEngineerUserIdList);
@@ -2645,11 +2628,11 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 		if(CollectionUtils.isNotEmpty(prpSdiList)){
 			userAllDutyTerritorySdiList.addAll(prpSdiList);
 		}
-		List<SysDictItem> pliSdiList = this.projectLawsInventoryEOService.getUserDutyTerritoryList(params);
+		List<SysDictItem> pliSdiList = this.platformProjectLawsInventoryEOService.getUserDutyTerritoryList(params);
 		if(CollectionUtils.isNotEmpty(pliSdiList)){
 			userAllDutyTerritorySdiList.addAll(pliSdiList);
 		}
-		List<SysDictItem> pciSdiList = this.projectCertificationInventoryEOService.getUserDutyTerritoryList(params);
+		List<SysDictItem> pciSdiList = this.platformProjectCertificationInventoryEOService.getUserDutyTerritoryList(params);
 		if(CollectionUtils.isNotEmpty(pciSdiList)){
 			userAllDutyTerritorySdiList.addAll(pciSdiList);
 		}
@@ -2682,8 +2665,8 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 	@Override
 	public Result<?> overallReplacementUser(JSONObject json) {
 		this.projectRelatedPersonnelService.replacementUser(json);
-		this.projectLawsInventoryEOService.replacementUser(json);
-		this.projectCertificationInventoryEOService.replacementUser(json);
+		this.platformProjectLawsInventoryEOService.replacementUser(json);
+		this.platformProjectCertificationInventoryEOService.replacementUser(json);
 		String projectLibraryId = json.getString("projectLibraryId");
 		ProjectLibraryBase projectLibraryBase = this.selectById(projectLibraryId);
 		json.put("parentId",projectLibraryBase.getParentId());
@@ -2752,7 +2735,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 
 		QueryWrapper<ProjectLawsInventoryEO> pliQueryWrap = new QueryWrapper<>();
 		pliQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
-		List<ProjectLawsInventoryEO> pliEOList = this.projectLawsInventoryEOMapper.selectList(pliQueryWrap);
+		List<ProjectLawsInventoryEO> pliEOList = this.platformProjectLawsInventoryEOMapper.selectList(pliQueryWrap);
 		List<SysDictItem> sysDictItems = new ArrayList<>();
 		String pliDutyTerritoryStr = pliEOList.stream().map(ProjectLawsInventoryEO::getDutyTerritory).collect(Collectors.joining(","));
 		if (StringUtils.isNotEmpty(pliDutyTerritoryStr)) {
@@ -2926,7 +2909,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 		String projectLibraryId = (String) params.get("projectLibraryId");
 		QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
 		pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId);
-		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.projectCertificationInventoryEOService.list(pciQueryWrap).stream().filter(pciEo -> {
+		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.platformProjectCertificationInventoryEOService.list(pciQueryWrap).stream().filter(pciEo -> {
 			boolean flag = false;
 			if (!StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.UNINVOLVED.getValue())) {
 				flag = true;
@@ -3274,11 +3257,11 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 
 			QueryWrapper<ProjectLawsInventoryEO> pliQueryWrap = new QueryWrapper<>();
 			pliQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectId);
-			List<ProjectLawsInventoryEO> pliEoList = this.projectLawsInventoryEOService.list(pliQueryWrap);
+			List<ProjectLawsInventoryEO> pliEoList = this.platformProjectLawsInventoryEOService.list(pliQueryWrap);
 
 			QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
 			pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectId);
-			List<ProjectCertificationInventoryEO> pciEoList = this.projectCertificationInventoryEOService.list(pciQueryWrap);
+			List<ProjectCertificationInventoryEO> pciEoList = this.platformProjectCertificationInventoryEOService.list(pciQueryWrap);
 
 			QueryWrapper<ParamsManifestEO> pmQueryWrap = new QueryWrapper<>();
 			pmQueryWrap.lambda().eq(ParamsManifestEO::getProjectId,projectId);
@@ -3351,11 +3334,11 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 
 			QueryWrapper<ProjectLawsInventoryEO> pliQueryWrap = new QueryWrapper<>();
 			pliQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectId);
-			List<ProjectLawsInventoryEO> pliEoList = this.projectLawsInventoryEOService.list(pliQueryWrap);
+			List<ProjectLawsInventoryEO> pliEoList = this.platformProjectLawsInventoryEOService.list(pliQueryWrap);
 
 			QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
 			pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectId);
-			List<ProjectCertificationInventoryEO> pciEoList = this.projectCertificationInventoryEOService.list(pciQueryWrap);
+			List<ProjectCertificationInventoryEO> pciEoList = this.platformProjectCertificationInventoryEOService.list(pciQueryWrap);
 
 			QueryWrapper<ParamsManifestEO> pmQueryWrap = new QueryWrapper<>();
 			pmQueryWrap.lambda().eq(ParamsManifestEO::getProjectId,projectId);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectNameInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectNameInfoEOServiceImpl.java
index ad7302c15..d6f134d81 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectNameInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectNameInfoEOServiceImpl.java
@@ -10,7 +10,7 @@ import com.jero.modules.project.mapper.ProblemManagementEOMapper;
 import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
 import com.jero.modules.project.service.impl.ProblemManagementEOServiceImpl;
 import com.jero.modules.project.service.impl.ProjectYearNameInfoEOServiceImpl;
-import com.jero.modules.platform.mapper.PlatpromProjectNameInfoEOMapper;
+import com.jero.modules.platform.mapper.PlatformProjectNameInfoEOMapper;
 import com.jero.modules.platform.service.IPlatformProjectNameInfoEOService;
 import com.jero.modules.space.service.SpaceServiceImpl;
 import com.jero.modules.system.enums.DicCodeEnum;
@@ -30,7 +30,7 @@ import java.util.List;
  * @Version: V1.0
  */
 @Service
-public class PlatformProjectNameInfoEOServiceImpl extends ServiceImpl<PlatpromProjectNameInfoEOMapper, ProjectNameInfoEO> implements IPlatformProjectNameInfoEOService {
+public class PlatformProjectNameInfoEOServiceImpl extends ServiceImpl<PlatformProjectNameInfoEOMapper, ProjectNameInfoEO> implements IPlatformProjectNameInfoEOService {
 	@Autowired
 	private ProjectNameInfoEOMapper projectNameInfoEOMapper;
 

From 36ba39c712822ca121c891d1b5255dbaa4698907 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 13 Sep 2023 14:33:01 +0800
Subject: [PATCH 011/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...tformProjectLawsInventoryEOController.java |  70 ++++++------
 ...formProjectLawsInventoryEOServiceImpl.java | 103 +++++++-----------
 2 files changed, 75 insertions(+), 98 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLawsInventoryEOController.java
index b481d4c60..1b4ce37e9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLawsInventoryEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLawsInventoryEOController.java
@@ -58,7 +58,7 @@ import java.util.Map;
 @Slf4j
 public class PlatformProjectLawsInventoryEOController extends JeroController<ProjectLawsInventoryEO, IProjectLawsInventoryEOService> {
 	@Autowired
-	private IPlatformProjectLawsInventoryEOService projectLawsInventoryEOService;
+	private IPlatformProjectLawsInventoryEOService platformProjectLawsInventoryEOService;
 	 @Autowired
 	 private IBussDocumentLibraryEOService bussDocumentLibraryEOService;
 	 @Autowired
@@ -80,7 +80,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		IPage<ProjectLawsInventoryEO> pageList = this.projectLawsInventoryEOService.queryPage(projectLawsInventoryEO,pageNo,pageSize,req);
+		IPage<ProjectLawsInventoryEO> pageList = this.platformProjectLawsInventoryEOService.queryPage(projectLawsInventoryEO,pageNo,pageSize,req);
 		return Result.OK(pageList);
 	}
 
@@ -94,7 +94,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
 	@GetMapping(value = "/list")
 	@RequiresPermissions("projectLawsInventory:list")
 	public Result<List<ProjectLawsInventoryEO>> queryList(ProjectLawsInventoryEO projectLawsInventoryEO,HttpServletRequest req) {
-        List<ProjectLawsInventoryEO> list = projectLawsInventoryEOService.queryList(projectLawsInventoryEO,req);
+        List<ProjectLawsInventoryEO> list = platformProjectLawsInventoryEOService.queryList(projectLawsInventoryEO,req);
         return Result.OK(projectLawsInventoryEO.getCut(),list);
 	}
 
@@ -108,7 +108,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
 	@ApiOperation(value="项目库-法规清单表-添加", notes="项目库-法规清单表-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@Validated @RequestBody ProjectLawsInventoryEO projectLawsInventoryEO) {
-		projectLawsInventoryEOService.add(projectLawsInventoryEO);
+		platformProjectLawsInventoryEOService.add(projectLawsInventoryEO);
 		return Result.OK("添加成功！");
 	}
 
@@ -122,7 +122,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
 	@ApiOperation(value="项目库-法规清单表-编辑", notes="项目库-法规清单表-编辑")
 	@PutMapping(value = "/edit")
 	public Result<?> edit(@Validated @RequestBody ProjectLawsInventoryEO projectLawsInventoryEO) {
-		projectLawsInventoryEOService.editById(projectLawsInventoryEO);
+		platformProjectLawsInventoryEOService.editById(projectLawsInventoryEO);
 		return Result.OK("编辑成功!");
 	}
 
@@ -138,7 +138,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
 	public Result<?> delete(@RequestParam(name="id",required=true) String id,
 							@RequestParam(name="projectLibraryId",required=true) String projectLibraryId,
 							@RequestParam(name="cut",required=true) String cut) {
-		projectLawsInventoryEOService.deleteById(id,projectLibraryId,cut);
+		platformProjectLawsInventoryEOService.deleteById(id,projectLibraryId,cut);
 		return Result.OK("删除成功!");
 	}
 
@@ -155,7 +155,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
 		String ids = json.getString("ids");
 		String projectLibraryId = json.getString("projectLibraryId");
 		String cut = json.getString("cut");
-		this.projectLawsInventoryEOService.deleteByIds(Arrays.asList(ids.split(",")),projectLibraryId,cut);
+		this.platformProjectLawsInventoryEOService.deleteByIds(Arrays.asList(ids.split(",")),projectLibraryId,cut);
 		return Result.OK("批量删除成功!");
 	}
 
@@ -169,7 +169,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
 	 @ApiOperation(value="项目库-法规清单表-通过id查询", notes="项目库-法规清单表-通过id查询")
 	 @GetMapping(value = "/queryById")
 	 public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
-		 ProjectLawsInventoryEO projectLawsInventoryEO = projectLawsInventoryEOService.queryById(id);
+		 ProjectLawsInventoryEO projectLawsInventoryEO = platformProjectLawsInventoryEOService.queryById(id);
 		 if(projectLawsInventoryEO==null) {
 			 return Result.error("未找到对应数据");
 		 }
@@ -208,7 +208,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
 	 @ApiOperation(value="项目库-法规清单表-批量更新状态", notes="项目库-法规清单表-批量更新状态")
 	 @PostMapping(value = "/updateStatusBatch")
 	 public Result<?> updateStatusBatch(@RequestBody JSONObject json) {
-		 return this.projectLawsInventoryEOService.updateStatusBatch(json);
+		 return this.platformProjectLawsInventoryEOService.updateStatusBatch(json);
 	 }
 
 	 /**
@@ -220,7 +220,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
 	 @ApiOperation(value="项目库-法规清单表-匹配相关人员", notes="项目库-法规清单表-匹配相关人员")
 	 @PostMapping(value = "/matchRelevantPeople")
 	 public Result<?> matchRelevantPeople(@RequestBody Map<String,Object> params){
-	 	return this.projectLawsInventoryEOService.matchRelevantPeople(params);
+	 	return this.platformProjectLawsInventoryEOService.matchRelevantPeople(params);
 	 }
 
 	 /**
@@ -232,7 +232,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
 	 @ApiOperation(value="项目库-法规清单表-流程调用", notes="项目库-法规清单表-流程调用")
 	 @PostMapping(value = "/processCall")
 	 public Result<?> processCall(@RequestBody JSONObject jsonObject){
-		 return this.projectLawsInventoryEOService.processCall(jsonObject);
+		 return this.platformProjectLawsInventoryEOService.processCall(jsonObject);
 	 }
 
 	 /**
@@ -244,7 +244,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
 	 @ApiOperation(value="项目库-法规清单表-通过id与操作类型查询", notes="项目库-法规清单表-通过id与操作类型查询")
 	 @GetMapping(value = "/queryProjectLawsInventoryInfoById")
 	 public Result<?> queryProjectLawsInventoryInfoById(@RequestParam Map<String,Object> params) {
-		 List<ProjectLawsInventoryEO> result = projectLawsInventoryEOService.queryProjectLawsInventoryInfoById(params);
+		 List<ProjectLawsInventoryEO> result = platformProjectLawsInventoryEOService.queryProjectLawsInventoryInfoById(params);
 		 return Result.OK((String) params.get("cut"),result);
 	 }
 
@@ -272,7 +272,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
 									@RequestParam(name="cut",required=true) String cut,
 									@RequestParam(name="operateType",required=true) String operateType) {
 		 try {
-			 projectLawsInventoryEOService.copyInfoByIds(ids,operateType);
+			 platformProjectLawsInventoryEOService.copyInfoByIds(ids,operateType);
 		 } catch (Exception e) {
 			 if(CutEnum.CN.getValue().equals(cut)){
 				 return Result.error("复制失败");
@@ -300,7 +300,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
 	 public Result<?> setBatch(@RequestBody ProjectLawsInventoryEO projectLawsInventoryEO) {
 		 String cut = projectLawsInventoryEO.getCut();
 		 try {
-			 projectLawsInventoryEOService.setBatch(projectLawsInventoryEO);
+			 platformProjectLawsInventoryEOService.setBatch(projectLawsInventoryEO);
 		 } catch (Exception e) {
 			 e.printStackTrace();
 			 log.error("批量设置失败：" + e.getMessage());
@@ -345,7 +345,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
 	 @ApiOperation(value = "模板下载")
 	 @GetMapping(value = "/exportTemplate")
 	 public void exportTemplate(ProjectLawsInventoryEO projectLawsInventoryEO, HttpServletResponse response, HttpServletRequest request) throws Exception {
-		 projectLawsInventoryEOService.exportTemplate(projectLawsInventoryEO,response,request);
+		 platformProjectLawsInventoryEOService.exportTemplate(projectLawsInventoryEO,response,request);
 	 }
 
 	 /**
@@ -358,7 +358,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
 	 public void exportData(HttpServletResponse response,
 							HttpServletRequest request,
 							ProjectLawsInventoryEO projectLawsInventoryEO) {
-		 projectLawsInventoryEOService.exportData(response,request, projectLawsInventoryEO);
+		 platformProjectLawsInventoryEOService.exportData(response,request, projectLawsInventoryEO);
 	 }
 
 	 /**
@@ -371,7 +371,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
 	 @RequestMapping(value = "/importData", method = RequestMethod.POST)
 	 public Result<?> importData(@RequestParam(value = "file", required = false) MultipartFile file,
 								 ProjectLawsInventoryEO projectLawsInventoryEO) {
-		 projectLawsInventoryEOService.importData(file,projectLawsInventoryEO);
+		 platformProjectLawsInventoryEOService.importData(file,projectLawsInventoryEO);
 		 return Result.OK("导入成功");
 	 }
 
@@ -380,14 +380,14 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
 	 @ApiOperation(value="变更", notes="变更")
 	 @PostMapping(value = "/change")
 	 public Result<?> change(@RequestBody JSONObject params) {
-	 	return this.projectLawsInventoryEOService.change(params);
+	 	return this.platformProjectLawsInventoryEOService.change(params);
 	 }
 
 	 @AutoLog(value = "下载pdf报告")
 	 @ApiOperation(value="下载pdf报告", notes="下载pdf报告")
 	 @GetMapping(value = "/downloadReport")
 	 public void downloadReport(@RequestParam Map<String,Object> params, HttpServletRequest req, HttpServletResponse resp) throws DocumentException {
-		 this.projectLawsInventoryEOService.downloadReport(params,req,resp);
+		 this.platformProjectLawsInventoryEOService.downloadReport(params,req,resp);
 	 }
 
 	 /**
@@ -429,14 +429,14 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
 	@ApiOperation(value="下载docx报告", notes="下载docx报告")
 	@GetMapping(value = "/downloadDocxReport")
  	public void downloadDocxReport(@RequestParam Map<String,Object> params, HttpServletRequest req, HttpServletResponse resp) throws DocumentException {
-		this.projectLawsInventoryEOService.downloadDocxReport(params,req,resp);
+		this.platformProjectLawsInventoryEOService.downloadDocxReport(params,req,resp);
 	}
 
 	@AutoLog(value = "催办")
 	@ApiOperation(value="催办", notes="催办")
 	@PostMapping(value = "/expediting")
 	public Result<?> expediting(@RequestBody JSONObject json) {
-		return this.projectLawsInventoryEOService.expediting(json);
+		return this.platformProjectLawsInventoryEOService.expediting(json);
 	}
 
 	/**
@@ -447,7 +447,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
 	@RequestMapping(value = "/getRoleByUserId", method = RequestMethod.GET)
 	public Result<List<SysRole>> getRoleByUserId(String projectLibraryId,String cut) {
 		Result<List<SysRole>> result = new Result<>();
-		List<SysRole> list = projectLawsInventoryEOService.getRoleByUserId(projectLibraryId,cut);
+		List<SysRole> list = platformProjectLawsInventoryEOService.getRoleByUserId(projectLibraryId,cut);
 		if(list==null||list.size()<=0) {
 			result.error500("未找到角色信息");
 		}else {
@@ -462,7 +462,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
 	@ApiOperation(value="任务清单催办", notes="任务清单催办")
 	@PostMapping(value = "/taskUrg")
 	public Result<?> taskUrg(@RequestBody ProjectTaskUrgVo projectTaskUrgVo) {
-		return this.projectLawsInventoryEOService.taskUrg(projectTaskUrgVo);
+		return this.platformProjectLawsInventoryEOService.taskUrg(projectTaskUrgVo);
 	}
 
 
@@ -470,35 +470,35 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
 	@ApiOperation(value="项目库-法规清单表-根据项目库id更新符合性流程发起人、责任人接口", notes="项目库-法规清单表-根据项目库id更新符合性流程发起人、责任人接口")
 	@GetMapping(value = "/updateFlowInfoByProjectLibraryIds")
 	public Result<?> updateFlowInfoByProjectLibraryIds(@RequestParam("projectLibraryIds") String projectLibraryIds){
-		return this.projectLawsInventoryEOService.updateFlowInfoByProjectLibraryIds(projectLibraryIds);
+		return this.platformProjectLawsInventoryEOService.updateFlowInfoByProjectLibraryIds(projectLibraryIds);
 	}
 
 	@AutoLog(value = "项目库-法规清单表-studio发布")
 	@ApiOperation(value="项目库-法规清单表-studio发布", notes="项目库-法规清单表-studio发布")
 	@PostMapping(value = "/studioPublish")
 	public Result<?> studioPublish(@RequestBody JSONObject json) {
-		return this.projectLawsInventoryEOService.studioPublish(json);
+		return this.platformProjectLawsInventoryEOService.studioPublish(json);
 	}
 
 	@AutoLog(value = "项目库-法规清单表-studio撤回")
 	@ApiOperation(value="项目库-法规清单表-studio撤回", notes="项目库-法规清单表-studio撤回")
 	@PostMapping(value = "/studioWithdrew")
 	public Result<?> studioWithdrew(@RequestBody JSONObject json) {
-		return this.projectLawsInventoryEOService.studioWithdrew(json);
+		return this.platformProjectLawsInventoryEOService.studioWithdrew(json);
 	}
 
 	@AutoLog(value = "项目库-法规清单表-法规工程师退回")
 	@ApiOperation(value="项目库-法规清单表-法规工程师退回", notes="项目库-法规清单表-法规工程师退回")
 	@PostMapping(value = "/regulationOwnerReturned")
 	public Result<?> regulationOwnerReturned(@RequestBody JSONObject json) {
-		return this.projectLawsInventoryEOService.regulationOwnerReturned(json);
+		return this.platformProjectLawsInventoryEOService.regulationOwnerReturned(json);
 	}
 
 	@AutoLog(value = "流程重置-迁移法规清单流程历史数据专用")
 	@ApiOperation(value="流程重置-迁移法规清单流程历史数据专用", notes="流程重置-迁移法规清单流程历史数据专用")
 	@PostMapping(value = "/resetFlowTemp")
 	public Result<?> resetFlowTemp(@RequestBody JSONObject params) {
-		return this.projectLawsInventoryEOService.resetFlowTemp(params);
+		return this.platformProjectLawsInventoryEOService.resetFlowTemp(params);
 	}
 
 	/**
@@ -510,21 +510,21 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
 	@ApiOperation(value="项目库-法规清单表-批量更新流程状态", notes="项目库-法规清单表-批量更新流程状态")
 	@PostMapping(value = "/updateFlowStatusBatch")
 	public Result<?> updateFlowStatusBatch(@RequestBody JSONObject json) {
-		return this.projectLawsInventoryEOService.updateFlowStatusBatch(json);
+		return this.platformProjectLawsInventoryEOService.updateFlowStatusBatch(json);
 	}
 
 	@AutoLog(value = "项目库-法规清单表-引用交付物")
 	@ApiOperation(value="项目库-法规清单表-引用交付物", notes="项目库-法规清单表-引用交付物")
 	@PostMapping(value = "/citeDeliverable")
 	public Result<?> citeDeliverable(@RequestBody JSONObject json) {
-		return this.projectLawsInventoryEOService.citeDeliverable(json);
+		return this.platformProjectLawsInventoryEOService.citeDeliverable(json);
 	}
 
 	@AutoLog(value = "项目库-法规清单表-强制转办")
 	@ApiOperation(value="项目库-法规清单表-强制转办", notes="项目库-法规清单表-强制转办")
 	@PostMapping(value = "/compulsoryTransfer")
 	public Result<?> compulsoryTransfer(@RequestBody JSONObject json) {
-		return this.projectLawsInventoryEOService.compulsoryTransfer(json);
+		return this.platformProjectLawsInventoryEOService.compulsoryTransfer(json);
 	}
 
 	/**
@@ -536,7 +536,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
 	@ApiOperation(value="项目库-法规清单表-通过projectId查询责任人", notes="项目库-法规清单表-通过projectId查询责任人")
 	@GetMapping(value = "/queryDutyPersonByProjectId")
 	public Result<?> queryDutyPersonByProjectId(@RequestParam Map<String,Object> params){
-		Map<String, List<Map<String, Object>>> res = this.projectLawsInventoryEOService.queryDutyPersonByProjectId(params);
+		Map<String, List<Map<String, Object>>> res = this.platformProjectLawsInventoryEOService.queryDutyPersonByProjectId(params);
 		return Result.OK(res);
 	}
 
@@ -548,7 +548,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
 	@ApiOperation(value="项目库-法规清单表-查询不符合项列表", notes="项目库-法规清单表-查询不符合项列表")
 	@GetMapping(value = "/queryNotComplianList")
 	public Result<?> queryNotComplianList(@RequestParam Map<String,Object> params) {
-		List<Map<String,Object>> result = this.projectLawsInventoryEOService.queryNotComplianList(params);
+		List<Map<String,Object>> result = this.platformProjectLawsInventoryEOService.queryNotComplianList(params);
 		Page pages = PageUtil.getPages(Integer.parseInt((String) params.get("pageNo")), Integer.parseInt((String) params.get("pageSize")), result);
 		return Result.OK(pages);
 	}
@@ -564,13 +564,13 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
 	public void exportNotComplianList(HttpServletResponse response,
 						   HttpServletRequest request,
 						   @RequestBody Map<String,Object> params) {
-		this.projectLawsInventoryEOService.exportNotComplianList(response,request, params);
+		this.platformProjectLawsInventoryEOService.exportNotComplianList(response,request, params);
 	}
 
 	@AutoLog(value = "项目库-法规清单表-定版校验")
 	@ApiOperation(value="项目库-法规清单表-定版校验", notes="项目库-法规清单表-定版校验")
 	@GetMapping(value = "/finalizationVerify")
 	public Result<?> finalizationVerify(@RequestParam Map<String,Object> params){
-		return this.projectLawsInventoryEOService.finalizationVerify(params);
+		return this.platformProjectLawsInventoryEOService.finalizationVerify(params);
 	}
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index 06edf9d70..73e87b67e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -55,6 +55,10 @@ import com.jero.modules.feishu.vo.FeishuMsgVo;
 import com.jero.modules.message.websocket.WebSocket;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
+import com.jero.modules.platform.mapper.PlatformProjectLawsInventoryEOMapper;
+import com.jero.modules.platform.mapper.PlatformProjectLibraryBaseMapper;
+import com.jero.modules.platform.mapper.PlatformProjectNameInfoEOMapper;
+import com.jero.modules.platform.service.IPlatformProjectLawsInventoryEOService;
 import com.jero.modules.project.entity.ConditionAssessmentEO;
 import com.jero.modules.project.entity.ProblemManagementEO;
 import com.jero.modules.project.entity.ProjectLawsInventoryEO;
@@ -88,30 +92,22 @@ import com.jero.modules.project.enums.RequestSourceEnum;
 import com.jero.modules.project.enums.TaskAffirmStatusEnum;
 import com.jero.modules.project.enums.TaskStatusEnum;
 import com.jero.modules.project.mapper.ProblemManagementEOMapper;
-import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
-import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
 import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper;
 import com.jero.modules.project.mapper.ProjectYearNameInfoEOMapper;
 import com.jero.modules.project.service.IConditionAssessmentEOService;
-import com.jero.modules.project.service.IFeedbackHistoryService;
 import com.jero.modules.project.service.IProjectLawsInventoryRejectCauseEOService;
-import com.jero.modules.project.service.IProjectLibraryRoleRelEOService;
 import com.jero.modules.project.service.IProjectRelatedPersonnelService;
 import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService;
 import com.jero.modules.project.service.IProjectTaskInventoryEOService;
-import com.jero.modules.project.service.IProjectTaskInventoryFeedbackEOService;
 import com.jero.modules.project.service.IProjectUserPermissionService;
 import com.jero.modules.project.service.editImpl.ProjectLawsInventoryEOEditServiceImpl;
 import com.jero.modules.project.service.impl.ProblemManagementEOServiceImpl;
 import com.jero.modules.project.service.impl.ProjectLawsInventoryLogEOServiceImpl;
-import com.jero.modules.project.service.impl.ProjectLibraryBaseServiceImpl;
 import com.jero.modules.project.service.impl.ProjectRelatedPersonnelServiceImpl;
 import com.jero.modules.project.util.WordUtil;
 import com.jero.modules.project.vo.NcrTrackVO;
 import com.jero.modules.project.vo.ProblemManagementVO;
 import com.jero.modules.project.vo.ProjectTaskUrgVo;
-import com.jero.modules.platform.mapper.PlatformProjectLawsInventoryEOMapper;
-import com.jero.modules.platform.service.IPlatformProjectLawsInventoryEOService;
 import com.jero.modules.split.common.FileUnZip;
 import com.jero.modules.system.entity.SysAnnouncement;
 import com.jero.modules.system.entity.SysCategory;
@@ -120,12 +116,10 @@ import com.jero.modules.system.entity.SysRole;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.enums.DicCodeEnum;
 import com.jero.modules.system.mapper.SysCategoryMapper;
-import com.jero.modules.system.mapper.SysDictItemMapper;
 import com.jero.modules.system.mapper.SysRoleMapper;
 import com.jero.modules.system.mapper.SysUserMapper;
 import com.jero.modules.system.service.IProjectUserDutyTerritoryService;
 import com.jero.modules.system.service.ISysAnnouncementService;
-import com.jero.modules.system.service.ISysDictItemService;
 import com.jero.modules.system.service.ISysDictService;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
@@ -141,7 +135,6 @@ import com.jero.modules.todoCenter.service.IProcessInfoEOService;
 import com.jero.modules.wkflow.entity.ProcessHistoryEO;
 import com.jero.modules.wkflow.enums.DesignComplianceNodeEnum;
 import com.jero.modules.wkflow.enums.FlowTypeEnum;
-import com.jero.modules.wkflow.feginClient.impl.TaskFeignClientImpl;
 import com.jero.modules.wkflow.feginClient.impl.WorkFlowFeignClientImpl;
 import com.jero.modules.wkflow.service.IProcessHistoryEOService;
 import com.jero.modules.wkflow.service.impl.ProcessHistoryEOServiceImpl;
@@ -240,7 +233,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 	private static DecimalFormat df = new DecimalFormat("#.00");
 	private static String percentSign = "%";
 	@Autowired
-	private ProjectLibraryBaseMapper projectLibraryBaseMapper;
+	private PlatformProjectLibraryBaseMapper platformProjectLibraryBaseMapper;
 
 	@Autowired
 	private SysUserMapper sysUserMapper;
@@ -267,7 +260,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 	private ProjectRelatedPersonnelMapper projectRelatedPersonnelMapper;
 
 	@Autowired
-	private ProjectNameInfoEOMapper projectNameInfoEOMapper;
+	private PlatformProjectNameInfoEOMapper platformProjectNameInfoEOMapper;
 
 	@Autowired
 	private ProjectYearNameInfoEOMapper projectYearNameInfoEOMapper;
@@ -278,12 +271,6 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 	@Autowired
 	private IProjectTaskInventoryDetailEOService projectTaskInventoryDetailEOService;
 
-	@Autowired
-	private IProjectTaskInventoryFeedbackEOService projectTaskInventoryFeedbackEOService;
-
-	@Autowired
-	private IFeedbackHistoryService feedbackHistoryService;
-
 	@Autowired
 	private IDummyInventoryInfoEOService dummyInventoryInfoEOService;
 	@Value(value = "${jero.path.upload}")
@@ -310,9 +297,6 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 	@Autowired
 	private DummyInventoryBaseEOServiceImpl dummyInventoryBaseEOService;
 
-	@Autowired
-	private SysDictItemMapper sysDictItemMapper;
-
 	@Autowired
 	private IProcessHistoryEOService processHistoryEOService;
 
@@ -324,15 +308,12 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 	@Autowired
 	SysCategoryMapper sysCategoryMapper;
 
-	@Autowired
-	private TaskFeignClientImpl taskFeignClient;
-
 	@Autowired
 	SysRoleMapper sysRoleMapper;
 	@Autowired
-	ProjectLibraryBaseServiceImpl projectLibraryBaseService;
+	private PlatformProjectLibraryBaseServiceImpl platformProjectLibraryBaseService;
 	@Autowired
-	ProjectRelatedPersonnelServiceImpl projectRelatedPersonnelService;
+	private ProjectRelatedPersonnelServiceImpl projectRelatedPersonnelService;
 
 	@Autowired
 	private IProjectLawsInventoryRejectCauseEOService projectLawsInventoryRejectCauseEOService;
@@ -353,10 +334,6 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 	@Autowired
 	private IProjectUserDutyTerritoryService projectUserDutyTerritoryService;
 
-	@Autowired
-	private ISysDictItemService sysDictItemService;
-	@Autowired
-	private IProjectLibraryRoleRelEOService projectLibraryRoleRelEOService;
 	@Autowired
 	private ProjectLawsInventoryEOEditServiceImpl editService;
 	@Autowired
@@ -1937,7 +1914,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 		}
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		try {
-			ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectOne(new QueryWrapper<ProjectLibraryBase>()
+			ProjectLibraryBase projectLibraryBase = platformProjectLibraryBaseMapper.selectOne(new QueryWrapper<ProjectLibraryBase>()
 					.lambda().eq(ProjectLibraryBase::getId, projectLibraryId));
 
 			// studio信息
@@ -1947,7 +1924,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 
 			QueryWrapper<ProjectNameInfoEO> projectNameInfoEOQueryWrapper = new QueryWrapper<>();
 			projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId());
-			ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
+			ProjectNameInfoEO projectNameInfoEO = platformProjectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
 
 			QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
 			projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId, projectLibraryBase.getYearNameId());
@@ -2530,7 +2507,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 				//项目库信息(获取studio)
 				LambdaQueryWrapper<ProjectLibraryBase> wrapper = new LambdaQueryWrapper<>();
 				wrapper.in(ProjectLibraryBase::getId, projectLibraryId);
-				List<ProjectLibraryBase> projectLibraryBases = projectLibraryBaseMapper.selectList(wrapper);
+				List<ProjectLibraryBase> projectLibraryBases = platformProjectLibraryBaseMapper.selectList(wrapper);
 				String studioEngineer = "";
 				if (projectLibraryBases.size() != 0) {
 					studioEngineer = projectLibraryBases.get(0).getStudioEngineer();
@@ -2930,7 +2907,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 			String templateId = jsonObject.getString("templateId");
 
 			String projectLibraryId = (String) prarams.get("projectLibraryId");
-			ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+			ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
 			if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
 				String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 				String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -3054,7 +3031,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 		String projectLibraryId = jsonObject.getString("projectLibraryId"); //项目库id
 		String engineeringInterfacePerson = jsonObject.getString("engineeringInterfacePerson"); //工程接口人id
 
-		ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectOne(new QueryWrapper<ProjectLibraryBase>()
+		ProjectLibraryBase projectLibraryBase = platformProjectLibraryBaseMapper.selectOne(new QueryWrapper<ProjectLibraryBase>()
 				.lambda().eq(ProjectLibraryBase::getId, projectLibraryId));
 
 		ProjectLawsInventoryEO projectLawsInventoryEO = this.baseMapper.selectOne(
@@ -3067,7 +3044,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 
 		QueryWrapper<ProjectNameInfoEO> projectNameInfoEOQueryWrapper = new QueryWrapper<>();
 		projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId());
-		ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
+		ProjectNameInfoEO projectNameInfoEO = platformProjectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
 
 		QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
 		projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId, projectLibraryBase.getYearNameId());
@@ -3091,7 +3068,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 		String enContentLower = "";//英文下部分
 		String color = "";//颜色
 
-		ProjectLibraryBase LibraryBase = projectLibraryBaseService.queryById(projectLibraryId, CutEnum.EN.getValue()).get(0);
+		ProjectLibraryBase LibraryBase = platformProjectLibraryBaseService.queryById(projectLibraryId, CutEnum.EN.getValue()).get(0);
 		String PRN = LibraryBase.getProjectName();//项目名称
 		String LAW_CN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle();//法规
 		BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(projectLawsInventoryEO.getStandId());
@@ -5021,7 +4998,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 			paramsMsg.put("userIdList", userIdList);
 			paramsMsg.put("serialNumbers", serialNumbers);
 
-			ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+			ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
 			if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
 				String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 				String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -7120,12 +7097,12 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 
 		QueryWrapper<ProjectLibraryBase> libraryBaseQueryWrapper = new QueryWrapper<>();
 		libraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId, projectLawsInventoryEO.getProjectLibraryId());
-		ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectOne(libraryBaseQueryWrapper);
+		ProjectLibraryBase projectLibraryBase = platformProjectLibraryBaseMapper.selectOne(libraryBaseQueryWrapper);
 		params.put("projectLibraryBase", projectLibraryBase);
 
 		QueryWrapper<ProjectNameInfoEO> projectNameQueryWrapper = new QueryWrapper<>();
 		projectNameQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId());
-		ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameQueryWrapper);
+		ProjectNameInfoEO projectNameInfoEO = platformProjectNameInfoEOMapper.selectOne(projectNameQueryWrapper);
 		params.put("projectNameInfoEO", projectNameInfoEO);
 
 		//设置ProgramInformation内容
@@ -7606,12 +7583,12 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 
 		QueryWrapper<ProjectLibraryBase> libraryBaseQueryWrapper = new QueryWrapper<>();
 		libraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId, projectLawsInventoryEO.getProjectLibraryId());
-		ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectOne(libraryBaseQueryWrapper);
+		ProjectLibraryBase projectLibraryBase = platformProjectLibraryBaseMapper.selectOne(libraryBaseQueryWrapper);
 		params.put("projectLibraryBase", projectLibraryBase);
 
 		QueryWrapper<ProjectNameInfoEO> projectNameQueryWrapper = new QueryWrapper<>();
 		projectNameQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId());
-		ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameQueryWrapper);
+		ProjectNameInfoEO projectNameInfoEO = platformProjectNameInfoEOMapper.selectOne(projectNameQueryWrapper);
 		params.put("projectNameInfoEO", projectNameInfoEO);
 
 
@@ -8008,7 +7985,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 
 		QueryWrapper<ProjectLibraryBase> libraryBaseQueryWrapper = new QueryWrapper<>();
 		libraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId,projectLibraryId);
-		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseMapper.selectOne(libraryBaseQueryWrapper);
+		ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseMapper.selectOne(libraryBaseQueryWrapper);
 
 		SysUser studioUserInfo = this.sysUserMapper.selectOne(
 				new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer())
@@ -8039,7 +8016,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 
 					QueryWrapper<ProjectNameInfoEO> projectNameInfoEOQueryWrapper = new QueryWrapper<>();
 					projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId());
-					ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
+					ProjectNameInfoEO projectNameInfoEO = platformProjectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
 
 					QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
 					projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId());
@@ -8133,7 +8110,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 
 					QueryWrapper<ProjectNameInfoEO> projectNameInfoEOQueryWrapper = new QueryWrapper<>();
 					projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId());
-					ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
+					ProjectNameInfoEO projectNameInfoEO = platformProjectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
 
 					QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
 					projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId());
@@ -8253,7 +8230,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 				params.put("userIdList", userIdList);
 				params.put("serialNumbers", serialNumbers);
 
-				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
 				if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -8321,7 +8298,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 				params.put("flowTypeCn","验证符合性流程");
 				params.put("flowTypeEn","Validation Compliance Process");
 
-				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
 				if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -8388,7 +8365,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 				params.put("userIdList", userIdList);
 				params.put("serialNumbers", serialNumbers);
 
-				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
 				if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -8454,7 +8431,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 				params.put("userIdList", userIdList);
 				params.put("serialNumbers", serialNumbers);
 
-				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
 				if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -8513,7 +8490,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 				params.put("userIdList", userIdList);
 				params.put("serialNumbers", serialNumbers);
 
-				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
 				if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -8581,7 +8558,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 				params.put("flowTypeCn","设计符合性流程");
 				params.put("flowTypeEn","Design Compliance Process");
 
-				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
 				if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -8648,7 +8625,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 				params.put("userIdList", userIdList);
 				params.put("serialNumbers", serialNumbers);
 
-				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
 				if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -8714,7 +8691,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 				params.put("userIdList", userIdList);
 				params.put("serialNumbers", serialNumbers);
 
-				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
 				if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -8737,7 +8714,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 		List<SysRole> sysRoles = new LinkedList<>();
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		//项目详情中取R&H Studio和认证工程师
-		List<ProjectLibraryBase> projectLibraryBases = projectLibraryBaseService.queryById(projectLibraryId, null);
+		List<ProjectLibraryBase> projectLibraryBases = platformProjectLibraryBaseService.queryById(projectLibraryId, null);
 		String certificationEngineerName = "";
 		if (projectLibraryBases.size() != 0) {
 			certificationEngineerName = projectLibraryBases.get(0).getCertificationEngineerName();
@@ -9189,12 +9166,12 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 			}
 		}
 
-		ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectOne(new QueryWrapper<ProjectLibraryBase>()
+		ProjectLibraryBase projectLibraryBase = platformProjectLibraryBaseMapper.selectOne(new QueryWrapper<ProjectLibraryBase>()
 				.lambda().eq(ProjectLibraryBase::getId, projectLawsInventoryEO.getProjectLibraryId()));
 
 		QueryWrapper<ProjectNameInfoEO> projectNameInfoEOQueryWrapper = new QueryWrapper<>();
 		projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId());
-		ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
+		ProjectNameInfoEO projectNameInfoEO = platformProjectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
 
 		QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
 		projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId, projectLibraryBase.getYearNameId());
@@ -9421,7 +9398,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 		params.put("endTime", inventoryAffirmDueDate);
 		params.put("userIdList", userIdList);
 
-		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+		ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
 		if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
 			String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 			String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -9513,7 +9490,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 		params.put("userIdList", userIdList);
 		params.put("serialNumbers", serialNumbers);
 
-		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+		ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
 		if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
 			String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 			String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -9536,7 +9513,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 		String cut = json.getString("cut");
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
-		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+		ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
 		if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
 			String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 			String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -9658,7 +9635,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 			String hrefFeishu_CN_P = (String) params.get("hrefFeishu_CN_P");
 
 
-			ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+			ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
 			if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
 				String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 				String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -9734,7 +9711,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 		String projectNameCn = (String) todoCenterParams.get("projectNameCn");
 		String projectNameEn = (String) todoCenterParams.get("projectNameEn");
 
-//		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.getBaseMapper().selectProjectName(projectLibraryId);
+//		ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.getBaseMapper().selectProjectName(projectLibraryId);
 //		String projectNameCn = projectLibraryBase.getProjectName();
 
 		Map<String, Object> result = new HashMap<>();
@@ -12011,7 +11988,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 			QueryWrapper<ProjectLibraryBase> projectLibraryBaseQueryWrapper = new QueryWrapper<>();
 			projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId, projectLibraryId);
 			projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getStudioEngineer, currentUserId);
-			Integer projectLibrayBaseCount = projectLibraryBaseMapper.selectCount(projectLibraryBaseQueryWrapper);
+			Integer projectLibrayBaseCount = platformProjectLibraryBaseMapper.selectCount(projectLibraryBaseQueryWrapper);
 			if (projectLibrayBaseCount > 0) {
 				result = Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue());
 			} else {

From 13ffee9729904882288089fb796fd7adc8387119 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 13 Sep 2023 14:42:40 +0800
Subject: [PATCH 012/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformProjectLibraryBaseController.java |  6 +--
 ...> IPlatformProjectLibraryBaseService.java} |  2 +-
 ...ctCertificationInventoryEOServiceImpl.java | 48 ++++++++-----------
 ...PlatformProjectLibraryBaseServiceImpl.java |  4 +-
 4 files changed, 27 insertions(+), 33 deletions(-)
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/{IPlatformIProjectLibraryBaseService.java => IPlatformProjectLibraryBaseService.java} (97%)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLibraryBaseController.java
index 42453f1de..9307bbfe8 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLibraryBaseController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLibraryBaseController.java
@@ -8,7 +8,7 @@ import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.vo.DictModel;
 import com.jero.modules.project.entity.ProjectLibraryBase;
-import com.jero.modules.platform.service.IPlatformIProjectLibraryBaseService;
+import com.jero.modules.platform.service.IPlatformProjectLibraryBaseService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -44,9 +44,9 @@ import java.util.Map;
 @RestController
 @RequestMapping("/platform/projectLibraryBase")
 @Slf4j
-public class PlatformProjectLibraryBaseController extends JeroController<ProjectLibraryBase, IPlatformIProjectLibraryBaseService> {
+public class PlatformProjectLibraryBaseController extends JeroController<ProjectLibraryBase, IPlatformProjectLibraryBaseService> {
 	@Autowired
-	private IPlatformIProjectLibraryBaseService platformIProjectLibraryBaseService;
+	private IPlatformProjectLibraryBaseService platformIProjectLibraryBaseService;
 
 	/**
 	 * 分页列表查询
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformIProjectLibraryBaseService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectLibraryBaseService.java
similarity index 97%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformIProjectLibraryBaseService.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectLibraryBaseService.java
index 76b51e0d9..5b067b8be 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformIProjectLibraryBaseService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectLibraryBaseService.java
@@ -20,7 +20,7 @@ import java.util.Map;
  * @Date:   2022-04-11
  * @Version: V1.0
  */
-public interface IPlatformIProjectLibraryBaseService extends IService<ProjectLibraryBase> {
+public interface IPlatformProjectLibraryBaseService extends IService<ProjectLibraryBase> {
 
 	/**
 	 * 保存
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
index 775043f28..3ddd759b8 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
@@ -20,7 +20,6 @@ import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.DateUtils;
 import com.jero.common.util.oss.CosBootUtil;
 import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO;
-import com.jero.modules.authDummy.service.IAuthDummyInventoryBaseEOService;
 import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService;
 import com.jero.modules.document.entity.BussDocumentLibraryEO;
 import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper;
@@ -31,6 +30,11 @@ import com.jero.modules.feishu.enums.TemplateInfoEnum2;
 import com.jero.modules.feishu.service.IFeishuService;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
+import com.jero.modules.platform.mapper.PlatformProjectCertificationInventoryEOMapper;
+import com.jero.modules.platform.mapper.PlatformProjectLibraryBaseMapper;
+import com.jero.modules.platform.service.IPlatformProjectCertificationInventoryEOService;
+import com.jero.modules.platform.service.IPlatformProjectLawsInventoryEOService;
+import com.jero.modules.platform.service.IPlatformProjectLibraryBaseService;
 import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEO;
 import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOEn;
 import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
@@ -54,16 +58,11 @@ import com.jero.modules.project.enums.ReviewResultEnum;
 import com.jero.modules.project.enums.RoleRelModelTypeEnum;
 import com.jero.modules.project.enums.TaskAffirmStatusEnum;
 import com.jero.modules.project.enums.TaskStatusEnum;
-import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
 import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper;
 import com.jero.modules.project.service.IProjectCertificationInventoryLogEOService;
-import com.jero.modules.project.service.IProjectLibraryBaseService;
 import com.jero.modules.project.service.IProjectLibraryRoleRelEOService;
 import com.jero.modules.project.service.IProjectRelatedPersonnelService;
 import com.jero.modules.project.service.IProjectUserPermissionService;
-import com.jero.modules.platform.mapper.PlatformProjectCertificationInventoryEOMapper;
-import com.jero.modules.platform.service.IPlatformProjectCertificationInventoryEOService;
-import com.jero.modules.platform.service.IPlatformProjectLawsInventoryEOService;
 import com.jero.modules.split.common.FileUnZip;
 import com.jero.modules.system.entity.SysCategory;
 import com.jero.modules.system.entity.SysDictItem;
@@ -73,7 +72,6 @@ import com.jero.modules.system.enums.ProjectRoleEnum;
 import com.jero.modules.system.enums.SysCategoryValueTypeEnum;
 import com.jero.modules.system.mapper.SysCategoryMapper;
 import com.jero.modules.system.mapper.SysRoleMapper;
-import com.jero.modules.system.mapper.SysUserMapper;
 import com.jero.modules.system.service.IProjectUserDutyTerritoryService;
 import com.jero.modules.system.service.ISysCategoryService;
 import com.jero.modules.system.service.ISysDictItemService;
@@ -168,7 +166,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 	@Autowired
 	private SysDictItemServiceImpl sysDictItemServiceImpl;
 	@Autowired
-	private IProjectLibraryBaseService projectLibraryBaseService;
+	private IPlatformProjectLibraryBaseService platformProjectLibraryBaseService;
 	@Autowired
 	private IProcessInfoEOService processInfoEOService;
 	@Autowired
@@ -182,8 +180,6 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 	@Autowired
 	private IFeishuService feishuService;
 	@Autowired
-	private IAuthDummyInventoryBaseEOService authDummyInventoryBaseEOService;
-	@Autowired
 	private IAuthDummyInventoryInfoEOService authDummyInventoryInfoEOService;
 	@Autowired
 	private IProjectCertificationInventoryLogEOService projectCertificationInventoryLogEOService;
@@ -200,7 +196,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 	private IPlatformProjectLawsInventoryEOService platformProjectLawsInventoryEOService;
 
 	@Autowired
-	private ProjectLibraryBaseMapper projectLibraryBaseMapper;
+	private PlatformProjectLibraryBaseMapper platformProjectLibraryBaseMapper;
 
 
 	@Value(value = "${jero.backUrl}")
@@ -222,8 +218,6 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 	@Autowired
 	private IOSSFileService iOSSFileService;
 	@Autowired
-	private SysUserMapper sysUserMapper;
-	@Autowired
 	private IProjectLibraryRoleRelEOService projectLibraryRoleRelEOService;
 	@Autowired
 	private IProcessHistoryEOService processHistoryEOService;
@@ -360,7 +354,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 		//获取当前项目库id的studio工程师和认证工程师
 		List<String> studionList = new ArrayList<>();
 		List<String> certificationEngineerList = new ArrayList<>();
-		List<ProjectLibraryBase> projectLibraryBases = projectLibraryBaseService.queryById(projectId, cut);
+		List<ProjectLibraryBase> projectLibraryBases = platformProjectLibraryBaseService.queryById(projectId, cut);
 		for(ProjectLibraryBase projectLibraryBase : projectLibraryBases){
 			studionList.add(projectLibraryBase.getStudioEngineer());
 
@@ -460,7 +454,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 		}).collect(Collectors.toList());
 
 		if(CollectionUtils.isNotEmpty(oldPciEos)){
-			ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId());
+			ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId());
 			if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 				int role = checkUserRole(oldPciEos.get(0).getProjectLibraryId(),currentUser.getId());
 				for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) {
@@ -518,7 +512,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 		}).collect(Collectors.toList());
 
 		if(CollectionUtils.isNotEmpty(oldPciEos)){
-			ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId());
+			ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId());
 			if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 				int role = checkUserRole(oldPciEos.get(0).getProjectLibraryId(),currentUser.getId());
 				for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) {
@@ -773,7 +767,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 		}).collect(Collectors.toList());
 
 		if(CollectionUtils.isNotEmpty(oldPciEos)){
-			ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId());
+			ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId());
 			if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 				// 同步更新待办中心-流程明细截止日期
 				this.syncProcessInfoDetailEndTime(newEndTime, oldPciEos);
@@ -1023,7 +1017,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 //				}).collect(Collectors.toList());
 //
 //				if (CollectionUtils.isNotEmpty(pciEoListTemp)) {
-//					ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(pciEoListTemp.get(0).getProjectLibraryId());
+//					ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(pciEoListTemp.get(0).getProjectLibraryId());
 //					if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 //						List<String> userIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
 //						List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
@@ -1094,7 +1088,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 										String contentEn){
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
-		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectCertificationInventoryEOS.get(0).getProjectLibraryId());
+		ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectCertificationInventoryEOS.get(0).getProjectLibraryId());
 		if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 			String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 			String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -1555,7 +1549,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 		}
 
 		// 获取项目信息，获取认证工程师，给认证工程师分配待办任务
-		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+		ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
 		if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 			String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 			String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -1701,7 +1695,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
 		//项目详情中取R&H Studio和认证工程师
-		List<ProjectLibraryBase> projectLibraryBases = projectLibraryBaseService.queryById(projectLibraryId,null);
+		List<ProjectLibraryBase> projectLibraryBases = platformProjectLibraryBaseService.queryById(projectLibraryId,null);
 		String certificationEngineerName = "";
 		if(projectLibraryBases.size() != 0){
 			certificationEngineerName = projectLibraryBases.get(0).getCertificationEngineerName();
@@ -2216,7 +2210,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 		}
 
 		String projectLibraryId = json.getString("projectLibraryId");
-		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+		ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
 		if(ObjectUtils.isEmpty(projectLibraryBase)){
 			throw new JeroBootException("无法获取项目库信息，项目库id为：" + projectLibraryId + " 请联系管理员！");
 		}
@@ -3546,7 +3540,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 		String operatorType = json.getString("operatorType");
 
 		String projectLibraryId = json.getString("projectLibraryId");
-		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+		ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
 		if(ObjectUtils.isEmpty(projectLibraryBase)){
 			throw new JeroBootException("无法获取项目库信息，项目库id为：" + projectLibraryId + " 请联系管理员！");
 		}
@@ -3689,7 +3683,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 		String transferUserId = json.getString("transferUserId");
 		SysUser transferUserInfo = this.sysUserService.getById(transferUserId);
 
-		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+		ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
 		if(ObjectUtils.isEmpty(projectLibraryBase)){
 			throw new JeroBootException("无法获取项目库信息，项目库id为：" + projectLibraryId + " 请联系管理员！");
 		}
@@ -3832,7 +3826,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 		}
 
 		String projectLibraryId = json.getString("projectLibraryId");
-		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+		ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
 		String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 		String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 		if(ObjectUtils.isEmpty(projectLibraryBase)){
@@ -5813,7 +5807,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 		if(CollectionUtils.isNotEmpty(pciList)){
 			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 			String projectLibraryId = pciList.get(0).getProjectLibraryId();
-			ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+			ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
 			if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 				List<SysUser> studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(Arrays.asList(projectLibraryBase.getStudioEngineer().split(",")));
 
@@ -6830,7 +6824,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 			QueryWrapper<ProjectLibraryBase> projectLibraryBaseQueryWrapper = new QueryWrapper<>();
 			projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId, projectLibraryId);
 			projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getStudioEngineer, currentUserId);
-			Integer projectLibrayBaseCount = projectLibraryBaseMapper.selectCount(projectLibraryBaseQueryWrapper);
+			Integer projectLibrayBaseCount = platformProjectLibraryBaseMapper.selectCount(projectLibraryBaseQueryWrapper);
 			if (projectLibrayBaseCount > 0) {
 				result = Integer.parseInt(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue());
 				if(result == -1){
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
index 27329d286..ccba9111b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
@@ -25,7 +25,7 @@ import com.jero.modules.feishu.enums.TemplateInfoEnum2;
 import com.jero.modules.ota.service.impl.OtaManageApplyEOServiceImpl;
 import com.jero.modules.platform.mapper.PlatformProjectLawsInventoryEOMapper;
 import com.jero.modules.platform.mapper.PlatformProjectLibraryBaseMapper;
-import com.jero.modules.platform.service.IPlatformIProjectLibraryBaseService;
+import com.jero.modules.platform.service.IPlatformProjectLibraryBaseService;
 import com.jero.modules.platform.service.IPlatformProjectCertificationInventoryEOService;
 import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
 import com.jero.modules.project.entity.ProjectLawsInventoryEO;
@@ -122,7 +122,7 @@ import java.util.stream.Collectors;
  * @Version: V1.0
  */
 @Service
-public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformProjectLibraryBaseMapper, ProjectLibraryBase> implements IPlatformIProjectLibraryBaseService {
+public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformProjectLibraryBaseMapper, ProjectLibraryBase> implements IPlatformProjectLibraryBaseService {
 	@Autowired
 	private PlatformProjectLibraryBaseMapper platformProjectLibraryBaseMapper;
 

From f7360d9de337db173481c1050595f1326d9f6911 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 13 Sep 2023 14:46:20 +0800
Subject: [PATCH 013/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6--=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platformProjectNameInfoEOController.java  | 21 ++++++++++---------
 .../PlatformProjectNameInfoEOServiceImpl.java | 12 ++---------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/platformProjectNameInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/platformProjectNameInfoEOController.java
index 5436884d1..b857754e3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/platformProjectNameInfoEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/platformProjectNameInfoEOController.java
@@ -7,6 +7,7 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.platform.service.IPlatformProjectNameInfoEOService;
 import com.jero.modules.project.entity.ProjectLibraryBase;
 import com.jero.modules.project.entity.ProjectNameInfoEO;
 import com.jero.modules.project.service.IProjectNameInfoEOService;
@@ -44,7 +45,7 @@ import java.util.List;
 @Slf4j
 public class platformProjectNameInfoEOController extends JeroController<ProjectNameInfoEO, IProjectNameInfoEOService> {
 	@Autowired
-	private IProjectNameInfoEOService projectNameInfoEOService;
+	private IPlatformProjectNameInfoEOService platformProjectNameInfoEOService;
 
 	/**
 	 * 分页列表查询
@@ -64,7 +65,7 @@ public class platformProjectNameInfoEOController extends JeroController<ProjectN
 								   HttpServletRequest req) {
 		QueryWrapper<ProjectNameInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(projectNameInfoEO, req.getParameterMap());
 		Page<ProjectNameInfoEO> page = new Page<ProjectNameInfoEO>(pageNo, pageSize);
-		IPage<ProjectNameInfoEO> pageList = projectNameInfoEOService.page(page, queryWrapper);
+		IPage<ProjectNameInfoEO> pageList = platformProjectNameInfoEOService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
 
@@ -77,7 +78,7 @@ public class platformProjectNameInfoEOController extends JeroController<ProjectN
     @ApiOperation(value="项目名信息表-列表查询", notes="项目名信息表-列表查询")
 	@GetMapping(value = "/list")
 	public Result<List<ProjectNameInfoEO>> queryList() {
-		List<ProjectNameInfoEO> list = projectNameInfoEOService.queryList();
+		List<ProjectNameInfoEO> list = platformProjectNameInfoEOService.queryList();
 		return Result.OK(list);
 	}
     /**
@@ -89,7 +90,7 @@ public class platformProjectNameInfoEOController extends JeroController<ProjectN
     @ApiOperation(value="返回项目全拼", notes="返回项目全拼")
 	@GetMapping(value = "/queryProjectNameList")
 	public Result<List<ProjectLibraryBase>> queryProjectNameList(String cut) {
-		List<ProjectLibraryBase> list = projectNameInfoEOService.queryProjectNameList(cut);
+		List<ProjectLibraryBase> list = platformProjectNameInfoEOService.queryProjectNameList(cut);
 		return Result.OK(list);
 	}
 
@@ -103,7 +104,7 @@ public class platformProjectNameInfoEOController extends JeroController<ProjectN
 	@ApiOperation(value="项目名信息表-添加", notes="项目名信息表-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@Validated @RequestBody ProjectNameInfoEO projectNameInfoEO) {
-		projectNameInfoEOService.add(projectNameInfoEO);
+		platformProjectNameInfoEOService.add(projectNameInfoEO);
 		return Result.OK("添加成功！");
 	}
 
@@ -117,7 +118,7 @@ public class platformProjectNameInfoEOController extends JeroController<ProjectN
 	@ApiOperation(value="项目名信息表-编辑", notes="项目名信息表-编辑")
 	@PutMapping(value = "/edit")
 	public Result<?> edit(@Validated @RequestBody ProjectNameInfoEO projectNameInfoEO) {
-		projectNameInfoEOService.editById(projectNameInfoEO);
+		platformProjectNameInfoEOService.editById(projectNameInfoEO);
 		return Result.OK("编辑成功!");
 	}
 
@@ -131,7 +132,7 @@ public class platformProjectNameInfoEOController extends JeroController<ProjectN
 	@ApiOperation(value="项目名信息表-通过id删除", notes="项目名信息表-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		projectNameInfoEOService.deleteById(id);
+		platformProjectNameInfoEOService.deleteById(id);
 		return Result.OK("删除成功!");
 	}
 
@@ -145,7 +146,7 @@ public class platformProjectNameInfoEOController extends JeroController<ProjectN
 	@ApiOperation(value="项目名信息表-批量删除", notes="项目名信息表-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.projectNameInfoEOService.deleteByIds(Arrays.asList(ids.split(",")));
+		this.platformProjectNameInfoEOService.deleteByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
 
@@ -159,7 +160,7 @@ public class platformProjectNameInfoEOController extends JeroController<ProjectN
 	@ApiOperation(value="项目名信息表-通过id查询", notes="项目名信息表-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
-		ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOService.queryById(id);
+		ProjectNameInfoEO projectNameInfoEO = platformProjectNameInfoEOService.queryById(id);
 		if(projectNameInfoEO==null) {
 			return Result.error("未找到对应数据");
 		}
@@ -198,6 +199,6 @@ public class platformProjectNameInfoEOController extends JeroController<ProjectN
 //	 @ApiOperation(value="项目名信息表-space", notes="项目名信息表-space")
 //	 @RequestMapping(value = "/getSpaceInfo", method = RequestMethod.POST)
 //	 public void getSpaceInfo(@RequestParam(name="cut",required=true) String cut) {
-//		 projectNameInfoEOService.getSpaceInfo(cut);
+//		 platformProjectNameInfoEOService.getSpaceInfo(cut);
 //	 }
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectNameInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectNameInfoEOServiceImpl.java
index d6f134d81..7da3631ee 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectNameInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectNameInfoEOServiceImpl.java
@@ -3,16 +3,14 @@ package com.jero.modules.platform.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.system.vo.DictModel;
+import com.jero.modules.platform.mapper.PlatformProjectNameInfoEOMapper;
+import com.jero.modules.platform.service.IPlatformProjectNameInfoEOService;
 import com.jero.modules.project.entity.ProjectLibraryBase;
 import com.jero.modules.project.entity.ProjectNameInfoEO;
 import com.jero.modules.project.entity.ProjectYearNameInfoEO;
 import com.jero.modules.project.mapper.ProblemManagementEOMapper;
-import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
 import com.jero.modules.project.service.impl.ProblemManagementEOServiceImpl;
 import com.jero.modules.project.service.impl.ProjectYearNameInfoEOServiceImpl;
-import com.jero.modules.platform.mapper.PlatformProjectNameInfoEOMapper;
-import com.jero.modules.platform.service.IPlatformProjectNameInfoEOService;
-import com.jero.modules.space.service.SpaceServiceImpl;
 import com.jero.modules.system.enums.DicCodeEnum;
 import com.jero.modules.system.service.ISysDictService;
 import com.jero.modules.system.util.StringUtils;
@@ -31,12 +29,6 @@ import java.util.List;
  */
 @Service
 public class PlatformProjectNameInfoEOServiceImpl extends ServiceImpl<PlatformProjectNameInfoEOMapper, ProjectNameInfoEO> implements IPlatformProjectNameInfoEOService {
-	@Autowired
-	private ProjectNameInfoEOMapper projectNameInfoEOMapper;
-
-	@Autowired
-	private SpaceServiceImpl spaceService;
-
 	@Autowired
 	private ProjectYearNameInfoEOServiceImpl projectYearNameInfoEOService;
 	@Autowired

From 5edd41fdafdac2b0f9a68b7da1cf6982df5e5a6d Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 13 Sep 2023 14:51:29 +0800
Subject: [PATCH 014/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E6=9B=B4=E6=8D=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/associatedplat.vue             | 268 ++++++++++++++++++
 .../components/listOfRegulations.vue          |  10 +
 .../platformItemLibrary/index.vue             |  10 +-
 .../components/ProjectDetails.vue             |  16 +-
 .../components/batSetting.vue                 |   2 +-
 .../components/certificationActivity.vue      |   2 +-
 .../components/addConfiguration.vue           |   2 +-
 .../certificationList/components/addModel.vue |   8 +-
 .../components/batSetting.vue                 |   4 +-
 .../components/modifyHistoryList.vue          |   2 +-
 .../components/referenceDeliverablesList.vue  |   4 +-
 .../components/transferListvirtal.vue         |   2 +-
 .../components/certificationList/index.vue    |  44 +--
 .../components/detilModel.vue                 |   1 +
 .../components/listEditModel.vue              |   2 +-
 .../components/listOfRegulations.vue          |  62 ++--
 .../components/listOfRegulationsView.vue      |   2 +-
 .../components/modifyOperator.vue             |   2 +-
 .../components/nonConformance.vue             |   8 +-
 .../components/regulatoryCompliance.vue       |   2 +-
 .../components/resultReportedUpload.vue       |   2 +-
 .../components/transferListvirtal.vue         |   2 +-
 22 files changed, 368 insertions(+), 89 deletions(-)
 create mode 100644 jero-web/src/views/projectManagement/components/associatedplat.vue

diff --git a/jero-web/src/views/projectManagement/components/associatedplat.vue b/jero-web/src/views/projectManagement/components/associatedplat.vue
new file mode 100644
index 000000000..40576fda4
--- /dev/null
+++ b/jero-web/src/views/projectManagement/components/associatedplat.vue
@@ -0,0 +1,268 @@
+<template>
+  <a-drawer
+    :title="$t('Transfer')"
+    :maskClosable="false"
+    :width="1000"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <div style="margin-bottom: 60px">
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :md="12" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('VirtualListName')">
+                  <span>{{$t('VirtualListName1')}}</span>
+                </div>
+                <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('VirtualListName')"
+                         v-model="queryParam.name"></j-input>
+              </div>
+            </a-col>
+            <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="12" :sm="24">
+                  <a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+               </a-col>
+      </span>
+          </a-row>
+        </a-form>
+      </div>
+      <a-table
+        :components="drag(columns,'columns')"
+        :columns="columns"
+        rowKey="id"
+        :scroll="{x: 1000}"
+        :data-source="dataList"
+        :pagination="false"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' }"
+        :loading="loading">
+
+      </a-table>
+      <div class="page" v-if="dataList.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="onChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+
+    <div class="drawer-bootom-button">
+      <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit(undefined)" type="primary" :loading="confirmLoading">{{$t('determine')}}</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+  export default {
+    name: 'transferList',
+    components: {},
+    props: ['url'],
+    mixins: [ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        visible: false,
+        queryParam: {},
+        confirmLoading: false,
+        selectedRowKeys: [],
+        columns: [
+          {
+            title: this.$t('VirtualListName'),
+            dataIndex: 'name',
+            align: 'left',
+            ellipsis: true,
+            width: 235
+          },
+          {
+            title: this.$t('instructionForUse'),
+            dataIndex: 'useExplain',
+            align: 'left',
+            ellipsis: true,
+            width: 235
+          },
+          {
+            title: this.$t('updateTime'),
+            dataIndex: 'updateTime',
+            align: 'left',
+            ellipsis: true,
+            width: 235
+          },
+          {
+            title: this.$t('creater'),
+            dataIndex: 'createBy',
+            align: 'left',
+            ellipsis: true,
+            width: 235
+          }
+        ],
+        dataList: [],
+        content: [],
+        loading: false,
+        pageNo: 1,
+        pageSize: 10,
+        total: 0
+      }
+    },
+    mounted() {
+
+    },
+    methods: {
+      transferModel() {
+        this.visible = true
+        this.queryParam = {}
+        this.selectedRowKeys = []
+        this.replacePage()
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.replacePage()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.replacePage()
+      },
+      onChange(page, pageSize) {
+        this.pageNo = page
+        this.replacePage()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.replacePage()
+      },
+      replacePage() {
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...this.queryParam
+        }
+        this.loading = true
+        postAction(this.url.transferUrl, query).then((res) => {
+          if (res.success) {
+            this.dataList = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+        if (this.selectedRowKeys.length > 1) {
+          this.selectedRowKeys.shift()
+        }
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      handleSubmit(flag) {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.confirmLoading = true
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          this.confirmLoading = false
+          this.$emit('transferListForm',selectedRowKeys.join(','))
+          this.selectedRowKeys = []
+          // postAction(this.url.addModel, {
+          //   dummyInventoryBaseId: selectedRowKeys.join(','),
+          //   projectLibraryId: this.$route.query.id,
+          //   flag: flag
+          // }).then((res) => {
+          //   if (res.success) {
+          //     this.confirmLoading = false
+          //     this.$message.success(this.$t('OperationSuccessful'))
+          //     this.visible = false
+          //     this.selectedRowKeys = []
+          //     this.$emit('transferListForm')
+          //   } else {
+          //     if (res.message == '该虚拟清单的维护清单中没有数据,是否需要添加') {
+          //       this.confirmLoading = false
+          //       this.getAdd()
+          //       return
+          //     }
+          //     this.$message.warning(this.$t('operationFailed'))
+          //     this.confirmLoading = false
+          //   }
+          // })
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      getAdd() {
+        let _this = this
+        this.$confirm({
+          content: _this.$t('TheDoesNotContainData'),
+          onOk() {
+            _this.handleSubmit('1')
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    z-index: 100;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index fc315edc7..ae84ee04e 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -160,6 +160,12 @@
           <a-icon type="copy"/>
           {{ $t('copy') }}
         </div>
+        <!--        关联平台件-->
+<!--        v-if="this.roleSwitchingCode == '0'"-->
+        <div class="operator-text" @click="associatedplatformClick">
+          <a-icon type="setting"/>
+          {{ $t('Associatedplatform') }}
+        </div>
         <!--        列表设置-->
         <!--        v-if="this.roleSwitchingCode == '0' || this.roleSwitchingCode == '1' || this.roleSwitchingCode == '13'"-->
         <a-popconfirm :visible="customizevisible" overlayClassName="popconfirmmize"
@@ -1920,6 +1926,10 @@
       //调取
       transferClick() {
         this.$refs.transferListRef.transferModel()
+      },
+      // 关联平台件
+      associatedplatformClick(){
+
       },
       //批量设置
       batSettingClick() {
diff --git a/jero-web/src/views/projectManagement/platformItemLibrary/index.vue b/jero-web/src/views/projectManagement/platformItemLibrary/index.vue
index d690e3235..9beaa2b38 100644
--- a/jero-web/src/views/projectManagement/platformItemLibrary/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibrary/index.vue
@@ -125,11 +125,11 @@
         dataSource: [],
         confirmLoading: false,
         url: {
-          list: 'project/projectLibraryBase/page',
-          add: 'project/projectLibraryBase/add',
-          edit: 'project/projectLibraryBase/edit',
-          deleteBatch: 'project/projectLibraryBase/delete',
-          deleteAll: 'project/projectLibraryBase/deleteBatch'
+          list: 'platform/projectLibraryBase/page',
+          add: 'platform/projectLibraryBase/add',
+          edit: 'platform/projectLibraryBase/edit',
+          deleteBatch: 'platform/projectLibraryBase/delete',
+          deleteAll: 'platform/projectLibraryBase/deleteBatch'
         },
         total: 0,
         pageSize: 10,
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
index 42cdbc327..59aac3d1f 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
@@ -124,13 +124,13 @@
         administrators: false,
         activeKey: this.$t('regulatoryComplianceManagement'),
         url: {
-          queryById: 'project/projectLibraryBase/queryById',
-          add: 'project/projectLibraryBase/add',
-          edit: 'project/projectLibraryBase/edit',
-          queryByProjectId: 'project/projectTaskPlanning/queryByProjectId',
-          addSettingUrl: 'project/projectTaskPlanning/add',
-          editSettingUrl: 'project/projectTaskPlanning/edit',
-          settingQueryForm: '/project/projectTaskPlanning/list'
+          queryById: 'platform/projectLibraryBase/queryById',
+          add: 'platform/projectLibraryBase/add',
+          edit: 'platform/projectLibraryBase/edit',
+          queryByProjectId: 'platform/projectTaskPlanning/queryByProjectId',
+          addSettingUrl: 'platform/projectTaskPlanning/add',
+          editSettingUrl: 'platform/projectTaskPlanning/edit',
+          settingQueryForm: '/platform/projectTaskPlanning/list'
         },
         selectedRowKeys: [],
         idList: [],
@@ -196,7 +196,7 @@
         let query = {
           projectLibraryId: this.$route.query.id
         }
-        downloadFile('/project/projectLibraryBase/exportProjectProgressStatisticsXls',
+        downloadFile('/platform/projectLibraryBase/exportProjectProgressStatisticsXls',
           this.queryForm.projectName+'-'+this.queryForm.projectVersion+'-'+this.$t('projectProgressStatistics') + '.xls', query)
       },
 
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batSetting.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batSetting.vue
index 41b4cde95..e367c7158 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batSetting.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batSetting.vue
@@ -447,7 +447,7 @@
           projectId: this.$route.query.id,
           dutyTerritory: row.dutyTerritory || row
         }
-        getAction('/project/projectRelatedPersonnel/queryPersonByProjectId', query).then((res) => {
+        getAction('/platform/projectRelatedPersonnel/queryPersonByProjectId', query).then((res) => {
           if (res.success) {
             this.regulatoryEngineerList = res.result.lawEngineerList || [] //法规工程师
             this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || [] //工程接口人
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue
index b1deb6f1d..d4780313a 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue
@@ -59,7 +59,7 @@
     data() {
       return {
         url: {
-          getProjectDetailsStatistics: '/project/projectLibraryBase/getProjectDetailsStatistics'
+          getProjectDetailsStatistics: '/platform/projectLibraryBase/getProjectDetailsStatistics'
         },
         certificationProgressMap: {},
         num: '0',
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addConfiguration.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addConfiguration.vue
index 50f854958..168e68733 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addConfiguration.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addConfiguration.vue
@@ -72,7 +72,7 @@
               configItem: this.formInline.configItem
             }
             this.confirmLoading = true
-            postAction('/project/projectCertificationInventoryEO/addConfigByIds', query).then((res) => {
+            postAction('/platform/projectCertificationInventoryEO/addConfigByIds', query).then((res) => {
               if (res.success) {
                 this.$message.success(this.$t('OperationSuccessful'))
                 this.confirmLoading = false
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
index 09fc9060d..8b77c7b5a 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
@@ -767,9 +767,9 @@
         uploadName: '',
         numIndex: 0,
         url: {
-          add: '/project/projectCertificationInventoryEO/batchAdd',
-          edit: '/project/projectCertificationInventoryEO/edit',
-          list: '/project/projectLawsInventoryEO/list'
+          add: '/platform/projectCertificationInventoryEO/batchAdd',
+          edit: '/platform/projectCertificationInventoryEO/edit',
+          list: '/platform/projectLawsInventoryEO/list'
         },
         engineeringInterfacePersonList: []
       }
@@ -1062,7 +1062,7 @@
           projectId: this.$route.query.id,
           dutyTerritory: row
         }
-        getAction('/project/projectRelatedPersonnel/queryPersonByProjectId', query).then((res) => {
+        getAction('/platform/projectRelatedPersonnel/queryPersonByProjectId', query).then((res) => {
           if (res.success) {
             if (this.formInline.id) {
               this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || [] //工程接口人
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue
index b4d746f2f..e85e361cd 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue
@@ -302,7 +302,7 @@
         let url = ''
         this.confirmLoading = true
         if (this.name == this.$t('changeSetting')) {
-          url = '/project/projectCertificationInventoryEO/updateConfigItemBatch'
+          url = '/platform/projectCertificationInventoryEO/updateConfigItemBatch'
         } else {
           url = this.url.setBatch
         }
@@ -369,7 +369,7 @@
           projectId: this.$route.query.id,
           dutyTerritory: row
         }
-        getAction('/project/projectRelatedPersonnel/queryPersonByProjectId', query).then((res) => {
+        getAction('/platform/projectRelatedPersonnel/queryPersonByProjectId', query).then((res) => {
           if (res.success) {
             this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || [] //工程接口人
           }
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/modifyHistoryList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/modifyHistoryList.vue
index 32eb8dcaf..42654f963 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/modifyHistoryList.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/modifyHistoryList.vue
@@ -54,7 +54,7 @@
         total: 0,
         projectCertificationInventoryId: '',
         url: {
-          list: '/project/projectCertificationInventoryLogEO/page'
+          list: '/platform/projectCertificationInventoryLogEO/page'
         },
         columns: [
           {
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/referenceDeliverablesList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/referenceDeliverablesList.vue
index 2a67fb149..e67700add 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/referenceDeliverablesList.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/referenceDeliverablesList.vue
@@ -144,7 +144,7 @@
           ...this.queryParam
         }
         this.loading = true
-        postAction('project/projectLibraryBase/page', query).then((res) => {
+        postAction('platform/projectLibraryBase/page', query).then((res) => {
           if (res.success) {
             this.dataList = res.result.records || []
             this.total = res.result.total
@@ -177,7 +177,7 @@
             return
           }
           this.confirmLoading = true
-          postAction('/project/projectCertificationInventoryEO/citeDeliverable', {
+          postAction('/platform/projectCertificationInventoryEO/citeDeliverable', {
             projectCertificationInventoryIds: this.ids,
             projectLibraryId: this.$route.query.id,
             citeProjectLibraryId: selectedRowKeys.join(',')
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/transferListvirtal.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/transferListvirtal.vue
index 973bd500f..cefbdf0dd 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/transferListvirtal.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/transferListvirtal.vue
@@ -236,7 +236,7 @@
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
           this.confirmLoading = true
           let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
-          postAction('project/projectCertificationInventoryEO/callAdd', {
+          postAction('platform/projectCertificationInventoryEO/callAdd', {
             authDummyInventoryBaseId: this.dummyInventoryBaseId,
             projectLibraryId: this.$route.query.id,
             authDummyInventoryInfoIds: selectedRowKeys.join(',')
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
index 7378538fb..1177bb49f 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
@@ -645,17 +645,17 @@
           ]
         },
         url: {
-          list: '/project/projectCertificationInventoryEO/page',
-          exportTemplate: '/project/projectCertificationInventoryEO/exportTemplate',
-          exportData: '/project/projectCertificationInventoryEO/exportData',
-          deleteBatch: '/project/projectCertificationInventoryEO/deleteBatch',
-          setBatch: '/project/projectCertificationInventoryEO/setBatch',
-          deleteOne: '/project/projectCertificationInventoryEO/delete',
-          AndUserId: '/project/projectLibraryRoleRelEO/queryByProjectLibraryIdAndUserId',
-          AndUserIdEdit: '/project/projectLibraryRoleRelEO/edit',
-          saveBatch: '/project/projectCertificationInventoryEO/saveBatch',
-          questionUrl: '/project/projectCertificationInventoryEO/expediting',
-          importZipUrl: '/project/projectCertificationInventoryEO/importData'
+          list: '/platform/projectCertificationInventoryEO/page',
+          exportTemplate: '/platform/projectCertificationInventoryEO/exportTemplate',
+          exportData: '/platform/projectCertificationInventoryEO/exportData',
+          deleteBatch: '/platform/projectCertificationInventoryEO/deleteBatch',
+          setBatch: '/platform/projectCertificationInventoryEO/setBatch',
+          deleteOne: '/platform/projectCertificationInventoryEO/delete',
+          AndUserId: '/platform/projectLibraryRoleRelEO/queryByProjectLibraryIdAndUserId',
+          AndUserIdEdit: '/platform/projectLibraryRoleRelEO/edit',
+          saveBatch: '/platform/projectCertificationInventoryEO/saveBatch',
+          questionUrl: '/platform/projectCertificationInventoryEO/expediting',
+          importZipUrl: '/platform/projectCertificationInventoryEO/importData'
         },
         dataSource: [],
         roleSwitchingCode: '',
@@ -914,7 +914,7 @@
         let query = {
           projectLibraryId: this.$route.query.id
         }
-        getAction('/project/projectCertificationInventoryEO/queryDutyPersonByProjectId', query).then((res) => {
+        getAction('/platform/projectCertificationInventoryEO/queryDutyPersonByProjectId', query).then((res) => {
           if (res.success) {
             let engineeringInterfacePerson = {
               value: 'sdt',
@@ -967,7 +967,7 @@
         })
       },
       getProcessStatus() {
-        getAction('/project/projectCertificationInventoryEO/getFlowStatusList', {}).then((res) => {
+        getAction('/platform/projectCertificationInventoryEO/getFlowStatusList', {}).then((res) => {
           if (res.success) {
             this.processStatusList = res.result || []
           } else {
@@ -1246,7 +1246,7 @@
         // this.$confirm({
         //   content: _this.$t('confirmRelease'),
         //   onOk() {
-        postAction('/project/projectCertificationInventoryEO/issue', {
+        postAction('/platform/projectCertificationInventoryEO/issue', {
           ids: ids.join(','),
           projectLibraryId: _this.$route.query.id,
           inventoryVerifyEndTime: formInline.inventoryVerifyEndTime
@@ -1283,7 +1283,7 @@
             taskConfirmEndTime: formInline.taskConfirmEndTime
           }
 
-          postAction('/project/projectCertificationInventoryEO/submitTask', query).then((res) => {
+          postAction('/platform/projectCertificationInventoryEO/submitTask', query).then((res) => {
             if (res.success) {
               _this.$message.success(_this.$t('OperationSuccessful'))
               _this.getList()
@@ -1365,7 +1365,7 @@
         this.$confirm({
           content: _this.$t('confirmWithdrawal'),
           onOk() {
-            postAction('/project/projectCertificationInventoryEO/resetFlow', {
+            postAction('/platform/projectCertificationInventoryEO/resetFlow', {
               ids: ids.join(','),
               projectLibraryId: _this.$route.query.id,
               operatorType: 'certificationInventoryStudioWithdraw'
@@ -1522,7 +1522,7 @@
         this.$refs.modifyHistoryRef.getList(row.id)
       },
       getRoleByUserId(callback) {
-        getAction('/project/projectCertificationInventoryEO/getRoleByUserId', { projectLibraryId: this.$route.query.id }).then((res) => {
+        getAction('/platform/projectCertificationInventoryEO/getRoleByUserId', { projectLibraryId: this.$route.query.id }).then((res) => {
           if (res.success) {
             this.roleSwitchingList = res.result || []
           } else {
@@ -1733,7 +1733,7 @@
           'projectLibraryId': this.$route.query.id,
           'ids': this.toDoIds.join(',')
         }
-        postAction('/project/projectCertificationInventoryEO/transferTask', query).then((res) => {
+        postAction('/platform/projectCertificationInventoryEO/transferTask', query).then((res) => {
           if (res.success) {
             this.$message.success(this.$t('OperationSuccessful'))
             this.$refs.SelectedByRef.visible = false
@@ -2039,7 +2039,7 @@
           'ids': ids.join(','),
           reasonForReturn: reasonForReturn
         }
-        postAction('/project/projectCertificationInventoryEO/submitTask', query).then((res) => {
+        postAction('/platform/projectCertificationInventoryEO/submitTask', query).then((res) => {
           if (res.success) {
             _this.$message.success(_this.$t('OperationSuccessful'))
             _this.getList()
@@ -2089,7 +2089,7 @@
                 'projectLibraryId': _this.$route.query.id,
                 'ids': ids.join(',')
               }
-              postAction('/project/projectCertificationInventoryEO/submitTask', query).then((res) => {
+              postAction('/platform/projectCertificationInventoryEO/submitTask', query).then((res) => {
                 if (res.success) {
                   _this.$message.success(_this.$t('OperationSuccessful'))
                   _this.getList()
@@ -2112,7 +2112,7 @@
           'flowStatus': 'NA',
           'ids': NAId.join(',')
         }
-        postAction('/project/projectCertificationInventoryEO/updateStatusBatch', query).then((res) => {
+        postAction('/platform/projectCertificationInventoryEO/updateStatusBatch', query).then((res) => {
           if (res.success) {
             if (ids && ids.length > 0) {
             } else {
@@ -2181,7 +2181,7 @@
                   ids: ids.join(','),
                   'flowStatus': 'Results to be submitted'
                 }
-                postAction('/project/projectCertificationInventoryEO/updateStatusBatch', query).then((res) => {
+                postAction('/platform/projectCertificationInventoryEO/updateStatusBatch', query).then((res) => {
                   if (res.success) {
                     _this.$message.success(_this.$t('OperationSuccessful'))
                     _this.getList()
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/detilModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/detilModel.vue
index 23e0d70f7..1fed49c1b 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/detilModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/detilModel.vue
@@ -24,6 +24,7 @@
                            :disabled="disabled"/>
                 </a-form-model-item>
               </div>
+
             </a-col>
           </a-row>
           <a-row :gutter="24">
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
index f7581f1be..d9bc9908a 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
@@ -787,7 +787,7 @@
         let query = {
           projectLawsInventoryId: id
         }
-        getAction('/project/projectLawsInventoryRejectCauseEO/list', query).then((res) => {
+        getAction('/platform/projectLawsInventoryRejectCauseEO/list', query).then((res) => {
           if (res.success) {
             this.rejectCauseList = []
             this.rejectCauseListOne = []
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
index 0ea88a2d0..2b1f0cbb1 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
@@ -1261,25 +1261,25 @@
           }
         ],
         url: {
-          addModelList: '/project/projectLawsInventoryEO/queryPageDummy',
-          queryConditionInventory: '/project/projectLawsInventoryEO/queryConditionInventory',
-          list: '/project/projectLawsInventoryEO/page',
-          addModel: 'project/projectLawsInventoryEO/add',
-          editModel: '/project/projectLawsInventoryEO/edit',
-          deleteBatch: '/project/projectLawsInventoryEO/deleteBatch',
-          deleteOne: '/project/projectLawsInventoryEO/delete',
-          updateStatusBatch: '/project/projectLawsInventoryEO/updateStatusBatch',
-          matchRelevantPeople: '/project/projectLawsInventoryEO/matchRelevantPeople',
-          queryPersonByProject: '/project/projectRelatedPersonnel/queryPersonByProjectId',
-          importZipUrl: '/project/projectLawsInventoryEO/importData',
-          exportTemplate: '/project/projectLawsInventoryEO/exportTemplate',
-          exportData: '/project/projectLawsInventoryEO/exportData',
-          setBatch: '/project/projectLawsInventoryEO/setBatch',//批量设置
-          copyUrl: '/project/projectLawsInventoryEO/copyInfoByIds',//复制
-          transferUrl: '/project/projectLawsInventoryEO/getPageInfoDummy',//调取
-          ExportReportUrl: '/project/projectLawsInventoryEO/downloadDocxReport',
-          AndUserId: '/project/projectLibraryRoleRelEO/queryByProjectLibraryIdAndUserId',
-          AndUserIdEdit: '/project/projectLibraryRoleRelEO/edit'
+          addModelList: '/platform/projectLawsInventoryEO/queryPageDummy',
+          queryConditionInventory: '/platform/projectLawsInventoryEO/queryConditionInventory',
+          list: '/platform/projectLawsInventoryEO/page',
+          addModel: 'platform/projectLawsInventoryEO/add',
+          editModel: '/platform/projectLawsInventoryEO/edit',
+          deleteBatch: '/platform/projectLawsInventoryEO/deleteBatch',
+          deleteOne: '/platform/projectLawsInventoryEO/delete',
+          updateStatusBatch: '/platform/projectLawsInventoryEO/updateStatusBatch',
+          matchRelevantPeople: '/platform/projectLawsInventoryEO/matchRelevantPeople',
+          queryPersonByProject: '/platform/projectRelatedPersonnel/queryPersonByProjectId',
+          importZipUrl: '/platform/projectLawsInventoryEO/importData',
+          exportTemplate: '/platform/projectLawsInventoryEO/exportTemplate',
+          exportData: '/platform/projectLawsInventoryEO/exportData',
+          setBatch: '/platform/projectLawsInventoryEO/setBatch',//批量设置
+          copyUrl: '/platform/projectLawsInventoryEO/copyInfoByIds',//复制
+          transferUrl: '/platform/projectLawsInventoryEO/getPageInfoDummy',//调取
+          ExportReportUrl: '/platform/projectLawsInventoryEO/downloadDocxReport',
+          AndUserId: '/platform/projectLibraryRoleRelEO/queryByProjectLibraryIdAndUserId',
+          AndUserIdEdit: '/platform/projectLibraryRoleRelEO/edit'
         },
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
         downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
@@ -1655,7 +1655,7 @@
         let query = {
           projectLibraryId: this.$route.query.id
         }
-        getAction('/project/projectRelatedPersonnel/queryEngineeringInterfacePersonByProjectId', query).then((res) => {
+        getAction('/platform/projectRelatedPersonnel/queryEngineeringInterfacePersonByProjectId', query).then((res) => {
           if (res.success) {
             let engineeringInterfacePerson = {
               value: 'engineeringInterfacePerson',
@@ -1681,7 +1681,7 @@
         let query = {
           projectLibraryId: this.$route.query.id
         }
-        getAction('/project/projectLawsInventoryEO/queryDutyPersonByProjectId', query).then((res) => {
+        getAction('/platform/projectLawsInventoryEO/queryDutyPersonByProjectId', query).then((res) => {
           if (res.success) {
             let designDuty = {
               value: 'designDutyId',
@@ -1708,7 +1708,7 @@
         let query = {
           projectLibraryId: this.$route.query.id
         }
-        getAction('/project/projectLawsInventoryEO/queryDutyPersonByProjectId', query).then((res) => {
+        getAction('/platform/projectLawsInventoryEO/queryDutyPersonByProjectId', query).then((res) => {
           if (res.success) {
             let verifyDuty = {
               value: 'verifyDutyId',
@@ -1812,7 +1812,7 @@
 
       //获取切换角色的数据
       getRoleByUserId(callback) {
-        getAction('/project/projectLawsInventoryEO/getRoleByUserId', { projectLibraryId: this.$route.query.id }).then((res) => {
+        getAction('/platform/projectLawsInventoryEO/getRoleByUserId', { projectLibraryId: this.$route.query.id }).then((res) => {
           if (res.success) {
             this.roleSwitchingList = res.result || []
           } else {
@@ -2083,7 +2083,7 @@
             operateType: operateType
           }
           this.confirmLoadingQuestion = true
-          postAction('project/projectLawsInventoryEO/expediting', query).then((res) => {
+          postAction('platform/projectLawsInventoryEO/expediting', query).then((res) => {
             if (res.success) {
               this.$message.success(this.$t('OperationSuccessful'))
               this.selectedRowKeys = []
@@ -2248,7 +2248,7 @@
             let _this = this
             _this.confirmLoadingReset = true
             let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
-            postAction('/project/projectLawsInventoryEO/change', {
+            postAction('/platform/projectLawsInventoryEO/change', {
               ids: idList.join(','),
               projectLibraryId: _this.$route.query.id,
               operateType: _this.formInlineReset.operateType
@@ -2279,7 +2279,7 @@
           content: _this.$t('NoteConfirmTheChange'),
           onOk() {
             let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
-            postAction('/project/projectLawsInventoryEO/change', {
+            postAction('/platform/projectLawsInventoryEO/change', {
               ids: idList.join(','),
               projectLibraryId: _this.$route.query.id
             }).then((res) => {
@@ -2820,7 +2820,7 @@
                 ...this.formInline
               }
               this.confirmLoading = true
-              postAction('/project/projectLawsInventoryEO/studioPublish', query).then((res) => {
+              postAction('/platform/projectLawsInventoryEO/studioPublish', query).then((res) => {
                 if (res.success) {
                   this.$message.success(this.$t('OperationSuccessful'))
                   this.visible = false
@@ -3085,7 +3085,7 @@
           flowStatus: 'NA',
           lawsInventoryArray: this.updateFlowStatusList
         }
-        postAction('/project/projectLawsInventoryEO/updateFlowStatusBatch', query).then((res) => {
+        postAction('/platform/projectLawsInventoryEO/updateFlowStatusBatch', query).then((res) => {
           if (res.success) {
             if (this.requestsNum == 0) {
               this.visible = false
@@ -3124,7 +3124,7 @@
               projectLibraryId: this.$route.query.id,
               ids: ids.join(',')
             }
-            postAction('/project/projectLawsInventoryEO/regulationOwnerReturned', query).then((res) => {
+            postAction('/platform/projectLawsInventoryEO/regulationOwnerReturned', query).then((res) => {
               if (res.success) {
                 this.$message.success(this.$t('OperationSuccessful'))
                 this.selectedRowKeys = []
@@ -3151,7 +3151,7 @@
           commentContent: this.$t('For') + content.join(',') + this.$t('markedRejection') + '：' + commentContent,
           projectLibraryId: this.$route.query.id
         }
-        postAction('/project/projectCommentEO/add', query).then((res) => {
+        postAction('/platform/projectCommentEO/add', query).then((res) => {
         })
       },
 
@@ -3164,7 +3164,7 @@
           projectLawsInventoryId: ids.join(','),
           rejectType: '0'
         }
-        postAction('/project/projectLawsInventoryRejectCauseEO/add', query).then((res) => {
+        postAction('/platform/projectLawsInventoryRejectCauseEO/add', query).then((res) => {
 
         })
       },
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulationsView.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulationsView.vue
index 25a12d88f..f228cc974 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulationsView.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulationsView.vue
@@ -525,7 +525,7 @@
         let query = {
           projectLawsInventoryId: id
         }
-        getAction('/project/projectLawsInventoryRejectCauseEO/list', query).then((res) => {
+        getAction('/platform/projectLawsInventoryRejectCauseEO/list', query).then((res) => {
           if (res.success) {
             this.rejectCauseList = []
             this.rejectCauseListOne = []
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/modifyOperator.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/modifyOperator.vue
index b9cbbdbcd..59ebbb5b6 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/modifyOperator.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/modifyOperator.vue
@@ -96,7 +96,7 @@
             verifyTransferUserId: this.formInline.verifyTransferUserId
           }
           this.confirmLoading = true
-          postAction('/project/projectLawsInventoryEO/compulsoryTransfer', query).then((res) => {
+          postAction('/platform/projectLawsInventoryEO/compulsoryTransfer', query).then((res) => {
             if (res.success) {
               this.$message.success(this.$t('OperationSuccessful'))
               this.confirmLoading = false
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue
index 816b9ba99..73b821008 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue
@@ -326,8 +326,8 @@ export default {
       long: '',
       isPersonnelSelection:true,
       url: {
-        page: '/project/projectLawsInventoryEO/queryNotComplianList',
-        exportData: '/project/projectLawsInventoryEO/exportNotComplianList'
+        page: '/platform/projectLawsInventoryEO/queryNotComplianList',
+        exportData: '/platform/projectLawsInventoryEO/exportNotComplianList'
       },
       content: []
     }
@@ -366,7 +366,7 @@ export default {
       })
     },
     getNameList() {
-      getAction('/project/projectNameInfoEO/queryProjectNameList', {}).then((res) => {
+      getAction('/platform/projectNameInfoEO/queryProjectNameList', {}).then((res) => {
         if (res.success) {
           this.projectNameList = res.result || []
         } else {
@@ -475,7 +475,7 @@ export default {
       this.$confirm({
         content: _this.$t('ConfirmDelete'),
         onOk() {
-          deleteAction('/project/problemManagementEO/deleteBatch', { ids: record.uuid }).then((res) => {
+          deleteAction('/platform/problemManagementEO/deleteBatch', { ids: record.uuid }).then((res) => {
             if (res.success) {
               _this.$message.success(_this.$t('OperationSuccessful'))
               _this.getList()
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/regulatoryCompliance.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/regulatoryCompliance.vue
index 9b9619dbe..6d1a894a1 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/regulatoryCompliance.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/regulatoryCompliance.vue
@@ -45,7 +45,7 @@
       return {
         loading: false,
         url: {
-          getProjectDetailsStatistics: '/project/projectLibraryBase/getProjectDetailsStatistics'
+          getProjectDetailsStatistics: '/platform/projectLibraryBase/getProjectDetailsStatistics'
         },
         mainTopNum: 0,
         mainLeftNum: 0,
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/resultReportedUpload.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/resultReportedUpload.vue
index a45c9d3a3..6fdf1d4e0 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/resultReportedUpload.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/resultReportedUpload.vue
@@ -57,7 +57,7 @@
         confirmLoading: false,
         uploadQuery: {},
         url: {
-          editModel: '/project/projectLawsInventoryEO/edit'
+          editModel: '/platform/projectLawsInventoryEO/edit'
         }
       }
     },
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferListvirtal.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferListvirtal.vue
index e7bacbf3a..8e6275b32 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferListvirtal.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/transferListvirtal.vue
@@ -333,7 +333,7 @@ export default {
       if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
         this.confirmLoading = true
         let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
-        postAction('project/projectLawsInventoryEO/add', {
+        postAction('platform/projectLawsInventoryEO/add', {
           dummyInventoryBaseId: this.dummyInventoryBaseId,
           projectLibraryId: this.$route.query.id,
           dummyids: selectedRowKeys.join(','),

From bfa4fd8aa2fc322140b8e8a120c5d071970ca3ee Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 13 Sep 2023 14:52:10 +0800
Subject: [PATCH 015/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-SQL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index e5eaf7717..77fd10153 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -1208,4 +1208,8 @@ MODIFY COLUMN `work_progress_en` text CHARACTER SET utf8mb4 COLLATE utf8mb4_gene
 --参数收集清单 添加英文
 UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Control Component' WHERE `id` = '84fec4a260dc646dc570cbf7cb581dab';
 UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Component Value' WHERE `id` = '5d468613746f413a53fa0b485089839b';
-UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Validate Component' WHERE `id` = '608274a6a6dfed0e183093d9ea357436';
\ No newline at end of file
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Validate Component' WHERE `id` = '608274a6a6dfed0e183093d9ea357436';
+
+--平台件项目库数据标识
+ALTER TABLE `laws_weilai`.`project_library_base`
+ADD COLUMN `platform` varchar(255) NULL COMMENT '平台件项目库数据（platform=YES）' AFTER `brand`;

From 6a6a7525715ac1ebd9c6e511b8282cfe2fb33c02 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 13 Sep 2023 15:22:10 +0800
Subject: [PATCH 016/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=20=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/certificationList/index.vue    |  2 +-
 .../components/listOfRegulations.vue          | 56 +++++++++----------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
index 1177bb49f..d097f1b9a 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
@@ -651,7 +651,7 @@
           deleteBatch: '/platform/projectCertificationInventoryEO/deleteBatch',
           setBatch: '/platform/projectCertificationInventoryEO/setBatch',
           deleteOne: '/platform/projectCertificationInventoryEO/delete',
-          AndUserId: '/platform/projectLibraryRoleRelEO/queryByProjectLibraryIdAndUserId',
+          AndUserId: '/project/projectLibraryRoleRelEO/queryByProjectLibraryIdAndUserId',
           AndUserIdEdit: '/platform/projectLibraryRoleRelEO/edit',
           saveBatch: '/platform/projectCertificationInventoryEO/saveBatch',
           questionUrl: '/platform/projectCertificationInventoryEO/expediting',
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
index 2b1f0cbb1..f5d237228 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
@@ -1278,7 +1278,7 @@
           copyUrl: '/platform/projectLawsInventoryEO/copyInfoByIds',//复制
           transferUrl: '/platform/projectLawsInventoryEO/getPageInfoDummy',//调取
           ExportReportUrl: '/platform/projectLawsInventoryEO/downloadDocxReport',
-          AndUserId: '/platform/projectLibraryRoleRelEO/queryByProjectLibraryIdAndUserId',
+          AndUserId: '/project/projectLibraryRoleRelEO/queryByProjectLibraryIdAndUserId',
           AndUserIdEdit: '/platform/projectLibraryRoleRelEO/edit'
         },
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
@@ -1527,7 +1527,7 @@
       this.JLoading = true
       this.getHeader()
       this.queryLawEngineerByProjectId()
-      this.queryengineeringInterfacePersonId()
+      // this.queryengineeringInterfacePersonId()
       this.querydesignDutyId()
       this.queryverifyDutyId()
       this.getRoleByUserId(() => {
@@ -1651,32 +1651,32 @@
           }
         })
       },
-      queryengineeringInterfacePersonId() {
-        let query = {
-          projectLibraryId: this.$route.query.id
-        }
-        getAction('/platform/projectRelatedPersonnel/queryEngineeringInterfacePersonByProjectId', query).then((res) => {
-          if (res.success) {
-            let engineeringInterfacePerson = {
-              value: 'engineeringInterfacePerson',
-              text: this.$t('engineeringInterfacePerson'),
-              options: []
-            }
-            if (res.result && res.result.length > 0) {
-              res.result.forEach(val => {
-                engineeringInterfacePerson.options.push({
-                  value: val.id,
-                  key: val.id,
-                  label: val.userName
-                })
-              })
-            }
-            this.fieldList.push(engineeringInterfacePerson)
-          } else {
-
-          }
-        })
-      },
+      // queryengineeringInterfacePersonId() {
+      //   let query = {
+      //     projectLibraryId: this.$route.query.id
+      //   }
+      //   getAction('/platform/projectRelatedPersonnel/queryEngineeringInterfacePersonByProjectId', query).then((res) => {
+      //     if (res.success) {
+      //       let engineeringInterfacePerson = {
+      //         value: 'engineeringInterfacePerson',
+      //         text: this.$t('engineeringInterfacePerson'),
+      //         options: []
+      //       }
+      //       if (res.result && res.result.length > 0) {
+      //         res.result.forEach(val => {
+      //           engineeringInterfacePerson.options.push({
+      //             value: val.id,
+      //             key: val.id,
+      //             label: val.userName
+      //           })
+      //         })
+      //       }
+      //       this.fieldList.push(engineeringInterfacePerson)
+      //     } else {
+      //
+      //     }
+      //   })
+      // },
       querydesignDutyId() {
         let query = {
           projectLibraryId: this.$route.query.id

From 4e6bbbfb1f6b9015feb50ff5f88da2c2852cf778 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 13 Sep 2023 15:45:10 +0800
Subject: [PATCH 017/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/projectManagement/platformItemLibrary/index.vue | 4 ++--
 .../platformItemLibraryDetails/components/addModel.vue        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibrary/index.vue b/jero-web/src/views/projectManagement/platformItemLibrary/index.vue
index 9beaa2b38..048891a31 100644
--- a/jero-web/src/views/projectManagement/platformItemLibrary/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibrary/index.vue
@@ -17,7 +17,7 @@
               <div class="title-text" :title="$t('brand')">
                 <span>{{$t('brand')}}</span>
               </div>
-              <j-dict-select-tag class="box-input" v-model="queryParam.targetMarket"
+              <j-dict-select-tag class="box-input" v-model="queryParam.brand"
                                  :placeholder="$t('PleaseSelect')+$t('brand')"
                                  :type="'select'"
                                  :triggerChange="false" :dictCode="'brand'"/>
@@ -29,7 +29,7 @@
                 <span>{{$t('configurationItem')}}</span>
               </div>
               <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('configurationItem')"
-                       v-model="queryParam.configurationItem"></a-input>
+                       v-model="queryParam.ipdInfo"></a-input>
             </div>
           </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
index daf5a259c..302632460 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
@@ -42,7 +42,7 @@
                 <span class="title-text-text" :title="$t('brand')">{{$t('brand')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="brand">
-                <j-dict-select-tag class="box-input" v-model="formInline.targetMarket"
+                <j-dict-select-tag class="box-input" v-model="formInline.brand"
                                    :placeholder="$t('PleaseSelect')+$t('brand')"
                                    :type="'select'"
                                    :triggerChange="false" :dictCode="'brand'"/>
@@ -59,7 +59,7 @@
               </div>
               <a-form-model-item class="itemModel-multi" prop="configurationItem">
                 <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('configurationItem')"
-                         v-model="formInline.configurationItem"></a-input>
+                         v-model="formInline.ipdInfo"></a-input>
               </a-form-model-item>
             </div>
           </a-col>

From 9b6d928f622192008683f9fa3e33caa20d223e46 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 13 Sep 2023 16:55:22 +0800
Subject: [PATCH 018/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E5=B8=88=E5=8F=96=E5=80=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/projectManagement/components/listOfRegulations.vue | 5 ++++-
 .../platformItemLibraryDetails/components/ProjectDetails.vue | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index ae84ee04e..f27e884d8 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -426,6 +426,7 @@
     <listEditModel :url="url" @editModelList="addModelList" ref="editModelRef"/>
     <batSetting :url="url" @batSettingList="addModelList" ref="batSettingRef"/>
     <transferList :url="url" @transferListForm="transferListForm" ref="transferListRef"/>
+    <associatedplat :url="url" @associatedplatForm="associatedplatForm" ref="associatedplatRef"/>
     <customizeList :url="url" @customizeListForm="customizeListForm" ref="customizeListRef"/>
     <transferListvirtal :url="url" @transferListFormHomo="transferListFormHomo" ref="transferListvirtalRef"/>
     <fixedPlate @fixedPlateForm="addModelList" ref="fixedPlateRef"/>
@@ -697,6 +698,7 @@
   import listEditModel from './listEditModel'
   import batSetting from './batSetting'
   import transferList from './transferList'
+  import associatedplat from './associatedplat'
   import customizeList from './customizeList'
   import transferListvirtal from './transferListvirtal'
   import fixedPlate from './fixedPlateForm'
@@ -722,6 +724,7 @@
       listEditModel,
       batSetting,
       transferList,
+      associatedplat,
       customizeList,
       transferListvirtal,
       globalAdvancedQuery,
@@ -1929,7 +1932,7 @@
       },
       // 关联平台件
       associatedplatformClick(){
-
+        this.$refs.associatedplatRef.transferModel()
       },
       //批量设置
       batSettingClick() {
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
index 59aac3d1f..83013e70b 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
@@ -33,8 +33,8 @@
     <div class="content-text">
       <div class="text-field">
         <span class="text-field-left" :title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span>
-        <span class="text-field-right" :title="queryForm.regulatoryEngineer"
-        >{{queryForm.regulatoryEngineer}}</span>
+        <span class="text-field-right" :title="queryForm.createBy"
+        >{{queryForm.createBy}}</span>
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('dehicleDevelopmentPlan')">{{$t('dehicleDevelopmentPlan')}}</span>

From 8453685bdf6547f1f0ab9256fc6e7ec9ea8ab630 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 13 Sep 2023 17:04:18 +0800
Subject: [PATCH 019/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/constant/enums/YesOrNoEnum.java    |  16 +-
 ...PlatformProjectLibraryBaseServiceImpl.java | 184 ++++--------------
 .../project/entity/ProjectLibraryBase.java    |   3 +
 3 files changed, 53 insertions(+), 150 deletions(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/YesOrNoEnum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/YesOrNoEnum.java
index 62b5bc535..2b56f4dd2 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/YesOrNoEnum.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/YesOrNoEnum.java
@@ -6,15 +6,17 @@ package com.jero.common.constant.enums;
  * @auth zhn
  */
 public enum YesOrNoEnum {
-    NO("否","0"),
-    YES("是","1");
+    NO("否","NO","0"),
+    YES("是","YES","1");
 
 
     String name;
+    String nameEn;
     String value;
 
-    private YesOrNoEnum(String name, String value) {
+    private YesOrNoEnum(String name,String nameEn, String value) {
         this.name = name;
+        this.nameEn = nameEn;
         this.value = value;
     }
 
@@ -33,4 +35,12 @@ public enum YesOrNoEnum {
     public void setValue(String value) {
         this.value = value;
     }
+
+    public String getNameEn() {
+        return nameEn;
+    }
+
+    public void setNameEn(String nameEn) {
+        this.nameEn = nameEn;
+    }
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
index ccba9111b..426f3117b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.Result;
 import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.vo.DictModel;
 import com.jero.common.system.vo.LoginUser;
@@ -25,8 +26,8 @@ import com.jero.modules.feishu.enums.TemplateInfoEnum2;
 import com.jero.modules.ota.service.impl.OtaManageApplyEOServiceImpl;
 import com.jero.modules.platform.mapper.PlatformProjectLawsInventoryEOMapper;
 import com.jero.modules.platform.mapper.PlatformProjectLibraryBaseMapper;
-import com.jero.modules.platform.service.IPlatformProjectLibraryBaseService;
 import com.jero.modules.platform.service.IPlatformProjectCertificationInventoryEOService;
+import com.jero.modules.platform.service.IPlatformProjectLibraryBaseService;
 import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
 import com.jero.modules.project.entity.ProjectLawsInventoryEO;
 import com.jero.modules.project.entity.ProjectLawsInventoryLogEO;
@@ -64,6 +65,7 @@ import com.jero.modules.project.vo.TimeNodeVO;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.enums.DicCodeEnum;
+import com.jero.modules.system.mapper.SysDictItemMapper;
 import com.jero.modules.system.mapper.SysRoleMapper;
 import com.jero.modules.system.mapper.SysUserMapper;
 import com.jero.modules.system.service.IProjectUserBrandService;
@@ -106,12 +108,10 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
@@ -192,6 +192,8 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 	private IProjectLibraryStatisticsService projectLibraryStatisticsService;
 	@Autowired
 	private OtaManageApplyEOServiceImpl otaManageApplyEOService;
+	@Autowired
+	private SysDictItemMapper sysDictItemMapper;
 
 	private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 	private static DecimalFormat df = new DecimalFormat("#.00");
@@ -206,6 +208,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 	@Override
 	@Transactional
 	public void add(ProjectLibraryBase projectLibraryBase) throws ParseException {
+		projectLibraryBase.setPlatform(YesOrNoEnum.YES.getNameEn());
 		Date now = new Date();
 
 		projectLibraryBase.setCreateTime(now);
@@ -450,6 +453,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 	 */
 	@Override
 	public void editById(ProjectLibraryBase projectLibraryBase) {
+		projectLibraryBase.setPlatform(YesOrNoEnum.YES.getNameEn());
 		Date now = new Date();
 		projectLibraryBase.setUpdateTime(now);
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -1034,30 +1038,27 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 	 */
 	@Override
 	public List<ProjectLibraryBase> queryPageList(Map<String,Object> params) {
-		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-		Integer isViewer = sysRoleMapper.queryUserRoleByCode(ProjectRoleEnum.VIEWER.getName(), loginUser.getId());
-		Set<String> projectIds = new HashSet<>();
-		//根据项目用户权限表筛选有权访问的项目
-		Set<String> permissionProjectIds = projectUserPermissionMapper.queryProjectIdsByUserId(loginUser.getId());
-		if (ObjectUtils.isNotEmpty(permissionProjectIds)) {
-			projectIds.addAll(permissionProjectIds);
+		String cut = (String) params.get("cut");
+		String projectNameId = (String) params.get("projectNameId");//项目名称
+		String brand = (String) params.get("brand");//品牌
+		String ipdInfo = (String) params.get("ipdInfo");//配置信息
+		LambdaQueryWrapper<ProjectLibraryBase> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(ProjectLibraryBase::getPlatform,YesOrNoEnum.YES.getNameEn());
+		queryWrapper.orderByDesc(ProjectLibraryBase::getCreateTime);
+		if(StringUtils.isNotBlank(projectNameId)){
+			queryWrapper.like(ProjectLibraryBase::getProjectNameId,projectNameId);
 		}
-		if (isViewer > 0) {
-			//如果是Viewer，根据配置的品牌筛选可访问的项目
-			List<String> brandTypes = projectUserBrandService.queryBrandByUserId(loginUser.getId());
-			if (ObjectUtils.isNotEmpty(brandTypes)) {
-				QueryWrapper<ProjectLibraryBase> queryWrapper = new QueryWrapper<>();
-				queryWrapper.in("brand",brandTypes);
-				if (ObjectUtils.isNotEmpty(list(queryWrapper))) {
-					projectIds.addAll(list(queryWrapper).stream().map(ProjectLibraryBase::getId).collect(Collectors.toSet()));
-				}
-			}
+		if(StringUtils.isNotBlank(brand)){
+			queryWrapper.eq(ProjectLibraryBase::getBrand,brand);
+		}
+		if(StringUtils.isNotBlank(ipdInfo)){
+			queryWrapper.like(ProjectLibraryBase::getIpdInfo,ipdInfo);
 		}
 
-		List<ProjectLibraryBase> result = platformProjectLibraryBaseMapper.queryPageList(params);
-		disposeData(result,"",false);
-		//目标市场
-		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
+		List<ProjectLibraryBase> result = this.list(queryWrapper);
+		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		List<SysDictItem> dictItemList = sysDictItemMapper.selectItemsByDictCode(DictCodeEnum.BRAND.getValue());
 
 		//置顶
 		List<String> idList = result.stream().map(ProjectLibraryBase::getId).collect(Collectors.toList());
@@ -1067,8 +1068,17 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 			wrapper.in(TopProjectEO::getCreateBy,loginUser.getUsername()).in(TopProjectEO::getProjectLibraryBaseId,idList).orderByDesc(TopProjectEO::getSort);
 			topProjectEOList = iTopProjectEOService.list(wrapper);
 		}
-
 		for(ProjectLibraryBase projectLibraryBase: result){
+			//处理品牌
+			List<SysDictItem> sysDictItemList = dictItemList.stream()
+					.filter(e -> e.getItemValue().equals(projectLibraryBase.getBrand())).collect(Collectors.toList());
+			if(!sysDictItemList.isEmpty()){
+				if (CutEnum.CN.getValue().equals(cut)) {
+					projectLibraryBase.setBrandText(sysDictItemList.get(0).getItemText() );
+				} else {
+					projectLibraryBase.setBrandText(sysDictItemList.get(0).getEnName());
+				}
+			}
 			//置顶处理
 			if(ObjectUtils.isNotEmpty(topProjectEOList)){
 				List<TopProjectEO> collect = topProjectEOList.stream()
@@ -1084,21 +1094,6 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 			}else{
 				projectLibraryBase.setSort("0");
 			}
-			//目标市场
-			String targetMarket = getMarket(params, targetMarketList, projectLibraryBase);
-			//主项目的版本号
-			String projectVersion = "";
-			if(StringUtils.isBlank(projectLibraryBase.getParentId())){
-				projectVersion = "00";
-			}else{
-				projectVersion = projectLibraryBase.getProjectVersion();
-			}
-			if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){
-				projectLibraryBase.setProjectName(projectLibraryBase.getProjectName()
-						+ "-" + projectLibraryBase.getYearName()
-						+ "-" + targetMarket
-						+ "-" + projectVersion);
-			}
 		}
 
 		if(ObjectUtils.isEmpty(params.get("orderByField"))){
@@ -1109,114 +1104,9 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 					}
 				});
 		}
-
-		//所有主项目
-		List<ProjectLibraryBase> projectLibraryBaseListParent = platformProjectLibraryBaseMapper.queryMaimList();
-		disposeData(projectLibraryBaseListParent,"",false);
-		for(ProjectLibraryBase projectLibraryBase: projectLibraryBaseListParent){
-			//目标市场
-			String targetMarket = getMarket(params, targetMarketList, projectLibraryBase);
-			//主项目的版本号
-			String projectVersion = "";
-			if(StringUtils.isBlank(projectLibraryBase.getParentId())){
-				projectVersion = "00";
-			}else{
-				projectVersion = projectLibraryBase.getProjectVersion();
-			}
-			if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){
-				projectLibraryBase.setProjectName(projectLibraryBase.getProjectName()
-						+ "-" + projectLibraryBase.getYearName()
-						+ "-" + targetMarket
-						+ "-" + projectVersion);
-			}
-		}
-
-		//项目名称模糊查询特殊处理(因为项目名称是多字段拼接的)
-		if(ObjectUtils.isNotEmpty(params.get("projectName"))){
-			result = result.stream().filter(e->e.getProjectName().toLowerCase().contains(String.valueOf(params.get("projectName")).toLowerCase())).collect(Collectors.toList());
-		}
-		List<ProjectLibraryBase> projectLibraryBaseParentList = result.stream().filter(e -> StringUtils.isBlank(e.getParentId())).distinct().collect(Collectors.toList());
-		//处理搜索版本号,(因为列表展示数据是以主项目为主并绑定子项目, 所以搜索的时候只有子项目这种情况需要特殊处理)
-		List<ProjectLibraryBase> resultNew = getProjectLibraryBases(result, projectLibraryBaseListParent);
-		disposeData(resultNew,"",false);
-
-
-		//数据组装
-//		List<ProjectLibraryBase> resultTemp = new LinkedList<>();
-//		for (ProjectLibraryBase projectLibraryBase : result) {
-//			if(StringUtils.isBlank(projectLibraryBase.getParentId())){
-//				resultTemp.add(projectLibraryBase);
-//			}
-//		}
-
-		for (ProjectLibraryBase projectLibraryBase : projectLibraryBaseParentList) {
-			//子项目
-			List<ProjectLibraryBase> children = result.stream()
-					.filter(e -> StringUtils.isNotBlank(e.getParentId()) && projectLibraryBase.getId().equals(e.getParentId())).collect(Collectors.toList());
-			if(children.size() != 0){
-				//子项目的基础上添加的子项目
-				List<String> childrenIdList = children.stream().map(ProjectLibraryBase::getId).distinct().collect(Collectors.toList());
-				List<ProjectLibraryBase> childrenList = result.stream()
-						.filter(e -> StringUtils.isNotBlank(e.getParentId()) && childrenIdList.contains(e.getParentId())).collect(Collectors.toList());
-				children.addAll(childrenList);
-
-				//按版本排序
-				Collections.sort(children);
-				projectLibraryBase.setChildren(children);
-				//最后一个版本号(主项目和主项目都需要设置)
-				String versionLast = children.get(children.size() - 1).getProjectVersion();
-				//主版本设置最后一个版本号(用于项目扩展中的版本号)
-				projectLibraryBase.setVersionLast(versionLast);
-				for (ProjectLibraryBase child : children) {
-					//每个子版本版本设置最后一个版本号(用于项目扩展中的版本号)
-					child.setVersionLast(versionLast);
-				}
-			}
-		}
-
-		List<ProjectLibraryBase> resultLast = new ArrayList<>();
-		//权限筛选
-		if (sysUserService.isAdministrator()) {
-			//管理员查看全部
-			if(ObjectUtils.isNotEmpty(projectLibraryBaseParentList)){
-				resultLast = projectLibraryBaseParentList;
-			}else{
-				resultLast = resultNew;
-			}
-		} else {
-			for (ProjectLibraryBase projectLibraryBase : projectLibraryBaseParentList) {
-				//判断父项目是否有权限
-				if (!projectIds.contains(projectLibraryBase.getId())) {
-					//判断子项目是否有权限
-					List<ProjectLibraryBase> children = projectLibraryBase.getChildren();
-					if (ObjectUtils.isNotEmpty(children)) {
-						for (ProjectLibraryBase child : children) {
-							//将有权限的放入最后返回的集合中
-							if (projectIds.contains(child.getId())) {
-								resultLast.add(child);
-							}
-						}
-					}
-				} else {
-					List<ProjectLibraryBase> children = projectLibraryBase.getChildren();
-					if (ObjectUtils.isNotEmpty(children)) {
-						List<ProjectLibraryBase> lastChild = new ArrayList<>();
-						//判断子项目是否有权限
-						for (ProjectLibraryBase child : children) {
-							if (projectIds.contains(child.getId())) {
-								lastChild.add(child);
-							}
-						}
-						projectLibraryBase.setChildren(lastChild);
-					}
-					resultLast.add(projectLibraryBase);
-				}
-
-			}
-		}
 		//表头排序
-		hearSort(params, resultLast);
-		return resultLast;
+		hearSort(params, result);
+		return result;
 	}
 
 	private void hearSort(Map<String, Object> params, List<ProjectLibraryBase> resultLast) {
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
index 2fdadb87a..0b80aafd2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
@@ -161,6 +161,9 @@ public class ProjectLibraryBase implements Comparable<ProjectLibraryBase> {
     @TableField(exist = false)
     private String projectNameCn;
 
+    @ApiModelProperty(value = "平台件数据标识，platform = YES，为平台件数据，platform为空是项目库数据")
+    private String platform;
+
     @Override
     public int compareTo(ProjectLibraryBase o) {
         if (!this.getProjectName().equals(o.getProjectName())) {

From ddeddd6925374194719c6047e488b12b9595ea45 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 13 Sep 2023 17:04:30 +0800
Subject: [PATCH 020/288] =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/projectManagement/platformItemLibrary/index.vue | 8 ++++----
 .../components/ProjectDetails.vue                         | 4 ++--
 .../platformItemLibraryDetails/components/addModel.vue    | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibrary/index.vue b/jero-web/src/views/projectManagement/platformItemLibrary/index.vue
index 048891a31..a4c973177 100644
--- a/jero-web/src/views/projectManagement/platformItemLibrary/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibrary/index.vue
@@ -139,7 +139,7 @@
           {
             title: this.$t('entryName'),
             align: 'left',
-            dataIndex: 'projectName',
+            dataIndex: 'project_name_id',
             width: 300,
             sorter:true,
             ellipsis: true,
@@ -151,7 +151,7 @@
             width: 120,
             sorter:true,
             ellipsis: true,
-            dataIndex: 'studioEngineerName'
+            dataIndex: 'createBy'
           },
           {
             title: this.$t('brand'),
@@ -167,7 +167,7 @@
             width: 180,
             sorter:true,
             ellipsis: true,
-            dataIndex: 'explanation'
+            dataIndex: 'ipdInfo'
           },
           {
             title: this.$t('explain'),
@@ -175,7 +175,7 @@
             width: 360,
             ellipsis: true,
             sorter:true,
-            dataIndex: 'explain'
+            dataIndex: 'explanation'
           },
           {
             title: this.$t('operation'),
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
index 83013e70b..3436d2342 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
@@ -16,8 +16,8 @@
     <div class="content-text">
       <div class="text-field">
         <span class="text-field-left" :title="$t('entryName')">{{$t('entryName')}}</span>
-        <span class="text-field-right" :title="queryForm.projectName"
-        >{{queryForm.projectName}}</span>
+        <span class="text-field-right" :title="queryForm.project_name_id"
+        >{{queryForm.project_name_id}}</span>
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('brand')">{{$t('brand')}}</span>
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
index 302632460..48b662dd8 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
@@ -20,7 +20,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="entryName">
                 <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('entryName')"
-                         v-model="formInline.projectName"></a-input>
+                         v-model="formInline.project_name_id"></a-input>
 <!--                <a-select :placeholder="$t('PleaseSelect')+$t('modelName')"-->
 <!--                          @change="projectNameChange"-->
 <!--                          v-model="formInline.projectNameId">-->

From b2687ea7cca6a4f09f42f575ad887021fd60fed6 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 13 Sep 2023 17:18:07 +0800
Subject: [PATCH 021/288] =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/projectManagement/platformItemLibrary/index.vue | 2 +-
 .../platformItemLibraryDetails/components/ProjectDetails.vue  | 4 ++--
 .../platformItemLibraryDetails/components/addModel.vue        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibrary/index.vue b/jero-web/src/views/projectManagement/platformItemLibrary/index.vue
index a4c973177..28c6478bd 100644
--- a/jero-web/src/views/projectManagement/platformItemLibrary/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibrary/index.vue
@@ -139,7 +139,7 @@
           {
             title: this.$t('entryName'),
             align: 'left',
-            dataIndex: 'project_name_id',
+            dataIndex: 'projectNameId',
             width: 300,
             sorter:true,
             ellipsis: true,
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
index 3436d2342..806a351d3 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
@@ -16,8 +16,8 @@
     <div class="content-text">
       <div class="text-field">
         <span class="text-field-left" :title="$t('entryName')">{{$t('entryName')}}</span>
-        <span class="text-field-right" :title="queryForm.project_name_id"
-        >{{queryForm.project_name_id}}</span>
+        <span class="text-field-right" :title="queryForm.projectNameId"
+        >{{queryForm.projectNameId}}</span>
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('brand')">{{$t('brand')}}</span>
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
index 48b662dd8..09bdae9d9 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
@@ -20,7 +20,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="entryName">
                 <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('entryName')"
-                         v-model="formInline.project_name_id"></a-input>
+                         v-model="formInline.projectNameId"></a-input>
 <!--                <a-select :placeholder="$t('PleaseSelect')+$t('modelName')"-->
 <!--                          @change="projectNameChange"-->
 <!--                          v-model="formInline.projectNameId">-->

From 5912979f4acc0fc26294e557d8c3934fcb597d06 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 14 Sep 2023 09:25:42 +0800
Subject: [PATCH 022/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=20=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E7=94=A8=E6=88=B7=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ProjectDetails.vue                         | 4 ++--
 .../components/certificationList/index.vue                | 2 +-
 .../components/listOfRegulations.vue                      | 2 +-
 .../platformItemLibraryDetails/index.vue                  | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
index 806a351d3..c0726d7fe 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
@@ -26,8 +26,8 @@
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
-        <span class="text-field-right" :title="queryForm.configurationItem"
-        >{{queryForm.configurationItem}}</span>
+        <span class="text-field-right" :title="queryForm.ipdInfo"
+        >{{queryForm.ipdInfo}}</span>
       </div>
     </div>
     <div class="content-text">
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
index d097f1b9a..2bede49f3 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
@@ -652,7 +652,7 @@
           setBatch: '/platform/projectCertificationInventoryEO/setBatch',
           deleteOne: '/platform/projectCertificationInventoryEO/delete',
           AndUserId: '/project/projectLibraryRoleRelEO/queryByProjectLibraryIdAndUserId',
-          AndUserIdEdit: '/platform/projectLibraryRoleRelEO/edit',
+          AndUserIdEdit: '/project/projectLibraryRoleRelEO/edit',
           saveBatch: '/platform/projectCertificationInventoryEO/saveBatch',
           questionUrl: '/platform/projectCertificationInventoryEO/expediting',
           importZipUrl: '/platform/projectCertificationInventoryEO/importData'
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
index f5d237228..2878fc922 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
@@ -1279,7 +1279,7 @@
           transferUrl: '/platform/projectLawsInventoryEO/getPageInfoDummy',//调取
           ExportReportUrl: '/platform/projectLawsInventoryEO/downloadDocxReport',
           AndUserId: '/project/projectLibraryRoleRelEO/queryByProjectLibraryIdAndUserId',
-          AndUserIdEdit: '/platform/projectLibraryRoleRelEO/edit'
+          AndUserIdEdit: '/project/projectLibraryRoleRelEO/edit'
         },
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
         downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue
index 5fc89ba34..6f6a4a2c0 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue
@@ -255,8 +255,8 @@ export default {
     }
   },
   created() {
-    document.title = this.$route.query.projectName ? this.$t('projectDetails') + '-' + this.$route.query.projectName : this.$t('projectDetails')
-    this.title = this.$route.query.projectName
+    document.title = this.$route.query.projectNameId ? this.$t('projectDetails') + '-' + this.$route.query.projectNameId : this.$t('projectDetails')
+    this.title = this.$route.query.projectNameId
   },
   mounted() {
     this.getTaskId()
@@ -436,7 +436,7 @@ export default {
       this.$router.push({
         path: '/projectRegulationTasks',
         query: {
-          projectName: this.$route.query.projectName
+          projectName: this.$route.query.projectNameId
         }
       })
     },
@@ -509,7 +509,7 @@ export default {
     },
     backClick() {
       this.$router.push({
-        path: '/projectLibrary'
+        path: '/platformItemLibraryDetails'
       })
     },
     roleSwitchingClick(roleCode) {

From dc4093d66df2329932a17d8ae7a589f9d63e61dd Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 14 Sep 2023 09:45:41 +0800
Subject: [PATCH 023/288] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E6=8E=89=E5=B9=B3=E5=8F=B0=E4=BB=B6=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=88.xml=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/system/mapper/xml/TodoCenterMapper.xml  |  2 +-
 .../collect/mapper/xml/ParamsManifestEOMapper.xml   | 12 ++++++------
 .../cert/report/mapper/xml/ParamsReportEOMapper.xml |  1 +
 .../xml/ParamsReportExportHistoryEOMapper.xml       |  3 ++-
 .../ota/mapper/xml/OtaManageApplyEOMapper.xml       |  3 ++-
 .../mapper/xml/LawsComplianceBoardMapper.xml        |  2 +-
 .../modules/project/mapper/xml/NcrTrackMapper.xml   |  5 ++++-
 .../mapper/xml/ProblemManagementEOMapper.xml        |  3 ++-
 .../project/mapper/xml/ProjectLibraryBaseMapper.xml | 13 ++++++++++---
 .../project/mapper/xml/ProjectRxswinEOMapper.xml    |  4 +++-
 .../todoCenter/mapper/xml/ProcessInfoEOMapper.xml   |  5 +++++
 11 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml
index 75a7e43c2..ff0405564 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml
@@ -27,7 +27,7 @@
               FROM
                   project_library_base a
                       JOIN mysql.help_topic b ON b.help_topic_id &lt; ( length( a.certification_engineer ) - length( REPLACE ( a.certification_engineer, ',', '' ) ) + 1 )) temp
-                        WHERE user_id = #{userId}) a ON pm.project_id = a.id
+                        WHERE user_id = #{userId} and platform is null) a ON pm.project_id = a.id
         where pm.state = #{state}
     </select>
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
index 3b8f336e0..ff57d79f1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
@@ -133,7 +133,7 @@
         left join project_name_info as pni on plb.project_name_id = pni.id
         left join project_year_name_info as pyni on plb.year_name_id=pyni.id
         ) tmp_tb
-        where 1=1 and state = #{state}
+        where 1=1 and state = #{state} and plb.platform is null
           <if test="projectName !=null and projectName !=''">
             AND project_name LIKE CONCAT(CONCAT('%',#{projectName}),'%')
           </if>
@@ -153,7 +153,7 @@
         left join project_name_info as pni on plb.project_name_id = pni.id
         left join project_year_name_info as pyni on plb.year_name_id=pyni.id
         ) tmp_tb
-        where 1=1 and id in
+        where 1=1 and plb.platform is null and id in
             <foreach collection="idList" index="index" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
@@ -175,7 +175,7 @@
         left join project_name_info as pni on plb.project_name_id = pni.id
         left join project_year_name_info as pyni on plb.year_name_id=pyni.id
         ) tmp_tb
-        where 1=1 and state = #{state}
+        where 1=1 and plb.platform is null and state = #{state}
           and id in(
                 SELECT pm.id AS pm FROM params_manifest pm
                 JOIN ( SELECT id FROM
@@ -183,7 +183,7 @@
                     FROM
                     project_library_base a
                     JOIN mysql.help_topic b ON b.help_topic_id &lt; ( length( a.certification_engineer ) - length( REPLACE ( a.certification_engineer, ',', '' ) ) + 1 )) temp
-                    WHERE user_id = #{userId}) a ON pm.project_id = a.id
+                    WHERE user_id = #{userId} and platform is null) a ON pm.project_id = a.id
 
                 UNION
                 SELECT DISTINCT pcm.params_manifest_id AS pm FROM params_collect_manifest pcm WHERE sdt = #{userName} and state in('2','5')
@@ -211,7 +211,7 @@
         left join project_name_info as pni on plb.project_name_id = pni.id
         left join project_year_name_info as pyni on plb.year_name_id = pyni.id
         ) tmp_tb
-        where project_id = #{projectId}
+        where project_id = #{projectId} and plb.platform is null
     </select>
 
     <select id="labelListForProjectDetails" resultType="java.util.LinkedHashMap">
@@ -232,7 +232,7 @@
               FROM
                   project_library_base a
                       JOIN mysql.help_topic b ON b.help_topic_id &lt; ( length( a.certification_engineer ) - length( REPLACE ( a.certification_engineer, ',', '' ) ) + 1 )) temp
-                        WHERE user_id = #{userId}) a ON pm.project_id = a.id
+                        WHERE user_id = #{userId} and platform is null) a ON pm.project_id = a.id
         where pm.state = #{state}
     </select>
 </mapper>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml
index 8f9924712..435a7ec0c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml
@@ -34,6 +34,7 @@
 
     <sql id="BaseQuerySql">
         <where>
+            platform is null
             <if test="paramsReportEO != null">
                 <if test="paramsReportEO.title !=null and paramsReportEO.title !=''">
                     AND title LIKE CONCAT(CONCAT('%',#{paramsReportEO.title}),'%')
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml
index 8451ceabe..4087b2fcd 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml
@@ -30,6 +30,7 @@
 
     <sql id="BaseQuerySql">
         <where>
+            plb.platform is null
             <if test="paramsReportExportHistoryEO != null">
                 <if test="paramsReportExportHistoryEO.projectName !=null and paramsReportExportHistoryEO.projectName !=''">
                     AND project_name LIKE CONCAT(CONCAT('%',#{paramsReportExportHistoryEO.projectName}),'%')
@@ -57,4 +58,4 @@
         <include refid="BaseQuerySql"/>
         order by export_time desc
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
index 2edd55c10..cf273c23a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
@@ -138,6 +138,7 @@
 	    JOIN project_year_name_info pyni ON pyni.id = plb.year_name_id
         where plb.target_market =#{market}
         and pni.project_name =#{car}
+        and plb.platform is null
         GROUP BY plb.id
         ORDER BY project_version asc
     </select>
@@ -160,7 +161,7 @@
 	    LEFT JOIN ota_manage_apply oma ON oma.project_version = plb.id
 	    LEFT JOIN project_name_info pni ON pni.id = plb.project_name_id
 	    LEFT JOIN project_year_name_info pyni ON pyni.project_name_id = pni.id
-        WHERE oma.vdr = #{vdr}
+        WHERE oma.vdr = #{vdr} and plb.platform is null
         GROUP BY plb.id
     </select>
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml
index ba76e12e3..001fd64de 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml
@@ -108,7 +108,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
-            1=1
+            1=1 and plb.platform is null
             <if test="params.id != null and params.id != null">
                 and pli.stand_id = #{params.id}
             </if>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
index e74921d7a..a700a3eaa 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
@@ -62,6 +62,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
         <!--<if test="ncrTrackVO.projectLibraryId != null and ncrTrackVO.projectLibraryId != ''">
             plb.id =#{ncrTrackVO.projectLibraryId}
             and
@@ -90,7 +91,7 @@
             (pli.design_duty_id =#{ncrTrackVO.duty} or pli.prehomo_duty_id =#{ncrTrackVO.duty} or pli.verify_duty_id =#{ncrTrackVO.duty})
             and
         </if>-->
-        (
+        and(
         design_flow_status =#{ncrTrackVO.inconformity}
         or verify_flow_status =#{ncrTrackVO.inconformity}
         )
@@ -161,6 +162,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
+
         <if test="ncrTrackVO.projectLibraryId != null and ncrTrackVO.projectLibraryId != ''">
             plb.id =#{ncrTrackVO.projectLibraryId}
             and
@@ -193,6 +195,7 @@
         <foreach collection="list" index="index" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>
+        and plb.platform is null
         order by pli.create_time desc
 
     </select>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml
index 82ebedceb..d842006a9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml
@@ -53,8 +53,9 @@
         left join sys_user as studiouser on plb.studio_engineer=studiouser.id
         left join project_year_name_info as pyni on plb.year_name_id=pyni.id
         <where>
+            plb.platform is null
             <if test="ids != null and ids !=''">
-                plb.id in
+                and plb.id in
                 <foreach collection="ids.split(',')" index="index" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
index 0a9425628..de931ad3b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
@@ -66,11 +66,12 @@
         <include refid="select_item"/>
 
         <where>
+            plb.platform is null
             <if test="params.projectName != null and params.projectName != ''">
                 <!--搜索条件:项目名称,包含%,单独搜索-->
                 <choose>
                     <when test='params.projectName != null and params.projectName != "" and params.projectName.contains("%")'>
-                        ( pni.project_name like '%1%%' escape '1' or pni.project_name like '%1%%' escape '1')
+                        and ( pni.project_name like '%1%%' escape '1' or pni.project_name like '%1%%' escape '1')
                     </when>
                     <otherwise>
             <!--(pni.project_name like concat('%',#{params.projectName},'%') or pyni.year_name like concat('%',#{params.projectName},'%'))-->
@@ -134,7 +135,10 @@
         <include refid="select_item"/>
 
         <where>
+            plb.platform is null
+            and(
             parent_id = '' or parent_id is null
+            )
         </where>
         order by  plb.create_time desc
     </select>
@@ -206,6 +210,7 @@
         <include refid="select_item"/>
 
         <where>
+            plb.platform is null
             <if test="projectLibraryBase.projectName != null and projectLibraryBase.projectName != ''">
                 <!--搜索条件:项目名称,包含%,单独搜索-->
                 <choose>
@@ -273,8 +278,9 @@
     <select id="queryById" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
         <include refid="select_item"/>
         <where>
+            plb.platform is null
             <if test="id != null and id != '' ">
-                plb.id=#{id}
+                and plb.id=#{id}
             </if>
         </where>
         order by plb.create_time desc
@@ -288,7 +294,7 @@
             LEFT JOIN project_name_info pni ON plb.project_name_id = pni.id
             LEFT JOIN project_year_name_info pyni ON plb.year_name_id = pyni.id
         WHERE
-            plb.id = #{projectLibraryId}
+            plb.id = #{projectLibraryId} and platform is null
     </select>
 
     <select id="getListByIds" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
@@ -298,6 +304,7 @@
         <foreach collection="idList" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
+        and plb.platform is null
         order by plb.create_time desc
     </select>
 </mapper>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml
index ed116b16d..145e0c75e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml
@@ -34,7 +34,9 @@
         	LEFT JOIN project_name_info AS pni ON plb.project_name_id = pni.id
         	LEFT JOIN project_year_name_info AS pyni ON plb.year_name_id = pyni.id
         	LEFT JOIN sys_dict_item AS sdi ON sdi.item_value = plb.target_market
-        	where plb.parent_id = #{parentId}
+        	where plb.platform is null and(
+        	plb.parent_id = #{parentId}
         	or plb.id = #{id}
+        	)
     </select>
 </mapper>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
index c41daf64f..bc43106a7 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
@@ -118,6 +118,7 @@
                 left join project_laws_inventory pli on pi.project_laws_inventory_id = pli.id
                 LEFT JOIN buss_document_library bdl ON pi.buss_document_library_id = bdl.id
             <where>
+                plb.platform is null
                 <if test="params.queryType != 'issuedProcess'">
                     and pi.id IN (
                         SELECT
@@ -223,6 +224,7 @@
                      <foreach collection="params.flowTypeList" index="index" item="item" open="(" separator="," close=")">
                         #{item}
                      </foreach>
+                     and plb.platform is null
                union
                SELECT
                    pi.id,
@@ -321,6 +323,7 @@
                     <foreach collection="params.qdqrFlowTypeValue" index="index" item="item" open="(" separator="," close=")">
                         #{item}
                     </foreach>
+                   and plb.platform is null
         )temp
         <include refid="BaseQuerySql"/>
         order by
@@ -467,6 +470,7 @@
                 <foreach collection="params.flowTypeList" index="index" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
+                and plb.platform is null
             union
             SELECT
                 pi.id,
@@ -537,6 +541,7 @@
             <foreach collection="params.qdqrFlowTypeValue" index="index" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
+            and plb.platform is null
             <if test="params.mobileProcessing == 0">
             union
             SELECT

From 2218f43f4e1562302074b052628e1b833974d69d Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 14 Sep 2023 10:31:15 +0800
Subject: [PATCH 024/288] =?UTF-8?q?=E5=8E=9F=E9=A1=B9=E7=9B=AE=E5=BA=93=20?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/associatedplat.vue             |  97 ++++--
 .../components/associatedplatthree.vue        | 270 ++++++++++++++++
 .../components/associatedplattwo.vue          | 303 ++++++++++++++++++
 .../components/listOfRegulations.vue          |  17 +-
 .../platformItemLibrary/index.vue             |   2 +-
 5 files changed, 666 insertions(+), 23 deletions(-)
 create mode 100644 jero-web/src/views/projectManagement/components/associatedplatthree.vue
 create mode 100644 jero-web/src/views/projectManagement/components/associatedplattwo.vue

diff --git a/jero-web/src/views/projectManagement/components/associatedplat.vue b/jero-web/src/views/projectManagement/components/associatedplat.vue
index 40576fda4..d38b0cfe5 100644
--- a/jero-web/src/views/projectManagement/components/associatedplat.vue
+++ b/jero-web/src/views/projectManagement/components/associatedplat.vue
@@ -1,6 +1,6 @@
 <template>
   <a-drawer
-    :title="$t('Transfer')"
+    :title="$t('Associatedplatform')"
     :maskClosable="false"
     :width="1000"
     placement="right"
@@ -14,16 +14,51 @@
           <a-row :gutter="24">
             <a-col :md="12" :sm="8">
               <div class="box-title-text">
-                <div class="title-text" :title="$t('VirtualListName')">
-                  <span>{{$t('VirtualListName1')}}</span>
+                <div class="title-text" :title="$t('entryName')">
+                  <span>{{$t('entryName')}}</span>
                 </div>
-                <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('VirtualListName')"
-                         v-model="queryParam.name"></j-input>
+                <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('entryName')"
+                         v-model="queryParam.projectName"></a-input>
               </div>
             </a-col>
+            <a-col :md="12" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('brand')">
+                  <span>{{$t('brand')}}</span>
+                </div>
+                <j-dict-select-tag class="box-input" v-model="queryParam.brand"
+                                   :placeholder="$t('PleaseSelect')+$t('brand')"
+                                   :type="'select'"
+                                   :triggerChange="false" :dictCode="'brand'"/>
+              </div>
+            </a-col>
+            <template v-if="toggleSearchStatus">
+              <a-col :md="12" :sm="8">
+                <div class="box-title-text">
+                  <div class="title-text" :title="$t('ModelPlatform')">
+                    <span>{{$t('ModelPlatform')}}</span>
+                  </div>
+                  <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ModelPlatform')"
+                           v-model="queryParam.vehiclePlatform"></a-input>
+                </div>
+              </a-col>
+              <a-col :md="12" :sm="8">
+                <div class="box-title-text">
+                  <div class="title-text" :title="$t('DigitalPlatform')">
+                    <span>{{$t('DigitalPlatform')}}</span>
+                  </div>
+                  <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('DigitalPlatform')"
+                           v-model="queryParam.digitalPlatform"></a-input>
+                </div>
+              </a-col>
+            </template>
             <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
-               <a-col :md="12" :sm="24">
-                  <a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
+               <a-col :md="6" :sm="24">
+                  <a @click="handleToggleSearch">
+                    {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                    <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                  </a>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
                   <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                </a-col>
       </span>
@@ -37,7 +72,7 @@
         :scroll="{x: 1000}"
         :data-source="dataList"
         :pagination="false"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' }"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:flag !== '法规'?' ':'' }"
         :loading="loading">
 
       </a-table>
@@ -76,51 +111,68 @@
         visible: false,
         queryParam: {},
         confirmLoading: false,
+        toggleSearchStatus: false,
         selectedRowKeys: [],
         columns: [
           {
-            title: this.$t('VirtualListName'),
-            dataIndex: 'name',
+            title: this.$t('entryName'),
+            dataIndex: 'projectNameId',
             align: 'left',
             ellipsis: true,
             width: 235
           },
           {
-            title: this.$t('instructionForUse'),
-            dataIndex: 'useExplain',
+            title: this.$t('StudioEngineer'),
+            dataIndex: 'studioEngineerName',
             align: 'left',
             ellipsis: true,
             width: 235
           },
           {
-            title: this.$t('updateTime'),
-            dataIndex: 'updateTime',
+            title: this.$t('configurationItem'),
+            dataIndex: 'ipdInfo',
             align: 'left',
             ellipsis: true,
             width: 235
           },
           {
-            title: this.$t('creater'),
-            dataIndex: 'createBy',
+            title: this.$t('explain'),
+            dataIndex: 'explanation',
             align: 'left',
             ellipsis: true,
             width: 235
-          }
+          },
+          {
+            title: this.$t('ModelPlatform'),
+            dataIndex: 'vehiclePlatform',
+            align: 'left',
+            ellipsis: true,
+            width: 235
+          },
+          {
+            title: this.$t('DigitalPlatform'),
+            dataIndex: 'digitalPlatform',
+            align: 'left',
+            ellipsis: true,
+            width: 235
+          },
         ],
         dataList: [],
         content: [],
         loading: false,
         pageNo: 1,
         pageSize: 10,
-        total: 0
+        total: 0,
+        flag:'',
       }
     },
     mounted() {
 
     },
     methods: {
-      transferModel() {
+      transferModel(flag) {
         this.visible = true
+        this.flag = flag
         this.queryParam = {}
         this.selectedRowKeys = []
         this.replacePage()
@@ -162,7 +214,7 @@
       },
       onSelectChange(value) {
         this.selectedRowKeys = value
-        if (this.selectedRowKeys.length > 1) {
+        if (this.selectedRowKeys.length > 1 && this.flag !== '法规') {
           this.selectedRowKeys.shift()
         }
       },
@@ -174,7 +226,7 @@
           this.confirmLoading = true
           let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
           this.confirmLoading = false
-          this.$emit('transferListForm',selectedRowKeys.join(','))
+          this.$emit('associatedplatForm',selectedRowKeys.join(','))
           this.selectedRowKeys = []
           // postAction(this.url.addModel, {
           //   dummyInventoryBaseId: selectedRowKeys.join(','),
@@ -201,6 +253,9 @@
           this.$message.warning(this.$t('selectLeastOne'))
         }
       },
+      handleToggleSearch() {
+        this.toggleSearchStatus = !this.toggleSearchStatus
+      },
       getAdd() {
         let _this = this
         this.$confirm({
diff --git a/jero-web/src/views/projectManagement/components/associatedplatthree.vue b/jero-web/src/views/projectManagement/components/associatedplatthree.vue
new file mode 100644
index 000000000..c3376be21
--- /dev/null
+++ b/jero-web/src/views/projectManagement/components/associatedplatthree.vue
@@ -0,0 +1,270 @@
+<template>
+  <a-drawer
+    :title="$t('Associatedplatform')"
+    :maskClosable="false"
+    :width="1000"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <div style="margin-bottom: 60px">
+      <div>{{'GB 111'}}{{$t('associatedItem')}}</div>
+      <a-table
+        :components="drag(columns,'columns')"
+        :columns="columns"
+        rowKey="id"
+        :scroll="{x: 1000}"
+        :data-source="dataList"
+        :pagination="false"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:'' }"
+        :loading="loading">
+
+      </a-table>
+<!--      <div class="page" v-if="dataList.length > 0">-->
+<!--        <a-pagination-->
+<!--          :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
+<!--          show-quick-jumper-->
+<!--          show-size-changer-->
+<!--          :page-size.sync="pageSize"-->
+<!--          :total="total"-->
+<!--          :current="pageNo"-->
+<!--          @change="onChange"-->
+<!--          @showSizeChange="SizeChange"-->
+<!--        />-->
+<!--      </div>-->
+    </div>
+
+    <div class="drawer-bootom-button">
+      <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit(undefined)" type="primary" :loading="confirmLoading">{{$t('determine')}}</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+  export default {
+    name: 'transferList',
+    components: {},
+    props: ['url'],
+    mixins: [ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        visible: false,
+        queryParam: {},
+        confirmLoading: false,
+        selectedRowKeys: [],
+        columns: [
+          {
+            title: this.$t('entryName'),
+            dataIndex: 'projectName',
+            align: 'left',
+            ellipsis: true,
+            width: 120
+          },
+          {
+            title: this.$t('standard'),
+            dataIndex: 'serialNumber',
+            align: 'left',
+            ellipsis: true,
+            width: 120
+          },
+          {
+            title: this.$t('subtitle'),
+            dataIndex: 'subtitle',
+            align: 'left',
+            ellipsis: true,
+            width: 120
+          },
+          {
+            title: this.$t('NareaOfResponsibility'),
+            dataIndex: 'dutyTerritory',
+            align: 'left',
+            ellipsis: true,
+            width: 140
+          },
+          {
+            title: this.$t('regulatoryEngineer'),
+            dataIndex: 'regulationOwnerName',
+            align: 'left',
+            ellipsis: true,
+            width: 120
+          },
+          {
+            title: this.$t('design') + '-' + this.$t('typeOfDeliverables'),
+            dataIndex: 'deliverableTypeName',
+            align: 'left',
+            ellipsis: true,
+            width: 130
+          },
+          {
+            title: this.$t('verify') + '-' + this.$t('typeOfDeliverables'),
+            dataIndex: 'deliverableTypeName',
+            align: 'left',
+            ellipsis: true,
+            width: 130
+          },
+        ],
+        dataList: [],
+        content: [],
+        loading: false,
+        pageNo: 1,
+        pageSize: 10,
+        total: 0
+      }
+    },
+    mounted() {
+
+    },
+    methods: {
+      transferModel() {
+        this.visible = true
+        this.queryParam = {}
+        this.selectedRowKeys = []
+        this.replacePage()
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.replacePage()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.replacePage()
+      },
+      onChange(page, pageSize) {
+        this.pageNo = page
+        this.replacePage()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.replacePage()
+      },
+      replacePage() {
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...this.queryParam
+        }
+        this.loading = true
+        postAction(this.url.transferUrl, query).then((res) => {
+          if (res.success) {
+            this.dataList = res.result.records || []
+            this.selectedRowKeys = this.dataList.map(item => item.id)
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+        // if (this.selectedRowKeys.length > 1) {
+        //   this.selectedRowKeys.shift()
+        // }
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      handleSubmit(flag) {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.confirmLoading = true
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          this.confirmLoading = false
+          this.$emit('associatedplatthreeForm',selectedRowKeys.join(','))
+          this.selectedRowKeys = []
+          // postAction(this.url.addModel, {
+          //   dummyInventoryBaseId: selectedRowKeys.join(','),
+          //   projectLibraryId: this.$route.query.id,
+          //   flag: flag
+          // }).then((res) => {
+          //   if (res.success) {
+          //     this.confirmLoading = false
+          //     this.$message.success(this.$t('OperationSuccessful'))
+          //     this.visible = false
+          //     this.selectedRowKeys = []
+          //     this.$emit('transferListForm')
+          //   } else {
+          //     if (res.message == '该虚拟清单的维护清单中没有数据,是否需要添加') {
+          //       this.confirmLoading = false
+          //       this.getAdd()
+          //       return
+          //     }
+          //     this.$message.warning(this.$t('operationFailed'))
+          //     this.confirmLoading = false
+          //   }
+          // })
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      getAdd() {
+        let _this = this
+        this.$confirm({
+          content: _this.$t('TheDoesNotContainData'),
+          onOk() {
+            _this.handleSubmit('1')
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    z-index: 100;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/associatedplattwo.vue b/jero-web/src/views/projectManagement/components/associatedplattwo.vue
new file mode 100644
index 000000000..96defae3f
--- /dev/null
+++ b/jero-web/src/views/projectManagement/components/associatedplattwo.vue
@@ -0,0 +1,303 @@
+<template>
+  <a-drawer
+    :title="$t('Associatedplatform')"
+    :maskClosable="false"
+    :width="1000"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <div style="margin-bottom: 60px">
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :md="12" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('standard')">
+                  <span>{{$t('standard')}}</span>
+                </div>
+                <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                         v-model="queryParam.serialNumber"></a-input>
+              </div>
+            </a-col>
+            <a-col :md="12" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('NareaOfResponsibility')">
+                  <span>{{$t('NareaOfResponsibility')}}</span>
+                </div>
+                  <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
+                                     :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
+                                     :type="'select'"
+                                     :triggerChange="false" :dictCode="'duty_territory'"/>
+              </div>
+            </a-col>
+            <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+<!--                  <a @click="handleToggleSearch">-->
+<!--                    {{ !toggleSearchStatus ? $t('open') : $t('away') }}-->
+<!--                    <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+<!--                  </a>-->
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+               </a-col>
+      </span>
+          </a-row>
+        </a-form>
+      </div>
+      <a-table
+        :components="drag(columns,'columns')"
+        :columns="columns"
+        rowKey="id"
+        :scroll="{x: 1000}"
+        :data-source="dataList"
+        :pagination="false"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:flag !== '法规'?' ':'' }"
+        :loading="loading">
+
+      </a-table>
+      <div class="page" v-if="dataList.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="onChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+
+    <div class="drawer-bootom-button">
+      <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit(undefined)" type="primary" :loading="confirmLoading">{{$t('determine')}}</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+import { getAction, postAction } from '@/api/manage'
+import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+export default {
+  name: 'transferList',
+  components: {},
+  props: ['url'],
+  mixins: [ResizeHeader, ResizeColumnProvide],
+  data() {
+    return {
+      visible: false,
+      queryParam: {},
+      confirmLoading: false,
+      toggleSearchStatus: false,
+      selectedRowKeys: [],
+      columns: [
+        {
+          title: this.$t('standard'),
+          dataIndex: 'serialNumber',
+          align: 'left',
+          ellipsis: true,
+          width: 120
+        },
+        {
+          title: this.$t('subtitle'),
+          dataIndex: 'subtitle',
+          align: 'left',
+          ellipsis: true,
+          width: 120
+        },
+        {
+          title: this.$t('NareaOfResponsibility'),
+          dataIndex: 'dutyTerritory',
+          align: 'left',
+          ellipsis: true,
+          width: 140
+        },
+        {
+          title: this.$t('regulatoryEngineer'),
+          dataIndex: 'regulationOwnerName',
+          align: 'left',
+          ellipsis: true,
+          width: 120
+        },
+        {
+          title: this.$t('design') + '-' + this.$t('typeOfDeliverables'),
+          dataIndex: 'deliverableTypeName',
+          align: 'left',
+          ellipsis: true,
+          width: 120
+        },
+        {
+          title: this.$t('verify') + '-' + this.$t('typeOfDeliverables'),
+          dataIndex: 'deliverableTypeName',
+          align: 'left',
+          ellipsis: true,
+          width: 120
+        },
+      ],
+      dataList: [],
+      content: [],
+      loading: false,
+      pageNo: 1,
+      pageSize: 10,
+      total: 0,
+      flag:'',
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    transferModel(flag) {
+      this.visible = true
+      this.flag = flag
+      this.queryParam = {}
+      this.selectedRowKeys = []
+      this.replacePage()
+    },
+    searchQuery() {
+      this.pageNo = 1
+      this.replacePage()
+    },
+    searchReset() {
+      this.pageNo = 1
+      this.queryParam = {}
+      this.replacePage()
+    },
+    onChange(page, pageSize) {
+      this.pageNo = page
+      this.replacePage()
+    },
+    SizeChange(page, pageSize) {
+      this.pageNo = 1
+      this.pageSize = pageSize
+      this.replacePage()
+    },
+    replacePage() {
+      let query = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        ...this.queryParam
+      }
+      this.loading = true
+      postAction(this.url.transferUrl, query).then((res) => {
+        if (res.success) {
+          this.dataList = res.result.records || []
+          this.total = res.result.total
+          this.loading = false
+        } else {
+          this.loading = false
+        }
+      })
+    },
+    onSelectChange(value) {
+      this.selectedRowKeys = value
+      if (this.selectedRowKeys.length > 1 && this.flag !== '法规') {
+        this.selectedRowKeys.shift()
+      }
+    },
+    handleCancel() {
+      this.visible = false
+    },
+    handleSubmit(flag) {
+      if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+        this.confirmLoading = true
+        let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+        this.confirmLoading = false
+        this.$emit('associatedplattwoForm',selectedRowKeys.join(','))
+        this.selectedRowKeys = []
+        // postAction(this.url.addModel, {
+        //   dummyInventoryBaseId: selectedRowKeys.join(','),
+        //   projectLibraryId: this.$route.query.id,
+        //   flag: flag
+        // }).then((res) => {
+        //   if (res.success) {
+        //     this.confirmLoading = false
+        //     this.$message.success(this.$t('OperationSuccessful'))
+        //     this.visible = false
+        //     this.selectedRowKeys = []
+        //     this.$emit('transferListForm')
+        //   } else {
+        //     if (res.message == '该虚拟清单的维护清单中没有数据,是否需要添加') {
+        //       this.confirmLoading = false
+        //       this.getAdd()
+        //       return
+        //     }
+        //     this.$message.warning(this.$t('operationFailed'))
+        //     this.confirmLoading = false
+        //   }
+        // })
+      } else {
+        this.$message.warning(this.$t('selectLeastOne'))
+      }
+    },
+    handleToggleSearch() {
+      this.toggleSearchStatus = !this.toggleSearchStatus
+    },
+    getAdd() {
+      let _this = this
+      this.$confirm({
+        content: _this.$t('TheDoesNotContainData'),
+        onOk() {
+          _this.handleSubmit('1')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.page {
+  text-align: right;
+  margin-top: 20px;
+}
+
+.drawer-bootom-button {
+  position: absolute;
+  bottom: 0;
+  z-index: 100;
+  width: 100%;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
+
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+
+.title-text {
+  width: 20%;
+  min-width: 110px;
+  color: #000F16;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  margin-top: 3px;
+  text-align: right;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.box-input {
+  display: inline-block;
+  width: 70%;
+  height: 38px;
+  margin-top: 2px;
+}
+
+.box-button {
+  height: 38px;
+}
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index f27e884d8..74249e206 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -427,6 +427,8 @@
     <batSetting :url="url" @batSettingList="addModelList" ref="batSettingRef"/>
     <transferList :url="url" @transferListForm="transferListForm" ref="transferListRef"/>
     <associatedplat :url="url" @associatedplatForm="associatedplatForm" ref="associatedplatRef"/>
+    <associatedplattwo :url="url" @associatedplattwoForm="associatedplattwoForm" ref="associatedplattwoRef"/>
+    <associatedplatthree :url="url" @associatedplatthreeForm="associatedplatthreeForm" ref="associatedplatthreeRef"/>
     <customizeList :url="url" @customizeListForm="customizeListForm" ref="customizeListRef"/>
     <transferListvirtal :url="url" @transferListFormHomo="transferListFormHomo" ref="transferListvirtalRef"/>
     <fixedPlate @fixedPlateForm="addModelList" ref="fixedPlateRef"/>
@@ -699,6 +701,8 @@
   import batSetting from './batSetting'
   import transferList from './transferList'
   import associatedplat from './associatedplat'
+  import associatedplattwo from './associatedplattwo'
+  import associatedplatthree from './associatedplatthree'
   import customizeList from './customizeList'
   import transferListvirtal from './transferListvirtal'
   import fixedPlate from './fixedPlateForm'
@@ -725,6 +729,8 @@
       batSetting,
       transferList,
       associatedplat,
+      associatedplattwo,
+      associatedplatthree,
       customizeList,
       transferListvirtal,
       globalAdvancedQuery,
@@ -1932,7 +1938,7 @@
       },
       // 关联平台件
       associatedplatformClick(){
-        this.$refs.associatedplatRef.transferModel()
+        this.$refs.associatedplatRef.transferModel('法规')
       },
       //批量设置
       batSettingClick() {
@@ -2540,6 +2546,15 @@
       transferListForm(id) {
         this.$refs.transferListvirtalRef.transferModel(id)
       },
+      associatedplatForm(id){
+        this.$refs.associatedplattwoRef.transferModel(id)
+      },
+      associatedplattwoForm(id){
+        this.$refs.associatedplatthreeRef.transferModel(id)
+      },
+      associatedplatthreeForm(id){
+        console.log(id)
+      },
       transferListFormHomo() {
         this.$refs.transferListRef.handleCancel()
         this.pageNo = 1
diff --git a/jero-web/src/views/projectManagement/platformItemLibrary/index.vue b/jero-web/src/views/projectManagement/platformItemLibrary/index.vue
index 28c6478bd..b8f3dad00 100644
--- a/jero-web/src/views/projectManagement/platformItemLibrary/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibrary/index.vue
@@ -9,7 +9,7 @@
                 <span>{{$t('entryName')}}</span>
               </div>
               <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('entryName')"
-                       v-model="queryParam.projectName"></a-input>
+                       v-model="queryParam.projectNameId"></a-input>
             </div>
           </a-col>
           <a-col :md="6" :sm="8">

From 757e4b5afae708e60cb0b9a059288c5137eb5780 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 14 Sep 2023 10:42:25 +0800
Subject: [PATCH 025/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...PlatformProjectLibraryBaseServiceImpl.java | 89 +++++++++++++------
 1 file changed, 61 insertions(+), 28 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
index 426f3117b..b9533899f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
@@ -1109,54 +1109,87 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 		return result;
 	}
 
-	private void hearSort(Map<String, Object> params, List<ProjectLibraryBase> resultLast) {
+	private void hearSort(Map<String, Object> params, List<ProjectLibraryBase> resultList) {
 		if(ObjectUtils.isNotEmpty(params.get("orderByField"))){
 			Collator comparator = Collator.getInstance(Locale.CHINESE);
 			//项目名称，R&H Studio，车型平台，数字平台
-			if("projectName".equals(params.get("orderByField"))){
+			if("projectNameId".equals(params.get("orderByField"))){
 				if(OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))){
-					Collections.sort(resultLast,(e1, e2)->{
-						return comparator.compare(e1.getProjectName(),e2.getProjectName());
+					Collections.sort(resultList,(e1, e2)->{
+						String e1Field = StringUtils.isNotBlank(e1.getProjectNameId()) ? e1.getProjectNameId() : "";
+						String e2Field = StringUtils.isNotBlank(e2.getProjectNameId()) ? e2.getProjectNameId() : "";
+						return comparator.compare(e1Field,e2Field);
 					});
 				}else if(OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))){
-					Collections.sort(resultLast,(e1,e2)->{
-						return comparator.compare(e2.getProjectName(),e1.getProjectName());
+					Collections.sort(resultList,(e1,e2)->{
+						String e1Field = StringUtils.isNotBlank(e1.getProjectNameId()) ? e1.getProjectNameId() : "";
+						String e2Field = StringUtils.isNotBlank(e2.getProjectNameId()) ? e2.getProjectNameId() : "";
+						return comparator.compare(e2Field,e1Field);
 					});
 				}
 			}
-			//R&H Studio
-			if("studioEngineerName".equals(params.get("orderByField"))){
+			//法规工程师
+			if("createBy".equals(params.get("orderByField"))){
 				if(OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))){
-					Collections.sort(resultLast,(e1, e2)->{
-						return comparator.compare(e1.getStudioEngineerName(),e2.getStudioEngineerName());
+					Collections.sort(resultList,(e1, e2)->{
+						String e1Field = StringUtils.isNotBlank(e1.getCreateBy()) ? e1.getCreateBy() : "";
+						String e2Field = StringUtils.isNotBlank(e2.getCreateBy()) ? e2.getCreateBy() : "";
+						return comparator.compare(e1Field,e2Field);
 					});
 				}else if(OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))){
-					Collections.sort(resultLast,(e1,e2)->{
-						return comparator.compare(e2.getStudioEngineerName(),e1.getStudioEngineerName());
+					Collections.sort(resultList,(e1,e2)->{
+						String e1Field = StringUtils.isNotBlank(e1.getCreateBy()) ? e1.getCreateBy() : "";
+						String e2Field = StringUtils.isNotBlank(e2.getCreateBy()) ? e2.getCreateBy() : "";
+						return comparator.compare(e2Field,e1Field);
 					});
 				}
 			}
-			//车型平台
-			if("vehiclePlatform".equals(params.get("orderByField"))){
-				if(OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))){
-					Collections.sort(resultLast,(e1, e2)->{
-						return comparator.compare(e1.getVehiclePlatform(),e2.getVehiclePlatform());
+			//品牌
+			if ("brandText".equals(params.get("orderByField"))) {
+				if (OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))) {
+					Collections.sort(resultList, (e1, e2) -> {
+						String e1Field = StringUtils.isNotBlank(e1.getBrandText()) ? e1.getBrandText() : "";
+						String e2Field = StringUtils.isNotBlank(e2.getBrandText()) ? e2.getBrandText() : "";
+						return comparator.compare(e1Field, e2Field);
 					});
-				}else if(OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))){
-					Collections.sort(resultLast,(e1,e2)->{
-						return comparator.compare(e2.getVehiclePlatform(),e1.getVehiclePlatform());
+				} else if (OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))) {
+					Collections.sort(resultList, (e1, e2) -> {
+						String e1Field = StringUtils.isNotBlank(e1.getBrandText()) ? e1.getBrandText() : "";
+						String e2Field = StringUtils.isNotBlank(e2.getBrandText()) ? e2.getBrandText() : "";
+						return comparator.compare(e2Field, e1Field);
 					});
 				}
 			}
-			//数字平台
-			if("digitalPlatform".equals(params.get("orderByField"))){
-				if(OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))){
-					Collections.sort(resultLast,(e1, e2)->{
-						return comparator.compare(e1.getDigitalPlatform(),e2.getDigitalPlatform());
+
+			//配置项
+			if ("ipdInfo".equals(params.get("orderByField"))) {
+				if (OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))) {
+					Collections.sort(resultList, (e1, e2) -> {
+						String e1Field = StringUtils.isNotBlank(e1.getIpdInfo()) ? e1.getIpdInfo() : "";
+						String e2Field = StringUtils.isNotBlank(e2.getIpdInfo()) ? e2.getIpdInfo() : "";
+						return comparator.compare(e1Field, e2Field);
 					});
-				}else if(OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))){
-					Collections.sort(resultLast,(e1,e2)->{
-						return comparator.compare(e2.getDigitalPlatform(),e1.getDigitalPlatform());
+				} else if (OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))) {
+					Collections.sort(resultList, (e1, e2) -> {
+						String e1Field = StringUtils.isNotBlank(e1.getIpdInfo()) ? e1.getIpdInfo() : "";
+						String e2Field = StringUtils.isNotBlank(e2.getIpdInfo()) ? e2.getIpdInfo() : "";
+						return comparator.compare(e2Field, e1Field);
+					});
+				}
+			}
+			//说明
+			if ("explanation".equals(params.get("orderByField"))) {
+				if (OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))) {
+					Collections.sort(resultList, (e1, e2) -> {
+						String e1Field = StringUtils.isNotBlank(e1.getExplanation()) ? e1.getExplanation() : "";
+						String e2Field = StringUtils.isNotBlank(e2.getExplanation()) ? e2.getExplanation() : "";
+						return comparator.compare(e1Field, e2Field);
+					});
+				} else if (OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))) {
+					Collections.sort(resultList, (e1, e2) -> {
+						String e1Field = StringUtils.isNotBlank(e1.getExplanation()) ? e1.getExplanation() : "";
+						String e2Field = StringUtils.isNotBlank(e2.getExplanation()) ? e2.getExplanation() : "";
+						return comparator.compare(e2Field, e1Field);
 					});
 				}
 			}

From a309f03340c8e996fc65f2798572a5b078286688 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 14 Sep 2023 11:08:38 +0800
Subject: [PATCH 026/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E5=90=88?=
 =?UTF-8?q?=E8=A7=84=E8=AE=A4=E8=AF=81=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformTaskPlanningEOController.java     | 192 ++++++++++++++++++
 .../entity/PlatformTaskPlanningEO.java        |  78 +++++++
 .../mapper/PlatformTaskPlanningEOMapper.java  |  14 ++
 .../xml/PlatformTaskPlanningEOMapper.xml      |  15 ++
 .../IPlatformTaskPlanningEOService.java       |  67 ++++++
 .../PlatformTaskPlanningEOServiceImpl.java    | 109 ++++++++++
 6 files changed, 475 insertions(+)
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformTaskPlanningEOController.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/entity/PlatformTaskPlanningEO.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatformTaskPlanningEOMapper.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformTaskPlanningEOMapper.xml
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformTaskPlanningEOService.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformTaskPlanningEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformTaskPlanningEOController.java
new file mode 100644
index 000000000..cc130f5c9
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformTaskPlanningEOController.java
@@ -0,0 +1,192 @@
+package com.jero.modules.platform.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.platform.entity.PlatformTaskPlanningEO;
+import com.jero.modules.platform.service.IPlatformTaskPlanningEOService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+
+ /**
+ * @Description: 平台件合规认证计划
+ * @Author: jero-boot
+ * @Date:   2023-09-14
+ * @Version: V1.0
+ */
+@Api(tags="平台件合规认证计划")
+@RestController
+@RequestMapping("/platform/platformTaskPlanningEO")
+@Slf4j
+public class PlatformTaskPlanningEOController extends JeroController<PlatformTaskPlanningEO, IPlatformTaskPlanningEOService> {
+	@Autowired
+	private IPlatformTaskPlanningEOService platformTaskPlanningEOService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param platformTaskPlanningEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "平台件合规认证计划-分页列表查询")
+	@ApiOperation(value="平台件合规认证计划-分页列表查询", notes="平台件合规认证计划-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(PlatformTaskPlanningEO platformTaskPlanningEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<PlatformTaskPlanningEO> queryWrapper = QueryGenerator.initQueryWrapper(platformTaskPlanningEO, req.getParameterMap());
+		Page<PlatformTaskPlanningEO> page = new Page<PlatformTaskPlanningEO>(pageNo, pageSize);
+		IPage<PlatformTaskPlanningEO> pageList = platformTaskPlanningEOService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "平台件合规认证计划-列表查询")
+    @ApiOperation(value="平台件合规认证计划-列表查询", notes="平台件合规认证计划-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<PlatformTaskPlanningEO>> queryList() {
+        List<PlatformTaskPlanningEO> list = platformTaskPlanningEOService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param platformTaskPlanningEO
+	 * @return
+	 */
+	@AutoLog(value = "平台件合规认证计划-添加")
+	@ApiOperation(value="平台件合规认证计划-添加", notes="平台件合规认证计划-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody PlatformTaskPlanningEO platformTaskPlanningEO) {
+		platformTaskPlanningEOService.add(platformTaskPlanningEO);
+		return Result.OK("添加成功！");
+	}
+	/**
+	 *   添加
+	 *
+	 * @param platformTaskPlanningEOList
+	 * @return
+	 */
+	@AutoLog(value = "平台件合规认证计划-批量添加")
+	@ApiOperation(value="平台件合规认证计划-批量添加", notes="平台件合规认证计划-批量添加")
+	@PostMapping(value = "/addBatch")
+	public Result<?> addBatch(@RequestBody List<PlatformTaskPlanningEO> platformTaskPlanningEOList) {
+		platformTaskPlanningEOService.addBatch(platformTaskPlanningEOList);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param platformTaskPlanningEO
+	 * @return
+	 */
+	@AutoLog(value = "平台件合规认证计划-编辑")
+	@ApiOperation(value="平台件合规认证计划-编辑", notes="平台件合规认证计划-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody PlatformTaskPlanningEO platformTaskPlanningEO) {
+		platformTaskPlanningEOService.editById(platformTaskPlanningEO);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "平台件合规认证计划-通过id删除")
+	@ApiOperation(value="平台件合规认证计划-通过id删除", notes="平台件合规认证计划-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		platformTaskPlanningEOService.deleteById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "平台件合规认证计划-批量删除")
+	@ApiOperation(value="平台件合规认证计划-批量删除", notes="平台件合规认证计划-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.platformTaskPlanningEOService.deleteByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "平台件合规认证计划-通过id查询")
+	@ApiOperation(value="平台件合规认证计划-通过id查询", notes="平台件合规认证计划-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		PlatformTaskPlanningEO platformTaskPlanningEO = platformTaskPlanningEOService.queryById(id);
+		if(platformTaskPlanningEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(platformTaskPlanningEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param platformTaskPlanningEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, PlatformTaskPlanningEO platformTaskPlanningEO) {
+        return super.exportXls(request, platformTaskPlanningEO, PlatformTaskPlanningEO.class, "平台件合规认证计划");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, PlatformTaskPlanningEO.class);
+    }
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/entity/PlatformTaskPlanningEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/entity/PlatformTaskPlanningEO.java
new file mode 100644
index 000000000..18733138d
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/entity/PlatformTaskPlanningEO.java
@@ -0,0 +1,78 @@
+package com.jero.modules.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+
+/**
+ * @Description: 平台件合规认证计划
+ * @Author: jero-boot
+ * @Date:   2023-09-14
+ * @Version: V1.0
+ */
+@Data
+@TableName("platform_task_planning")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="platform_task_planning对象", description="平台件合规认证计划")
+public class PlatformTaskPlanningEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+
+	/**节点名称*/
+	@Excel(name = "节点名称", width = 15)
+    @ApiModelProperty(value = "节点名称")
+    private java.lang.String nodeName;
+
+	/**节点时间*/
+	@Excel(name = "节点时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "节点时间")
+    private java.util.Date nodeTime;
+
+	/**项目id*/
+	@Excel(name = "项目id", width = 15)
+    @ApiModelProperty(value = "项目id")
+    private java.lang.String projectId;
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatformTaskPlanningEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatformTaskPlanningEOMapper.java
new file mode 100644
index 000000000..a7ba6a47d
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatformTaskPlanningEOMapper.java
@@ -0,0 +1,14 @@
+package com.jero.modules.platform.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.modules.platform.entity.PlatformTaskPlanningEO;
+
+/**
+ * @Description: 平台件合规认证计划
+ * @Author: jero-boot
+ * @Date:   2023-09-14
+ * @Version: V1.0
+ */
+public interface PlatformTaskPlanningEOMapper extends BaseMapper<PlatformTaskPlanningEO> {
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformTaskPlanningEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformTaskPlanningEOMapper.xml
new file mode 100644
index 000000000..440389db1
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformTaskPlanningEOMapper.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.platform.mapper.PlatformTaskPlanningEOMapper">
+    <resultMap id="PlatformTaskPlanningEOResultMap" type="com.jero.modules.platform.entity.PlatformTaskPlanningEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="node_name" property="nodeName" />
+        <result column="node_time" property="nodeTime" />
+        <result column="project_id" property="projectId" />
+    </resultMap>
+</mapper>
\ No newline at end of file
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformTaskPlanningEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformTaskPlanningEOService.java
new file mode 100644
index 000000000..5a84716e9
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformTaskPlanningEOService.java
@@ -0,0 +1,67 @@
+package com.jero.modules.platform.service;
+
+import com.jero.modules.platform.entity.PlatformTaskPlanningEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 平台件合规认证计划
+ * @Author: jero-boot
+ * @Date:   2023-09-14
+ * @Version: V1.0
+ */
+public interface IPlatformTaskPlanningEOService extends IService<PlatformTaskPlanningEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param platformTaskPlanningEO
+	 * @return
+	 */
+    void add(PlatformTaskPlanningEO platformTaskPlanningEO);
+
+	/**
+	 * 平台件合规认证计划-批量添加
+	 * @param platformTaskPlanningEOList
+	 */
+	void addBatch(List<PlatformTaskPlanningEO> platformTaskPlanningEOList);
+
+	/**
+	 * 更新
+	 *
+	 * @param platformTaskPlanningEO
+	 * @return
+	 */
+    void editById(PlatformTaskPlanningEO platformTaskPlanningEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    PlatformTaskPlanningEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<PlatformTaskPlanningEO> queryList();
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java
new file mode 100644
index 000000000..d663dadb7
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java
@@ -0,0 +1,109 @@
+package com.jero.modules.platform.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.modules.platform.entity.PlatformTaskPlanningEO;
+import com.jero.modules.platform.mapper.PlatformTaskPlanningEOMapper;
+import com.jero.modules.platform.service.IPlatformTaskPlanningEOService;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description: 平台件合规认证计划
+ * @Author: jero-boot
+ * @Date:   2023-09-14
+ * @Version: V1.0
+ */
+@Service
+public class PlatformTaskPlanningEOServiceImpl extends ServiceImpl<PlatformTaskPlanningEOMapper, PlatformTaskPlanningEO> implements IPlatformTaskPlanningEOService {
+
+	/**
+	 * 保存
+	 *
+	 * @param platformTaskPlanningEO
+	 * @return
+	 */
+	@Override
+    public void add(PlatformTaskPlanningEO platformTaskPlanningEO) {
+        Date now = new Date();
+        platformTaskPlanningEO.setCreateTime(now);
+        platformTaskPlanningEO.setUpdateTime(now);
+        save(platformTaskPlanningEO);
+    }
+
+	/**
+	 * 平台件合规认证计划-批量添加
+	 * @param platformTaskPlanningEOList
+	 */
+	@Override
+    public void addBatch(List<PlatformTaskPlanningEO> platformTaskPlanningEOList) {
+		if(!platformTaskPlanningEOList.isEmpty()){
+			for (PlatformTaskPlanningEO platformTaskPlanningEO : platformTaskPlanningEOList) {
+				Date now = new Date();
+				platformTaskPlanningEO.setCreateTime(now);
+				platformTaskPlanningEO.setUpdateTime(now);
+			}
+			saveOrUpdateBatch(platformTaskPlanningEOList);
+		}
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param platformTaskPlanningEO
+	 * @return
+	 */
+	@Override
+    public void editById(PlatformTaskPlanningEO platformTaskPlanningEO) {
+    	Date now = new Date();
+        platformTaskPlanningEO.setUpdateTime(now);
+    	saveOrUpdate(platformTaskPlanningEO);
+    }
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public void deleteById(String id) {
+        removeById(id);
+    }
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+    public void deleteByIds(List<String> ids) {
+        removeByIds(ids);
+    }
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public PlatformTaskPlanningEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<PlatformTaskPlanningEO> queryList() {
+		LambdaQueryWrapper<PlatformTaskPlanningEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.orderByAsc(PlatformTaskPlanningEO::getNodeTime);
+        return list(wrapper);
+    }
+}

From 87660866aa3e0df16b87bfd6ec75612138f1ff9e Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 14 Sep 2023 11:09:14 +0800
Subject: [PATCH 027/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E5=90=88=E8=A7=84=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E8=AE=BE=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/associatedplat.vue               |  2 +-
 .../components/associatedplatthree.vue          |  2 +-
 .../components/associatedplattwo.vue            | 10 +++++-----
 .../components/listOfRegulations.vue            | 17 ++++++++++++++---
 .../components/ProjectDetails.vue               |  6 +++---
 .../components/settingList.vue                  | 16 +++++++++-------
 6 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/associatedplat.vue b/jero-web/src/views/projectManagement/components/associatedplat.vue
index d38b0cfe5..a40587ed4 100644
--- a/jero-web/src/views/projectManagement/components/associatedplat.vue
+++ b/jero-web/src/views/projectManagement/components/associatedplat.vue
@@ -226,7 +226,7 @@
           this.confirmLoading = true
           let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
           this.confirmLoading = false
-          this.$emit('associatedplatForm',selectedRowKeys.join(','))
+          this.$emit('associatedplatForm',selectedRowKeys.join(','),this.flag)
           this.selectedRowKeys = []
           // postAction(this.url.addModel, {
           //   dummyInventoryBaseId: selectedRowKeys.join(','),
diff --git a/jero-web/src/views/projectManagement/components/associatedplatthree.vue b/jero-web/src/views/projectManagement/components/associatedplatthree.vue
index c3376be21..3236488aa 100644
--- a/jero-web/src/views/projectManagement/components/associatedplatthree.vue
+++ b/jero-web/src/views/projectManagement/components/associatedplatthree.vue
@@ -95,7 +95,7 @@
           },
           {
             title: this.$t('design') + '-' + this.$t('typeOfDeliverables'),
-            dataIndex: 'deliverableTypeName',
+            dataIndex: 'designdeliverableTypeName',
             align: 'left',
             ellipsis: true,
             width: 130
diff --git a/jero-web/src/views/projectManagement/components/associatedplattwo.vue b/jero-web/src/views/projectManagement/components/associatedplattwo.vue
index 96defae3f..40af5e357 100644
--- a/jero-web/src/views/projectManagement/components/associatedplattwo.vue
+++ b/jero-web/src/views/projectManagement/components/associatedplattwo.vue
@@ -52,7 +52,7 @@
         :scroll="{x: 1000}"
         :data-source="dataList"
         :pagination="false"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:flag !== '法规'?' ':'' }"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:'' }"
         :loading="loading">
 
       </a-table>
@@ -124,7 +124,7 @@ export default {
         },
         {
           title: this.$t('design') + '-' + this.$t('typeOfDeliverables'),
-          dataIndex: 'deliverableTypeName',
+          dataIndex: 'designdeliverableTypeName',
           align: 'left',
           ellipsis: true,
           width: 120
@@ -194,9 +194,9 @@ export default {
     },
     onSelectChange(value) {
       this.selectedRowKeys = value
-      if (this.selectedRowKeys.length > 1 && this.flag !== '法规') {
-        this.selectedRowKeys.shift()
-      }
+      // if (this.selectedRowKeys.length > 1 && this.flag !== '法规') {
+      //   this.selectedRowKeys.shift()
+      // }
     },
     handleCancel() {
       this.visible = false
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 74249e206..bfc34ed26 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1938,7 +1938,13 @@
       },
       // 关联平台件
       associatedplatformClick(){
-        this.$refs.associatedplatRef.transferModel('法规')
+        let flag = ''
+        if(this.selectedRowKeys && this.selectedRowKeys.length > 0){
+          flag = '法规'
+        }else{
+          flag = '清单'
+        }
+        this.$refs.associatedplatRef.transferModel(flag)
       },
       //批量设置
       batSettingClick() {
@@ -2546,8 +2552,13 @@
       transferListForm(id) {
         this.$refs.transferListvirtalRef.transferModel(id)
       },
-      associatedplatForm(id){
-        this.$refs.associatedplattwoRef.transferModel(id)
+      associatedplatForm(id,flag){
+        console.log(flag)
+        if(flag == '法规'){
+          this.$refs.associatedplatthreeRef.transferModel(id)
+        }else{
+          this.$refs.associatedplattwoRef.transferModel(id)
+        }
       },
       associatedplattwoForm(id){
         this.$refs.associatedplatthreeRef.transferModel(id)
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
index c0726d7fe..933380e46 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
@@ -128,9 +128,9 @@
           add: 'platform/projectLibraryBase/add',
           edit: 'platform/projectLibraryBase/edit',
           queryByProjectId: 'platform/projectTaskPlanning/queryByProjectId',
-          addSettingUrl: 'platform/projectTaskPlanning/add',
-          editSettingUrl: 'platform/projectTaskPlanning/edit',
-          settingQueryForm: '/platform/projectTaskPlanning/list'
+          addSettingUrl: '/platform/platformTaskPlanningEO/addBatch',
+          editSettingUrl: '/platform/platformTaskPlanningEO/addBatch',
+          settingQueryForm: '/platform/platformTaskPlanningEO/list'
         },
         selectedRowKeys: [],
         idList: [],
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
index f1413d6d5..ac730b4e1 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
@@ -21,7 +21,7 @@
                   </div>
                   <a-form-model-item class="itemModel">
                     <a-input class="box-input"
-                             v-model="item.nodename"
+                             v-model="item.nodeName"
                              :placeholder="$t('PleaseEnter')+$t('Nodename')"/>
                   </a-form-model-item>
                 </div>
@@ -37,7 +37,7 @@
                                    @change="dateChange(item,index)"
                                    format="YYYY-MM-DD"
                                    :getCalendarContainer="(trigger) => trigger.parentNode"
-                                   v-model="item.date"
+                                   v-model="item.nodeTime"
                                    :disabled="false"
                                    style="width: 100%"/>
                   </a-form-model-item>
@@ -114,17 +114,22 @@
         })
       },
       handleOk() {
+        if(this.formInline.list){
+          this.formInline.list.forEach(item => {
+            item.projectId = this.$route.query.id
+          })
+        }
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
             let query = {
               ...this.formInline,
-              projectId: this.$route.query.id
+              // projectId: this.$route.query.id
             }
             let url = ''
             let Action
             if (this.formInline.id) {
               url = this.url.editSettingUrl
-              Action = putAction
+              Action = postAction
             } else {
               url = this.url.addSettingUrl
               Action = postAction
@@ -136,9 +141,6 @@
                 this.visible = false
                 this.confirmLoading = false
                 this.$emit('settingListForm')
-                if(res.result.matchVdr == true){
-                  this.vdrClick()
-                }
               } else {
                 this.$message.warning(this.$t('operationFailed'))
                 this.confirmLoading = false

From 12fc004e459ae874aa312f4ec2dcb1f35f673d1c Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 14 Sep 2023 11:48:39 +0800
Subject: [PATCH 028/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E5=90=88?=
 =?UTF-8?q?=E8=A7=84=E8=AE=A4=E8=AF=81=E8=AE=A1=E5=88=92-=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformTaskPlanningEOController.java         | 15 ++++++++++-----
 .../service/IPlatformTaskPlanningEOService.java   |  2 +-
 .../impl/PlatformTaskPlanningEOServiceImpl.java   |  3 ++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformTaskPlanningEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformTaskPlanningEOController.java
index cc130f5c9..eb2e32349 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformTaskPlanningEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformTaskPlanningEOController.java
@@ -1,5 +1,7 @@
 package com.jero.modules.platform.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -29,9 +31,10 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 
- /**
+/**
  * @Description: 平台件合规认证计划
  * @Author: jero-boot
  * @Date:   2023-09-14
@@ -75,8 +78,8 @@ public class PlatformTaskPlanningEOController extends JeroController<PlatformTas
 	@AutoLog(value = "平台件合规认证计划-列表查询")
     @ApiOperation(value="平台件合规认证计划-列表查询", notes="平台件合规认证计划-列表查询")
 	@GetMapping(value = "/list")
-	public Result<List<PlatformTaskPlanningEO>> queryList() {
-        List<PlatformTaskPlanningEO> list = platformTaskPlanningEOService.queryList();
+	public Result<List<PlatformTaskPlanningEO>> queryList(String projectId) {
+        List<PlatformTaskPlanningEO> list = platformTaskPlanningEOService.queryList(projectId);
         return Result.OK(list);
 	}
 
@@ -96,13 +99,15 @@ public class PlatformTaskPlanningEOController extends JeroController<PlatformTas
 	/**
 	 *   添加
 	 *
-	 * @param platformTaskPlanningEOList
+	 * @param data
 	 * @return
 	 */
 	@AutoLog(value = "平台件合规认证计划-批量添加")
 	@ApiOperation(value="平台件合规认证计划-批量添加", notes="平台件合规认证计划-批量添加")
 	@PostMapping(value = "/addBatch")
-	public Result<?> addBatch(@RequestBody List<PlatformTaskPlanningEO> platformTaskPlanningEOList) {
+	public Result<?> addBatch(@RequestBody Map<String,Object> data) {
+		JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(data.get("list")));
+		List<PlatformTaskPlanningEO> platformTaskPlanningEOList = jsonArray.toJavaList(PlatformTaskPlanningEO.class);
 		platformTaskPlanningEOService.addBatch(platformTaskPlanningEOList);
 		return Result.OK("添加成功！");
 	}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformTaskPlanningEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformTaskPlanningEOService.java
index 5a84716e9..4e965dc96 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformTaskPlanningEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformTaskPlanningEOService.java
@@ -63,5 +63,5 @@ public interface IPlatformTaskPlanningEOService extends IService<PlatformTaskPla
 	 *
 	 * @return
 	 */
-    List<PlatformTaskPlanningEO> queryList();
+    List<PlatformTaskPlanningEO> queryList(String projectId);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java
index d663dadb7..652bd2bc4 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java
@@ -101,8 +101,9 @@ public class PlatformTaskPlanningEOServiceImpl extends ServiceImpl<PlatformTaskP
 	 * @return
 	 */
 	@Override
-    public List<PlatformTaskPlanningEO> queryList() {
+    public List<PlatformTaskPlanningEO> queryList(String projectId) {
 		LambdaQueryWrapper<PlatformTaskPlanningEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(PlatformTaskPlanningEO::getProjectId,projectId);
 		wrapper.orderByAsc(PlatformTaskPlanningEO::getNodeTime);
         return list(wrapper);
     }

From 23cda96d75d5d7530aab6b00bdd2fbecf291c927 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 14 Sep 2023 13:55:19 +0800
Subject: [PATCH 029/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E5=90=88?=
 =?UTF-8?q?=E8=A7=84=E8=AE=A4=E8=AF=81=E8=AE=A1=E5=88=92SQL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index 77fd10153..dd1a81394 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -1213,3 +1213,17 @@ UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Validate Compo
 --平台件项目库数据标识
 ALTER TABLE `laws_weilai`.`project_library_base`
 ADD COLUMN `platform` varchar(255) NULL COMMENT '平台件项目库数据（platform=YES）' AFTER `brand`;
+
+--平台件合规认证计划
+CREATE TABLE `laws_weilai`.`platform_task_planning`  (
+  `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建日期',
+  `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新日期',
+  `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+  `node_name` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '节点名称',
+  `node_time` datetime(0) NULL DEFAULT NULL COMMENT '节点时间',
+  `project_id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '项目id',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;

From 14d5ffb537a18041fc5a8a70bdb0249d6c2a3898 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 14 Sep 2023 14:37:35 +0800
Subject: [PATCH 030/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ProjectDetails.vue             |  4 +-
 .../components/addModel.vue                   | 86 ++++++++-----------
 .../components/settingList.vue                |  6 +-
 3 files changed, 44 insertions(+), 52 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
index 933380e46..9c8b4c7c5 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
@@ -26,7 +26,9 @@
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
-        <span class="text-field-right" :title="queryForm.ipdInfo"
+        <span class="text-field-right text-field-right-color"
+              :title="queryForm.ipdInfo"
+              @click="urlClick(queryForm.ipdInfo)"
         >{{queryForm.ipdInfo}}</span>
       </div>
     </div>
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
index 09bdae9d9..d30bae959 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
@@ -18,7 +18,7 @@
                 <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('entryName')">{{$t('entryName')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="entryName">
+              <a-form-model-item class="itemModel" prop="projectNameId">
                 <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('entryName')"
                          v-model="formInline.projectNameId"></a-input>
 <!--                <a-select :placeholder="$t('PleaseSelect')+$t('modelName')"-->
@@ -54,10 +54,10 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="Required">*</span>
+<!--                <span class="Required">*</span>-->
                 <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
               </div>
-              <a-form-model-item class="itemModel-multi" prop="configurationItem">
+              <a-form-model-item class="itemModel-multi" prop="ipdInfo">
                 <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('configurationItem')"
                          v-model="formInline.ipdInfo"></a-input>
               </a-form-model-item>
@@ -71,7 +71,36 @@
               <a-form-model-item class="itemModel" prop="explanation">
                 <a-textarea :placeholder="$t('pleaseEnter')+$t('explain')"
                             v-model="formInline.explanation"
-                            :rows="4"/>
+                            :rows="2"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('dehicleDevelopmentPlan')">{{$t('dehicleDevelopmentPlan')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" :prop="'vehicleDevelopmentPlan'">
+                <a-input class="box-input"
+                         :disabled="disabled"
+                         v-model="formInline.vehicleDevelopmentPlan"
+                         :placeholder="$t('PleaseEnter')+$t('dehicleDevelopmentPlan')"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('certificationProgram')">{{$t('certificationProgram')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="attestationPlan">
+                <a-input class="box-input"
+                         :disabled="disabled"
+                         v-model="formInline.attestationPlan"
+                         :placeholder="$t('PleaseEnter')+$t('certificationProgram')"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -170,37 +199,6 @@
 <!--              </a-form-model-item>-->
 <!--            </div>-->
 <!--          </a-col>-->
-<!--        </a-row>-->
-<!--        <a-row :gutter="24">-->
-<!--          <a-col :span="12">-->
-<!--            <div class="box-title-text">-->
-<!--              <div class="title-text">-->
-<!--                <span class="title-text-text"-->
-<!--                      :title="$t('softwareVersion')">{{$t('softwareVersion')}}</span>-->
-<!--              </div>-->
-<!--              <a-form-model-item class="itemModel" :prop="'softwareVersion'">-->
-<!--                <a-input class="box-input"-->
-<!--                         :disabled="disabled"-->
-<!--                         v-model="formInline.softwareVersion"-->
-<!--                         :placeholder="$t('PleaseEnter')+$t('softwareVersion')"/>-->
-<!--              </a-form-model-item>-->
-<!--            </div>-->
-<!--          </a-col>-->
-<!--          <a-col :span="12">-->
-<!--            <div class="box-title-text">-->
-<!--              <div class="title-text">-->
-<!--                <span class="title-text-text"-->
-<!--                      :title="$t('dehicleDevelopmentPlan')">{{$t('dehicleDevelopmentPlan')}}</span>-->
-<!--              </div>-->
-<!--              <a-form-model-item class="itemModel" :prop="'vehicleDevelopmentPlan'">-->
-<!--                <a-input class="box-input"-->
-<!--                         :disabled="disabled"-->
-<!--                         v-model="formInline.vehicleDevelopmentPlan"-->
-<!--                         :placeholder="$t('PleaseEnter')+$t('dehicleDevelopmentPlan')"/>-->
-<!--              </a-form-model-item>-->
-<!--            </div>-->
-<!--          </a-col>-->
-
 <!--        </a-row>-->
 <!--        <a-row :gutter="24">-->
 <!--          <a-col :span="12">-->
@@ -321,10 +319,10 @@
               trigger: 'blur'
             }
           ],
-          projectVersion:[
+          projectNameId:[
             {
               required: true,
-              message: this.$t('projectVersion') + this.$t('cannotEmpty'),
+              message: this.$t('entryName') + this.$t('cannotEmpty'),
               trigger: 'blur'
             }
           ],
@@ -342,13 +340,6 @@
               trigger: 'blur'
             }
           ],
-          projectNameId: [
-            {
-              required: true,
-              message: this.$t('entryName') + this.$t('cannotEmpty'),
-              trigger: 'change'
-            }
-          ],
           yearNameId: [
             {
               required: true,
@@ -356,10 +347,10 @@
               trigger: 'change'
             }
           ],
-          targetMarket: [
+          brand: [
             {
               required: true,
-              message: this.$t('targetMarket') + this.$t('cannotEmpty'),
+              message: this.$t('brand') + this.$t('cannotEmpty'),
               trigger: 'change'
             }
           ],
@@ -408,8 +399,8 @@
               let content = this.projectNameList.filter(res => {
                 return res.id == value.projectNameId
               })
-              this.yearNameDataList = content[0].yearNameDataList || []
               this.formInline = value
+              console.log(this.formInline)
               this.formInline = { ...this.formInline }
             }
           } else {
@@ -504,7 +495,6 @@
           return res.id == value
         })
         this.formInline.vehiclePlatform = content[0].vehiclePlatform || ''
-        this.yearNameDataList = content[0].yearNameDataList || []
         this.formInline.digitalPlatform = content[0].digitalPlatform || ''
         this.formInline = { ...this.formInline }
       }
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
index ac730b4e1..e0a033aab 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
@@ -104,8 +104,8 @@
         getAction(this.url.settingQueryForm, { projectId: this.$route.query.id }).then((res) => {
           if (res.success) {
             this.$nextTick(() => {
-              this.formInline=res.result? {list:[{}]} :res.result
-              if(!res.result.list || res.result.list.length==0){
+              this.formInline.list = res.result? res.result : [{}]
+              if(!res.result || res.result.length==0){
                 this.formInline.list=[{}]
               }
 
@@ -154,7 +154,7 @@
         this.visible = false
       },
       dateChange(item,index) {
-        this.formInline.list[index].date = this.formInline.list[index].date ? moment(this.formInline.list[index].date).format('YYYY-MM-DD') : ''
+        this.formInline.list[index].danodeTimete = this.formInline.list[index].nodeTime ? moment(this.formInline.list[index].nodeTime).format('YYYY-MM-DD') : ''
       }
     }
   }

From f6070c28359cd6c20e6d426a658d1d1cb6d5e0e0 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 14 Sep 2023 15:10:50 +0800
Subject: [PATCH 031/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=EF=BC=88=E8=A7=92=E8=89=B2=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...formProjectLawsInventoryEOServiceImpl.java | 107 ++----------------
 1 file changed, 8 insertions(+), 99 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index 73e87b67e..d4090ef6b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -103,6 +103,7 @@ import com.jero.modules.project.service.IProjectUserPermissionService;
 import com.jero.modules.project.service.editImpl.ProjectLawsInventoryEOEditServiceImpl;
 import com.jero.modules.project.service.impl.ProblemManagementEOServiceImpl;
 import com.jero.modules.project.service.impl.ProjectLawsInventoryLogEOServiceImpl;
+import com.jero.modules.project.service.impl.ProjectLibraryBaseServiceImpl;
 import com.jero.modules.project.service.impl.ProjectRelatedPersonnelServiceImpl;
 import com.jero.modules.project.util.WordUtil;
 import com.jero.modules.project.vo.NcrTrackVO;
@@ -313,6 +314,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 	@Autowired
 	private PlatformProjectLibraryBaseServiceImpl platformProjectLibraryBaseService;
 	@Autowired
+	private ProjectLibraryBaseServiceImpl projectLibraryBaseService;
+	@Autowired
 	private ProjectRelatedPersonnelServiceImpl projectRelatedPersonnelService;
 
 	@Autowired
@@ -8713,113 +8716,20 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 	public List<SysRole> getRoleByUserId(String projectLibraryId, String cut) {
 		List<SysRole> sysRoles = new LinkedList<>();
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-		//项目详情中取R&H Studio和认证工程师
 		List<ProjectLibraryBase> projectLibraryBases = platformProjectLibraryBaseService.queryById(projectLibraryId, null);
-		String certificationEngineerName = "";
-		if (projectLibraryBases.size() != 0) {
-			certificationEngineerName = projectLibraryBases.get(0).getCertificationEngineerName();
-			String studioEngineerName = projectLibraryBases.get(0).getStudioEngineerName();
-			if (StringUtils.isNotBlank(studioEngineerName) && studioEngineerName.equals(loginUser.getUsername())) {
-				SysRole sysRole = new SysRole();
-				sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue());
-				if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
-					sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.STUDIO_ENGINEER.getName());
-				} else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
-					sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.STUDIO_ENGINEER.getCode());
-				}
-
-				sysRoles.add(sysRole);
-			}
-
-			// 认证
-			if ((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername()))) {
-				SysRole sysRole = new SysRole();
-				sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue());
-				if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
-					sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getName());
-				} else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
-					sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getCode());
-				}
-				sysRoles.add(sysRole);
-			}
-		}
-		//相关人员名单中取法规工程师
-		/*List<ProjectRelatedPersonnel> projectRelatedPersonnels = projectRelatedPersonnelService.queryPageList(projectLibraryId,null,null,null,null,null);
-		List<String> lawEngineerNameList = new ArrayList<>();
-		if(projectRelatedPersonnels.size() != 0){
-			for (ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels) {
-				String lawEngineerName = projectRelatedPersonnel.getLawEngineerName();
-				if(StringUtils.isNotBlank(lawEngineerName)){
-					lawEngineerName = lawEngineerName.replaceAll(" ","");
-					lawEngineerNameList.addAll(Arrays.asList(lawEngineerName.split(",")));
-				}
-			}
-		}
-		if(lawEngineerNameList.contains(loginUser.getUsername())){
+		//1、判断当前登录用户是否为该平台件项目的的法规工程师
+		if(!projectLibraryBases.isEmpty() && loginUser.getUsername().equals(projectLibraryBases.get(0).getCreateBy())){
 			SysRole sysRole = new SysRole();
 			sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue());
-			if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+			if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
 				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getName());
-			}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+			} else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
 				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getCode());
 			}
 			sysRoles.add(sysRole);
-		}*/
-		/*List<String> certificationEngineerList = new ArrayList<>();
-		if(projectRelatedPersonnels.size() != 0){
-			for(ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels){
-				String certificationEngineerName1 = projectRelatedPersonnel.getCertificationEngineerName();
-				if(StringUtils.isNotBlank(certificationEngineerName1)){
-					certificationEngineerName1 = certificationEngineerName1.replaceAll(" ","");
-					certificationEngineerList.addAll(Arrays.asList(certificationEngineerName1.split(",")));
-				}
-			}
 		}
-		if((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername()))
-				|| certificationEngineerList.contains(loginUser.getUsername())){
-			SysRole sysRole = new SysRole();
-			sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue());
-			if(StringUtils.equals(cut,CutEnum.CN.getValue())){
-				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getName());
-			}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
-				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getCode());
-			}
-			sysRoles.add(sysRole);
-		}*/
 
-		/*List<String> engineeringInterfacePersonList = new ArrayList<>();
-		if(projectRelatedPersonnels.size() != 0){
-			for(ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels){
-				String engineeringInterfacePerson = projectRelatedPersonnel.getEngineeringInterfacePersonName();
-				if(StringUtils.isNotBlank(engineeringInterfacePerson)){
-					engineeringInterfacePerson = engineeringInterfacePerson.replaceAll(" ","");
-					engineeringInterfacePersonList.addAll(Arrays.asList(engineeringInterfacePerson.split(",")));
-				}
-			}
-		}
-		if(engineeringInterfacePersonList.contains(loginUser.getUsername())){
-			SysRole sysRole = new SysRole();
-			sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getValue());
-			if(StringUtils.equals(cut,CutEnum.CN.getValue())){
-				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getName());
-			}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
-				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getCode());
-			}
-			sysRoles.add(sysRole);
-		}*/
-
-//		if((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername()))
-//				|| lawEngineerNameList.contains(loginUser.getUsername())){
-//			SysRole sysRole = new SysRole();
-//			sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue());
-//			if(StringUtils.equals(cut,CutEnum.CN.getValue())){
-//				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getName());
-//			}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
-//				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getCode());
-//			}
-//			sysRoles.add(sysRole);
-//
-//		}
+		//遍历法规清单，判断是否为接口人或责任人
 
 		// 法规工程师
 		QueryWrapper<ProjectLawsInventoryEO> querylawEngineerCountWrap = new QueryWrapper<>();
@@ -9797,7 +9707,6 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 	 * @param projectLawsInventoryEO
 	 * @param errorMsg
 	 * @param msgList
-	 * @param regulationOwnerId
 	 * @param sysUserList
 	 * @param nameCn
 	 * @param nameEn

From 189f45749696ecbbf41705ca8ac3d96452446072 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 14 Sep 2023 15:19:58 +0800
Subject: [PATCH 032/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95=EF=BC=88=E8=A7=92=E8=89=B2=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctCertificationInventoryEOServiceImpl.java | 130 ++++++------------
 1 file changed, 43 insertions(+), 87 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
index 3ddd759b8..b3c422c46 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
@@ -1694,93 +1694,51 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 		List<SysRole> sysRoles = new LinkedList<>();
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
-		//项目详情中取R&H Studio和认证工程师
-		List<ProjectLibraryBase> projectLibraryBases = platformProjectLibraryBaseService.queryById(projectLibraryId,null);
-		String certificationEngineerName = "";
-		if(projectLibraryBases.size() != 0){
-			certificationEngineerName = projectLibraryBases.get(0).getCertificationEngineerName();
-			String studioEngineerName = projectLibraryBases.get(0).getStudioEngineerName();
-			// studio
-			if(StringUtils.isNotBlank(studioEngineerName) && studioEngineerName.equals(loginUser.getUsername())){
-				SysRole sysRole = new SysRole();
-				sysRole.setRoleCode(ProjectRoleEnum.STUDIO_ENGINEER.getValue());
-				if(StringUtils.equals(cut,CutEnum.CN.getValue())){
-					sysRole.setRoleName(ProjectRoleEnum.STUDIO_ENGINEER.getName());
-				}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
-					sysRole.setRoleName(ProjectRoleEnum.STUDIO_ENGINEER.getCode());
-				}
+		List<ProjectLibraryBase> projectLibraryBases = platformProjectLibraryBaseService.queryById(projectLibraryId, null);
 
-				sysRoles.add(sysRole);
+
+		//1、判断当前登录用户是否为该平台件项目的的法规工程师
+		if(!projectLibraryBases.isEmpty() && loginUser.getUsername().equals(projectLibraryBases.get(0).getCreateBy())){
+			SysRole sysRole = new SysRole();
+			sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue());
+			if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getName());
+			} else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
+				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getCode());
 			}
+			sysRoles.add(sysRole);
+		}
 
-			// 认证
-			if((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername()))){
-				SysRole sysRole = new SysRole();
-				sysRole.setRoleCode(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue());
-				if(StringUtils.equals(cut,CutEnum.CN.getValue())){
-					sysRole.setRoleName(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getName());
-				}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
-					sysRole.setRoleName(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getCode());
-				}
-				sysRoles.add(sysRole);
+		// 接口人
+		QueryWrapper<ProjectCertificationInventoryEO> querySdtCountWrap = new QueryWrapper<>();
+		querySdtCountWrap.lambda().eq(ProjectCertificationInventoryEO::getSdt, loginUser.getId());
+		querySdtCountWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId, projectLibraryId);
+		Integer sdtCount = this.baseMapper.selectCount(querySdtCountWrap);
+		if (sdtCount > 0) {
+			SysRole sysRole = new SysRole();
+			sysRole.setRoleCode(ProjectRoleEnum.INTERFACE_PERSON.getValue());
+			if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+				sysRole.setRoleName(ProjectRoleEnum.INTERFACE_PERSON.getName());
+			} else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
+				sysRole.setRoleName(ProjectRoleEnum.INTERFACE_PERSON.getCode());
 			}
+			sysRoles.add(sysRole);
+		}
 
-			// 法规
-			//相关人员名单中取法规工程师
-			List<ProjectRelatedPersonnel> projectRelatedPersonnels = this.projectRelatedPersonnelService.queryPageList(projectLibraryId,null,null,null,null,null,null);
-			List<String> lawEngineerNameList = new ArrayList<>();
-			if(projectRelatedPersonnels.size() != 0){
-				for (ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels) {
-					String lawEngineerName = projectRelatedPersonnel.getLawEngineerName();
-					if(StringUtils.isNotBlank(lawEngineerName)){
-						lawEngineerName = lawEngineerName.replaceAll(" ","");
-						lawEngineerNameList.addAll(Arrays.asList(lawEngineerName.split(",")));
-					}
-				}
-
-				if(lawEngineerNameList.contains(loginUser.getUsername())){
-					SysRole sysRole = new SysRole();
-					sysRole.setRoleCode(ProjectRoleEnum.REGULATI_ENGINEER.getValue());
-					if(StringUtils.equals(cut,CutEnum.CN.getValue())){
-						sysRole.setRoleName(ProjectRoleEnum.REGULATI_ENGINEER.getName());
-					}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
-						sysRole.setRoleName(ProjectRoleEnum.REGULATI_ENGINEER.getCode());
-					}
-					sysRoles.add(sysRole);
-				}
-			}
-
-			// 接口人
-			QueryWrapper<ProjectCertificationInventoryEO> querySdtCountWrap = new QueryWrapper<>();
-			querySdtCountWrap.lambda().eq(ProjectCertificationInventoryEO::getSdt,loginUser.getId());
-			querySdtCountWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId);
-			Integer sdtCount = this.baseMapper.selectCount(querySdtCountWrap);
-			if(sdtCount > 0){
-				SysRole sysRole = new SysRole();
-				sysRole.setRoleCode(ProjectRoleEnum.INTERFACE_PERSON.getValue());
-				if(StringUtils.equals(cut,CutEnum.CN.getValue())){
-					sysRole.setRoleName(ProjectRoleEnum.INTERFACE_PERSON.getName());
-				}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
-					sysRole.setRoleName(ProjectRoleEnum.INTERFACE_PERSON.getCode());
-				}
-				sysRoles.add(sysRole);
-			}
-
-			// 责任人
-			QueryWrapper<ProjectCertificationInventoryEO> queryDutyPersonCountWrap = new QueryWrapper<>();
-			queryDutyPersonCountWrap.lambda().eq(ProjectCertificationInventoryEO::getDutyPerson,loginUser.getId());
-			queryDutyPersonCountWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId);
-			Integer dutyPersonCount = this.baseMapper.selectCount(queryDutyPersonCountWrap);
-			if(dutyPersonCount > 0){
-				SysRole sysRole = new SysRole();
-				sysRole.setRoleCode(ProjectRoleEnum.PERSON_LIABLE.getValue());
-				if(StringUtils.equals(cut,CutEnum.CN.getValue())){
-					sysRole.setRoleName(ProjectRoleEnum.PERSON_LIABLE.getName());
-				}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
-					sysRole.setRoleName(ProjectRoleEnum.PERSON_LIABLE.getCode());
-				}
-				sysRoles.add(sysRole);
+		// 责任人
+		QueryWrapper<ProjectCertificationInventoryEO> queryDutyPersonCountWrap = new QueryWrapper<>();
+		queryDutyPersonCountWrap.lambda().eq(ProjectCertificationInventoryEO::getDutyPerson, loginUser.getId());
+		queryDutyPersonCountWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId, projectLibraryId);
+		Integer dutyPersonCount = this.baseMapper.selectCount(queryDutyPersonCountWrap);
+		if (dutyPersonCount > 0) {
+			SysRole sysRole = new SysRole();
+			sysRole.setRoleCode(ProjectRoleEnum.PERSON_LIABLE.getValue());
+			if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+				sysRole.setRoleName(ProjectRoleEnum.PERSON_LIABLE.getName());
+			} else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
+				sysRole.setRoleName(ProjectRoleEnum.PERSON_LIABLE.getCode());
 			}
+			sysRoles.add(sysRole);
 		}
 
 		// 领导、系统管理员、Viewer、品牌管理员 处理
@@ -1790,7 +1748,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 			List<SysRole> admin = roleList.stream().filter(e -> ProjectRoleEnum.ADMIN.getCode().equals(e.getRoleCode())).collect(Collectors.toList());
 			List<SysRole> Viewer = roleList.stream().filter(e -> ProjectRoleEnum.VIEWER.getCode().equals(e.getRoleCode())).collect(Collectors.toList());
 			List<SysRole> brandAdministrator = roleList.stream().filter(e -> ProjectRoleEnum.BRAND_ADMINISTRATOR.getCode().equals(e.getRoleCode())).collect(Collectors.toList());
-			if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+			if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
 				if (manager.size() != 0) {
 					manager.get(0).setRoleCode(ProjectRoleEnum.MANAGER.getValue());
 					sysRoles.addAll(manager);
@@ -1807,7 +1765,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 					brandAdministrator.get(0).setRoleCode(ProjectRoleEnum.BRAND_ADMINISTRATOR.getValue());
 					sysRoles.addAll(brandAdministrator);
 				}
-			}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+			} else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
 				if (manager.size() != 0) {
 					manager.get(0).setRoleCode(ProjectRoleEnum.MANAGER.getValue());
 					manager.get(0).setRoleName(ProjectRoleEnum.MANAGER.getCode());
@@ -1828,14 +1786,12 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 					brandAdministrator.get(0).setRoleName(ProjectRoleEnum.BRAND_ADMINISTRATOR.getCode());
 					sysRoles.addAll(brandAdministrator);
 				}
-
 			}
-
 		}
 
-		if(sysRoles==null||sysRoles.size()<=0) {
+		if (sysRoles == null || sysRoles.size() <= 0) {
 			result.error500("未找到角色信息");
-		}else {
+		} else {
 			result.setResult(sysRoles);
 			result.setSuccess(true);
 		}

From bf86579ccc5ff4e0585cb146365d4c414e7ab628 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 14 Sep 2023 15:30:22 +0800
Subject: [PATCH 033/288] =?UTF-8?q?=E5=8E=9F=E9=A1=B9=E7=9B=AE=E5=BA=93=20?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=95=B0=E7=BB=84=E5=BE=AA=E7=8E=AF=E8=A1=A8=E6=A0=BC=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/associatedplatthree.vue        | 53 +++++++++++++++++--
 1 file changed, 50 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/associatedplatthree.vue b/jero-web/src/views/projectManagement/components/associatedplatthree.vue
index 3236488aa..52c045f6b 100644
--- a/jero-web/src/views/projectManagement/components/associatedplatthree.vue
+++ b/jero-web/src/views/projectManagement/components/associatedplatthree.vue
@@ -8,14 +8,14 @@
     @close="handleCancel"
     :visible="visible"
     style="height: 100%;overflow: auto;padding-bottom: 53px;">
-    <div style="margin-bottom: 60px">
+    <div style="margin-bottom: 60px" v-for='(item,index) in data'>
       <div>{{'GB 111'}}{{$t('associatedItem')}}</div>
       <a-table
         :components="drag(columns,'columns')"
         :columns="columns"
         rowKey="id"
         :scroll="{x: 1000}"
-        :data-source="dataList"
+        :data-source="item.list"
         :pagination="false"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:'' }"
         :loading="loading">
@@ -108,7 +108,52 @@
             width: 130
           },
         ],
-        dataList: [],
+        data: [
+          {
+            id:'1',
+            list:[
+              {
+                createBy: "linda.zhao",
+                createByCn: null,
+                createTime: "2023-04-17 19:10:14",
+                cut: null,
+                id: "1647920396307046401",
+                name: "EU/UK Regulation List V23.04",
+                orderBy: null,
+                orderByField: null,
+                readFlag: null,
+                state: "1",
+                state_dictText: "已发布",
+                sysOrgCode: "SUPERVISORY_ORGANIZATION-3-522",
+                updateBy: "admin",
+                updateTime: "2023-05-10 15:24:33",
+                upgradeExplanation: "asd",
+              }
+            ]
+          },
+          {
+            id:'1',
+            list:[
+              {
+                createBy: "linda.zhao",
+                createByCn: null,
+                createTime: "2023-04-17 19:10:14",
+                cut: null,
+                id: "1647920396307046401",
+                name: "EU/UK Regulation List V23.04",
+                orderBy: null,
+                orderByField: null,
+                readFlag: null,
+                state: "1",
+                state_dictText: "已发布",
+                sysOrgCode: "SUPERVISORY_ORGANIZATION-3-522",
+                updateBy: "admin",
+                updateTime: "2023-05-10 15:24:33",
+                upgradeExplanation: "asd",
+              }
+            ]
+          },
+        ],
         content: [],
         loading: false,
         pageNo: 1,
@@ -172,6 +217,8 @@
         this.visible = false
       },
       handleSubmit(flag) {
+        console.log(this.selectedRowKeys)
+        return
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
           this.confirmLoading = true
           let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))

From 1f6bab60ea33560b0197b27c7b27a3c429d5b0bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Thu, 14 Sep 2023 15:45:28 +0800
Subject: [PATCH 034/288] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E9=97=AE=E9=A2=98=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/projectManagement/components/projectStatus.vue  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/projectStatus.vue b/jero-web/src/views/projectManagement/components/projectStatus.vue
index c71874cfe..aa9e2a4af 100644
--- a/jero-web/src/views/projectManagement/components/projectStatus.vue
+++ b/jero-web/src/views/projectManagement/components/projectStatus.vue
@@ -25,8 +25,8 @@
         <parameterCollectionProgress @currentStatus="currentStatus" :idList="[]"
                                    v-if="activeKey == $t('parameterCollectionProgressManagement')"/>
       </a-tab-pane>
-      <a-tab-pane :key="$t('nonConformance')" :tab="$t('nonConformance')">
-        <nonConformance @currentStatus="currentStatus" v-if="activeKey == $t('nonConformance')"/>
+      <a-tab-pane :key="$t('Problemanagement')" :tab="$t('Problemanagement')">
+        <nonConformance @currentStatus="currentStatus" v-if="activeKey == $t('Problemanagement')"/>
       </a-tab-pane>
       <a-tab-pane :key="$t('otastatus')" :tab="$t('otastatus')">
         <otastatus @currentStatus="currentStatus" :idList="idList" v-if="activeKey == $t('otastatus')"/>

From 505600f0da539d4aee2a4806a6e1eb13a617c27c Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 14 Sep 2023 16:00:11 +0800
Subject: [PATCH 035/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E5=90=88?=
 =?UTF-8?q?=E8=A7=84=E8=AE=A4=E8=AF=81=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/PlatformTaskPlanningEO.java        | 18 +++++++++++++
 .../PlatformTaskPlanningEOServiceImpl.java    | 25 ++++++++++++++++++-
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/entity/PlatformTaskPlanningEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/entity/PlatformTaskPlanningEO.java
index 18733138d..e49019c50 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/entity/PlatformTaskPlanningEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/entity/PlatformTaskPlanningEO.java
@@ -1,6 +1,7 @@
 package com.jero.modules.platform.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -75,4 +76,21 @@ public class PlatformTaskPlanningEO implements Serializable {
     @ApiModelProperty(value = "项目id")
     private java.lang.String projectId;
 
+    @ApiModelProperty(value = "字段名与项目库保持一致")
+    @TableField(exist = false)
+    private java.lang.String name;
+
+    /**节点时间*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "字段名与项目库保持一致")
+    @TableField(exist = false)
+    private java.util.Date time;
+
+    @TableField(exist = false)
+    private String status;
+
+    @TableField(exist = false)
+    private boolean isG;
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java
index 652bd2bc4..ca1985b85 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java
@@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.modules.platform.entity.PlatformTaskPlanningEO;
 import com.jero.modules.platform.mapper.PlatformTaskPlanningEOMapper;
 import com.jero.modules.platform.service.IPlatformTaskPlanningEOService;
+import com.jero.modules.project.enums.PlanStatusEnum;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
@@ -102,9 +105,29 @@ public class PlatformTaskPlanningEOServiceImpl extends ServiceImpl<PlatformTaskP
 	 */
 	@Override
     public List<PlatformTaskPlanningEO> queryList(String projectId) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd");
+		Date date = null;
+		try {
+			date = sdf.parse(sdf.format(new Date()));
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
 		LambdaQueryWrapper<PlatformTaskPlanningEO> wrapper = new LambdaQueryWrapper<>();
 		wrapper.eq(PlatformTaskPlanningEO::getProjectId,projectId);
 		wrapper.orderByAsc(PlatformTaskPlanningEO::getNodeTime);
-        return list(wrapper);
+		List<PlatformTaskPlanningEO> taskPlanningEOList = list(wrapper);
+		for (PlatformTaskPlanningEO platformTaskPlanningEO : taskPlanningEOList) {
+			platformTaskPlanningEO.setName(platformTaskPlanningEO.getNodeName());
+			platformTaskPlanningEO.setTime(platformTaskPlanningEO.getNodeTime());
+			platformTaskPlanningEO.setG(false);
+			if(platformTaskPlanningEO.getNodeTime().after(date)){
+				platformTaskPlanningEO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
+			}else if(platformTaskPlanningEO.getNodeTime().before(date)){
+				platformTaskPlanningEO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
+			}else{
+				platformTaskPlanningEO.setStatus(PlanStatusEnum.ON_GOING.getValue());
+			}
+		}
+		return taskPlanningEOList;
     }
 }

From 9aa56a38904bf070b83f1dbbb5e2a5dbb1176058 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 14 Sep 2023 16:04:56 +0800
Subject: [PATCH 036/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E5=90=88=E8=A7=84=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js                               | 1 +
 jero-web/src/common/lang/zh-cn.js                               | 1 +
 .../components/complianceCertificationForm.vue                  | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 80d898f80..8018e836a 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1974,4 +1974,5 @@ module.exports = {
   Nodedate:'Node Time',
   Associatedplatform:'Associated platform',
   associatedItem:'There are multiple matching items in the platform item. Please select the associated item',
+  unpublishedregulationsselected:'Only unpublished regulations can be selected',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index babf28ee6..31addc756 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -3930,4 +3930,5 @@ module.exports = {
   Nodedate:'节点时间',
   Associatedplatform:'关联平台件',
   associatedItem:'在平台件项目中包含多条匹配内容，请选择关联项',
+  unpublishedregulationsselected:'仅能选择未发布的法规',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/complianceCertificationForm.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/complianceCertificationForm.vue
index acb5fb4b2..559a12334 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/complianceCertificationForm.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/complianceCertificationForm.vue
@@ -60,7 +60,7 @@
         regulatoryCertificationTaskPlanList: [],
         timeData: [],
         url: {
-          queryByProjectId: 'project/projectTaskPlanning/queryByProjectId'
+          queryByProjectId: 'platform/platformTaskPlanningEO/list'
         }
       }
     },

From 1b828b18039cfe33142e5ebc164cbd71d4d5b79d Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 14 Sep 2023 16:46:49 +0800
Subject: [PATCH 037/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E4=BF=AE=E6=94=B9=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E8=AE=BE=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/settingList.vue                       | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
index e0a033aab..05ba0869e 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
@@ -103,13 +103,9 @@
       settingQueryForm() {
         getAction(this.url.settingQueryForm, { projectId: this.$route.query.id }).then((res) => {
           if (res.success) {
-            this.$nextTick(() => {
-              this.formInline.list = res.result? res.result : [{}]
-              if(!res.result || res.result.length==0){
-                this.formInline.list=[{}]
-              }
+              this.formInline.list = res.result ? res.result : [{}]
+            console.log(this.formInline.list)
 
-            })
           }
         })
       },
@@ -150,7 +146,9 @@
         })
       },
       handleCancel() {
-        this.formInline = {}
+        this.formInline = {
+          list:[{}]
+        }
         this.visible = false
       },
       dateChange(item,index) {

From 964f79b5c827647188dfb2d5e5ed83011954b5af Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 14 Sep 2023 17:17:05 +0800
Subject: [PATCH 038/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E5=88=97=E8=A1=A8=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=EF=BC=88=E6=B3=95=E8=A7=84=E5=B7=A5=E7=A8=8B=E5=B8=88=E6=8B=A5?=
 =?UTF-8?q?=E6=9C=89=E5=92=8Cstudio=EF=BC=8C=E8=AE=A4=E8=AF=81=E5=B7=A5?=
 =?UTF-8?q?=E7=A8=8B=E5=B8=88=E4=B8=80=E6=A0=B7=E7=9A=84=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PlatformProjectLawsInventoryEOServiceImpl.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index d4090ef6b..a4eb66f62 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -11674,7 +11674,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 		if(isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())
 				&& isProjectRole != Integer.parseInt(ProjectRoleEnum.MANAGER.getValue())
 				&& isProjectRole != Integer.parseInt(ProjectRoleEnum.ADMIN.getValue())
-				&& isProjectRole != Integer.parseInt(ProjectRoleEnum.VIEWER.getValue())){
+				&& isProjectRole != Integer.parseInt(ProjectRoleEnum.VIEWER.getValue())
+				&& isProjectRole != Integer.parseInt(ProjectRoleEnum.REGULATI_ENGINEER.getValue())){
 			// 创建查询权限
 			this.createQueryPermission(isProjectRole,currentUser,queryWrapper);
 		}

From d38458fe38909cf09801228543e80a9da7479173 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Thu, 14 Sep 2023 18:02:59 +0800
Subject: [PATCH 039/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9VDR=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ota/entity/OtaManageApplyEO.java  |  10 +
 .../ota/entity/OtaManageReceiveNsdp.java      |  11 +
 .../jero/modules/ota/job/OtaDataUpdate.java   |  33 +-
 .../service/IOtaManageReceiveNsdpService.java |   2 +
 .../impl/OtaManageApplyEOServiceImpl.java     | 361 +++++++++++++-----
 .../impl/OtaManageReceiveNsdpServiceImpl.java |   9 +
 .../impl/ProjectStatusBoardServiceImpl.java   |   2 +-
 jero-web/src/common/lang/en-us.js             |   1 +
 jero-web/src/common/lang/zh-cn.js             |   1 +
 .../otamanagement/otaAuthentication/index.vue |  46 ++-
 10 files changed, 362 insertions(+), 114 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java
index 5408c129a..72191756b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java
@@ -211,6 +211,16 @@ public class OtaManageApplyEO implements Serializable {
     @ApiModelProperty(value = "导出文件名")
     private String exportName;
 
+    @TableField(exist = false)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "软件版本创建时间")
+    private Date createdAt;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "发布类型")
+    private String releaseType;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "中英文切换")
     private String cut;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceiveNsdp.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceiveNsdp.java
index c4d1c3a8a..d4b581f72 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceiveNsdp.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceiveNsdp.java
@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -71,6 +72,12 @@ public class OtaManageReceiveNsdp implements Serializable {
     @ApiModelProperty(value = "发布版本")
     private String releaseName;
 
+
+    /**发布版本*/
+    @Excel(name = "适用车型", width = 15)
+    @ApiModelProperty(value = "适用车型")
+    private String vehicle;
+
 	/**发布类型*/
 	@Excel(name = "发布类型", width = 15)
     @ApiModelProperty(value = "发布类型")
@@ -93,4 +100,8 @@ public class OtaManageReceiveNsdp implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private java.util.Date createdAt;
 
+
+    @TableField(exist = false)
+    private String market;
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/job/OtaDataUpdate.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/job/OtaDataUpdate.java
index a8120b94c..5d25c3f37 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/job/OtaDataUpdate.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/job/OtaDataUpdate.java
@@ -15,6 +15,8 @@ import org.springframework.stereotype.Service;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 @Service
 public class OtaDataUpdate implements Job {
@@ -34,6 +36,11 @@ public class OtaDataUpdate implements Job {
      */
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+        //截取版本号中前面数字部分
+        String regex = "BL\\d+\\.+\\d+\\.(\\d+)";
+        Pattern pattern = Pattern.compile(regex);
+
+
         List<OtaManageReceive> omrSyncList = otaManageReceiveService.getReceiveSync();
         List<OtaManageReceive> omrList = otaManageReceiveService.queryList();
 
@@ -66,6 +73,13 @@ public class OtaDataUpdate implements Job {
             }
             if (addFlag) {
                 //同步数据中新增
+                String plannedBpLaunchBatch = omrSync.getPlannedBpLaunchBatch();
+                if (StringUtils.isNotEmpty(plannedBpLaunchBatch)) {
+                    Matcher matcher = pattern.matcher(plannedBpLaunchBatch);
+                    if (matcher.find()) {
+                        omrSync.setPlannedBpLaunchBatch(matcher.group());
+                    }
+                }
                 addList.add(omrSync);
             }
         }
@@ -115,6 +129,13 @@ public class OtaDataUpdate implements Job {
             }
             if (addFlag) {
                 //同步数据中新增
+                String releaseName = omrnSync.getReleaseName();
+                if (StringUtils.isNotEmpty(releaseName)) {
+                    Matcher matcher = pattern.matcher(releaseName);
+                    if (matcher.find()) {
+                        omrnSync.setReleaseName(matcher.group());
+                    }
+                }
                 addNsdpList.add(omrnSync);
             }
             //找到最快来临的发布时间
@@ -147,7 +168,7 @@ public class OtaDataUpdate implements Job {
         List<OtaManageReceive> dateUpdateList = new ArrayList<>();
         List<OtaManageReceive> omrListForDate = otaManageReceiveService.queryList();
         for (OtaManageReceive omr : omrListForDate) {
-            if(releaceDateMap.containsKey(omr.getPlannedBpLaunchBatch())){
+            if (releaceDateMap.containsKey(omr.getPlannedBpLaunchBatch())) {
                 omr.setReleaseDate(sdf.format(releaceDateMap.get(omr.getPlannedBpLaunchBatch())));
                 dateUpdateList.add(omr);
             }
@@ -155,15 +176,13 @@ public class OtaDataUpdate implements Job {
         if (CollectionUtils.isNotEmpty(dateUpdateList)) {
             otaManageReceiveService.updateBatchById(dateUpdateList);
         }
+        System.out.println("===============================OtaDataUpdate定时任务结束===============================");
     }
 
     private boolean compareReceive(OtaManageReceiveNsdp omrn, OtaManageReceiveNsdp omrnSync) {
         if (!StringUtils.equals(omrn.getPlatformName(), omrnSync.getPlatformName())) {
             return false;
         }
-        if (!StringUtils.equals(omrn.getReleaseName(), omrnSync.getReleaseName())) {
-            return false;
-        }
         if (!StringUtils.equals(omrn.getReleaseType(), omrnSync.getReleaseType())) {
             return false;
         }
@@ -173,13 +192,13 @@ public class OtaDataUpdate implements Job {
         if (!StringUtils.equals(omrn.getReleaseDate(), omrnSync.getReleaseDate())) {
             return false;
         }
+        if (!StringUtils.equals(omrn.getVehicle(), omrnSync.getVehicle())) {
+            return false;
+        }
         return true;
     }
 
     private boolean compareReceive(OtaManageReceive omr, OtaManageReceive omrSync) {
-        if (!StringUtils.equals(omr.getPlannedBpLaunchBatch(), omrSync.getPlannedBpLaunchBatch())) {
-            return false;
-        }
         if (!StringUtils.equals(omr.getSummary(), omrSync.getSummary())) {
             return false;
         }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageReceiveNsdpService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageReceiveNsdpService.java
index 1e4ffbc38..938e33eb9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageReceiveNsdpService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageReceiveNsdpService.java
@@ -61,4 +61,6 @@ public interface IOtaManageReceiveNsdpService extends IService<OtaManageReceiveN
 
 
 	List<OtaManageReceiveNsdp> getOtaManageReceiveNsdpSync();
+
+	List<OtaManageReceiveNsdp> getListByReleaseName(String releaseName);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
index 3d5ba5b49..6dae49913 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
@@ -11,18 +11,12 @@ import com.jero.common.util.oConvertUtils;
 import com.jero.modules.dummy.enums.OrderEnum;
 import com.jero.modules.feishu.enums.TemplateInfoEnum2;
 import com.jero.modules.feishu.service.IFeishuService;
-import com.jero.modules.ota.entity.OtaManageApplyEO;
-import com.jero.modules.ota.entity.OtaManageHistory;
-import com.jero.modules.ota.entity.OtaManagePermission;
-import com.jero.modules.ota.entity.OtaManageReceive;
+import com.jero.modules.ota.entity.*;
 import com.jero.modules.ota.enums.OtaCarEnum;
 import com.jero.modules.ota.enums.OtaHomoImpactEnum;
 import com.jero.modules.ota.enums.OtaStatusEnum;
 import com.jero.modules.ota.mapper.OtaManageApplyEOMapper;
-import com.jero.modules.ota.service.IOtaManageApplyEOService;
-import com.jero.modules.ota.service.IOtaManageHistoryService;
-import com.jero.modules.ota.service.IOtaManagePermissionService;
-import com.jero.modules.ota.service.IOtaManageReceiveService;
+import com.jero.modules.ota.service.*;
 import com.jero.modules.ota.vo.AllCarExportCnVO;
 import com.jero.modules.ota.vo.AllCarExportEnVO;
 import com.jero.modules.ota.vo.OneCarExportCnVO;
@@ -63,6 +57,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import java.text.Collator;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -108,6 +103,8 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
     @Autowired
     private IOtaManagePermissionService otaManagePermissionService;
 
+    @Autowired
+    private IOtaManageReceiveNsdpService otaManageReceiveNsdpService;
     @Autowired
     private ISysDictService sysDictService;
     @Autowired
@@ -198,6 +195,85 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
         return list();
     }
 
+
+    public List<OtaManageApplyEO> getNsdpList(OtaManageApplyEO otaManageApplyEO) {
+        Date today = new Date();
+        List<OtaManageApplyEO> resList = new ArrayList<>();
+        List<OtaManageReceiveNsdp> dataList = otaManageReceiveNsdpService.queryList();
+        Map<String, List<OtaManageReceiveNsdp>> dataMap = dataList.stream().collect(Collectors.groupingBy(OtaManageReceiveNsdp::getReleaseName));
+
+        for (String rn : dataMap.keySet()) {
+            if(StringUtils.isNotEmpty(otaManageApplyEO.getPlannedBpLaunchBatch())&&!otaManageApplyEO.getPlannedBpLaunchBatch().equals(rn)){
+                continue;
+            }
+            List<OtaManageReceiveNsdp> valList = dataMap.get(rn);
+            if (CollectionUtils.isNotEmpty(valList)) {
+                Date releaseDate = null;
+                //市场
+                Set<String> marketSet = new HashSet<>();
+                //车型
+                Set<String> vehicleSet = new HashSet<>();
+                for (OtaManageReceiveNsdp omrn : valList) {
+                    //找到最快来临的发布时间
+                    try {
+                        Date syncDate = sdf.parse(omrn.getReleaseDate());
+                        if (null == releaseDate) {
+                            releaseDate = syncDate;
+                        } else {
+                            if (syncDate.after(today) && syncDate.before(releaseDate)) {
+                                releaseDate = syncDate;
+                            }
+                        }
+                    } catch (ParseException e) {
+                        e.printStackTrace();
+                    }
+                    String appliedVehicleProject = omrn.getVehicle();
+                    if(StringUtils.isNotEmpty(appliedVehicleProject)){
+                        for (String s : appliedVehicleProject.split(",")) {
+                            String[] split = s.split(" ");
+                            if (split.length == 3) {
+                                vehicleSet.add(split[0]+" "+split[2]);
+                                marketSet.add(split[2]);
+                            }
+                        }
+                    }
+                }
+                if(ObjectUtils.isNotEmpty(otaManageApplyEO.getSoftwareIssueTimeStart()) && ObjectUtils.isNotEmpty(otaManageApplyEO.getSoftwareIssueTimeEnd())){
+                    if(ObjectUtils.isEmpty(releaseDate) || otaManageApplyEO.getSoftwareIssueTimeStart().after(releaseDate) || otaManageApplyEO.getSoftwareIssueTimeEnd().before(releaseDate)){
+                        continue;
+                    }
+                }
+                if (StringUtils.isNotEmpty(otaManageApplyEO.getAppliedVehicleProject()) && !vehicleSet.contains(otaManageApplyEO.getAppliedVehicleProject())) {
+                    continue;
+                }
+                if (StringUtils.isNotEmpty(otaManageApplyEO.getMarket()) && !marketSet.contains(otaManageApplyEO.getMarket())) {
+                    continue;
+                }
+                OtaManageReceiveNsdp omrn = valList.get(0);
+                if (StringUtils.isNotEmpty(otaManageApplyEO.getReleaseType()) && !otaManageApplyEO.getReleaseType().equals(omrn.getReleaseType())) {
+                    continue;
+                }
+                OtaManageApplyEO oma = new OtaManageApplyEO();
+                oma.setId(omrn.getId());
+                oma.setPlannedBpLaunchBatch(omrn.getReleaseName());
+                if (!marketSet.isEmpty()) {
+                    oma.setMarket(StringUtils.join(marketSet, ","));
+                }
+                if (!vehicleSet.isEmpty()) {
+                    oma.setAppliedVehicleProject(StringUtils.join(vehicleSet, ","));
+                }
+                if (ObjectUtils.isNotEmpty(releaseDate)) {
+                    oma.setReleaseDate(sdf.format(releaseDate));
+                }
+                oma.setCreatedAt(omrn.getCreatedAt());
+                oma.setReleaseType(omrn.getReleaseType());
+                resList.add(oma);
+            }
+        }
+        return resList;
+    }
+
+
     /**
      * OTA管理列表和全车型列表-分页列表查询
      *
@@ -208,7 +284,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
     public List<OtaManageApplyEO> getOtaPage(OtaManageApplyEO otaManageApplyEO) {
         LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         boolean otaManager = isOtaManager();
-        List<OtaManageApplyEO> otaManageApplyEOList = this.getBaseMapper().getOtaList(otaManageApplyEO);
+        List<OtaManageApplyEO> otaManageApplyEOList = this.getNsdpList(otaManageApplyEO);
         List<OtaManageApplyEO> dataList = new ArrayList<>();
 
         //去跟manager和studio权限
@@ -223,80 +299,80 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
             }
         }
 
-        List<OtaManageApplyEO> result = new ArrayList<>();
+//        List<OtaManageApplyEO> result = new ArrayList<>();
+//        if (!dataList.isEmpty()) {
+//            List<String> otaNameList = OtaCarEnum.getOtaNameList();
+//            List<String> plannedBpLaunchBatchList = dataList.stream()
+//                    .filter(e -> StringUtils.isNotBlank(e.getPlannedBpLaunchBatch()))
+//                    .map(OtaManageApplyEO::getPlannedBpLaunchBatch).distinct().collect(Collectors.toList());
+//            if (!plannedBpLaunchBatchList.isEmpty()) {
+//                for (String plannedBpLaunchBatch : plannedBpLaunchBatchList) {
+//                    OtaManageApplyEO manageApplyEO = new OtaManageApplyEO();
+//                    manageApplyEO.setPlannedBpLaunchBatch(plannedBpLaunchBatch);
+//                    manageApplyEO.setId(plannedBpLaunchBatch);
+//
+//                    List<OtaManageApplyEO> otaManageApplyEOS = dataList.stream()
+//                            .filter(e -> plannedBpLaunchBatch.equals(e.getPlannedBpLaunchBatch())).collect(Collectors.toList());
+//                    if (!otaManageApplyEOS.isEmpty()) {
+//                        //发布时间
+//                        manageApplyEO.setReleaseDate(otaManageApplyEOS.get(0).getReleaseDate());
+//
+//                        List<String> appliedVehicleProjectList = otaManageApplyEOS.stream()
+//                                .filter(e -> StringUtils.isNotBlank(e.getAppliedVehicleProject()))
+//                                .map(OtaManageApplyEO::getAppliedVehicleProject).collect(Collectors.toList());
+//                        List<String> carList = new ArrayList<>();
+//                        for (String appliedVehicleProject : appliedVehicleProjectList) {
+//                            carList.addAll(Arrays.asList(appliedVehicleProject.split(",")));
+//                        }
+//                        if (!carList.isEmpty()) {
+//                            //适用车型
+//                            carList = carList.stream().distinct().collect(Collectors.toList());
+//                            manageApplyEO.setAppliedVehicleProject(StringUtils.join(carList, ","));
+//                            //市场
+//                            Set<String> marketSet = new HashSet<>();
+//                            for (String appliedVehicleProject : carList) {
+//                                if(otaNameList.contains(appliedVehicleProject)){
+//                                    marketSet.add(appliedVehicleProject);
+//                                }else{
+//                                    for (String s : appliedVehicleProject.split(",")) {
+//                                        String[] split = s.split(" ");
+//                                        if (split.length == 2) {
+//                                            if (!otaNameList.contains(s)) {
+//                                                marketSet.add(split[1]);
+//                                            }
+//                                        } else if (split.length == 3) {
+//                                            if (!otaNameList.contains(s)) {
+//                                                marketSet.add(split[2]);
+//                                            }
+//                                        }
+//                                    }
+//                                }
+//                            }
+//                            if (!marketSet.isEmpty()) {
+//                                manageApplyEO.setMarket(StringUtils.join(marketSet, ","));
+//                            }
+//                        }
+//                    }
+//                    result.add(manageApplyEO);
+//                }
+//            }
+//        }
+//        if (ObjectUtils.isNotEmpty(otaManageApplyEO.getSoftwareIssueTimeStart())) {
+//            result = result.stream()
+//                    .filter(e -> StringUtils.isNotBlank(e.getReleaseDate())
+//                            && (e.getReleaseNameDate().after(otaManageApplyEO.getSoftwareIssueTimeStart())
+//                            || e.getReleaseNameDate().equals(otaManageApplyEO.getSoftwareIssueTimeStart()))).collect(Collectors.toList());
+//        }
+//        if (ObjectUtils.isNotEmpty(otaManageApplyEO.getSoftwareIssueTimeEnd())) {
+//            result = result.stream().filter(e -> StringUtils.isNotBlank(e.getReleaseDate())
+//                    && (e.getReleaseNameDate().before(otaManageApplyEO.getSoftwareIssueTimeEnd())
+//                    || e.getReleaseNameDate().equals(otaManageApplyEO.getSoftwareIssueTimeEnd()))).collect(Collectors.toList());
+//        }
         if (!dataList.isEmpty()) {
-            List<String> otaNameList = OtaCarEnum.getOtaNameList();
-            List<String> plannedBpLaunchBatchList = dataList.stream()
-                    .filter(e -> StringUtils.isNotBlank(e.getPlannedBpLaunchBatch()))
-                    .map(OtaManageApplyEO::getPlannedBpLaunchBatch).distinct().collect(Collectors.toList());
-            if (!plannedBpLaunchBatchList.isEmpty()) {
-                for (String plannedBpLaunchBatch : plannedBpLaunchBatchList) {
-                    OtaManageApplyEO manageApplyEO = new OtaManageApplyEO();
-                    manageApplyEO.setPlannedBpLaunchBatch(plannedBpLaunchBatch);
-                    manageApplyEO.setId(plannedBpLaunchBatch);
-
-                    List<OtaManageApplyEO> otaManageApplyEOS = dataList.stream()
-                            .filter(e -> plannedBpLaunchBatch.equals(e.getPlannedBpLaunchBatch())).collect(Collectors.toList());
-                    if (!otaManageApplyEOS.isEmpty()) {
-                        //发布时间
-                        manageApplyEO.setReleaseDate(otaManageApplyEOS.get(0).getReleaseDate());
-
-                        List<String> appliedVehicleProjectList = otaManageApplyEOS.stream()
-                                .filter(e -> StringUtils.isNotBlank(e.getAppliedVehicleProject()))
-                                .map(OtaManageApplyEO::getAppliedVehicleProject).collect(Collectors.toList());
-                        List<String> carList = new ArrayList<>();
-                        for (String appliedVehicleProject : appliedVehicleProjectList) {
-                            carList.addAll(Arrays.asList(appliedVehicleProject.split(",")));
-                        }
-                        if (!carList.isEmpty()) {
-                            //适用车型
-                            carList = carList.stream().distinct().collect(Collectors.toList());
-                            manageApplyEO.setAppliedVehicleProject(StringUtils.join(carList, ","));
-                            //市场
-                            Set<String> marketSet = new HashSet<>();
-                            for (String appliedVehicleProject : carList) {
-                                if(otaNameList.contains(appliedVehicleProject)){
-                                    marketSet.add(appliedVehicleProject);
-                                }else{
-                                    for (String s : appliedVehicleProject.split(",")) {
-                                        String[] split = s.split(" ");
-                                        if (split.length == 2) {
-                                            if (!otaNameList.contains(s)) {
-                                                marketSet.add(split[1]);
-                                            }
-                                        } else if (split.length == 3) {
-                                            if (!otaNameList.contains(s)) {
-                                                marketSet.add(split[2]);
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                            if (!marketSet.isEmpty()) {
-                                manageApplyEO.setMarket(StringUtils.join(marketSet, ","));
-                            }
-                        }
-                    }
-                    result.add(manageApplyEO);
-                }
-            }
-        }
-        if (ObjectUtils.isNotEmpty(otaManageApplyEO.getSoftwareIssueTimeStart())) {
-            result = result.stream()
-                    .filter(e -> StringUtils.isNotBlank(e.getReleaseDate())
-                            && (e.getReleaseNameDate().after(otaManageApplyEO.getSoftwareIssueTimeStart())
-                            || e.getReleaseNameDate().equals(otaManageApplyEO.getSoftwareIssueTimeStart()))).collect(Collectors.toList());
-        }
-        if (ObjectUtils.isNotEmpty(otaManageApplyEO.getSoftwareIssueTimeEnd())) {
-            result = result.stream().filter(e -> StringUtils.isNotBlank(e.getReleaseDate())
-                    && (e.getReleaseNameDate().before(otaManageApplyEO.getSoftwareIssueTimeEnd())
-                    || e.getReleaseNameDate().equals(otaManageApplyEO.getSoftwareIssueTimeEnd()))).collect(Collectors.toList());
-        }
-        if (!result.isEmpty()) {
             //表头排序
-            heartSort(otaManageApplyEO, result);
+            heartSort(otaManageApplyEO, dataList);
         }
-        return result;
+        return dataList;
     }
 
     /**
@@ -414,7 +490,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
             }
         }
         // 软件发布时间，
-        if ("releaseName".equals(otaManageApplyEO.getOrderByField())) {
+        if ("releaseDate".equals(otaManageApplyEO.getOrderByField())) {
             if (OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())) {
                 Collections.sort(otaManageApplyEOList, (e1, e2) -> {
                     String e1ReleaseName = StringUtils.isNotBlank(e1.getReleaseDate()) ? e1.getReleaseDate() : "";
@@ -669,6 +745,22 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                 });
             }
         }
+        //发布类型
+        if ("releaseType".equals(otaManageApplyEO.getOrderByField())) {
+            if (OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())) {
+                Collections.sort(otaManageApplyEOList, (e1, e2) -> {
+                    String e1ReleaseType = StringUtils.isNotBlank(e1.getReleaseType()) ? e1.getReleaseType() : "";
+                    String e2ReleaseType = StringUtils.isNotBlank(e2.getReleaseType()) ? e2.getReleaseType() : "";
+                    return comparator.compare(e1ReleaseType, e2ReleaseType);
+                });
+            } else if (OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())) {
+                Collections.sort(otaManageApplyEOList, (e1, e2) -> {
+                    String e1ReleaseType = StringUtils.isNotBlank(e1.getReleaseType()) ? e1.getReleaseType() : "";
+                    String e2ReleaseType = StringUtils.isNotBlank(e2.getReleaseType()) ? e2.getReleaseType() : "";
+                    return comparator.compare(e2ReleaseType, e1ReleaseType);
+                });
+            }
+        }
         //备注
         if ("remark".equals(otaManageApplyEO.getOrderByField())) {
             if (OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())) {
@@ -685,6 +777,13 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                 });
             }
         }
+        if(StringUtils.isEmpty(otaManageApplyEO.getOrderByField())){
+            Collections.sort(otaManageApplyEOList, (e1, e2) -> {
+                Date e1CreatedAt = ObjectUtils.isNotEmpty(e1.getCreatedAt()) ? e1.getCreatedAt() : new Date(0);
+                Date e2CreatedAt = ObjectUtils.isNotEmpty(e2.getCreatedAt()) ? e2.getCreatedAt() : new Date(0);
+                return e2CreatedAt.compareTo(e1CreatedAt);
+            });
+        }
     }
 
     private boolean hasPermission(String plannedBpLaunchBatch){
@@ -882,7 +981,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
      */
     @Override
     public Map<String, Object> getPullDownList() {
-        List<OtaManageApplyEO> otaManageApplyEOS = this.getBaseMapper().getOtaCarList(null);
+        List<OtaManageApplyEO> otaManageApplyEOS = this.getNsdpList(new OtaManageApplyEO());
         Map<String, Object> result = new HashMap<>();
         if (!otaManageApplyEOS.isEmpty()) {
             //软件版本 planned_bp_launch_batch_
@@ -922,11 +1021,48 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
         return result;
     }
 
+
     /**
      * 下拉数据-全部和分车型（不含年款）
      *
      * @return
      */
+    @Override
+    public List<String> getCarList(String cut, String plannedBpLaunchBatch) {
+        List<OtaManageReceiveNsdp> dataList = otaManageReceiveNsdpService.getListByReleaseName(plannedBpLaunchBatch);
+        //车型
+        Set<String> vehicleSet = new HashSet<>();
+        for (OtaManageReceiveNsdp omrn : dataList) {
+            String appliedVehicleProject = omrn.getVehicle();
+            if(StringUtils.isNotEmpty(appliedVehicleProject)){
+                for (String s : appliedVehicleProject.split(",")) {
+                    String[] split = s.split(" ");
+                    if (split.length == 3) {
+                        String projectName = split[0];
+                        String market = split[2];
+                        vehicleSet.add(projectName + " " + market);
+                    }
+                }
+            }
+        }
+        List<String> resList = new ArrayList<>();
+        if (CutEnum.CN.getValue().equals(cut)) {
+            resList.add("全部");
+        } else {
+            resList.add("All");
+        }
+        resList.addAll(vehicleSet);
+        return resList;
+    }
+
+
+    /**
+     * 下拉数据-全部和分车型（不含年款）
+     *
+     * @return
+     */
+    /*.
+
     @Override
     public List<String> getCarList(String cut, String plannedBpLaunchBatch) {
         Set<String> set = new HashSet<>();
@@ -1003,6 +1139,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
         }
         return result;
     }
+     */
 
     public List<String> getStudioCarList(String plannedBpLaunchBatch) {
         Set<String> set = new HashSet<>();
@@ -1231,6 +1368,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
     @Override
     public void issueNotice(String id) {
         if (StringUtils.isNotEmpty(id)) {
+            /*
             //根据版本查出所有vdr
             List<OtaManageReceive> omrList = otaManageReceiveService.getReceiveByplanned(id);
             List<String> appliedVehicleProjectList = omrList.stream()
@@ -1278,6 +1416,34 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                     }
                 }
             }
+
+             */
+
+
+            List<OtaManageReceiveNsdp> dataList = otaManageReceiveNsdpService.getListByReleaseName(id);
+            //车型
+            Set<String> vehicleSet = new HashSet<>();
+            for (OtaManageReceiveNsdp omrn : dataList) {
+                String appliedVehicleProject = omrn.getVehicle();
+                if(StringUtils.isNotEmpty(appliedVehicleProject)){
+                    for (String s : appliedVehicleProject.split(",")) {
+                        String[] split = s.split(" ");
+                        if (split.length == 3) {
+                            String projectName = split[0].toUpperCase(Locale.ROOT);
+                            String market = "";
+                            if (split[2].equals("CN")) {
+                                market = "China";
+                            } else if (split[2].equals("RHD")) {
+                                market = "UK";
+                            } else {
+                                market = split[2];
+                            }
+                            vehicleSet.add(projectName + " " + market);
+                        }
+                    }
+                }
+            }
+
             //查询所有NT2平台的项目
             ProjectLibraryBase plbSearch = new ProjectLibraryBase();
             plbSearch.setDigitalPlatform("NT2");
@@ -1285,31 +1451,18 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
             //存储符合条件的项目中Studio的用户ID
             Set<String> matchStudioSet = new HashSet();
             for (ProjectLibraryBase plb : plbList) {
-                boolean flag = false;
-                if (appMap.containsKey("All")) {
-                    matchStudioSet.add(plb.getStudioEngineer());
-                    continue;
-                }
-                String targetMarket = plb.getTargetMarket();
                 String projectName = plb.getProjectName().toUpperCase(Locale.ROOT);
+                boolean flag = false;
+                String targetMarket = plb.getTargetMarket();
                 String[] targetMarkets = targetMarket.split(",");
                 for (String tm : targetMarkets) {
-                    if ((appMap.containsKey("CN") && tm.equals("China"))
-                            || (appMap.containsKey("EU") && tm.equals("EU"))
-                            || (appMap.containsKey("RHD") && tm.equals("UK"))) {
-                        //三个ALL的市场类型
+                    String vehicleStr =projectName + " " + tm;
+                    if (vehicleSet.contains(vehicleStr)) {
                         matchStudioSet.add(plb.getStudioEngineer());
-                        continue;
-                    }
-                    if (appMap.containsKey(projectName)) {
-                        Set appSet = appMap.get(projectName);
-                        if (appSet.contains(tm)) {
-                            matchStudioSet.add(plb.getStudioEngineer());
-                            continue;
-                        }
                     }
                 }
             }
+
             List<OtaManagePermission> ompList = new ArrayList<>();
             for (String studioId : matchStudioSet) {
                 OtaManagePermission omp = new OtaManagePermission();
@@ -1328,12 +1481,12 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
             params.put("plannedBpLaunchBatch", id);
             params.put("viewBtnUrlCnPhone", backUrlPhone);
             String url = backUrl;
-            if (omrList.size() > 0) {
-                url = backUrl + "/components/detil?plannedBpLaunchBatch=" + id + "&releaseDate=" + omrList.get(0).getReleaseDate();
+            if (dataList.size() > 0) {
+                url = backUrl + "/components/detil?plannedBpLaunchBatch=" + id + "&releaseDate=" + dataList.get(0).getReleaseDate();
             }
             params.put("viewBtnUrlCn", url);
             params.put("viewBtnUrlEn", url);
-            params.put("appliedVehicleProject", appMap.keySet().stream().collect(Collectors.joining(",")));
+            params.put("appliedVehicleProject", vehicleSet.stream().collect(Collectors.joining(",")));
             params.put("Initiator", " " + currentUser.getUsername());
             params.put("initiatorStrCn", "发起人");
             params.put("initiatorStrEn", "Initiator");
@@ -1954,7 +2107,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
     @Override
     public ModelAndView otaExportXls(HttpServletRequest request, OtaManageApplyEO otaManageApplyEO) {
         // Step.2 获取导出数据
-        List<OtaManageApplyEO> pageList = getOtaPage(otaManageApplyEO);
+        List<OtaManageApplyEO> pageList = getNsdpList(otaManageApplyEO);
         List<OtaManageApplyEO> exportList = null;
 
         // 过滤选中数据
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageReceiveNsdpServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageReceiveNsdpServiceImpl.java
index 14a33cf93..118c9cb12 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageReceiveNsdpServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageReceiveNsdpServiceImpl.java
@@ -1,5 +1,6 @@
 package com.jero.modules.ota.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.modules.ota.entity.OtaManageReceiveNsdp;
 import com.jero.modules.ota.mapper.OtaManageReceiveNsdpMapper;
 import com.jero.modules.ota.service.IOtaManageReceiveNsdpService;
@@ -91,4 +92,12 @@ public class OtaManageReceiveNsdpServiceImpl extends ServiceImpl<OtaManageReceiv
 	public List<OtaManageReceiveNsdp> getOtaManageReceiveNsdpSync() {
 		return this.getBaseMapper().getOtaManageReceiveNsdpSync();
 	}
+
+
+	@Override
+	public List<OtaManageReceiveNsdp> getListByReleaseName(String releaseName) {
+		LambdaQueryWrapper<OtaManageReceiveNsdp> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(OtaManageReceiveNsdp::getReleaseName, releaseName);
+		return this.list(queryWrapper);
+	}
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
index 633a99b7d..d4b7de890 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
@@ -1396,7 +1396,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
 
 
             List<ParamsManifestEO> pmEos = pmEoList.stream().filter(pmEo -> {
-                if(pmEo.getProjectVersion().equals("00")){
+                if("00".equals(pmEo.getProjectVersion())){
                     return StringUtils.equals(pmEo.getProjectId(), plbEo.getId());
                 }else{
                     return StringUtils.equals(pmEo.getProjectId(), plbEo.getParentId()) && StringUtils.equals(pmEo.getProjectVersion(), plbEo.getProjectVersion());
diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index cfa34b6e2..e0d6f2a7d 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1969,4 +1969,5 @@ module.exports = {
   Listcreationtime:'List creation time',
   Chinesecharacters:'The role code cannot enter Chinese characters',
   alreadyexistssystem:'The role encoding already exists',
+  releaseType:'releaseType',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index e5c490bdf..773b0e065 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -3925,4 +3925,5 @@ module.exports = {
   Fileupload:'文件上传',
   Addresslink:'地址链接',
   Problemanagement:'问题管理',
+  releaseType:'发布类型',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/otaAuthentication/index.vue b/jero-web/src/views/otamanagement/otaAuthentication/index.vue
index b9cd3711b..ef4be56fa 100644
--- a/jero-web/src/views/otamanagement/otaAuthentication/index.vue
+++ b/jero-web/src/views/otamanagement/otaAuthentication/index.vue
@@ -103,6 +103,30 @@
             </div>
           </a-col>
           <template v-if="toggleSearchStatus">
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('releaseType')">
+                  <span>{{ $t('releaseType') }}</span>
+                </div>
+                <a-select :placeholder="$t('PleaseSelect')+$t('releaseType')"
+                          class="box-input"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          allowClear
+                          showSearch
+                          optionFilterProp="label"
+                          :autoClearSearchValue="false"
+                          v-model="queryParam.releaseType">
+                  <a-select-option v-for="(item, key) in releaseTypeList"
+                                   :label='item'
+                                   :key="key"
+                                   :value="item">
+                  <span style="display: inline-block;width: 100%" :title=" item">
+                    {{ item }}
+                  </span>
+                  </a-select-option>
+                </a-select>
+              </div>
+            </a-col>
             <a-col :md="6" :sm="8">
               <div class="box-title-text">
                 <div class="title-text" :title="$t('softwarereleasetime')">
@@ -139,7 +163,7 @@
     </div>
     <div>
       <a-table ref="table" size="middle" :components="drag(columns, 'columns')" :loading="loading" :pagination="false"
-        :scroll="{ x: '100%', y: 'calc(100vh - 140px)' }" rowKey="id" :data-source="dataSource"
+        :scroll="{ x: '100%', y: 'calc(100vh - 140px)' }" rowKey="id" :data-source="dataSource" @change="tableOnChange"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns">
         <!--         -->
         <span slot="operation" slot-scope="text,record">
@@ -196,6 +220,7 @@ export default {
       queryParam: {
       },
       formInline: {},
+      releaseTypeList:['BUILD','MARKETING','POC'],
       rules: {
         whetherTobring: [
           {
@@ -230,6 +255,14 @@ export default {
           sorter:true,
           dataIndex: 'market'
         },
+        {
+          title: this.$t('releaseType'),
+          align: 'left',
+          width: 150,
+          ellipsis: true,
+          sorter:true,
+          dataIndex: 'releaseType'
+        },
         {
           title: this.$t('vehicleType'),
           align: 'left',
@@ -255,7 +288,9 @@ export default {
         // }
       ],
       userInfoQuery: {},
-      administrators: false
+      administrators: false,
+      orderBy: '1',
+      orderByField: ''
     }
   },
   mounted() {
@@ -275,6 +310,11 @@ export default {
         }
       })
     },
+    tableOnChange(pagination, filters, sorter) {
+      this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+      this.orderByField = sorter.columnKey
+      this.getList()
+    },
     handleToggleSearch() {
       this.toggleSearchStatus = !this.toggleSearchStatus
     },
@@ -308,6 +348,8 @@ export default {
       let query = {
         pageNo: this.pageNo,
         pageSize: this.pageSize,
+        orderBy: this.orderBy,
+        orderByField: this.orderByField,
         ...queryParam
       }
       this.loading = true

From 8099e7aab2e6013b1482ded9e5f86d7207ec0a95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Thu, 14 Sep 2023 21:05:21 +0800
Subject: [PATCH 040/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9VDR=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ota/mapper/xml/OtaManageApplyEOMapper.xml |   1 +
 .../impl/OtaManageApplyEOServiceImpl.java     | 124 +++++++++++-------
 .../com/jero/modules/ota/vo/VersionVO.java    |   5 +-
 3 files changed, 82 insertions(+), 48 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
index 2edd55c10..2654ccc75 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
@@ -153,6 +153,7 @@
 	    oma.attestation_schedule,
 	    oma.project_version,
 	    pni.project_name car,
+        oma.vehicle_type,
 	    pyni.year_name
         FROM
 	    project_library_base plb
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
index 6dae49913..857172ece 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
@@ -1303,61 +1303,91 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
      */
     @Override
     public List<VersionVO> getVersionInfo(String vdr, String car, String cut) {
-        //认证进度数据字典 certification_progress
-        List<SysDictItem> regionDictList = sysDictItemServiceImpl.selectItemsByDictCode("certification_progress");
-
-        List<DictModel> regionList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
-
-        List<VersionVO> versionVOList = this.getBaseMapper().getVersionInfo(vdr);
         List<VersionVO> result = new LinkedList<>();
-        if (!versionVOList.isEmpty()) {
-            List<VersionVO> oneList = versionVOList.stream().filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList());
-            List<VersionVO> twoList = versionVOList.stream().filter(e -> StringUtils.isNotBlank(e.getParentId())).collect(Collectors.toList());
+        OtaManageReceive omr = otaManageReceiveService.getById(vdr);
+        //获取到版本号，然后获取所有车型
+        String plannedBpLaunchBatch = omr.getPlannedBpLaunchBatch();
+        if (StringUtils.isNotEmpty(plannedBpLaunchBatch)) {
+            List<OtaManageReceiveNsdp> dataList = otaManageReceiveNsdpService.getListByReleaseName(plannedBpLaunchBatch);
+            //车型
+            Set<String> vehicleSet = new HashSet<>();
+            for (OtaManageReceiveNsdp omrn : dataList) {
+                String appliedVehicleProject = omrn.getVehicle();
+                if (StringUtils.isNotEmpty(appliedVehicleProject)) {
+                    for (String s : appliedVehicleProject.split(",")) {
+                        String[] split = s.split(" ");
+                        if (split.length == 3) {
+                            vehicleSet.add(split[0] + " " + split[2]);
+                        }
+                    }
+                }
+            }
 
-            for (VersionVO versionVO : oneList) {
-                result.add(versionVO);
-                List<VersionVO> collect = twoList.stream().filter(e -> versionVO.getProjectId().equals(e.getParentId())).collect(Collectors.toList());
-                Collections.sort(collect, new Comparator<VersionVO>() {
-                    @Override
-                    public int compare(VersionVO o1, VersionVO o2) {
-                        return Integer.valueOf(o1.getVersionNumber()).compareTo(Integer.valueOf(o2.getVersionNumber()));
+            //认证进度数据字典 certification_progress
+            List<SysDictItem> regionDictList = sysDictItemServiceImpl.selectItemsByDictCode("certification_progress");
+
+            List<DictModel> regionList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
+
+            List<VersionVO> versionVOList = this.getBaseMapper().getVersionInfo(vdr);
+            if (!versionVOList.isEmpty()) {
+                List<VersionVO> oneList = versionVOList.stream().filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList());
+                List<VersionVO> twoList = versionVOList.stream().filter(e -> StringUtils.isNotBlank(e.getParentId())).collect(Collectors.toList());
+
+                for (VersionVO versionVO : oneList) {
+                    result.add(versionVO);
+                    List<VersionVO> collect = twoList.stream().filter(e -> versionVO.getProjectId().equals(e.getParentId())).collect(Collectors.toList());
+                    Collections.sort(collect, new Comparator<VersionVO>() {
+                        @Override
+                        public int compare(VersionVO o1, VersionVO o2) {
+                            return Integer.valueOf(o1.getVersionNumber()).compareTo(Integer.valueOf(o2.getVersionNumber()));
+                        }
+                    });
+                    result.addAll(collect);
+                }
+                for (VersionVO versionVO : result) {
+                    String market = versionVO.getMarket();
+                    List<String> list = new LinkedList<>();
+                    for (String s : market.split(",")) {
+                        List<DictModel> collect = regionList.stream().filter(e -> e.getValue().equals(s)).collect(Collectors.toList());
+                        if (!collect.isEmpty()) {
+                            list.add(collect.get(0).getTextEn());
+                        }
                     }
-                });
-                result.addAll(collect);
-            }
-            for (VersionVO versionVO : result) {
-                String market = versionVO.getMarket();
-                List<String> list = new LinkedList<>();
-                for (String s : market.split(",")) {
-                    List<DictModel> collect = regionList.stream().filter(e -> e.getValue().equals(s)).collect(Collectors.toList());
-                    if (!collect.isEmpty()) {
-                        list.add(collect.get(0).getTextEn());
+                    if (!list.isEmpty()) {
+                        market = StringUtils.join(list, ",");
                     }
-                }
-                if (!list.isEmpty()) {
-                    market = StringUtils.join(list, ",");
-                }
-                if (StringUtils.isBlank(versionVO.getProjectVersion())) {
-                    versionVO.setVersionName(versionVO.getCar() + "-" + market);
-                } else {
-                    versionVO.setVersionName(versionVO.getCar() + "-" + versionVO.getYearName() + "-" + market + "-" + versionVO.getVersionNumber());
-                }
-                //认证进度
-                if (StringUtils.isNotBlank(versionVO.getAttestationSchedule())) {
-                    List<SysDictItem> collect = regionDictList.stream()
-                            .filter(e -> e.getItemValue().equals(versionVO.getAttestationSchedule())).collect(Collectors.toList());
-                    if (CutEnum.CN.getValue().equals(cut)) {
-                        versionVO.setAttestationSchedule(collect.get(0).getItemText());
+                    if (StringUtils.isBlank(versionVO.getProjectVersion())) {
+                        versionVO.setVersionName(versionVO.getCar() + "-" + market);
                     } else {
-                        versionVO.setAttestationSchedule(collect.get(0).getEnName());
+                        versionVO.setVersionName(versionVO.getCar() + "-" + versionVO.getYearName() + "-" + market + "-" + versionVO.getVersionNumber());
+                    }
+                    //认证进度
+                    if (StringUtils.isNotBlank(versionVO.getAttestationSchedule())) {
+                        List<SysDictItem> collect = regionDictList.stream()
+                                .filter(e -> e.getItemValue().equals(versionVO.getAttestationSchedule())).collect(Collectors.toList());
+                        if (CutEnum.CN.getValue().equals(cut)) {
+                            versionVO.setAttestationSchedule(collect.get(0).getItemText());
+                        } else {
+                            versionVO.setAttestationSchedule(collect.get(0).getEnName());
+                        }
                     }
                 }
             }
-        }
-        if (result.isEmpty()) {
-            VersionVO versionVO = new VersionVO();
-            versionVO.setVersionName(car);
-            result.add(versionVO);
+            for (String vehicleStr : vehicleSet) {
+                boolean flag = false;
+                for (VersionVO ver : result) {
+                    if(ver.getVehicleType().equals(vehicleStr)){
+                        flag = true;
+                        break;
+                    }
+                }
+                if(!flag){
+                    VersionVO versionVO = new VersionVO();
+                    versionVO.setVersionName(vehicleStr);
+                    versionVO.setVehicleType(vehicleStr);
+                    result.add(versionVO);
+                }
+            }
         }
         return result;
     }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/VersionVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/VersionVO.java
index e8bf7f9bc..b53a538ad 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/VersionVO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/VersionVO.java
@@ -62,6 +62,9 @@ public class VersionVO {
     private String versionName;
 
     @ApiModelProperty(value = "项目版本-id")
-    private java.lang.String projectVersion;
+    private String projectVersion;
+
+    @ApiModelProperty(value = "适用车型")
+    private String vehicleType;
 
 }

From 563d599ab8a33c7fb8424d9472f91708c9db281e Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 15 Sep 2023 09:32:56 +0800
Subject: [PATCH 041/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/batSetting.vue                 |  2 +-
 .../certificationList/components/addModel.vue |  2 +-
 .../components/batSetting.vue                 |  2 +-
 .../components/listEditModel.vue              | 48 +++++++++----------
 .../components/listOfRegulations.vue          |  2 +-
 .../components/listOfRegulationsView.vue      |  2 +-
 6 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batSetting.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batSetting.vue
index e367c7158..41b4cde95 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batSetting.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/batSetting.vue
@@ -447,7 +447,7 @@
           projectId: this.$route.query.id,
           dutyTerritory: row.dutyTerritory || row
         }
-        getAction('/platform/projectRelatedPersonnel/queryPersonByProjectId', query).then((res) => {
+        getAction('/project/projectRelatedPersonnel/queryPersonByProjectId', query).then((res) => {
           if (res.success) {
             this.regulatoryEngineerList = res.result.lawEngineerList || [] //法规工程师
             this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || [] //工程接口人
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
index 8b77c7b5a..d3e4a156e 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
@@ -1062,7 +1062,7 @@
           projectId: this.$route.query.id,
           dutyTerritory: row
         }
-        getAction('/platform/projectRelatedPersonnel/queryPersonByProjectId', query).then((res) => {
+        getAction('/project/projectRelatedPersonnel/queryPersonByProjectId', query).then((res) => {
           if (res.success) {
             if (this.formInline.id) {
               this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || [] //工程接口人
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue
index e85e361cd..02b908714 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue
@@ -369,7 +369,7 @@
           projectId: this.$route.query.id,
           dutyTerritory: row
         }
-        getAction('/platform/projectRelatedPersonnel/queryPersonByProjectId', query).then((res) => {
+        getAction('/project/projectRelatedPersonnel/queryPersonByProjectId', query).then((res) => {
           if (res.success) {
             this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || [] //工程接口人
           }
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
index d9bc9908a..f2e5cfa7d 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
@@ -132,29 +132,29 @@
                       :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
               </div>
               <a-form-model-item class="itemModel-multi" prop="dutyTerritory">
-                <a-select :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                          class="box-input"
-                          optionFilterProp="label"
-                          mode="multiple"
-                          @change="dutyTerritoryChange"
-                          :disabled="formInline.roleCodeIndex == 0 ? false : true"
-                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                          v-model="formInline.dutyTerritory">
-                  <a-select-option v-for="(item, key) in dutyTerritoryList"
-                                   :key="key"
-                                   :label="item.itemText"
-                                   :value="item.itemValue">
-                               <span style="display: inline-block;width: 100%" :title=" item.itemText ">
-                                     {{ item.itemText }}
-                               </span>
-                  </a-select-option>
-                </a-select>
-                <!--                <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"-->
-                <!--                                    @change="dutyTerritoryChange"-->
-                <!--                                    :disabled="formInline.roleCodeIndex == 0 ? false : true"-->
-                <!--                                    :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
-                <!--                                    :type="'select'"-->
-                <!--                                    :triggerChange="false" :dictCode="'duty_territory'"/>-->
+<!--                <a-select :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
+<!--                          class="box-input"-->
+<!--                          optionFilterProp="label"-->
+<!--                          mode="multiple"-->
+<!--                          @change="dutyTerritoryChange"-->
+<!--                          :disabled="formInline.roleCodeIndex == 0 ? false : true"-->
+<!--                          :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+<!--                          v-model="formInline.dutyTerritory">-->
+<!--                  <a-select-option v-for="(item, key) in dutyTerritoryList"-->
+<!--                                   :key="key"-->
+<!--                                   :label="item.itemText"-->
+<!--                                   :value="item.itemValue">-->
+<!--                               <span style="display: inline-block;width: 100%" :title=" item.itemText ">-->
+<!--                                     {{ item.itemText }}-->
+<!--                               </span>-->
+<!--                  </a-select-option>-->
+<!--                </a-select>-->
+                <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
+                                    @change="dutyTerritoryChange"
+                                    :disabled="formInline.roleCodeIndex == 0 ? false : true"
+                                    :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                    :type="'select'"
+                                    :triggerChange="false" :dictCode="'duty_territory'"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -787,7 +787,7 @@
         let query = {
           projectLawsInventoryId: id
         }
-        getAction('/platform/projectLawsInventoryRejectCauseEO/list', query).then((res) => {
+        getAction('/project/projectLawsInventoryRejectCauseEO/list', query).then((res) => {
           if (res.success) {
             this.rejectCauseList = []
             this.rejectCauseListOne = []
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
index 2878fc922..a39853031 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
@@ -1270,7 +1270,7 @@
           deleteOne: '/platform/projectLawsInventoryEO/delete',
           updateStatusBatch: '/platform/projectLawsInventoryEO/updateStatusBatch',
           matchRelevantPeople: '/platform/projectLawsInventoryEO/matchRelevantPeople',
-          queryPersonByProject: '/platform/projectRelatedPersonnel/queryPersonByProjectId',
+          queryPersonByProject: '/project/projectRelatedPersonnel/queryPersonByProjectId',
           importZipUrl: '/platform/projectLawsInventoryEO/importData',
           exportTemplate: '/platform/projectLawsInventoryEO/exportTemplate',
           exportData: '/platform/projectLawsInventoryEO/exportData',
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulationsView.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulationsView.vue
index f228cc974..25a12d88f 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulationsView.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulationsView.vue
@@ -525,7 +525,7 @@
         let query = {
           projectLawsInventoryId: id
         }
-        getAction('/platform/projectLawsInventoryRejectCauseEO/list', query).then((res) => {
+        getAction('/project/projectLawsInventoryRejectCauseEO/list', query).then((res) => {
           if (res.success) {
             this.rejectCauseList = []
             this.rejectCauseListOne = []

From 34b33b608f66c881c84e40a943668b35d6b43a55 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 15 Sep 2023 09:56:42 +0800
Subject: [PATCH 042/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificationList/components/addModel.vue |  1 +
 .../components/listEditModel.vue              | 88 +++++++++++--------
 2 files changed, 52 insertions(+), 37 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
index d3e4a156e..c2236b6ad 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
@@ -1055,6 +1055,7 @@
         this.formInline.dataList[index].sdt = undefined
         this.formInline = { ...this.formInline }
         this.handleInput('dataList.' + index + '.dutyTerritory')
+        console.log(11)
         this.queryPersonByProject(this.formInline.dataList[index].dutyTerritory.join(','), index)
       },
       queryPersonByProject(row, index) {
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
index f2e5cfa7d..2bd9fb111 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
@@ -99,7 +99,7 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>
+                <span class="Required" v-if="formInline.roleCodeIndex == 1">*</span>
                 <span class="title-text-text"
                       :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
               </div>
@@ -109,7 +109,7 @@
                           optionFilterProp="label"
                           @change="DutyDepartChange"
                           mode="multiple"
-                          :disabled="formInline.roleCodeIndex == 0 ? false : true"
+                          :disabled="formInline.roleCodeIndex == 1 ? false : true"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           v-model="formInline.dutyDepart">
                   <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
@@ -127,7 +127,7 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>
+                <span class="Required" v-if="formInline.roleCodeIndex == 1">*</span>
                 <span class="title-text-text"
                       :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
               </div>
@@ -151,7 +151,7 @@
 <!--                </a-select>-->
                 <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
                                     @change="dutyTerritoryChange"
-                                    :disabled="formInline.roleCodeIndex == 0 ? false : true"
+                                    :disabled="formInline.roleCodeIndex == 1 ? false : true"
                                     :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
                                     :type="'select'"
                                     :triggerChange="false" :dictCode="'duty_territory'"/>
@@ -163,24 +163,31 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>
+                <span class="Required" v-if="formInline.roleCodeIndex == 1">*</span>
                 <span class="title-text-text" :title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span>
               </div>
               <a-form-model-item class="itemModel" :prop="'regulationOwnerId'">
-                <a-select :placeholder="$t('PleaseSelect')+$t('regulatoryEngineer')"
-                          class="box-input"
-                          :disabled="formInline.roleCodeIndex == 0 ? false : true"
-                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                          allowClear
-                          v-model="formInline.regulationOwnerId">
-                  <a-select-option v-for="(item, key) in regulatoryEngineerList"
-                                   :key="key"
-                                   :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.name">
-                           {{ item.name }}
-                     </span>
-                  </a-select-option>
-                </a-select>
+<!--                <a-select :placeholder="$t('PleaseSelect')+$t('regulatoryEngineer')"-->
+<!--                          class="box-input"-->
+<!--                          :disabled="formInline.roleCodeIndex == 1 ? false : true"-->
+<!--                          :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+<!--                          allowClear-->
+<!--                          v-model="formInline.regulationOwnerId">-->
+<!--                  <a-select-option v-for="(item, key) in regulatoryEngineerList"-->
+<!--                                   :key="key"-->
+<!--                                   :value="item.value">-->
+<!--                     <span style="display: inline-block;width: 100%" :title=" item.name">-->
+<!--                           {{ item.name }}-->
+<!--                     </span>-->
+<!--                  </a-select-option>-->
+<!--                </a-select>-->
+                <PersonnelSelection :query="{db_field_name:'regulationOwnerId',db_field_txt:$t('regulatoryEngineer')}"
+                                    :isSingleChoice="true"
+                                    :personneQuery="formInline"
+                                    v-if="visible"
+                                    :disabled="isEdit(this.formInline)"
+                                    @change="PersonnelSelectionChange"
+                                    v-model="formInline.regulationOwnerId"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -191,19 +198,26 @@
                 <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
               </div>
               <a-form-model-item class="itemModel" :prop="'engineeringInterfacePerson'">
-                <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
-                          class="box-input"
-                          allowClear
-                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                          v-model="formInline.engineeringInterfacePerson">
-                  <a-select-option v-for="(item, key) in engineeringInterfacePersonList"
-                                   :key="key"
-                                   :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.name ">
-                           {{ item.name }}
-                     </span>
-                  </a-select-option>
-                </a-select>
+<!--                <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"-->
+<!--                          class="box-input"-->
+<!--                          allowClear-->
+<!--                          :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+<!--                          v-model="formInline.engineeringInterfacePerson">-->
+<!--                  <a-select-option v-for="(item, key) in engineeringInterfacePersonList"-->
+<!--                                   :key="key"-->
+<!--                                   :value="item.value">-->
+<!--                     <span style="display: inline-block;width: 100%" :title=" item.name ">-->
+<!--                           {{ item.name }}-->
+<!--                     </span>-->
+<!--                  </a-select-option>-->
+<!--                </a-select>-->
+                <PersonnelSelection :query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('engineeringInterfacePerson')}"
+                                    :isSingleChoice="true"
+                                    :personneQuery="formInline"
+                                    v-if="visible"
+                                    :disabled="isEdit(this.formInline)"
+                                    @change="PersonnelSelectionChange"
+                                    v-model="formInline.engineeringInterfacePerson"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -485,11 +499,11 @@
             </div>
           </a-col>
         </a-row>
-        <div class="header-text" v-if="rejectCauseList && rejectCauseList.length > 0 && formInline.roleCodeIndex == 0">
+        <div class="header-text" v-if="rejectCauseList && rejectCauseList.length > 1 && formInline.roleCodeIndex == 1">
           {{$t('reasonForReturnOfDesignCompliance')}}
         </div>
 
-        <div v-if="rejectCauseList && rejectCauseList.length > 0 && formInline.roleCodeIndex == 0"
+        <div v-if="rejectCauseList && rejectCauseList.length > 0 && formInline.roleCodeIndex == 1"
              v-for="(item,index) in rejectCauseList">
           <a-row :gutter="24">
             <a-col :span="12">
@@ -531,11 +545,11 @@
         </div>
 
         <div class="header-text"
-             v-if="rejectCauseListOne && rejectCauseListOne.length > 0 && formInline.roleCodeIndex == 0">
+             v-if="rejectCauseListOne && rejectCauseListOne.length > 0 && formInline.roleCodeIndex == 1">
           {{$t('verifyComplianceConfirmReturnReason')}}
         </div>
 
-        <div v-if="rejectCauseListOne && rejectCauseListOne.length > 0 && formInline.roleCodeIndex == 0"
+        <div v-if="rejectCauseListOne && rejectCauseListOne.length > 0 && formInline.roleCodeIndex == 1"
              v-for="(item,index) in rejectCauseListOne">
           <a-row :gutter="24">
             <a-col :span="12">
@@ -579,7 +593,7 @@
     </a-spin>
     <div class="drawer-bootom-button">
       <a-button style="margin-right: 8px" @click="handleCancel">{{$t('cancel')}}</a-button>
-      <a-button @click="handleSubmit" v-if="formInline.roleCodeIndex == 0" type="primary" :loading="confirmLoading">
+      <a-button @click="handleSubmit" v-if="formInline.roleCodeIndex == 1" type="primary" :loading="confirmLoading">
         {{$t('submit')}}
       </a-button>
       <a-button @click="handleSubmit" v-else type="primary" :loading="confirmLoading">{{$t('confirm')}}</a-button>

From 1e4a8c77205b1c8b8c92d70fcc44f17dbe88b087 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 15 Sep 2023 11:02:52 +0800
Subject: [PATCH 043/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=9B=9E=E6=98=BE=20=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificationList/components/addModel.vue | 72 ++++++++++---------
 .../components/batSetting.vue                 | 36 ++++++----
 .../components/modifyHistoryList.vue          |  2 +-
 .../components/certificationList/index.vue    | 12 ++--
 .../components/listEditModel.vue              | 20 +++---
 5 files changed, 75 insertions(+), 67 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
index c2236b6ad..1bd0ae6b5 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
@@ -234,21 +234,12 @@
                                        :prop="item.deliverableType == '1635545748968783874'?'':'dataList.'+index+'.sdt'"
                                        :rules="[{ required: item.deliverableType == '1635545748968783874'?false:true, message: $t('engineeringInterfacePerson') + $t('cannotEmpty'), trigger: 'change'},]"
                     >
-                      <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
-                                optionFilterProp="label"
-                                showSearch
-                                @change="handleInput('dataList.'+index+'.sdt',item.sdt,index,item.engineeringInterfacePersonList)"
-                                v-model="item.sdt">
-                        <a-select-option v-for="(val, key) in item.engineeringInterfacePersonList"
-                                         :label="val.name"
-                                         :key="key"
-                                         :value="val.value">
-                     <span style="display: inline-block;width: 100%"
-                           :title=" val.name ">
-                           {{ val.name}}
-                     </span>
-                        </a-select-option>
-                      </a-select>
+                      <PersonnelSelection :query="{db_field_name:'sdt',db_field_txt:$t('engineeringInterfacePerson')}"
+                                          :isSingleChoice="true"
+                                          :personneQuery="formInline"
+                                          v-if="visible"
+                                          @change="PersonnelSelectionChange"
+                                          v-model="item.sdt"/>
                     </a-form-model-item>
                   </div>
                 </a-col>
@@ -500,21 +491,27 @@
                                      :rules="[{ required: formInline.deliverableType=='1635545748968783874'?false:true,
                                  message: $t('engineeringInterfacePerson') + $t('cannotEmpty'), trigger: 'change'}]"
                   >
-                    <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
-                              optionFilterProp="label"
-                              @change="handleInput('sdt',formInline.sdt)"
-                              showSearch
-                              v-model="formInline.sdt">
-                      <a-select-option v-for="(item, key) in engineeringInterfacePersonList"
-                                       :label="item.name"
-                                       :key="key"
-                                       :value="item.value">
-                     <span style="display: inline-block;width: 100%"
-                           :title=" item.name ">
-                           {{ item.name}}
-                     </span>
-                      </a-select-option>
-                    </a-select>
+<!--                    <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"-->
+<!--                              optionFilterProp="label"-->
+<!--                              @change="handleInput('sdt',formInline.sdt)"-->
+<!--                              showSearch-->
+<!--                              v-model="formInline.sdt">-->
+<!--                      <a-select-option v-for="(item, key) in engineeringInterfacePersonList"-->
+<!--                                       :label="item.name"-->
+<!--                                       :key="key"-->
+<!--                                       :value="item.value">-->
+<!--                     <span style="display: inline-block;width: 100%"-->
+<!--                           :title=" item.name ">-->
+<!--                           {{ item.name}}-->
+<!--                     </span>-->
+<!--                      </a-select-option>-->
+<!--                    </a-select>-->
+                    <PersonnelSelection :query="{db_field_name:'sdt',db_field_txt:$t('engineeringInterfacePerson')}"
+                                        :isSingleChoice="true"
+                                        :personneQuery="formInline"
+                                        v-if="visible"
+                                        @change="PersonnelSelectionChange"
+                                        v-model="formInline.sdt"/>
                   </a-form-model-item>
                 </div>
               </a-col>
@@ -974,12 +971,17 @@
         })
       },
       PersonnelSelectionChange(value, id, index) {
+        console.log(value, id, index)
         if (this.formInline.id) {
           this.formInline[value] = id
         } else {
           this.formInline.dataList[index][value] = id
         }
-        this.formInline = { ...this.formInline }
+        // console.log(this.formInline.sdt)
+        this.$nextTick(() => {
+          this.formInline = { ...this.formInline }
+          this.$refs.ruleForm.validateField([value])
+        })
       },
       clickButtonToUpload(item, index, isTrue) {
         this.numIndex = index
@@ -1048,15 +1050,15 @@
         }
       },
       handleChange(value) {
-        this.formInline.sdt = undefined
-        this.queryPersonByProject(this.formInline.dutyTerritory.join(','))
+        // this.formInline.sdt = undefined
+        // this.queryPersonByProject(this.formInline.dutyTerritory.join(','))
       },
       dutyHandleChange(index) {
         this.formInline.dataList[index].sdt = undefined
         this.formInline = { ...this.formInline }
         this.handleInput('dataList.' + index + '.dutyTerritory')
-        console.log(11)
-        this.queryPersonByProject(this.formInline.dataList[index].dutyTerritory.join(','), index)
+        // console.log(11)
+        // this.queryPersonByProject(this.formInline.dataList[index].dutyTerritory.join(','), index)
       },
       queryPersonByProject(row, index) {
         let query = {
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue
index 02b908714..e50c44aad 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue
@@ -35,21 +35,27 @@
               <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
             </div>
             <a-form-model-item class="itemModel">
-              <a-select :placeholder="$t('cannotSetResponsibilityAreas')"
-                        class="box-input"
-                        allowClear
-                        optionFilterProp="label"
-                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                        v-model="formInline.sdt">
-                <a-select-option v-for="(item, key) in engineeringInterfacePersonList"
-                                 :key="item.key"
-                                 :label="item.name"
-                                 :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.name ">
-                           {{ item.name }}
-                     </span>
-                </a-select-option>
-              </a-select>
+<!--              <a-select :placeholder="$t('cannotSetResponsibilityAreas')"-->
+<!--                        class="box-input"-->
+<!--                        allowClear-->
+<!--                        optionFilterProp="label"-->
+<!--                        :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+<!--                        v-model="formInline.sdt">-->
+<!--                <a-select-option v-for="(item, key) in engineeringInterfacePersonList"-->
+<!--                                 :key="item.key"-->
+<!--                                 :label="item.name"-->
+<!--                                 :value="item.value">-->
+<!--                     <span style="display: inline-block;width: 100%" :title=" item.name ">-->
+<!--                           {{ item.name }}-->
+<!--                     </span>-->
+<!--                </a-select-option>-->
+<!--              </a-select>-->
+              <PersonnelSelection :query="{db_field_name:'sdt',db_field_txt:$t('engineeringInterfacePerson')}"
+                                  :isSingleChoice="true"
+                                  :personneQuery="formInline"
+                                  v-if="visible"
+                                  @change="PersonnelSelectionChange"
+                                  v-model="formInline.sdt"/>
             </a-form-model-item>
           </div>
         </a-col>
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/modifyHistoryList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/modifyHistoryList.vue
index 42654f963..32eb8dcaf 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/modifyHistoryList.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/modifyHistoryList.vue
@@ -54,7 +54,7 @@
         total: 0,
         projectCertificationInventoryId: '',
         url: {
-          list: '/platform/projectCertificationInventoryLogEO/page'
+          list: '/project/projectCertificationInventoryLogEO/page'
         },
         columns: [
           {
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
index 2bede49f3..4f1464d6b 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
@@ -228,27 +228,27 @@
 
         <!--        发起任务-->
         <div @click="initiatingProcessClick('rzgcsjsrw',$t('confirmLaunchTask'))"
-             v-if="roleSwitchingCode == 2" class="operator-text">
+             v-if="roleSwitchingCode == 1" class="operator-text">
           <a-icon type="check-circle"/>
           {{ $t('initiateTask') }}
         </div>
 
         <!--        退回至Studio-->
         <div @click="returnToStudioClick('rzgcsthrw',$t('areYouReturnToStudio'))"
-             v-if="roleSwitchingCode == 2" class="operator-text">
+             v-if="roleSwitchingCode == 1" class="operator-text">
           <a-icon type="close-circle"/>
           {{ $t('returnToStudio') }}
         </div>
 
         <!--        审批通过-->
-        <div @click="ApprovedClick('rzgcssc_tg',$t('confirmApproval'))" v-if="roleSwitchingCode == 2"
+        <div @click="ApprovedClick('rzgcssc_tg',$t('confirmApproval'))" v-if="roleSwitchingCode == 1"
              class="operator-text">
           <a-icon type="check-circle"/>
           {{ $t('reviewAndPass') }}
         </div>
 
         <!--        审批退回-->
-        <div @click="ApprovedClick('rzgcssc_th',$t('confirmReturnForApproval'))" v-if="roleSwitchingCode == 2"
+        <div @click="ApprovedClick('rzgcssc_th',$t('confirmReturnForApproval'))" v-if="roleSwitchingCode == 1"
              class="operator-text">
           <a-icon type="close-circle"/>
           {{ $t('reviewAndReturn') }}
@@ -1125,10 +1125,10 @@
           ...this.queryParam,
           ids: selectedRowKeys.join(','),
           ...this.queryParamQuery,
-          excelName: this.$route.query.projectName,
+          excelName: this.$route.query.projectNameId,
           projectLibraryId: this.$route.query.id
         }
-        downloadFile(this.url.exportData, this.$route.query.projectName + '.zip', query, this.Deselect)
+        downloadFile(this.url.exportData, this.$route.query.projectNameId + '.zip', query, this.Deselect)
       },
       handleDel() {
         let _this = this
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
index 2bd9fb111..53fac2abb 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
@@ -166,7 +166,7 @@
                 <span class="Required" v-if="formInline.roleCodeIndex == 1">*</span>
                 <span class="title-text-text" :title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span>
               </div>
-              <a-form-model-item class="itemModel" :prop="'regulationOwnerId'">
+              <a-form-model-item class="itemModel" :prop="'regulationOwnerIdName'">
 <!--                <a-select :placeholder="$t('PleaseSelect')+$t('regulatoryEngineer')"-->
 <!--                          class="box-input"-->
 <!--                          :disabled="formInline.roleCodeIndex == 1 ? false : true"-->
@@ -187,7 +187,7 @@
                                     v-if="visible"
                                     :disabled="isEdit(this.formInline)"
                                     @change="PersonnelSelectionChange"
-                                    v-model="formInline.regulationOwnerId"/>
+                                    v-model="formInline.regulationOwnerIdName"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -197,7 +197,7 @@
                 <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
               </div>
-              <a-form-model-item class="itemModel" :prop="'engineeringInterfacePerson'">
+              <a-form-model-item class="itemModel" :prop="'engineeringInterfacePersonName'">
 <!--                <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"-->
 <!--                          class="box-input"-->
 <!--                          allowClear-->
@@ -217,7 +217,7 @@
                                     v-if="visible"
                                     :disabled="isEdit(this.formInline)"
                                     @change="PersonnelSelectionChange"
-                                    v-model="formInline.engineeringInterfacePerson"/>
+                                    v-model="formInline.engineeringInterfacePersonName"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -847,8 +847,6 @@
         })
       },
       dutyTerritoryChange(event) {
-        this.formInline.regulationOwnerId = undefined
-        this.formInline.engineeringInterfacePerson = undefined
         this.formInline.homologationEngineerId = undefined
         this.formInline.designInitiatorId = undefined
         this.formInline.prehomoInitiatorId = undefined
@@ -940,12 +938,14 @@
           this.getDutyTerritory(item.dutyDepart.join(','))
         }
         console.log(item.dutyTerritory)
-        if (item.dutyTerritory && item.dutyTerritory.length > 0) {
-          this.queryPersonByProject(item)
-        } else {
+        // if (item.dutyTerritory && item.dutyTerritory.length > 0) {
+        //   this.queryPersonByProject(item)
+        // } else {
           this.formInline = item
           this.formInline = { ...this.formInline }
-        }
+        // }
+        console.log(this.formInline)
+        console.log(this.formInline.regulationOwnerIdName)
         this.$nextTick(() => {
           this.$refs.ruleForm.clearValidate()
         })

From 1f8d40bde70168783483f4083172983b55fe1327 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 15 Sep 2023 11:10:39 +0800
Subject: [PATCH 044/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=80=80=E5=9B=9E=E8=87=B3studio=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/certificationList/index.vue           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
index 4f1464d6b..689e12d4e 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
@@ -233,12 +233,12 @@
           {{ $t('initiateTask') }}
         </div>
 
-        <!--        退回至Studio-->
-        <div @click="returnToStudioClick('rzgcsthrw',$t('areYouReturnToStudio'))"
-             v-if="roleSwitchingCode == 1" class="operator-text">
-          <a-icon type="close-circle"/>
-          {{ $t('returnToStudio') }}
-        </div>
+<!--        &lt;!&ndash;        退回至Studio&ndash;&gt;-->
+<!--        <div @click="returnToStudioClick('rzgcsthrw',$t('areYouReturnToStudio'))"-->
+<!--             v-if="roleSwitchingCode == 1" class="operator-text">-->
+<!--          <a-icon type="close-circle"/>-->
+<!--          {{ $t('returnToStudio') }}-->
+<!--        </div>-->
 
         <!--        审批通过-->
         <div @click="ApprovedClick('rzgcssc_tg',$t('confirmApproval'))" v-if="roleSwitchingCode == 1"

From 3b574926b6f2e832a37c619cb1bf2275b97250d2 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 15 Sep 2023 11:11:29 +0800
Subject: [PATCH 045/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=90=88=E8=A7=84=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...formProjectLawsInventoryEOServiceImpl.java | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index a4eb66f62..799273bdc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -7618,27 +7618,34 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 		//对应 Subject
 		dataMap.put("SUBJECT", StringUtils.isNotEmpty(projectLawsInventoryEO.getTitle()) ? projectLawsInventoryEO.getTitle() : "");
 		//对应 Project
-		dataMap.put("PROJECT_NAME", StringUtils.isNotEmpty(projectNameInfoEO.getProjectName()) ? projectNameInfoEO.getProjectName() : "");
+		dataMap.put("PROJECT_NAME", StringUtils.isNotEmpty(projectLibraryBase.getProjectNameId()) ? projectLibraryBase.getProjectNameId() : "");
+//		dataMap.put("PROJECT_NAME", StringUtils.isNotEmpty(projectNameInfoEO.getProjectName()) ? projectNameInfoEO.getProjectName() : "");
 
 		List<SysDictItem> regionDictList = sysDictItemServiceImpl.selectItemsByDictCode("region");
 		String market = "";
 		if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
-			market = regionDictList.stream()
-					.filter(e -> projectLibraryBase.getTargetMarket().contains(e.getItemValue()))
-					.map(SysDictItem::getItemText)
-					.collect(Collectors.joining(","));
+			if(StringUtils.isNotBlank(projectLibraryBase.getTargetMarket())){
+				market = regionDictList.stream()
+						.filter(e -> projectLibraryBase.getTargetMarket().contains(e.getItemValue()))
+						.map(SysDictItem::getItemText)
+						.collect(Collectors.joining(","));
+			}
 		} else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
-			market = regionDictList.stream()
-					.filter(e -> projectLibraryBase.getTargetMarket().contains(e.getItemValue()))
-					.map(SysDictItem::getEnName)
-					.collect(Collectors.joining(","));
+			if(StringUtils.isNotBlank(projectLibraryBase.getTargetMarket())){
+				market = regionDictList.stream()
+						.filter(e -> projectLibraryBase.getTargetMarket().contains(e.getItemValue()))
+						.map(SysDictItem::getEnName)
+						.collect(Collectors.joining(","));
+			}
 		}
 		//对应 Market
 		dataMap.put("MARKET", StringUtils.isNotEmpty(market) ? market : "");
-		//对应 nt 数字平台
-		dataMap.put("NT", StringUtils.isNotEmpty(projectNameInfoEO.getDigitalPlatform()) ? projectNameInfoEO.getDigitalPlatform() : "");
-		//对应 np 车型平台
-		dataMap.put("NP", StringUtils.isNotEmpty(projectNameInfoEO.getVehiclePlatform()) ? projectNameInfoEO.getVehiclePlatform() : "");
+		if(ObjectUtils.isNotEmpty(projectNameInfoEO)){
+			//对应 nt 数字平台
+			dataMap.put("NT", StringUtils.isNotEmpty(projectNameInfoEO.getDigitalPlatform()) ? projectNameInfoEO.getDigitalPlatform() : "");
+			//对应 np 车型平台
+			dataMap.put("NP", StringUtils.isNotEmpty(projectNameInfoEO.getVehiclePlatform()) ? projectNameInfoEO.getVehiclePlatform() : "");
+		}
 		String processEndTimeStr = "";
 		// 流程最后结束的时间
 		if (projectLawsInventoryEO.getProcessEndTime() != null) {

From bce3feb1bf9ab1247ccc019822ff948aa17d8850 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 15 Sep 2023 11:42:52 +0800
Subject: [PATCH 046/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6->=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E5=92=8C=E4=BB=BB=E5=8A=A1=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95-=E6=96=B0=E5=A2=9E=E6=97=B6=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=94=B1=E6=B8=85=E5=8D=95=E5=BE=85=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E6=94=B9=E4=B8=BA=E4=BB=BB=E5=8A=A1=E5=BE=85=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformProjectCertificationInventoryEOServiceImpl.java   | 2 +-
 .../impl/PlatformProjectLawsInventoryEOServiceImpl.java       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
index b3c422c46..1209fcfab 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
@@ -894,7 +894,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 				projectCertificationInventoryEO.setWvtaId(wvtaId);
 				projectCertificationInventoryEO.setBussDocumentLibraryId(bussDocumentLibraryId);
 				projectCertificationInventoryEO.setProjectLibraryId(projectLibraryId);
-				projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+				projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
 				projectCertificationInventoryEO.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
 				projectCertificationInventoryEOList.add(projectCertificationInventoryEO);
 			}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index 799273bdc..1010a9174 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -521,8 +521,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 				projectLawsInventoryTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
 				projectLawsInventoryTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
 				projectLawsInventoryTemp.setStandId(standId);
-				projectLawsInventoryTemp.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
-				projectLawsInventoryTemp.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+				projectLawsInventoryTemp.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
+				projectLawsInventoryTemp.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
 				list.add(projectLawsInventoryTemp);
 
 				ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();

From fd2ef618845787a7e2fe93eafd669f6aa482b2a5 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 15 Sep 2023 13:47:17 +0800
Subject: [PATCH 047/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=8F=91=E8=B5=B7=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/certificationList/components/addModel.vue      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
index 1bd0ae6b5..7faf15fad 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
@@ -487,7 +487,7 @@
                     <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
                   </div>
                   <a-form-model-item class="itemModel"
-                                     :prop="formInline.deliverableType == '1635545748968783874'?'':'sdt'"
+                                     :prop="formInline.deliverableType == '1635545748968783874'?'':'sdtName'"
                                      :rules="[{ required: formInline.deliverableType=='1635545748968783874'?false:true,
                                  message: $t('engineeringInterfacePerson') + $t('cannotEmpty'), trigger: 'change'}]"
                   >
@@ -511,7 +511,7 @@
                                         :personneQuery="formInline"
                                         v-if="visible"
                                         @change="PersonnelSelectionChange"
-                                        v-model="formInline.sdt"/>
+                                        v-model="formInline.sdtName"/>
                   </a-form-model-item>
                 </div>
               </a-col>

From c5536f7672e719ef08d072c2111e6309293487d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Fri, 15 Sep 2023 14:29:10 +0800
Subject: [PATCH 048/288] =?UTF-8?q?=E6=B7=BB=E5=8A=A0OTA=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/toDoCenter/OTAToDoTask/index.vue    | 323 ++++++++++++++++++
 1 file changed, 323 insertions(+)
 create mode 100644 jero-web/src/views/toDoCenter/OTAToDoTask/index.vue

diff --git a/jero-web/src/views/toDoCenter/OTAToDoTask/index.vue b/jero-web/src/views/toDoCenter/OTAToDoTask/index.vue
new file mode 100644
index 000000000..15e2d7e23
--- /dev/null
+++ b/jero-web/src/views/toDoCenter/OTAToDoTask/index.vue
@@ -0,0 +1,323 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('softwareversion')">
+                <span>{{$t('softwareversion')}}</span>
+              </div>
+              <a-select :placeholder="$t('PleaseSelect')+$t('softwareplatform')"
+                        class="box-input"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        allowClear
+                        showSearch
+                        optionFilterProp="label"
+                        :autoClearSearchValue="false"
+                        v-model="queryParam.releaseName">
+                <a-select-option v-for="(item, key) in softwareversionList"
+                                 :label='item'
+                                 :key="key"
+                                 :value="item">
+                  <span style="display: inline-block;width: 100%" :title=" item">
+                    {{ item }}
+                  </span>
+                </a-select-option>
+              </a-select>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('releaseType')">
+                <span>{{$t('releaseType')}}</span>
+              </div>
+              <a-select :placeholder="$t('PleaseSelect')+$t('releaseType')"
+                        class="box-input"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        allowClear
+                        showSearch
+                        optionFilterProp="label"
+                        v-model="queryParam.releaseType">
+                <a-select-option v-for="(item, key) in releaseTypeList"
+                                 :label='item'
+                                 :key="key"
+                                 :value="item">
+                  <span style="display: inline-block;width: 100%" :title=" item">
+                    {{ item }}
+                  </span>
+                </a-select-option>
+              </a-select>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('vehicleType')">
+                <span>{{$t('vehicleType')}}</span>
+              </div>
+              <a-select :placeholder="$t('PleaseSelect')+$t('vehicleType')"
+                        class="box-input"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        allowClear
+                        showSearch
+                        optionFilterProp="label"
+                        :autoClearSearchValue="false"
+                        v-model="queryParam.vehicle">
+                <a-select-option v-for="(item, key) in vehicleTypeList"
+                                 :label='item'
+                                 :key="key"
+                                 :value="item">
+                  <span style="display: inline-block;width: 100%" :title=" item">
+                    {{ item }}
+                  </span>
+                </a-select-option>
+              </a-select>
+            </div>
+          </a-col>
+
+          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                  <a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+               </a-col>
+          </span>
+        </a-row>
+      </a-form>
+    </div>
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        :components="drag(columns,'columns')"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
+        rowKey="id"
+        :data-source="dataSource"
+        :columns="columns"
+      >
+        <span slot="action" slot-scope="text,record">
+         <a @click="processingClick(record)">{{$t('Processing')}}</a>
+        </span>
+      </a-table>
+      <div class="page" v-if="dataSource.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} ` +$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="pageOnChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+  </a-card>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+  export default {
+    name: 'index',
+    components: {},
+    mixins:[ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        queryParam: {},
+        dataSource: [],
+        vehicleTypeList:[],
+        softwareversionList:[],
+        releaseTypeList:['BUILD','MARKETING','POC'],
+        pageSize: 10,
+        pageNo: 1,
+        total: 0,
+        loading: false,
+        url:{
+          list:'',
+        },
+        columns: [
+          {
+            title: this.$t('softwareversion'),
+            align: 'left',
+            dataIndex: 'releaseName',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('releaseType'),
+            align: 'left',
+            dataIndex: 'releaseType',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('vehicleType'),
+            align: 'left',
+            dataIndex: 'vehicle',
+            ellipsis: true,
+            width: 600,
+          },
+          {
+            title: this.$t('softwarereleasetime'),
+            align: 'left',
+            dataIndex: 'releaseDate',
+            ellipsis: true,
+            width: 170,
+          },
+          {
+            title: this.$t('operation'),
+            align: 'left',
+            ellipsis: true,
+            width: 170,
+            scopedSlots: { customRender: 'action' }
+          }
+        ]
+      }
+    },
+    mounted() {
+      this.getList()
+      this.getSelectData()
+    },
+    methods: {
+      getSelectData(){
+        getAction('/ota/otaManageApplyEO/getPullDownList', {}).then((res) => {
+          if (res.success) {
+            this.softwareversionList = res.result.plannedBpLaunchBatchList
+            this.vehicleTypeList = res.result.carSet
+          } else {
+          }
+        })
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.getList()
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...queryParam
+        }
+        this.loading = true
+        getAction('/ota/otaManageApplyEO/getOtaTodoList', query).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      processingClick(row){
+        let newUrl = this.$router.resolve({
+          path:'/components/detil',
+          query:{
+            vehicleTypeCode:row.vehicle,
+            plannedBpLaunchBatch:row.releaseName,
+            releaseDate:row.releaseDate
+          },
+        })
+        window.open(newUrl.href, '_blank')
+      },
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  @import'~@assets/less/common.less';
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+    /*margin-top: 2px;*/
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  ::v-deep .ant-table-row:first-child {
+    background: #fff !important;
+    opacity: 0.9;
+  }
+
+  ::v-deep .ant-table-body {
+    background: transparent !important;
+  }
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  ::v-deep .ant-table-placeholder{
+    margin-top: 8px !important;
+  }
+</style>
\ No newline at end of file

From 5ac493610bfcd8127504f8f9f251588ff3c8135b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Fri, 15 Sep 2023 14:37:48 +0800
Subject: [PATCH 049/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=9A=84=E8=A1=A8=E6=A0=BC=E5=8F=98=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otamanagement/otaAuthentication/index.vue | 651 +++++++++---------
 1 file changed, 333 insertions(+), 318 deletions(-)

diff --git a/jero-web/src/views/otamanagement/otaAuthentication/index.vue b/jero-web/src/views/otamanagement/otaAuthentication/index.vue
index ef4be56fa..9b03fe0f7 100644
--- a/jero-web/src/views/otamanagement/otaAuthentication/index.vue
+++ b/jero-web/src/views/otamanagement/otaAuthentication/index.vue
@@ -29,29 +29,29 @@
             </div>
           </a-col>
 
-<!--          <a-col :md="6" :sm="8">-->
-<!--            <div class="box-title-text">-->
-<!--              <div class="title-text" :title="$t('softwareplatform')">-->
-<!--                <span>{{ $t('softwareplatform') }}</span>-->
-<!--              </div>-->
-<!--              <a-select :placeholder="$t('PleaseSelect')+$t('softwareplatform')"-->
-<!--                        class="box-input"-->
-<!--                        :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
-<!--                        allowClear-->
-<!--                        showSearch-->
-<!--                        optionFilterProp="children"-->
-<!--                        :autoClearSearchValue="false"-->
-<!--                        v-model="queryParam.softwareplatform">-->
-<!--                <a-select-option v-for="(item, key) in softwareplatformList"-->
-<!--                                 :key="key"-->
-<!--                                 :value="item.value">-->
-<!--                  <span style="display: inline-block;width: 100%" :title=" item.name">-->
-<!--                    {{ item.name }}-->
-<!--                  </span>-->
-<!--                </a-select-option>-->
-<!--              </a-select>-->
-<!--            </div>-->
-<!--          </a-col>-->
+          <!--          <a-col :md="6" :sm="8">-->
+          <!--            <div class="box-title-text">-->
+          <!--              <div class="title-text" :title="$t('softwareplatform')">-->
+          <!--                <span>{{ $t('softwareplatform') }}</span>-->
+          <!--              </div>-->
+          <!--              <a-select :placeholder="$t('PleaseSelect')+$t('softwareplatform')"-->
+          <!--                        class="box-input"-->
+          <!--                        :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+          <!--                        allowClear-->
+          <!--                        showSearch-->
+          <!--                        optionFilterProp="children"-->
+          <!--                        :autoClearSearchValue="false"-->
+          <!--                        v-model="queryParam.softwareplatform">-->
+          <!--                <a-select-option v-for="(item, key) in softwareplatformList"-->
+          <!--                                 :key="key"-->
+          <!--                                 :value="item.value">-->
+          <!--                  <span style="display: inline-block;width: 100%" :title=" item.name">-->
+          <!--                    {{ item.name }}-->
+          <!--                  </span>-->
+          <!--                </a-select-option>-->
+          <!--              </a-select>-->
+          <!--            </div>-->
+          <!--          </a-col>-->
 
           <a-col :md="6" :sm="8">
             <div class="box-title-text">
@@ -145,7 +145,7 @@
             <a-col :md="6" :sm="24">
               <a @click="handleToggleSearch">
                 {{ !toggleSearchStatus ? $t('open') : $t('away') }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
               </a>
               <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{ $t('reset') }}</a-button>
               <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
@@ -157,339 +157,354 @@
     <div class="table-operator">
       <div class="operator-text" @click="handleExportManage"
            v-has="'ota:export'">
-        <a-icon type="export" :rotate="-90" />
+        <a-icon type="export" :rotate="-90"/>
         {{ $t('export') }}
       </div>
     </div>
     <div>
-      <a-table ref="table" size="middle" :components="drag(columns, 'columns')" :loading="loading" :pagination="false"
-        :scroll="{ x: '100%', y: 'calc(100vh - 140px)' }" rowKey="id" :data-source="dataSource" @change="tableOnChange"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns">
+      <a-table ref="table"
+               size="middle"
+               :components="drag(columns, 'columns')"
+               :loading="loading" :pagination="false"
+               :rowClassName="rowClassName"
+               :scroll="{ x: '100%', y: 'calc(100vh - 140px)' }" rowKey="id" :data-source="dataSource"
+               @change="tableOnChange"
+               :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns">
         <!--         -->
         <span slot="operation" slot-scope="text,record">
           <a class="text-operation" @click="detailclick(record)">{{text}}</a>
         </span>
       </a-table>
       <div class="page" v-if="dataSource && dataSource.length > 0">
-        <a-pagination :show-total="total => $t('total') + ` ${total} ` + $t('strip')" show-quick-jumper show-size-changer
-          :page-size.sync="pageSize" :total="total" :current="pageNo" @change="pageOnChange"
-          @showSizeChange="SizeChange" />
+        <a-pagination :show-total="total => $t('total') + ` ${total} ` + $t('strip')" show-quick-jumper
+                      show-size-changer
+                      :page-size.sync="pageSize" :total="total" :current="pageNo" @change="pageOnChange"
+                      @showSizeChange="SizeChange"/>
       </div>
     </div>
   </a-card>
 </template>
 
 <script>
-import { getAction, postAction, deleteAction,downloadFile } from '@/api/manage'
-import { mapGetters } from 'vuex'
-import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
-import ImportFile from '@/components/ImportFileData/index'
-import moment from 'moment'
+  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+  import { mapGetters } from 'vuex'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+  import ImportFile from '@/components/ImportFileData/index'
+  import moment from 'moment'
 
-export default {
-  name: 'index',
-  components: {
-    ImportFile
-  },
-  mixins: [ResizeHeader, ResizeColumnProvide],
-  data() {
-    return {
-      //url传参严格按照当前命名
-      url: {
-        list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/page',
-        deleteBatch: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/deleteBatch',
-        exportData: '/ota/otaBaCxList/exportData',
-        importZipUrl: '/ota/otaBaCxList/importData',//导入
-      },
-      number:'',
-      visible: false,
-      loading: false,
-      toggleSearchStatus: false,
-      dataSource: [],
-      selectedRowKeys: [],
-      selectedRowKeysRecord: [],
-      serialNumber: '',
-      total: 0,
-      pageSize: 10,
-      pageNo: 1,
-      CategoryTreeList: [],
-      softwareversionList: [],
-      softwareplatformList: [],
-      vehicleTypeList: [],
-      marketList: [],
-      queryParam: {
-      },
-      formInline: {},
-      releaseTypeList:['BUILD','MARKETING','POC'],
-      rules: {
-        whetherTobring: [
+  export default {
+    name: 'index',
+    components: {
+      ImportFile
+    },
+    mixins: [ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        //url传参严格按照当前命名
+        url: {
+          list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/page',
+          deleteBatch: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/deleteBatch',
+          exportData: '/ota/otaBaCxList/exportData',
+          importZipUrl: '/ota/otaBaCxList/importData'//导入
+        },
+        number: '',
+        visible: false,
+        loading: false,
+        toggleSearchStatus: false,
+        dataSource: [],
+        selectedRowKeys: [],
+        selectedRowKeysRecord: [],
+        serialNumber: '',
+        total: 0,
+        pageSize: 10,
+        pageNo: 1,
+        CategoryTreeList: [],
+        softwareversionList: [],
+        softwareplatformList: [],
+        vehicleTypeList: [],
+        marketList: [],
+        queryParam: {},
+        formInline: {},
+        releaseTypeList: ['BUILD', 'MARKETING', 'POC'],
+        rules: {
+          whetherTobring: [
+            {
+              required: true,
+              message: this.$t('standardDecompositionDocument') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ]
+        },
+        columns: [
           {
-            required: true,
-            message: this.$t('standardDecompositionDocument') + this.$t('cannotEmpty'),
-            trigger: 'change'
+            title: this.$t('softwareversion'),
+            align: 'left',
+            dataIndex: 'plannedBpLaunchBatch',
+            ellipsis: true,
+            sorter: true,
+            width: 150,
+            scopedSlots: { customRender: 'operation' }
+          },
+          // {
+          //   title: this.$t('softwareplatform'),
+          //   align: 'left',
+          //   dataIndex: 'ggpc',
+          //   ellipsis: true,
+          //   width: 170
+          // },
+          {
+            title: this.$t('market'),
+            align: 'left',
+            width: 150,
+            ellipsis: true,
+            sorter: true,
+            dataIndex: 'market'
+          },
+          {
+            title: this.$t('releaseType'),
+            align: 'left',
+            width: 150,
+            ellipsis: true,
+            sorter: true,
+            dataIndex: 'releaseType'
+          },
+          {
+            title: this.$t('vehicleType'),
+            align: 'left',
+            width: 600,
+            ellipsis: true,
+            sorter: true,
+            dataIndex: 'appliedVehicleProject'
+          },
+          {
+            title: this.$t('softwarereleasetime'),
+            align: 'left',
+            width: 120,
+            ellipsis: true,
+            sorter: true,
+            dataIndex: 'releaseDate'
           }
-        ]
+          // {
+          //   title: this.$t('operation'),
+          //   align: 'left',
+          //   fixed: 'right',
+          //   width: 100,
+          //   scopedSlots: { customRender: 'operation' }
+          // }
+        ],
+        userInfoQuery: {},
+        administrators: false,
+        orderBy: '1',
+        orderByField: ''
+      }
+    },
+    mounted() {
+      this.getSelectData()
+      this.getList()
+      this.administrators = false
+    },
+    methods: {
+      ...mapGetters(['userInfo']),
+      getSelectData() {
+        getAction('/ota/otaManageApplyEO/getPullDownList', {}).then((res) => {
+          if (res.success) {
+            this.softwareversionList = res.result.plannedBpLaunchBatchList
+            this.vehicleTypeList = res.result.carSet
+            this.marketList = res.result.marketSet
+          } else {
+          }
+        })
       },
-      columns: [
-        {
-          title: this.$t('softwareversion'),
-          align: 'left',
-          dataIndex: 'plannedBpLaunchBatch',
-          ellipsis: true,
-          sorter:true,
-          width: 150,
-          scopedSlots: { customRender: 'operation' }
-        },
-        // {
-        //   title: this.$t('softwareplatform'),
-        //   align: 'left',
-        //   dataIndex: 'ggpc',
-        //   ellipsis: true,
-        //   width: 170
-        // },
-        {
-          title: this.$t('market'),
-          align: 'left',
-          width: 150,
-          ellipsis: true,
-          sorter:true,
-          dataIndex: 'market'
-        },
-        {
-          title: this.$t('releaseType'),
-          align: 'left',
-          width: 150,
-          ellipsis: true,
-          sorter:true,
-          dataIndex: 'releaseType'
-        },
-        {
-          title: this.$t('vehicleType'),
-          align: 'left',
-          width: 600,
-          ellipsis: true,
-          sorter:true,
-          dataIndex: 'appliedVehicleProject'
-        },
-        {
-          title: this.$t('softwarereleasetime'),
-          align: 'left',
-          width: 120,
-          ellipsis: true,
-          sorter:true,
-          dataIndex: 'releaseDate'
-        },
-        // {
-        //   title: this.$t('operation'),
-        //   align: 'left',
-        //   fixed: 'right',
-        //   width: 100,
-        //   scopedSlots: { customRender: 'operation' }
-        // }
-      ],
-      userInfoQuery: {},
-      administrators: false,
-      orderBy: '1',
-      orderByField: ''
-    }
-  },
-  mounted() {
-    this.getSelectData()
-    this.getList()
-    this.administrators = false
-  },
-  methods: {
-    ...mapGetters(['userInfo']),
-    getSelectData(){
-      getAction('/ota/otaManageApplyEO/getPullDownList', {}).then((res) => {
-        if (res.success) {
-          this.softwareversionList = res.result.plannedBpLaunchBatchList
-          this.vehicleTypeList = res.result.carSet
-          this.marketList = res.result.marketSet
-        } else {
-        }
-      })
-    },
-    tableOnChange(pagination, filters, sorter) {
-      this.orderBy = sorter.order == 'ascend' ? '1' : '2'
-      this.orderByField = sorter.columnKey
-      this.getList()
-    },
-    handleToggleSearch() {
-      this.toggleSearchStatus = !this.toggleSearchStatus
-    },
-    searchQuery() {
-      this.pageNo = 1
-      this.getList()
-    },
-    searchReset() {
-      this.queryParam = {}
-      this.$route.query.serialNumber = ''
-      this.$route.query.flowStatus = ''
-      this.pageNo = 1
-      this.getList()
-    },
-    pageOnChange(page) {
-      this.pageNo = page
-      this.getList()
-    },
-    SizeChange(page, pageSize) {
-      this.pageNo = 1
-      this.pageSize = pageSize
-      this.getList()
-    },
-    getList() {
-      let queryParam = JSON.parse(JSON.stringify(this.queryParam))
-      Object.keys(queryParam).forEach(val => {
-        if (queryParam[val] instanceof Array) {
-          queryParam[val] = queryParam[val].join(',')
-        }
-      })
-      let query = {
-        pageNo: this.pageNo,
-        pageSize: this.pageSize,
-        orderBy: this.orderBy,
-        orderByField: this.orderByField,
-        ...queryParam
-      }
-      this.loading = true
-      getAction('/ota/otaManageApplyEO/getOtaPage', query).then((res) => {
-        if (res.success) {
-          if (res.result.current > 1 && res.result.records.length == 0) {
-            this.pageNo = 1
-            this.getList()
-            return
+      tableOnChange(pagination, filters, sorter) {
+        this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+        this.orderByField = sorter.columnKey
+        this.getList()
+      },
+      handleToggleSearch() {
+        this.toggleSearchStatus = !this.toggleSearchStatus
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.$route.query.serialNumber = ''
+        this.$route.query.flowStatus = ''
+        this.pageNo = 1
+        this.getList()
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
           }
-          this.dataSource = res.result.records || []
-          this.total = res.result.total
-          this.loading = false
-        } else {
-          this.loading = false
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          orderBy: this.orderBy,
+          orderByField: this.orderByField,
+          ...queryParam
+        }
+        this.loading = true
+        getAction('/ota/otaManageApplyEO/getOtaPage', query).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value, record) {
+        this.selectedRowKeys = value
+        this.selectedRowKeysRecord = record
+      },
+      //导出
+      handleExportManage() {
+        // console.log('menuId',this.menuId)
+        let dateName = moment(new Date()).format('YYYYMMDD')
+        let name = 'OTA' + this.$t('softwareversion') + ' ' + dateName + '.xlsx'
+        let long = localStorage.getItem('language')
+        let cut = ''
+        if (long && long == 'zh-cn') {
+          this.cut = 'cn'
+        } else if (long && long == 'en-us') {
+          this.cut = 'en'
+        }
+        let query = {
+          exportName: name,
+          selections: this.selectedRowKeys.join(','),
+          ...this.queryParam,
+          cut: this.cut
         }
-      })
-    },
-    onSelectChange(value, record) {
-      this.selectedRowKeys = value
-      this.selectedRowKeysRecord = record
-    },
-    //导出
-    handleExportManage() {
-      // console.log('menuId',this.menuId)
-      let dateName = moment(new Date()).format('YYYYMMDD')
-      let name = 'OTA' + this.$t('softwareversion') + ' ' + dateName + '.xlsx'
-      let long = localStorage.getItem('language')
-      let cut = ''
-      if (long && long == 'zh-cn') {
-        this.cut = 'cn'
-      } else if (long && long == 'en-us') {
-        this.cut = 'en'
-      }
-      let query = {
-        exportName: name,
-        selections: this.selectedRowKeys.join(','),
-        ...this.queryParam,
-        cut:this.cut
-      }
 
-      downloadFile('ota/otaManageApplyEO/otaExportXls', name, query, this.selectClear)
-    },
-    // 查看
-    detailclick(item){
-      this.$router.push({
-        path: '/components/detil',
-        query: item
-      })
-    },
-    onChange(value, dateString) {
-      if (this.queryParam.releaseDate && this.queryParam.releaseDate.length > 0) {
-        let dateOne = moment(dateString[0]).format('YYYY-MM-DD')
-        let dateTwo = moment(dateString[1]).format('YYYY-MM-DD')
-        this.queryParam.softwareIssueTimeStart = dateOne
-        this.queryParam.softwareIssueTimeEnd = dateTwo
-      } else {
-        this.queryParam.releaseDate = []
-        // this.queryParamOne[item + '_name'] = []
+        downloadFile('ota/otaManageApplyEO/otaExportXls', name, query, this.selectClear)
+      },
+      // 查看
+      detailclick(item) {
+        this.$router.push({
+          path: '/components/detil',
+          query: item
+        })
+      },
+      onChange(value, dateString) {
+        if (this.queryParam.releaseDate && this.queryParam.releaseDate.length > 0) {
+          let dateOne = moment(dateString[0]).format('YYYY-MM-DD')
+          let dateTwo = moment(dateString[1]).format('YYYY-MM-DD')
+          this.queryParam.softwareIssueTimeStart = dateOne
+          this.queryParam.softwareIssueTimeEnd = dateTwo
+        } else {
+          this.queryParam.releaseDate = []
+          // this.queryParamOne[item + '_name'] = []
+        }
+      },
+      rowClassName(row, index) {
+        if (row.isNew) {
+          return 'rowClassRedYellow'
+        }
       }
-    },
+    }
   }
-}
 </script>
 
 <style>
-.tree-select .ant-select-tree-dropdown {
-  height: 298px !important;
-}
+  .tree-select .ant-select-tree-dropdown {
+    height: 298px !important;
+  }
 </style>
 <style scoped>
-@import '~@assets/less/common.less';
+  @import '~@assets/less/common.less';
 
-.page {
-  text-align: right;
-  margin-top: 20px;
-}
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
 
-.box-title-text {
-  line-height: 1.4;
-  display: flex;
-  align-items: center;
-  margin-bottom: 10px;
-}
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
 
-.title-text {
-  width: 20%;
-  min-width: 110px;
-  color: #000F16;
-  display: inline-block;
-  font-weight: 500;
-  font-size: 14px;
-  margin-right: 16px;
-  margin-top: 3px;
-  text-align: right;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
 
-.box-input {
-  display: inline-block;
-  width: 70%;
-  height: 38px;
-  margin-top: 2px;
-}
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
 
-.box-button {
-  height: 38px;
-  /*margin-top: 2px;*/
-}
+  .box-button {
+    height: 38px;
+    /*margin-top: 2px;*/
+  }
 
-.text-operation {
-  margin-right: 8px;
-}
+  .text-operation {
+    margin-right: 8px;
+  }
 
-.itemModel {
-  width: calc(100% - 130px);
-  display: inline-block;
-  margin-top: 2px;
-}
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
 
-.Required {
-  color: red;
-  margin-right: 4px;
-}
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
 
-::v-deep .ant-table-row:first-child {
-  background: #fff !important;
-  opacity: 0.9;
-}
+  /*::v-deep .ant-table-row:first-child {*/
+  /*  background: #fff !important;*/
+  /*  opacity: 0.9;*/
+  /*}*/
 
-::v-deep .ant-table-body {
-  background: transparent !important;
-}
+  ::v-deep .ant-table-body {
+    background: transparent !important;
+  }
 
-::v-deep .ant-table-placeholder {
-  margin-top: 8px !important;
-}
-/deep/ .ant-calendar-range-picker-input{
-  margin-left: -2px !important;
-}
+  ::v-deep .ant-table-placeholder {
+    margin-top: 8px !important;
+  }
+
+  /deep/ .ant-calendar-range-picker-input {
+    margin-left: -2px !important;
+  }
+
+  ::v-deep .rowClassRedYellow {
+    background: yellow!important;
+  }
 </style>
\ No newline at end of file

From 5d788afc91f7f814b17ec8d1e2391633ac240405 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 15 Sep 2023 15:21:49 +0800
Subject: [PATCH 050/288] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?=
 =?UTF-8?q?=E6=B3=95=E8=A7=84=E8=AE=A4=E8=AF=81=E6=B5=81=E7=A8=8B-?=
 =?UTF-8?q?=E5=BE=85=E5=8A=9E=E6=B5=81=E7=A8=8B=EF=BC=88=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E4=BB=B6=E6=95=B0=E6=8D=AE=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/ProcessInfoEOMapper.xml        | 130 ++++++++++++++----
 1 file changed, 102 insertions(+), 28 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
index bc43106a7..fca1d4afe 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
@@ -267,34 +267,6 @@
                             process_info_detail pid
                        where pid.process_info_id = pi.id and pid.STATUS = 'NotDone' and pid.end_time is not null and pid.user_id = #{params.currentUserId}  order by pid.end_time asc limit 1
                    ) as end_time,
-                    <!--(
-                        case when flow_type = '21' then
-                            (
-                                SELECT
-                                    pci.end_time
-                                FROM
-                                    project_certification_inventory pci
-                                WHERE
-                                    pci.project_library_id = pi.id
-                                    AND ( pci.flow_status = 'List to be checked' OR pci.flow_status = 'Refusal of responsible person' )
-                                ORDER BY
-                                pci.end_time ASC
-                                LIMIT 1
-                            )
-                            when flow_type = '10' then
-                            (
-                                SELECT
-                                    pid.end_time
-                                FROM
-                                    process_info_detail pid
-                                WHERE
-                                    pid.process_info_id = pi.id
-                                    AND pid.STATUS = 'NotDone'
-                                ORDER BY
-                                pid.end_time ASC
-                                LIMIT 1
-                            ) end
-                    )AS end_time,-->
                    pi.STATUS,
                    pi.prc_num,
                    pi.prc_name,
@@ -324,6 +296,108 @@
                         #{item}
                     </foreach>
                    and plb.platform is null
+                   union
+        SELECT
+        pi.id,
+        pi.project_library_id,
+        pi.project_laws_inventory_id,
+        pi.buss_document_library_id,
+        pi.acti_proc_inst_id,
+        plb.project_name_id AS project_name,
+        pyni.year_name,
+        pli.serial_number,
+        pli.title,
+        bdl.title_en,
+        <if test="params.cut == 'cn'">
+            concat(pli.serial_number,' ',pli.title) as standard_info,
+        </if>
+        <if test="params.cut == 'en'">
+            concat(pli.serial_number,' ',bdl.title_en) as standard_info,
+        </if>
+        (case pi.flow_type when '32' THEN '2'  when '34' THEN '4' else pi.flow_type END) as flow_type,
+        pi.create_by,
+        pi.end_time,
+        pi.STATUS,
+        pi.prc_num,
+        pi.prc_name,
+        plb.project_name_id,
+        plb.target_market,
+        plb.studio_engineer,
+        plb.project_version,
+        plb.parent_id
+        FROM
+        process_info pi
+        LEFT JOIN project_library_base plb ON plb.id = pi.project_library_id
+        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
+        LEFT JOIN project_laws_inventory pli ON pi.project_laws_inventory_id = pli.id
+        LEFT JOIN buss_document_library bdl ON pi.buss_document_library_id = bdl.id
+        where
+        (
+        pi.id IN (
+        SELECT
+        pid.process_info_id
+        FROM
+        process_info_detail pid
+        where pid.user_id = #{params.currentUserId} and pid.status = #{params.taskStatus}
+        )
+        )
+        AND pi.flow_type IN
+        <foreach collection="params.flowTypeList" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        and plb.platform is not null
+        union
+        SELECT
+        pi.id,
+        pi.project_library_id,
+        pi.project_laws_inventory_id,
+        pi.buss_document_library_id,
+        pi.acti_proc_inst_id,
+        plb.project_name_id AS project_name,
+        pyni.year_name,
+        '--' as serial_number,
+        '--' as standard_info,
+        '' as title,
+        '' as title_en,
+        pi.flow_type,
+        pi.create_by,
+        (
+        select
+        pid.end_time
+        from
+        process_info_detail pid
+        where pid.process_info_id = pi.id and pid.STATUS = 'NotDone' and pid.end_time is not null and pid.user_id = #{params.currentUserId}  order by pid.end_time asc limit 1
+        ) as end_time,
+        pi.STATUS,
+        pi.prc_num,
+        pi.prc_name,
+        plb.project_name_id,
+        plb.target_market,
+        plb.studio_engineer,
+        plb.project_version,
+        plb.parent_id
+        FROM
+        process_info pi
+        LEFT JOIN project_library_base plb ON plb.id = pi.project_library_id
+        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
+        LEFT JOIN project_laws_inventory pli ON pi.project_laws_inventory_id = pli.id
+        WHERE
+        (
+        pi.id IN (
+        SELECT
+        pid.process_info_id
+        FROM
+        process_info_detail pid
+        where pid.user_id = #{params.currentUserId} and pid.status = #{params.taskStatus}
+        )
+        )
+        AND  pi.flow_type IN
+        <foreach collection="params.qdqrFlowTypeValue" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        and plb.platform is not null
         )temp
         <include refid="BaseQuerySql"/>
         order by

From 19131b86d9b5f2386eb30df815201c33cd73861d Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 15 Sep 2023 15:56:20 +0800
Subject: [PATCH 051/288] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=EF=BC=8C=E5=B7=B2=E5=8A=9E=E6=B5=81=E7=A8=8B=EF=BC=8C=E5=B7=B2?=
 =?UTF-8?q?=E5=8F=91=E6=B5=81=E7=A8=8B=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=88=E5=B9=B3=E5=8F=B0=E4=BB=B6=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/ProcessInfoEOMapper.xml        | 137 +++---------------
 1 file changed, 22 insertions(+), 115 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
index fca1d4afe..fc024a11a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
@@ -67,8 +67,12 @@
                 pi.project_laws_inventory_id,
                 pi.buss_document_library_id,
                 pi.acti_proc_inst_id,
-                <!--pni.project_name,-->
-                <!--concat( pni.project_name, '-', pyni.year_name ) AS project_name,-->
+                case
+                when
+                year_name_id is null
+                THEN plb.project_name_id
+                when year_name_id is not null
+                THEN
                 concat(
                     pni.project_name, '-',
                     pyni.year_name, '-',
@@ -87,7 +91,7 @@
                             AND dict_id = ( SELECT id FROM sys_dict WHERE dict_code = 'region' )
                     ) , '-',
                     plb.project_version
-                ) AS project_name,
+                ) end AS project_name,
                 pyni.year_name,
                 pli.serial_number,
                 pli.title,
@@ -118,7 +122,6 @@
                 left join project_laws_inventory pli on pi.project_laws_inventory_id = pli.id
                 LEFT JOIN buss_document_library bdl ON pi.buss_document_library_id = bdl.id
             <where>
-                plb.platform is null
                 <if test="params.queryType != 'issuedProcess'">
                     and pi.id IN (
                         SELECT
@@ -161,8 +164,12 @@
                    pi.project_laws_inventory_id,
                    pi.buss_document_library_id,
                    pi.acti_proc_inst_id,
-                   <!--pni.project_name,-->
-                   <!--concat( pni.project_name, '-', pyni.year_name ) AS project_name,-->
+                   case
+                   when
+                   year_name_id is null
+                   THEN plb.project_name_id
+                   when year_name_id is not null
+                   THEN
                     concat(
                         pni.project_name, '-',
                         pyni.year_name, '-',
@@ -181,7 +188,7 @@
                                 AND dict_id = ( SELECT id FROM sys_dict WHERE dict_code = 'region' )
                         ) , '-',
                         plb.project_version
-                    ) AS project_name,
+                    ) end AS project_name,
                    pyni.year_name,
                    pli.serial_number,
                    pli.title,
@@ -224,7 +231,6 @@
                      <foreach collection="params.flowTypeList" index="index" item="item" open="(" separator="," close=")">
                         #{item}
                      </foreach>
-                     and plb.platform is null
                union
                SELECT
                    pi.id,
@@ -232,8 +238,12 @@
                    pi.project_laws_inventory_id,
                    pi.buss_document_library_id,
                    pi.acti_proc_inst_id,
-                    <!--pni.project_name,-->
-                    <!--concat( pni.project_name, '-', pyni.year_name ) AS project_name,-->
+                   case
+                   when
+                   year_name_id is null
+                   THEN plb.project_name_id
+                   when year_name_id is not null
+                   THEN
                     concat(
                         pni.project_name, '-',
                         pyni.year_name, '-',
@@ -252,7 +262,7 @@
                                 AND dict_id = ( SELECT id FROM sys_dict WHERE dict_code = 'region' )
                         ) , '-',
                         plb.project_version
-                    ) AS project_name,
+                    ) end AS project_name,
                    pyni.year_name,
                    '--' as serial_number,
                    '--' as standard_info,
@@ -295,110 +305,7 @@
                     <foreach collection="params.qdqrFlowTypeValue" index="index" item="item" open="(" separator="," close=")">
                         #{item}
                     </foreach>
-                   and plb.platform is null
-                   union
-        SELECT
-        pi.id,
-        pi.project_library_id,
-        pi.project_laws_inventory_id,
-        pi.buss_document_library_id,
-        pi.acti_proc_inst_id,
-        plb.project_name_id AS project_name,
-        pyni.year_name,
-        pli.serial_number,
-        pli.title,
-        bdl.title_en,
-        <if test="params.cut == 'cn'">
-            concat(pli.serial_number,' ',pli.title) as standard_info,
-        </if>
-        <if test="params.cut == 'en'">
-            concat(pli.serial_number,' ',bdl.title_en) as standard_info,
-        </if>
-        (case pi.flow_type when '32' THEN '2'  when '34' THEN '4' else pi.flow_type END) as flow_type,
-        pi.create_by,
-        pi.end_time,
-        pi.STATUS,
-        pi.prc_num,
-        pi.prc_name,
-        plb.project_name_id,
-        plb.target_market,
-        plb.studio_engineer,
-        plb.project_version,
-        plb.parent_id
-        FROM
-        process_info pi
-        LEFT JOIN project_library_base plb ON plb.id = pi.project_library_id
-        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
-        LEFT JOIN project_laws_inventory pli ON pi.project_laws_inventory_id = pli.id
-        LEFT JOIN buss_document_library bdl ON pi.buss_document_library_id = bdl.id
-        where
-        (
-        pi.id IN (
-        SELECT
-        pid.process_info_id
-        FROM
-        process_info_detail pid
-        where pid.user_id = #{params.currentUserId} and pid.status = #{params.taskStatus}
-        )
-        )
-        AND pi.flow_type IN
-        <foreach collection="params.flowTypeList" index="index" item="item" open="(" separator="," close=")">
-            #{item}
-        </foreach>
-        and plb.platform is not null
-        union
-        SELECT
-        pi.id,
-        pi.project_library_id,
-        pi.project_laws_inventory_id,
-        pi.buss_document_library_id,
-        pi.acti_proc_inst_id,
-        plb.project_name_id AS project_name,
-        pyni.year_name,
-        '--' as serial_number,
-        '--' as standard_info,
-        '' as title,
-        '' as title_en,
-        pi.flow_type,
-        pi.create_by,
-        (
-        select
-        pid.end_time
-        from
-        process_info_detail pid
-        where pid.process_info_id = pi.id and pid.STATUS = 'NotDone' and pid.end_time is not null and pid.user_id = #{params.currentUserId}  order by pid.end_time asc limit 1
-        ) as end_time,
-        pi.STATUS,
-        pi.prc_num,
-        pi.prc_name,
-        plb.project_name_id,
-        plb.target_market,
-        plb.studio_engineer,
-        plb.project_version,
-        plb.parent_id
-        FROM
-        process_info pi
-        LEFT JOIN project_library_base plb ON plb.id = pi.project_library_id
-        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
-        LEFT JOIN project_laws_inventory pli ON pi.project_laws_inventory_id = pli.id
-        WHERE
-        (
-        pi.id IN (
-        SELECT
-        pid.process_info_id
-        FROM
-        process_info_detail pid
-        where pid.user_id = #{params.currentUserId} and pid.status = #{params.taskStatus}
-        )
-        )
-        AND  pi.flow_type IN
-        <foreach collection="params.qdqrFlowTypeValue" index="index" item="item" open="(" separator="," close=")">
-            #{item}
-        </foreach>
-        and plb.platform is not null
-        )temp
+                   )temp
         <include refid="BaseQuerySql"/>
         order by
             temp.end_time IS NULL,

From 0e8b3cd2d91e6c5f7ca4a6243defe0fc251bf190 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 15 Sep 2023 16:58:40 +0800
Subject: [PATCH 052/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectRegulationTasks/components/designCompliance.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
index 9bf569afd..c55695f3e 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
@@ -96,7 +96,7 @@
         queryBy: {},
         loading: false,
         url: {
-          urlFrom: 'project/projectLibraryBase/queryById',
+          urlFrom: 'project/projectLibraryBase/queryByIdFlow',
           queryProjectLawsInventoryInfoById: 'project/projectLawsInventoryEO/queryProjectLawsInventoryInfoById',
           queryTaskDetailByTaskIds: '/task/queryTaskDetailByTaskIds',
           edit: '/project/projectTaskInventoryDetailEO/edit',

From 20e0f1283d202b0ef0c1134a0ca379ad668e4879 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 15 Sep 2023 17:17:58 +0800
Subject: [PATCH 053/288] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLibraryBaseController.java         | 12 ++++
 .../mapper/ProjectLibraryBaseMapper.java      |  3 +-
 .../mapper/xml/ProjectLibraryBaseMapper.xml   |  9 +++
 .../service/IProjectLibraryBaseService.java   |  2 +
 .../impl/ProjectLibraryBaseServiceImpl.java   | 67 +++++++++++++++++--
 5 files changed, 87 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
index 13dc0cc81..c6ad6bd3b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
@@ -170,6 +170,18 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
 		return Result.OK(cut,data);
 	}
 
+	@AutoLog(value = "待办中心-项目详情")
+	@ApiOperation(value="待办中心-项目详情", notes="待办中心-项目详情")
+	@GetMapping(value = "/queryByIdFlow")
+	public Result<?> queryByIdFlow(@RequestParam(name="id",required=true) String id,
+							   @RequestParam(name="cut",required=true) String cut) {
+		List<ProjectLibraryBase> data = projectLibraryBaseService.queryByIdFlow(id,cut);
+			if(data==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cut,data);
+	}
+
     /**
     * 导出excel
     *
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java
index 177df9c1b..26e572258 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java
@@ -1,7 +1,6 @@
 package com.jero.modules.project.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.modules.project.entity.ProjectLibraryBase;
 import org.apache.ibatis.annotations.Param;
 
@@ -25,6 +24,8 @@ public interface ProjectLibraryBaseMapper extends BaseMapper<ProjectLibraryBase>
     /**根据id查询*/
     List<ProjectLibraryBase> queryById(String id);
 
+    List<ProjectLibraryBase> queryByIdFlow(String id);
+
     ProjectLibraryBase selectProjectName(@Param("projectLibraryId") String projectLibraryId);
 
     List<ProjectLibraryBase> getListByIds(@Param("idList") List<String> idList);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
index de931ad3b..2e5692fe3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
@@ -285,6 +285,15 @@
         </where>
         order by plb.create_time desc
     </select>
+    <select id="queryByIdFlow" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
+        <include refid="select_item"/>
+        <where>
+            <if test="id != null and id != '' ">
+                and plb.id=#{id}
+            </if>
+        </where>
+        order by plb.create_time desc
+    </select>
 
     <select id="selectProjectName" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
         SELECT
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java
index 887732bec..1582dcb0c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java
@@ -70,6 +70,8 @@ public interface IProjectLibraryBaseService extends IService<ProjectLibraryBase>
 	 */
 	List<ProjectLibraryBase> queryById(String id,String cut);
 
+	List<ProjectLibraryBase> queryByIdFlow(String id,String cut);
+
     /**
 	 * 列表查询
 	 *
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index f99bd3606..33539db73 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -22,17 +22,43 @@ import com.jero.modules.cert.template.enums.ControlTypeEnum;
 import com.jero.modules.dummy.enums.OrderEnum;
 import com.jero.modules.enums.DictCodeEnum;
 import com.jero.modules.feishu.enums.TemplateInfoEnum2;
-import com.jero.modules.ota.entity.OtaManageApplyEO;
 import com.jero.modules.ota.service.impl.OtaManageApplyEOServiceImpl;
-import com.jero.modules.project.entity.*;
-import com.jero.modules.project.enums.*;
+import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
+import com.jero.modules.project.entity.ProjectLawsInventoryEO;
+import com.jero.modules.project.entity.ProjectLawsInventoryLogEO;
+import com.jero.modules.project.entity.ProjectLibraryBase;
+import com.jero.modules.project.entity.ProjectLibraryRoleRelEO;
+import com.jero.modules.project.entity.ProjectRelatedPersonnel;
+import com.jero.modules.project.entity.ProjectTaskInventoryEO;
+import com.jero.modules.project.entity.ProjectTaskPlanning;
+import com.jero.modules.project.entity.ProjectUserPermission;
+import com.jero.modules.project.enums.CertificationFlowNodeEnum;
+import com.jero.modules.project.enums.CertificationInventoryFlowStatusEnum;
+import com.jero.modules.project.enums.CertificationProgressEnum;
+import com.jero.modules.project.enums.ComplianceFlowStatusEnum;
+import com.jero.modules.project.enums.DesignComplianceStatusEnum;
+import com.jero.modules.project.enums.HSStatisticalNodesEnum;
+import com.jero.modules.project.enums.OperatorTypeEnum;
+import com.jero.modules.project.enums.PermissionDescriptionEnum;
+import com.jero.modules.project.enums.ProjectRoleEnum;
+import com.jero.modules.project.enums.ProjectTaskPlanningNameEnum;
+import com.jero.modules.project.enums.ProjectUserLocationEnum;
+import com.jero.modules.project.enums.RoleRelModelTypeEnum;
+import com.jero.modules.project.enums.TaskAffirmStatusEnum;
+import com.jero.modules.project.enums.TaskStatusEnum;
+import com.jero.modules.project.enums.TopEnum;
 import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper;
 import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
 import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
 import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper;
 import com.jero.modules.project.mapper.ProjectTaskInventoryEOMapper;
 import com.jero.modules.project.mapper.ProjectUserPermissionMapper;
-import com.jero.modules.project.service.*;
+import com.jero.modules.project.service.IConditionAssessmentEOService;
+import com.jero.modules.project.service.IProjectCertificationInventoryEOService;
+import com.jero.modules.project.service.IProjectLibraryBaseService;
+import com.jero.modules.project.service.IProjectLibraryRoleRelEOService;
+import com.jero.modules.project.service.IProjectLibraryStatisticsService;
+import com.jero.modules.project.service.IProjectUserPermissionService;
 import com.jero.modules.project.vo.TimeNodeVO;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.entity.SysUser;
@@ -50,7 +76,6 @@ import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService;
 import com.jero.modules.top.entity.TopProjectEO;
 import com.jero.modules.top.service.ITopProjectEOService;
 import com.jero.modules.wkflow.enums.FlowTypeEnum;
-import javafx.beans.binding.ObjectBinding;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
@@ -1001,6 +1026,38 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		}
 		return records;
 	}
+	@Override
+	public List<ProjectLibraryBase> queryByIdFlow(String id,String cut) {
+		List<ProjectLibraryBase> records = projectLibraryBaseMapper.queryByIdFlow(id);
+		disposeData(records,"",false);
+		//目标市场数据字典
+		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
+		for(ProjectLibraryBase projectLibraryBase: records){
+			//历史数据的主版本没有版本号,所以默认给00
+			if(StringUtils.isBlank(projectLibraryBase.getParentId()) && StringUtils.isBlank(projectLibraryBase.getProjectVersion())){
+				projectLibraryBase.setProjectVersion("00");
+			}
+			//目标市场
+			Map<String,Object> param = new HashMap<>();
+			param.put("cut",cut);
+			String targetMarket = getMarket(param, targetMarketList, projectLibraryBase);
+			//主项目的版本号
+			String projectVersion = "";
+			if(StringUtils.isBlank(projectLibraryBase.getParentId())){
+				projectVersion = "00";
+			}else{
+				projectVersion = projectLibraryBase.getProjectVersion();
+			}
+			if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){
+				projectLibraryBase.setProjectName(projectLibraryBase.getProjectName()
+						+ "-" + projectLibraryBase.getYearName()
+						+ "-" + targetMarket + "-" + projectVersion);
+			}else{
+				projectLibraryBase.setProjectName(projectLibraryBase.getProjectNameId());
+			}
+		}
+		return records;
+	}
 
 	/**
 	 * 列表查询

From 7dd0130e68724955f0f8bd5c21a9829b1c797ecb Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 15 Sep 2023 17:18:38 +0800
Subject: [PATCH 054/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectRegulationTasks/components/projectInformation.vue  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue
index 5f2d2454c..f685a2d3d 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue
@@ -20,8 +20,8 @@
         <span class="text-field-right text-field-right-url"
               @click="RelatedItemsClick(queryForm)"
               v-else-if="item.projectVersion == 'projectVersion'"
-              :title="queryForm[item.value]+queryForm[item.projectVersion]"
-        >{{queryForm[item.value]+'-'+queryForm[item.projectVersion]}}</span>
+              :title="queryForm[item.value]"
+        >{{queryForm[item.value]}}</span>
         <span class="text-field-right" v-else :title="queryForm[item.value]"
         >{{queryForm[item.value]}}</span>
       </div>

From c02f35a118583c42a559d3ca591574041666e42a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Sun, 17 Sep 2023 18:56:31 +0800
Subject: [PATCH 055/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OtaManageApplyEOController.java           |  16 +++
 .../modules/ota/entity/OtaManageApplyEO.java  |   4 +
 .../ota/entity/OtaManagePermission.java       |   5 +
 .../modules/ota/entity/OtaManageReceive.java  |  10 ++
 .../jero/modules/ota/job/OtaDataUpdate.java   | 109 +++++++++++---
 .../ota/mapper/xml/OtaManageApplyEOMapper.xml |   5 +-
 .../ota/service/IOtaManageApplyEOService.java |   3 +
 .../ota/service/IOtaManageReceiveService.java |   3 +
 .../impl/OtaManageApplyEOServiceImpl.java     | 135 +++++++++++++-----
 .../impl/OtaManageReceiveServiceImpl.java     |  17 +++
 10 files changed, 252 insertions(+), 55 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java
index ff5d721a0..48402b047 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java
@@ -8,6 +8,7 @@ import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.util.PageUtil;
 import com.jero.modules.ota.entity.OtaManageApplyEO;
+import com.jero.modules.ota.entity.OtaManageReceiveNsdp;
 import com.jero.modules.ota.service.IOtaManageApplyEOService;
 import com.jero.modules.ota.vo.VersionVO;
 import com.jero.modules.project.entity.ProjectLibraryBase;
@@ -344,5 +345,20 @@ public class OtaManageApplyEOController extends JeroController<OtaManageApplyEO,
 		return otaManageApplyEOService.oneCarExportXls(request, otaManageApplyEO);
 	}
 
+	/**
+	 * OTA管理待办中心列表
+	 */
+	@AutoLog(value = "OTA管理列表和全车型列表-OTA管理待办中心列表")
+	@ApiOperation(value="OTA管理列表和全车型列表-OTA管理待办中心列表", notes="OTA管理列表和全车型列表-OTA管理待办中心列表")
+	@GetMapping(value = "/getOtaTodoList")
+	public Result<?> getOtaTodoList(OtaManageReceiveNsdp otaManageReceiveNsdp,
+									@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+
+		List<OtaManageReceiveNsdp> list = otaManageApplyEOService.getOtaTodoList(otaManageReceiveNsdp);
+		Page pages = PageUtil.getPages(pageNo, pageSize, list);
+		return Result.OK(pages);
+	}
+
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java
index 72191756b..31dae5e12 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java
@@ -221,6 +221,10 @@ public class OtaManageApplyEO implements Serializable {
     @ApiModelProperty(value = "发布类型")
     private String releaseType;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "车型(匹配版本号后)")
+    private String vehicleMatch;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "中英文切换")
     private String cut;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManagePermission.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManagePermission.java
index bdfd2c301..c0fa8d8ae 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManagePermission.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManagePermission.java
@@ -71,4 +71,9 @@ public class OtaManagePermission implements Serializable {
     @ApiModelProperty(value = "对应applyID")
     private String applyId;
 
+    /**车型*/
+    @Excel(name = "车型", width = 15)
+    @ApiModelProperty(value = "车型")
+    private String vehicle;
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceive.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceive.java
index 87712f25e..8b8651b67 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceive.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceive.java
@@ -116,6 +116,16 @@ public class OtaManageReceive implements Serializable {
     @ApiModelProperty(value = "发布时间")
     private String releaseDate;
 
+    /**车型(匹配版本号后)*/
+    @Excel(name = "车型(匹配版本号后)", width = 15)
+    @ApiModelProperty(value = "车型(匹配版本号后)")
+    private String vehicleMatch;
+
+    /**发布类型*/
+    @Excel(name = "发布类型", width = 15)
+    @ApiModelProperty(value = "发布类型")
+    private String releaseType;
+
 
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/job/OtaDataUpdate.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/job/OtaDataUpdate.java
index 5d25c3f37..0a9a6cfe4 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/job/OtaDataUpdate.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/job/OtaDataUpdate.java
@@ -17,6 +17,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 @Service
 public class OtaDataUpdate implements Job {
@@ -93,7 +94,6 @@ public class OtaDataUpdate implements Job {
             otaManageReceiveService.updateBatchById(updateList);
         }
 
-
         List<OtaManageReceiveNsdp> omrnSyncList = otaManageReceiveNsdpService.getOtaManageReceiveNsdpSync();
         List<OtaManageReceiveNsdp> omrnList = otaManageReceiveNsdpService.queryList();
 
@@ -117,9 +117,6 @@ public class OtaDataUpdate implements Job {
             }
         }
 
-        Map<String, Date> releaceDateMap = new HashMap<>();
-        Date today = new Date();
-
         for (OtaManageReceiveNsdp omrnSync : omrnSyncList) {
             boolean addFlag = true;
             for (OtaManageReceiveNsdp omrn : omrnList) {
@@ -138,20 +135,7 @@ public class OtaDataUpdate implements Job {
                 }
                 addNsdpList.add(omrnSync);
             }
-            //找到最快来临的发布时间
-            Date releaceDate = releaceDateMap.get(omrnSync.getReleaseName());
-            try {
-                Date syncDate = sdf.parse(omrnSync.getReleaseDate());
-                if (null == releaceDate) {
-                    releaceDateMap.put(omrnSync.getReleaseName(), syncDate);
-                } else {
-                    if (syncDate.after(today) && syncDate.before(releaceDate)) {
-                        releaceDateMap.put(omrnSync.getReleaseName(), syncDate);
-                    }
-                }
-            } catch (ParseException e) {
-                e.printStackTrace();
-            }
+
         }
 
         if (CollectionUtils.isNotEmpty(addNsdpList)) {
@@ -164,14 +148,101 @@ public class OtaDataUpdate implements Job {
             otaManageReceiveNsdpService.updateBatchById(updateNsdpList);
         }
 
+        //记录发布时间
+        Map<String, Date> releaceDateMap = new HashMap<>();
+        //记录车型列表
+        Map<String ,Set<String>> omrnVehicleMap = new HashMap<>();
 
+
+        Map<String ,String> releaceTypeMap = new HashMap<>();
+
+        Date today = new Date();
+        List<OtaManageReceiveNsdp> omrnLastList = otaManageReceiveNsdpService.queryList();
+        for (OtaManageReceiveNsdp omrn : omrnLastList) {
+            //找到最快来临的发布时间
+            Date releaceDate = releaceDateMap.get(omrn.getReleaseName());
+            try {
+                Date syncDate = sdf.parse(omrn.getReleaseDate());
+                if (null == releaceDate) {
+                    releaceDateMap.put(omrn.getReleaseName(), syncDate);
+                } else {
+                    if (syncDate.after(today) && syncDate.before(releaceDate)) {
+                        releaceDateMap.put(omrn.getReleaseName(), syncDate);
+                    }
+                }
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            //处理车型字符串
+            Set<String> vehicleSet = omrnVehicleMap.get(omrn.getReleaseName());
+            if(null == vehicleSet){
+                vehicleSet = new HashSet<>();
+            }
+            String appliedVehicleProject = omrn.getVehicle();
+            if(StringUtils.isNotEmpty(appliedVehicleProject)){
+                for (String s : appliedVehicleProject.split(",")) {
+                    String[] split = s.split(" ");
+                    if (split.length == 3) {
+                        String projectName = split[0];
+                        String market = split[2];
+                        vehicleSet.add(projectName + " " + market);
+                    }
+                }
+            }
+            omrnVehicleMap.put(omrn.getReleaseName(),vehicleSet);
+
+            releaceTypeMap.put(omrn.getReleaseName(),omrn.getReleaseType());
+        }
+
+
+        //开始刷新 otaManageReceive中的车型和发布时间
         List<OtaManageReceive> dateUpdateList = new ArrayList<>();
         List<OtaManageReceive> omrListForDate = otaManageReceiveService.queryList();
         for (OtaManageReceive omr : omrListForDate) {
+            //处理发布时间
             if (releaceDateMap.containsKey(omr.getPlannedBpLaunchBatch())) {
                 omr.setReleaseDate(sdf.format(releaceDateMap.get(omr.getPlannedBpLaunchBatch())));
-                dateUpdateList.add(omr);
             }
+            //处理车型
+            String appliedVehicleProject = omr.getAppliedVehicleProject();
+            Set<String> vehicleSet = new HashSet<>();
+            if(StringUtils.isNotEmpty(appliedVehicleProject)){
+                Set<String> omrnVehicleSet = omrnVehicleMap.get(omr.getPlannedBpLaunchBatch());
+                if(CollectionUtils.isEmpty(omrnVehicleSet)){
+                    omrnVehicleSet = new HashSet<>();
+                }
+                for (String s : appliedVehicleProject.split(",")) {
+                    String[] split = s.split(" ");
+                    if (split.length == 1 && "All".equals(split[0])) {
+                        vehicleSet.addAll(omrnVehicleSet);
+                    }else if (split.length == 2) {
+                        if("All".equals(split[1])){
+                            for (String val : omrnVehicleSet) {
+                                if(val.contains(split[0])){
+                                    vehicleSet.add(val);
+                                }
+                            }
+                        }else{
+                            for (String val : omrnVehicleSet) {
+                                if(val.contains(s)){
+                                    vehicleSet.add(val);
+                                }
+                            }
+                        }
+                    }else if (split.length == 3) {
+                        for (String val : omrnVehicleSet) {
+                            if(val.contains(split[0]+" "+split[2])){
+                                vehicleSet.add(val);
+                            }
+                        }
+                    }
+                }
+                if(!vehicleSet.isEmpty()){
+                    omr.setVehicleMatch(vehicleSet.stream().collect(Collectors.joining(",")));
+                }
+                omr.setReleaseType(releaceTypeMap.get(omr.getPlannedBpLaunchBatch()));
+            }
+            dateUpdateList.add(omr);
         }
         if (CollectionUtils.isNotEmpty(dateUpdateList)) {
             otaManageReceiveService.updateBatchById(dateUpdateList);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
index 2654ccc75..7c83b88f7 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
@@ -72,7 +72,7 @@
         omr.summary,omr.status,
         omr.homologation_impact,omr.homologation,
         omr.impact_cn_homo,omr.impact_eu_homo,
-        omr.master_domain,omr.applied_vehicle_project,
+        omr.master_domain,omr.applied_vehicle_project,omr.vehicle_match,
         oma.id,oma.project_version,oma.attestation_schedule,oma.match_status,oma.remark,oma.vehicle_type
         from ota_manage_receive omr
         left join ota_manage_apply oma on oma.vdr = omr.id
@@ -92,9 +92,6 @@
                 and (omr.impact_cn_homo LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.impactHomo}),'%')
                     and omr.impact_eu_homo LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.impactHomo}),'%'))
             </if>
-            <if test="otaManageApplyEO.appliedVehicleProject != null and otaManageApplyEO.appliedVehicleProject != ''">
-                and omr.applied_vehicle_project LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.appliedVehicleProject}),'%')
-            </if>
             <if test="otaManageApplyEO.homologationImpact != null and otaManageApplyEO.homologationImpact != ''">
                 and omr.homologation_impact LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.homologationImpact}),'%')
             </if>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java
index 45220cbb6..c007e9b14 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java
@@ -2,6 +2,7 @@ package com.jero.modules.ota.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.ota.entity.OtaManageApplyEO;
+import com.jero.modules.ota.entity.OtaManageReceiveNsdp;
 import com.jero.modules.ota.vo.VersionVO;
 import com.jero.modules.project.entity.ProjectLibraryBase;
 import org.springframework.web.servlet.ModelAndView;
@@ -134,4 +135,6 @@ public interface IOtaManageApplyEOService extends IService<OtaManageApplyEO> {
 	ModelAndView allCarExportXls(HttpServletRequest request, OtaManageApplyEO otaManageApplyEO);
 
 	ModelAndView oneCarExportXls(HttpServletRequest request, OtaManageApplyEO otaManageApplyEO);
+
+    List<OtaManageReceiveNsdp> getOtaTodoList(OtaManageReceiveNsdp otaManageReceiveNsdp);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageReceiveService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageReceiveService.java
index 765eb5aed..4e8be0be0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageReceiveService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageReceiveService.java
@@ -4,6 +4,7 @@ import com.jero.modules.ota.entity.OtaManageApplyEO;
 import com.jero.modules.ota.entity.OtaManageReceive;
 import com.baomidou.mybatisplus.extension.service.IService;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: OTA管理
@@ -64,6 +65,8 @@ public interface IOtaManageReceiveService extends IService<OtaManageReceive> {
 
 	List<OtaManageReceive> getReceiveByplanned(String plannedBpLaunchBatch);
 
+	List<OtaManageReceive> getReceiveByplannedList(List<String> plannedBpLaunchBatchList);
+
 	List<OtaManageReceive> getReceiveSync();
 
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
index 857172ece..c53bef149 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
@@ -833,27 +833,31 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                         manageApplyEO.setVehicleType("");
                     }
                 }
-                String appliedVehicleProject = manageApplyEO.getAppliedVehicleProject();
+                String appliedVehicleProject = manageApplyEO.getVehicleMatch();
                 if (StringUtils.isNotBlank(appliedVehicleProject)) {
                     String[] appliedVehicleProjectArr = appliedVehicleProject.split(",");
                     for (String appliedVehicleProjectTemp : appliedVehicleProjectArr) {
-                        String[] split = appliedVehicleProjectTemp.split(" ");
-                        if (split.length == 1) {
+                        if(carMarket.equals(appliedVehicleProjectTemp)){
                             omaMap.put(manageApplyEO.getVdr(), manageApplyEO);
                             break;
-                        } else if (split.length == 2) {
-                            if (Arrays.equals(conditionSplit, split)) {
-                                omaMap.put(manageApplyEO.getVdr(), manageApplyEO);
-                                break;
-                            }
-                        } else if (split.length == 3) {
-                            List<String> listTemp = Arrays.asList(split);
-                            List<String> conditionList = Arrays.asList(conditionSplit);
-                            if (listTemp.containsAll(conditionList)) {
-                                omaMap.put(manageApplyEO.getVdr(), manageApplyEO);
-                                break;
-                            }
                         }
+//                        String[] split = appliedVehicleProjectTemp.split(" ");
+//                        if (split.length == 1) {
+//                            omaMap.put(manageApplyEO.getVdr(), manageApplyEO);
+//                            break;
+//                        } else if (split.length == 2) {
+//                            if (Arrays.equals(conditionSplit, split)) {
+//                                omaMap.put(manageApplyEO.getVdr(), manageApplyEO);
+//                                break;
+//                            }
+//                        } else if (split.length == 3) {
+//                            List<String> listTemp = Arrays.asList(split);
+//                            List<String> conditionList = Arrays.asList(conditionSplit);
+//                            if (listTemp.containsAll(conditionList)) {
+//                                omaMap.put(manageApplyEO.getVdr(), manageApplyEO);
+//                                break;
+//                            }
+//                        }
                     }
                 }
             }
@@ -1449,7 +1453,6 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
 
              */
 
-
             List<OtaManageReceiveNsdp> dataList = otaManageReceiveNsdpService.getListByReleaseName(id);
             //车型
             Set<String> vehicleSet = new HashSet<>();
@@ -1459,15 +1462,8 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                     for (String s : appliedVehicleProject.split(",")) {
                         String[] split = s.split(" ");
                         if (split.length == 3) {
-                            String projectName = split[0].toUpperCase(Locale.ROOT);
-                            String market = "";
-                            if (split[2].equals("CN")) {
-                                market = "China";
-                            } else if (split[2].equals("RHD")) {
-                                market = "UK";
-                            } else {
-                                market = split[2];
-                            }
+                            String projectName = split[0];
+                            String market = split[2];
                             vehicleSet.add(projectName + " " + market);
                         }
                     }
@@ -1478,33 +1474,50 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
             ProjectLibraryBase plbSearch = new ProjectLibraryBase();
             plbSearch.setDigitalPlatform("NT2");
             List<ProjectLibraryBase> plbList = projectLibraryBaseService.getList(plbSearch);
-            //存储符合条件的项目中Studio的用户ID
-            Set<String> matchStudioSet = new HashSet();
+            //存储符合条件的项目中Studio的用户ID,value车型列表
+            Map<String,Set<String>> matchStudioMap = new HashMap<>();
             for (ProjectLibraryBase plb : plbList) {
-                String projectName = plb.getProjectName().toUpperCase(Locale.ROOT);
+                String projectName = plb.getProjectName();
+                if(projectName.equals("FORCE")){
+                    projectName = "Force";
+                }
                 boolean flag = false;
                 String targetMarket = plb.getTargetMarket();
                 String[] targetMarkets = targetMarket.split(",");
                 for (String tm : targetMarkets) {
-                    String vehicleStr =projectName + " " + tm;
+                    String tmStr = tm.trim();
+                    if (tm.equals("China")) {
+                        tmStr = "CN";
+                    } else if (tm.equals("UK")) {
+                        tmStr = "RHD";
+                    }
+                    String vehicleStr = projectName + " " + tmStr;
                     if (vehicleSet.contains(vehicleStr)) {
-                        matchStudioSet.add(plb.getStudioEngineer());
+                        Set vehset = null;
+                        if (matchStudioMap.containsKey(plb.getStudioEngineer())) {
+                            vehset = matchStudioMap.get(plb.getStudioEngineer());
+                        } else {
+                            vehset = new HashSet<>();
+                        }
+                        vehset.add(vehicleStr);
+                        matchStudioMap.put(plb.getStudioEngineer(), vehset);
                     }
                 }
             }
 
             List<OtaManagePermission> ompList = new ArrayList<>();
-            for (String studioId : matchStudioSet) {
+            for (String studioId : matchStudioMap.keySet()) {
                 OtaManagePermission omp = new OtaManagePermission();
                 omp.setApplyId(id);
                 omp.setUserId(studioId);
+                omp.setVehicle(matchStudioMap.get(studioId).stream().collect(Collectors.joining(",")));
                 ompList.add(omp);
             }
             otaManagePermissionService.saveBatch(ompList);
             //给studio发消息
             LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
             Map<String, Object> params = new HashMap<>();
-            List<String> userIdList = new ArrayList<>(matchStudioSet);
+            List<String> userIdList = new ArrayList<>(matchStudioMap.keySet());
             params.put("userIdList", userIdList);
             params.put("contentCn", "您好，请及时查看处理此项任务，谢谢！-请在PC端查看");
             params.put("contentEn", "Hello! Please check and address the task in a timely manner. Thank you!-Check on the PC");
@@ -2264,4 +2277,62 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
     }
 
 
+    public List<OtaManageApplyEO> getListByVdrList(List<String> vdrList) {
+        if(CollectionUtils.isEmpty(vdrList)){
+            return new ArrayList<>();
+        }
+        QueryWrapper<OtaManageApplyEO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().in(OtaManageApplyEO::getVdr, vdrList);
+        List<OtaManageApplyEO> resList = this.list(queryWrapper);
+        return resList;
+    }
+
+    @Override
+    public List<OtaManageReceiveNsdp> getOtaTodoList(OtaManageReceiveNsdp otaManageReceiveNsdp) {
+        List<OtaManageReceiveNsdp> resList = new ArrayList<>();
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String userId = user.getId();
+        //查询所有此人权限
+        List<OtaManagePermission> ompList = otaManagePermissionService.queryByUserId(userId);
+        //筛选版本号ID
+        List<String> plannedList = ompList.stream().map(OtaManagePermission::getApplyId).distinct().collect(Collectors.toList());
+        //查询所有VDR
+        List<OtaManageReceive> omrList = otaManageReceiveService.getReceiveByplannedList(plannedList);
+
+        List<String> vdrList = omrList.stream().map(OtaManageReceive::getId).distinct().collect(Collectors.toList());
+
+        List<OtaManageApplyEO> omaList = this.getListByVdrList(vdrList);
+
+        for (OtaManagePermission omp : ompList) {
+            String vehicleStr = omp.getVehicle();
+            String[] vehicleList = vehicleStr.split(",");
+            for (String vehicle : vehicleList) {
+                List<OtaManageReceive> omrVehicleList = omrList.stream()
+                        .filter(obj -> StringUtils.isNotEmpty(obj.getPlannedBpLaunchBatch()) && obj.getPlannedBpLaunchBatch().equals(omp.getApplyId())
+                                && StringUtils.isNotEmpty(obj.getVehicleMatch()) && obj.getVehicleMatch().contains(vehicle))
+                        .collect(Collectors.toList());
+
+                for (OtaManageReceive mrVehicle : omrVehicleList) {
+                    if (!OtaHomoImpactEnum.YES.getValue().equals(mrVehicle.getHomologationImpact())
+                            && !OtaHomoImpactEnum.INTER_VALID.getValue().equals(mrVehicle.getHomologationImpact())) {
+                        List<OtaManageApplyEO> applyList = omaList.stream()
+                                .filter(obj -> StringUtils.isNotEmpty(obj.getVdr()) && obj.getVdr().equals(mrVehicle.getId())
+                                        && StringUtils.isNotEmpty(obj.getVehicleType()) && obj.getVehicleType().equals(vehicle))
+                                .collect(Collectors.toList());
+                        if(CollectionUtils.isEmpty(applyList) || OtaStatusEnum.TO_BE_MATCHED.getKey().equals(applyList.get(0).getMatchStatus())){
+                            OtaManageReceiveNsdp omrn = new OtaManageReceiveNsdp();
+                            omrn.setId(UUID.randomUUID().toString().replace("-", ""));
+                            omrn.setReleaseName(omp.getApplyId());
+                            omrn.setReleaseType(mrVehicle.getReleaseType());
+                            omrn.setVehicle(vehicle);
+                            omrn.setReleaseDate(mrVehicle.getReleaseDate());
+                            resList.add(omrn);
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        return resList;
+    }
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageReceiveServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageReceiveServiceImpl.java
index 8292a10d1..01167b407 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageReceiveServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageReceiveServiceImpl.java
@@ -4,9 +4,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.modules.ota.entity.OtaManageReceive;
 import com.jero.modules.ota.mapper.OtaManageReceiveMapper;
 import com.jero.modules.ota.service.IOtaManageReceiveService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Date;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
@@ -100,6 +106,17 @@ public class OtaManageReceiveServiceImpl extends ServiceImpl<OtaManageReceiveMap
 		return this.list(queryWrapper);
 	}
 
+	@Override
+	public List<OtaManageReceive> getReceiveByplannedList(List<String> plannedBpLaunchBatchList) {
+		if(CollectionUtils.isEmpty(plannedBpLaunchBatchList)){
+			return new ArrayList<>();
+		}
+		QueryWrapper<OtaManageReceive> queryWrapper = new QueryWrapper<>();
+		queryWrapper.lambda().in(OtaManageReceive::getPlannedBpLaunchBatch, plannedBpLaunchBatchList);
+		List<OtaManageReceive> resList = this.list(queryWrapper);
+		return resList;
+	}
+
 	@Override
 	public List<OtaManageReceive> getReceiveSync() {
 		return this.getBaseMapper().getReceiveSync();

From f49ce9c2172105c9d30aa8221335ab151c53d1bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Sun, 17 Sep 2023 21:00:10 +0800
Subject: [PATCH 056/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/system/controller/SysPermissionController.java   | 5 +++++
 .../com/jero/modules/system/enums/SysPermissionEnum.java     | 1 +
 2 files changed, 6 insertions(+)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java
index 84956933d..e1aa6a133 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java
@@ -688,6 +688,11 @@ public class SysPermissionController {
 				existTaskFlag = sysPermissionService.judgeToDo();
 				meta.put("existTask",existTaskFlag);
 			}
+			//OTA任务
+			if(StringUtils.equals(permission.getId(), SysPermissionEnum.OTA_TASKS.getId())){
+
+			}
+
 			json.put("meta", meta);
 		}
 
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/SysPermissionEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/SysPermissionEnum.java
index 951afcc20..8af3f1388 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/SysPermissionEnum.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/SysPermissionEnum.java
@@ -9,6 +9,7 @@ public enum SysPermissionEnum {
 
     PROJECT_REGULATION_TASKS("项目法规任务","1580735287309119489",""),
     REGULATORY_ASSESSMENT_TASKS("法规评估任务","1580735611793059842",""),
+    OTA_TASKS("OTA任务","1702513806814900226",""),
     PROJECT_PARAMETER_TASKS("项目参数任务","1580735965892980738","");
 
     private String name;

From 2a1c567977a5fbce74e158415c016a01d4114361 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 18 Sep 2023 09:14:34 +0800
Subject: [PATCH 057/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6->=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E4=B8=AD=E6=B8=85=E5=8D=95=E5=BE=85?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=94=B9=E4=B8=BA=E6=B8=85=E5=8D=95=E5=B8=A6?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PlatformProjectLawsInventoryEOServiceImpl.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index 1010a9174..016f7b15e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -4862,18 +4862,18 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 
 			// 区分重置设计、验证、全部流程
 			if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_ALL_RESET_FLOW.getValue())){
-				updateWrapper.set(ProjectLawsInventoryEO::getDesignFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
-				updateWrapper.set(ProjectLawsInventoryEO::getVerifyFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+				updateWrapper.set(ProjectLawsInventoryEO::getDesignFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
+				updateWrapper.set(ProjectLawsInventoryEO::getVerifyFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
 				piFlowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue());
 				piFlowTypeList.add(FlowTypeEnum.YZFHXSCLC.getValue());
 				piFlowTypeList.add(FlowTypeEnum.SJ_XGJFWLC.getValue());
 				piFlowTypeList.add(FlowTypeEnum.YZ_XGJFWLC.getValue());
 			}else if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_DESIGN_RESET_FLOW.getValue())){
-				updateWrapper.set(ProjectLawsInventoryEO::getDesignFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+				updateWrapper.set(ProjectLawsInventoryEO::getDesignFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
 				piFlowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue());
 				piFlowTypeList.add(FlowTypeEnum.SJ_XGJFWLC.getValue());
 			}else if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_VERIFY_RESET_FLOW.getValue())){
-				updateWrapper.set(ProjectLawsInventoryEO::getVerifyFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+				updateWrapper.set(ProjectLawsInventoryEO::getVerifyFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
 				piFlowTypeList.add(FlowTypeEnum.YZFHXSCLC.getValue());
 				piFlowTypeList.add(FlowTypeEnum.YZ_XGJFWLC.getValue());
 			}

From ddfff05de2b18b7859df435572f382b54c620fea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Mon, 18 Sep 2023 11:28:38 +0800
Subject: [PATCH 058/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DummyInventoryInfoEOServiceImpl.java        |  4 ++++
 .../service/impl/OtaManageApplyEOServiceImpl.java    | 12 +++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
index 486ba10c1..339a11252 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
@@ -2273,6 +2273,10 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				value = pullMore(dictItemList, dummyInventoryInfoEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field","duty_territory");
 				if(StringUtils.isNotBlank(value)){
 					dummyInventoryInfoEO.setDutyTerritory(value);
+					List<String> list = Arrays.asList(value.split(","));
+					List<SysDictItem> ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList());
+					List<String> valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList());
+					dummyInventoryInfoEO.setDutyDepart(StringUtils.join(valueList,","));
 				}
 			}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
index c53bef149..4f48be03a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
@@ -216,12 +216,14 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                 for (OtaManageReceiveNsdp omrn : valList) {
                     //找到最快来临的发布时间
                     try {
-                        Date syncDate = sdf.parse(omrn.getReleaseDate());
-                        if (null == releaseDate) {
-                            releaseDate = syncDate;
-                        } else {
-                            if (syncDate.after(today) && syncDate.before(releaseDate)) {
+                        if(StringUtils.isNotEmpty(omrn.getReleaseDate())){
+                            Date syncDate = sdf.parse(omrn.getReleaseDate());
+                            if (null == releaseDate) {
                                 releaseDate = syncDate;
+                            } else {
+                                if (syncDate.after(today) && syncDate.before(releaseDate)) {
+                                    releaseDate = syncDate;
+                                }
                             }
                         }
                     } catch (ParseException e) {

From cbcd3bde70de4d881a87803edcbe1cb27943f2df Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 18 Sep 2023 13:44:25 +0800
Subject: [PATCH 059/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctCertificationInventoryEOServiceImpl.java | 212 +++++++++++++-----
 1 file changed, 162 insertions(+), 50 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
index 1209fcfab..0ca6f884a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
@@ -2459,11 +2459,8 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 
 		ProjectLibraryBase projectLibraryBase = JSONObject.parseObject(JSONObject.toJSONString(json.get("projectLibraryBase")), ProjectLibraryBase.class);
 
-		// 给认证工程师分配待办中心的任务
-		String certificationEngineer = projectLibraryBase.getCertificationEngineer();
-		if(StringUtils.isEmpty(certificationEngineer)){
-			throw new JeroBootException("该项目中认证工程师为空，请先维护认证工程师！");
-		}
+		String lawsEngineer = projectLibraryBase.getCreateBy();
+		SysUser userByName = sysUserService.getUserByName(lawsEngineer);
 
 		// 根据项目库id查询当前项目认证清单数据，获取数据状态为 结果待审查的 截止时间 最早的一个时间
 		Date endTime = null;
@@ -2487,11 +2484,10 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 		}
 
 		List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
-		List<String> certificationEngineerList = Arrays.asList(certificationEngineer.split(","));
-		// 给认证工程师分配任务
-		for (String userId : certificationEngineerList) {
+		// 给法规工程师分配任务
+		if(ObjectUtils.isNotEmpty(userByName)){
 			ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
-			processInfoDetailEO.setUserId(userId);
+			processInfoDetailEO.setUserId(userByName.getId());
 			processInfoDetailEO.setTaskDefinitionKey(CertificationFlowNodeEnum.RZGCSSC.getKey());
 			processInfoDetailEO.setCreateTime(new Date());
 			processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue());
@@ -2505,13 +2501,9 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
 			projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue());
 			processHistoryEOService.add(projectCertificationInventoryEO.getId(),CertificationFlowNodeEnum.TASK_HANDLING.getKey(),currentUser.getId(),null,null,projectCertificationInventoryEO.getDeliveryResult());
-
 		}
-
 		this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_SUBMIT_TASK.getValue());
 
-		List<SysUser> certificationEngineers = this.sysUserService.querySysUserListByIdList(certificationEngineerList);
-
 		try {
 			this.updateBatchById(projectCertificationInventoryEOList);
 
@@ -2528,16 +2520,20 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 			detailUpdateWrap.set(ProcessInfoDetailEO::getUpdateBy,currentUser.getUsername());
 			this.processInfoDetailEOService.update(detailUpdateWrap);
 
-			// 给认证工程师分配待办中心的任务  认证工程师审查
+			// 给法规工程师分配待办中心的任务  认证工程师审查
 			this.addProcessInfoDetailEO(processInfoDetailEOList,projectLibraryBase.getId(),CertificationFlowNodeEnum.RZGCSSC.getKey());
+
+			List<SysUser> sysUserList = new ArrayList<>();
+			sysUserList.add(userByName);
 			this.sendMessageByTemplateId(
 					projectCertificationInventoryEOList,
 					TemplateInfoEnum2.CERTIFICATION_MESSAGE23.getValue(),
-					certificationEngineerList,
-					certificationEngineers,
+					Arrays.asList(userByName.getId().split(",")),
+					sysUserList,
 					endTime,
 					CertificationFlowNodeEnum.TASK_REVIEW.getKey()
 			);
+
 		}catch (Exception ex){
 			ex.printStackTrace();
 			log.error("责任人-提交任务失败：" + ex.getMessage());
@@ -2546,6 +2542,119 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 
 		return Result.OK("提交任务成功！");
 	}
+//	private Result<?> dutyPersonSubmitTask(JSONObject json) {
+//		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//
+//		String ids = json.getString("ids");
+//		if(StringUtils.isEmpty(ids)){
+//			throw new JeroBootException("至少选择一条数据进行操作！");
+//		}
+//		List<String> idList = Arrays.asList(ids.split(","));
+//
+//		List<String> flowStatusList = new ArrayList<>();
+//		flowStatusList.add(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue());
+//		flowStatusList.add(CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue());
+//
+//		QueryWrapper<ProjectCertificationInventoryEO> queryWrapper = new QueryWrapper<>();
+//		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getId,idList);
+//		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList);
+//		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.list(queryWrapper);
+//		this.disposeData(projectCertificationInventoryEOList,CutEnum.CN.getValue());
+//
+//		if(CollectionUtils.isEmpty(projectCertificationInventoryEOList)){
+//			throw new JeroBootException("至少选择一条数据流程状态为'结果待提交 或 审查退回'的数据！");
+//		}
+//		this.certificationInventoryEOListSortByEndTimeAsc(projectCertificationInventoryEOList);
+//
+//		ProjectLibraryBase projectLibraryBase = JSONObject.parseObject(JSONObject.toJSONString(json.get("projectLibraryBase")), ProjectLibraryBase.class);
+//
+//		// 给认证工程师分配待办中心的任务
+//		String certificationEngineer = projectLibraryBase.getCertificationEngineer();
+//		if(StringUtils.isEmpty(certificationEngineer)){
+//			throw new JeroBootException("该项目中认证工程师为空，请先维护认证工程师！");
+//		}
+//
+//		// 根据项目库id查询当前项目认证清单数据，获取数据状态为 结果待审查的 截止时间 最早的一个时间
+//		Date endTime = null;
+//		QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
+//		pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryBase.getId());
+//		pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getFlowStatus,CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue());
+//		pciQueryWrap.lambda().isNotNull(ProjectCertificationInventoryEO::getEndTime);
+//		List<ProjectCertificationInventoryEO> pciEoList = this.list(pciQueryWrap);
+//		if(CollectionUtils.isNotEmpty(pciEoList) || CollectionUtils.isNotEmpty(projectCertificationInventoryEOList)){
+//			List<Date> endTimeList = new ArrayList<>();
+//			// 本次提交之前数据库里面存在的截止时间
+//			List<Date> oldEndTimeList = pciEoList.stream().map(ProjectCertificationInventoryEO::getEndTime).distinct().collect(Collectors.toList());
+//			endTimeList.addAll(oldEndTimeList);
+//			// 当前要提交的数据截止时间
+//			List<Date> newEndTimeList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getEndTime).distinct().collect(Collectors.toList());
+//			endTimeList.addAll(newEndTimeList);
+//
+//			endTimeList = endTimeList.stream().distinct().collect(Collectors.toList());
+//			Collections.sort(endTimeList, (d1, d2) -> d1.compareTo(d2)); // 根据时间顺序排序
+//			endTime = endTimeList.get(0);
+//		}
+//
+//		List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
+//		List<String> certificationEngineerList = Arrays.asList(certificationEngineer.split(","));
+//		// 给认证工程师分配任务
+//		for (String userId : certificationEngineerList) {
+//			ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
+//			processInfoDetailEO.setUserId(userId);
+//			processInfoDetailEO.setTaskDefinitionKey(CertificationFlowNodeEnum.RZGCSSC.getKey());
+//			processInfoDetailEO.setCreateTime(new Date());
+//			processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue());
+//			processInfoDetailEO.setProcessInfoId(projectLibraryBase.getId());
+//			processInfoDetailEO.setActiProcInstId(projectLibraryBase.getId());
+//			processInfoDetailEO.setFlowType(FlowTypeEnum.CERTIFICATION_LC.getValue());
+//			processInfoDetailEO.setEndTime(endTime);
+//			processInfoDetailEOList.add(processInfoDetailEO);
+//		}
+//		// 数据更新为结果待审查
+//		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
+//			projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue());
+//			processHistoryEOService.add(projectCertificationInventoryEO.getId(),CertificationFlowNodeEnum.TASK_HANDLING.getKey(),currentUser.getId(),null,null,projectCertificationInventoryEO.getDeliveryResult());
+//
+//		}
+//
+//		this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_SUBMIT_TASK.getValue());
+//
+//		List<SysUser> certificationEngineers = this.sysUserService.querySysUserListByIdList(certificationEngineerList);
+//
+//		try {
+//			this.updateBatchById(projectCertificationInventoryEOList);
+//
+//			List<String> certificationIdList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getId).distinct().collect(Collectors.toList());
+//
+//			// 将当前责任人的待办任务转为已办
+//			LambdaUpdateWrapper<ProcessInfoDetailEO> detailUpdateWrap = new LambdaUpdateWrapper<>();
+//			detailUpdateWrap.eq(ProcessInfoDetailEO::getProcessInfoId,projectLibraryBase.getId());
+//			detailUpdateWrap.eq(ProcessInfoDetailEO::getUserId,currentUser.getId());
+//			detailUpdateWrap.eq(ProcessInfoDetailEO::getTaskDefinitionKey,CertificationFlowNodeEnum.ZRRTJRW.getKey());
+//			detailUpdateWrap.in(ProcessInfoDetailEO::getProjectLawsInventoryId,certificationIdList);
+//			detailUpdateWrap.set(ProcessInfoDetailEO::getStatus,TaskStatusEnum.HAVE_DONE.getValue());
+//			detailUpdateWrap.set(ProcessInfoDetailEO::getUpdateTime,new Date());
+//			detailUpdateWrap.set(ProcessInfoDetailEO::getUpdateBy,currentUser.getUsername());
+//			this.processInfoDetailEOService.update(detailUpdateWrap);
+//
+//			// 给认证工程师分配待办中心的任务  认证工程师审查
+//			this.addProcessInfoDetailEO(processInfoDetailEOList,projectLibraryBase.getId(),CertificationFlowNodeEnum.RZGCSSC.getKey());
+//			this.sendMessageByTemplateId(
+//					projectCertificationInventoryEOList,
+//					TemplateInfoEnum2.CERTIFICATION_MESSAGE23.getValue(),
+//					certificationEngineerList,
+//					certificationEngineers,
+//					endTime,
+//					CertificationFlowNodeEnum.TASK_REVIEW.getKey()
+//			);
+//		}catch (Exception ex){
+//			ex.printStackTrace();
+//			log.error("责任人-提交任务失败：" + ex.getMessage());
+//			throw new JeroBootException("提交任务失败！");
+//		}
+//
+//		return Result.OK("提交任务成功！");
+//	}
 
 	/**
 	 * 责任人接受任务
@@ -2575,9 +2684,9 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 
 		ProjectLibraryBase projectLibraryBase = JSONObject.parseObject(JSONObject.toJSONString(json.get("projectLibraryBase")), ProjectLibraryBase.class);
 		String certificationEngineer = projectLibraryBase.getCertificationEngineer();
-		if(StringUtils.isEmpty(certificationEngineer)){
-			throw new JeroBootException("该项目中认证工程师为空，请先维护认证工程师！");
-		}
+//		if(StringUtils.isEmpty(certificationEngineer)){
+//			throw new JeroBootException("该项目中认证工程师为空，请先维护认证工程师！");
+//		}
 
 		List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
 		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
@@ -2627,38 +2736,38 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 			this.updateBatchById(projectCertificationInventoryEOList);
 
 
-			List<String> certificationEngineerList = Arrays.asList(certificationEngineer.split(","));
-			List<SysUser> certificationEngineers = this.sysUserService.querySysUserListByIdList(certificationEngineerList);
+//			List<String> certificationEngineerList = Arrays.asList(certificationEngineer.split(","));
+//			List<SysUser> certificationEngineers = this.sysUserService.querySysUserListByIdList(certificationEngineerList);
 			try {
-				for (String userId : certificationEngineerList) {
-					String thirdId = this.sysUserService.getUserThirdIdByUserId(certificationEngineers,userId);
-
-					if(StringUtils.isNotEmpty(thirdId)){
-						// 根据结束时间进行排序，获取最近的时间，发消息时使用。
-						this.certificationInventoryEOListSortByEndTimeAsc(projectCertificationInventoryEOList);
-						Date endTime = projectCertificationInventoryEOList.get(0).getEndTime();
-
-						JSONObject larkMesJson = new JSONObject();
-						larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE12.getValue());
-						larkMesJson.put("userIds",thirdId);
-
-						Map<String,Object> templateVariableMap = new HashMap<>();
-						templateVariableMap.put("projectNameCn",PRN_CN);
-						templateVariableMap.put("projectNameEn",PRN_EN);
-						templateVariableMap.put("standName",standName);
-						templateVariableMap.put("itemName",itemName);
-						templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName());
-						templateVariableMap.put("endTime",DateUtils.formatDate(endTime));
-						templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
-						templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
-						templateVariableMap.put("viewBtnUrlCnPhone",hrefFeishu_CN_P);
-						templateVariableMap.put("operateUserName",currentUser.getUsername());
-
-
-						larkMesJson.put("templateVariableMap",templateVariableMap);
-						this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson);
-					}
-				}
+//				for (String userId : certificationEngineerList) {
+//					String thirdId = this.sysUserService.getUserThirdIdByUserId(certificationEngineers,userId);
+//
+//					if(StringUtils.isNotEmpty(thirdId)){
+//						// 根据结束时间进行排序，获取最近的时间，发消息时使用。
+//						this.certificationInventoryEOListSortByEndTimeAsc(projectCertificationInventoryEOList);
+//						Date endTime = projectCertificationInventoryEOList.get(0).getEndTime();
+//
+//						JSONObject larkMesJson = new JSONObject();
+//						larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE12.getValue());
+//						larkMesJson.put("userIds",thirdId);
+//
+//						Map<String,Object> templateVariableMap = new HashMap<>();
+//						templateVariableMap.put("projectNameCn",PRN_CN);
+//						templateVariableMap.put("projectNameEn",PRN_EN);
+//						templateVariableMap.put("standName",standName);
+//						templateVariableMap.put("itemName",itemName);
+//						templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName());
+//						templateVariableMap.put("endTime",DateUtils.formatDate(endTime));
+//						templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
+//						templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
+//						templateVariableMap.put("viewBtnUrlCnPhone",hrefFeishu_CN_P);
+//						templateVariableMap.put("operateUserName",currentUser.getUsername());
+//
+//
+//						larkMesJson.put("templateVariableMap",templateVariableMap);
+//						this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson);
+//					}
+//				}
 			} catch (Exception e) {
 				log.error("飞书消息推送失败");
 			}
@@ -3012,6 +3121,9 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 
 			this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_INITIATING_TASK.getValue());
 
+			String projectLibraryId = json.getString("projectLibraryId");
+			ProcessInfoEO processInfoEO = new ProcessInfoEO();
+			this.addProcessInfoEO(processInfoEO,projectLibraryId);
 			this.addProcessInfoDetailEO(processInfoDetailEOList,projectLibraryBase.getId(),CertificationFlowNodeEnum.ZRRJSRW.getKey());
 
 			// 认证工程师发起任务，将数据的状态更新为 任务待确认。

From 6874f15b13f9d26f76859a4b24d4c28a00678077 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 18 Sep 2023 14:08:25 +0800
Subject: [PATCH 060/288] =?UTF-8?q?=E5=BE=85=E5=8A=9E-=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86=E5=B9=B3=E5=8F=B0=E4=BB=B6=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../todoCenter/mapper/xml/ProcessInfoEOMapper.xml     | 11 +++++++----
 .../com/jero/modules/todoCenter/vo/ProcessInfoVO.java |  3 +++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
index fc024a11a..a3c3f2092 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
@@ -113,7 +113,8 @@
                 plb.target_market,
                 plb.studio_engineer,
                 plb.project_version,
-                plb.parent_id
+                plb.parent_id,
+                plb.platform
             FROM
                 process_info pi
                 left join project_library_base plb on plb.id = pi.project_library_id
@@ -209,8 +210,9 @@
                    plb.target_market,
                    plb.studio_engineer,
                    plb.project_version,
-                   plb.parent_id
-               FROM
+                   plb.parent_id,
+                   plb.platform
+        FROM
                    process_info pi
                    LEFT JOIN project_library_base plb ON plb.id = pi.project_library_id
                    LEFT JOIN project_name_info pni ON pni.id = plb.project_name_id
@@ -284,7 +286,8 @@
                    plb.target_market,
                    plb.studio_engineer,
                    plb.project_version,
-                   plb.parent_id
+                   plb.parent_id,
+                   plb.platform
                FROM
                    process_info pi
                    LEFT JOIN project_library_base plb ON plb.id = pi.project_library_id
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java
index 65b62c02f..9cd8b22f9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java
@@ -120,4 +120,7 @@ public class ProcessInfoVO implements Serializable {
     private String dutyTerritoryName;
     /**流程类型排序字段*/
     private String flowTypeShowOrderBy;
+
+    //该字段有值时，代表数据为平台件的数据
+    private String platform;
 }

From 1c5ee0cdca20ff3628aec4fada665b57982bd847 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 18 Sep 2023 14:17:22 +0800
Subject: [PATCH 061/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E6=8E=A5=E5=8F=A3=E4=BA=BA=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificationList/components/addModel.vue | 64 ++-----------------
 .../components/certificationList/index.vue    | 10 +--
 2 files changed, 11 insertions(+), 63 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
index 7faf15fad..dee8bbe07 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
@@ -196,22 +196,6 @@
                                        :prop="'dataList.'+index+'.dutyTerritory'"
                                        :rules="[{ required: true, message: $t('areaOfResponsibility') + $t('cannotEmpty'), trigger: 'change'},]"
                     >
-<!--                      <a-select :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
-<!--                                class="box-input"-->
-<!--                                optionFilterProp="label"-->
-<!--                                mode="multiple"-->
-<!--                                @change="dutyHandleChange(index)"-->
-<!--                                :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
-<!--                                v-model="item.dutyTerritory">-->
-<!--                        <a-select-option v-for="(val, key) in item.dutyTerritoryList"-->
-<!--                                         :key="key"-->
-<!--                                         :label="val.itemText"-->
-<!--                                         :value="val.itemValue">-->
-<!--                               <span style="display: inline-block;width: 100%" :title=" val.itemText ">-->
-<!--                                     {{ val.itemText }}-->
-<!--                               </span>-->
-<!--                        </a-select-option>-->
-<!--                      </a-select>-->
                       <j-dict-select-tag class="box-input" v-model="item.dutyTerritory"
                                          @input="handleInput('dataList.'+index+'.dutyTerritory')"
                                          @changeQuery="dutyHandleChange(index)"
@@ -231,15 +215,15 @@
                       <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
                     </div>
                     <a-form-model-item class="itemModel"
-                                       :prop="item.deliverableType == '1635545748968783874'?'':'dataList.'+index+'.sdt'"
+                                       :prop="item.deliverableType == '1635545748968783874'?'':'dataList.'+index+'.sdtName'"
                                        :rules="[{ required: item.deliverableType == '1635545748968783874'?false:true, message: $t('engineeringInterfacePerson') + $t('cannotEmpty'), trigger: 'change'},]"
                     >
-                      <PersonnelSelection :query="{db_field_name:'sdt',db_field_txt:$t('engineeringInterfacePerson')}"
+                      <PersonnelSelection :query="{db_field_name:'sdt',db_field_txt:$t('engineeringInterfacePerson'),subscript:index}"
                                           :isSingleChoice="true"
                                           :personneQuery="formInline"
                                           v-if="visible"
                                           @change="PersonnelSelectionChange"
-                                          v-model="item.sdt"/>
+                                          v-model="item.sdtName"/>
                     </a-form-model-item>
                   </div>
                 </a-col>
@@ -491,21 +475,6 @@
                                      :rules="[{ required: formInline.deliverableType=='1635545748968783874'?false:true,
                                  message: $t('engineeringInterfacePerson') + $t('cannotEmpty'), trigger: 'change'}]"
                   >
-<!--                    <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"-->
-<!--                              optionFilterProp="label"-->
-<!--                              @change="handleInput('sdt',formInline.sdt)"-->
-<!--                              showSearch-->
-<!--                              v-model="formInline.sdt">-->
-<!--                      <a-select-option v-for="(item, key) in engineeringInterfacePersonList"-->
-<!--                                       :label="item.name"-->
-<!--                                       :key="key"-->
-<!--                                       :value="item.value">-->
-<!--                     <span style="display: inline-block;width: 100%"-->
-<!--                           :title=" item.name ">-->
-<!--                           {{ item.name}}-->
-<!--                     </span>-->
-<!--                      </a-select-option>-->
-<!--                    </a-select>-->
                     <PersonnelSelection :query="{db_field_name:'sdt',db_field_txt:$t('engineeringInterfacePerson')}"
                                         :isSingleChoice="true"
                                         :personneQuery="formInline"
@@ -644,20 +613,6 @@
               </a-col>
             </a-row>
           </div>
-          <!--        <a-row :gutter="24">-->
-          <!--          <a-col :span="24">-->
-          <!--            <div class="box-title-text">-->
-          <!--              <div class="title-text">-->
-          <!--                <span class="title-text-text" :title="$t('explain')">{{$t('explain')}}</span>-->
-          <!--              </div>-->
-          <!--              <a-form-model-item class="itemModel" prop="explanation">-->
-          <!--                <a-textarea :placeholder="$t('pleaseEnter')+$t('explain')"-->
-          <!--                            v-model="formInline.explanation"-->
-          <!--                            :rows="4"/>-->
-          <!--              </a-form-model-item>-->
-          <!--            </div>-->
-          <!--          </a-col>-->
-          <!--        </a-row>-->
         </a-form-model>
       </a-spin>
       <div class="drawer-bootom-button">
@@ -856,16 +811,9 @@
         value.dutyDepart = value.dutyDepart ? value.dutyDepart.split(',') : []
         value.dutyTerritory = value.dutyTerritory ? value.dutyTerritory.split(',') : []
         this.formInline = JSON.parse(JSON.stringify(value))
-        // if (this.formInline.deliverableType) {
-        //   this.formInline.deliverableType = this.formInline.deliverableType.split(',')
+        // if (value.dutyTerritory && value.dutyTerritory.length > 0) {
+        //   this.queryPersonByProject(value.dutyTerritory.join(','))
         // }
-
-        if (value.dutyDepart && value.dutyDepart.length > 0) {
-          this.getDutyTerritoryOne(value.dutyDepart.join(','))
-        }
-        if (value.dutyTerritory && value.dutyTerritory.length > 0) {
-          this.queryPersonByProject(value.dutyTerritory.join(','))
-        }
         this.getRegulationNo()
         this.title = this.$t('edit')
         this.$nextTick(() => {
@@ -977,7 +925,7 @@
         } else {
           this.formInline.dataList[index][value] = id
         }
-        // console.log(this.formInline.sdt)
+        console.log(this.formInline)
         this.$nextTick(() => {
           this.formInline = { ...this.formInline }
           this.$refs.ruleForm.validateField([value])
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
index 689e12d4e..9e71b79d7 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
@@ -220,11 +220,11 @@
       </div>
       <div style="margin-top: 1px;float:right;">
 
-        <!--        撤回-->
-        <div @click="withdrawClick" v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2" class="operator-text">
-          <a-icon type="rollback"/>
-          {{ $t('withdraw') }}
-        </div>
+<!--        &lt;!&ndash;        撤回&ndash;&gt;-->
+<!--        <div @click="withdrawClick" v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2" class="operator-text">-->
+<!--          <a-icon type="rollback"/>-->
+<!--          {{ $t('withdraw') }}-->
+<!--        </div>-->
 
         <!--        发起任务-->
         <div @click="initiatingProcessClick('rzgcsjsrw',$t('confirmLaunchTask'))"

From bdfb30585af2aa130f97a71a50eaea131c79801e Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 18 Sep 2023 14:30:16 +0800
Subject: [PATCH 062/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js | 2 +-
 jero-web/src/common/lang/zh-cn.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 8018e836a..43e06006c 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1426,7 +1426,7 @@ module.exports = {
   confirmLaunchTask:'Confirm to initiate a task ?',
   conditionsNotMet:'Conditions not met',
   onlyProcessStatusReturned:'Only data with process status of List to Be Checked and Rejected by Owner can be returned',
-  onlyProcessReturned:'Only data with a process status of list to be verified and rejected by the responsible person can be initiated, and the delivery type, engineering interface person, responsible person, and deadline cannot be empty',
+  onlyProcessReturned:'Only data whose process status is Task ready to be started or rejected by the responsible person can be initiated, and the deliverable type, project interface person, responsible person, and deadline cannot be left blank',
   confirmToAcceptTheTask:'Confirm to accept the task?',
   confirmRejectTask:'Confirm to reject the task ?',
   onlyDataStatusConfirmedSelected:'Only data with process status of Task to Be Confirmed can be selected',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 31addc756..29ccb00da 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1525,7 +1525,7 @@ module.exports = {
   confirmLaunchTask: '确认发起任务?',
   conditionsNotMet: '不满足条件',
   onlyProcessStatusReturned: '只能退回流程状态为清单待校核和责任人拒绝的数据',
-  onlyProcessReturned: '只能发起流程状态为清单待校核和责任人拒绝的数据,并且交付物类型、工程接口人、责任人、截止时间不能为空',
+  onlyProcessReturned: '只能发起流程状态为任务待发起和责任人拒绝的数据,并且交付物类型、工程接口人、责任人、截止时间不能为空',
   confirmToAcceptTheTask: '确认接受任务?',
   confirmRejectTask: '确认拒绝任务?',
   onlyDataStatusConfirmedSelected: '只能选择流程状态为任务待确认的数据',
@@ -3430,7 +3430,7 @@ module.exports = {
   confirmLaunchTask: '确认发起任务?',
   conditionsNotMet: '不满足条件',
   onlyProcessStatusReturned: '只能退回流程状态为清单待校核和责任人拒绝的数据',
-  onlyProcessReturned: '只能发起流程状态为清单待校核和责任人拒绝的数据,并且交付物类型、工程接口人、责任人、截止时间不能为空',
+  onlyProcessReturned: '只能发起流程状态为任务待发起和责任人拒绝的数据,并且交付物类型、工程接口人、责任人、截止时间不能为空',
   confirmToAcceptTheTask: '确认接受任务?',
   confirmRejectTask: '确认拒绝任务?',
   onlyDataStatusConfirmedSelected: '只能选择流程状态为任务待确认的数据',

From 1b343be83ed991c805d0aa641453107dc31cf7c3 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 18 Sep 2023 14:50:34 +0800
Subject: [PATCH 063/288] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BA=93=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../toDoCenter/projectRegulationTasks/components/SentList.vue | 4 ++--
 .../projectRegulationTasks/components/dealtWith.vue           | 4 ++--
 .../toDoCenter/projectRegulationTasks/components/doneList.vue | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
index 88e2c06ed..40832d7c7 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
@@ -204,7 +204,7 @@
           window.open(newUrl.href, '_blank')
         } else if (row.flowType == '10') {
           let newUrl = this.$router.resolve({
-            path: '/ProjectDetails',
+            path: row.platform == 'YES' ? '/platformItemLibraryDetails' : '/ProjectDetails',
             query: {
               id: row.projectLibraryId,
               projectName: row.projectName,
@@ -217,7 +217,7 @@
           window.open(newUrl.href, '_blank')
         } else if (row.flowType == '21') {
           let newUrl = this.$router.resolve({
-            path: '/ProjectDetails',
+            path: row.platform == 'YES' ? '/platformItemLibraryDetails' : '/ProjectDetails',
             query: {
               id: row.projectLibraryId,
               projectName: row.projectName,
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
index 1144f8f81..765c8d342 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
@@ -261,7 +261,7 @@
           window.open(newUrl.href, '_blank')
         } else if (row.flowType == '10') {
           let newUrl = this.$router.resolve({
-            path: '/ProjectDetails',
+            path: row.platform == 'YES' ? '/platformItemLibraryDetails' : '/ProjectDetails',
             query: {
               id: row.projectLibraryId,
               projectName: row.projectName,
@@ -275,7 +275,7 @@
           window.open(newUrl.href, '_blank')
         } else if (row.flowType == '21') {
           let newUrl = this.$router.resolve({
-            path: '/ProjectDetails',
+            path: row.platform == 'YES' ? '/platformItemLibraryDetails' : '/ProjectDetails',
             query: {
               id: row.projectLibraryId,
               projectName: row.projectName,
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
index 1c6f81295..360d673c9 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
@@ -198,7 +198,7 @@
           window.open(newUrl.href, '_blank')
         }else if(row.flowType == '10'){
           let newUrl = this.$router.resolve({
-            path: '/ProjectDetails',
+            path: row.platform == 'YES' ? '/platformItemLibraryDetails' : '/ProjectDetails',
             query: {
               id: row.projectLibraryId,
               projectName: row.projectName,
@@ -211,7 +211,7 @@
           window.open(newUrl.href, '_blank')
         } else if (row.flowType == '21') {
           let newUrl = this.$router.resolve({
-            path: '/ProjectDetails',
+            path: row.platform == 'YES' ? '/platformItemLibraryDetails' : '/ProjectDetails',
             query: {
               id: row.projectLibraryId,
               projectName: row.projectName,

From d5c3532271c60589e7c522e88b5dc8554e96e3d5 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 18 Sep 2023 15:41:57 +0800
Subject: [PATCH 064/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95=EF=BC=8C=E8=B4=A3=E4=BB=BB=E4=BA=BA?=
 =?UTF-8?q?=E6=8B=92=E7=BB=9D=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctCertificationInventoryEOServiceImpl.java | 218 ++++++++++++++----
 1 file changed, 174 insertions(+), 44 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
index 0ca6f884a..cd4aca3ff 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
@@ -2811,10 +2811,14 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 		ProjectLibraryBase projectLibraryBase = JSONObject.parseObject(JSONObject.toJSONString(json.get("projectLibraryBase")), ProjectLibraryBase.class);
 
 		// 给认证工程师分配待办中心的任务
-		String certificationEngineer = projectLibraryBase.getCertificationEngineer();
-		if(StringUtils.isEmpty(certificationEngineer)){
-			throw new JeroBootException("该项目中认证工程师为空，请先维护认证工程师！");
-		}
+//		String certificationEngineer = projectLibraryBase.getCertificationEngineer();
+//		if(StringUtils.isEmpty(certificationEngineer)){
+//			throw new JeroBootException("该项目中认证工程师为空，请先维护认证工程师！");
+//		}
+		String lawsEngineer = projectLibraryBase.getCreateBy();
+		SysUser userByName = sysUserService.getUserByName(lawsEngineer);
+
+
 
 		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
 			projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue());
@@ -2854,20 +2858,18 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 			this.certificationInventoryEOListSortByInventoryVerifyEndTimeAsc(projectCertificationInventoryEOList);
 
 			List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
-			List<String> certificationEngineerList = Arrays.asList(certificationEngineer.split(","));
+//			List<String> certificationEngineerList = Arrays.asList(certificationEngineer.split(","));
 			// 给认证工程师分配任务
-			for (String userId : certificationEngineerList) {
-				ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
-				processInfoDetailEO.setUserId(userId);
-				processInfoDetailEO.setTaskDefinitionKey(CertificationFlowNodeEnum.RZGCSJSRW.getKey());
-				processInfoDetailEO.setCreateTime(new Date());
-				processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue());
-				processInfoDetailEO.setProcessInfoId(projectLibraryBase.getId());
-				processInfoDetailEO.setActiProcInstId(projectLibraryBase.getId());
-				processInfoDetailEO.setFlowType(FlowTypeEnum.CERTIFICATION_LC.getValue());
-				processInfoDetailEO.setEndTime(projectCertificationInventoryEOList.get(0).getInventoryVerifyEndTime());
-				processInfoDetailEOList.add(processInfoDetailEO);
-			}
+			ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
+			processInfoDetailEO.setUserId(userByName.getId());
+			processInfoDetailEO.setTaskDefinitionKey(CertificationFlowNodeEnum.RZGCSJSRW.getKey());
+			processInfoDetailEO.setCreateTime(new Date());
+			processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue());
+			processInfoDetailEO.setProcessInfoId(projectLibraryBase.getId());
+			processInfoDetailEO.setActiProcInstId(projectLibraryBase.getId());
+			processInfoDetailEO.setFlowType(FlowTypeEnum.CERTIFICATION_LC.getValue());
+			processInfoDetailEO.setEndTime(projectCertificationInventoryEOList.get(0).getInventoryVerifyEndTime());
+			processInfoDetailEOList.add(processInfoDetailEO);
 
 			// 删除该项目数据的待办任务，key为 认证工程师接受任务的数据
 			QueryWrapper<ProcessInfoDetailEO> deleteDetailWrap = new QueryWrapper<>();
@@ -2879,37 +2881,29 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 
 			// 责任人接受任务，将数据的状态更新为 结果待提交。
 			this.updateBatchById(projectCertificationInventoryEOList);
-
-			List<SysUser> certificationEngineers = this.sysUserService.querySysUserListByIdList(certificationEngineerList);
 			try {
-				for (String userId : certificationEngineerList) {
-					String thirdId = this.sysUserService.getUserThirdIdByUserId(certificationEngineers,userId);
-
-					if(StringUtils.isNotEmpty(thirdId)){
-						// 根据结束时间进行排序，获取最近的时间，发消息时使用。
+				if(ObjectUtils.isNotEmpty(userByName) && StringUtils.isNotBlank(userByName.getThirdId())){
+					// 根据结束时间进行排序，获取最近的时间，发消息时使用。
 //						this.certificationInventoryEOListSortByEndTimeAsc(projectCertificationInventoryEOList);
-						Date endTime = projectCertificationInventoryEOList.get(0).getInventoryVerifyEndTime();
+					Date endTime = projectCertificationInventoryEOList.get(0).getInventoryVerifyEndTime();
 
-						JSONObject larkMesJson = new JSONObject();
-						larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE11.getValue());
-						larkMesJson.put("userIds",thirdId);
+					JSONObject larkMesJson = new JSONObject();
+					larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE11.getValue());
+					larkMesJson.put("userIds",userByName.getThirdId());
 
-						Map<String,Object> templateVariableMap = new HashMap<>();
-						templateVariableMap.put("projectNameCn",PRN_CN);
-						templateVariableMap.put("projectNameEn",PRN_EN);
-						templateVariableMap.put("standName",standName);
-						templateVariableMap.put("itemName",itemName);
-						templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName());
-						templateVariableMap.put("endTime",DateUtils.formatDate(endTime));
-						templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
-						templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
-						templateVariableMap.put("viewBtnUrlCnPhone",hrefFeishu_CN_P);
-
-						templateVariableMap.put("operateUserName",currentUser.getUsername());
-
-						larkMesJson.put("templateVariableMap",templateVariableMap);
-						this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson);
-					}
+					Map<String,Object> templateVariableMap = new HashMap<>();
+					templateVariableMap.put("projectNameCn",PRN_CN);
+					templateVariableMap.put("projectNameEn",PRN_EN);
+					templateVariableMap.put("standName",standName);
+					templateVariableMap.put("itemName",itemName);
+					templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName());
+					templateVariableMap.put("endTime",DateUtils.formatDate(endTime));
+					templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
+					templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
+					templateVariableMap.put("viewBtnUrlCnPhone",hrefFeishu_CN_P);
+					templateVariableMap.put("operateUserName",currentUser.getUsername());
+					larkMesJson.put("templateVariableMap",templateVariableMap);
+					this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson);
 				}
 			} catch (Exception e) {
 				log.error("飞书消息推送失败");
@@ -2921,6 +2915,142 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 		}
 		return Result.OK("拒绝任务成功！");
 	}
+//	private Result<?> dutyPersonRejectTask(JSONObject json) {
+//		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//
+//		String ids = json.getString("ids");
+//		if(StringUtils.isEmpty(ids)){
+//			throw new JeroBootException("至少选择一条数据进行操作！");
+//		}
+//		String reasonForReturn = json.getString("reasonForReturn");
+//
+//		List<String> idList = Arrays.asList(ids.split(","));
+//
+//		List<String> flowStatusList = new ArrayList<>();
+//		flowStatusList.add(CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue());
+//
+//		QueryWrapper<ProjectCertificationInventoryEO> queryWrapper = new QueryWrapper<>();
+//		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getId,idList);
+//		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList);
+//		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.list(queryWrapper);
+//
+//		if(CollectionUtils.isEmpty(projectCertificationInventoryEOList)){
+//			throw new JeroBootException("至少选择一条数据流程状态为'任务待确认'的数据！");
+//		}
+//
+//		ProjectLibraryBase projectLibraryBase = JSONObject.parseObject(JSONObject.toJSONString(json.get("projectLibraryBase")), ProjectLibraryBase.class);
+//
+//		// 给认证工程师分配待办中心的任务
+//		String certificationEngineer = projectLibraryBase.getCertificationEngineer();
+//		if(StringUtils.isEmpty(certificationEngineer)){
+//			throw new JeroBootException("该项目中认证工程师为空，请先维护认证工程师！");
+//		}
+//
+//		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
+//			projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue());
+//			projectCertificationInventoryEO.setReasonForReturn(reasonForReturn);
+//			processHistoryEOService.add(projectCertificationInventoryEO.getId(),CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey(),currentUser.getId(),ReviewResultEnum.REJECTED.getValue(),reasonForReturn,null);
+//
+//		}
+//
+//		this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_REJECT_TASK.getValue());
+//
+//		String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
+//		String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
+//
+//		// 获取认证清单 - 飞书跳转链接
+//		Map<String, Object> hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN);
+//		String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN");
+//		String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN");
+//		String hrefFeishu_CN_P = (String) hrefFeishuMap.get("hrefFeishu_CN_P");
+//
+//		Map<String, Object> standNameAndItemName = this.platformProjectCertificationInventoryEOService.getStandNameAndItemName(projectCertificationInventoryEOList);
+//		String standName = (String) standNameAndItemName.get("standName");
+//		String itemName = (String) standNameAndItemName.get("itemName");
+//
+//		try {
+//			List<String> certificationIdList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getId).distinct().collect(Collectors.toList());
+//			// 将当前责任人的待办任务转为已办
+//			LambdaUpdateWrapper<ProcessInfoDetailEO> detailUpdateWrap = new LambdaUpdateWrapper<>();
+//			detailUpdateWrap.eq(ProcessInfoDetailEO::getProcessInfoId,projectLibraryBase.getId());
+//			detailUpdateWrap.eq(ProcessInfoDetailEO::getUserId,currentUser.getId());
+//			detailUpdateWrap.eq(ProcessInfoDetailEO::getTaskDefinitionKey,CertificationFlowNodeEnum.ZRRJSRW.getKey());
+//			detailUpdateWrap.in(ProcessInfoDetailEO::getProjectLawsInventoryId,certificationIdList);
+//			detailUpdateWrap.set(ProcessInfoDetailEO::getStatus,TaskStatusEnum.HAVE_DONE.getValue());
+//			detailUpdateWrap.set(ProcessInfoDetailEO::getUpdateTime,new Date());
+//			detailUpdateWrap.set(ProcessInfoDetailEO::getUpdateBy,currentUser.getUsername());
+//			this.processInfoDetailEOService.update(detailUpdateWrap);
+//
+//			this.certificationInventoryEOListSortByInventoryVerifyEndTimeAsc(projectCertificationInventoryEOList);
+//
+//			List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
+//			List<String> certificationEngineerList = Arrays.asList(certificationEngineer.split(","));
+//			// 给认证工程师分配任务
+//			for (String userId : certificationEngineerList) {
+//				ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
+//				processInfoDetailEO.setUserId(userId);
+//				processInfoDetailEO.setTaskDefinitionKey(CertificationFlowNodeEnum.RZGCSJSRW.getKey());
+//				processInfoDetailEO.setCreateTime(new Date());
+//				processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue());
+//				processInfoDetailEO.setProcessInfoId(projectLibraryBase.getId());
+//				processInfoDetailEO.setActiProcInstId(projectLibraryBase.getId());
+//				processInfoDetailEO.setFlowType(FlowTypeEnum.CERTIFICATION_LC.getValue());
+//				processInfoDetailEO.setEndTime(projectCertificationInventoryEOList.get(0).getInventoryVerifyEndTime());
+//				processInfoDetailEOList.add(processInfoDetailEO);
+//			}
+//
+//			// 删除该项目数据的待办任务，key为 认证工程师接受任务的数据
+//			QueryWrapper<ProcessInfoDetailEO> deleteDetailWrap = new QueryWrapper<>();
+//			deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getProcessInfoId,projectLibraryBase.getId());
+//			deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getTaskDefinitionKey,CertificationFlowNodeEnum.RZGCSJSRW.getKey());
+//			deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.CERTIFICATION_LC.getValue());
+//			this.processInfoDetailEOService.remove(deleteDetailWrap);
+//			this.processInfoDetailEOService.saveBatch(processInfoDetailEOList);
+//
+//			// 责任人接受任务，将数据的状态更新为 结果待提交。
+//			this.updateBatchById(projectCertificationInventoryEOList);
+//
+//			List<SysUser> certificationEngineers = this.sysUserService.querySysUserListByIdList(certificationEngineerList);
+//			try {
+//				for (String userId : certificationEngineerList) {
+//					String thirdId = this.sysUserService.getUserThirdIdByUserId(certificationEngineers,userId);
+//
+//					if(StringUtils.isNotEmpty(thirdId)){
+//						// 根据结束时间进行排序，获取最近的时间，发消息时使用。
+////						this.certificationInventoryEOListSortByEndTimeAsc(projectCertificationInventoryEOList);
+//						Date endTime = projectCertificationInventoryEOList.get(0).getInventoryVerifyEndTime();
+//
+//						JSONObject larkMesJson = new JSONObject();
+//						larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE11.getValue());
+//						larkMesJson.put("userIds",thirdId);
+//
+//						Map<String,Object> templateVariableMap = new HashMap<>();
+//						templateVariableMap.put("projectNameCn",PRN_CN);
+//						templateVariableMap.put("projectNameEn",PRN_EN);
+//						templateVariableMap.put("standName",standName);
+//						templateVariableMap.put("itemName",itemName);
+//						templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName());
+//						templateVariableMap.put("endTime",DateUtils.formatDate(endTime));
+//						templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
+//						templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
+//						templateVariableMap.put("viewBtnUrlCnPhone",hrefFeishu_CN_P);
+//
+//						templateVariableMap.put("operateUserName",currentUser.getUsername());
+//
+//						larkMesJson.put("templateVariableMap",templateVariableMap);
+//						this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson);
+//					}
+//				}
+//			} catch (Exception e) {
+//				log.error("飞书消息推送失败");
+//			}
+//		}catch (Exception ex){
+//			ex.printStackTrace();
+//			log.error("责任人-拒绝任务失败：" + ex.getMessage());
+//			throw new JeroBootException("拒绝任务失败！");
+//		}
+//		return Result.OK("拒绝任务成功！");
+//	}
 
 	/**
 	 * 认证工程师退回至studio任务

From 04c0271d6bd28265ca6752c1fa14efebb173c84a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Mon, 18 Sep 2023 15:47:27 +0800
Subject: [PATCH 065/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ota/service/impl/OtaManageApplyEOServiceImpl.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
index 4f48be03a..7e3b4081f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
@@ -2306,22 +2306,31 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
         List<OtaManageApplyEO> omaList = this.getListByVdrList(vdrList);
 
         for (OtaManagePermission omp : ompList) {
+            if (StringUtils.isNotEmpty(otaManageReceiveNsdp.getReleaseName()) && !omp.getApplyId().contains(otaManageReceiveNsdp.getReleaseName())) {
+                continue;
+            }
             String vehicleStr = omp.getVehicle();
             String[] vehicleList = vehicleStr.split(",");
             for (String vehicle : vehicleList) {
+                if (StringUtils.isNotEmpty(otaManageReceiveNsdp.getVehicle()) && !vehicle.contains(otaManageReceiveNsdp.getVehicle())) {
+                    continue;
+                }
                 List<OtaManageReceive> omrVehicleList = omrList.stream()
                         .filter(obj -> StringUtils.isNotEmpty(obj.getPlannedBpLaunchBatch()) && obj.getPlannedBpLaunchBatch().equals(omp.getApplyId())
                                 && StringUtils.isNotEmpty(obj.getVehicleMatch()) && obj.getVehicleMatch().contains(vehicle))
                         .collect(Collectors.toList());
 
                 for (OtaManageReceive mrVehicle : omrVehicleList) {
+                    if (StringUtils.isNotEmpty(otaManageReceiveNsdp.getReleaseType()) && !otaManageReceiveNsdp.getReleaseType().equals(mrVehicle.getReleaseType())) {
+                        continue;
+                    }
                     if (!OtaHomoImpactEnum.YES.getValue().equals(mrVehicle.getHomologationImpact())
                             && !OtaHomoImpactEnum.INTER_VALID.getValue().equals(mrVehicle.getHomologationImpact())) {
                         List<OtaManageApplyEO> applyList = omaList.stream()
                                 .filter(obj -> StringUtils.isNotEmpty(obj.getVdr()) && obj.getVdr().equals(mrVehicle.getId())
                                         && StringUtils.isNotEmpty(obj.getVehicleType()) && obj.getVehicleType().equals(vehicle))
                                 .collect(Collectors.toList());
-                        if(CollectionUtils.isEmpty(applyList) || OtaStatusEnum.TO_BE_MATCHED.getKey().equals(applyList.get(0).getMatchStatus())){
+                        if (CollectionUtils.isEmpty(applyList) || OtaStatusEnum.TO_BE_MATCHED.getKey().equals(applyList.get(0).getMatchStatus())) {
                             OtaManageReceiveNsdp omrn = new OtaManageReceiveNsdp();
                             omrn.setId(UUID.randomUUID().toString().replace("-", ""));
                             omrn.setReleaseName(omp.getApplyId());

From f2f3a5b7dfaa5aaf9c360f2f5552d79f884eea15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Mon, 18 Sep 2023 16:08:49 +0800
Subject: [PATCH 066/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/toDoCenter/OTAToDoTask/index.vue     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/jero-web/src/views/toDoCenter/OTAToDoTask/index.vue b/jero-web/src/views/toDoCenter/OTAToDoTask/index.vue
index 15e2d7e23..3de232c83 100644
--- a/jero-web/src/views/toDoCenter/OTAToDoTask/index.vue
+++ b/jero-web/src/views/toDoCenter/OTAToDoTask/index.vue
@@ -94,6 +94,7 @@
         :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
         rowKey="id"
         :data-source="dataSource"
+        @change="tableOnChange"
         :columns="columns"
       >
         <span slot="action" slot-scope="text,record">
@@ -138,12 +139,15 @@
         url:{
           list:'',
         },
+        orderBy: '1',
+        orderByField: '',
         columns: [
           {
             title: this.$t('softwareversion'),
             align: 'left',
             dataIndex: 'releaseName',
             ellipsis: true,
+            sorter: true,
             width: 170
           },
           {
@@ -151,6 +155,7 @@
             align: 'left',
             dataIndex: 'releaseType',
             ellipsis: true,
+            sorter: true,
             width: 170
           },
           {
@@ -158,6 +163,7 @@
             align: 'left',
             dataIndex: 'vehicle',
             ellipsis: true,
+            sorter: true,
             width: 600,
           },
           {
@@ -165,6 +171,7 @@
             align: 'left',
             dataIndex: 'releaseDate',
             ellipsis: true,
+            sorter: true,
             width: 170,
           },
           {
@@ -209,6 +216,11 @@
         this.pageSize = pageSize
         this.getList()
       },
+      tableOnChange(pagination, filters, sorter) {
+        this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+        this.orderByField = sorter.columnKey
+        this.getList()
+      },
       getList() {
         let queryParam = JSON.parse(JSON.stringify(this.queryParam))
         Object.keys(queryParam).forEach(val => {
@@ -219,6 +231,8 @@
         let query = {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
+          orderBy: this.orderBy,
+          orderByField: this.orderByField,
           ...queryParam
         }
         this.loading = true

From 216b2c8921f0191392bb532987af40360c4c6cd6 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 18 Sep 2023 16:25:03 +0800
Subject: [PATCH 067/288] =?UTF-8?q?=E5=8E=9F=E9=A1=B9=E7=9B=AE=E5=BA=93=20?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/associatedplat.vue             | 10 +--
 .../components/associatedplatthree.vue        |  8 ++-
 .../components/associatedplattwo.vue          |  8 ++-
 .../components/certificationList/index.vue    | 57 ++++++++++++++++
 .../components/listOfRegulations.vue          | 68 +++++++++++++------
 .../certificationList/components/addModel.vue | 16 +----
 6 files changed, 122 insertions(+), 45 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/associatedplat.vue b/jero-web/src/views/projectManagement/components/associatedplat.vue
index a40587ed4..3f2bd496b 100644
--- a/jero-web/src/views/projectManagement/components/associatedplat.vue
+++ b/jero-web/src/views/projectManagement/components/associatedplat.vue
@@ -72,7 +72,7 @@
         :scroll="{x: 1000}"
         :data-source="dataList"
         :pagination="false"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:flag !== '法规'?' ':'' }"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:flag !== '1'?' ':'' }"
         :loading="loading">
 
       </a-table>
@@ -164,15 +164,17 @@
         pageSize: 10,
         total: 0,
         flag:'',
+        type:'',
       }
     },
     mounted() {
 
     },
     methods: {
-      transferModel(flag) {
+      transferModel(flag,type) {
         this.visible = true
         this.flag = flag
+        this.type = type
         this.queryParam = {}
         this.selectedRowKeys = []
         this.replacePage()
@@ -214,7 +216,7 @@
       },
       onSelectChange(value) {
         this.selectedRowKeys = value
-        if (this.selectedRowKeys.length > 1 && this.flag !== '法规') {
+        if (this.selectedRowKeys.length > 1 && this.flag !== '1') {
           this.selectedRowKeys.shift()
         }
       },
@@ -226,7 +228,7 @@
           this.confirmLoading = true
           let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
           this.confirmLoading = false
-          this.$emit('associatedplatForm',selectedRowKeys.join(','),this.flag)
+          this.$emit('associatedplatForm',selectedRowKeys.join(','),this.flag,this.type)
           this.selectedRowKeys = []
           // postAction(this.url.addModel, {
           //   dummyInventoryBaseId: selectedRowKeys.join(','),
diff --git a/jero-web/src/views/projectManagement/components/associatedplatthree.vue b/jero-web/src/views/projectManagement/components/associatedplatthree.vue
index 52c045f6b..5a7158360 100644
--- a/jero-web/src/views/projectManagement/components/associatedplatthree.vue
+++ b/jero-web/src/views/projectManagement/components/associatedplatthree.vue
@@ -158,15 +158,19 @@
         loading: false,
         pageNo: 1,
         pageSize: 10,
-        total: 0
+        total: 0,
+        type:'',
+        id:'',
       }
     },
     mounted() {
 
     },
     methods: {
-      transferModel() {
+      transferModel(id,type) {
         this.visible = true
+        this.id = id
+        this.type = type
         this.queryParam = {}
         this.selectedRowKeys = []
         this.replacePage()
diff --git a/jero-web/src/views/projectManagement/components/associatedplattwo.vue b/jero-web/src/views/projectManagement/components/associatedplattwo.vue
index 40af5e357..e5337f1bf 100644
--- a/jero-web/src/views/projectManagement/components/associatedplattwo.vue
+++ b/jero-web/src/views/projectManagement/components/associatedplattwo.vue
@@ -144,15 +144,17 @@ export default {
       pageSize: 10,
       total: 0,
       flag:'',
+      type:'',
     }
   },
   mounted() {
 
   },
   methods: {
-    transferModel(flag) {
+    transferModel(flag,type) {
       this.visible = true
       this.flag = flag
+      this.type = type
       this.queryParam = {}
       this.selectedRowKeys = []
       this.replacePage()
@@ -194,7 +196,7 @@ export default {
     },
     onSelectChange(value) {
       this.selectedRowKeys = value
-      // if (this.selectedRowKeys.length > 1 && this.flag !== '法规') {
+      // if (this.selectedRowKeys.length > 1 && this.flag !== '1') {
       //   this.selectedRowKeys.shift()
       // }
     },
@@ -206,7 +208,7 @@ export default {
         this.confirmLoading = true
         let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
         this.confirmLoading = false
-        this.$emit('associatedplattwoForm',selectedRowKeys.join(','))
+        this.$emit('associatedplattwoForm',selectedRowKeys.join(','),this.type)
         this.selectedRowKeys = []
         // postAction(this.url.addModel, {
         //   dummyInventoryBaseId: selectedRowKeys.join(','),
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 496f75338..4f2dfcf86 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -217,6 +217,13 @@
                 <a-icon type="file-search"/>
                 {{ $t('processReset') }}
               </div>
+              <!--              关联平台件-->
+              <div @click="associatedplatformClick('认证')"
+                   v-if="roleSwitchingCode == 0"
+                   class="operator-text-title">
+                <a-icon type="setting"/>
+                {{ $t('Associatedplatform') }}
+              </div>
             </div>
           </template>
           <div class="operator-text" style="position: relative"
@@ -472,6 +479,9 @@
     <reasonForReturn ref="reasonForReturnRef" @reasonForReturnForm="reasonForReturnForm"/>
     <addConfiguration ref="addConfigurationRef" @addConfigurationForm="transferListForm"/>
     <deadlineForm ref="deadlineFormRef" @deadlineDataForm="deadlineDataForm"/>
+    <associatedplat :url="url" @associatedplatForm="associatedplatForm" ref="associatedplatRef"/>
+    <associatedplattwo :url="url" @associatedplattwoForm="associatedplattwoForm" ref="associatedplattwoRef"/>
+    <associatedplatthree :url="url" @associatedplatthreeForm="associatedplatthreeForm" ref="associatedplatthreeRef"/>
     <JLoading :loading="JTextLoading">{{ $t('Submitting') }}</JLoading>
     <!--    <a-modal-->
     <!--      :title="listTitle"-->
@@ -551,6 +561,9 @@
   import viewFileModel from '@/components/viewFileModel/index'
   import ImportFile from '@/components/ImportFile/index'
   import transferList from './components/transferList'
+  import associatedplat from '../associatedplat'
+  import associatedplattwo from '../associatedplattwo'
+  import associatedplatthree from '../associatedplatthree'
   import uploadFile from '@/components/uploadFile/file'
   import addModel from './components/addModel'
   import batSetting from './components/batSetting'
@@ -580,6 +593,9 @@
       modifyHistory,
       uploadFile,
       TaskListModel,
+      associatedplat,
+      associatedplattwo,
+      associatedplatthree,
       referenceDeliverablesList,
       SelectedBy,
       viewFileModel,
@@ -1256,6 +1272,47 @@
           this.$message.warning(this.$t('selectLeastOne'))
         }
       },
+      // 关联平台件
+      associatedplatformClick(type){
+        let flag = ''
+        if(this.selectedRowKeys && this.selectedRowKeys.length > 0){
+          this.detailedWarningList = []
+          let dataSource = []
+          for (let i = 0; i < this.dataSource.length; i++) {
+            for (let j = 0; j < this.selectedRowKeys.length; j++) {
+              if (this.dataSource[i].id == this.selectedRowKeys[j]) {
+                dataSource.push(this.dataSource[i])
+              }
+            }
+          }
+          for (let i = 0; i < dataSource.length; i++) {
+            if (dataSource[i].verifyFlowStatus == 'List to be released' &&
+              dataSource[i].designFlowStatus == 'List to be released') {
+              flag = '1'
+              this.$refs.associatedplatRef.transferModel(flag,type)
+            } else {
+              this.$message.warning(this.$t('unpublishedregulationsselected'))
+              return
+            }
+          }
+        }else{
+          flag = '2'
+          this.$refs.associatedplatRef.transferModel(flag,type)
+        }
+      },
+      associatedplatForm(id,flag,type){
+        if(flag == '1'){
+          this.$refs.associatedplatthreeRef.transferModel(id,type)
+        }else{
+          this.$refs.associatedplattwoRef.transferModel(id,type)
+        }
+      },
+      associatedplattwoForm(id,type){
+        this.$refs.associatedplatthreeRef.transferModel(id,type)
+      },
+      associatedplatthreeForm(id){
+        console.log(id)
+      },
       //添加
       handleAdd() {
         this.$refs.addModelRef.addModel()
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index bfc34ed26..d39c57392 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -162,10 +162,10 @@
         </div>
         <!--        关联平台件-->
 <!--        v-if="this.roleSwitchingCode == '0'"-->
-        <div class="operator-text" @click="associatedplatformClick">
-          <a-icon type="setting"/>
-          {{ $t('Associatedplatform') }}
-        </div>
+<!--        <div class="operator-text" @click="associatedplatformClick('法规')">-->
+<!--          <a-icon type="setting"/>-->
+<!--          {{ $t('Associatedplatform') }}-->
+<!--        </div>-->
         <!--        列表设置-->
         <!--        v-if="this.roleSwitchingCode == '0' || this.roleSwitchingCode == '1' || this.roleSwitchingCode == '13'"-->
         <a-popconfirm :visible="customizevisible" overlayClassName="popconfirmmize"
@@ -266,6 +266,13 @@
                 <a-icon type="file-search"/>
                 {{ $t('processReset') }}
               </div>
+              <!--              关联平台件-->
+              <div @click="associatedplatformClick('法规')"
+                   v-if="roleSwitchingCode == 0"
+                   class="operator-text-title">
+                <a-icon type="setting"/>
+                {{ $t('Associatedplatform') }}
+              </div>
             </div>
           </template>
           <div class="operator-text" style="position: relative">
@@ -1937,14 +1944,45 @@
         this.$refs.transferListRef.transferModel()
       },
       // 关联平台件
-      associatedplatformClick(){
+      associatedplatformClick(type){
         let flag = ''
         if(this.selectedRowKeys && this.selectedRowKeys.length > 0){
-          flag = '法规'
+          this.detailedWarningList = []
+          let dataSource = []
+          for (let i = 0; i < this.dataSource.length; i++) {
+            for (let j = 0; j < this.selectedRowKeys.length; j++) {
+              if (this.dataSource[i].id == this.selectedRowKeys[j]) {
+                dataSource.push(this.dataSource[i])
+              }
+            }
+          }
+          for (let i = 0; i < dataSource.length; i++) {
+            if (dataSource[i].verifyFlowStatus == 'List to be released' &&
+              dataSource[i].designFlowStatus == 'List to be released') {
+              flag = '1'
+              this.$refs.associatedplatRef.transferModel(flag,type)
+            } else {
+              this.$message.warning(this.$t('unpublishedregulationsselected'))
+              return
+            }
+          }
         }else{
-          flag = '清单'
+          flag = '2'
+          this.$refs.associatedplatRef.transferModel(flag,type)
         }
-        this.$refs.associatedplatRef.transferModel(flag)
+      },
+      associatedplatForm(id,flag,type){
+        if(flag == '1'){
+          this.$refs.associatedplatthreeRef.transferModel(id,type)
+        }else{
+          this.$refs.associatedplattwoRef.transferModel(id,type)
+        }
+      },
+      associatedplattwoForm(id,type){
+        this.$refs.associatedplatthreeRef.transferModel(id,type)
+      },
+      associatedplatthreeForm(id){
+        console.log(id)
       },
       //批量设置
       batSettingClick() {
@@ -2552,20 +2590,6 @@
       transferListForm(id) {
         this.$refs.transferListvirtalRef.transferModel(id)
       },
-      associatedplatForm(id,flag){
-        console.log(flag)
-        if(flag == '法规'){
-          this.$refs.associatedplatthreeRef.transferModel(id)
-        }else{
-          this.$refs.associatedplattwoRef.transferModel(id)
-        }
-      },
-      associatedplattwoForm(id){
-        this.$refs.associatedplatthreeRef.transferModel(id)
-      },
-      associatedplatthreeForm(id){
-        console.log(id)
-      },
       transferListFormHomo() {
         this.$refs.transferListRef.handleCancel()
         this.pageNo = 1
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
index dee8bbe07..aeb1aa03b 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
@@ -775,21 +775,9 @@
         })
       },
       DutyDepartChangeOne(event) {
-        this.formInline.dutyTerritory = []
+        // this.formInline.dutyTerritory = []
         this.formInline = {...this.formInline}
-        this.getDutyTerritoryOne(event.join(','))
-      },
-      getDutyTerritoryOne(row) {
-        let query = {
-          dutyDepart: row
-        }
-        getAction('/sys/dict/getDutyTeryByDD', query).then((res) => {
-          if (res.success) {
-            this.dutyTerritoryList = res.result || []
-          } else {
-            this.dutyTerritoryList = []
-          }
-        })
+        // this.getDutyTerritoryOne(event.join(','))
       },
       addModel() {
         this.visible = true

From 5df7920a9441e8c0746f716062ee4aecaf7969eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Mon, 18 Sep 2023 16:29:39 +0800
Subject: [PATCH 068/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysUserController.java  | 38 +++++++++++++++++++
 .../components/PersonnelSelection/index.vue   |  8 ++--
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
index 69b474d20..6723339f8 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
@@ -118,6 +118,44 @@ public class SysUserController {
     @Autowired
     private IProjectUserDutyTerritoryService projectUserDutyTerritoryService;
 
+    /**
+     * 搜索用户列表数据
+     */
+    @ApiOperation(value = "搜索用户列表数据")
+    @RequestMapping(value = "/searchUser", method = RequestMethod.GET)
+    public Result<List<SysUser>> searchUser(SysUser user, HttpServletRequest req) {
+        Result<List<SysUser>> result = new Result<List<SysUser>>();
+        List<SysUser> resList = new ArrayList<>();
+        String username = user.getUsername();
+        SysUser userSearch = null;
+        if(StringUtils.isNotEmpty(username)){
+            userSearch = sysUserService.getUserByName(username);
+        }
+        QueryWrapper<SysUser> queryWrapper1 = new QueryWrapper<>();
+        if(StringUtils.isNotEmpty(username)){
+            queryWrapper1.like("username",username);
+            queryWrapper1.orderByAsc("username");
+        }
+        Page<SysUser> page = new Page<>(1, 20);
+        IPage<SysUser> pageList = sysUserService.page(page, queryWrapper1);
+        List<SysUser> userList = pageList.getRecords();
+        if(null != userSearch){
+            SysUser finalUserSearch = userSearch;
+            boolean hasUser = userList.stream()
+                    .filter(u -> u.getId().equals(finalUserSearch.getId()))
+                    .findFirst()
+                    .isPresent();
+            if(!hasUser){
+                resList.add(userSearch);
+            }
+            resList.addAll(userList);
+        }
+        result.setSuccess(true);
+        result.setResult(resList);
+        log.info(userList.toString());
+        return result;
+    }
+
     /**
      * 获取用户列表数据
      *
diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue
index 24fdc6166..b3240aa71 100644
--- a/jero-web/src/components/PersonnelSelection/index.vue
+++ b/jero-web/src/components/PersonnelSelection/index.vue
@@ -164,11 +164,11 @@
       },
       getUserAndDepart(value, callback) {
         let query = {
-          current: 1,
-          pageSize: 20,
-          username: '*' + value + '*'
+          // current: 1,
+          // pageSize: 20,
+          username: value
         }
-        getAction('/sys/user/page', query).then((res) => {
+        getAction('/sys/user/searchUser', query).then((res) => {
           if (res.success) {
             callback && callback(res.result.records || res.result)
           } else {

From 54064404f61e688c51b902178dd9df3b83a09cec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Mon, 18 Sep 2023 16:46:37 +0800
Subject: [PATCH 069/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ota/entity/OtaManageReceiveNsdp.java      |  9 +++
 .../impl/OtaManageApplyEOServiceImpl.java     | 72 +++++++++++++++++++
 2 files changed, 81 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceiveNsdp.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceiveNsdp.java
index d4b581f72..e1b1cb18d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceiveNsdp.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceiveNsdp.java
@@ -104,4 +104,13 @@ public class OtaManageReceiveNsdp implements Serializable {
     @TableField(exist = false)
     private String market;
 
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "表头排序字段")
+    private java.lang.String orderByField;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "排序")
+    private java.lang.String orderBy;
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
index 7e3b4081f..dcaa894a9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
@@ -2344,6 +2344,78 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                 }
             }
         }
+        if (!resList.isEmpty()) {
+            //表头排序
+            headSort(otaManageReceiveNsdp,resList);
+        }
         return resList;
     }
+    private void headSort(OtaManageReceiveNsdp otaManageReceiveNsdp, List<OtaManageReceiveNsdp> resList) {
+        Collator comparator = Collator.getInstance(Locale.CHINESE);
+        // 软件版本，
+        if ("releaseName".equals(otaManageReceiveNsdp.getOrderByField())) {
+            if (OrderEnum.POSITIVE.getValue().equals(otaManageReceiveNsdp.getOrderBy())) {
+                Collections.sort(resList, (e1, e2) -> {
+                    String e1ReleaseName = StringUtils.isNotBlank(e1.getReleaseName()) ? e1.getReleaseName() : "";
+                    String e2ReleaseName = StringUtils.isNotBlank(e2.getReleaseName()) ? e2.getReleaseName() : "";
+                    return comparator.compare(e1ReleaseName, e2ReleaseName);
+                });
+            } else if (OrderEnum.REVERSE.getValue().equals(otaManageReceiveNsdp.getOrderBy())) {
+                Collections.sort(resList, (e1, e2) -> {
+                    String e1ReleaseName = StringUtils.isNotBlank(e1.getReleaseName()) ? e1.getReleaseName() : "";
+                    String e2ReleaseName = StringUtils.isNotBlank(e2.getReleaseName()) ? e2.getReleaseName() : "";
+                    return comparator.compare(e2ReleaseName, e1ReleaseName);
+                });
+            }
+        }
+        // 发布类型
+        if ("releaseType".equals(otaManageReceiveNsdp.getOrderByField())) {
+            if (OrderEnum.POSITIVE.getValue().equals(otaManageReceiveNsdp.getOrderBy())) {
+                Collections.sort(resList, (e1, e2) -> {
+                    String e1ReleaseType = StringUtils.isNotBlank(e1.getReleaseType()) ? e1.getReleaseType() : "";
+                    String e2ReleaseType = StringUtils.isNotBlank(e2.getReleaseType()) ? e2.getReleaseType() : "";
+                    return comparator.compare(e1ReleaseType, e2ReleaseType);
+                });
+            } else if (OrderEnum.REVERSE.getValue().equals(otaManageReceiveNsdp.getOrderBy())) {
+                Collections.sort(resList, (e1, e2) -> {
+                    String e1ReleaseType = StringUtils.isNotBlank(e1.getReleaseType()) ? e1.getReleaseType() : "";
+                    String e2ReleaseType = StringUtils.isNotBlank(e2.getReleaseType()) ? e2.getReleaseType() : "";
+                    return comparator.compare(e2ReleaseType, e1ReleaseType);
+                });
+            }
+        }
+        // 适用车型，
+        if ("vehicle".equals(otaManageReceiveNsdp.getOrderByField())) {
+            if (OrderEnum.POSITIVE.getValue().equals(otaManageReceiveNsdp.getOrderBy())) {
+                Collections.sort(resList, (e1, e2) -> {
+                    String e1Vehicle= StringUtils.isNotBlank(e1.getVehicle()) ? e1.getVehicle() : "";
+                    String e2Vehicle= StringUtils.isNotBlank(e2.getVehicle()) ? e2.getVehicle() : "";
+                    return comparator.compare(e1Vehicle, e2Vehicle);
+                });
+            } else if (OrderEnum.REVERSE.getValue().equals(otaManageReceiveNsdp.getOrderBy())) {
+                Collections.sort(resList, (e1, e2) -> {
+                    String e1Vehicle= StringUtils.isNotBlank(e1.getVehicle()) ? e1.getVehicle() : "";
+                    String e2Vehicle= StringUtils.isNotBlank(e2.getVehicle()) ? e2.getVehicle() : "";
+                    return comparator.compare(e2Vehicle, e1Vehicle);
+                });
+            }
+        }
+        // 软件发布时间，
+        if ("releaseDate".equals(otaManageReceiveNsdp.getOrderByField())) {
+            if (OrderEnum.POSITIVE.getValue().equals(otaManageReceiveNsdp.getOrderBy())) {
+                Collections.sort(resList, (e1, e2) -> {
+                    String e1ReleaseDate = StringUtils.isNotBlank(e1.getReleaseDate()) ? e1.getReleaseDate() : "";
+                    String e2ReleaseDate = StringUtils.isNotBlank(e2.getReleaseDate()) ? e2.getReleaseDate() : "";
+                    return comparator.compare(e1ReleaseDate, e2ReleaseDate);
+                });
+            } else if (OrderEnum.REVERSE.getValue().equals(otaManageReceiveNsdp.getOrderBy())) {
+                Collections.sort(resList, (e1, e2) -> {
+                    String e1ReleaseDate = StringUtils.isNotBlank(e1.getReleaseDate()) ? e1.getReleaseDate() : "";
+                    String e2ReleaseDate = StringUtils.isNotBlank(e2.getReleaseDate()) ? e2.getReleaseDate() : "";
+                    return comparator.compare(e2ReleaseDate, e1ReleaseDate);
+                });
+            }
+        }
+
+    }
 }

From d663a7cc8c5a4e99625ce7e7195f32d2eecc7202 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 19 Sep 2023 09:16:03 +0800
Subject: [PATCH 070/288] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A4=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctCertificationInventoryEOServiceImpl.java | 97 +++++++++++++------
 1 file changed, 69 insertions(+), 28 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index 276673057..c1e006cbb 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -1,8 +1,5 @@
 package com.jero.modules.project.service.impl;
 
-import cn.afterturn.easypoi.excel.ExcelImportUtil;
-import cn.afterturn.easypoi.excel.entity.ImportParams;
-import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
 import cn.hutool.core.util.URLUtil;
 import cn.hutool.core.util.ZipUtil;
 import com.alibaba.fastjson.JSON;
@@ -14,20 +11,17 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.Result;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.query.QueryGenerator;
-import com.jero.common.system.vo.DictModel;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.DateUtils;
 import com.jero.common.util.oss.CosBootUtil;
 import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO;
 import com.jero.modules.authDummy.service.IAuthDummyInventoryBaseEOService;
 import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService;
-import com.jero.modules.cert.template.vo.ParamsInfoCnImport;
-import com.jero.modules.cert.template.vo.ParamsInfoEnImport;
-import com.jero.modules.document.controller.BussDocumentLibraryEOController;
 import com.jero.modules.document.entity.BussDocumentLibraryEO;
 import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper;
 import com.jero.modules.document.service.IBussDocumentLibraryEOService;
@@ -37,22 +31,45 @@ import com.jero.modules.feishu.enums.TemplateInfoEnum2;
 import com.jero.modules.feishu.service.IFeishuService;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
-import com.jero.modules.project.entity.*;
+import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEO;
+import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOEn;
 import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
+import com.jero.modules.project.entity.ProjectCertificationInventoryEOEn;
 import com.jero.modules.project.entity.ProjectCertificationInventoryLogEO;
+import com.jero.modules.project.entity.ProjectLawsInventoryEO;
 import com.jero.modules.project.entity.ProjectLibraryBase;
+import com.jero.modules.project.entity.ProjectLibraryRoleRelEO;
 import com.jero.modules.project.entity.ProjectRelatedPersonnel;
-import com.jero.modules.project.enums.*;
+import com.jero.modules.project.entity.ProjectUserPermission;
+import com.jero.modules.project.enums.CertificationFlowNodeEnum;
+import com.jero.modules.project.enums.CertificationInventoryFlowStatusEnum;
+import com.jero.modules.project.enums.CertificationProgressEnum;
+import com.jero.modules.project.enums.JumpLinkEnum;
+import com.jero.modules.project.enums.OperatorTypeEnum;
+import com.jero.modules.project.enums.PermissionDescriptionEnum;
+import com.jero.modules.project.enums.ProjectInventoryFieldEnum;
+import com.jero.modules.project.enums.ProjectMessageEnum;
+import com.jero.modules.project.enums.ProjectUserLocationEnum;
+import com.jero.modules.project.enums.ReviewResultEnum;
+import com.jero.modules.project.enums.RoleRelModelTypeEnum;
+import com.jero.modules.project.enums.TaskAffirmStatusEnum;
+import com.jero.modules.project.enums.TaskStatusEnum;
+import com.jero.modules.project.mapper.ProjectCertificationInventoryEOMapper;
 import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
 import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper;
-import com.jero.modules.project.service.*;
+import com.jero.modules.project.service.IProjectCertificationInventoryEOService;
+import com.jero.modules.project.service.IProjectCertificationInventoryLogEOService;
+import com.jero.modules.project.service.IProjectLawsInventoryEOService;
+import com.jero.modules.project.service.IProjectLibraryBaseService;
+import com.jero.modules.project.service.IProjectLibraryRoleRelEOService;
+import com.jero.modules.project.service.IProjectRelatedPersonnelService;
+import com.jero.modules.project.service.IProjectUserPermissionService;
 import com.jero.modules.split.common.FileUnZip;
-import com.jero.modules.system.enums.ProjectRoleEnum;
-import com.jero.modules.project.mapper.ProjectCertificationInventoryEOMapper;
 import com.jero.modules.system.entity.SysCategory;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.entity.SysRole;
 import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.enums.ProjectRoleEnum;
 import com.jero.modules.system.enums.SysCategoryValueTypeEnum;
 import com.jero.modules.system.mapper.SysCategoryMapper;
 import com.jero.modules.system.mapper.SysRoleMapper;
@@ -64,45 +81,68 @@ import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
 import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
 import com.jero.modules.todoCenter.entity.ProcessInfoEO;
-import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum;
 import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService;
 import com.jero.modules.todoCenter.service.IProcessInfoEOService;
 import com.jero.modules.wkflow.enums.FlowTypeEnum;
 import com.jero.modules.wkflow.service.IProcessHistoryEOService;
 import lombok.SneakyThrows;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FileUtils;
-import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import org.apache.poi.hssf.usermodel.HSSFDateUtil;
+import org.apache.poi.hssf.usermodel.HSSFRichTextString;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.WorkbookFactory;
 import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.xssf.streaming.SXSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.SecurityUtils;
 import org.aspectj.util.FileUtil;
 import org.jeecgframework.poi.excel.ExcelExportUtil;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
-import org.joda.time.DateTime;
 import org.springframework.beans.BeanUtils;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;
-
-import java.io.*;
-import java.text.*;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.text.Collator;
+import java.text.DateFormat;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.Collectors;
 
 import static com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl.copyFile;
 
@@ -1508,7 +1548,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		pciQueryWrap.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList);
 		List<ProjectCertificationInventoryEO> pciEoList = this.list(pciQueryWrap);
 		if(CollectionUtils.isNotEmpty(pciEoList)){
-			List<Date> inventoryVerifyEndTimeList = pciEoList.stream().map(ProjectCertificationInventoryEO::getInventoryVerifyEndTime).distinct().collect(Collectors.toList());
+			List<Date> inventoryVerifyEndTimeList = pciEoList.stream().filter(e->ObjectUtils.isNotEmpty(e.getInventoryVerifyEndTime()))
+					.map(ProjectCertificationInventoryEO::getInventoryVerifyEndTime).distinct().collect(Collectors.toList());
 			inventoryVerifyEndTimeList.add(inventoryVerifyEndTime);
 			Collections.sort(inventoryVerifyEndTimeList, (d1, d2) -> d1.compareTo(d2)); // 根据时间顺序排序
 			inventoryVerifyEndTime = inventoryVerifyEndTimeList.get(0);

From cb9f486814b855938e38eabe1211196448a65b2d Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 19 Sep 2023 09:21:57 +0800
Subject: [PATCH 071/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E4=BA=A4=E4=BB=98=E7=89=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificationList/components/referenceDeliverablesList.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/referenceDeliverablesList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/referenceDeliverablesList.vue
index e67700add..ff924378a 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/referenceDeliverablesList.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/referenceDeliverablesList.vue
@@ -144,7 +144,7 @@
           ...this.queryParam
         }
         this.loading = true
-        postAction('platform/projectLibraryBase/page', query).then((res) => {
+        postAction('project/projectLibraryBase/page', query).then((res) => {
           if (res.success) {
             this.dataList = res.result.records || []
             this.total = res.result.total

From eca8f18f436f81d84b1be65b5c91f59e60e15f85 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 19 Sep 2023 09:39:17 +0800
Subject: [PATCH 072/288] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=EF=BC=88=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BA=BA=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformProjectCertificationInventoryEOServiceImpl.java     | 2 ++
 .../impl/ProjectCertificationInventoryEOServiceImpl.java        | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
index cd4aca3ff..4592a6b41 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
@@ -4390,6 +4390,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 		}
 
 		String configItem = json.getString("configItem");
+		String sdt = json.getString("sdt");//工程接口人
 		if(StringUtils.isEmpty(ids)){
 			throw new JeroBootException("请选择一个配置！");
 		}
@@ -4398,6 +4399,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.list(queryWrap);
 		projectCertificationInventoryEOList.forEach(certificationInventoryEO -> {
 			certificationInventoryEO.setConfigItem(configItem);
+			certificationInventoryEO.setSdt(sdt);
 		});
 
 		this.updateBatchById(projectCertificationInventoryEOList);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index c1e006cbb..7c04dc814 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -4199,6 +4199,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		}
 
 		String configItem = json.getString("configItem");
+		String sdt = json.getString("sdt");//工程接口人
 		if(StringUtils.isEmpty(ids)){
 			throw new JeroBootException("请选择一个配置！");
 		}
@@ -4207,6 +4208,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.list(queryWrap);
 		projectCertificationInventoryEOList.forEach(certificationInventoryEO -> {
 			certificationInventoryEO.setConfigItem(configItem);
+			certificationInventoryEO.setSdt(sdt);
 		});
 
 		this.updateBatchById(projectCertificationInventoryEOList);

From ecc6576d4a59d79bc98b9a54c8f067c11674b70b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 19 Sep 2023 10:20:38 +0800
Subject: [PATCH 073/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/modules/system/controller/SysUserController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
index 6723339f8..75aff3c83 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
@@ -148,8 +148,8 @@ public class SysUserController {
             if(!hasUser){
                 resList.add(userSearch);
             }
-            resList.addAll(userList);
         }
+        resList.addAll(userList);
         result.setSuccess(true);
         result.setResult(resList);
         log.info(userList.toString());

From cf568d87d77d0a3e11a7d98a5a20f089ad92e2f8 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 19 Sep 2023 11:13:00 +0800
Subject: [PATCH 074/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/associatedplat.vue             | 86 +++++++++----------
 .../components/associatedplatthree.vue        | 12 +--
 .../components/associatedplattwo.vue          |  6 +-
 .../components/certificationList/index.vue    | 12 +--
 .../components/listOfRegulations.vue          | 12 +--
 5 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/associatedplat.vue b/jero-web/src/views/projectManagement/components/associatedplat.vue
index 3f2bd496b..ac007c0e1 100644
--- a/jero-web/src/views/projectManagement/components/associatedplat.vue
+++ b/jero-web/src/views/projectManagement/components/associatedplat.vue
@@ -32,32 +32,32 @@
                                    :triggerChange="false" :dictCode="'brand'"/>
               </div>
             </a-col>
-            <template v-if="toggleSearchStatus">
-              <a-col :md="12" :sm="8">
-                <div class="box-title-text">
-                  <div class="title-text" :title="$t('ModelPlatform')">
-                    <span>{{$t('ModelPlatform')}}</span>
-                  </div>
-                  <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ModelPlatform')"
-                           v-model="queryParam.vehiclePlatform"></a-input>
-                </div>
-              </a-col>
-              <a-col :md="12" :sm="8">
-                <div class="box-title-text">
-                  <div class="title-text" :title="$t('DigitalPlatform')">
-                    <span>{{$t('DigitalPlatform')}}</span>
-                  </div>
-                  <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('DigitalPlatform')"
-                           v-model="queryParam.digitalPlatform"></a-input>
-                </div>
-              </a-col>
-            </template>
+<!--            <template v-if="toggleSearchStatus">-->
+<!--              <a-col :md="12" :sm="8">-->
+<!--                <div class="box-title-text">-->
+<!--                  <div class="title-text" :title="$t('ModelPlatform')">-->
+<!--                    <span>{{$t('ModelPlatform')}}</span>-->
+<!--                  </div>-->
+<!--                  <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ModelPlatform')"-->
+<!--                           v-model="queryParam.vehiclePlatform"></a-input>-->
+<!--                </div>-->
+<!--              </a-col>-->
+<!--              <a-col :md="12" :sm="8">-->
+<!--                <div class="box-title-text">-->
+<!--                  <div class="title-text" :title="$t('DigitalPlatform')">-->
+<!--                    <span>{{$t('DigitalPlatform')}}</span>-->
+<!--                  </div>-->
+<!--                  <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('DigitalPlatform')"-->
+<!--                           v-model="queryParam.digitalPlatform"></a-input>-->
+<!--                </div>-->
+<!--              </a-col>-->
+<!--            </template>-->
             <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <a @click="handleToggleSearch">
-                    {{ !toggleSearchStatus ? $t('open') : $t('away') }}
-                    <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-                  </a>
+<!--                  <a @click="handleToggleSearch">-->
+<!--                    {{ !toggleSearchStatus ? $t('open') : $t('away') }}-->
+<!--                    <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+<!--                  </a>-->
                   <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
                   <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                </a-col>
@@ -119,21 +119,29 @@
             dataIndex: 'projectNameId',
             align: 'left',
             ellipsis: true,
-            width: 235
+            width: 120
           },
           {
-            title: this.$t('StudioEngineer'),
-            dataIndex: 'studioEngineerName',
+            title: this.$t('regulatoryEngineer'),
+            dataIndex: 'createBy',
             align: 'left',
             ellipsis: true,
             width: 235
           },
+          {
+            title: this.$t('brand'),
+            align: 'left',
+            width: 120,
+            sorter:true,
+            ellipsis: true,
+            dataIndex: 'brandText'
+          },
           {
             title: this.$t('configurationItem'),
             dataIndex: 'ipdInfo',
             align: 'left',
             ellipsis: true,
-            width: 235
+            width: 180
           },
           {
             title: this.$t('explain'),
@@ -142,20 +150,6 @@
             ellipsis: true,
             width: 235
           },
-          {
-            title: this.$t('ModelPlatform'),
-            dataIndex: 'vehiclePlatform',
-            align: 'left',
-            ellipsis: true,
-            width: 235
-          },
-          {
-            title: this.$t('DigitalPlatform'),
-            dataIndex: 'digitalPlatform',
-            align: 'left',
-            ellipsis: true,
-            width: 235
-          },
         ],
         dataList: [],
         content: [],
@@ -165,16 +159,18 @@
         total: 0,
         flag:'',
         type:'',
+        ids:'',
       }
     },
     mounted() {
 
     },
     methods: {
-      transferModel(flag,type) {
+      transferModel(flag,type,ids) {
         this.visible = true
         this.flag = flag
         this.type = type
+        this.ids = ids
         this.queryParam = {}
         this.selectedRowKeys = []
         this.replacePage()
@@ -204,7 +200,7 @@
           ...this.queryParam
         }
         this.loading = true
-        postAction(this.url.transferUrl, query).then((res) => {
+        postAction('platform/projectLibraryBase/page', query).then((res) => {
           if (res.success) {
             this.dataList = res.result.records || []
             this.total = res.result.total
@@ -228,7 +224,7 @@
           this.confirmLoading = true
           let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
           this.confirmLoading = false
-          this.$emit('associatedplatForm',selectedRowKeys.join(','),this.flag,this.type)
+          this.$emit('associatedplatForm',selectedRowKeys.join(','),this.flag,this.type,this.ids)
           this.selectedRowKeys = []
           // postAction(this.url.addModel, {
           //   dummyInventoryBaseId: selectedRowKeys.join(','),
diff --git a/jero-web/src/views/projectManagement/components/associatedplatthree.vue b/jero-web/src/views/projectManagement/components/associatedplatthree.vue
index 5a7158360..36eb3a79a 100644
--- a/jero-web/src/views/projectManagement/components/associatedplatthree.vue
+++ b/jero-web/src/views/projectManagement/components/associatedplatthree.vue
@@ -161,16 +161,17 @@
         total: 0,
         type:'',
         id:'',
+        ids:'',
       }
     },
     mounted() {
 
     },
     methods: {
-      transferModel(id,type) {
-        this.visible = true
+      transferModel(id,type,ids) {
         this.id = id
         this.type = type
+        this.ids = ids
         this.queryParam = {}
         this.selectedRowKeys = []
         this.replacePage()
@@ -195,17 +196,18 @@
       },
       replacePage() {
         let query = {
-          pageNo: this.pageNo,
-          pageSize: this.pageSize,
+          ids: this.ids,
+          projectLibraryIds: this.id,
           ...this.queryParam
         }
         this.loading = true
-        postAction(this.url.transferUrl, query).then((res) => {
+        postAction('project/projectLibraryBase/listPlatform', query).then((res) => {
           if (res.success) {
             this.dataList = res.result.records || []
             this.selectedRowKeys = this.dataList.map(item => item.id)
             this.total = res.result.total
             this.loading = false
+            this.visible = true
           } else {
             this.loading = false
           }
diff --git a/jero-web/src/views/projectManagement/components/associatedplattwo.vue b/jero-web/src/views/projectManagement/components/associatedplattwo.vue
index e5337f1bf..cdb39f4ce 100644
--- a/jero-web/src/views/projectManagement/components/associatedplattwo.vue
+++ b/jero-web/src/views/projectManagement/components/associatedplattwo.vue
@@ -145,16 +145,18 @@ export default {
       total: 0,
       flag:'',
       type:'',
+      ids:'',
     }
   },
   mounted() {
 
   },
   methods: {
-    transferModel(flag,type) {
+    transferModel(flag,type,ids) {
       this.visible = true
       this.flag = flag
       this.type = type
+      this.ids = ids
       this.queryParam = {}
       this.selectedRowKeys = []
       this.replacePage()
@@ -208,7 +210,7 @@ export default {
         this.confirmLoading = true
         let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
         this.confirmLoading = false
-        this.$emit('associatedplattwoForm',selectedRowKeys.join(','),this.type)
+        this.$emit('associatedplattwoForm',selectedRowKeys.join(','),this.type,this.ids)
         this.selectedRowKeys = []
         // postAction(this.url.addModel, {
         //   dummyInventoryBaseId: selectedRowKeys.join(','),
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 4f2dfcf86..265550aef 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -1297,18 +1297,18 @@
           }
         }else{
           flag = '2'
-          this.$refs.associatedplatRef.transferModel(flag,type)
+          this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
         }
       },
-      associatedplatForm(id,flag,type){
+      associatedplatForm(id,flag,type,ids){
         if(flag == '1'){
-          this.$refs.associatedplatthreeRef.transferModel(id,type)
+          this.$refs.associatedplatthreeRef.transferModel(id,type,ids)
         }else{
-          this.$refs.associatedplattwoRef.transferModel(id,type)
+          this.$refs.associatedplattwoRef.transferModel(id,type,ids)
         }
       },
-      associatedplattwoForm(id,type){
-        this.$refs.associatedplatthreeRef.transferModel(id,type)
+      associatedplattwoForm(id,type,ids){
+        this.$refs.associatedplatthreeRef.transferModel(id,type,ids)
       },
       associatedplatthreeForm(id){
         console.log(id)
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index d39c57392..75c720c36 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1968,18 +1968,18 @@
           }
         }else{
           flag = '2'
-          this.$refs.associatedplatRef.transferModel(flag,type)
+          this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
         }
       },
-      associatedplatForm(id,flag,type){
+      associatedplatForm(id,flag,type,ids){
         if(flag == '1'){
-          this.$refs.associatedplatthreeRef.transferModel(id,type)
+          this.$refs.associatedplatthreeRef.transferModel(id,type,ids)
         }else{
-          this.$refs.associatedplattwoRef.transferModel(id,type)
+          this.$refs.associatedplattwoRef.transferModel(id,type,ids)
         }
       },
-      associatedplattwoForm(id,type){
-        this.$refs.associatedplatthreeRef.transferModel(id,type)
+      associatedplattwoForm(id,type,ids){
+        this.$refs.associatedplatthreeRef.transferModel(id,type,ids)
       },
       associatedplatthreeForm(id){
         console.log(id)

From 0a3ca2026139735235aee59390ed32afe6963f64 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 19 Sep 2023 13:40:10 +0800
Subject: [PATCH 075/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/projectManagement/components/listOfRegulations.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 75c720c36..cf628f497 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1960,7 +1960,7 @@
             if (dataSource[i].verifyFlowStatus == 'List to be released' &&
               dataSource[i].designFlowStatus == 'List to be released') {
               flag = '1'
-              this.$refs.associatedplatRef.transferModel(flag,type)
+              this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
             } else {
               this.$message.warning(this.$t('unpublishedregulationsselected'))
               return

From 156454c5b8f2e89f4d909e76576e910362c7695d Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Tue, 19 Sep 2023 14:32:15 +0800
Subject: [PATCH 076/288] =?UTF-8?q?draft=20=E6=9C=AC=E5=9C=B0=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jero/common/system/util/JwtUtil.java      | 2 +-
 .../src/main/java/com/jero/config/TomcatWebConfiguration.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/util/JwtUtil.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/util/JwtUtil.java
index 54db7a793..1da048c0e 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/util/JwtUtil.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/util/JwtUtil.java
@@ -28,7 +28,7 @@ import com.jero.common.util.oConvertUtils;
 public class JwtUtil {
 
 	// Token过期时间30分钟（用户登录过期时间是此时间的两倍，以token在reids缓存时间为准）
-	public static final long EXPIRE_TIME = 240 * 60 * 1000;
+	public static final long EXPIRE_TIME = 7 * 24 * 60 * 60 * 1000L;
 
 	/**
 	 * 校验token是否正确
diff --git a/jero-boot/jero-boot-single-startup/src/main/java/com/jero/config/TomcatWebConfiguration.java b/jero-boot/jero-boot-single-startup/src/main/java/com/jero/config/TomcatWebConfiguration.java
index 2a6e8f839..8bcf69a84 100644
--- a/jero-boot/jero-boot-single-startup/src/main/java/com/jero/config/TomcatWebConfiguration.java
+++ b/jero-boot/jero-boot-single-startup/src/main/java/com/jero/config/TomcatWebConfiguration.java
@@ -15,7 +15,7 @@ public class TomcatWebConfiguration extends WebMvcConfigurerAdapter {
     @Bean
     public TomcatServletWebServerFactory servletContainer(TomcatSslConnectorProperties properties) {
         TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory();
-        factory.addAdditionalTomcatConnectors(createSslConnector(properties));
+        //factory.addAdditionalTomcatConnectors(createSslConnector(properties));
         return factory;
     }
 

From 889b1c786b389d50a36d3e97aff6601872e00f2a Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 19 Sep 2023 14:51:06 +0800
Subject: [PATCH 077/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLibraryBaseController.java         | 13 +++
 .../entity/ProjectLawsInventoryEO.java        |  5 +-
 .../service/IProjectLibraryBaseService.java   |  7 ++
 .../impl/ProjectLibraryBaseServiceImpl.java   | 82 +++++++++++++++++++
 4 files changed, 105 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
index c6ad6bd3b..2ecf13b82 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
@@ -62,6 +62,19 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
 		return Result.OK(params.get("cut").toString(),pages);
 	}
 
+	/**
+	 * 法规清单关联平台件
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "法规清单关联平台件")
+	@ApiOperation(value="法规清单关联平台件", notes="法规清单关联平台件")
+	@PostMapping(value = "/listPlatform")
+	public Result<?> listPlatform(@RequestBody Map<String,Object> params) {
+		List<Map<String, Object>> mapList = projectLibraryBaseService.listPlatform(params);
+		return Result.OK(params.get("cut").toString(),mapList);
+	}
+
     /**
 	 * 列表查询
 	 *
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
index bec053579..34c78aec1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
@@ -1,12 +1,10 @@
 package com.jero.modules.project.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -538,4 +536,7 @@ public class ProjectLawsInventoryEO implements Serializable {
     /**一级责任领域**/
     @TableField(exist = false)
     private String firstLevelDutyTerritory;
+
+    @TableField(exist = false)
+    private String projectName;//项目名称
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java
index 1582dcb0c..26a2b99dc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java
@@ -85,6 +85,13 @@ public interface IProjectLibraryBaseService extends IService<ProjectLibraryBase>
 	 * @return
 	 */
 	List<ProjectLibraryBase> queryPageList(Map<String, Object> params);
+
+	/**
+	 * 法规清单关联平台件
+	 * @param params
+	 * @return
+	 */
+	List<Map<String,Object>> listPlatform(Map<String, Object> params);
 //	IPage<ProjectLibraryBase> queryPageList(Map<String, Object> params);
 
 	/**
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 33539db73..1a57078db 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -1261,6 +1261,88 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		hearSort(params, resultLast);
 		return resultLast;
 	}
+	/**
+	 * 法规清单关联平台件
+	 *
+	 * @return
+	 */
+	@Override
+	public List<Map<String,Object>> listPlatform(Map<String,Object> params) {
+		String cut = (String) params.get("cut");//法规清单id
+		String ids = (String) params.get("ids");//法规清单id
+		String projectLibraryIds = (String) params.get("projectLibraryIds");//平台件项目id
+
+		//法规清单数据
+		LambdaQueryWrapper<ProjectLawsInventoryEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.in(ProjectLawsInventoryEO::getId,Arrays.asList(ids.split(",")));
+		List<ProjectLawsInventoryEO> lawsInventoryEOList = projectLawsInventoryEOService.list(wrapper);
+
+		//平台件项目对应的法规清单数据
+		LambdaQueryWrapper<ProjectLawsInventoryEO> wrapper1 = new LambdaQueryWrapper<>();
+		wrapper1.in(ProjectLawsInventoryEO::getProjectLibraryId,Arrays.asList(projectLibraryIds.split(",")));
+		List<ProjectLawsInventoryEO> lawsInventoryEOS = projectLawsInventoryEOService.list(wrapper1);
+
+		//平台件项目信息
+		List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
+		if(!lawsInventoryEOList.isEmpty()){
+			List<String> projectIdList = lawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList());
+			LambdaQueryWrapper<ProjectLibraryBase> wrapper2 = new LambdaQueryWrapper<>();
+			wrapper2.in(ProjectLibraryBase::getId,projectIdList);
+			projectLibraryBaseList = this.list(wrapper2);
+		}
+
+		//普通数据字典
+		List<SysDictItem> sysDictItemList = sysDictItemMapper.selectItemsByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue());
+		List<Map<String,Object>> mapList = new ArrayList<>();
+		for (ProjectLawsInventoryEO projectLawsInventoryEO : lawsInventoryEOList) {
+			Map<String,Object> map = new HashMap<>();
+			List<ProjectLawsInventoryEO> projectLawsInventoryEOS = new ArrayList<>();
+			//serialNumber dutyTerritory
+			String serialNumber = projectLawsInventoryEO.getSerialNumber();
+			String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
+
+			//责任领域
+			List<String> list = new LinkedList<>();
+			if(StringUtils.isNotBlank(dutyTerritory)){
+				for (String s : dutyTerritory.split(",")) {
+					List<SysDictItem> collect = sysDictItemList.stream().filter(e -> e.getItemValue().equals(s)).collect(Collectors.toList());
+					if(CutEnum.CN.getValue().equals(cut) && !collect.isEmpty()){
+						list.add(collect.get(0).getItemText());
+					}else if(CutEnum.EN.getValue().equals(cut) && !collect.isEmpty()){
+						list.add(collect.get(0).getEnName());
+					}
+				}
+			}
+			String dutyTerritoryNew = "";
+			if(!list.isEmpty()){
+				dutyTerritoryNew = StringUtils.join(list, ",");
+			}
+
+			for (ProjectLawsInventoryEO lawsInventoryEO : lawsInventoryEOS) {
+				String serialNumberTemp = lawsInventoryEO.getSerialNumber();
+				String dutyTerritoryTemp = lawsInventoryEO.getDutyTerritory();
+				if(serialNumber.equals(serialNumberTemp) && StringUtils.isNotBlank(dutyTerritory) && dutyTerritory.equals(dutyTerritoryTemp)){
+					List<ProjectLibraryBase> projectLibraryBases = projectLibraryBaseList.stream().filter(e -> e.getId().equals(lawsInventoryEO.getProjectLibraryId())).collect(Collectors.toList());
+					if(!projectLibraryBases.isEmpty()){
+						lawsInventoryEO.setProjectName(projectLibraryBases.get(0).getProjectNameId());
+					}
+					if(!list.isEmpty()){
+						lawsInventoryEO.setDutyTerritory_dictText(dutyTerritoryNew);
+					}
+					projectLawsInventoryEOS.add(lawsInventoryEO);
+				}
+			}
+
+			if(!projectLawsInventoryEOS.isEmpty()){
+				map.put("title",serialNumber+" "+dutyTerritoryNew+"在平台件项目中包含多条匹配内容，请选择关联");
+				map.put("result",projectLawsInventoryEOS);
+				mapList.add(map);
+			}
+		}
+
+
+		return mapList;
+	}
 
 	private void hearSort(Map<String, Object> params, List<ProjectLibraryBase> resultLast) {
 		if(ObjectUtils.isNotEmpty(params.get("orderByField"))){

From ebfe932cf7ac46b432a563cc7bbe971a13141b9a Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 19 Sep 2023 16:11:47 +0800
Subject: [PATCH 078/288] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BA=93=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E8=A1=A8sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index dd1a81394..3fd67ad44 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -1227,3 +1227,17 @@ CREATE TABLE `laws_weilai`.`platform_task_planning`  (
   `project_id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '项目id',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+
+--车型项目库法规清单关联平台件表2023-09-19
+CREATE TABLE `inventory_flatform`  (
+  `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+  `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建日期',
+  `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新日期',
+  `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+  `laws_inventory_id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '车型项目库法规清单id',
+  `platform_laws_inventory_id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '平台件项目库法规清单id',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;

From 98b44d68b9f28e43e6adf798a647e9b81a6dcff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 19 Sep 2023 16:12:50 +0800
Subject: [PATCH 079/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=BC=96=E8=BE=91=E6=9D=A1=E7=9B=AE=E5=90=8E?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=9B=9E=E7=AC=AC=E4=B8=80=E9=A1=B5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectManagement/components/certificationList/index.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 496f75338..644e8075e 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -1566,7 +1566,7 @@
         this.selectedRowKeys = []
       },
       addModelForm() {
-        this.pageNo = 1
+        // this.pageNo = 1
         this.getList()
         this.selectedRowKeys = []
       },

From b11e2622aad659815abfd0a3c4357851a508aa22 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 19 Sep 2023 16:34:33 +0800
Subject: [PATCH 080/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=20SQL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql |   4 +-
 .../LawsInventoryPlatformEOController.java    | 179 ++++++++++++++++++
 .../entity/LawsInventoryPlatformEO.java       |  74 ++++++++
 .../mapper/LawsInventoryPlatformEOMapper.java |  17 ++
 .../xml/LawsInventoryPlatformEOMapper.xml     |  14 ++
 .../ILawsInventoryPlatformEOService.java      |  61 ++++++
 .../LawsInventoryPlatformEOServiceImpl.java   |  89 +++++++++
 7 files changed, 436 insertions(+), 2 deletions(-)
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/LawsInventoryPlatformEOController.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/LawsInventoryPlatformEO.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/LawsInventoryPlatformEOMapper.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsInventoryPlatformEOMapper.xml
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/ILawsInventoryPlatformEOService.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsInventoryPlatformEOServiceImpl.java

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index 3fd67ad44..51b763aec 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -1230,8 +1230,8 @@ CREATE TABLE `laws_weilai`.`platform_task_planning`  (
 
 
 --车型项目库法规清单关联平台件表2023-09-19
-CREATE TABLE `inventory_flatform`  (
-  `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+CREATE TABLE `laws_inventory_platform`  (
+  `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
   `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
   `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建日期',
   `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/LawsInventoryPlatformEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/LawsInventoryPlatformEOController.java
new file mode 100644
index 000000000..e3c976ac0
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/LawsInventoryPlatformEOController.java
@@ -0,0 +1,179 @@
+package com.jero.modules.project.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.project.entity.LawsInventoryPlatformEO;
+import com.jero.modules.project.service.ILawsInventoryPlatformEOService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+
+ /**
+ * @Description: 车型项目库法规清单关联平台件表
+ * @Author: jero-boot
+ * @Date:   2023-09-19
+ * @Version: V1.0
+ */
+@Api(tags="车型项目库法规清单关联平台件表")
+@RestController
+@RequestMapping("/project/lawsInventoryPlatformEO")
+@Slf4j
+public class LawsInventoryPlatformEOController extends JeroController<LawsInventoryPlatformEO, ILawsInventoryPlatformEOService> {
+	@Autowired
+	private ILawsInventoryPlatformEOService lawsInventoryPlatformEOService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param lawsInventoryPlatformEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "车型项目库法规清单关联平台件表-分页列表查询")
+	@ApiOperation(value="车型项目库法规清单关联平台件表-分页列表查询", notes="车型项目库法规清单关联平台件表-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(LawsInventoryPlatformEO lawsInventoryPlatformEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<LawsInventoryPlatformEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsInventoryPlatformEO, req.getParameterMap());
+		Page<LawsInventoryPlatformEO> page = new Page<LawsInventoryPlatformEO>(pageNo, pageSize);
+		IPage<LawsInventoryPlatformEO> pageList = lawsInventoryPlatformEOService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "车型项目库法规清单关联平台件表-列表查询")
+    @ApiOperation(value="车型项目库法规清单关联平台件表-列表查询", notes="车型项目库法规清单关联平台件表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<LawsInventoryPlatformEO>> queryList() {
+        List<LawsInventoryPlatformEO> list = lawsInventoryPlatformEOService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param lawsInventoryPlatformEO
+	 * @return
+	 */
+	@AutoLog(value = "车型项目库法规清单关联平台件表-添加")
+	@ApiOperation(value="车型项目库法规清单关联平台件表-添加", notes="车型项目库法规清单关联平台件表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody LawsInventoryPlatformEO lawsInventoryPlatformEO) {
+		lawsInventoryPlatformEOService.add(lawsInventoryPlatformEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param lawsInventoryPlatformEO
+	 * @return
+	 */
+	@AutoLog(value = "车型项目库法规清单关联平台件表-编辑")
+	@ApiOperation(value="车型项目库法规清单关联平台件表-编辑", notes="车型项目库法规清单关联平台件表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody LawsInventoryPlatformEO lawsInventoryPlatformEO) {
+		lawsInventoryPlatformEOService.editById(lawsInventoryPlatformEO);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "车型项目库法规清单关联平台件表-通过id删除")
+	@ApiOperation(value="车型项目库法规清单关联平台件表-通过id删除", notes="车型项目库法规清单关联平台件表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		lawsInventoryPlatformEOService.deleteById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "车型项目库法规清单关联平台件表-批量删除")
+	@ApiOperation(value="车型项目库法规清单关联平台件表-批量删除", notes="车型项目库法规清单关联平台件表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.lawsInventoryPlatformEOService.deleteByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "车型项目库法规清单关联平台件表-通过id查询")
+	@ApiOperation(value="车型项目库法规清单关联平台件表-通过id查询", notes="车型项目库法规清单关联平台件表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		LawsInventoryPlatformEO lawsInventoryPlatformEO = lawsInventoryPlatformEOService.queryById(id);
+		if(lawsInventoryPlatformEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(lawsInventoryPlatformEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param lawsInventoryPlatformEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, LawsInventoryPlatformEO lawsInventoryPlatformEO) {
+        return super.exportXls(request, lawsInventoryPlatformEO, LawsInventoryPlatformEO.class, "车型项目库法规清单关联平台件表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, LawsInventoryPlatformEO.class);
+    }
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/LawsInventoryPlatformEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/LawsInventoryPlatformEO.java
new file mode 100644
index 000000000..2548502e5
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/LawsInventoryPlatformEO.java
@@ -0,0 +1,74 @@
+package com.jero.modules.project.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @Description: 车型项目库法规清单关联平台件表
+ * @Author: jero-boot
+ * @Date:   2023-09-19
+ * @Version: V1.0
+ */
+@Data
+@TableName("laws_inventory_platform")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="laws_inventory_platform对象", description="车型项目库法规清单关联平台件表")
+public class LawsInventoryPlatformEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+
+	/**车型项目库法规清单id*/
+	@Excel(name = "车型项目库法规清单id", width = 15)
+    @ApiModelProperty(value = "车型项目库法规清单id")
+    private java.lang.String lawsInventoryId;
+
+	/**平台件项目库法规清单id*/
+	@Excel(name = "平台件项目库法规清单id", width = 15)
+    @ApiModelProperty(value = "平台件项目库法规清单id")
+    private java.lang.String platformLawsInventoryId;
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/LawsInventoryPlatformEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/LawsInventoryPlatformEOMapper.java
new file mode 100644
index 000000000..b8357525e
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/LawsInventoryPlatformEOMapper.java
@@ -0,0 +1,17 @@
+package com.jero.modules.project.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.project.entity.LawsInventoryPlatformEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 车型项目库法规清单关联平台件表
+ * @Author: jero-boot
+ * @Date:   2023-09-19
+ * @Version: V1.0
+ */
+public interface LawsInventoryPlatformEOMapper extends BaseMapper<LawsInventoryPlatformEO> {
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsInventoryPlatformEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsInventoryPlatformEOMapper.xml
new file mode 100644
index 000000000..c93297b1d
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsInventoryPlatformEOMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.project.mapper.LawsInventoryPlatformEOMapper">
+    <resultMap id="LawsInventoryPlatformEOResultMap" type="com.jero.modules.project.entity.LawsInventoryPlatformEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="laws_inventory_id" property="lawsInventoryId" />
+        <result column="platform_laws_inventory_id" property="platformLawsInventoryId" />
+    </resultMap>
+</mapper>
\ No newline at end of file
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/ILawsInventoryPlatformEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/ILawsInventoryPlatformEOService.java
new file mode 100644
index 000000000..45b5a1a7e
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/ILawsInventoryPlatformEOService.java
@@ -0,0 +1,61 @@
+package com.jero.modules.project.service;
+
+import com.jero.modules.project.entity.LawsInventoryPlatformEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 车型项目库法规清单关联平台件表
+ * @Author: jero-boot
+ * @Date:   2023-09-19
+ * @Version: V1.0
+ */
+public interface ILawsInventoryPlatformEOService extends IService<LawsInventoryPlatformEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param lawsInventoryPlatformEO
+	 * @return
+	 */
+    void add(LawsInventoryPlatformEO lawsInventoryPlatformEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param lawsInventoryPlatformEO
+	 * @return
+	 */
+    void editById(LawsInventoryPlatformEO lawsInventoryPlatformEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    LawsInventoryPlatformEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<LawsInventoryPlatformEO> queryList();
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsInventoryPlatformEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsInventoryPlatformEOServiceImpl.java
new file mode 100644
index 000000000..8aaecb0e1
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsInventoryPlatformEOServiceImpl.java
@@ -0,0 +1,89 @@
+package com.jero.modules.project.service.impl;
+
+import com.jero.modules.project.entity.LawsInventoryPlatformEO;
+import com.jero.modules.project.mapper.LawsInventoryPlatformEOMapper;
+import com.jero.modules.project.service.ILawsInventoryPlatformEOService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Date;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 车型项目库法规清单关联平台件表
+ * @Author: jero-boot
+ * @Date:   2023-09-19
+ * @Version: V1.0
+ */
+@Service
+public class LawsInventoryPlatformEOServiceImpl extends ServiceImpl<LawsInventoryPlatformEOMapper, LawsInventoryPlatformEO> implements ILawsInventoryPlatformEOService {
+
+	/**
+	 * 保存
+	 *
+	 * @param lawsInventoryPlatformEO
+	 * @return
+	 */
+	@Override
+    public void add(LawsInventoryPlatformEO lawsInventoryPlatformEO) {
+        Date now = new Date();
+        lawsInventoryPlatformEO.setCreateTime(now);
+        lawsInventoryPlatformEO.setUpdateTime(now);
+        save(lawsInventoryPlatformEO);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param lawsInventoryPlatformEO
+	 * @return
+	 */
+	@Override
+    public void editById(LawsInventoryPlatformEO lawsInventoryPlatformEO) {
+    	Date now = new Date();
+        lawsInventoryPlatformEO.setUpdateTime(now);
+    	saveOrUpdate(lawsInventoryPlatformEO);
+    }
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public void deleteById(String id) {
+        removeById(id);
+    }
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+    public void deleteByIds(List<String> ids) {
+        removeByIds(ids);
+    }
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public LawsInventoryPlatformEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<LawsInventoryPlatformEO> queryList() {
+        return list();
+    }
+}

From a81500beb2db6fab2ba6741708f602bc0fc983c0 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 19 Sep 2023 16:45:00 +0800
Subject: [PATCH 081/288] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BA=93=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E8=A1=A8-=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsInventoryPlatformEOController.java    | 13 +++++++
 .../entity/LawsInventoryPlatformEO.java       | 18 +++++-----
 .../ILawsInventoryPlatformEOService.java      |  6 ++++
 .../LawsInventoryPlatformEOServiceImpl.java   | 34 +++++++++++++++++--
 4 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/LawsInventoryPlatformEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/LawsInventoryPlatformEOController.java
index e3c976ac0..f4a6f62f3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/LawsInventoryPlatformEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/LawsInventoryPlatformEOController.java
@@ -93,6 +93,19 @@ public class LawsInventoryPlatformEOController extends JeroController<LawsInvent
 		lawsInventoryPlatformEOService.add(lawsInventoryPlatformEO);
 		return Result.OK("添加成功！");
 	}
+	/**
+	 *   批量添加
+	 *
+	 * @param lawsInventoryPlatformEOList
+	 * @return
+	 */
+	@AutoLog(value = "车型项目库法规清单关联平台件表-批量添加")
+	@ApiOperation(value="车型项目库法规清单关联平台件表-批量添加", notes="车型项目库法规清单关联平台件表-批量添加")
+	@PostMapping(value = "/addBatch")
+	public Result<?> addBatch(@Validated @RequestBody List<LawsInventoryPlatformEO> lawsInventoryPlatformEOList) {
+		lawsInventoryPlatformEOService.addBatch(lawsInventoryPlatformEOList);
+		return Result.OK("添加成功！");
+	}
 
 	/**
 	 *  编辑
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/LawsInventoryPlatformEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/LawsInventoryPlatformEO.java
index 2548502e5..1f8118edb 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/LawsInventoryPlatformEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/LawsInventoryPlatformEO.java
@@ -1,21 +1,19 @@
 package com.jero.modules.project.entity;
 
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
 
 
 /**
@@ -71,4 +69,8 @@ public class LawsInventoryPlatformEO implements Serializable {
     @ApiModelProperty(value = "平台件项目库法规清单id")
     private java.lang.String platformLawsInventoryId;
 
+	@TableField(exist = false)
+    @ApiModelProperty(value = "平台件项目库法规清单ids")
+    private java.lang.String platformLawsInventoryIds;
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/ILawsInventoryPlatformEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/ILawsInventoryPlatformEOService.java
index 45b5a1a7e..3a3c4f99d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/ILawsInventoryPlatformEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/ILawsInventoryPlatformEOService.java
@@ -20,6 +20,12 @@ public interface ILawsInventoryPlatformEOService extends IService<LawsInventoryP
 	 */
     void add(LawsInventoryPlatformEO lawsInventoryPlatformEO);
 
+	/**
+	 * 批量保存
+	 * @param lawsInventoryPlatformEOList
+	 */
+	void addBatch(List<LawsInventoryPlatformEO> lawsInventoryPlatformEOList);
+
 	/**
 	 * 更新
 	 *
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsInventoryPlatformEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsInventoryPlatformEOServiceImpl.java
index 8aaecb0e1..76024f23d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsInventoryPlatformEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsInventoryPlatformEOServiceImpl.java
@@ -1,12 +1,15 @@
 package com.jero.modules.project.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.modules.project.entity.LawsInventoryPlatformEO;
 import com.jero.modules.project.mapper.LawsInventoryPlatformEOMapper;
 import com.jero.modules.project.service.ILawsInventoryPlatformEOService;
+import com.jero.modules.system.util.StringUtils;
 import org.springframework.stereotype.Service;
-import java.util.List;
+
+import java.util.ArrayList;
 import java.util.Date;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.List;
 
 /**
  * @Description: 车型项目库法规清单关联平台件表
@@ -30,6 +33,33 @@ public class LawsInventoryPlatformEOServiceImpl extends ServiceImpl<LawsInventor
         lawsInventoryPlatformEO.setUpdateTime(now);
         save(lawsInventoryPlatformEO);
     }
+	/**
+	 * 批量保存
+	 *
+	 * @param lawsInventoryPlatformEOList
+	 * @return
+	 */
+	@Override
+    public void addBatch(List<LawsInventoryPlatformEO> lawsInventoryPlatformEOList) {
+		if(!lawsInventoryPlatformEOList.isEmpty()){
+			List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
+			for (LawsInventoryPlatformEO lawsInventoryPlatformEO : lawsInventoryPlatformEOList) {
+				if(StringUtils.isNotBlank(lawsInventoryPlatformEO.getPlatformLawsInventoryIds())){
+					for (String platformLawsInventoryId : lawsInventoryPlatformEO.getPlatformLawsInventoryIds().split(",")) {
+						LawsInventoryPlatformEO inventoryPlatformEO = new LawsInventoryPlatformEO();
+						inventoryPlatformEO.setCreateTime(new Date());
+						inventoryPlatformEO.setUpdateTime(new Date());
+						inventoryPlatformEO.setLawsInventoryId(lawsInventoryPlatformEO.getLawsInventoryId());
+						inventoryPlatformEO.setPlatformLawsInventoryId(platformLawsInventoryId);
+						lawsInventoryPlatformEOS.add(inventoryPlatformEO);
+					}
+				}
+			}
+			if(!lawsInventoryPlatformEOS.isEmpty()){
+				this.saveBatch(lawsInventoryPlatformEOS);
+			}
+		}
+    }
 
 	/**
 	 * 更新

From e28afe886a5c49ec99ddac40c0f464fcd443bc12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 19 Sep 2023 16:51:22 +0800
Subject: [PATCH 082/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=9C=89=E5=BE=85=E5=8A=9E=E5=8F=98=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/HomePermissionController.java  | 389 ++++++++++++++++++
 .../src/main/resources/application-dev.yml    |   2 +-
 2 files changed, 390 insertions(+), 1 deletion(-)
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomePermissionController.java

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomePermissionController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomePermissionController.java
new file mode 100644
index 000000000..e3be48b61
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomePermissionController.java
@@ -0,0 +1,389 @@
+package com.jero.modules.home.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jero.common.api.vo.Result;
+import com.jero.common.constant.CommonConstant;
+import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.system.vo.LoginUser;
+import com.jero.common.util.MD5Util;
+import com.jero.common.util.oConvertUtils;
+import com.jero.modules.ota.entity.OtaManageReceiveNsdp;
+import com.jero.modules.ota.service.IOtaManageApplyEOService;
+import com.jero.modules.system.entity.SysDepartPermission;
+import com.jero.modules.system.entity.SysPermission;
+import com.jero.modules.system.entity.SysPermissionDataRule;
+import com.jero.modules.system.entity.SysRolePermission;
+import com.jero.modules.system.enums.SysPermissionEnum;
+import com.jero.modules.system.mapper.TodoCenterMapper;
+import com.jero.modules.system.model.SysPermissionTree;
+import com.jero.modules.system.model.TreeModel;
+import com.jero.modules.system.service.ISysDepartPermissionService;
+import com.jero.modules.system.service.ISysPermissionDataRuleService;
+import com.jero.modules.system.service.ISysPermissionService;
+import com.jero.modules.system.service.ISysRolePermissionService;
+import com.jero.modules.system.util.PermissionDataUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 菜单权限表 为了做待办中心消息提醒放过来的
+ * </p>
+ *
+ * @Author scott
+ * @since 2018-12-21
+ */
+@Slf4j
+@RestController
+@RequestMapping("/home/permission")
+public class HomePermissionController {
+
+    @Autowired
+    private ISysPermissionService sysPermissionService;
+
+    @Autowired
+    private TodoCenterMapper todoCenterMapper;
+
+    @Autowired
+    private IOtaManageApplyEOService otaManageApplyEOService;
+
+
+
+    /**
+     * 查询用户拥有的菜单权限和按钮权限
+     *
+     * @return
+     */
+    @RequestMapping(value = "/getUserPermissionByToken", method = RequestMethod.GET)
+    public Result<?> getUserPermissionByToken(String cut) {
+        Result<JSONObject> result = new Result<JSONObject>();
+        try {
+            //直接获取当前用户不适用前端token
+            LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+            if (oConvertUtils.isEmpty(loginUser)) {
+                return Result.error("请登录系统！");
+            }
+            List<SysPermission> metaList = sysPermissionService.queryByUser(loginUser.getUsername());
+            //添加首页路由
+            //update-begin-author:taoyan date:20200211 for: TASK #3368 【路由缓存】首页的缓存设置有问题，需要根据后台的路由配置来实现是否缓存
+            if (!PermissionDataUtil.hasIndexPage(metaList)) {
+                SysPermission indexMenu = sysPermissionService.list(new LambdaQueryWrapper<SysPermission>().eq(SysPermission::getName, "首页")).get(0);
+                metaList.add(0, indexMenu);
+            }
+            //update-end-author:taoyan date:20200211 for: TASK #3368 【路由缓存】首页的缓存设置有问题，需要根据后台的路由配置来实现是否缓存
+            JSONObject json = new JSONObject();
+            JSONArray menujsonArray = new JSONArray();
+            this.getPermissionJsonArray(menujsonArray, metaList, null, cut);
+            JSONArray authjsonArray = new JSONArray();
+            this.getAuthJsonArray(authjsonArray, metaList);
+            //查询所有的权限
+            LambdaQueryWrapper<SysPermission> query = new LambdaQueryWrapper<SysPermission>();
+            query.eq(SysPermission::getDelFlag, CommonConstant.DEL_FLAG_0);
+            query.eq(SysPermission::getMenuType, CommonConstant.MENU_TYPE_2);
+            //query.eq(SysPermission::getStatus, "1");
+            List<SysPermission> allAuthList = sysPermissionService.list(query);
+            JSONArray allauthjsonArray = new JSONArray();
+            this.getAllAuthJsonArray(allauthjsonArray, allAuthList);
+            //路由菜单
+            json.put("menu", menujsonArray);
+            //按钮权限（用户拥有的权限集合）
+            json.put("auth", authjsonArray);
+            //全部权限配置集合（按钮权限，访问权限）
+            json.put("allAuth", allauthjsonArray);
+            result.setResult(json);
+            result.success("查询成功");
+        } catch (Exception e) {
+            result.error500("查询失败:" + e.getMessage());
+            log.error(e.getMessage(), e);
+        }
+        return result;
+    }
+
+    /**
+     * 获取菜单JSON数组
+     *
+     * @param jsonArray
+     * @param metaList
+     * @param parentJson
+     */
+    private void getPermissionJsonArray(JSONArray jsonArray, List<SysPermission> metaList, JSONObject parentJson, String cut) {
+        for (SysPermission permission : metaList) {
+            if (permission.getMenuType() == null) {
+                continue;
+            }
+            String tempPid = permission.getParentId();
+            JSONObject json = getPermissionJsonObject(permission, cut);
+            if (json == null) {
+                continue;
+            }
+            if (parentJson == null && oConvertUtils.isEmpty(tempPid)) {
+                jsonArray.add(json);
+                if (!permission.isLeaf()) {
+                    getPermissionJsonArray(jsonArray, metaList, json, cut);
+                }
+            } else if (parentJson != null && oConvertUtils.isNotEmpty(tempPid) && tempPid.equals(parentJson.getString("id"))) {
+                // 类型( 0：一级菜单 1：子菜单 2：按钮 )
+                if (permission.getMenuType().equals(CommonConstant.MENU_TYPE_2)) {
+                    JSONObject metaJson = parentJson.getJSONObject("meta");
+                    if (metaJson.containsKey("permissionList")) {
+                        metaJson.getJSONArray("permissionList").add(json);
+                    } else {
+                        JSONArray permissionList = new JSONArray();
+                        permissionList.add(json);
+                        metaJson.put("permissionList", permissionList);
+                    }
+                    // 类型( 0：一级菜单 1：子菜单 2：按钮 )
+                } else if (permission.getMenuType().equals(CommonConstant.MENU_TYPE_1) || permission.getMenuType().equals(CommonConstant.MENU_TYPE_0)) {
+                    if (parentJson.containsKey("children")) {
+                        parentJson.getJSONArray("children").add(json);
+                    } else {
+                        JSONArray children = new JSONArray();
+                        children.add(json);
+                        parentJson.put("children", children);
+                    }
+
+                    if (!permission.isLeaf()) {
+                        getPermissionJsonArray(jsonArray, metaList, json, cut);
+                    }
+                }
+            }
+
+        }
+    }
+
+
+    /**
+     * 获取权限JSON数组
+     *
+     * @param jsonArray
+     * @param metaList
+     */
+    private void getAuthJsonArray(JSONArray jsonArray, List<SysPermission> metaList) {
+        for (SysPermission permission : metaList) {
+            if (permission.getMenuType() == null) {
+                continue;
+            }
+            JSONObject json = null;
+            if (permission.getMenuType().equals(CommonConstant.MENU_TYPE_2) && CommonConstant.STATUS_1.equals(permission.getStatus())) {
+                json = new JSONObject();
+                json.put("action", permission.getPerms());
+                json.put("type", permission.getPermsType());
+                json.put("describe", permission.getName());
+                jsonArray.add(json);
+            }
+        }
+    }
+
+
+    /**
+     * 获取权限JSON数组
+     *
+     * @param jsonArray
+     * @param allList
+     */
+    private void getAllAuthJsonArray(JSONArray jsonArray, List<SysPermission> allList) {
+        JSONObject json = null;
+        for (SysPermission permission : allList) {
+            json = new JSONObject();
+            json.put("action", permission.getPerms());
+            json.put("status", permission.getStatus());
+            //1显示2禁用
+            json.put("type", permission.getPermsType());
+            json.put("describe", permission.getName());
+            jsonArray.add(json);
+        }
+    }
+
+
+    /**
+     * 根据菜单配置生成路由json
+     *
+     * @param permission
+     * @return
+     */
+    private JSONObject getPermissionJsonObject(SysPermission permission, String cut) {
+        JSONObject json = new JSONObject();
+        // 类型(0：一级菜单 1：子菜单 2：按钮)
+        if (permission.getMenuType().equals(CommonConstant.MENU_TYPE_2)) {
+            //json.put("action", permission.getPerms());
+            //json.put("type", permission.getPermsType());
+            //json.put("describe", permission.getName());
+            return null;
+        } else if (permission.getMenuType().equals(CommonConstant.MENU_TYPE_0) || permission.getMenuType().equals(CommonConstant.MENU_TYPE_1)) {
+            json.put("id", permission.getId());
+            if (permission.isRoute()) {
+                json.put("route", "1");// 表示生成路由
+            } else {
+                json.put("route", "0");// 表示不生成路由
+            }
+
+            if (isWWWHttpUrl(permission.getUrl())) {
+                json.put("path", MD5Util.MD5Encode(permission.getUrl(), "utf-8"));
+            } else {
+                json.put("path", permission.getUrl());
+            }
+
+            // 重要规则：路由name (通过URL生成路由name,路由name供前端开发，页面跳转使用)
+            if (oConvertUtils.isNotEmpty(permission.getComponentName())) {
+                json.put("name", permission.getComponentName());
+            } else {
+                json.put("name", urlToRouteName(permission.getUrl()));
+            }
+
+            // 是否隐藏路由，默认都是显示的
+            if (permission.isHidden()) {
+                json.put("hidden", true);
+            }
+            // 聚合路由
+            if (permission.isAlwaysShow()) {
+                json.put("alwaysShow", true);
+            }
+            json.put("component", permission.getComponent());
+            JSONObject meta = new JSONObject();
+            // 由用户设置是否缓存页面 用布尔值
+            if (permission.isKeepAlive()) {
+                meta.put("keepAlive", true);
+            } else {
+                meta.put("keepAlive", false);
+            }
+
+            /*update_begin author:wuxianquan date:20190908 for:往菜单信息里添加外链菜单打开方式 */
+            //外链菜单打开方式
+            if (permission.isInternalOrExternal()) {
+                meta.put("internalOrExternal", true);
+            } else {
+                meta.put("internalOrExternal", false);
+            }
+            /* update_end author:wuxianquan date:20190908 for: 往菜单信息里添加外链菜单打开方式*/
+
+            if (CutEnum.EN.getValue().equals(cut)) {
+                meta.put("title", permission.getMenuEn());
+            } else {
+                meta.put("title", permission.getName());
+            }
+
+            //update-begin--Author:scott  Date:20201015 for：路由缓存问题，关闭了tab页时再打开就不刷新 #842
+            String component = permission.getComponent();
+            if (oConvertUtils.isNotEmpty(permission.getComponentName()) || oConvertUtils.isNotEmpty(component)) {
+                meta.put("componentName", oConvertUtils.getString(permission.getComponentName(), component.substring(component.lastIndexOf("/") + 1)));
+            }
+            //update-end--Author:scott  Date:20201015 for：路由缓存问题，关闭了tab页时再打开就不刷新 #842
+
+            if (oConvertUtils.isEmpty(permission.getParentId())) {
+                // 一级菜单跳转地址
+                json.put("redirect", permission.getRedirect());
+                if (oConvertUtils.isNotEmpty(permission.getIcon())) {
+                    meta.put("icon", permission.getIcon());
+                }
+            } else {
+                if (oConvertUtils.isNotEmpty(permission.getIcon())) {
+                    meta.put("icon", permission.getIcon());
+                }
+            }
+            if (isWWWHttpUrl(permission.getUrl())) {
+                meta.put("url", permission.getUrl());
+            }
+
+            LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+            Map<String, Object> params = new HashMap<>();
+            params.put("currentUserId", currentUser.getId());
+
+            List<String> flowTypeList = new ArrayList<>();
+            //项目法规任务
+            if (StringUtils.equals(permission.getId(), SysPermissionEnum.PROJECT_REGULATION_TASKS.getId())) {
+                flowTypeList.add("1");
+                flowTypeList.add("2");
+                flowTypeList.add("3");
+                flowTypeList.add("4");
+                flowTypeList.add("10");
+                flowTypeList.add("21");
+                params.put("flowTypeList", flowTypeList);
+                //存在待办任务标识，true为有
+                boolean existTaskFlag = false;
+                int result = todoCenterMapper.todoCenterTaskCount(params);
+                if (result > 0) {
+                    existTaskFlag = true;
+                }
+                //查询当前登录用户是否有项目法规任务
+                meta.put("existTask", existTaskFlag);
+            }
+            //法规评估任务
+            if (StringUtils.equals(permission.getId(), SysPermissionEnum.REGULATORY_ASSESSMENT_TASKS.getId())) {
+                flowTypeList.add("5");
+                flowTypeList.add("6");
+                params.put("flowTypeList", flowTypeList);
+                int result = todoCenterMapper.todoCenterTaskCount(params);
+                boolean existTaskFlag = false;
+                if (result > 0) {
+                    existTaskFlag = true;
+                }
+                meta.put("existTask", existTaskFlag);
+            }
+            //项目参数任务
+            if (StringUtils.equals(permission.getId(), SysPermissionEnum.PROJECT_PARAMETER_TASKS.getId())) {
+                boolean existTaskFlag = false;
+                existTaskFlag = sysPermissionService.judgeToDo();
+                meta.put("existTask", existTaskFlag);
+            }
+            //OTA任务
+            if (StringUtils.equals(permission.getId(), SysPermissionEnum.OTA_TASKS.getId())) {
+                boolean existTaskFlag = false;
+                List<OtaManageReceiveNsdp> otaList = otaManageApplyEOService.getOtaTodoList(new OtaManageReceiveNsdp());
+                if(!otaList.isEmpty()){
+                    existTaskFlag = true;
+                }
+                meta.put("existTask", existTaskFlag);
+            }
+
+            json.put("meta", meta);
+        }
+
+        return json;
+    }
+
+    /**
+     * 判断是否外网URL 例如： http://localhost:8080/jero-boot/swagger-ui.html#/ 支持特殊格式： {{
+     * window._CONFIG['domianURL'] }}/druid/ {{ JS代码片段 }}，前台解析会自动执行JS代码片段
+     *
+     * @return
+     */
+    private boolean isWWWHttpUrl(String url) {
+        if (url != null && (url.startsWith("http://") || url.startsWith("https://") || url.startsWith("{{"))) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 通过URL生成路由name（去掉URL前缀斜杠，替换内容中的斜杠‘/’为-） 举例： URL = /isystem/role RouteName =
+     * isystem-role
+     *
+     * @return
+     */
+    private String urlToRouteName(String url) {
+        if (oConvertUtils.isNotEmpty(url)) {
+            if (url.startsWith("/")) {
+                url = url.substring(1);
+            }
+            url = url.replace("/", "-");
+
+            // 特殊标记
+            url = url.replace(":", "@");
+            return url;
+        } else {
+            return null;
+        }
+    }
+
+}
diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
index 1fb617200..f8349666e 100644
--- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
+++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
@@ -130,7 +130,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://121.36.69.172:3307/laws_weilai?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
+          url: jdbc:mysql://121.36.69.172:3307/laws_weilai_20230531?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
 #          url: jdbc:mysql://127.0.0.1:3306/laws_weilai?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
           username: root
           password: hzwlsoft.com

From 27e58a96cfa0ee97f7d4653cf1e9a2f27b61d678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 19 Sep 2023 16:51:40 +0800
Subject: [PATCH 083/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=9C=89=E5=BE=85=E5=8A=9E=E5=8F=98=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/api/api.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/api/api.js b/jero-web/src/api/api.js
index b6336bbfc..1ce851bd9 100644
--- a/jero-web/src/api/api.js
+++ b/jero-web/src/api/api.js
@@ -32,7 +32,7 @@ const queryTreeListForRole = (params)=>getAction("/sys/role/queryTreeList",param
 const queryListAsync = (params)=>getAction("/sys/permission/queryListAsync",params);
 const queryRolePermission = (params)=>getAction("/sys/permission/queryRolePermission",params);
 const saveRolePermission = (params)=>postAction("/sys/permission/saveRolePermission",params);
-const queryPermissionsByUser = ()=>getAction("/sys/permission/getUserPermissionByToken");
+const queryPermissionsByUser = ()=>getAction("/home/permission/getUserPermissionByToken");
 const loadAllRoleIds = (params)=>getAction("/sys/permission/loadAllRoleIds",params);
 const getPermissionRuleList = (params)=>getAction("/sys/permission/getPermRuleListByPermId",params);
 const queryPermissionRule = (params)=>getAction("/sys/permission/queryPermissionRule",params);

From 571b1ab70672b54504859eb4f5dfb89c86976fda Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 19 Sep 2023 16:52:04 +0800
Subject: [PATCH 084/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6->=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E6=95=B0=E6=8D=AE=E6=B7=BB=E5=8A=A0=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/service/impl/ProjectLibraryBaseServiceImpl.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 1a57078db..da59f6777 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -1334,6 +1334,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 			}
 
 			if(!projectLawsInventoryEOS.isEmpty()){
+				map.put("lawsInventoryId",projectLawsInventoryEO.getId());
 				map.put("title",serialNumber+" "+dutyTerritoryNew+"在平台件项目中包含多条匹配内容，请选择关联");
 				map.put("result",projectLawsInventoryEOS);
 				mapList.add(map);

From 8aaf1e90b368cf0350a1e15b8f0f7a0c7c03f7df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 19 Sep 2023 17:36:01 +0800
Subject: [PATCH 085/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9ota=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otaAuthentication/components/detil.vue    | 34 +++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
index 13e2f30af..7b48ee6e3 100644
--- a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
+++ b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
@@ -244,7 +244,11 @@
         </template>
         <!--        Vdr详情-->
         <template slot="vdr" slot-scope="text, record">
-          <a @click="getcdr(record)" :title='text'>{{text}}</a>
+          <a class="summaryClass" @click="getcdr(record)" :title='text'>{{text}}</a>
+        </template>
+
+        <template slot="summary" slot-scope="text, record">
+          <span class="summaryClass" :title='text'>{{text}}</span>
         </template>
         <!--        项目版本编辑-->
         <template slot="projectVersionName" slot-scope="text, record">
@@ -798,7 +802,8 @@ export default {
           ellipsis: true,
           sorter:true,
           fixed:'left',
-          width: 170
+          width: 170,
+          scopedSlots: { customRender: 'summary' }
         },
         {
           title: this.$t('vdrste'),
@@ -1573,4 +1578,29 @@ popconfirmmize {
     }
   }
 }
+.summaryClass{
+  display: inline-block;
+  width: 150px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.nio-drag-handler {
+  position: absolute;
+  right: 0;
+  top: 0;
+  height: 100%;
+  width: 5px;
+  z-index: 1;
+  border-right: 1px #e8e8e8 solid;
+}
+.nio-drag-handler:hover,
+.nio-drag-handler:focus{
+  cursor: col-resize!important;
+  border-right: 2px solid #0bd9d9!important;
+}
+.nio-header-th {
+  position: relative;
+  isolation: isolate;
+}
 </style>
\ No newline at end of file

From 0e1eaf78ddd0047c8f2c848db4251826e6b42739 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 19 Sep 2023 17:48:47 +0800
Subject: [PATCH 086/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9VDR=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OtaManageApplyEOServiceImpl.java     | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
index dcaa894a9..c79038397 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
@@ -1506,16 +1506,21 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                     }
                 }
             }
-
+            List<OtaManagePermission> ompAllList = otaManagePermissionService.list();
             List<OtaManagePermission> ompList = new ArrayList<>();
             for (String studioId : matchStudioMap.keySet()) {
-                OtaManagePermission omp = new OtaManagePermission();
-                omp.setApplyId(id);
-                omp.setUserId(studioId);
-                omp.setVehicle(matchStudioMap.get(studioId).stream().collect(Collectors.joining(",")));
-                ompList.add(omp);
+                List<OtaManagePermission> filterList = ompAllList.stream().filter(o->o.getApplyId().equals(id)&&o.getUserId().equals(studioId)).collect(Collectors.toList());
+                if(CollectionUtils.isEmpty(filterList)){
+                    OtaManagePermission omp = new OtaManagePermission();
+                    omp.setApplyId(id);
+                    omp.setUserId(studioId);
+                    omp.setVehicle(matchStudioMap.get(studioId).stream().collect(Collectors.joining(",")));
+                    ompList.add(omp);
+                }
+            }
+            if(CollectionUtils.isNotEmpty(ompList)){
+                otaManagePermissionService.saveBatch(ompList);
             }
-            otaManagePermissionService.saveBatch(ompList);
             //给studio发消息
             LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
             Map<String, Object> params = new HashMap<>();

From 15257448672f5ad1e1a3f2296fbd379e16131a53 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 20 Sep 2023 10:05:01 +0800
Subject: [PATCH 087/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95->?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProjectLawsInventoryEO.java        |   4 +
 .../ProjectLawsInventoryEOServiceImpl.java    | 128 ++++++++++++++++++
 2 files changed, 132 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
index 34c78aec1..d65ae364c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
@@ -15,6 +15,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -539,4 +540,7 @@ public class ProjectLawsInventoryEO implements Serializable {
 
     @TableField(exist = false)
     private String projectName;//项目名称
+
+    @TableField(exist = false)
+    private List<ProjectLawsInventoryEO> projectLawsInventoryEOS;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index ae9423dc4..0d5fdee66 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -289,6 +289,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 	private BussDocumentLibraryEOServiceImpl documentLibraryEOService;
 	@Autowired
 	private ProcessHistoryEOServiceImpl processHistoryEOServiceImpl;
+	@Autowired
+	private ProjectLawsInventoryEOMapper projectLawsInventoryEOMapper;
+	@Autowired
+	private LawsInventoryPlatformEOServiceImpl lawsInventoryPlatformEOService;
 
 	/**
 	 * 保存
@@ -11717,6 +11721,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		IPage<ProjectLawsInventoryEO> pageList = this.page(page, queryWrapper);
 		List<ProjectLawsInventoryEO> result = pageList.getRecords();
 
+		//关联平台件数据
+		platformDispose(projectLawsInventoryEO, result);
+
 		this.dataDispose(result,currentUser,isProjectRole,projectLawsInventoryEO.getCut());
 		this.dataDictDispose(result,projectLawsInventoryEO.getCut());
 		//表头排序
@@ -11724,6 +11731,127 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		return pageList;
 	}
 
+	private void platformDispose(ProjectLawsInventoryEO projectLawsInventoryEO, List<ProjectLawsInventoryEO> result) {
+		List<LawsInventoryPlatformEO> lawsInventoryPlatformEOList = new ArrayList<>();
+		List<ProjectLawsInventoryEO> projectLawsInventoryEOS = new ArrayList<>();
+
+		List<String> lawsInventoryIdList = new ArrayList<>();
+		List<String> inventoryIdList = new ArrayList<>();
+		List<String> userIdList = new ArrayList<>();
+		if(!result.isEmpty()){
+			lawsInventoryIdList = result.stream().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList());
+			LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();
+			wrapper.in(LawsInventoryPlatformEO::getLawsInventoryId,lawsInventoryIdList);
+			lawsInventoryPlatformEOList = lawsInventoryPlatformEOService.list(wrapper);
+			if(!lawsInventoryPlatformEOList.isEmpty()){
+				List<String> collect = lawsInventoryPlatformEOList.stream().map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).distinct().collect(Collectors.toList());
+				LambdaQueryWrapper<ProjectLawsInventoryEO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+				lambdaQueryWrapper.in(ProjectLawsInventoryEO::getId,collect);
+				projectLawsInventoryEOS = this.list(lambdaQueryWrapper);
+				if(!projectLawsInventoryEOS.isEmpty()){
+					inventoryIdList = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList());
+					List<String> collect1 = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getDesignDutyId).distinct().collect(Collectors.toList());
+					List<String> collect2 = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getVerifyDutyId).distinct().collect(Collectors.toList());
+					if(!collect1.isEmpty()){
+						userIdList.addAll(collect1);
+					}
+					if(!collect2.isEmpty()){
+						userIdList.addAll(collect2);
+					}
+				}
+			}
+		}
+		//树形结构数据字典(技术领域)
+		List<SysCategory> categoryList = sysCategoryService.list();
+		//文件
+		List<OSSFile> fileInfos = new ArrayList<>();
+		if (inventoryIdList.size() != 0) {
+			fileInfos = iOSSFileService.getFileInfos(StringUtils.join(inventoryIdList, ","));
+		}
+		List<SysUser> sysUsers = new ArrayList<>();
+		if (CollectionUtils.isNotEmpty(userIdList)) {
+			userIdList = userIdList.stream().distinct().collect(Collectors.toList());
+			QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
+			sysUserQueryWrapper.lambda().in(SysUser::getId, userIdList);
+			sysUsers = sysUserMapper.selectList(sysUserQueryWrapper);
+		}
+		String cut = projectLawsInventoryEO.getCut();
+		for (ProjectLawsInventoryEO lawsInventoryEO : result) {
+			if(!lawsInventoryPlatformEOList.isEmpty()){
+				List<LawsInventoryPlatformEO> inventoryPlatformEOList = lawsInventoryPlatformEOList.stream()
+						.filter(e -> lawsInventoryEO.getId().equals(e.getLawsInventoryId())).collect(Collectors.toList());
+				if(!inventoryPlatformEOList.isEmpty()){
+					List<String> idList = inventoryPlatformEOList.stream()
+							.map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).collect(Collectors.toList());
+					List<ProjectLawsInventoryEO> lawsInventoryEOS = projectLawsInventoryEOS.stream()
+							.filter(e -> idList.contains(e.getId())).collect(Collectors.toList());
+					lawsInventoryEO.setProjectLawsInventoryEOS(lawsInventoryEOS);
+					//如果关联平台件数据不为空，编辑时将设计符合性和验证符合性的数据覆盖
+					if(!lawsInventoryEOS.isEmpty()){
+						ProjectLawsInventoryEO inventoryEO = lawsInventoryEOS.get(0);
+						//设计
+						String designDeliverableType = inventoryEO.getDesignDeliverableType();//交付物类型
+						String designDutyId = inventoryEO.getDesignDutyId();//责任人
+						String designDeliverableTemplate = inventoryEO.getDesignDeliverableTemplate();//交付物模板
+						//验证
+						String verifyDeliverableType = inventoryEO.getVerifyDeliverableType();//交付物类型
+						String verifyDutyId = inventoryEO.getVerifyDutyId();//责任人
+						String verifyDeliverableTemplate = inventoryEO.getVerifyDeliverableTemplate();//交付物模板
+						//设计交付物类型
+						if (StringUtils.isNotBlank(designDeliverableType)) {
+							lawsInventoryEO.setDesignDeliverableType(designDeliverableType);
+							List<String> designDeliverableTypeList = Arrays.asList(designDeliverableType.split(","));
+							String name = getTreeName(cut, categoryList, designDeliverableTypeList);
+							lawsInventoryEO.setDesignDeliverableTypeName(name);
+						}
+						//验证交付物类型
+						if (StringUtils.isNotBlank(verifyDeliverableType)) {
+							lawsInventoryEO.setVerifyDeliverableType(verifyDeliverableType);
+							List<String> verifyDeliverableTypeList = Arrays.asList(verifyDeliverableType.split(","));
+							String name = getTreeName(cut, categoryList, verifyDeliverableTypeList);
+							lawsInventoryEO.setVerifyDeliverableTypeName(name);
+						}
+						//交付物类型模板
+						if (fileInfos.size() != 0) {
+							if (StringUtils.isNotBlank(designDeliverableTemplate)) {
+								lawsInventoryEO.setDesignDeliverableTemplate(designDeliverableTemplate);
+								String fileName = this.editService.getFileName(null, fileInfos, designDeliverableTemplate);
+								if (StringUtils.isNotBlank(fileName)) {
+									lawsInventoryEO.setDesignDeliverableTemplateName(fileName);
+								}
+							}
+							if (StringUtils.isNotBlank(verifyDeliverableTemplate)) {
+								lawsInventoryEO.setVerifyDeliverableTemplate(verifyDeliverableTemplate);
+								String fileName = this.editService.getFileName(null, fileInfos, verifyDeliverableTemplate);
+								if (StringUtils.isNotBlank(fileName)) {
+									lawsInventoryEO.setVerifyDeliverableTemplateName(fileName);
+								}
+							}
+						}
+						//设计责任人
+						if (StringUtils.isNotEmpty(designDutyId)) {
+							lawsInventoryEO.setVerifyDutyId(designDutyId);
+							String designDutyName = sysUsers.stream().filter(e -> designDutyId.equals(e.getId())).
+									map(SysUser::getUsername).collect(Collectors.joining(","));
+							lawsInventoryEO.setDesignDutyIdName(designDutyName);
+						} else {
+							lawsInventoryEO.setDesignDutyIdName("");
+						}
+						//验证责任人
+						if (StringUtils.isNotEmpty(verifyDutyId)) {
+							lawsInventoryEO.setVerifyDutyId(verifyDutyId);
+							String verifyDutyName = sysUsers.stream().filter(e -> verifyDutyId.equals(e.getId())).
+									map(SysUser::getUsername).collect(Collectors.joining(","));
+							lawsInventoryEO.setVerifyDutyIdName(verifyDutyName);
+						} else {
+							lawsInventoryEO.setVerifyDutyIdName("");
+						}
+					}
+				}
+			}
+		}
+	}
+
 	@Override
 	public Result<?> finalizationVerify(Map<String, Object> params) {
 		boolean result = false; // 返回true，可以定版，返回false 不能定版

From 4d3ddee40665672e0b2c9036c2b239bb41e9a722 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 20 Sep 2023 10:36:53 +0800
Subject: [PATCH 088/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/associatedplatthree.vue        | 212 +++++++++---------
 .../components/certificationList/index.vue    |  14 +-
 .../components/listOfRegulations.vue          |   2 +-
 3 files changed, 110 insertions(+), 118 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/associatedplatthree.vue b/jero-web/src/views/projectManagement/components/associatedplatthree.vue
index 36eb3a79a..00e41c0f6 100644
--- a/jero-web/src/views/projectManagement/components/associatedplatthree.vue
+++ b/jero-web/src/views/projectManagement/components/associatedplatthree.vue
@@ -9,30 +9,17 @@
     :visible="visible"
     style="height: 100%;overflow: auto;padding-bottom: 53px;">
     <div style="margin-bottom: 60px" v-for='(item,index) in data'>
-      <div>{{'GB 111'}}{{$t('associatedItem')}}</div>
+      <div>{{item.title}}{{$t('associatedItem')}}</div>
       <a-table
         :components="drag(columns,'columns')"
         :columns="columns"
         rowKey="id"
         :scroll="{x: 1000}"
-        :data-source="item.list"
+        :data-source="item.result"
         :pagination="false"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:'' }"
+        :row-selection="{ selectedRowKeys: selectQuery['selectedRowKeys'+index], onChange:(value, data) =>onChange(value, data, index),columnTitle:'' }"
         :loading="loading">
-
       </a-table>
-<!--      <div class="page" v-if="dataList.length > 0">-->
-<!--        <a-pagination-->
-<!--          :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
-<!--          show-quick-jumper-->
-<!--          show-size-changer-->
-<!--          :page-size.sync="pageSize"-->
-<!--          :total="total"-->
-<!--          :current="pageNo"-->
-<!--          @change="onChange"-->
-<!--          @showSizeChange="SizeChange"-->
-<!--        />-->
-<!--      </div>-->
     </div>
 
     <div class="drawer-bootom-button">
@@ -57,6 +44,8 @@
         queryParam: {},
         confirmLoading: false,
         selectedRowKeys: [],
+        selectQuery:{},
+        selectedRow: [],
         columns: [
           {
             title: this.$t('entryName'),
@@ -81,7 +70,7 @@
           },
           {
             title: this.$t('NareaOfResponsibility'),
-            dataIndex: 'dutyTerritory',
+            dataIndex: 'dutyTerritory_dictText',
             align: 'left',
             ellipsis: true,
             width: 140
@@ -102,57 +91,57 @@
           },
           {
             title: this.$t('verify') + '-' + this.$t('typeOfDeliverables'),
-            dataIndex: 'deliverableTypeName',
+            dataIndex: 'verifyDeliverableTypeName',
             align: 'left',
             ellipsis: true,
             width: 130
           },
         ],
         data: [
-          {
-            id:'1',
-            list:[
-              {
-                createBy: "linda.zhao",
-                createByCn: null,
-                createTime: "2023-04-17 19:10:14",
-                cut: null,
-                id: "1647920396307046401",
-                name: "EU/UK Regulation List V23.04",
-                orderBy: null,
-                orderByField: null,
-                readFlag: null,
-                state: "1",
-                state_dictText: "已发布",
-                sysOrgCode: "SUPERVISORY_ORGANIZATION-3-522",
-                updateBy: "admin",
-                updateTime: "2023-05-10 15:24:33",
-                upgradeExplanation: "asd",
-              }
-            ]
-          },
-          {
-            id:'1',
-            list:[
-              {
-                createBy: "linda.zhao",
-                createByCn: null,
-                createTime: "2023-04-17 19:10:14",
-                cut: null,
-                id: "1647920396307046401",
-                name: "EU/UK Regulation List V23.04",
-                orderBy: null,
-                orderByField: null,
-                readFlag: null,
-                state: "1",
-                state_dictText: "已发布",
-                sysOrgCode: "SUPERVISORY_ORGANIZATION-3-522",
-                updateBy: "admin",
-                updateTime: "2023-05-10 15:24:33",
-                upgradeExplanation: "asd",
-              }
-            ]
-          },
+          // {
+          //   id:'1',
+          //   list:[
+          //     {
+          //       createBy: "linda.zhao",
+          //       createByCn: null,
+          //       createTime: "2023-04-17 19:10:14",
+          //       cut: null,
+          //       id: "1647920396307046401",
+          //       name: "EU/UK Regulation List V23.04",
+          //       orderBy: null,
+          //       orderByField: null,
+          //       readFlag: null,
+          //       state: "1",
+          //       state_dictText: "已发布",
+          //       sysOrgCode: "SUPERVISORY_ORGANIZATION-3-522",
+          //       updateBy: "admin",
+          //       updateTime: "2023-05-10 15:24:33",
+          //       upgradeExplanation: "asd",
+          //     }
+          //   ]
+          // },
+          // {
+          //   id:'1',
+          //   list:[
+          //     {
+          //       createBy: "linda.zhao",
+          //       createByCn: null,
+          //       createTime: "2023-04-17 19:10:14",
+          //       cut: null,
+          //       id: "1647920396307046401",
+          //       name: "EU/UK Regulation List V23.04",
+          //       orderBy: null,
+          //       orderByField: null,
+          //       readFlag: null,
+          //       state: "1",
+          //       state_dictText: "已发布",
+          //       sysOrgCode: "SUPERVISORY_ORGANIZATION-3-522",
+          //       updateBy: "admin",
+          //       updateTime: "2023-05-10 15:24:33",
+          //       upgradeExplanation: "asd",
+          //     }
+          //   ]
+          // },
         ],
         content: [],
         loading: false,
@@ -173,7 +162,7 @@
         this.type = type
         this.ids = ids
         this.queryParam = {}
-        this.selectedRowKeys = []
+        this.selectQuery = {}
         this.replacePage()
       },
       searchQuery() {
@@ -185,15 +174,6 @@
         this.queryParam = {}
         this.replacePage()
       },
-      onChange(page, pageSize) {
-        this.pageNo = page
-        this.replacePage()
-      },
-      SizeChange(page, pageSize) {
-        this.pageNo = 1
-        this.pageSize = pageSize
-        this.replacePage()
-      },
       replacePage() {
         let query = {
           ids: this.ids,
@@ -203,57 +183,69 @@
         this.loading = true
         postAction('project/projectLibraryBase/listPlatform', query).then((res) => {
           if (res.success) {
-            this.dataList = res.result.records || []
-            this.selectedRowKeys = this.dataList.map(item => item.id)
-            this.total = res.result.total
+            this.data = res.result || []
+            this.data.forEach((item,index) => {
+              let name = 'selectedRowKeys'+index
+              this.selectQuery[name] = item.result.map(val => val.id)
+              // for(var i in item.result.map(val => val.id)){
+              //   this.selectedRowKeys.push(item.result.map(val => val.id)[i])
+              // }
+              // this.selectedRow.push(item.result)
+            })
+            console.log(this.selectQuery)
+            // console.log(this.selectedRow)
             this.loading = false
-            this.visible = true
+            if(this.data.length >= 1){
+              this.visible = true
+            }
           } else {
             this.loading = false
           }
         })
       },
-      onSelectChange(value) {
-        this.selectedRowKeys = value
-        // if (this.selectedRowKeys.length > 1) {
-        //   this.selectedRowKeys.shift()
-        // }
+      onChange(value,data,ind) {
+        this.selectQuery['selectedRowKeys'+ind] = value
+        this.data = [...this.data]
       },
       handleCancel() {
         this.visible = false
       },
       handleSubmit(flag) {
-        console.log(this.selectedRowKeys)
-        return
-        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+        if (this.selectQuery) {
           this.confirmLoading = true
-          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
-          this.confirmLoading = false
-          this.$emit('associatedplatthreeForm',selectedRowKeys.join(','))
-          this.selectedRowKeys = []
-          // postAction(this.url.addModel, {
-          //   dummyInventoryBaseId: selectedRowKeys.join(','),
-          //   projectLibraryId: this.$route.query.id,
-          //   flag: flag
-          // }).then((res) => {
-          //   if (res.success) {
-          //     this.confirmLoading = false
-          //     this.$message.success(this.$t('OperationSuccessful'))
-          //     this.visible = false
-          //     this.selectedRowKeys = []
-          //     this.$emit('transferListForm')
-          //   } else {
-          //     if (res.message == '该虚拟清单的维护清单中没有数据,是否需要添加') {
-          //       this.confirmLoading = false
-          //       this.getAdd()
-          //       return
-          //     }
-          //     this.$message.warning(this.$t('operationFailed'))
-          //     this.confirmLoading = false
-          //   }
-          // })
+          let array = Object.values(this.selectQuery)
+          let arr = []
+          this.data.forEach((val,index) => {
+            array.forEach((item,index1) => {
+              if(index == index1){
+                arr.push({
+                  lawsInventoryId:val.lawsInventoryId,
+                  platformLawsInventoryIds:item.join(',')
+                })
+              }
+            })
+          })
+          arr = arr
+          console.log(arr)
+          let query = {
+            list : JSON.parse(JSON.stringify(arr))
+          }
+          console.log(query)
+          postAction('project/lawsInventoryPlatformEO/addBatch', query).then((res) => {
+            if (res.success) {
+              this.confirmLoading = false
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.visible = false
+              this.selectQuery = {}
+              this.$emit('associatedplatthreeForm')
+            } else {
+              this.$message.warning(this.$t('operationFailed'))
+              this.confirmLoading = false
+            }
+          })
         } else {
-          this.$message.warning(this.$t('selectLeastOne'))
+          // this.$message.warning(this.$t('selectLeastOne'))
+          this.visible = false
         }
       },
       getAdd() {
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 265550aef..acd258b30 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -1297,18 +1297,18 @@
           }
         }else{
           flag = '2'
-          this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
+          this.$message.warning(this.$t('selectLeastOne'))
         }
       },
       associatedplatForm(id,flag,type,ids){
-        if(flag == '1'){
-          this.$refs.associatedplatthreeRef.transferModel(id,type,ids)
-        }else{
-          this.$refs.associatedplattwoRef.transferModel(id,type,ids)
-        }
+        // if(flag == '1'){
+        //   this.$refs.associatedplatthreeRef.transferModel(id,type,ids)
+        // }else{
+        //   this.$refs.associatedplattwoRef.transferModel(id,type,ids)
+        // }
       },
       associatedplattwoForm(id,type,ids){
-        this.$refs.associatedplatthreeRef.transferModel(id,type,ids)
+        // this.$refs.associatedplatthreeRef.transferModel(id,type,ids)
       },
       associatedplatthreeForm(id){
         console.log(id)
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index cf628f497..9b804c8d6 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1982,7 +1982,7 @@
         this.$refs.associatedplatthreeRef.transferModel(id,type,ids)
       },
       associatedplatthreeForm(id){
-        console.log(id)
+        this.getList()
       },
       //批量设置
       batSettingClick() {

From 0836403f3324274fdd5ff38c9ae89ac7846a5c94 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 20 Sep 2023 11:09:34 +0800
Subject: [PATCH 089/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/service/impl/ProjectLibraryBaseServiceImpl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index da59f6777..c48f84b1b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -1268,7 +1268,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	 */
 	@Override
 	public List<Map<String,Object>> listPlatform(Map<String,Object> params) {
-		String cut = (String) params.get("cut");//法规清单id
+		String cut = (String) params.get("cut");//
 		String ids = (String) params.get("ids");//法规清单id
 		String projectLibraryIds = (String) params.get("projectLibraryIds");//平台件项目id
 

From a0a0fb89501c9509a21ce225cb33e603cf0a4595 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 20 Sep 2023 11:18:16 +0800
Subject: [PATCH 090/288] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BA=93=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E8=A1=A8-=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsInventoryPlatformEOController.java        | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/LawsInventoryPlatformEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/LawsInventoryPlatformEOController.java
index f4a6f62f3..598c52bff 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/LawsInventoryPlatformEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/LawsInventoryPlatformEOController.java
@@ -1,5 +1,7 @@
 package com.jero.modules.project.controller;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -27,6 +29,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -96,14 +99,20 @@ public class LawsInventoryPlatformEOController extends JeroController<LawsInvent
 	/**
 	 *   批量添加
 	 *
-	 * @param lawsInventoryPlatformEOList
+	 * @param json
 	 * @return
 	 */
 	@AutoLog(value = "车型项目库法规清单关联平台件表-批量添加")
 	@ApiOperation(value="车型项目库法规清单关联平台件表-批量添加", notes="车型项目库法规清单关联平台件表-批量添加")
 	@PostMapping(value = "/addBatch")
-	public Result<?> addBatch(@Validated @RequestBody List<LawsInventoryPlatformEO> lawsInventoryPlatformEOList) {
-		lawsInventoryPlatformEOService.addBatch(lawsInventoryPlatformEOList);
+	public Result<?> addBatch(@Validated @RequestBody JSONObject json) {
+		JSONArray dataList = json.getJSONArray("list");
+		List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
+		for (Object data : dataList) {
+			LawsInventoryPlatformEO inventoryPlatformEO = JSONObject.parseObject(JSONObject.toJSONString(data), LawsInventoryPlatformEO.class);
+			lawsInventoryPlatformEOS.add(inventoryPlatformEO);
+		}
+		lawsInventoryPlatformEOService.addBatch(lawsInventoryPlatformEOS);
 		return Result.OK("添加成功！");
 	}
 

From acee333cc80fb242b4d3ccef4be3d574801fa0c1 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 20 Sep 2023 13:43:49 +0800
Subject: [PATCH 091/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  1 +
 jero-web/src/common/lang/zh-cn.js             |  1 +
 .../components/listEditModel.vue              | 98 ++++++++++++++++++-
 3 files changed, 96 insertions(+), 4 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 43e06006c..292a84b55 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1975,4 +1975,5 @@ module.exports = {
   Associatedplatform:'Associated platform',
   associatedItem:'There are multiple matching items in the platform item. Please select the associated item',
   unpublishedregulationsselected:'Only unpublished regulations can be selected',
+  PlatformInformation:'Platform Information',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 29ccb00da..69b3c0887 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -3931,4 +3931,5 @@ module.exports = {
   Associatedplatform:'关联平台件',
   associatedItem:'在平台件项目中包含多条匹配内容，请选择关联项',
   unpublishedregulationsselected:'仅能选择未发布的法规',
+  PlatformInformation:'平台件信息',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index f7581f1be..70862e23c 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -575,6 +575,26 @@
             </a-col>
           </a-row>
         </div>
+
+        <div class="header-text" v-if='dataList && dataList.length > 0'>
+          &nbsp;{{$t('PlatformInformation')}}
+        </div>
+        <a-table
+          v-if='dataList && dataList.length > 0'
+          :components="drag(columns,'columns')"
+          :columns="columns"
+          rowKey="id"
+          :scroll="{x: 1000}"
+          :data-source="dataList"
+          :pagination="false"
+          :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:'' }"
+          :loading="loading">
+
+              <span slot="operation" slot-scope="record" class="operate">
+                 <a class="text-operation"
+                    @click="disassociate(record)">{{$t('disassociate')}}</a>
+             </span>
+        </a-table>
       </a-form-model>
     </a-spin>
     <div class="drawer-bootom-button">
@@ -591,7 +611,8 @@
 <script>
   import Standardselection from '@/components/Standardselection/index'
   import PersonnelSelection from '@/components/PersonnelSelection/index'
-  import { getAction, postAction, putAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+  import { getAction, postAction, putAction, deleteAction } from '@/api/manage'
   import uploadFile from '@/components/uploadFile/file'
   import moment from 'moment'
   import { mapGetters } from 'vuex'
@@ -603,13 +624,66 @@
       PersonnelSelection,
       uploadFile
     },
+    mixins: [ResizeHeader, ResizeColumnProvide],
     props: ['url'],
     data() {
       return {
         visible: false,
         confirmLoading: false,
+        loading: false,
         rejectCauseListOne: [],
         firstLevelDutyTerritoryList: [],
+        selectedRowKeys: [],
+        dataList: [],
+        columns: [
+          {
+            title: this.$t('entryName'),
+            dataIndex: 'projectNameId',
+            align: 'left',
+            ellipsis: true,
+            sorter:true,
+            width: 120
+          },
+          {
+            title: this.$t('design')+ this.$t('typeOfDeliverables'),
+            dataIndex: 'designDeliverableTypeName',
+            align: 'left',
+            ellipsis: true,
+            sorter:true,
+            width: 180
+          },
+          {
+            title: this.$t('design')+ this.$t('deliverableTemplate'),
+            align: 'left',
+            width: 180,
+            sorter:true,
+            ellipsis: true,
+            dataIndex: 'designDeliverableTemplate'
+          },
+          {
+            title: this.$t('verify')+ this.$t('typeOfDeliverables'),
+            dataIndex: 'verifyDeliverableTypeName',
+            align: 'left',
+            ellipsis: true,
+            sorter:true,
+            width: 180
+          },
+          {
+            title: this.$t('verify')+ this.$t('deliverableTemplate'),
+            dataIndex: 'verifyDeliverableTemplate',
+            align: 'left',
+            ellipsis: true,
+            sorter:true,
+            width: 180
+          },
+          {
+            title: this.$t('operation'),
+            align: 'left',
+            fixed: 'right',
+            width: 110,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
         rules: {
           attestationRank: [
             {
@@ -756,6 +830,13 @@
           }
         })
       },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+      },
+      disassociate(val){
+        this.dataList = this.dataList.splice(val.id, 1)
+        console.log(this.dataList)
+      },
       isEdit(val) {
         // if (val.designFlowStatus == 'Task to be confirmed' || val.designFlowStatus == 'Results to be submitted' ||
         //   val.designFlowStatus == 'Results to be reviewed') {
@@ -764,7 +845,11 @@
         //   return false
         // }
         if (val.roleCodeIndex == '0' || val.roleCodeIndex == '1') {
-          return false
+          if(this.dataList && this.dataList.length > 0) {
+            return true
+          }else{
+            return false
+          }
         } else {
           return true
         }
@@ -777,8 +862,12 @@
         //   return false
         // }
         if (val.roleCodeIndex == '0' || val.roleCodeIndex == '1') {
-          return false
-        } else {
+          if(this.dataList && this.dataList.length > 0) {
+            return true
+          }else{
+            return false
+          }
+        } else{
           return true
         }
       },
@@ -921,6 +1010,7 @@
         item.verifyDeliverableType = item.verifyDeliverableType ? item.verifyDeliverableType.split(',') : []
         item.dutyDepart = item.dutyDepart ? item.dutyDepart.split(',') : []
         item.dutyTerritory = item.dutyTerritory ? item.dutyTerritory.split(',') : []
+        this.dataList = item.projectLawsInventoryEOS ? item.projectLawsInventoryEOS :[]
         this.getRejectCause(item.id)
         if (item.dutyDepart && item.dutyDepart.length > 0) {
           this.getDutyTerritory(item.dutyDepart.join(','))

From 683423e694b0844116daa6134beaaa8a72408c34 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 20 Sep 2023 14:02:08 +0800
Subject: [PATCH 092/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=B8=AD=E5=88=A0=E9=99=A4=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E7=9A=84=E5=B9=B3=E5=8F=B0=E4=BB=B6=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/project/entity/ProjectLawsInventoryEO.java    | 3 +++
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java        | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
index d65ae364c..e551c2282 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
@@ -543,4 +543,7 @@ public class ProjectLawsInventoryEO implements Serializable {
 
     @TableField(exist = false)
     private List<ProjectLawsInventoryEO> projectLawsInventoryEOS;
+
+    @TableField(exist = false)
+    private String platformIds;//项目名称
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 0d5fdee66..54b295aee 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -514,6 +514,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 	@Override
 	public void editById(ProjectLawsInventoryEO projectLawsInventoryEO) {
 		this.editService.editById(projectLawsInventoryEO);
+		if(StringUtils.isNotBlank(projectLawsInventoryEO.getPlatformIds())){
+			lawsInventoryPlatformEOService.deleteByIds(Arrays.asList(projectLawsInventoryEO.getPlatformIds().split(",")));
+		}
 	}
 
 	/**

From 326e90752c6e6f6138abdd6ac319a9b507f04121 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 20 Sep 2023 14:25:07 +0800
Subject: [PATCH 093/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/listEditModel.vue              | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index 70862e23c..5978a03ed 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -812,6 +812,7 @@
         DeliverableTreeList: [],
         userInfoQuery: {},
         rejectCauseList: [],
+        platformIds: [],
         dutyTerritoryList: []
       }
     },
@@ -834,8 +835,34 @@
         this.selectedRowKeys = value
       },
       disassociate(val){
-        this.dataList = this.dataList.splice(val.id, 1)
-        console.log(this.dataList)
+        let _this = this
+        this.$confirm({
+          title: _this.$t('whether') + _this.$t('disassociate') + '?',
+          content: '',
+          onOk:
+            async () => {
+              _this.platformIds.push(val.id)
+              _this.dataList = _this.dataList.filter(item => item.id !== val.id);
+              _this.dataList = [..._this.dataList]
+              console.log(this.platformIds)
+              if(this.platformIds){
+                this.formInline.platformIds = this.platformIds.join(',')
+              }
+              this.formInline.designDutyIdName = this.dataList && this.dataList.length>0 ? this.dataList[0].designDutyIdName : ''
+              this.formInline.verifyDutyIdName = this.dataList && this.dataList.length>0 ? this.dataList[0].verifyDutyIdName : ''
+              this.formInline.designDueDate = this.dataList && this.dataList.length>0 ? this.dataList[0].designDueDate : ''
+              this.formInline.verifyDueDate = this.dataList && this.dataList.length>0 ? this.dataList[0].verifyDueDate : ''
+              this.formInline.designDeliverableTemplate = this.dataList && this.dataList.length>0 ? this.dataList[0].designDeliverableTemplate : ''
+              this.formInline.verifyDeliverableTemplate = this.dataList && this.dataList.length>0 ? this.dataList[0].verifyDeliverableTemplate : ''
+              this.formInline.designDutyDueDate = this.dataList && this.dataList.length>0 ? this.dataList[0].designDutyDueDate : ''
+              this.formInline.verifyDutyDueDate = this.dataList && this.dataList.length>0 ? this.dataList[0].verifyDutyDueDate : ''
+              this.formInline.designRemark = this.dataList && this.dataList.length>0 ? this.dataList[0].designRemark : ''
+              this.formInline.verifyRemark = this.dataList && this.dataList.length>0 ? this.dataList[0].verifyRemark : ''
+              this.formInline.designDeliverableType = this.dataList && this.dataList.length>0 ? this.dataList[0].designDeliverableType.split(',') : []
+              this.formInline.verifyDeliverableType = this.dataList && this.dataList.length>0 ? this.dataList[0].verifyDeliverableType.split(',') : []
+              this.formInline = {...this.formInline}
+            }
+        })
       },
       isEdit(val) {
         // if (val.designFlowStatus == 'Task to be confirmed' || val.designFlowStatus == 'Results to be submitted' ||

From 584e7928bb6fe485c4d31b6090ca1574ee9c1f08 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 20 Sep 2023 14:28:56 +0800
Subject: [PATCH 094/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=85=8D=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/certificationList/index.vue    | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
index 9e71b79d7..78e18618d 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
@@ -137,11 +137,11 @@
           {{ $t('CertificationDirectory') }}
         </div>
         <!--        修改配置-->
-        <div @click="BatchSettingClick($t('changeSetting'))" v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21"
-             class="operator-text">
-          <a-icon type="setting"/>
-          {{ $t('changeSetting') }}
-        </div>
+<!--        <div @click="BatchSettingClick($t('changeSetting'))" v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21"-->
+<!--             class="operator-text">-->
+<!--          <a-icon type="setting"/>-->
+<!--          {{ $t('changeSetting') }}-->
+<!--        </div>-->
 
         <!--        引用交付物-->
         <div @click="referenceDeliverablesClick" v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21"
@@ -150,12 +150,12 @@
           {{ $t('referenceDeliverables') }}
         </div>
         <!--              添加配置-->
-        <div @click="addConfigurationClick"
-             v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21"
-             class="operator-text">
-          <a-icon type="plus"/>
-          {{ $t('addConfiguration') }}
-        </div>
+<!--        <div @click="addConfigurationClick"-->
+<!--             v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21"-->
+<!--             class="operator-text">-->
+<!--          <a-icon type="plus"/>-->
+<!--          {{ $t('addConfiguration') }}-->
+<!--        </div>-->
         <a-popconfirm overlayClassName="popconfirm" placement="bottomRight">
           <template slot="title" id="popconfirm">
             <div>
@@ -588,11 +588,11 @@
             value: 'category',
             text: this.$t('category')
           },
-          {
-            type: 'string',
-            value: 'configItem',
-            text: this.$t('configurationItem')
-          },
+          // {
+          //   type: 'string',
+          //   value: 'configItem',
+          //   text: this.$t('configurationItem')
+          // },
           {
             type: 'string',
             value: 'wvtaId',
@@ -693,13 +693,13 @@
             sorter: true,
             fixed: 'left'
           },
-          {
-            title: this.$t('configurationItem'),
-            align: 'left',
-            dataIndex: 'configItem',
-            width: 85,
-            ellipsis: true
-          },
+          // {
+          //   title: this.$t('configurationItem'),
+          //   align: 'left',
+          //   dataIndex: 'configItem',
+          //   width: 85,
+          //   ellipsis: true
+          // },
           {
             title: this.$t('certificationType'),
             align: 'left',

From 44c675dbebd1957c972b88eeff609c45cfedb5d8 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 20 Sep 2023 15:15:25 +0800
Subject: [PATCH 095/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=B8=AD-=E5=A4=84=E7=90=86=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E4=BB=B6=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    | 159 ++++++++++++------
 1 file changed, 104 insertions(+), 55 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 54b295aee..a18d0c095 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -11740,6 +11740,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 		List<String> lawsInventoryIdList = new ArrayList<>();
 		List<String> inventoryIdList = new ArrayList<>();
+		List<String> fileIdList = new ArrayList<>();
 		List<String> userIdList = new ArrayList<>();
 		if(!result.isEmpty()){
 			lawsInventoryIdList = result.stream().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList());
@@ -11755,12 +11756,20 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					inventoryIdList = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList());
 					List<String> collect1 = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getDesignDutyId).distinct().collect(Collectors.toList());
 					List<String> collect2 = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getVerifyDutyId).distinct().collect(Collectors.toList());
+					List<String> collect3 = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getDesignDeliverableTemplate).distinct().collect(Collectors.toList());
+					List<String> collect4 = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getVerifyDeliverableTemplate).distinct().collect(Collectors.toList());
 					if(!collect1.isEmpty()){
 						userIdList.addAll(collect1);
 					}
 					if(!collect2.isEmpty()){
 						userIdList.addAll(collect2);
 					}
+					if(!collect3.isEmpty()){
+						fileIdList.addAll(collect3);
+					}
+					if(!collect4.isEmpty()){
+						fileIdList.addAll(collect4);
+					}
 				}
 			}
 		}
@@ -11768,8 +11777,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		List<SysCategory> categoryList = sysCategoryService.list();
 		//文件
 		List<OSSFile> fileInfos = new ArrayList<>();
-		if (inventoryIdList.size() != 0) {
-			fileInfos = iOSSFileService.getFileInfos(StringUtils.join(inventoryIdList, ","));
+		if (fileIdList.size() != 0) {
+			fileInfos = iOSSFileService.getFileInfos(StringUtils.join(fileIdList, ","));
 		}
 		List<SysUser> sysUsers = new ArrayList<>();
 		if (CollectionUtils.isNotEmpty(userIdList)) {
@@ -11778,6 +11787,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			sysUserQueryWrapper.lambda().in(SysUser::getId, userIdList);
 			sysUsers = sysUserMapper.selectList(sysUserQueryWrapper);
 		}
+		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = new ArrayList<>();
 		String cut = projectLawsInventoryEO.getCut();
 		for (ProjectLawsInventoryEO lawsInventoryEO : result) {
 			if(!lawsInventoryPlatformEOList.isEmpty()){
@@ -11789,65 +11799,104 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					List<ProjectLawsInventoryEO> lawsInventoryEOS = projectLawsInventoryEOS.stream()
 							.filter(e -> idList.contains(e.getId())).collect(Collectors.toList());
 					lawsInventoryEO.setProjectLawsInventoryEOS(lawsInventoryEOS);
+					if(!lawsInventoryEOS.isEmpty()){
+						projectLawsInventoryEOList.addAll(lawsInventoryEOS);
+					}
 					//如果关联平台件数据不为空，编辑时将设计符合性和验证符合性的数据覆盖
 					if(!lawsInventoryEOS.isEmpty()){
-						ProjectLawsInventoryEO inventoryEO = lawsInventoryEOS.get(0);
-						//设计
-						String designDeliverableType = inventoryEO.getDesignDeliverableType();//交付物类型
-						String designDutyId = inventoryEO.getDesignDutyId();//责任人
-						String designDeliverableTemplate = inventoryEO.getDesignDeliverableTemplate();//交付物模板
-						//验证
-						String verifyDeliverableType = inventoryEO.getVerifyDeliverableType();//交付物类型
-						String verifyDutyId = inventoryEO.getVerifyDutyId();//责任人
-						String verifyDeliverableTemplate = inventoryEO.getVerifyDeliverableTemplate();//交付物模板
-						//设计交付物类型
-						if (StringUtils.isNotBlank(designDeliverableType)) {
-							lawsInventoryEO.setDesignDeliverableType(designDeliverableType);
-							List<String> designDeliverableTypeList = Arrays.asList(designDeliverableType.split(","));
-							String name = getTreeName(cut, categoryList, designDeliverableTypeList);
-							lawsInventoryEO.setDesignDeliverableTypeName(name);
-						}
-						//验证交付物类型
-						if (StringUtils.isNotBlank(verifyDeliverableType)) {
-							lawsInventoryEO.setVerifyDeliverableType(verifyDeliverableType);
-							List<String> verifyDeliverableTypeList = Arrays.asList(verifyDeliverableType.split(","));
-							String name = getTreeName(cut, categoryList, verifyDeliverableTypeList);
-							lawsInventoryEO.setVerifyDeliverableTypeName(name);
-						}
-						//交付物类型模板
-						if (fileInfos.size() != 0) {
-							if (StringUtils.isNotBlank(designDeliverableTemplate)) {
-								lawsInventoryEO.setDesignDeliverableTemplate(designDeliverableTemplate);
-								String fileName = this.editService.getFileName(null, fileInfos, designDeliverableTemplate);
-								if (StringUtils.isNotBlank(fileName)) {
-									lawsInventoryEO.setDesignDeliverableTemplateName(fileName);
+						for (ProjectLawsInventoryEO inventoryEO : lawsInventoryEOS) {
+							//设计
+							String designDeliverableType = inventoryEO.getDesignDeliverableType();//交付物类型
+							String designDutyId = inventoryEO.getDesignDutyId();//责任人
+							String designDeliverableTemplate = inventoryEO.getDesignDeliverableTemplate();//交付物模板
+							//验证
+							String verifyDeliverableType = inventoryEO.getVerifyDeliverableType();//交付物类型
+							String verifyDutyId = inventoryEO.getVerifyDutyId();//责任人
+							String verifyDeliverableTemplate = inventoryEO.getVerifyDeliverableTemplate();//交付物模板
+							//设计交付物类型
+							if (StringUtils.isNotBlank(designDeliverableType)) {
+//								lawsInventoryEO.setDesignDeliverableType(designDeliverableType);
+								List<String> designDeliverableTypeList = Arrays.asList(designDeliverableType.split(","));
+								String name = getTreeName(cut, categoryList, designDeliverableTypeList);
+								inventoryEO.setDesignDeliverableTypeName(name);
+							}
+							//验证交付物类型
+							if (StringUtils.isNotBlank(verifyDeliverableType)) {
+//								lawsInventoryEO.setVerifyDeliverableType(verifyDeliverableType);
+								List<String> verifyDeliverableTypeList = Arrays.asList(verifyDeliverableType.split(","));
+								String name = getTreeName(cut, categoryList, verifyDeliverableTypeList);
+								inventoryEO.setVerifyDeliverableTypeName(name);
+							}
+							//交付物类型模板
+							if (fileInfos.size() != 0) {
+								if (StringUtils.isNotBlank(designDeliverableTemplate)) {
+//									lawsInventoryEO.setDesignDeliverableTemplate(designDeliverableTemplate);
+									String fileName = this.editService.getFileName(null, fileInfos, designDeliverableTemplate);
+									if (StringUtils.isNotBlank(fileName)) {
+										inventoryEO.setDesignDeliverableTemplateName(fileName);
+									}
+								}
+								if (StringUtils.isNotBlank(verifyDeliverableTemplate)) {
+//									lawsInventoryEO.setVerifyDeliverableTemplate(verifyDeliverableTemplate);
+									String fileName = this.editService.getFileName(null, fileInfos, verifyDeliverableTemplate);
+									if (StringUtils.isNotBlank(fileName)) {
+										inventoryEO.setVerifyDeliverableTemplateName(fileName);
+									}
 								}
 							}
-							if (StringUtils.isNotBlank(verifyDeliverableTemplate)) {
-								lawsInventoryEO.setVerifyDeliverableTemplate(verifyDeliverableTemplate);
-								String fileName = this.editService.getFileName(null, fileInfos, verifyDeliverableTemplate);
-								if (StringUtils.isNotBlank(fileName)) {
-									lawsInventoryEO.setVerifyDeliverableTemplateName(fileName);
-								}
+							//设计责任人
+							if (StringUtils.isNotEmpty(designDutyId)) {
+//								lawsInventoryEO.setVerifyDutyId(designDutyId);
+								String designDutyName = sysUsers.stream().filter(e -> designDutyId.equals(e.getId())).
+										map(SysUser::getUsername).collect(Collectors.joining(","));
+								inventoryEO.setDesignDutyIdName(designDutyName);
+							} else {
+								inventoryEO.setDesignDutyIdName("");
 							}
+							//验证责任人
+							if (StringUtils.isNotEmpty(verifyDutyId)) {
+//								lawsInventoryEO.setVerifyDutyId(verifyDutyId);
+								String verifyDutyName = sysUsers.stream().filter(e -> verifyDutyId.equals(e.getId())).
+										map(SysUser::getUsername).collect(Collectors.joining(","));
+								inventoryEO.setVerifyDutyIdName(verifyDutyName);
+							} else {
+								inventoryEO.setVerifyDutyIdName("");
+							}
+							//设计交付物类型
+							lawsInventoryEO.setDesignDeliverableType(lawsInventoryEOS.get(0).getDesignDeliverableType());
+							lawsInventoryEO.setDesignDeliverableTypeName(lawsInventoryEOS.get(0).getDesignDeliverableTypeName());
+							//验证交付物类型
+							lawsInventoryEO.setVerifyDeliverableType(lawsInventoryEOS.get(0).getVerifyDeliverableType());
+							lawsInventoryEO.setVerifyDeliverableTypeName(lawsInventoryEOS.get(0).getVerifyDeliverableTypeName());
+							//交付物类型模板
+							lawsInventoryEO.setDesignDeliverableTemplate(lawsInventoryEOS.get(0).getDesignDeliverableTemplate());
+							lawsInventoryEO.setDesignDeliverableTemplateName(lawsInventoryEOS.get(0).getDesignDeliverableTemplateName());
+
+							lawsInventoryEO.setVerifyDeliverableTemplate(lawsInventoryEOS.get(0).getVerifyDeliverableTemplate());
+							lawsInventoryEO.setVerifyDeliverableTemplateName(lawsInventoryEOS.get(0).getVerifyDeliverableTemplateName());
+
+							lawsInventoryEO.setVerifyDutyId(lawsInventoryEOS.get(0).getDesignDutyId());
+							lawsInventoryEO.setDesignDutyIdName(lawsInventoryEOS.get(0).getDesignDutyIdName());
+
+							lawsInventoryEO.setVerifyDutyId(lawsInventoryEOS.get(0).getVerifyDutyId());
+							lawsInventoryEO.setVerifyDutyIdName(lawsInventoryEOS.get(0).getVerifyDutyIdName());
 						}
-						//设计责任人
-						if (StringUtils.isNotEmpty(designDutyId)) {
-							lawsInventoryEO.setVerifyDutyId(designDutyId);
-							String designDutyName = sysUsers.stream().filter(e -> designDutyId.equals(e.getId())).
-									map(SysUser::getUsername).collect(Collectors.joining(","));
-							lawsInventoryEO.setDesignDutyIdName(designDutyName);
-						} else {
-							lawsInventoryEO.setDesignDutyIdName("");
-						}
-						//验证责任人
-						if (StringUtils.isNotEmpty(verifyDutyId)) {
-							lawsInventoryEO.setVerifyDutyId(verifyDutyId);
-							String verifyDutyName = sysUsers.stream().filter(e -> verifyDutyId.equals(e.getId())).
-									map(SysUser::getUsername).collect(Collectors.joining(","));
-							lawsInventoryEO.setVerifyDutyIdName(verifyDutyName);
-						} else {
-							lawsInventoryEO.setVerifyDutyIdName("");
+					}
+				}
+			}
+		}
+		if(!projectLawsInventoryEOList.isEmpty()){
+			List<String> projectLibraryIdList = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList());
+			LambdaQueryWrapper<ProjectLibraryBase> wrapper = new LambdaQueryWrapper<>();
+			wrapper.in(ProjectLibraryBase::getId,projectLibraryIdList);
+			List<ProjectLibraryBase> libraryBaseList = projectLibraryBaseService.list(wrapper);
+			for (ProjectLawsInventoryEO lawsInventoryEO : result) {
+				List<ProjectLawsInventoryEO> lawsInventoryEOS = lawsInventoryEO.getProjectLawsInventoryEOS();
+				if(!lawsInventoryEOS.isEmpty()){
+					for (ProjectLawsInventoryEO inventoryEO : lawsInventoryEOS) {
+						List<ProjectLibraryBase> collect = libraryBaseList.stream().filter(e -> inventoryEO.getProjectLibraryId().equals(e.getId())).collect(Collectors.toList());
+						if(!collect.isEmpty()){
+							inventoryEO.setProjectName(collect.get(0).getProjectNameId());
 						}
 					}
 				}

From 9e960f6fb4d29047ce4c459b3ff47fa9e480f013 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 20 Sep 2023 15:22:30 +0800
Subject: [PATCH 096/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=BB=98=E8=AE=A4=E6=8C=89=E9=A1=B9=E7=9B=AE=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E6=AD=A3=E5=BA=8F=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectLawsInventoryEOServiceImpl.java     | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index a18d0c095..2b3e83858 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -11901,6 +11901,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					}
 				}
 			}
+			//平台件信息默认按项目名称正序排序
+			for (ProjectLawsInventoryEO lawsInventoryEO : result) {
+				List<ProjectLawsInventoryEO> nventoryEOList = lawsInventoryEO.getProjectLawsInventoryEOS();
+				if(!nventoryEOList.isEmpty()){
+					Collator comparator = Collator.getInstance(Locale.CHINESE);
+					Collections.sort(nventoryEOList,(e1,e2)->{
+						String e1ProjectName = StringUtils.isNotBlank(e1.getProjectName()) ? e1.getAttestationType() : "";
+						String e2ProjectName = StringUtils.isNotBlank(e2.getProjectName()) ? e2.getAttestationType() : "";
+						return comparator.compare(e1ProjectName,e2ProjectName);
+					});
+					lawsInventoryEO.setProjectLawsInventoryEOS(nventoryEOList);
+				}
+			}
 		}
 	}
 

From a4581a38e830832d588fb49f214ff5a8912e7a8f Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 20 Sep 2023 15:47:01 +0800
Subject: [PATCH 097/288] =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E4=BB=B6=E4=BF=A1=E6=81=AF=E6=88=91=E4=B8=80=E6=9D=A1=E6=97=B6?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectLibraryBaseServiceImpl.java   | 33 +++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index c48f84b1b..3aa0f273f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -23,6 +23,7 @@ import com.jero.modules.dummy.enums.OrderEnum;
 import com.jero.modules.enums.DictCodeEnum;
 import com.jero.modules.feishu.enums.TemplateInfoEnum2;
 import com.jero.modules.ota.service.impl.OtaManageApplyEOServiceImpl;
+import com.jero.modules.project.entity.LawsInventoryPlatformEO;
 import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
 import com.jero.modules.project.entity.ProjectLawsInventoryEO;
 import com.jero.modules.project.entity.ProjectLawsInventoryLogEO;
@@ -203,6 +204,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	private IProjectLibraryStatisticsService projectLibraryStatisticsService;
 	@Autowired
 	private OtaManageApplyEOServiceImpl otaManageApplyEOService;
+	@Autowired
+	private LawsInventoryPlatformEOServiceImpl lawsInventoryPlatformEOService;
 
 	private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 	private static DecimalFormat df = new DecimalFormat("#.00");
@@ -1294,12 +1297,15 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		//普通数据字典
 		List<SysDictItem> sysDictItemList = sysDictItemMapper.selectItemsByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue());
 		List<Map<String,Object>> mapList = new ArrayList<>();
+		List<Map<String,Object>> mapListOne = new ArrayList<>();
+		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = new ArrayList<>();
 		for (ProjectLawsInventoryEO projectLawsInventoryEO : lawsInventoryEOList) {
 			Map<String,Object> map = new HashMap<>();
 			List<ProjectLawsInventoryEO> projectLawsInventoryEOS = new ArrayList<>();
 			//serialNumber dutyTerritory
 			String serialNumber = projectLawsInventoryEO.getSerialNumber();
 			String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
+			String subtitle = projectLawsInventoryEO.getSubtitle();
 
 			//责任领域
 			List<String> list = new LinkedList<>();
@@ -1333,15 +1339,36 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 				}
 			}
 
-			if(!projectLawsInventoryEOS.isEmpty()){
+
+			if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() > 1){
 				map.put("lawsInventoryId",projectLawsInventoryEO.getId());
-				map.put("title",serialNumber+" "+dutyTerritoryNew+"在平台件项目中包含多条匹配内容，请选择关联");
+				map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+"在平台件项目中包含多条匹配内容，请选择关联");
 				map.put("result",projectLawsInventoryEOS);
 				mapList.add(map);
+			}else if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() == 1){
+				Map<String,Object> mapTemp = new HashMap<>();
+				mapTemp.put("lawsInventoryId",projectLawsInventoryEO.getId());
+				mapTemp.put("result",projectLawsInventoryEOS);
+				mapListOne.add(mapTemp);
 			}
 		}
+		if(!mapListOne.isEmpty()){
+			//匹配一条平台件时直接新增
+			List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
+			for (Map<String, Object> map : mapListOne) {
+				LawsInventoryPlatformEO inventoryPlatformEO = new LawsInventoryPlatformEO();
+				inventoryPlatformEO.setCreateTime(new Date());
+				inventoryPlatformEO.setUpdateTime(new Date());
+				inventoryPlatformEO.setLawsInventoryId((String) map.get("lawsInventoryId"));
+				List<ProjectLawsInventoryEO> projectLawsInventoryEOS = (List<ProjectLawsInventoryEO>) map.get("result");
+				inventoryPlatformEO.setPlatformLawsInventoryId(projectLawsInventoryEOS.get(0).getId());
+				lawsInventoryPlatformEOS.add(inventoryPlatformEO);
+			}
 
-
+			if (!lawsInventoryPlatformEOS.isEmpty()) {
+				lawsInventoryPlatformEOService.saveBatch(lawsInventoryPlatformEOS);
+			}
+		}
 		return mapList;
 	}
 

From 434162d07fabe285f84af5e4c52bc940cf8e965f Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 20 Sep 2023 15:48:03 +0800
Subject: [PATCH 098/288] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=20=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   1 +
 jero-web/src/common/lang/zh-cn.js             |   3 +-
 .../components/flowstatusdetial.vue           | 334 ++++++++++++++++++
 .../components/listEditModel.vue              |  11 +-
 .../components/listOfRegulations.vue          |  14 +
 5 files changed, 354 insertions(+), 9 deletions(-)
 create mode 100644 jero-web/src/views/projectManagement/components/flowstatusdetial.vue

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 292a84b55..dbccc4ddc 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1976,4 +1976,5 @@ module.exports = {
   associatedItem:'There are multiple matching items in the platform item. Please select the associated item',
   unpublishedregulationsselected:'Only unpublished regulations can be selected',
   PlatformInformation:'Platform Information',
+  Processdetails:'Process Details',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 69b3c0887..888611cac 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -2536,7 +2536,7 @@ module.exports = {
   areaOfResponsibility: '责任领域',
   confirmationOfDesignConformity: '设计符合性确认',
   Deliverables: '交付物',
-  personLiable: '责任人',
+  personable: '责任人',
   PrehomoConfirmation: 'Pre-Homo确认',
   verificationAndConformityconfirmation: '验证符合性确认',
   StandardImplementationDate: '标准实施日期',
@@ -3932,4 +3932,5 @@ module.exports = {
   associatedItem:'在平台件项目中包含多条匹配内容，请选择关联项',
   unpublishedregulationsselected:'仅能选择未发布的法规',
   PlatformInformation:'平台件信息',
+  Processdetails:'流程详情',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/flowstatusdetial.vue b/jero-web/src/views/projectManagement/components/flowstatusdetial.vue
new file mode 100644
index 000000000..714d9c6c5
--- /dev/null
+++ b/jero-web/src/views/projectManagement/components/flowstatusdetial.vue
@@ -0,0 +1,334 @@
+<!--流程详情-->
+<template>
+  <div>
+    <a-drawer
+      :title="$t('Processdetails')"
+      :maskClosable="false"
+      :width="800"
+      placement="right"
+      :closable="true"
+      @close="handleCancel"
+      :visible="visible"
+      style="height: 100%;overflow: auto;padding-bottom: 53px;">
+      <a-spin :spinning="confirmLoading">
+        <div class='title'>{{$t('basicInformation')}}</div>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class='detail-box'>
+              <span class='detail-text' :title="$t('regulationNo')">{{$t('regulationNo')}}</span>
+              <span class="title-text-text" :title="form.vdr">
+                {{form.vdr}}</span>
+            </div>
+
+          </a-col>
+          <a-col :span="12">
+            <div class='detail-box'>
+              <span class='detail-text' :title="$t('title')">{{$t('title')}}</span>
+              <span class="title-text-text" :title="form.summary">
+                {{form.summary}}</span>
+            </div>
+
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class='detail-box'>
+              <span class='detail-text' :title="$t('subtitle')">{{$t('subtitle')}}</span>
+              <span class="title-text-text" :title="form.homologationImpact">
+                {{form.homologationImpact}}</span>
+            </div>
+
+          </a-col>
+          <a-col :span="12">
+            <div class='detail-box'>
+              <span class='detail-text' :title="$t('applicableSupplement')">{{$t('applicableSupplement')}}</span>
+              <span class="title-text-text" :title="form.impactCnHomo">
+                {{form.impactCnHomo}}</span>
+            </div>
+
+          </a-col>
+        </a-row>
+        <div v-for='(item,index) in dataList' :key='index'>
+          <div class='title' :title="item.title">{{item.title}}</div>
+          <div style='height:100%'>
+            <a-row :gutter="24">
+              <a-col :span="12">
+                <div class='detail-box'>
+                  <span class='detail-text' :title="$t('ProcessStatus')">{{$t('ProcessStatus')}}</span>
+                  <span class="title-text-text" :title="item.ProcessStatus">
+                {{item.ProcessStatus}}</span>
+                </div>
+              </a-col>
+              <a-col :span="12">
+              </a-col>
+            </a-row>
+            <a-row :gutter="24">
+              <a-col :span="12">
+                <div class='detail-box'>
+                  <span class='detail-text' :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
+                  <span class="title-text-text" :title="item.Sponsor">
+                {{item.Sponsor}}</span>
+                </div>
+              </a-col>
+              <a-col :span="12">
+                <div class='detail-box'>
+                  <span class='detail-text' :title="$t('personLiable')">{{$t('personLiable')}}</span>
+                  <span class="title-text-text" :title="item.personLiable">
+                {{item.personLiable}}</span>
+                </div>
+              </a-col>
+            </a-row>
+            <a-row :gutter="24">
+              <a-col :span="12">
+                <div class='detail-box'>
+                  <span class='detail-text' :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
+                  <span class="title-text-text" :title="item.statisticalNodes">
+                {{item.statisticalNodes}}</span>
+                </div>
+              </a-col>
+              <a-col :span="12">
+                <div class='detail-box'>
+                  <span class='detail-text' :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
+                  <span class="title-text-text" :title="item.areaOfResponsibility">
+                {{item.areaOfResponsibility}}</span>
+                </div>
+              </a-col>
+            </a-row>
+            <a-row :gutter="24">
+              <a-col :span="12">
+                <div class='detail-box'>
+                  <span class='detail-text' :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
+                  <span class="title-text-text" :title="item.deliverableTemplate">
+                {{item.deliverableTemplate}}</span>
+                </div>
+              </a-col>
+              <a-col :span="12">
+                <div class='detail-box'>
+                  <span class='detail-text' :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
+                  <span class="title-text-text" :title="item.typeOfDeliverables">
+                {{item.typeOfDeliverables}}</span>
+                </div>
+              </a-col>
+            </a-row>
+            <a-row :gutter="24">
+              <a-col :span="24">
+                <div class='detail-box' style='display:flex'>
+                  <span class='detail-text' :title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
+                  <span class="title-text-description" :title="item.descriptionDeliverables">
+                {{item.descriptionDeliverables}}</span>
+                </div>
+              </a-col>
+            </a-row>
+          </div>
+        </div>
+
+      </a-spin>
+      <div class="drawer-bootom-button">
+        <a-button style="margin-right: 8px" @click="handleCancel">{{$t('close')}}</a-button>
+<!--        <a-button type="primary" @click="handleSubmit" :loading="confirmLoading">{{$t('submit')}}</a-button>-->
+      </div>
+    </a-drawer>
+    <uploadFile ref="uploadFile" :acceptcode="acceptcode" @uploadSuccess="uploadSuccess"/>
+  </div>
+
+</template>
+
+<script>
+import { getAction, postAction } from '@/api/manage'
+import uploadFile from '@/components/uploadFile/file'
+import { mapGetters } from 'vuex'
+
+export default {
+  name:"addModel",
+  components:{
+    uploadFile
+  },
+  data() {
+    return {
+      visible: false,
+      disabled: false,
+      showButton:false,
+      confirmLoading: false,
+      acceptcode:'',
+      projectNameList: [],
+      DeliverableTreeList: [],
+      form:{
+        VDR:'',
+        theme:'',
+        authenticationimpact:'',
+        influencestatuteCn:'',
+        influencestatuteEu:'',
+      },
+      dataList:[
+        {
+        title:'平台件项目',
+        ProcessStatus:'1',
+        Sponsor:'1',
+        personLiable:'1',
+        statisticalNodes:'1',
+        areaOfResponsibility:'1',
+        deliverableTemplate:'1',
+        typeOfDeliverables:'1',
+        descriptionDeliverables:'1sdfdgdf法官大人风格的调1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的格式的',
+      },
+        {
+          title:'平台件项目2',
+          ProcessStatus:'1',
+          Sponsor:'1',
+          personLiable:'1',
+          statisticalNodes:'1',
+          areaOfResponsibility:'1',
+          deliverableTemplate:'1',
+          typeOfDeliverables:'1',
+          descriptionDeliverables:'1sdfdgdf法官大人风格的调1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的格式的',
+        },
+        {
+          title:'平台件项目2',
+          ProcessStatus:'1',
+          Sponsor:'1',
+          personLiable:'1',
+          statisticalNodes:'1',
+          areaOfResponsibility:'1',
+          deliverableTemplate:'1',
+          typeOfDeliverables:'1',
+          descriptionDeliverables:'1sdfdgdf法官大人风格的调1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的格式的',
+        }
+      ],
+      url:{
+        addModel:''
+      },
+      record:{},
+      car:'',
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    ...mapGetters(['userInfo']),
+    addModel(record,val) {
+      this.form={}
+      this.visible = true
+      this.confirmLoading = false
+      console.log('555',record);
+    },
+    handleCancel() {
+      this.visible = false
+    },
+    /** 上传文件的回调 */
+    uploadSuccess(data) {
+      let attIdList = []
+      if (data && data.length > 0) {
+        data.map(item => {
+          attIdList.push(item.id || data.name)
+        })
+      }
+      /** 赋值给当前对应的表单文件 */
+      this.formInline[this.uploadName] = attIdList.join(',')
+      this.formInline = { ...this.formInline }
+    },
+    isEdit(){
+      this.disabled=false
+    }
+  }
+}
+</script>
+
+<style scoped>
+.title{
+  font-size: 16px;
+  font-weight: bold;
+  margin-bottom: 20px;
+}
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  /*align-items: center;*/
+}
+.detail-box{
+  width: 100%;
+  height: 100%;
+  margin-bottom: 20px;
+  position: relative;
+}
+.detail-text{
+  height: 100%;
+  display: inline-block;
+  font-size: 14px;
+  color: #6F7385;
+  width: 120px;
+  overflow: hidden; /*超出部分隐藏*/
+  text-overflow: ellipsis; /*超出部分省略号表示*/
+  white-space: nowrap; /*强制单行显示*/
+  display: inline-block; /*转换为行内块元素*/
+}
+.title-text-text{
+  display: inline-block;
+  position: absolute;
+  left: 33%;
+  font-size: 14px;
+  color: #040B29;
+}
+.title-text-description{
+  display: inline-block;
+  width: 80%;
+  margin: 10px;
+  font-size: 14px;
+  color: #040B29;
+}
+.title-text {
+  width: 250px;
+  text-align: right;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 42px;
+  line-height: 48px;
+}
+
+.box-input {
+  display: inline-block;
+  height: 38px;
+  width: 100%;
+}
+
+.itemModel {
+  width: calc(100% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+  min-height: 40px;
+  margin-bottom: 24px;
+}
+
+.Required {
+  color: red;
+  margin-right: 4px;
+}
+
+.header-text {
+  font-size: 16px;
+  font-weight: 500;
+}
+
+.drawer-bootom-button {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  z-index: 100;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
+
+.icon-text {
+  font-size: 16px;
+  margin-right: 4px;
+}
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index 5978a03ed..39498ce70 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -638,10 +638,9 @@
         columns: [
           {
             title: this.$t('entryName'),
-            dataIndex: 'projectNameId',
+            dataIndex: 'projectName',
             align: 'left',
             ellipsis: true,
-            sorter:true,
             width: 120
           },
           {
@@ -649,31 +648,27 @@
             dataIndex: 'designDeliverableTypeName',
             align: 'left',
             ellipsis: true,
-            sorter:true,
             width: 180
           },
           {
             title: this.$t('design')+ this.$t('deliverableTemplate'),
             align: 'left',
             width: 180,
-            sorter:true,
             ellipsis: true,
-            dataIndex: 'designDeliverableTemplate'
+            dataIndex: 'designDeliverableTemplateName'
           },
           {
             title: this.$t('verify')+ this.$t('typeOfDeliverables'),
             dataIndex: 'verifyDeliverableTypeName',
             align: 'left',
             ellipsis: true,
-            sorter:true,
             width: 180
           },
           {
             title: this.$t('verify')+ this.$t('deliverableTemplate'),
-            dataIndex: 'verifyDeliverableTemplate',
+            dataIndex: 'verifyDeliverableTemplateName',
             align: 'left',
             ellipsis: true,
-            sorter:true,
             width: 180
           },
           {
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 9b804c8d6..5be71b891 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -273,6 +273,12 @@
                 <a-icon type="setting"/>
                 {{ $t('Associatedplatform') }}
               </div>
+              <div @click="a"
+                   v-if="roleSwitchingCode == 0"
+                   class="operator-text-title">
+                <a-icon type="setting"/>
+                {{ $t('Associatedplatform1') }}
+              </div>
             </div>
           </template>
           <div class="operator-text" style="position: relative">
@@ -695,6 +701,7 @@
     <batchSettingPersonnel :url="url" ref="batchSettingPersonnelRef" @batchSettingPersonnelForm="addModelList"/>
     <viewFileModel ref="viewFileModelRef"/>
     <designCompliance ref="designComplianceRef"/>
+    <flowstatusdetial ref="flowstatusdetialRef"/>
     <modifyOperator ref="modifyOperatorRef" @modifyOperatorForm="modifyOperatorForm"/>
     <toResubmitForm ref="toResubmitFormRef" @toResubmitFormForm="toResubmitFormForm"/>
   </a-card>
@@ -705,6 +712,7 @@
   import designCompliance from '../../toDoCenter/projectRegulationTasks/components/designCompliance'
   import listAddModel from './listAddModel'
   import listEditModel from './listEditModel'
+  import flowstatusdetial from './flowstatusdetial'
   import batSetting from './batSetting'
   import transferList from './transferList'
   import associatedplat from './associatedplat'
@@ -733,6 +741,7 @@
       ImportFile,
       listAddModel,
       listEditModel,
+      flowstatusdetial,
       batSetting,
       transferList,
       associatedplat,
@@ -1824,6 +1833,11 @@
           }
         }
         this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), name)
+
+
+      },
+      a(){
+        this.$refs.flowstatusdetialRef.addModel()
       },
 
       //查看列表页面

From 92dc4fc0966a03524f3cb163bbd9dafaf9aabf95 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 20 Sep 2023 16:24:02 +0800
Subject: [PATCH 099/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8D=E5=8B=BE=E9=80=89=E6=B3=95=E8=A7=84=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/associatedplatthree.vue        | 12 ++++++++++--
 .../components/associatedplattwo.vue          | 19 ++++++++++++-------
 .../components/listOfRegulations.vue          | 10 ++++++----
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/associatedplatthree.vue b/jero-web/src/views/projectManagement/components/associatedplatthree.vue
index 00e41c0f6..a55cc93d2 100644
--- a/jero-web/src/views/projectManagement/components/associatedplatthree.vue
+++ b/jero-web/src/views/projectManagement/components/associatedplatthree.vue
@@ -149,6 +149,7 @@
         pageSize: 10,
         total: 0,
         type:'',
+        flag:'',
         id:'',
         ids:'',
       }
@@ -157,9 +158,11 @@
 
     },
     methods: {
-      transferModel(id,type,ids) {
+      transferModel(id,flag,type,ids) {
+        console.log(id,flag,type,ids)
         this.id = id
         this.type = type
+        this.flag = flag,
         this.ids = ids
         this.queryParam = {}
         this.selectQuery = {}
@@ -180,8 +183,13 @@
           projectLibraryIds: this.id,
           ...this.queryParam
         }
+        let val = {
+          projectLibraryIds: this.ids,
+          platformProjectLibraryIds: this.id,
+          ...this.queryParam
+        }
         this.loading = true
-        postAction('project/projectLibraryBase/listPlatform', query).then((res) => {
+        postAction(this.flag == '2' ? '/project/projectLibraryBase/listPlatformAll' : 'project/projectLibraryBase/listPlatform', this.flag == '2' ? val : query).then((res) => {
           if (res.success) {
             this.data = res.result || []
             this.data.forEach((item,index) => {
diff --git a/jero-web/src/views/projectManagement/components/associatedplattwo.vue b/jero-web/src/views/projectManagement/components/associatedplattwo.vue
index cdb39f4ce..3ff14e24c 100644
--- a/jero-web/src/views/projectManagement/components/associatedplattwo.vue
+++ b/jero-web/src/views/projectManagement/components/associatedplattwo.vue
@@ -124,14 +124,14 @@ export default {
         },
         {
           title: this.$t('design') + '-' + this.$t('typeOfDeliverables'),
-          dataIndex: 'designdeliverableTypeName',
+          dataIndex: 'designDeliverableTypeName',
           align: 'left',
           ellipsis: true,
           width: 120
         },
         {
           title: this.$t('verify') + '-' + this.$t('typeOfDeliverables'),
-          dataIndex: 'deliverableTypeName',
+          dataIndex: 'verifyDeliverableTypeName',
           align: 'left',
           ellipsis: true,
           width: 120
@@ -143,8 +143,9 @@ export default {
       pageNo: 1,
       pageSize: 10,
       total: 0,
-      flag:'',
+      id:'',
       type:'',
+      flag:'',
       ids:'',
     }
   },
@@ -152,11 +153,12 @@ export default {
 
   },
   methods: {
-    transferModel(flag,type,ids) {
+    transferModel(id,flag,type,ids) {
       this.visible = true
-      this.flag = flag
+      this.id = id
       this.type = type
       this.ids = ids
+      this.flag = flag
       this.queryParam = {}
       this.selectedRowKeys = []
       this.replacePage()
@@ -180,13 +182,16 @@ export default {
       this.replacePage()
     },
     replacePage() {
+      console.log(this.id)
       let query = {
         pageNo: this.pageNo,
         pageSize: this.pageSize,
+        projectLibraryId: this.id,
+        roleCode: 0,
         ...this.queryParam
       }
       this.loading = true
-      postAction(this.url.transferUrl, query).then((res) => {
+      getAction('/platform/projectLawsInventoryEO/page', query).then((res) => {
         if (res.success) {
           this.dataList = res.result.records || []
           this.total = res.result.total
@@ -210,7 +215,7 @@ export default {
         this.confirmLoading = true
         let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
         this.confirmLoading = false
-        this.$emit('associatedplattwoForm',selectedRowKeys.join(','),this.type,this.ids)
+        this.$emit('associatedplattwoForm',selectedRowKeys.join(','),this.flag,this.type,this.ids)
         this.selectedRowKeys = []
         // postAction(this.url.addModel, {
         //   dummyInventoryBaseId: selectedRowKeys.join(','),
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 5be71b891..3676fec0d 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1982,18 +1982,20 @@
           }
         }else{
           flag = '2'
+          this.selectedRowKeys = this.dataSource.map(val => val.id)
+          console.log(this.selectedRowKeys)
           this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
         }
       },
       associatedplatForm(id,flag,type,ids){
         if(flag == '1'){
-          this.$refs.associatedplatthreeRef.transferModel(id,type,ids)
+          this.$refs.associatedplatthreeRef.transferModel(id,flag,type,ids)
         }else{
-          this.$refs.associatedplattwoRef.transferModel(id,type,ids)
+          this.$refs.associatedplattwoRef.transferModel(id,flag,type,ids)
         }
       },
-      associatedplattwoForm(id,type,ids){
-        this.$refs.associatedplatthreeRef.transferModel(id,type,ids)
+      associatedplattwoForm(id,flag,type,ids){
+        this.$refs.associatedplatthreeRef.transferModel(id,flag,type,ids)
       },
       associatedplatthreeForm(id){
         this.getList()

From c68e0d946d4f2101adb283728830959a049a956e Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 20 Sep 2023 16:36:16 +0800
Subject: [PATCH 100/288] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=20=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/certificationList/index.vue                  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index acd258b30..3358f9955 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -1286,10 +1286,9 @@
             }
           }
           for (let i = 0; i < dataSource.length; i++) {
-            if (dataSource[i].verifyFlowStatus == 'List to be released' &&
-              dataSource[i].designFlowStatus == 'List to be released') {
+            if (dataSource[i].flowStatus == 'List to be released') {
               flag = '1'
-              this.$refs.associatedplatRef.transferModel(flag,type)
+              this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
             } else {
               this.$message.warning(this.$t('unpublishedregulationsselected'))
               return
@@ -1301,6 +1300,7 @@
         }
       },
       associatedplatForm(id,flag,type,ids){
+        console.log(type)
         // if(flag == '1'){
         //   this.$refs.associatedplatthreeRef.transferModel(id,type,ids)
         // }else{

From 46fc2db7a57fb61555f5d50beff95c55f4ef01eb Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 20 Sep 2023 16:45:00 +0800
Subject: [PATCH 101/288] =?UTF-8?q?=E4=B8=8D=E5=8B=BE=E9=80=89=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E8=BF=9B=E8=A1=8C=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLibraryBaseController.java         |  18 ++-
 .../service/IProjectLibraryBaseService.java   |   9 +-
 .../impl/ProjectLibraryBaseServiceImpl.java   | 113 +++++++++++++++++-
 3 files changed, 135 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
index 2ecf13b82..ba98706f0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
@@ -63,17 +63,29 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
 	}
 
 	/**
-	 * 法规清单关联平台件
+	 * 勾选法规清单进行关联平台件
 	 *
 	 * @return
 	 */
-	@AutoLog(value = "法规清单关联平台件")
-	@ApiOperation(value="法规清单关联平台件", notes="法规清单关联平台件")
+	@AutoLog(value = "勾选法规清单进行关联平台件")
+	@ApiOperation(value="勾选法规清单进行关联平台件", notes="勾选法规清单进行关联平台件")
 	@PostMapping(value = "/listPlatform")
 	public Result<?> listPlatform(@RequestBody Map<String,Object> params) {
 		List<Map<String, Object>> mapList = projectLibraryBaseService.listPlatform(params);
 		return Result.OK(params.get("cut").toString(),mapList);
 	}
+	/**
+	 * 不勾选法规清单进行关联平台件
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "不勾选法规清单进行关联平台件")
+	@ApiOperation(value="不勾选法规清单进行关联平台件", notes="不勾选法规清单进行关联平台件")
+	@PostMapping(value = "/listPlatformAll")
+	public Result<?> listPlatformAll(@RequestBody Map<String,Object> params) {
+		List<Map<String, Object>> mapList = projectLibraryBaseService.listPlatformAll(params);
+		return Result.OK(params.get("cut").toString(),mapList);
+	}
 
     /**
 	 * 列表查询
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java
index 26a2b99dc..4f9f6f60e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java
@@ -87,11 +87,18 @@ public interface IProjectLibraryBaseService extends IService<ProjectLibraryBase>
 	List<ProjectLibraryBase> queryPageList(Map<String, Object> params);
 
 	/**
-	 * 法规清单关联平台件
+	 * 勾选法规清单进行关联平台件
 	 * @param params
 	 * @return
 	 */
 	List<Map<String,Object>> listPlatform(Map<String, Object> params);
+
+	/**
+	 * 不勾选法规清单进行关联平台件
+	 * @param params
+	 * @return
+	 */
+	List<Map<String,Object>> listPlatformAll(Map<String, Object> params);
 //	IPage<ProjectLibraryBase> queryPageList(Map<String, Object> params);
 
 	/**
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 3aa0f273f..25d289488 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -1265,7 +1265,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		return resultLast;
 	}
 	/**
-	 * 法规清单关联平台件
+	 * 勾选法规清单进行关联平台件
 	 *
 	 * @return
 	 */
@@ -1340,6 +1340,117 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 			}
 
 
+			if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() > 1){
+				map.put("lawsInventoryId",projectLawsInventoryEO.getId());
+				map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+"在平台件项目中包含多条匹配内容，请选择关联");
+				map.put("result",projectLawsInventoryEOS);
+				mapList.add(map);
+			}else if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() == 1){
+				Map<String,Object> mapTemp = new HashMap<>();
+				mapTemp.put("lawsInventoryId",projectLawsInventoryEO.getId());
+				mapTemp.put("result",projectLawsInventoryEOS);
+				mapListOne.add(mapTemp);
+			}
+		}
+		if(!mapListOne.isEmpty()){
+			//匹配一条平台件时直接新增
+			List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
+			for (Map<String, Object> map : mapListOne) {
+				LawsInventoryPlatformEO inventoryPlatformEO = new LawsInventoryPlatformEO();
+				inventoryPlatformEO.setCreateTime(new Date());
+				inventoryPlatformEO.setUpdateTime(new Date());
+				inventoryPlatformEO.setLawsInventoryId((String) map.get("lawsInventoryId"));
+				List<ProjectLawsInventoryEO> projectLawsInventoryEOS = (List<ProjectLawsInventoryEO>) map.get("result");
+				inventoryPlatformEO.setPlatformLawsInventoryId(projectLawsInventoryEOS.get(0).getId());
+				lawsInventoryPlatformEOS.add(inventoryPlatformEO);
+			}
+
+			if (!lawsInventoryPlatformEOS.isEmpty()) {
+				lawsInventoryPlatformEOService.saveBatch(lawsInventoryPlatformEOS);
+			}
+		}
+		return mapList;
+	}
+	/**
+	 * 不勾选法规清单进行关联平台件
+	 *
+	 * @return
+	 */
+	@Override
+	public List<Map<String,Object>> listPlatformAll(Map<String,Object> params) {
+		String cut = (String) params.get("cut");//
+		String projectLibraryIds = (String) params.get("projectLibraryIds");//法规清单id
+		String platformProjectLibraryIds = (String) params.get("platformProjectLibraryIds");//平台件法规id
+
+		//法规清单数据
+		LambdaQueryWrapper<ProjectLawsInventoryEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.in(ProjectLawsInventoryEO::getId,Arrays.asList(projectLibraryIds.split(",")));
+		List<ProjectLawsInventoryEO> lawsInventoryEOList = projectLawsInventoryEOService.list(wrapper);
+		//只有法规的设计符合性确认和验证符合性确认中的流程状态均为清单待发布的时候，才能关联平台件数据
+		lawsInventoryEOList = lawsInventoryEOList.stream()
+				.filter(e->ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue().equals(e.getDesignFlowStatus())
+				&& ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue().equals(e.getVerifyFlowStatus())).collect(Collectors.toList());
+
+		//平台件项目对应的法规清单数据
+		LambdaQueryWrapper<ProjectLawsInventoryEO> wrapper1 = new LambdaQueryWrapper<>();
+		wrapper1.in(ProjectLawsInventoryEO::getId,Arrays.asList(platformProjectLibraryIds.split(",")));
+		List<ProjectLawsInventoryEO> lawsInventoryEOS = projectLawsInventoryEOService.list(wrapper1);
+
+		//平台件项目信息
+		List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
+		if(!lawsInventoryEOList.isEmpty()){
+			List<String> projectIdList = lawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList());
+			LambdaQueryWrapper<ProjectLibraryBase> wrapper2 = new LambdaQueryWrapper<>();
+			wrapper2.in(ProjectLibraryBase::getId,projectIdList);
+			projectLibraryBaseList = this.list(wrapper2);
+		}
+
+		//普通数据字典
+		List<SysDictItem> sysDictItemList = sysDictItemMapper.selectItemsByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue());
+		List<Map<String,Object>> mapList = new ArrayList<>();
+		List<Map<String,Object>> mapListOne = new ArrayList<>();
+		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = new ArrayList<>();
+		for (ProjectLawsInventoryEO projectLawsInventoryEO : lawsInventoryEOList) {
+			Map<String,Object> map = new HashMap<>();
+			List<ProjectLawsInventoryEO> projectLawsInventoryEOS = new ArrayList<>();
+			//serialNumber dutyTerritory
+			String serialNumber = projectLawsInventoryEO.getSerialNumber();
+			String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
+			String subtitle = projectLawsInventoryEO.getSubtitle();
+
+			//责任领域
+			List<String> list = new LinkedList<>();
+			if(StringUtils.isNotBlank(dutyTerritory)){
+				for (String s : dutyTerritory.split(",")) {
+					List<SysDictItem> collect = sysDictItemList.stream().filter(e -> e.getItemValue().equals(s)).collect(Collectors.toList());
+					if(CutEnum.CN.getValue().equals(cut) && !collect.isEmpty()){
+						list.add(collect.get(0).getItemText());
+					}else if(CutEnum.EN.getValue().equals(cut) && !collect.isEmpty()){
+						list.add(collect.get(0).getEnName());
+					}
+				}
+			}
+			String dutyTerritoryNew = "";
+			if(!list.isEmpty()){
+				dutyTerritoryNew = StringUtils.join(list, ",");
+			}
+
+			for (ProjectLawsInventoryEO lawsInventoryEO : lawsInventoryEOS) {
+				String serialNumberTemp = lawsInventoryEO.getSerialNumber();
+				String dutyTerritoryTemp = lawsInventoryEO.getDutyTerritory();
+				if(serialNumber.equals(serialNumberTemp) && StringUtils.isNotBlank(dutyTerritory) && dutyTerritory.equals(dutyTerritoryTemp)){
+					List<ProjectLibraryBase> projectLibraryBases = projectLibraryBaseList.stream().filter(e -> e.getId().equals(lawsInventoryEO.getProjectLibraryId())).collect(Collectors.toList());
+					if(!projectLibraryBases.isEmpty()){
+						lawsInventoryEO.setProjectName(projectLibraryBases.get(0).getProjectNameId());
+					}
+					if(!list.isEmpty()){
+						lawsInventoryEO.setDutyTerritory_dictText(dutyTerritoryNew);
+					}
+					projectLawsInventoryEOS.add(lawsInventoryEO);
+				}
+			}
+
+
 			if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() > 1){
 				map.put("lawsInventoryId",projectLawsInventoryEO.getId());
 				map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+"在平台件项目中包含多条匹配内容，请选择关联");

From de09486be84c639bc8480b618e37aec1119e34ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 20 Sep 2023 17:22:38 +0800
Subject: [PATCH 102/288] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ParamsCollectManifestEOServiceImpl.java     |  8 ++++++++
 .../components/ParameterItemCollectionList.vue       | 12 ++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index dc7be6228..cf0973a09 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -697,6 +697,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
             sqlJoinSb.append(" and dre like '%").append(paramsCollectManifestVO.getDre()).append("%'");
         }
 
+        if (StringUtils.isNotEmpty(paramsCollectManifestVO.getState())) {
+            paramsCollectManifestVO.setDre(paramsCollectManifestVO.getState().replaceAll("'", "\'"));
+            sqlJoinSb.append(" and state = '").append(paramsCollectManifestVO.getDre()).append("'");
+        }
+        if (StringUtils.isNotEmpty(paramsCollectManifestVO.getCertCategory())) {
+            sqlJoinSb.append(" and cert_category like '%").append(paramsCollectManifestVO.getCertCategory()).append("%'");
+        }
+
         // 如果高级查询条件不为空，拼接参数
         if (StringUtils.isNotEmpty(paramsCollectManifestVO.getQueryConditionVOListStr())) {
             List<QueryConditionVO> queryConditionVOList = JSONObject.parseArray(paramsCollectManifestVO.getQueryConditionVOListStr(), QueryConditionVO.class);
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 66dffac05..13d24b0b4 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -799,12 +799,12 @@
             value: 'paramsNumber',
             text: this.$t('certificationCategoryNumber')
           },
-          // {
-          //   type: '',
-          //   value: 'state',
-          //   text: this.$t('status'),
-          //   options: this.statusList//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
-          // },
+          {
+            type: '',
+            value: 'state',
+            text: this.$t('status'),
+            options: this.statusList//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          },
           {
             type: 'string',
             value: 'params_batch',

From c43e3fd7296b17a6bde1b41d2ee561e8e82be00d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 20 Sep 2023 17:52:20 +0800
Subject: [PATCH 103/288] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ParameterItemCollectionList.vue                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 13d24b0b4..12f1be61d 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -3,7 +3,7 @@
     <div class="Virtual-detail-header" style="position: fixed;top: 0">
       <div class="Virtual-detail-title">
         <span>
-          {{$t('ParameteItemCollectionList')}}({{$t(this.$route.query.projectName)}}) — {{$t(this.$route.query.title)}}
+          {{$t('ParameteItemCollectionList')}}({{$t(this.$route.query.projectName.slice(0,-3))}}-{{$t(this.$route.query.projectVersion)}}) — {{$t(this.$route.query.title)}}
         </span>
       </div>
       <div class="Virtual-detail-title-right">

From bc305082d6c961fcb66e2d7491763b7602c35c01 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 20 Sep 2023 17:55:43 +0800
Subject: [PATCH 104/288] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    |  2 +-
 .../impl/ProjectLibraryBaseServiceImpl.java   | 22 +++++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 2b3e83858..ca601940e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -1827,7 +1827,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		}
 	}
 
-	private String getTreeName(String cut, List<SysCategory> categoryList, List<String> technologyTerritoryList) {
+	public String getTreeName(String cut, List<SysCategory> categoryList, List<String> technologyTerritoryList) {
 		StringBuilder sb = new StringBuilder();
 		for (String technologyTerritory : technologyTerritoryList) {
 			List<SysCategory> collect = categoryList.stream().filter(e -> technologyTerritory.equals(e.getId())).collect(Collectors.toList());
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 25d289488..4709f34b9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -61,6 +61,7 @@ import com.jero.modules.project.service.IProjectLibraryRoleRelEOService;
 import com.jero.modules.project.service.IProjectLibraryStatisticsService;
 import com.jero.modules.project.service.IProjectUserPermissionService;
 import com.jero.modules.project.vo.TimeNodeVO;
+import com.jero.modules.system.entity.SysCategory;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.enums.DicCodeEnum;
@@ -70,6 +71,7 @@ import com.jero.modules.system.mapper.SysUserMapper;
 import com.jero.modules.system.service.IProjectUserBrandService;
 import com.jero.modules.system.service.ISysDictService;
 import com.jero.modules.system.service.ISysUserService;
+import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
 import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
 import com.jero.modules.system.util.StringUtils;
 import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
@@ -206,6 +208,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	private OtaManageApplyEOServiceImpl otaManageApplyEOService;
 	@Autowired
 	private LawsInventoryPlatformEOServiceImpl lawsInventoryPlatformEOService;
+	@Autowired
+	private SysCategoryServiceImpl sysCategoryService;
 
 	private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 	private static DecimalFormat df = new DecimalFormat("#.00");
@@ -1296,9 +1300,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 
 		//普通数据字典
 		List<SysDictItem> sysDictItemList = sysDictItemMapper.selectItemsByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue());
+		List<SysCategory> categoryList = sysCategoryService.list();
 		List<Map<String,Object>> mapList = new ArrayList<>();
 		List<Map<String,Object>> mapListOne = new ArrayList<>();
-		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = new ArrayList<>();
 		for (ProjectLawsInventoryEO projectLawsInventoryEO : lawsInventoryEOList) {
 			Map<String,Object> map = new HashMap<>();
 			List<ProjectLawsInventoryEO> projectLawsInventoryEOS = new ArrayList<>();
@@ -1323,6 +1327,19 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 			if(!list.isEmpty()){
 				dutyTerritoryNew = StringUtils.join(list, ",");
 			}
+			//设计-交付物类型
+			String designDeliverableTypeName = "";
+			String verifyDeliverableTypeName = "";
+			String designDeliverableType = projectLawsInventoryEO.getDesignDeliverableType();
+			if(StringUtils.isNotBlank(designDeliverableType)){
+				designDeliverableTypeName = projectLawsInventoryEOService.getTreeName(cut, categoryList, Arrays.asList(designDeliverableType.split(",")));
+			}
+
+			//验证-交付物类型
+			String verifyDeliverableType = projectLawsInventoryEO.getVerifyDeliverableType();
+			if(StringUtils.isNotBlank(verifyDeliverableType)){
+				verifyDeliverableTypeName = projectLawsInventoryEOService.getTreeName(cut, categoryList, Arrays.asList(verifyDeliverableType.split(",")));
+			}
 
 			for (ProjectLawsInventoryEO lawsInventoryEO : lawsInventoryEOS) {
 				String serialNumberTemp = lawsInventoryEO.getSerialNumber();
@@ -1335,11 +1352,12 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 					if(!list.isEmpty()){
 						lawsInventoryEO.setDutyTerritory_dictText(dutyTerritoryNew);
 					}
+					lawsInventoryEO.setDesignDeliverableTypeName(designDeliverableTypeName);
+					lawsInventoryEO.setVerifyDeliverableTypeName(verifyDeliverableTypeName);
 					projectLawsInventoryEOS.add(lawsInventoryEO);
 				}
 			}
 
-
 			if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() > 1){
 				map.put("lawsInventoryId",projectLawsInventoryEO.getId());
 				map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+"在平台件项目中包含多条匹配内容，请选择关联");

From 4ca7876bb6c35ccfa2ba921b6c80723c7f60ae70 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 20 Sep 2023 17:58:16 +0800
Subject: [PATCH 105/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E5=85=B3=E8=81=94=E5=8F=96=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectManagement/components/associatedplatthree.vue      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/associatedplatthree.vue b/jero-web/src/views/projectManagement/components/associatedplatthree.vue
index a55cc93d2..96a610c85 100644
--- a/jero-web/src/views/projectManagement/components/associatedplatthree.vue
+++ b/jero-web/src/views/projectManagement/components/associatedplatthree.vue
@@ -77,14 +77,14 @@
           },
           {
             title: this.$t('regulatoryEngineer'),
-            dataIndex: 'regulationOwnerName',
+            dataIndex: 'createBy',
             align: 'left',
             ellipsis: true,
             width: 120
           },
           {
             title: this.$t('design') + '-' + this.$t('typeOfDeliverables'),
-            dataIndex: 'designdeliverableTypeName',
+            dataIndex: 'designDeliverableTypeName',
             align: 'left',
             ellipsis: true,
             width: 130

From 0bef771651d56de814c9e3bc6fac70ac0ed5d17f Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 20 Sep 2023 19:00:32 +0800
Subject: [PATCH 106/288] =?UTF-8?q?=E5=8B=BE=E9=80=89=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E8=BF=9B=E8=A1=8C=E5=85=B3=E8=81=94=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ectCertificationInventoryEOController.java | 54 +++++++----
 ...rojectCertificationInventoryEOService.java | 12 ++-
 ...ctCertificationInventoryEOServiceImpl.java | 97 +++++++++++++++++++
 3 files changed, 143 insertions(+), 20 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java
index c943f39cb..4c6b640f6 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java
@@ -1,32 +1,39 @@
 package com.jero.modules.project.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.alibaba.fastjson.JSONObject;
-import com.jero.common.api.vo.Result;
-import com.jero.common.system.query.QueryGenerator;
-import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
-import com.jero.modules.project.entity.ProjectLawsInventoryEO;
-import com.jero.modules.project.service.IProjectCertificationInventoryEOService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jero.modules.system.entity.SysRole;
-import lombok.extern.slf4j.Slf4j;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
+import com.jero.modules.project.service.IProjectCertificationInventoryEOService;
+import com.jero.modules.system.entity.SysRole;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import com.jero.common.aspect.annotation.AutoLog;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 
  /**
@@ -86,6 +93,19 @@ public class ProjectCertificationInventoryEOController extends JeroController<Pr
 		return Result.OK(cut,pageList);
 	}
 
+	 /**
+	  * 勾选认证清单进行关联平台件
+	  *
+	  * @return
+	  */
+	 @AutoLog(value = "勾选认证清单进行关联平台件")
+	 @ApiOperation(value="勾选认证清单进行关联平台件", notes="勾选认证清单进行关联平台件")
+	 @PostMapping(value = "/listPlatform")
+	 public Result<?> listPlatform(@RequestBody Map<String,Object> params) {
+		 projectCertificationInventoryEOService.listPlatform(params);
+		 return Result.OK();
+	 }
+
     /**
 	 * 列表查询
 	 *
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java
index 16dcdbaaf..472446bd3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java
@@ -4,10 +4,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jero.common.api.vo.Result;
-import com.jero.common.system.vo.DictModel;
-import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.common.api.vo.Result;
+import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
 import com.jero.modules.system.entity.SysCategory;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.entity.SysRole;
@@ -339,4 +338,11 @@ public interface IProjectCertificationInventoryEOService extends IService<Projec
 	 * @return
 	 */
 	Result<?> matchRelevantPeople(Map<String, Object> params);
+
+	/**
+	 * 勾选认证清单进行关联平台件
+	 * @param params
+	 * @return
+	 */
+	void listPlatform(Map<String, Object> params);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index 7c04dc814..830ccfbd3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -31,6 +31,7 @@ import com.jero.modules.feishu.enums.TemplateInfoEnum2;
 import com.jero.modules.feishu.service.IFeishuService;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
+import com.jero.modules.project.entity.LawsInventoryPlatformEO;
 import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEO;
 import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOEn;
 import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
@@ -227,6 +228,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 	private IProjectLibraryRoleRelEOService projectLibraryRoleRelEOService;
 	@Autowired
 	private IProcessHistoryEOService processHistoryEOService;
+	@Autowired
+	private LawsInventoryPlatformEOServiceImpl lawsInventoryPlatformEOService;
 
 	/**
 	 * 保存
@@ -6847,4 +6850,98 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		return result;
 	}
 
+	/**
+	 * 勾选认证清单进行关联平台件
+	 *
+	 * @return
+	 */
+	@Override
+	public void listPlatform(Map<String,Object> params) {
+		String cut = (String) params.get("cut");//
+		String ids = (String) params.get("ids");//认证清单id
+		String projectLibraryIds = (String) params.get("projectLibraryIds");//平台件项目id
+
+		//认证清单数据
+		LambdaQueryWrapper<ProjectCertificationInventoryEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.in(ProjectCertificationInventoryEO::getId,Arrays.asList(ids.split(",")));
+		List<ProjectCertificationInventoryEO> certificationInventoryEOList = this.list(wrapper);
+
+		//平台件项目对应的认证清单数据
+		LambdaQueryWrapper<ProjectCertificationInventoryEO> wrapper1 = new LambdaQueryWrapper<>();
+		wrapper1.in(ProjectCertificationInventoryEO::getProjectLibraryId,Arrays.asList(projectLibraryIds.split(",")));
+		List<ProjectCertificationInventoryEO> certificationInventoryEOS = this.list(wrapper1);
+
+		//平台件项目信息
+		List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
+		if(!certificationInventoryEOList.isEmpty()){
+			List<String> projectIdList = certificationInventoryEOS.stream().map(ProjectCertificationInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList());
+			LambdaQueryWrapper<ProjectLibraryBase> wrapper2 = new LambdaQueryWrapper<>();
+			wrapper2.in(ProjectLibraryBase::getId,projectIdList);
+			projectLibraryBaseList = projectLibraryBaseService.list(wrapper2);
+		}
+
+		List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
+
+		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : certificationInventoryEOList) {
+			Map<String,Object> map = new HashMap<>();
+			List<ProjectLawsInventoryEO> projectLawsInventoryEOS = new ArrayList<>();
+			//类别
+			String category = projectCertificationInventoryEO.getCategory();
+			//检验项目
+			String inspectionItem = projectCertificationInventoryEO.getInspectionItem();
+			//配置项
+			String configItem = projectCertificationInventoryEO.getConfigItem();
+			//编号
+			String serialNumber = projectCertificationInventoryEO.getSerialNumber();
+			//责任领域
+			String dutyTerritory = projectCertificationInventoryEO.getDutyTerritory();
+
+			for (ProjectCertificationInventoryEO certificationInventoryEO : certificationInventoryEOS) {
+				List<ProjectLibraryBase> libraryBaseList = projectLibraryBaseList.stream()
+						.filter(e -> certificationInventoryEO.getProjectLibraryId().equals(e.getId())).collect(Collectors.toList());
+				//平台件项目库中的认证清单的配置项为平台件项目名称
+				String configItemTemp = "";
+				if(!libraryBaseList.isEmpty()){
+					//配置项
+					configItemTemp = libraryBaseList.get(0).getProjectNameId();
+				}
+				//类别
+				String categoryTemp = certificationInventoryEO.getCategory();
+				//检验项目
+				String inspectionItemTemp = certificationInventoryEO.getInspectionItem();
+				//编号
+				String serialNumberTemp = certificationInventoryEO.getSerialNumber();
+				//责任领域
+				String dutyTerritoryTemp = certificationInventoryEO.getDutyTerritory();
+
+				if(StringUtils.isBlank(configItem) || "标配".equals(configItem)){
+					//如果车型项目库中的配置项为空或为标配时，直接将平台件信息添加到关联表
+					setData(lawsInventoryPlatformEOS, projectCertificationInventoryEO, certificationInventoryEO);
+				}else if(StringUtils.isNotBlank(configItem) && !"标配".equals(configItem)){
+					//如果车型项目库中的配置项不为空且不为标配时，如果车型项目库认证清单的配置项与平台件认证清单的配置项不一致，则不再匹配
+					//如果一致，则用类别，检验项目，编号，责任领域去做匹配
+					if(configItem.equals(configItemTemp)
+							&& category.equals(categoryTemp)
+							&& inspectionItem.equals(inspectionItemTemp)
+							&& serialNumber.equals(serialNumberTemp)
+							&& dutyTerritory.equals(dutyTerritoryTemp)){
+						setData(lawsInventoryPlatformEOS, projectCertificationInventoryEO, certificationInventoryEO);
+					}
+				}
+			}
+		}
+		if(!lawsInventoryPlatformEOS.isEmpty()){
+			lawsInventoryPlatformEOService.saveBatch(lawsInventoryPlatformEOS);
+		}
+	}
+
+	private void setData(List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS, ProjectCertificationInventoryEO projectCertificationInventoryEO, ProjectCertificationInventoryEO certificationInventoryEO) {
+		LawsInventoryPlatformEO inventoryPlatformEO = new LawsInventoryPlatformEO();
+		inventoryPlatformEO.setCreateTime(new Date());
+		inventoryPlatformEO.setUpdateTime(new Date());
+		inventoryPlatformEO.setLawsInventoryId(projectCertificationInventoryEO.getId());
+		inventoryPlatformEO.setPlatformLawsInventoryId(certificationInventoryEO.getId());
+		lawsInventoryPlatformEOS.add(inventoryPlatformEO);
+	}
+
 }

From a8507c3210de7cc0292830eaf23ff9145a564e3d Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 21 Sep 2023 09:54:17 +0800
Subject: [PATCH 107/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6=E5=AF=B9=E6=8E=A5?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/certificationList/index.vue        | 15 ++++++++++++++-
 .../components/listEditModel.vue                  |  2 ++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 3358f9955..645dbe1ea 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -1300,7 +1300,20 @@
         }
       },
       associatedplatForm(id,flag,type,ids){
-        console.log(type)
+        console.log(id,flag,type,ids)
+        let query ={
+          ids:ids,
+          projectLibraryIds:id
+        }
+        if(type == '认证'){
+          postAction('/project/projectCertificationInventoryEO/listPlatform', query).then((res) => {
+            if (res.success) {
+              this.$refs.associatedplatRef.visible = false
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.getList()
+            }
+          })
+        }
         // if(flag == '1'){
         //   this.$refs.associatedplatthreeRef.transferModel(id,type,ids)
         // }else{
diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index 39498ce70..60de12437 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -845,6 +845,8 @@
               }
               this.formInline.designDutyIdName = this.dataList && this.dataList.length>0 ? this.dataList[0].designDutyIdName : ''
               this.formInline.verifyDutyIdName = this.dataList && this.dataList.length>0 ? this.dataList[0].verifyDutyIdName : ''
+              this.formInline.designDutyId = this.dataList && this.dataList.length>0 ? this.dataList[0].designDutyId : ''
+              this.formInline.verifyDutyId = this.dataList && this.dataList.length>0 ? this.dataList[0].verifyDutyId : ''
               this.formInline.designDueDate = this.dataList && this.dataList.length>0 ? this.dataList[0].designDueDate : ''
               this.formInline.verifyDueDate = this.dataList && this.dataList.length>0 ? this.dataList[0].verifyDueDate : ''
               this.formInline.designDeliverableTemplate = this.dataList && this.dataList.length>0 ? this.dataList[0].designDeliverableTemplate : ''

From 9ca563bc67f1436a16794ec4635982bbd4a8b1cc Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 21 Sep 2023 13:36:44 +0800
Subject: [PATCH 108/288] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctCertificationInventoryEOServiceImpl.java | 188 ++++++++++++++----
 1 file changed, 152 insertions(+), 36 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index 830ccfbd3..9bd34fcd7 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -6857,7 +6857,6 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 	 */
 	@Override
 	public void listPlatform(Map<String,Object> params) {
-		String cut = (String) params.get("cut");//
 		String ids = (String) params.get("ids");//认证清单id
 		String projectLibraryIds = (String) params.get("projectLibraryIds");//平台件项目id
 
@@ -6882,9 +6881,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 
 		List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
 
+		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = new ArrayList<>();
 		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : certificationInventoryEOList) {
-			Map<String,Object> map = new HashMap<>();
-			List<ProjectLawsInventoryEO> projectLawsInventoryEOS = new ArrayList<>();
 			//类别
 			String category = projectCertificationInventoryEO.getCategory();
 			//检验项目
@@ -6896,52 +6894,170 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			//责任领域
 			String dutyTerritory = projectCertificationInventoryEO.getDutyTerritory();
 
-			for (ProjectCertificationInventoryEO certificationInventoryEO : certificationInventoryEOS) {
-				List<ProjectLibraryBase> libraryBaseList = projectLibraryBaseList.stream()
-						.filter(e -> certificationInventoryEO.getProjectLibraryId().equals(e.getId())).collect(Collectors.toList());
-				//平台件项目库中的认证清单的配置项为平台件项目名称
-				String configItemTemp = "";
-				if(!libraryBaseList.isEmpty()){
-					//配置项
-					configItemTemp = libraryBaseList.get(0).getProjectNameId();
+			List<ProjectCertificationInventoryEO> result = new ArrayList<>();
+			//如果车型项目库中的配置项为空或为标配时，不去匹配直接关联
+			if(StringUtils.isBlank(configItem) || "标配".equals(configItem)){
+				if(!certificationInventoryEOS.isEmpty()){
+					result = setData(certificationInventoryEOS, projectCertificationInventoryEOList, projectCertificationInventoryEO);
 				}
-				//类别
-				String categoryTemp = certificationInventoryEO.getCategory();
-				//检验项目
-				String inspectionItemTemp = certificationInventoryEO.getInspectionItem();
-				//编号
-				String serialNumberTemp = certificationInventoryEO.getSerialNumber();
-				//责任领域
-				String dutyTerritoryTemp = certificationInventoryEO.getDutyTerritory();
+			}else if(StringUtils.isNotBlank(configItem) && !"标配".equals(configItem)){
+				//如果车型项目库中的配置项不为空且不为标配时，如果车型项目库认证清单的配置项与平台件认证清单的配置项不一致，则不再匹配
+				//如果一致，则用类别，检验项目，编号，责任领域去做匹配
+
+				List<ProjectCertificationInventoryEO> projectCertificationInventoryEOS = new ArrayList<>();
+				for (int i = 0; i < certificationInventoryEOS.size(); i++) {
+					int finalI = i;
+					List<ProjectLibraryBase> libraryBaseList = projectLibraryBaseList.stream()
+							.filter(e -> certificationInventoryEOS.get(finalI).getProjectLibraryId().equals(e.getId())).collect(Collectors.toList());
+					//平台件项目库中的认证清单的配置项为平台件项目名称
+					String configItemTemp = "";
+					if(!libraryBaseList.isEmpty()){
+						//配置项
+						configItemTemp = libraryBaseList.get(0).getProjectNameId();
+					}
+					//类别
+					String categoryTemp = certificationInventoryEOS.get(i).getCategory();
+					//检验项目
+					String inspectionItemTemp = certificationInventoryEOS.get(i).getInspectionItem();
+					//编号
+					String serialNumberTemp = certificationInventoryEOS.get(i).getSerialNumber();
+					//责任领域
+					String dutyTerritoryTemp = certificationInventoryEOS.get(i).getDutyTerritory();
 
-				if(StringUtils.isBlank(configItem) || "标配".equals(configItem)){
-					//如果车型项目库中的配置项为空或为标配时，直接将平台件信息添加到关联表
-					setData(lawsInventoryPlatformEOS, projectCertificationInventoryEO, certificationInventoryEO);
-				}else if(StringUtils.isNotBlank(configItem) && !"标配".equals(configItem)){
-					//如果车型项目库中的配置项不为空且不为标配时，如果车型项目库认证清单的配置项与平台件认证清单的配置项不一致，则不再匹配
-					//如果一致，则用类别，检验项目，编号，责任领域去做匹配
 					if(configItem.equals(configItemTemp)
 							&& category.equals(categoryTemp)
 							&& inspectionItem.equals(inspectionItemTemp)
 							&& serialNumber.equals(serialNumberTemp)
 							&& dutyTerritory.equals(dutyTerritoryTemp)){
-						setData(lawsInventoryPlatformEOS, projectCertificationInventoryEO, certificationInventoryEO);
+
+						projectCertificationInventoryEOS.add(certificationInventoryEOS.get(i));
 					}
 				}
+				if(!projectCertificationInventoryEOS.isEmpty()){
+					result = setData(certificationInventoryEOS, projectCertificationInventoryEOS, projectCertificationInventoryEO);
+					this.saveOrUpdateBatch(result);
+				}
 			}
 		}
-		if(!lawsInventoryPlatformEOS.isEmpty()){
-			lawsInventoryPlatformEOService.saveBatch(lawsInventoryPlatformEOS);
-		}
 	}
 
-	private void setData(List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS, ProjectCertificationInventoryEO projectCertificationInventoryEO, ProjectCertificationInventoryEO certificationInventoryEO) {
-		LawsInventoryPlatformEO inventoryPlatformEO = new LawsInventoryPlatformEO();
-		inventoryPlatformEO.setCreateTime(new Date());
-		inventoryPlatformEO.setUpdateTime(new Date());
-		inventoryPlatformEO.setLawsInventoryId(projectCertificationInventoryEO.getId());
-		inventoryPlatformEO.setPlatformLawsInventoryId(certificationInventoryEO.getId());
-		lawsInventoryPlatformEOS.add(inventoryPlatformEO);
+	private List<ProjectCertificationInventoryEO> setData(List<ProjectCertificationInventoryEO> certificationInventoryEOS,
+						 List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList,
+						 ProjectCertificationInventoryEO projectCertificationInventoryEO) {
+		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOS = new ArrayList<>();
+		//设置平台件认证清单数据
+		setProjectCertificationInventoryEO(certificationInventoryEOS.get(0), projectCertificationInventoryEO);
+		projectCertificationInventoryEOS.add(projectCertificationInventoryEO);
+
+		//如果车型项目库中的配置项为空或为标配时，不去匹配直接关联，此时一对多，一指的是车型库认证清单，多指的是平台件认证清单
+		//例：一条车型库认证清单对应3条平台件认证清单，此时需要复制两条项目库认证清单，将这两条认证清单中的交付物模板到生产企业名称
+		//的字段值替换为平台件认证清单的数据，原有的那条认证清单这部分数据也需要替换
+		for (int i = 1; i < certificationInventoryEOS.size(); i++) {
+			ProjectCertificationInventoryEO certificationInventoryEO = new ProjectCertificationInventoryEO();
+			BeanUtils.copyProperties(projectCertificationInventoryEO,certificationInventoryEO);
+			certificationInventoryEO.setId(UUID.randomUUID().toString().replace("-",""));
+			//设置平台件认证清单数据
+			setProjectCertificationInventoryEO(certificationInventoryEOS.get(i), certificationInventoryEO);
+			projectCertificationInventoryEOS.add(certificationInventoryEO);
+		}
+		return projectCertificationInventoryEOS;
 	}
 
+	private void setProjectCertificationInventoryEO(ProjectCertificationInventoryEO certificationInventoryEO, ProjectCertificationInventoryEO projectCertificationInventoryEO) {
+		//交付物模板-deliverableTemplate
+		projectCertificationInventoryEO.setDeliverableTemplate(certificationInventoryEO.getDeliverableTemplate());
+		//交付物类型-deliverableType
+		projectCertificationInventoryEO.setDeliverableType(certificationInventoryEO.getDeliverableType());
+		//交付结果-deliveryResult
+		projectCertificationInventoryEO.setDeliveryResult(certificationInventoryEO.getDeliveryResult());
+		//截止日期-endTime
+		projectCertificationInventoryEO.setEndTime(certificationInventoryEO.getEndTime());
+		//流程状态-flowStatus
+		projectCertificationInventoryEO.setFlowStatus(certificationInventoryEO.getFlowStatus());
+		//报告编号-reportNumber
+		projectCertificationInventoryEO.setReportNumber(certificationInventoryEO.getReportNumber());
+		//产品型号-productModel
+		projectCertificationInventoryEO.setProductModel(certificationInventoryEO.getProductModel());
+		//生产企业名称-productionEnterpriseName
+		projectCertificationInventoryEO.setProductionEnterpriseName(certificationInventoryEO.getProductionEnterpriseName());
+	}
+//	public void listPlatform(Map<String,Object> params) {
+//		String cut = (String) params.get("cut");//
+//		String ids = (String) params.get("ids");//认证清单id
+//		String projectLibraryIds = (String) params.get("projectLibraryIds");//平台件项目id
+//
+//		//认证清单数据
+//		LambdaQueryWrapper<ProjectCertificationInventoryEO> wrapper = new LambdaQueryWrapper<>();
+//		wrapper.in(ProjectCertificationInventoryEO::getId,Arrays.asList(ids.split(",")));
+//		List<ProjectCertificationInventoryEO> certificationInventoryEOList = this.list(wrapper);
+//
+//		//平台件项目对应的认证清单数据
+//		LambdaQueryWrapper<ProjectCertificationInventoryEO> wrapper1 = new LambdaQueryWrapper<>();
+//		wrapper1.in(ProjectCertificationInventoryEO::getProjectLibraryId,Arrays.asList(projectLibraryIds.split(",")));
+//		List<ProjectCertificationInventoryEO> certificationInventoryEOS = this.list(wrapper1);
+//
+//		//平台件项目信息
+//		List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
+//		if(!certificationInventoryEOList.isEmpty()){
+//			List<String> projectIdList = certificationInventoryEOS.stream().map(ProjectCertificationInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList());
+//			LambdaQueryWrapper<ProjectLibraryBase> wrapper2 = new LambdaQueryWrapper<>();
+//			wrapper2.in(ProjectLibraryBase::getId,projectIdList);
+//			projectLibraryBaseList = projectLibraryBaseService.list(wrapper2);
+//		}
+//
+//		List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
+//
+//		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : certificationInventoryEOList) {
+//			Map<String,Object> map = new HashMap<>();
+//			List<ProjectLawsInventoryEO> projectLawsInventoryEOS = new ArrayList<>();
+//			//类别
+//			String category = projectCertificationInventoryEO.getCategory();
+//			//检验项目
+//			String inspectionItem = projectCertificationInventoryEO.getInspectionItem();
+//			//配置项
+//			String configItem = projectCertificationInventoryEO.getConfigItem();
+//			//编号
+//			String serialNumber = projectCertificationInventoryEO.getSerialNumber();
+//			//责任领域
+//			String dutyTerritory = projectCertificationInventoryEO.getDutyTerritory();
+//
+//			for (ProjectCertificationInventoryEO certificationInventoryEO : certificationInventoryEOS) {
+//				List<ProjectLibraryBase> libraryBaseList = projectLibraryBaseList.stream()
+//						.filter(e -> certificationInventoryEO.getProjectLibraryId().equals(e.getId())).collect(Collectors.toList());
+//				//平台件项目库中的认证清单的配置项为平台件项目名称
+//				String configItemTemp = "";
+//				if(!libraryBaseList.isEmpty()){
+//					//配置项
+//					configItemTemp = libraryBaseList.get(0).getProjectNameId();
+//				}
+//				//类别
+//				String categoryTemp = certificationInventoryEO.getCategory();
+//				//检验项目
+//				String inspectionItemTemp = certificationInventoryEO.getInspectionItem();
+//				//编号
+//				String serialNumberTemp = certificationInventoryEO.getSerialNumber();
+//				//责任领域
+//				String dutyTerritoryTemp = certificationInventoryEO.getDutyTerritory();
+//
+//				if(StringUtils.isBlank(configItem) || "标配".equals(configItem)){
+//					//如果车型项目库中的配置项为空或为标配时，直接将平台件信息添加到关联表
+//					setData(lawsInventoryPlatformEOS, projectCertificationInventoryEO, certificationInventoryEO);
+//				}else if(StringUtils.isNotBlank(configItem) && !"标配".equals(configItem)){
+//					//如果车型项目库中的配置项不为空且不为标配时，如果车型项目库认证清单的配置项与平台件认证清单的配置项不一致，则不再匹配
+//					//如果一致，则用类别，检验项目，编号，责任领域去做匹配
+//					if(configItem.equals(configItemTemp)
+//							&& category.equals(categoryTemp)
+//							&& inspectionItem.equals(inspectionItemTemp)
+//							&& serialNumber.equals(serialNumberTemp)
+//							&& dutyTerritory.equals(dutyTerritoryTemp)){
+//						setData(lawsInventoryPlatformEOS, projectCertificationInventoryEO, certificationInventoryEO);
+//					}
+//				}
+//			}
+//		}
+//		if(!lawsInventoryPlatformEOS.isEmpty()){
+//			lawsInventoryPlatformEOService.saveBatch(lawsInventoryPlatformEOS);
+//		}
+//	}
+
 }

From 4c836792ee5af7fad9eec6761acd1ef9aba948a6 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 21 Sep 2023 14:09:55 +0800
Subject: [PATCH 109/288] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectCertificationInventoryEOServiceImpl.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index 9bd34fcd7..1107ba247 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -6935,9 +6935,11 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				}
 				if(!projectCertificationInventoryEOS.isEmpty()){
 					result = setData(certificationInventoryEOS, projectCertificationInventoryEOS, projectCertificationInventoryEO);
-					this.saveOrUpdateBatch(result);
 				}
 			}
+			if(!result.isEmpty()){
+				this.saveOrUpdateBatch(result);
+			}
 		}
 	}
 

From 37473c03f1717f5c950112335f5a2f5ad27eef29 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 21 Sep 2023 14:16:05 +0800
Subject: [PATCH 110/288] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectCertificationInventoryEOServiceImpl.java     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index 1107ba247..e876f5618 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -6898,7 +6898,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			//如果车型项目库中的配置项为空或为标配时，不去匹配直接关联
 			if(StringUtils.isBlank(configItem) || "标配".equals(configItem)){
 				if(!certificationInventoryEOS.isEmpty()){
-					result = setData(certificationInventoryEOS, projectCertificationInventoryEOList, projectCertificationInventoryEO);
+					result = setData(certificationInventoryEOS, projectCertificationInventoryEO);
 				}
 			}else if(StringUtils.isNotBlank(configItem) && !"标配".equals(configItem)){
 				//如果车型项目库中的配置项不为空且不为标配时，如果车型项目库认证清单的配置项与平台件认证清单的配置项不一致，则不再匹配
@@ -6934,7 +6934,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					}
 				}
 				if(!projectCertificationInventoryEOS.isEmpty()){
-					result = setData(certificationInventoryEOS, projectCertificationInventoryEOS, projectCertificationInventoryEO);
+					result = setData(projectCertificationInventoryEOS, projectCertificationInventoryEO);
 				}
 			}
 			if(!result.isEmpty()){
@@ -6944,7 +6944,6 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 	}
 
 	private List<ProjectCertificationInventoryEO> setData(List<ProjectCertificationInventoryEO> certificationInventoryEOS,
-						 List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList,
 						 ProjectCertificationInventoryEO projectCertificationInventoryEO) {
 		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOS = new ArrayList<>();
 		//设置平台件认证清单数据

From ea804a0ce82843b3439bf8c9fb406ae355532d2c Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 21 Sep 2023 14:27:45 +0800
Subject: [PATCH 111/288] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A4=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctCertificationInventoryEOServiceImpl.java | 138 +++++++++---------
 1 file changed, 70 insertions(+), 68 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index e876f5618..e38cb5c4d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -6870,75 +6870,77 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		wrapper1.in(ProjectCertificationInventoryEO::getProjectLibraryId,Arrays.asList(projectLibraryIds.split(",")));
 		List<ProjectCertificationInventoryEO> certificationInventoryEOS = this.list(wrapper1);
 
-		//平台件项目信息
-		List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
-		if(!certificationInventoryEOList.isEmpty()){
-			List<String> projectIdList = certificationInventoryEOS.stream().map(ProjectCertificationInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList());
-			LambdaQueryWrapper<ProjectLibraryBase> wrapper2 = new LambdaQueryWrapper<>();
-			wrapper2.in(ProjectLibraryBase::getId,projectIdList);
-			projectLibraryBaseList = projectLibraryBaseService.list(wrapper2);
-		}
-
-		List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
-
-		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = new ArrayList<>();
-		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : certificationInventoryEOList) {
-			//类别
-			String category = projectCertificationInventoryEO.getCategory();
-			//检验项目
-			String inspectionItem = projectCertificationInventoryEO.getInspectionItem();
-			//配置项
-			String configItem = projectCertificationInventoryEO.getConfigItem();
-			//编号
-			String serialNumber = projectCertificationInventoryEO.getSerialNumber();
-			//责任领域
-			String dutyTerritory = projectCertificationInventoryEO.getDutyTerritory();
-
-			List<ProjectCertificationInventoryEO> result = new ArrayList<>();
-			//如果车型项目库中的配置项为空或为标配时，不去匹配直接关联
-			if(StringUtils.isBlank(configItem) || "标配".equals(configItem)){
-				if(!certificationInventoryEOS.isEmpty()){
-					result = setData(certificationInventoryEOS, projectCertificationInventoryEO);
-				}
-			}else if(StringUtils.isNotBlank(configItem) && !"标配".equals(configItem)){
-				//如果车型项目库中的配置项不为空且不为标配时，如果车型项目库认证清单的配置项与平台件认证清单的配置项不一致，则不再匹配
-				//如果一致，则用类别，检验项目，编号，责任领域去做匹配
-
-				List<ProjectCertificationInventoryEO> projectCertificationInventoryEOS = new ArrayList<>();
-				for (int i = 0; i < certificationInventoryEOS.size(); i++) {
-					int finalI = i;
-					List<ProjectLibraryBase> libraryBaseList = projectLibraryBaseList.stream()
-							.filter(e -> certificationInventoryEOS.get(finalI).getProjectLibraryId().equals(e.getId())).collect(Collectors.toList());
-					//平台件项目库中的认证清单的配置项为平台件项目名称
-					String configItemTemp = "";
-					if(!libraryBaseList.isEmpty()){
-						//配置项
-						configItemTemp = libraryBaseList.get(0).getProjectNameId();
-					}
-					//类别
-					String categoryTemp = certificationInventoryEOS.get(i).getCategory();
-					//检验项目
-					String inspectionItemTemp = certificationInventoryEOS.get(i).getInspectionItem();
-					//编号
-					String serialNumberTemp = certificationInventoryEOS.get(i).getSerialNumber();
-					//责任领域
-					String dutyTerritoryTemp = certificationInventoryEOS.get(i).getDutyTerritory();
-
-					if(configItem.equals(configItemTemp)
-							&& category.equals(categoryTemp)
-							&& inspectionItem.equals(inspectionItemTemp)
-							&& serialNumber.equals(serialNumberTemp)
-							&& dutyTerritory.equals(dutyTerritoryTemp)){
-
-						projectCertificationInventoryEOS.add(certificationInventoryEOS.get(i));
-					}
-				}
-				if(!projectCertificationInventoryEOS.isEmpty()){
-					result = setData(projectCertificationInventoryEOS, projectCertificationInventoryEO);
-				}
+		if(!certificationInventoryEOS.isEmpty()){
+			//平台件项目信息
+			List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
+			if(!certificationInventoryEOList.isEmpty()){
+				List<String> projectIdList = certificationInventoryEOS.stream().map(ProjectCertificationInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList());
+				LambdaQueryWrapper<ProjectLibraryBase> wrapper2 = new LambdaQueryWrapper<>();
+				wrapper2.in(ProjectLibraryBase::getId,projectIdList);
+				projectLibraryBaseList = projectLibraryBaseService.list(wrapper2);
 			}
-			if(!result.isEmpty()){
-				this.saveOrUpdateBatch(result);
+
+			List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
+
+			List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = new ArrayList<>();
+			for (ProjectCertificationInventoryEO projectCertificationInventoryEO : certificationInventoryEOList) {
+				//类别
+				String category = projectCertificationInventoryEO.getCategory();
+				//检验项目
+				String inspectionItem = projectCertificationInventoryEO.getInspectionItem();
+				//配置项
+				String configItem = projectCertificationInventoryEO.getConfigItem();
+				//编号
+				String serialNumber = projectCertificationInventoryEO.getSerialNumber();
+				//责任领域
+				String dutyTerritory = projectCertificationInventoryEO.getDutyTerritory();
+
+				List<ProjectCertificationInventoryEO> result = new ArrayList<>();
+				//如果车型项目库中的配置项为空或为标配时，不去匹配直接关联
+				if(StringUtils.isBlank(configItem) || "标配".equals(configItem)){
+					if(!certificationInventoryEOS.isEmpty()){
+						result = setData(certificationInventoryEOS, projectCertificationInventoryEO);
+					}
+				}else if(StringUtils.isNotBlank(configItem) && !"标配".equals(configItem)){
+					//如果车型项目库中的配置项不为空且不为标配时，如果车型项目库认证清单的配置项与平台件认证清单的配置项不一致，则不再匹配
+					//如果一致，则用类别，检验项目，编号，责任领域去做匹配
+
+					List<ProjectCertificationInventoryEO> projectCertificationInventoryEOS = new ArrayList<>();
+					for (int i = 0; i < certificationInventoryEOS.size(); i++) {
+						int finalI = i;
+						List<ProjectLibraryBase> libraryBaseList = projectLibraryBaseList.stream()
+								.filter(e -> certificationInventoryEOS.get(finalI).getProjectLibraryId().equals(e.getId())).collect(Collectors.toList());
+						//平台件项目库中的认证清单的配置项为平台件项目名称
+						String configItemTemp = "";
+						if(!libraryBaseList.isEmpty()){
+							//配置项
+							configItemTemp = libraryBaseList.get(0).getProjectNameId();
+						}
+						//类别
+						String categoryTemp = certificationInventoryEOS.get(i).getCategory();
+						//检验项目
+						String inspectionItemTemp = certificationInventoryEOS.get(i).getInspectionItem();
+						//编号
+						String serialNumberTemp = certificationInventoryEOS.get(i).getSerialNumber();
+						//责任领域
+						String dutyTerritoryTemp = certificationInventoryEOS.get(i).getDutyTerritory();
+
+						if(configItem.equals(configItemTemp)
+								&& category.equals(categoryTemp)
+								&& inspectionItem.equals(inspectionItemTemp)
+								&& serialNumber.equals(serialNumberTemp)
+								&& dutyTerritory.equals(dutyTerritoryTemp)){
+
+							projectCertificationInventoryEOS.add(certificationInventoryEOS.get(i));
+						}
+					}
+					if(!projectCertificationInventoryEOS.isEmpty()){
+						result = setData(projectCertificationInventoryEOS, projectCertificationInventoryEO);
+					}
+				}
+				if(!result.isEmpty()){
+					this.saveOrUpdateBatch(result);
+				}
 			}
 		}
 	}

From 1cee376084a46466da36727dc4148e83ceb5e8a0 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 21 Sep 2023 15:25:54 +0800
Subject: [PATCH 112/288] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ProjectCertificationInventoryEOServiceImpl.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index e38cb5c4d..502bad66f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -6968,21 +6968,21 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 
 	private void setProjectCertificationInventoryEO(ProjectCertificationInventoryEO certificationInventoryEO, ProjectCertificationInventoryEO projectCertificationInventoryEO) {
 		//交付物模板-deliverableTemplate
-		projectCertificationInventoryEO.setDeliverableTemplate(certificationInventoryEO.getDeliverableTemplate());
+		projectCertificationInventoryEO.setDeliverableTemplate(StringUtils.isNotEmpty(certificationInventoryEO.getDeliverableTemplate()) ? certificationInventoryEO.getDeliverableTemplate() : "");
 		//交付物类型-deliverableType
-		projectCertificationInventoryEO.setDeliverableType(certificationInventoryEO.getDeliverableType());
+		projectCertificationInventoryEO.setDeliverableType(StringUtils.isNotEmpty(certificationInventoryEO.getDeliverableType()) ? certificationInventoryEO.getDeliverableType() : "");
 		//交付结果-deliveryResult
-		projectCertificationInventoryEO.setDeliveryResult(certificationInventoryEO.getDeliveryResult());
+		projectCertificationInventoryEO.setDeliveryResult(StringUtils.isNotEmpty(certificationInventoryEO.getDeliveryResult()) ? certificationInventoryEO.getDeliveryResult() : "");
 		//截止日期-endTime
 		projectCertificationInventoryEO.setEndTime(certificationInventoryEO.getEndTime());
 		//流程状态-flowStatus
-		projectCertificationInventoryEO.setFlowStatus(certificationInventoryEO.getFlowStatus());
+		projectCertificationInventoryEO.setFlowStatus(StringUtils.isNotEmpty(certificationInventoryEO.getFlowStatus()) ? certificationInventoryEO.getFlowStatus() : "");
 		//报告编号-reportNumber
-		projectCertificationInventoryEO.setReportNumber(certificationInventoryEO.getReportNumber());
+		projectCertificationInventoryEO.setReportNumber(StringUtils.isNotEmpty(certificationInventoryEO.getReportNumber()) ? certificationInventoryEO.getReportNumber() : "");
 		//产品型号-productModel
-		projectCertificationInventoryEO.setProductModel(certificationInventoryEO.getProductModel());
+		projectCertificationInventoryEO.setProductModel(StringUtils.isNotEmpty(certificationInventoryEO.getProductModel()) ? certificationInventoryEO.getProductModel() : "");
 		//生产企业名称-productionEnterpriseName
-		projectCertificationInventoryEO.setProductionEnterpriseName(certificationInventoryEO.getProductionEnterpriseName());
+		projectCertificationInventoryEO.setProductionEnterpriseName(StringUtils.isNotEmpty(certificationInventoryEO.getProductionEnterpriseName()) ? certificationInventoryEO.getProductionEnterpriseName() : "");
 	}
 //	public void listPlatform(Map<String,Object> params) {
 //		String cut = (String) params.get("cut");//

From a463e4c4a5178898f316a4237f6e824520c38cf7 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 21 Sep 2023 16:36:27 +0800
Subject: [PATCH 113/288] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctCertificationInventoryEOServiceImpl.java | 280 ++++++++++++------
 1 file changed, 187 insertions(+), 93 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index 502bad66f..4a843a973 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -6855,95 +6855,95 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 	 *
 	 * @return
 	 */
-	@Override
-	public void listPlatform(Map<String,Object> params) {
-		String ids = (String) params.get("ids");//认证清单id
-		String projectLibraryIds = (String) params.get("projectLibraryIds");//平台件项目id
-
-		//认证清单数据
-		LambdaQueryWrapper<ProjectCertificationInventoryEO> wrapper = new LambdaQueryWrapper<>();
-		wrapper.in(ProjectCertificationInventoryEO::getId,Arrays.asList(ids.split(",")));
-		List<ProjectCertificationInventoryEO> certificationInventoryEOList = this.list(wrapper);
-
-		//平台件项目对应的认证清单数据
-		LambdaQueryWrapper<ProjectCertificationInventoryEO> wrapper1 = new LambdaQueryWrapper<>();
-		wrapper1.in(ProjectCertificationInventoryEO::getProjectLibraryId,Arrays.asList(projectLibraryIds.split(",")));
-		List<ProjectCertificationInventoryEO> certificationInventoryEOS = this.list(wrapper1);
-
-		if(!certificationInventoryEOS.isEmpty()){
-			//平台件项目信息
-			List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
-			if(!certificationInventoryEOList.isEmpty()){
-				List<String> projectIdList = certificationInventoryEOS.stream().map(ProjectCertificationInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList());
-				LambdaQueryWrapper<ProjectLibraryBase> wrapper2 = new LambdaQueryWrapper<>();
-				wrapper2.in(ProjectLibraryBase::getId,projectIdList);
-				projectLibraryBaseList = projectLibraryBaseService.list(wrapper2);
-			}
-
-			List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
-
-			List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = new ArrayList<>();
-			for (ProjectCertificationInventoryEO projectCertificationInventoryEO : certificationInventoryEOList) {
-				//类别
-				String category = projectCertificationInventoryEO.getCategory();
-				//检验项目
-				String inspectionItem = projectCertificationInventoryEO.getInspectionItem();
-				//配置项
-				String configItem = projectCertificationInventoryEO.getConfigItem();
-				//编号
-				String serialNumber = projectCertificationInventoryEO.getSerialNumber();
-				//责任领域
-				String dutyTerritory = projectCertificationInventoryEO.getDutyTerritory();
-
-				List<ProjectCertificationInventoryEO> result = new ArrayList<>();
-				//如果车型项目库中的配置项为空或为标配时，不去匹配直接关联
-				if(StringUtils.isBlank(configItem) || "标配".equals(configItem)){
-					if(!certificationInventoryEOS.isEmpty()){
-						result = setData(certificationInventoryEOS, projectCertificationInventoryEO);
-					}
-				}else if(StringUtils.isNotBlank(configItem) && !"标配".equals(configItem)){
-					//如果车型项目库中的配置项不为空且不为标配时，如果车型项目库认证清单的配置项与平台件认证清单的配置项不一致，则不再匹配
-					//如果一致，则用类别，检验项目，编号，责任领域去做匹配
-
-					List<ProjectCertificationInventoryEO> projectCertificationInventoryEOS = new ArrayList<>();
-					for (int i = 0; i < certificationInventoryEOS.size(); i++) {
-						int finalI = i;
-						List<ProjectLibraryBase> libraryBaseList = projectLibraryBaseList.stream()
-								.filter(e -> certificationInventoryEOS.get(finalI).getProjectLibraryId().equals(e.getId())).collect(Collectors.toList());
-						//平台件项目库中的认证清单的配置项为平台件项目名称
-						String configItemTemp = "";
-						if(!libraryBaseList.isEmpty()){
-							//配置项
-							configItemTemp = libraryBaseList.get(0).getProjectNameId();
-						}
-						//类别
-						String categoryTemp = certificationInventoryEOS.get(i).getCategory();
-						//检验项目
-						String inspectionItemTemp = certificationInventoryEOS.get(i).getInspectionItem();
-						//编号
-						String serialNumberTemp = certificationInventoryEOS.get(i).getSerialNumber();
-						//责任领域
-						String dutyTerritoryTemp = certificationInventoryEOS.get(i).getDutyTerritory();
-
-						if(configItem.equals(configItemTemp)
-								&& category.equals(categoryTemp)
-								&& inspectionItem.equals(inspectionItemTemp)
-								&& serialNumber.equals(serialNumberTemp)
-								&& dutyTerritory.equals(dutyTerritoryTemp)){
-
-							projectCertificationInventoryEOS.add(certificationInventoryEOS.get(i));
-						}
-					}
-					if(!projectCertificationInventoryEOS.isEmpty()){
-						result = setData(projectCertificationInventoryEOS, projectCertificationInventoryEO);
-					}
-				}
-				if(!result.isEmpty()){
-					this.saveOrUpdateBatch(result);
-				}
-			}
-		}
-	}
+//	@Override
+//	public void listPlatform(Map<String,Object> params) {
+//		String ids = (String) params.get("ids");//认证清单id
+//		String projectLibraryIds = (String) params.get("projectLibraryIds");//平台件项目id
+//
+//		//认证清单数据
+//		LambdaQueryWrapper<ProjectCertificationInventoryEO> wrapper = new LambdaQueryWrapper<>();
+//		wrapper.in(ProjectCertificationInventoryEO::getId,Arrays.asList(ids.split(",")));
+//		List<ProjectCertificationInventoryEO> certificationInventoryEOList = this.list(wrapper);
+//
+//		//平台件项目对应的认证清单数据
+//		LambdaQueryWrapper<ProjectCertificationInventoryEO> wrapper1 = new LambdaQueryWrapper<>();
+//		wrapper1.in(ProjectCertificationInventoryEO::getProjectLibraryId,Arrays.asList(projectLibraryIds.split(",")));
+//		List<ProjectCertificationInventoryEO> certificationInventoryEOS = this.list(wrapper1);
+//
+//		if(!certificationInventoryEOS.isEmpty()){
+//			//平台件项目信息
+//			List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
+//			if(!certificationInventoryEOList.isEmpty()){
+//				List<String> projectIdList = certificationInventoryEOS.stream().map(ProjectCertificationInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList());
+//				LambdaQueryWrapper<ProjectLibraryBase> wrapper2 = new LambdaQueryWrapper<>();
+//				wrapper2.in(ProjectLibraryBase::getId,projectIdList);
+//				projectLibraryBaseList = projectLibraryBaseService.list(wrapper2);
+//			}
+//
+//			List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
+//
+//			List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = new ArrayList<>();
+//			for (ProjectCertificationInventoryEO projectCertificationInventoryEO : certificationInventoryEOList) {
+//				//类别
+//				String category = projectCertificationInventoryEO.getCategory();
+//				//检验项目
+//				String inspectionItem = projectCertificationInventoryEO.getInspectionItem();
+//				//配置项
+//				String configItem = projectCertificationInventoryEO.getConfigItem();
+//				//编号
+//				String serialNumber = projectCertificationInventoryEO.getSerialNumber();
+//				//责任领域
+//				String dutyTerritory = projectCertificationInventoryEO.getDutyTerritory();
+//
+//				List<ProjectCertificationInventoryEO> result = new ArrayList<>();
+//				//如果车型项目库中的配置项为空或为标配时，不去匹配直接关联
+//				if(StringUtils.isBlank(configItem) || "标配".equals(configItem)){
+//					if(!certificationInventoryEOS.isEmpty()){
+//						result = setData(certificationInventoryEOS, projectCertificationInventoryEO);
+//					}
+//				}else if(StringUtils.isNotBlank(configItem) && !"标配".equals(configItem)){
+//					//如果车型项目库中的配置项不为空且不为标配时，如果车型项目库认证清单的配置项与平台件认证清单的配置项不一致，则不再匹配
+//					//如果一致，则用类别，检验项目，编号，责任领域去做匹配
+//
+//					List<ProjectCertificationInventoryEO> projectCertificationInventoryEOS = new ArrayList<>();
+//					for (int i = 0; i < certificationInventoryEOS.size(); i++) {
+//						int finalI = i;
+//						List<ProjectLibraryBase> libraryBaseList = projectLibraryBaseList.stream()
+//								.filter(e -> certificationInventoryEOS.get(finalI).getProjectLibraryId().equals(e.getId())).collect(Collectors.toList());
+//						//平台件项目库中的认证清单的配置项为平台件项目名称
+//						String configItemTemp = "";
+//						if(!libraryBaseList.isEmpty()){
+//							//配置项
+//							configItemTemp = libraryBaseList.get(0).getProjectNameId();
+//						}
+//						//类别
+//						String categoryTemp = certificationInventoryEOS.get(i).getCategory();
+//						//检验项目
+//						String inspectionItemTemp = certificationInventoryEOS.get(i).getInspectionItem();
+//						//编号
+//						String serialNumberTemp = certificationInventoryEOS.get(i).getSerialNumber();
+//						//责任领域
+//						String dutyTerritoryTemp = certificationInventoryEOS.get(i).getDutyTerritory();
+//
+//						if(configItem.equals(configItemTemp)
+//								&& category.equals(categoryTemp)
+//								&& inspectionItem.equals(inspectionItemTemp)
+//								&& serialNumber.equals(serialNumberTemp)
+//								&& dutyTerritory.equals(dutyTerritoryTemp)){
+//
+//							projectCertificationInventoryEOS.add(certificationInventoryEOS.get(i));
+//						}
+//					}
+//					if(!projectCertificationInventoryEOS.isEmpty()){
+//						result = setData(projectCertificationInventoryEOS, projectCertificationInventoryEO);
+//					}
+//				}
+//				if(!result.isEmpty()){
+//					this.saveOrUpdateBatch(result);
+//				}
+//			}
+//		}
+//	}
 
 	private List<ProjectCertificationInventoryEO> setData(List<ProjectCertificationInventoryEO> certificationInventoryEOS,
 						 ProjectCertificationInventoryEO projectCertificationInventoryEO) {
@@ -6984,6 +6984,100 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		//生产企业名称-productionEnterpriseName
 		projectCertificationInventoryEO.setProductionEnterpriseName(StringUtils.isNotEmpty(certificationInventoryEO.getProductionEnterpriseName()) ? certificationInventoryEO.getProductionEnterpriseName() : "");
 	}
+	/**
+	 * 勾选认证清单进行关联平台件
+	 *
+	 * @return
+	 */
+	@Override
+	public void listPlatform(Map<String,Object> params) {
+		String cut = (String) params.get("cut");//
+		String ids = (String) params.get("ids");//认证清单id
+		String projectLibraryIds = (String) params.get("projectLibraryIds");//平台件项目id
+
+		//认证清单数据
+		LambdaQueryWrapper<ProjectCertificationInventoryEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.in(ProjectCertificationInventoryEO::getId,Arrays.asList(ids.split(",")));
+		List<ProjectCertificationInventoryEO> certificationInventoryEOList = this.list(wrapper);
+
+		//平台件项目对应的认证清单数据
+		LambdaQueryWrapper<ProjectCertificationInventoryEO> wrapper1 = new LambdaQueryWrapper<>();
+		wrapper1.in(ProjectCertificationInventoryEO::getProjectLibraryId,Arrays.asList(projectLibraryIds.split(",")));
+		List<ProjectCertificationInventoryEO> certificationInventoryEOS = this.list(wrapper1);
+
+		//平台件项目信息
+		List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
+		if(!certificationInventoryEOList.isEmpty()){
+			List<String> projectIdList = certificationInventoryEOS.stream().map(ProjectCertificationInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList());
+			LambdaQueryWrapper<ProjectLibraryBase> wrapper2 = new LambdaQueryWrapper<>();
+			wrapper2.in(ProjectLibraryBase::getId,projectIdList);
+			projectLibraryBaseList = projectLibraryBaseService.list(wrapper2);
+		}
+
+		List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
+
+		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : certificationInventoryEOList) {
+			//类别
+			String category = projectCertificationInventoryEO.getCategory();
+			//检验项目
+			String inspectionItem = projectCertificationInventoryEO.getInspectionItem();
+			//配置项
+			String configItem = projectCertificationInventoryEO.getConfigItem();
+			//编号
+			String serialNumber = projectCertificationInventoryEO.getSerialNumber();
+			//责任领域
+			String dutyTerritory = projectCertificationInventoryEO.getDutyTerritory();
+
+			for (ProjectCertificationInventoryEO certificationInventoryEO : certificationInventoryEOS) {
+				List<ProjectLibraryBase> libraryBaseList = projectLibraryBaseList.stream()
+						.filter(e -> certificationInventoryEO.getProjectLibraryId().equals(e.getId())).collect(Collectors.toList());
+				//平台件项目库中的认证清单的配置项为平台件项目名称
+				String configItemTemp = "";
+				if(!libraryBaseList.isEmpty()){
+					//配置项
+					configItemTemp = libraryBaseList.get(0).getProjectNameId();
+				}
+				//类别
+				String categoryTemp = certificationInventoryEO.getCategory();
+				//检验项目
+				String inspectionItemTemp = certificationInventoryEO.getInspectionItem();
+				//编号
+				String serialNumberTemp = certificationInventoryEO.getSerialNumber();
+				//责任领域
+				String dutyTerritoryTemp = certificationInventoryEO.getDutyTerritory();
+
+				if(StringUtils.isBlank(configItem) || "标配".equals(configItem)){
+					//如果车型项目库中的配置项为空或为标配时，直接将平台件信息添加到关联表
+					setDataTemp(lawsInventoryPlatformEOS, projectCertificationInventoryEO, certificationInventoryEO);
+				}else if(StringUtils.isNotBlank(configItem) && !"标配".equals(configItem)){
+					//如果车型项目库中的配置项不为空且不为标配时，如果车型项目库认证清单的配置项与平台件认证清单的配置项不一致，则不再匹配
+					//如果一致，则用类别，检验项目，编号，责任领域去做匹配
+					if(configItem.equals(configItemTemp)
+							&& category.equals(categoryTemp)
+							&& inspectionItem.equals(inspectionItemTemp)
+							&& serialNumber.equals(serialNumberTemp)
+							&& dutyTerritory.equals(dutyTerritoryTemp)){
+						setDataTemp(lawsInventoryPlatformEOS, projectCertificationInventoryEO, certificationInventoryEO);
+					}
+				}
+			}
+		}
+		if(!lawsInventoryPlatformEOS.isEmpty()){
+			lawsInventoryPlatformEOService.saveBatch(lawsInventoryPlatformEOS);
+		}
+	}
+
+	private void setDataTemp(List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS,
+							 ProjectCertificationInventoryEO projectCertificationInventoryEO,
+							 ProjectCertificationInventoryEO certificationInventoryEO) {
+		LawsInventoryPlatformEO inventoryPlatformEO = new LawsInventoryPlatformEO();
+		inventoryPlatformEO.setCreateTime(new Date());
+		inventoryPlatformEO.setUpdateTime(new Date());
+		inventoryPlatformEO.setLawsInventoryId(projectCertificationInventoryEO.getId());
+		inventoryPlatformEO.setPlatformLawsInventoryId(certificationInventoryEO.getId());
+		lawsInventoryPlatformEOS.add(inventoryPlatformEO);
+	}
+//	@Override
 //	public void listPlatform(Map<String,Object> params) {
 //		String cut = (String) params.get("cut");//
 //		String ids = (String) params.get("ids");//认证清单id
@@ -7011,8 +7105,6 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 //		List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
 //
 //		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : certificationInventoryEOList) {
-//			Map<String,Object> map = new HashMap<>();
-//			List<ProjectLawsInventoryEO> projectLawsInventoryEOS = new ArrayList<>();
 //			//类别
 //			String category = projectCertificationInventoryEO.getCategory();
 //			//检验项目
@@ -7044,7 +7136,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 //
 //				if(StringUtils.isBlank(configItem) || "标配".equals(configItem)){
 //					//如果车型项目库中的配置项为空或为标配时，直接将平台件信息添加到关联表
-//					setData(lawsInventoryPlatformEOS, projectCertificationInventoryEO, certificationInventoryEO);
+//					setDataTemp(lawsInventoryPlatformEOS, projectCertificationInventoryEO, certificationInventoryEO);
 //				}else if(StringUtils.isNotBlank(configItem) && !"标配".equals(configItem)){
 //					//如果车型项目库中的配置项不为空且不为标配时，如果车型项目库认证清单的配置项与平台件认证清单的配置项不一致，则不再匹配
 //					//如果一致，则用类别，检验项目，编号，责任领域去做匹配
@@ -7053,7 +7145,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 //							&& inspectionItem.equals(inspectionItemTemp)
 //							&& serialNumber.equals(serialNumberTemp)
 //							&& dutyTerritory.equals(dutyTerritoryTemp)){
-//						setData(lawsInventoryPlatformEOS, projectCertificationInventoryEO, certificationInventoryEO);
+//						setDataTemp(lawsInventoryPlatformEOS, projectCertificationInventoryEO, certificationInventoryEO);
 //					}
 //				}
 //			}
@@ -7063,4 +7155,6 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 //		}
 //	}
 
+
+
 }

From c83d0a2a33325eeceb13458fdc892bf6588cb940 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 21 Sep 2023 17:02:45 +0800
Subject: [PATCH 114/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=85=8D=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificationList/components/addModel.vue | 181 +++++++++---------
 .../components/batSetting.vue                 | 104 +++++-----
 .../components/certificationList/index.vue    |  12 +-
 3 files changed, 148 insertions(+), 149 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
index aeb1aa03b..bb67b377b 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
@@ -113,27 +113,48 @@
                 <a-col :span="12">
                   <div class="box-title-text">
                     <div class="title-text">
-                      <span class="Required">*</span>
-                      <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
+                      <span class="Required" v-if="item.deliverableType != '1635545748968783874'">*</span>
+                      <span class="title-text-text" :title="$t('closingDate')">{{$t('closingDate')}}</span>
                     </div>
-                    <a-form-model-item
-                      class="itemModel"
-                      :prop="'dataList.'+index+'.configItem'"
-                      :rules="[{ required: true, message: $t('configurationItem') + $t('cannotEmpty'), trigger: 'blur'},
-                             {max: 300,message: $t('configurationItem') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
-                            }]"
+                    <a-form-model-item class="itemModel"
+                                       :prop="item.deliverableType == '1635545748968783874'?'':'dataList.'+index+'.endTime'"
+                                       :rules="[{ required: item.deliverableType == '1635545748968783874'?false:true, message: $t('closingDate') + $t('cannotEmpty'), trigger: 'change'},]"
                     >
-                      <a-input class="box-input"
-                               v-model.trim="item.configItem"
-                               :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>
-                      <!--                      <j-dict-select-tag class="box-input" v-model="item.configItem"-->
-                      <!--                                         @input="handleInput('dataList.'+index+'.configItem')"-->
-                      <!--                                         :placeholder="$t('PleaseSelect')+$t('configurationItem')"-->
-                      <!--                                         :type="'select'"-->
-                      <!--                                         :triggerChange="false" :dictCode="'ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4'"/>-->
+                      <a-date-picker class="box-input"
+                                     :placeholder="$t('PleaseSelect')+$t('closingDate')"
+                                     @change="dateChange({db_field_name:'endTime'},index)"
+                                     format="YYYY-MM-DD"
+                                     :disabledDate="disabledDate"
+                                     :getCalendarContainer="(trigger) => trigger.parentNode"
+                                     v-model="item.endTime"
+                                     style="width: 100%"/>
                     </a-form-model-item>
                   </div>
                 </a-col>
+<!--                <a-col :span="12">-->
+<!--                  <div class="box-title-text">-->
+<!--                    <div class="title-text">-->
+<!--                      <span class="Required">*</span>-->
+<!--                      <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>-->
+<!--                    </div>-->
+<!--                    <a-form-model-item-->
+<!--                      class="itemModel"-->
+<!--                      :prop="'dataList.'+index+'.configItem'"-->
+<!--                      :rules="[{ required: true, message: $t('configurationItem') + $t('cannotEmpty'), trigger: 'blur'},-->
+<!--                             {max: 300,message: $t('configurationItem') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'-->
+<!--                            }]"-->
+<!--                    >-->
+<!--                      <a-input class="box-input"-->
+<!--                               v-model.trim="item.configItem"-->
+<!--                               :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>-->
+<!--                      &lt;!&ndash;                      <j-dict-select-tag class="box-input" v-model="item.configItem"&ndash;&gt;-->
+<!--                      &lt;!&ndash;                                         @input="handleInput('dataList.'+index+'.configItem')"&ndash;&gt;-->
+<!--                      &lt;!&ndash;                                         :placeholder="$t('PleaseSelect')+$t('configurationItem')"&ndash;&gt;-->
+<!--                      &lt;!&ndash;                                         :type="'select'"&ndash;&gt;-->
+<!--                      &lt;!&ndash;                                         :triggerChange="false" :dictCode="'ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4'"/>&ndash;&gt;-->
+<!--                    </a-form-model-item>-->
+<!--                  </div>-->
+<!--                </a-col>-->
                 <a-col :span="12">
                   <div class="box-title-text">
                     <div class="title-text">
@@ -273,27 +294,7 @@
                     </a-form-model-item>
                   </div>
                 </a-col>
-                <a-col :span="12">
-                  <div class="box-title-text">
-                    <div class="title-text">
-                      <span class="Required" v-if="item.deliverableType != '1635545748968783874'">*</span>
-                      <span class="title-text-text" :title="$t('closingDate')">{{$t('closingDate')}}</span>
-                    </div>
-                    <a-form-model-item class="itemModel"
-                                       :prop="item.deliverableType == '1635545748968783874'?'':'dataList.'+index+'.endTime'"
-                                       :rules="[{ required: item.deliverableType == '1635545748968783874'?false:true, message: $t('closingDate') + $t('cannotEmpty'), trigger: 'change'},]"
-                    >
-                      <a-date-picker class="box-input"
-                                     :placeholder="$t('PleaseSelect')+$t('closingDate')"
-                                     @change="dateChange({db_field_name:'endTime'},index)"
-                                     format="YYYY-MM-DD"
-                                     :disabledDate="disabledDate"
-                                     :getCalendarContainer="(trigger) => trigger.parentNode"
-                                     v-model="item.endTime"
-                                     style="width: 100%"/>
-                    </a-form-model-item>
-                  </div>
-                </a-col>
+
               </a-row>
 
               <!--              <a-row :gutter="24">-->
@@ -358,24 +359,63 @@
               <a-col :span="12">
                 <div class="box-title-text">
                   <div class="title-text">
-                    <span class="Required">*</span>
-                    <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
+                    <span class="Required" v-if="formInline.deliverableType != '1635545748968783874'">*</span>
+                    <span class="title-text-text" :title="$t('personLiable')">{{$t('personLiable')}}</span>
                   </div>
-                  <a-form-model-item
-                    class="itemModel"
-                    :prop="'configItem'"
+                  <a-form-model-item class="itemModel-multi"
+                                     :prop="formInline.deliverableType == '1635545748968783874'?'':'dutyPersonName'"
+                                     :rules="[{ required: formInline.deliverableType=='1635545748968783874'?false:true,
+                                 message: $t('personLiable') + $t('cannotEmpty'), trigger: 'change'}]"
                   >
-                    <a-input class="box-input"
-                             v-model.trim="formInline.configItem"
-                             :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>
-                    <!--                    <j-dict-select-tag class="box-input" v-model="formInline.configItem"-->
-                    <!--                                       @input="handleInput('configItem')"-->
-                    <!--                                       :placeholder="$t('PleaseSelect')+$t('configurationItem')"-->
-                    <!--                                       :type="'select'"-->
-                    <!--                                       :triggerChange="false" :dictCode="'ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4'"/>-->
+                    <PersonnelSelection
+                      :query="{db_field_name:'dutyPerson',db_field_txt:$t('personLiable')}"
+                      :personneQuery="formInline"
+                      :isSingleChoice="true"
+                      v-if="personnelVisible"
+                      @change="PersonnelSelectionChange"
+                      :disabled="disabled"
+                      v-model="formInline.dutyPersonName"/>
                   </a-form-model-item>
                 </div>
               </a-col>
+              <a-col :span="12" v-if="formInline.taskConfirmEndTime">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="title-text-text" :title="$t('taskConfirmEndTime')">{{$t('taskConfirmEndTime')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel">
+                    <a-date-picker class="box-input"
+                                   @change="dateChange({db_field_name:'taskConfirmEndTime'})"
+                                   format="YYYY-MM-DD"
+                                   :disabled="true"
+                                   :disabledDate="disabledDate"
+                                   :getCalendarContainer="(trigger) => trigger.parentNode"
+                                   v-model="formInline.taskConfirmEndTime"
+                                   style="width: 100%"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+<!--              <a-col :span="12">-->
+<!--                <div class="box-title-text">-->
+<!--                  <div class="title-text">-->
+<!--                    <span class="Required">*</span>-->
+<!--                    <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>-->
+<!--                  </div>-->
+<!--                  <a-form-model-item-->
+<!--                    class="itemModel"-->
+<!--                    :prop="'configItem'"-->
+<!--                  >-->
+<!--                    <a-input class="box-input"-->
+<!--                             v-model.trim="formInline.configItem"-->
+<!--                             :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>-->
+<!--                    &lt;!&ndash;                    <j-dict-select-tag class="box-input" v-model="formInline.configItem"&ndash;&gt;-->
+<!--                    &lt;!&ndash;                                       @input="handleInput('configItem')"&ndash;&gt;-->
+<!--                    &lt;!&ndash;                                       :placeholder="$t('PleaseSelect')+$t('configurationItem')"&ndash;&gt;-->
+<!--                    &lt;!&ndash;                                       :type="'select'"&ndash;&gt;-->
+<!--                    &lt;!&ndash;                                       :triggerChange="false" :dictCode="'ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4'"/>&ndash;&gt;-->
+<!--                  </a-form-model-item>-->
+<!--                </div>-->
+<!--              </a-col>-->
               <a-col :span="12">
                 <div class="box-title-text">
                   <div class="title-text">
@@ -528,28 +568,6 @@
                   </a-form-model-item>
                 </div>
               </a-col>
-              <a-col :span="12">
-                <div class="box-title-text">
-                  <div class="title-text">
-                    <span class="Required" v-if="formInline.deliverableType != '1635545748968783874'">*</span>
-                    <span class="title-text-text" :title="$t('personLiable')">{{$t('personLiable')}}</span>
-                  </div>
-                  <a-form-model-item class="itemModel-multi"
-                                     :prop="formInline.deliverableType == '1635545748968783874'?'':'dutyPersonName'"
-                                     :rules="[{ required: formInline.deliverableType=='1635545748968783874'?false:true,
-                                 message: $t('personLiable') + $t('cannotEmpty'), trigger: 'change'}]"
-                  >
-                    <PersonnelSelection
-                      :query="{db_field_name:'dutyPerson',db_field_txt:$t('personLiable')}"
-                      :personneQuery="formInline"
-                      :isSingleChoice="true"
-                      v-if="personnelVisible"
-                      @change="PersonnelSelectionChange"
-                      :disabled="disabled"
-                      v-model="formInline.dutyPersonName"/>
-                  </a-form-model-item>
-                </div>
-              </a-col>
             </a-row>
             <a-row :gutter="24">
               <a-col :span="12">
@@ -593,25 +611,6 @@
                 </div>
               </a-col>
             </a-row>
-            <a-row :gutter="24">
-              <a-col :span="12" v-if="formInline.taskConfirmEndTime">
-                <div class="box-title-text">
-                  <div class="title-text">
-                    <span class="title-text-text" :title="$t('taskConfirmEndTime')">{{$t('taskConfirmEndTime')}}</span>
-                  </div>
-                  <a-form-model-item class="itemModel">
-                    <a-date-picker class="box-input"
-                                   @change="dateChange({db_field_name:'taskConfirmEndTime'})"
-                                   format="YYYY-MM-DD"
-                                   :disabled="true"
-                                   :disabledDate="disabledDate"
-                                   :getCalendarContainer="(trigger) => trigger.parentNode"
-                                   v-model="formInline.taskConfirmEndTime"
-                                   style="width: 100%"/>
-                  </a-form-model-item>
-                </div>
-              </a-col>
-            </a-row>
           </div>
         </a-form-model>
       </a-spin>
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue
index e50c44aad..f768e4616 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue
@@ -9,58 +9,6 @@
     @cancel="handleCancel"
   >
     <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
-      <a-row :gutter="24">
-        <a-col :span="name == $t('changeSetting') ? 24 : 12"
-               v-if="name == $t('BatchSetting') || name == $t('changeSetting')">
-          <div class="box-title-text">
-            <div class="title-text">
-              <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
-            </div>
-            <a-form-model-item class="itemModel">
-              <a-input class="box-input"
-                       v-model.trim="formInline.configItem"
-                       :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>
-
-              <!--              <j-dict-select-tag class="box-input" v-model="formInline.configItem"-->
-              <!--                                 @input="handleInput('configItem')"-->
-              <!--                                 :placeholder="$t('PleaseSelect')+$t('configurationItem')"-->
-              <!--                                 :type="'select'"-->
-              <!--                                 :triggerChange="false" :dictCode="'ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4'"/>-->
-            </a-form-model-item>
-          </div>
-        </a-col>
-        <a-col :span="12">
-          <div class="box-title-text">
-            <div class="title-text">
-              <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
-            </div>
-            <a-form-model-item class="itemModel">
-<!--              <a-select :placeholder="$t('cannotSetResponsibilityAreas')"-->
-<!--                        class="box-input"-->
-<!--                        allowClear-->
-<!--                        optionFilterProp="label"-->
-<!--                        :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
-<!--                        v-model="formInline.sdt">-->
-<!--                <a-select-option v-for="(item, key) in engineeringInterfacePersonList"-->
-<!--                                 :key="item.key"-->
-<!--                                 :label="item.name"-->
-<!--                                 :value="item.value">-->
-<!--                     <span style="display: inline-block;width: 100%" :title=" item.name ">-->
-<!--                           {{ item.name }}-->
-<!--                     </span>-->
-<!--                </a-select-option>-->
-<!--              </a-select>-->
-              <PersonnelSelection :query="{db_field_name:'sdt',db_field_txt:$t('engineeringInterfacePerson')}"
-                                  :isSingleChoice="true"
-                                  :personneQuery="formInline"
-                                  v-if="visible"
-                                  @change="PersonnelSelectionChange"
-                                  v-model="formInline.sdt"/>
-            </a-form-model-item>
-          </div>
-        </a-col>
-
-      </a-row>
       <a-row :gutter="24" v-if="name == $t('BatchSetting')">
         <a-col :span="12">
           <div class="box-title-text">
@@ -179,6 +127,58 @@
           </div>
         </a-col>
       </a-row>
+      <a-row :gutter="24">
+        <!--        <a-col :span="name == $t('changeSetting') ? 24 : 12"-->
+        <!--               v-if="name == $t('BatchSetting') || name == $t('changeSetting')">-->
+        <!--          <div class="box-title-text">-->
+        <!--            <div class="title-text">-->
+        <!--              <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>-->
+        <!--            </div>-->
+        <!--            <a-form-model-item class="itemModel">-->
+        <!--              <a-input class="box-input"-->
+        <!--                       v-model.trim="formInline.configItem"-->
+        <!--                       :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>-->
+
+        <!--              &lt;!&ndash;              <j-dict-select-tag class="box-input" v-model="formInline.configItem"&ndash;&gt;-->
+        <!--              &lt;!&ndash;                                 @input="handleInput('configItem')"&ndash;&gt;-->
+        <!--              &lt;!&ndash;                                 :placeholder="$t('PleaseSelect')+$t('configurationItem')"&ndash;&gt;-->
+        <!--              &lt;!&ndash;                                 :type="'select'"&ndash;&gt;-->
+        <!--              &lt;!&ndash;                                 :triggerChange="false" :dictCode="'ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4'"/>&ndash;&gt;-->
+        <!--            </a-form-model-item>-->
+        <!--          </div>-->
+        <!--        </a-col>-->
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <!--              <a-select :placeholder="$t('cannotSetResponsibilityAreas')"-->
+              <!--                        class="box-input"-->
+              <!--                        allowClear-->
+              <!--                        optionFilterProp="label"-->
+              <!--                        :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+              <!--                        v-model="formInline.sdt">-->
+              <!--                <a-select-option v-for="(item, key) in engineeringInterfacePersonList"-->
+              <!--                                 :key="item.key"-->
+              <!--                                 :label="item.name"-->
+              <!--                                 :value="item.value">-->
+              <!--                     <span style="display: inline-block;width: 100%" :title=" item.name ">-->
+              <!--                           {{ item.name }}-->
+              <!--                     </span>-->
+              <!--                </a-select-option>-->
+              <!--              </a-select>-->
+              <PersonnelSelection :query="{db_field_name:'sdt',db_field_txt:$t('engineeringInterfacePerson')}"
+                                  :isSingleChoice="true"
+                                  :personneQuery="formInline"
+                                  v-if="visible"
+                                  @change="PersonnelSelectionChange"
+                                  v-model="formInline.sdt"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+
+      </a-row>
       <a-row :gutter="24" v-if="name == $t('BatchSetting') && roleSwitchingCode == 2">
         <a-col :span="24">
           <div class="box-title-text">
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
index 78e18618d..b66b269b0 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
@@ -167,12 +167,12 @@
                 {{ $t('add') }}
               </div>
               <!--              添加配置-->
-              <div @click="addConfigurationClick"
-                   v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2"
-                   class="operator-text-title">
-                <a-icon type="plus"/>
-                {{ $t('addConfiguration') }}
-              </div>
+<!--              <div @click="addConfigurationClick"-->
+<!--                   v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2"-->
+<!--                   class="operator-text-title">-->
+<!--                <a-icon type="plus"/>-->
+<!--                {{ $t('addConfiguration') }}-->
+<!--              </div>-->
               <!--              模板下载-->
               <div @click="handleModule"
                    v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2"

From 00552ddbe36a84db782a432bfd052bd333ae64be Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 21 Sep 2023 17:29:02 +0800
Subject: [PATCH 115/288] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5-=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E4=BB=B6=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctCertificationInventoryEOServiceImpl.java | 41 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index 4a843a973..1cc9b7208 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -1924,11 +1924,49 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			}
 		}
 		IPage<ProjectCertificationInventoryEO> pageList = this.page(page, queryWrapper);
+		//平台件数据处理
+		platformDispose(projectCertificationInventoryEO, pageList.getRecords());
+
+
+
 		this.disposeData(pageList.getRecords(),cut);
 		List<ProjectCertificationInventoryEO> records = this.hearSort(projectCertificationInventoryEO, pageList.getRecords());
 		pageList.setRecords(records);
 		return pageList;
 	}
+	private void platformDispose(ProjectCertificationInventoryEO projectCertificationInventoryEO, List<ProjectCertificationInventoryEO> result) {
+		List<LawsInventoryPlatformEO> lawsInventoryPlatformEOList = new ArrayList<>();
+		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOS = new ArrayList<>();
+
+		if(!result.isEmpty()){
+			//认证清单ID
+			List<String> certificationInventoryIdList = result.stream().map(ProjectCertificationInventoryEO::getId).collect(Collectors.toList());
+			LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();
+			wrapper.in(LawsInventoryPlatformEO::getLawsInventoryId,certificationInventoryIdList);
+			lawsInventoryPlatformEOList = lawsInventoryPlatformEOService.list(wrapper);
+			if(!lawsInventoryPlatformEOList.isEmpty()){
+				List<String> collect = lawsInventoryPlatformEOList.stream().map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).distinct().collect(Collectors.toList());
+				LambdaQueryWrapper<ProjectCertificationInventoryEO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+				lambdaQueryWrapper.in(ProjectCertificationInventoryEO::getId,collect);
+				projectCertificationInventoryEOS = this.list(lambdaQueryWrapper);//平台件清单
+			}
+		}
+		for (ProjectCertificationInventoryEO certificationInventoryEO : result) {
+			if(!projectCertificationInventoryEOS.isEmpty()){
+				List<LawsInventoryPlatformEO> inventoryPlatformEOList = lawsInventoryPlatformEOList.stream()
+						.filter(e -> certificationInventoryEO.getId().equals(e.getLawsInventoryId())).collect(Collectors.toList());
+				if(!inventoryPlatformEOList.isEmpty()){
+					List<String> idList = inventoryPlatformEOList.stream()
+							.map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).collect(Collectors.toList());
+					List<ProjectCertificationInventoryEO> certificationInventoryEOS = projectCertificationInventoryEOS.stream()
+							.filter(e -> idList.contains(e.getId())).collect(Collectors.toList());
+					if(!certificationInventoryEOS.isEmpty()){
+						setProjectCertificationInventoryEO(certificationInventoryEOS.get(0),certificationInventoryEO);
+					}
+				}
+			}
+		}
+	}
 
 	/**
 	 * 表头排序
@@ -6966,7 +7004,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		return projectCertificationInventoryEOS;
 	}
 
-	private void setProjectCertificationInventoryEO(ProjectCertificationInventoryEO certificationInventoryEO, ProjectCertificationInventoryEO projectCertificationInventoryEO) {
+	private void setProjectCertificationInventoryEO(ProjectCertificationInventoryEO certificationInventoryEO,
+													ProjectCertificationInventoryEO projectCertificationInventoryEO) {
 		//交付物模板-deliverableTemplate
 		projectCertificationInventoryEO.setDeliverableTemplate(StringUtils.isNotEmpty(certificationInventoryEO.getDeliverableTemplate()) ? certificationInventoryEO.getDeliverableTemplate() : "");
 		//交付物类型-deliverableType

From 251453b33fc41a1031aa118521845c982d0d8ba3 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 21 Sep 2023 18:22:38 +0800
Subject: [PATCH 116/288] =?UTF-8?q?=E7=83=AD=E8=AE=A4=E8=AF=81=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctCertificationInventoryEOServiceImpl.java | 32 +++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index 1cc9b7208..27ab0fb30 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -7055,6 +7055,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 
 		List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
 
+		List<ProjectCertificationInventoryEO> result = new ArrayList<>();
+
 		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : certificationInventoryEOList) {
 			//类别
 			String category = projectCertificationInventoryEO.getCategory();
@@ -7067,6 +7069,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			//责任领域
 			String dutyTerritory = projectCertificationInventoryEO.getDutyTerritory();
 
+			List<LawsInventoryPlatformEO> lawsInventoryPlatformEOList = new ArrayList<>();
+			List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = new ArrayList<>();
+
 			for (ProjectCertificationInventoryEO certificationInventoryEO : certificationInventoryEOS) {
 				List<ProjectLibraryBase> libraryBaseList = projectLibraryBaseList.stream()
 						.filter(e -> certificationInventoryEO.getProjectLibraryId().equals(e.getId())).collect(Collectors.toList());
@@ -7087,7 +7092,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 
 				if(StringUtils.isBlank(configItem) || "标配".equals(configItem)){
 					//如果车型项目库中的配置项为空或为标配时，直接将平台件信息添加到关联表
-					setDataTemp(lawsInventoryPlatformEOS, projectCertificationInventoryEO, certificationInventoryEO);
+					projectCertificationInventoryEOList.add(certificationInventoryEO);
+
 				}else if(StringUtils.isNotBlank(configItem) && !"标配".equals(configItem)){
 					//如果车型项目库中的配置项不为空且不为标配时，如果车型项目库认证清单的配置项与平台件认证清单的配置项不一致，则不再匹配
 					//如果一致，则用类别，检验项目，编号，责任领域去做匹配
@@ -7096,10 +7102,32 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 							&& inspectionItem.equals(inspectionItemTemp)
 							&& serialNumber.equals(serialNumberTemp)
 							&& dutyTerritory.equals(dutyTerritoryTemp)){
-						setDataTemp(lawsInventoryPlatformEOS, projectCertificationInventoryEO, certificationInventoryEO);
+						projectCertificationInventoryEOList.add(certificationInventoryEO);
 					}
 				}
 			}
+
+			if(!projectCertificationInventoryEOList.isEmpty()){
+				setDataTemp(lawsInventoryPlatformEOS, projectCertificationInventoryEO, projectCertificationInventoryEOList.get(0));
+				if(projectCertificationInventoryEOList.size() > 1){
+					//往认证清单表中添加projectCertificationInventoryEOList.size()-1条数据
+					List<ProjectCertificationInventoryEO> list = new ArrayList<>();
+					for (int i = 1; i < projectCertificationInventoryEOList.size(); i++) {
+						ProjectCertificationInventoryEO projectCertificationInventoryEOTemp = new ProjectCertificationInventoryEO();
+						BeanUtils.copyProperties(projectCertificationInventoryEO,projectCertificationInventoryEOTemp);
+						projectCertificationInventoryEOTemp.setId(UUID.randomUUID().toString().replace("-", ""));
+						list.add(projectCertificationInventoryEOTemp);
+
+						setDataTemp(lawsInventoryPlatformEOS, projectCertificationInventoryEOTemp, projectCertificationInventoryEOList.get(i));
+					}
+					if(!list.isEmpty()){
+						result.addAll(list);
+					}
+				}
+			}
+		}
+		if(!result.isEmpty()){
+			this.saveBatch(result);
 		}
 		if(!lawsInventoryPlatformEOS.isEmpty()){
 			lawsInventoryPlatformEOService.saveBatch(lawsInventoryPlatformEOS);

From 0852e87c23c244069866ed94fc87479548462f02 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 21 Sep 2023 18:43:02 +0800
Subject: [PATCH 117/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/service/impl/ProjectLibraryBaseServiceImpl.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 4709f34b9..2f55167ee 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -1309,7 +1309,10 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 			//serialNumber dutyTerritory
 			String serialNumber = projectLawsInventoryEO.getSerialNumber();
 			String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
-			String subtitle = projectLawsInventoryEO.getSubtitle();
+			String subtitle = "";
+			if(StringUtils.isNotBlank(projectLawsInventoryEO.getSubtitle())){
+				subtitle = projectLawsInventoryEO.getSubtitle();
+			}
 
 			//责任领域
 			List<String> list = new LinkedList<>();

From d4c4f2305ad9178ebb205982583b2ca47305a855 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 21 Sep 2023 19:25:27 +0800
Subject: [PATCH 118/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=85=B3=E8=81=94=E4=BA=86=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E4=BB=B6=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=B5=81=E7=A8=8B=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=8C=89=E5=B9=B3=E5=8F=B0=E4=BB=B6=E4=B8=AD=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E7=9A=84=E9=A1=BA=E5=BA=8F=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/project/enums/FlowStateEnum.java  | 66 +++++++++++++++++++
 .../ProjectLawsInventoryEOServiceImpl.java    | 31 +++++++--
 2 files changed, 91 insertions(+), 6 deletions(-)
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java
new file mode 100644
index 000000000..2425ed44d
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java
@@ -0,0 +1,66 @@
+package com.jero.modules.project.enums;
+
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * 消息类型枚举类
+ */
+public enum FlowStateEnum {
+    INCONFORMITY("不符合","Non-Compliance","Non-Compliance"),
+    TO_TRACK("待追踪","To be tracked","To be tracked"),
+    CONFORMITY("符合","Compliance","Compliance"),
+    UNINVOLVED("不涉及","NA","NA"),
+    LIST_TO_BE_RELEASED("清单待发布","List to be released","List to be released"),
+    LIST_TO_BE_CHECKED("任务待发起","Task to be initiated","List to be checked"),
+    REGULATORY_ENGINEER_RETURNS("法规工程师退回","Regulatory engineer returns","Regulatory engineer returns"),
+    REFUSAL_OF_RESPONSIBLE_PERSON("责任人拒绝","Refusal of responsible person","Refusal of responsible person"),
+    TASK_TO_BE_CONFIRMED("任务待确认","Task to be confirmed","Task to be confirmed"),
+    RESULTS_TO_BE_SUBMITTED("结果待提交","Results to be submitted","Results to be submitted"),
+    RESULTS_TO_BE_REVIEWED("结果待审查","Results to be reviewed","Results to be reviewed"),
+
+    ;
+
+    String nameCn;
+    String nameEn;
+    String value;
+
+    private FlowStateEnum(String nameCn, String nameEn, String value) {
+        this.nameCn = nameCn;
+        this.nameEn = nameEn;
+        this.value = value;
+    }
+
+    public String getNameCn() {
+        return nameCn;
+    }
+
+    public void setNameCn(String nameCn) {
+        this.nameCn = nameCn;
+    }
+
+    public String getNameEn() {
+        return nameEn;
+    }
+
+    public void setNameEn(String nameEn) {
+        this.nameEn = nameEn;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public static List<String> getValueInfo() {
+        List<String> result = new LinkedList<>();
+        FlowStateEnum[] values = values();
+        for (FlowStateEnum flowStateEnum : values) {
+            result.add(flowStateEnum.getValue());
+        }
+        return result;
+    }
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index ca601940e..e07916a03 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -11735,6 +11735,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 	}
 
 	private void platformDispose(ProjectLawsInventoryEO projectLawsInventoryEO, List<ProjectLawsInventoryEO> result) {
+		List<String> valueList = FlowStateEnum.getValueInfo();
 		List<LawsInventoryPlatformEO> lawsInventoryPlatformEOList = new ArrayList<>();
 		List<ProjectLawsInventoryEO> projectLawsInventoryEOS = new ArrayList<>();
 
@@ -11756,8 +11757,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					inventoryIdList = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList());
 					List<String> collect1 = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getDesignDutyId).distinct().collect(Collectors.toList());
 					List<String> collect2 = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getVerifyDutyId).distinct().collect(Collectors.toList());
-					List<String> collect3 = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getDesignDeliverableTemplate).distinct().collect(Collectors.toList());
-					List<String> collect4 = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getVerifyDeliverableTemplate).distinct().collect(Collectors.toList());
+					List<String> collect3 = projectLawsInventoryEOS.stream().filter(e->StringUtils.isNotBlank(e.getDesignDeliverableTemplate())).map(ProjectLawsInventoryEO::getDesignDeliverableTemplate).distinct().collect(Collectors.toList());
+					List<String> collect4 = projectLawsInventoryEOS.stream().filter(e->StringUtils.isNotBlank(e.getVerifyDeliverableTemplate())).map(ProjectLawsInventoryEO::getVerifyDeliverableTemplate).distinct().collect(Collectors.toList());
 					if(!collect1.isEmpty()){
 						userIdList.addAll(collect1);
 					}
@@ -11798,6 +11799,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 							.map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).collect(Collectors.toList());
 					List<ProjectLawsInventoryEO> lawsInventoryEOS = projectLawsInventoryEOS.stream()
 							.filter(e -> idList.contains(e.getId())).collect(Collectors.toList());
+					if(ObjectUtils.isNotEmpty(lawsInventoryEOS)){
+						for (String value : valueList) {
+							List<ProjectLawsInventoryEO> collect = lawsInventoryEOS.stream()
+									.filter(e -> value.equals(e.getDesignFlowStatus())).collect(Collectors.toList());
+							if(ObjectUtils.isNotEmpty(collect)){
+								lawsInventoryEO.setDesignFlowStatus(value);
+								break;
+							}
+						}
+						for (String value : valueList) {
+							List<ProjectLawsInventoryEO> collect = lawsInventoryEOS.stream()
+									.filter(e -> value.equals(e.getVerifyFlowStatus())).collect(Collectors.toList());
+							if(ObjectUtils.isNotEmpty(collect)){
+								lawsInventoryEO.setVerifyFlowStatus(value);
+								break;
+							}
+						}
+					}
 					lawsInventoryEO.setProjectLawsInventoryEOS(lawsInventoryEOS);
 					if(!lawsInventoryEOS.isEmpty()){
 						projectLawsInventoryEOList.addAll(lawsInventoryEOS);
@@ -11892,7 +11911,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			List<ProjectLibraryBase> libraryBaseList = projectLibraryBaseService.list(wrapper);
 			for (ProjectLawsInventoryEO lawsInventoryEO : result) {
 				List<ProjectLawsInventoryEO> lawsInventoryEOS = lawsInventoryEO.getProjectLawsInventoryEOS();
-				if(!lawsInventoryEOS.isEmpty()){
+				if(ObjectUtils.isNotEmpty(lawsInventoryEOS)){
 					for (ProjectLawsInventoryEO inventoryEO : lawsInventoryEOS) {
 						List<ProjectLibraryBase> collect = libraryBaseList.stream().filter(e -> inventoryEO.getProjectLibraryId().equals(e.getId())).collect(Collectors.toList());
 						if(!collect.isEmpty()){
@@ -11904,11 +11923,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			//平台件信息默认按项目名称正序排序
 			for (ProjectLawsInventoryEO lawsInventoryEO : result) {
 				List<ProjectLawsInventoryEO> nventoryEOList = lawsInventoryEO.getProjectLawsInventoryEOS();
-				if(!nventoryEOList.isEmpty()){
+				if(ObjectUtils.isNotEmpty(nventoryEOList)){
 					Collator comparator = Collator.getInstance(Locale.CHINESE);
 					Collections.sort(nventoryEOList,(e1,e2)->{
-						String e1ProjectName = StringUtils.isNotBlank(e1.getProjectName()) ? e1.getAttestationType() : "";
-						String e2ProjectName = StringUtils.isNotBlank(e2.getProjectName()) ? e2.getAttestationType() : "";
+						String e1ProjectName = StringUtils.isNotBlank(e1.getProjectName()) ? e1.getProjectName() : "";
+						String e2ProjectName = StringUtils.isNotBlank(e2.getProjectName()) ? e2.getProjectName() : "";
 						return comparator.compare(e1ProjectName,e2ProjectName);
 					});
 					lawsInventoryEO.setProjectLawsInventoryEOS(nventoryEOList);

From f5eb3befc6114feca0917c5cbb3123b4f65e9677 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 21 Sep 2023 20:37:48 +0800
Subject: [PATCH 119/288] =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9F=A5=E7=9C=8B=E6=B5=81=E7=A8=8B=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=EF=BC=88=E5=B9=B3=E5=8F=B0=E4=BB=B6=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...PhoneProjectLawsInventoryEOController.java |  13 ++
 .../IProjectLawsInventoryEOService.java       |   3 +-
 .../ProjectLawsInventoryEOServiceImpl.java    | 128 ++++++++++++++++++
 3 files changed, 143 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/PhoneProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/PhoneProjectLawsInventoryEOController.java
index 9ec966ed0..2f178b654 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/PhoneProjectLawsInventoryEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/PhoneProjectLawsInventoryEOController.java
@@ -561,4 +561,17 @@ public class PhoneProjectLawsInventoryEOController extends JeroController<Projec
 	public Result<?> finalizationVerify(@RequestParam Map<String,Object> params){
 		return this.projectLawsInventoryEOService.finalizationVerify(params);
 	}
+
+	/**
+	 * 点击流程状态查看流程详情（平台件）
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "点击流程状态查看流程详情（平台件）")
+	@ApiOperation(value="点击流程状态查看流程详情（平台件）", notes="点击流程状态查看流程详情（平台件）")
+	@GetMapping(value = "/queryPlatformList")
+	public Result<List<ProjectLawsInventoryEO>> queryPlatformList(String lawsInventoryId,String flowFlag,String cut) {
+		List<ProjectLawsInventoryEO> list = projectLawsInventoryEOService.queryPlatformList(lawsInventoryId,flowFlag,cut);
+		return Result.OK(list);
+	}
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java
index d6280ef2a..2f2687e23 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java
@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.itextpdf.text.DocumentException;
 import com.jero.common.api.vo.Result;
 import com.jero.common.constant.enums.MessageTypeEnum;
-import com.jero.common.system.vo.DictModel;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.feishu.vo.FeishuMsgVo;
 import com.jero.modules.project.entity.ProjectLawsInventoryEO;
@@ -323,4 +322,6 @@ public interface IProjectLawsInventoryEOService extends IService<ProjectLawsInve
 	 */
     void replacementUser(JSONObject json);
 	int checkUserRole(String projectLibraryId, String currentUserId, String lawsInventoryId);
+
+	List<ProjectLawsInventoryEO> queryPlatformList(String lawsInventoryId,String flowFlag,String cut);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index e07916a03..70d4fdedd 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -12176,4 +12176,132 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		return result;
 	}
 
+	public List<ProjectLawsInventoryEO> queryPlatformList(String lawsInventoryId,String flowFlag,String cut){
+		if(StringUtils.isBlank(lawsInventoryId) || StringUtils.isBlank(flowFlag)){
+			return new ArrayList<>();
+		}
+		List<SysDictItem> sysDictItems = this.sysDictItemServiceImpl.selectItemsAll();
+		List<SysCategory> categoryList = sysCategoryService.list();
+
+		LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(LawsInventoryPlatformEO::getLawsInventoryId,lawsInventoryId);
+		List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = lawsInventoryPlatformEOService.list(wrapper);
+		List<String> idList = new ArrayList<>();
+		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = new ArrayList<>();
+		if(ObjectUtils.isNotEmpty(lawsInventoryPlatformEOS)){
+			idList = lawsInventoryPlatformEOS.stream().map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).collect(Collectors.toList());
+			projectLawsInventoryEOList = this.listByIds(idList);
+			List<String> userIdList = new ArrayList<>();
+			List<String> collect1 = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getDesignDutyId).distinct().collect(Collectors.toList());
+			List<String> collect2 = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getVerifyDutyId).distinct().collect(Collectors.toList());
+			if(ObjectUtils.isNotEmpty(collect1)){
+				userIdList.addAll(collect1);
+			}
+			if(ObjectUtils.isNotEmpty(collect2)){
+				userIdList.addAll(collect2);
+			}
+
+			List<String> fileIdList = new ArrayList<>();
+			List<String> collect3 = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getDesignDeliverableTemplate).distinct().collect(Collectors.toList());
+			List<String> collect4 = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getVerifyDeliverableTemplate).distinct().collect(Collectors.toList());
+			if(ObjectUtils.isNotEmpty(collect3)){
+				fileIdList.addAll(collect3);
+			}
+			if(ObjectUtils.isNotEmpty(collect4)){
+				fileIdList.addAll(collect4);
+			}
+
+			List<SysUser> sysUsers = new ArrayList<>();
+			if (CollectionUtils.isNotEmpty(userIdList)) {
+				userIdList = userIdList.stream().distinct().collect(Collectors.toList());
+				QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
+				sysUserQueryWrapper.lambda().in(SysUser::getId, userIdList);
+				sysUsers = sysUserMapper.selectList(sysUserQueryWrapper);
+			}
+
+			List<OSSFile> fileInfos = new ArrayList<>();
+			if (fileIdList.size() != 0) {
+				fileInfos = iOSSFileService.getFileInfos(StringUtils.join(fileIdList, ","));
+			}
+
+			for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOList) {
+				//流程状态
+				String flowStatus = "";
+				if("design".equals(flowFlag)){
+					flowStatus = projectLawsInventoryEO.getDesignFlowStatus();
+				}else{
+					flowStatus = projectLawsInventoryEO.getVerifyFlowStatus();
+				}
+				if (StringUtils.isNotEmpty(flowStatus)) {
+					String designFlowStatusName = ComplianceFlowStatusEnum.getTextByValue(flowStatus, cut);
+					projectLawsInventoryEO.setDesignFlowStatusName(designFlowStatusName);
+				}
+
+				//发起人.
+//				if("design".equals(flowFlag)){
+//					projectLawsInventoryEO.get
+//				}else{
+//
+//				}
+				//责任人
+				String dutyId = "";
+				if("design".equals(flowFlag)){
+					dutyId = projectLawsInventoryEO.getDesignDutyId();
+				}else{
+					dutyId = projectLawsInventoryEO.getVerifyDutyId();
+				}
+				if (StringUtils.isNotEmpty(dutyId)) {
+					String finalDutyId = dutyId;
+					String designDutyName = sysUsers.stream().filter(e -> finalDutyId.equals(e.getId())).
+							map(SysUser::getUsername).collect(Collectors.joining(","));
+					projectLawsInventoryEO.setDesignDutyIdName(designDutyName);
+				} else {
+					projectLawsInventoryEO.setDesignDutyIdName("");
+				}
+
+				//交付物模板
+				String deliverableTemplate = "";
+				if("design".equals(flowFlag)){
+					deliverableTemplate = projectLawsInventoryEO.getDesignDeliverableTemplate();
+				}else{
+					deliverableTemplate = projectLawsInventoryEO.getVerifyDeliverableTemplate();
+				}
+				if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())) {
+					String fileName = this.editService.getFileName(projectLawsInventoryEO, fileInfos, projectLawsInventoryEO.getDesignDeliverableTemplate());
+					if (org.apache.commons.lang3.StringUtils.isNotBlank(fileName)) {
+						projectLawsInventoryEO.setDesignDeliverableTemplateName(fileName);
+					}
+				}
+				//交付物类型
+				String deliverableType = "";
+				if("design".equals(flowFlag)){
+					deliverableType = projectLawsInventoryEO.getDesignDeliverableType();
+				}else{
+					deliverableType = projectLawsInventoryEO.getVerifyDeliverableType();
+				}
+				if (StringUtils.isNotBlank(deliverableType)) {
+					List<String> designDeliverableTypeList = Arrays.asList(deliverableType.split(","));
+					String name = getTreeName(cut, categoryList, designDeliverableTypeList);
+					projectLawsInventoryEO.setDesignDeliverableTypeName(name);
+				}
+
+				//责任领域
+				String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
+				if (StringUtils.isNotEmpty(dutyTerritory)) {
+					String dutyTerritory_dictText = disposeShowDictItemValue(sysDictItems, dutyTerritory, cut, ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
+					projectLawsInventoryEO.setDutyTerritory_dictText(dutyTerritory_dictText);
+				}
+				//交付物说明
+				String remark = "";
+				if("design".equals(flowFlag)){
+					remark = projectLawsInventoryEO.getDesignRemark();
+				}else{
+					remark = projectLawsInventoryEO.getVerifyRemark();
+				}
+			}
+		}
+		return projectLawsInventoryEOList;
+	}
+
+
 }

From df2101cdfd5d7b89a650e0ac9490fe7cace93f97 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 21 Sep 2023 20:44:37 +0800
Subject: [PATCH 120/288] =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9F=A5=E7=9C=8B=E6=B5=81=E7=A8=8B=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=EF=BC=88=E5=B9=B3=E5=8F=B0=E4=BB=B6=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...PhoneProjectLawsInventoryEOController.java | 13 +-----
 .../ProjectLawsInventoryEOController.java     | 12 +++++
 .../modules/project/enums/FlowFlagEnum.java   | 45 +++++++++++++++++++
 .../ProjectLawsInventoryEOServiceImpl.java    |  4 +-
 4 files changed, 60 insertions(+), 14 deletions(-)
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowFlagEnum.java

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/PhoneProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/PhoneProjectLawsInventoryEOController.java
index 2f178b654..3506c9e7a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/PhoneProjectLawsInventoryEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/PhoneProjectLawsInventoryEOController.java
@@ -562,16 +562,5 @@ public class PhoneProjectLawsInventoryEOController extends JeroController<Projec
 		return this.projectLawsInventoryEOService.finalizationVerify(params);
 	}
 
-	/**
-	 * 点击流程状态查看流程详情（平台件）
-	 *
-	 * @return
-	 */
-	@AutoLog(value = "点击流程状态查看流程详情（平台件）")
-	@ApiOperation(value="点击流程状态查看流程详情（平台件）", notes="点击流程状态查看流程详情（平台件）")
-	@GetMapping(value = "/queryPlatformList")
-	public Result<List<ProjectLawsInventoryEO>> queryPlatformList(String lawsInventoryId,String flowFlag,String cut) {
-		List<ProjectLawsInventoryEO> list = projectLawsInventoryEOService.queryPlatformList(lawsInventoryId,flowFlag,cut);
-		return Result.OK(list);
-	}
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java
index 66ab3f348..e96cef2cc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java
@@ -575,4 +575,16 @@ public class ProjectLawsInventoryEOController extends JeroController<ProjectLaws
 	public Result<?> finalizationVerify(@RequestParam Map<String,Object> params){
 		return this.projectLawsInventoryEOService.finalizationVerify(params);
 	}
+	/**
+	 * 点击流程状态查看流程详情（平台件）
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "点击流程状态查看流程详情（平台件）")
+	@ApiOperation(value="点击流程状态查看流程详情（平台件）", notes="点击流程状态查看流程详情（平台件）")
+	@GetMapping(value = "/queryPlatformList")
+	public Result<List<ProjectLawsInventoryEO>> queryPlatformList(String lawsInventoryId,String flowFlag,String cut) {
+		List<ProjectLawsInventoryEO> list = projectLawsInventoryEOService.queryPlatformList(lawsInventoryId,flowFlag,cut);
+		return Result.OK(list);
+	}
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowFlagEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowFlagEnum.java
new file mode 100644
index 000000000..06ffd9ad3
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowFlagEnum.java
@@ -0,0 +1,45 @@
+package com.jero.modules.project.enums;
+
+/**
+ * 任务状态枚举类
+ */
+public enum FlowFlagEnum {
+    DESIGN("设计符合性流程状态","design"),
+    VERIFY("验证符合性流程状态","verify"),
+    ;
+
+
+    String name;
+    String value;
+
+    private FlowFlagEnum(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public static String getTextByValue(String value) {
+        FlowFlagEnum[] values = values();
+        for (FlowFlagEnum taskStatusEnum : values) {
+            if (taskStatusEnum.value.equals(value)) {
+                return taskStatusEnum.name;
+            }
+        }
+        return null;
+    }
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 70d4fdedd..ec500c9ff 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -12227,9 +12227,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOList) {
 				//流程状态
 				String flowStatus = "";
-				if("design".equals(flowFlag)){
+				if(FlowFlagEnum.DESIGN.getValue().equals(flowFlag)){//流程标识，点击设计符合性流程状态跳转
 					flowStatus = projectLawsInventoryEO.getDesignFlowStatus();
-				}else{
+				}else if(FlowFlagEnum.VERIFY.getValue().equals(flowFlag)){//流程标识，点击验证符合性流程状态跳转
 					flowStatus = projectLawsInventoryEO.getVerifyFlowStatus();
 				}
 				if (StringUtils.isNotEmpty(flowStatus)) {

From 1129d62d7d968b18f908c6a7fd0bef8d498a4130 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 22 Sep 2023 09:36:05 +0800
Subject: [PATCH 121/288] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=20=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=85=B3=E8=81=94=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectManagement/components/listEditModel.vue   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index 60de12437..1e6ea973c 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -1088,11 +1088,13 @@
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
             let formInline = JSON.parse(JSON.stringify(this.formInline))
-            Object.keys(formInline).forEach(res => {
-              if (formInline[res] && formInline[res] instanceof Array) {
-                formInline[res] = formInline[res].join(',')
-              }
-            })
+            if(!formInline.projectLawsInventoryEOS){
+              Object.keys(formInline).forEach(res => {
+                if (formInline[res] && formInline[res] instanceof Array) {
+                  formInline[res] = formInline[res].join(',')
+                }
+              })
+            }
             if (!formInline.verifyDutyId) {
               formInline.verifyDutyId = ''
             }

From ad9bff2c03e706b365742088987b9fe0c1600c71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Fri, 22 Sep 2023 09:51:05 +0800
Subject: [PATCH 122/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9VDR=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OtaManageApplyEOServiceImpl.java     | 33 ++++++++++---------
 .../ParameterItemCollectionList.vue           |  2 +-
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
index c79038397..ec01d0f02 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
@@ -216,7 +216,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                 for (OtaManageReceiveNsdp omrn : valList) {
                     //找到最快来临的发布时间
                     try {
-                        if(StringUtils.isNotEmpty(omrn.getReleaseDate())){
+                        if(StringUtils.isNotBlank(omrn.getReleaseDate())){
                             Date syncDate = sdf.parse(omrn.getReleaseDate());
                             if (null == releaseDate) {
                                 releaseDate = syncDate;
@@ -1336,21 +1336,21 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
 
             List<VersionVO> versionVOList = this.getBaseMapper().getVersionInfo(vdr);
             if (!versionVOList.isEmpty()) {
-                List<VersionVO> oneList = versionVOList.stream().filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList());
-                List<VersionVO> twoList = versionVOList.stream().filter(e -> StringUtils.isNotBlank(e.getParentId())).collect(Collectors.toList());
-
-                for (VersionVO versionVO : oneList) {
-                    result.add(versionVO);
-                    List<VersionVO> collect = twoList.stream().filter(e -> versionVO.getProjectId().equals(e.getParentId())).collect(Collectors.toList());
-                    Collections.sort(collect, new Comparator<VersionVO>() {
-                        @Override
-                        public int compare(VersionVO o1, VersionVO o2) {
-                            return Integer.valueOf(o1.getVersionNumber()).compareTo(Integer.valueOf(o2.getVersionNumber()));
-                        }
-                    });
-                    result.addAll(collect);
-                }
-                for (VersionVO versionVO : result) {
+//                List<VersionVO> oneList = versionVOList.stream().filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList());
+//                List<VersionVO> twoList = versionVOList.stream().filter(e -> StringUtils.isNotBlank(e.getParentId())).collect(Collectors.toList());
+//
+//                for (VersionVO versionVO : oneList) {
+//                    result.add(versionVO);
+//                    List<VersionVO> collect = twoList.stream().filter(e -> versionVO.getProjectId().equals(e.getParentId())).collect(Collectors.toList());
+//                    Collections.sort(collect, new Comparator<VersionVO>() {
+//                        @Override
+//                        public int compare(VersionVO o1, VersionVO o2) {
+//                            return Integer.valueOf(o1.getVersionNumber()).compareTo(Integer.valueOf(o2.getVersionNumber()));
+//                        }
+//                    });
+//                    result.addAll(collect);
+//                }
+                for (VersionVO versionVO : versionVOList) {
                     String market = versionVO.getMarket();
                     List<String> list = new LinkedList<>();
                     for (String s : market.split(",")) {
@@ -1377,6 +1377,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                             versionVO.setAttestationSchedule(collect.get(0).getEnName());
                         }
                     }
+                    result.add(versionVO);
                 }
             }
             for (String vehicleStr : vehicleSet) {
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 12f1be61d..daeb1d5b5 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -3,7 +3,7 @@
     <div class="Virtual-detail-header" style="position: fixed;top: 0">
       <div class="Virtual-detail-title">
         <span>
-          {{$t('ParameteItemCollectionList')}}({{$t(this.$route.query.projectName.slice(0,-3))}}-{{$t(this.$route.query.projectVersion)}}) — {{$t(this.$route.query.title)}}
+          {{$t('ParameteItemCollectionList')}}({{this.$route.query.type == '1' ? $t(this.$route.query.projectName) : $t(this.$route.query.projectName.slice(0,-3)) + '-' + $t(this.$route.query.projectVersion)}}) — {{$t(this.$route.query.title)}}
         </span>
       </div>
       <div class="Virtual-detail-title-right">

From 5d30fcc0e00ecc16917434c91b47c4d26ec4652c Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 22 Sep 2023 10:19:55 +0800
Subject: [PATCH 123/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    |  5 +++-
 .../components/listEditModel.vue              | 27 ++++++++++++++-----
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index ec500c9ff..7ac8b589b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -515,7 +515,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 	public void editById(ProjectLawsInventoryEO projectLawsInventoryEO) {
 		this.editService.editById(projectLawsInventoryEO);
 		if(StringUtils.isNotBlank(projectLawsInventoryEO.getPlatformIds())){
-			lawsInventoryPlatformEOService.deleteByIds(Arrays.asList(projectLawsInventoryEO.getPlatformIds().split(",")));
+			LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();
+			wrapper.eq(LawsInventoryPlatformEO::getLawsInventoryId,projectLawsInventoryEO.getId());
+			wrapper.in(LawsInventoryPlatformEO::getPlatformLawsInventoryId,Arrays.asList(projectLawsInventoryEO.getPlatformIds().split(",")));
+			lawsInventoryPlatformEOService.remove(wrapper);
 		}
 	}
 
diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index 1e6ea973c..f3d71970a 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -1088,12 +1088,27 @@
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
             let formInline = JSON.parse(JSON.stringify(this.formInline))
-            if(!formInline.projectLawsInventoryEOS){
-              Object.keys(formInline).forEach(res => {
-                if (formInline[res] && formInline[res] instanceof Array) {
-                  formInline[res] = formInline[res].join(',')
-                }
-              })
+              // Object.keys(formInline).forEach(res => {
+              //   if(!formInline.projectLawsInventoryEOS){
+              //     if (formInline[res] && formInline[res] instanceof Array) {
+              //       formInline[res] = formInline[res].join(',')
+              //     }
+              //   }
+              // })
+            if(formInline.designDeliverableType){
+              formInline.designDeliverableType = formInline.designDeliverableType.join(',')
+            }
+            if(formInline.dutyDepart){
+              formInline.dutyDepart = formInline.dutyDepart.join(',')
+            }
+            if(formInline.dutyTerritory){
+              formInline.dutyTerritory = formInline.dutyTerritory.join(',')
+            }
+            if(formInline.verifyDeliverableType){
+              formInline.verifyDeliverableType = formInline.verifyDeliverableType.join(',')
+            }
+            if(formInline.prehomoDeliverableType){
+              formInline.prehomoDeliverableType = formInline.prehomoDeliverableType.join(',')
             }
             if (!formInline.verifyDutyId) {
               formInline.verifyDutyId = ''

From a8e4c886147463fa9bb77cb21dd730afe1d551ce Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 22 Sep 2023 10:59:04 +0800
Subject: [PATCH 124/288] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  3 +++
 jero-web/src/common/lang/zh-cn.js             |  3 +++
 .../components/addModelconformance.vue        | 21 +++++++++++++++--
 .../moudles/addModel.vue                      | 23 +++++++++++++++++--
 4 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index e0d6f2a7d..ab21c14ce 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1970,4 +1970,7 @@ module.exports = {
   Chinesecharacters:'The role code cannot enter Chinese characters',
   alreadyexistssystem:'The role encoding already exists',
   releaseType:'releaseType',
+  by:'By',
+  Changeto:'Change to',
+  emptyc:'empty',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 773b0e065..61034b24d 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -3926,4 +3926,7 @@ module.exports = {
   Addresslink:'地址链接',
   Problemanagement:'问题管理',
   releaseType:'发布类型',
+  by:'由',
+  Changeto:'改为了',
+  emptyc:'空',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/addModelconformance.vue b/jero-web/src/views/projectManagement/components/addModelconformance.vue
index 0bdd14ac0..c5a499e73 100644
--- a/jero-web/src/views/projectManagement/components/addModelconformance.vue
+++ b/jero-web/src/views/projectManagement/components/addModelconformance.vue
@@ -152,6 +152,7 @@
                             :getPopupContainer="triggerNode=> triggerNode.parentNode"
                             showSearch
                             optionFilterProp="label"
+                            @change='change'
                             :autoClearSearchValue="false"
                             :placeholder="$t('PleaseSelect')+$t('Problemstate')">
                     <a-select-option v-for="(item, key) in ProblemstateList"
@@ -244,11 +245,11 @@
             <a-col :span="24">
               <div class="box-title-text">
                 <div class="title-text">
-                  <!--                  <span class="Required">*</span>-->
+                  <span class="Required" v-if="this.formInline.problemState == this.$t('green')">*</span>
                   <span class="title-text-text"
                         :title="$t('conculsion')">{{$t('conculsion')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="conclusion">
+                <a-form-model-item class="itemModel" :prop="this.formInline.problemState == this.$t('green') ? 'conclusion' : ''">
                   <a-input class="box-input"
                            v-model='formInline.conclusion'
                            :disabled="disabled"
@@ -372,6 +373,13 @@ export default {
             trigger: 'change'
           }
         ],
+        conclusion: [
+          {
+            required: true,
+            message: this.$t('conculsion') + this.$t('cannotEmpty'),
+            trigger: 'change'
+          }
+        ],
       },
       visible: false,
       visibletrack: false,
@@ -421,6 +429,7 @@ export default {
         }
       ],
       index:'',
+      problemState:'',
       url: {
         add: '/project/problemManagementEO/add',
         edit: '/project/problemManagementEO/edit',
@@ -456,6 +465,13 @@ export default {
         }
       })
     },
+    change(value){
+      if(value != this.problemState && this.title == this.$t('edit') && this.problemState){
+        let time = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+        let text = this.userInfo().username + ' ' + time + ' ' + this.$t('Problemstate')+this.$t('by')+ '\'' + this.problemState + '\'' +this.$t('Changeto') + '\'' + value + '\''
+        this.formInline.progressTrackingList.push({progressTracking:text})
+      }
+    },
     StandardselectionChange(value, id) {
       this.formInline.lawsId = id
       this.formInline = { ...this.formInline }
@@ -510,6 +526,7 @@ export default {
       this.getNameList()
       this.getFirstLevelDutyTerritory()
       this.title = this.$t('edit')
+      this.problemState = row.problemState
       this.formInline = row
       if(this.formInline.dutyTerritory != null){
         this.formInline.dutyTerritory = this.formInline.dutyTerritory.split(',')
diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue
index 0bdd14ac0..343b431fa 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue
@@ -153,6 +153,7 @@
                             showSearch
                             optionFilterProp="label"
                             :autoClearSearchValue="false"
+                            @change='change'
                             :placeholder="$t('PleaseSelect')+$t('Problemstate')">
                     <a-select-option v-for="(item, key) in ProblemstateList"
                                      :label='item'
@@ -244,11 +245,11 @@
             <a-col :span="24">
               <div class="box-title-text">
                 <div class="title-text">
-                  <!--                  <span class="Required">*</span>-->
+                  <span class="Required" v-if="this.formInline.problemState == this.$t('green')">*</span>
                   <span class="title-text-text"
                         :title="$t('conculsion')">{{$t('conculsion')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="conclusion">
+                <a-form-model-item class="itemModel" :prop="this.formInline.problemState == this.$t('green') ? 'conclusion' : ''">
                   <a-input class="box-input"
                            v-model='formInline.conclusion'
                            :disabled="disabled"
@@ -372,6 +373,13 @@ export default {
             trigger: 'change'
           }
         ],
+        conclusion: [
+          {
+            required: true,
+            message: this.$t('conculsion') + this.$t('cannotEmpty'),
+            trigger: 'change'
+          }
+        ],
       },
       visible: false,
       visibletrack: false,
@@ -392,6 +400,7 @@ export default {
         projectId:undefined,
         problemState:undefined,
       },
+      data:{},
       formInlinetracking:{},
       confirmLoading: false,
       title: '',
@@ -421,6 +430,7 @@ export default {
         }
       ],
       index:'',
+      problemState:'',
       url: {
         add: '/project/problemManagementEO/add',
         edit: '/project/problemManagementEO/edit',
@@ -460,6 +470,14 @@ export default {
       this.formInline.lawsId = id
       this.formInline = { ...this.formInline }
     },
+    change(value){
+      if(value != this.problemState && this.title == this.$t('edit') && this.problemState){
+        console.log(this.formInline.progressTrackingList)
+        let time = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+        let text = this.userInfo().username + ' ' + time + ' ' + this.$t('Problemstate')+this.$t('by')+ '\'' + this.problemState + '\'' +this.$t('Changeto') + '\'' + value + '\''
+        this.formInline.progressTrackingList.push({progressTracking:text})
+      }
+    },
     Standardselectioninput(val){
       this.formInline.lawsName = val
     },
@@ -510,6 +528,7 @@ export default {
       this.getNameList()
       this.getFirstLevelDutyTerritory()
       this.title = this.$t('edit')
+      this.problemState = row.problemState
       this.formInline = row
       if(this.formInline.dutyTerritory != null){
         this.formInline.dutyTerritory = this.formInline.dutyTerritory.split(',')

From 66dfaddd78d0b4923807e178bee2ecc2b6ca3c3e Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 22 Sep 2023 11:41:37 +0800
Subject: [PATCH 125/288] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectNonConformance/moudles/addModel.vue      | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue
index 343b431fa..3123bfdcb 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue
@@ -471,10 +471,19 @@ export default {
       this.formInline = { ...this.formInline }
     },
     change(value){
-      if(value != this.problemState && this.title == this.$t('edit') && this.problemState){
-        console.log(this.formInline.progressTrackingList)
+      if(value != this.problemState && this.title == this.$t('edit')){
+        if(this.problemState == null || this.problemState == ''){
+          this.problemState = this.$t('emptyc')
+        }
         let time = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
         let text = this.userInfo().username + ' ' + time + ' ' + this.$t('Problemstate')+this.$t('by')+ '\'' + this.problemState + '\'' +this.$t('Changeto') + '\'' + value + '\''
+        console.log(this.formInline.progressTrackingList[0])
+        if(JSON.stringify(this.formInline.progressTrackingList[0]) == '{}' || this.formInline.progressTrackingList[0].progressTracking == ''){
+          this.formInline.progressTrackingList.forEach((item,index) => {
+              item.progressTracking = text
+          })
+          return
+        }
         this.formInline.progressTrackingList.push({progressTracking:text})
       }
     },

From 4ab41cab98e09c40358dc8c0c5161d6aa844e66a Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 22 Sep 2023 16:01:44 +0800
Subject: [PATCH 126/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/project/entity/ProjectLawsInventoryEO.java |  2 +-
 .../impl/ProjectLawsInventoryEOServiceImpl.java        | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
index e551c2282..1092df44a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
@@ -545,5 +545,5 @@ public class ProjectLawsInventoryEO implements Serializable {
     private List<ProjectLawsInventoryEO> projectLawsInventoryEOS;
 
     @TableField(exist = false)
-    private String platformIds;//项目名称
+    private String platformIds;//平台件数据id
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 7ac8b589b..b70756479 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -12191,9 +12191,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = lawsInventoryPlatformEOService.list(wrapper);
 		List<String> idList = new ArrayList<>();
 		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = new ArrayList<>();
+		List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
 		if(ObjectUtils.isNotEmpty(lawsInventoryPlatformEOS)){
 			idList = lawsInventoryPlatformEOS.stream().map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).collect(Collectors.toList());
 			projectLawsInventoryEOList = this.listByIds(idList);
+			if(ObjectUtils.isNotEmpty(projectLawsInventoryEOList)){
+				List<String> projectIdList = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getProjectLibraryId).collect(Collectors.toList());
+				projectLibraryBaseList = projectLibraryBaseService.listByIds(projectIdList);
+			}
 			List<String> userIdList = new ArrayList<>();
 			List<String> collect1 = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getDesignDutyId).distinct().collect(Collectors.toList());
 			List<String> collect2 = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getVerifyDutyId).distinct().collect(Collectors.toList());
@@ -12228,6 +12233,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			}
 
 			for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOList) {
+				List<ProjectLibraryBase> libraryBaseList = projectLibraryBaseList.stream()
+						.filter(e -> e.getId().equals(projectLawsInventoryEO.getProjectLibraryId())).collect(Collectors.toList());
+				if(ObjectUtils.isNotEmpty(libraryBaseList)){
+					projectLawsInventoryEO.setProjectName(libraryBaseList.get(0).getProjectNameId());
+				}
 				//流程状态
 				String flowStatus = "";
 				if(FlowFlagEnum.DESIGN.getValue().equals(flowFlag)){//流程标识，点击设计符合性流程状态跳转

From fad1e2f8ec4b0bfe571d0dd60157af95590cf6c7 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 22 Sep 2023 16:21:37 +0800
Subject: [PATCH 127/288] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=20=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E7=BC=96=E8=BE=91=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/associatedplat.vue             |   2 +-
 .../components/flowstatusdetial.vue           | 118 +++++++-----------
 .../components/listOfRegulations.vue          |  24 ++--
 3 files changed, 63 insertions(+), 81 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/associatedplat.vue b/jero-web/src/views/projectManagement/components/associatedplat.vue
index ac007c0e1..e6c0466d5 100644
--- a/jero-web/src/views/projectManagement/components/associatedplat.vue
+++ b/jero-web/src/views/projectManagement/components/associatedplat.vue
@@ -18,7 +18,7 @@
                   <span>{{$t('entryName')}}</span>
                 </div>
                 <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('entryName')"
-                         v-model="queryParam.projectName"></a-input>
+                         v-model="queryParam.projectNameId"></a-input>
               </div>
             </a-col>
             <a-col :md="12" :sm="8">
diff --git a/jero-web/src/views/projectManagement/components/flowstatusdetial.vue b/jero-web/src/views/projectManagement/components/flowstatusdetial.vue
index 714d9c6c5..a708b55dc 100644
--- a/jero-web/src/views/projectManagement/components/flowstatusdetial.vue
+++ b/jero-web/src/views/projectManagement/components/flowstatusdetial.vue
@@ -16,16 +16,16 @@
           <a-col :span="12">
             <div class='detail-box'>
               <span class='detail-text' :title="$t('regulationNo')">{{$t('regulationNo')}}</span>
-              <span class="title-text-text" :title="form.vdr">
-                {{form.vdr}}</span>
+              <span class="title-text-text" :title="form.serialNumber">
+                {{form.serialNumber}}</span>
             </div>
 
           </a-col>
           <a-col :span="12">
             <div class='detail-box'>
               <span class='detail-text' :title="$t('title')">{{$t('title')}}</span>
-              <span class="title-text-text" :title="form.summary">
-                {{form.summary}}</span>
+              <span class="title-text-text" :title="form.title">
+                {{form.title}}</span>
             </div>
 
           </a-col>
@@ -34,8 +34,8 @@
           <a-col :span="12">
             <div class='detail-box'>
               <span class='detail-text' :title="$t('subtitle')">{{$t('subtitle')}}</span>
-              <span class="title-text-text" :title="form.homologationImpact">
-                {{form.homologationImpact}}</span>
+              <span class="title-text-text" :title="form.subtitle">
+                {{form.subtitle}}</span>
             </div>
 
           </a-col>
@@ -49,14 +49,14 @@
           </a-col>
         </a-row>
         <div v-for='(item,index) in dataList' :key='index'>
-          <div class='title' :title="item.title">{{item.title}}</div>
+          <div class='title' :title="item.projectName">{{item.projectName}}</div>
           <div style='height:100%'>
             <a-row :gutter="24">
               <a-col :span="12">
                 <div class='detail-box'>
                   <span class='detail-text' :title="$t('ProcessStatus')">{{$t('ProcessStatus')}}</span>
-                  <span class="title-text-text" :title="item.ProcessStatus">
-                {{item.ProcessStatus}}</span>
+                  <span class="title-text-text" :title="flag == 'design'?item.designFlowStatusName : item.verifyFlowStatusName">
+                {{flag == 'design'?item.designFlowStatusName : item.verifyFlowStatusName}}</span>
                 </div>
               </a-col>
               <a-col :span="12">
@@ -66,15 +66,15 @@
               <a-col :span="12">
                 <div class='detail-box'>
                   <span class='detail-text' :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
-                  <span class="title-text-text" :title="item.Sponsor">
-                {{item.Sponsor}}</span>
+                  <span class="title-text-text" :title="item.createBy">
+                {{item.createBy}}</span>
                 </div>
               </a-col>
               <a-col :span="12">
                 <div class='detail-box'>
                   <span class='detail-text' :title="$t('personLiable')">{{$t('personLiable')}}</span>
-                  <span class="title-text-text" :title="item.personLiable">
-                {{item.personLiable}}</span>
+                  <span class="title-text-text" :title="flag == 'design'?item.designDutyIdName : item.verifyDutyIdName">
+                {{flag == 'design'?item.designDutyIdName : item.verifyDutyIdName}}</span>
                 </div>
               </a-col>
             </a-row>
@@ -82,15 +82,15 @@
               <a-col :span="12">
                 <div class='detail-box'>
                   <span class='detail-text' :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
-                  <span class="title-text-text" :title="item.statisticalNodes">
-                {{item.statisticalNodes}}</span>
+                  <span class="title-text-text" :title="item.dutyDepart">
+                {{item.dutyDepart}}</span>
                 </div>
               </a-col>
               <a-col :span="12">
                 <div class='detail-box'>
                   <span class='detail-text' :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
-                  <span class="title-text-text" :title="item.areaOfResponsibility">
-                {{item.areaOfResponsibility}}</span>
+                  <span class="title-text-text" :title="item.dutyTerritory_dictText">
+                {{item.dutyTerritory_dictText}}</span>
                 </div>
               </a-col>
             </a-row>
@@ -98,15 +98,15 @@
               <a-col :span="12">
                 <div class='detail-box'>
                   <span class='detail-text' :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
-                  <span class="title-text-text" :title="item.deliverableTemplate">
-                {{item.deliverableTemplate}}</span>
+                  <a style='color:#00B3BE' class="title-text-text text-operation" @click="down(flag == 'design'?item.designDeliverableTemplate : item.verifyDeliverableTemplate),flag == 'design'?item.designDeliverableTemplateName : item.verifyDeliverableTemplateName" :title="flag == 'design'?item.designDeliverableTemplateName : item.verifyDeliverableTemplateName">
+                {{flag == 'design'?item.designDeliverableTemplateName : item.verifyDeliverableTemplateName }}</a>
                 </div>
               </a-col>
               <a-col :span="12">
                 <div class='detail-box'>
                   <span class='detail-text' :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
-                  <span class="title-text-text" :title="item.typeOfDeliverables">
-                {{item.typeOfDeliverables}}</span>
+                  <span class="title-text-text" :title="flag == 'design'?item.designDeliverableTypeName : item.verifyDeliverableTypeName">
+                {{flag == 'design'?item.designDeliverableTypeName : item.verifyDeliverableTypeName}}</span>
                 </div>
               </a-col>
             </a-row>
@@ -114,8 +114,8 @@
               <a-col :span="24">
                 <div class='detail-box' style='display:flex'>
                   <span class='detail-text' :title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
-                  <span class="title-text-description" :title="item.descriptionDeliverables">
-                {{item.descriptionDeliverables}}</span>
+                  <span class="title-text-description" :title="flag == 'design'?item.designRemark : item.verifyRemark">
+                {{flag == 'design'?item.designRemark : item.verifyRemark}}</span>
                 </div>
               </a-col>
             </a-row>
@@ -134,7 +134,7 @@
 </template>
 
 <script>
-import { getAction, postAction } from '@/api/manage'
+import { getAction, postAction,downloadFile } from '@/api/manage'
 import uploadFile from '@/components/uploadFile/file'
 import { mapGetters } from 'vuex'
 
@@ -153,52 +153,19 @@ export default {
       projectNameList: [],
       DeliverableTreeList: [],
       form:{
-        VDR:'',
-        theme:'',
-        authenticationimpact:'',
-        influencestatuteCn:'',
+        serialNumber:'',
+        title:'',
+        subtitle:'',
+        applicableSupplement:'',
         influencestatuteEu:'',
       },
-      dataList:[
-        {
-        title:'平台件项目',
-        ProcessStatus:'1',
-        Sponsor:'1',
-        personLiable:'1',
-        statisticalNodes:'1',
-        areaOfResponsibility:'1',
-        deliverableTemplate:'1',
-        typeOfDeliverables:'1',
-        descriptionDeliverables:'1sdfdgdf法官大人风格的调1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的格式的',
-      },
-        {
-          title:'平台件项目2',
-          ProcessStatus:'1',
-          Sponsor:'1',
-          personLiable:'1',
-          statisticalNodes:'1',
-          areaOfResponsibility:'1',
-          deliverableTemplate:'1',
-          typeOfDeliverables:'1',
-          descriptionDeliverables:'1sdfdgdf法官大人风格的调1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的格式的',
-        },
-        {
-          title:'平台件项目2',
-          ProcessStatus:'1',
-          Sponsor:'1',
-          personLiable:'1',
-          statisticalNodes:'1',
-          areaOfResponsibility:'1',
-          deliverableTemplate:'1',
-          typeOfDeliverables:'1',
-          descriptionDeliverables:'1sdfdgdf法官大人风格的调1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的1sdfdgdf法官大人风格的调格式的格式的',
-        }
-      ],
+      dataList:[],
       url:{
         addModel:''
       },
       record:{},
       car:'',
+      flag:'',
     }
   },
   mounted() {
@@ -206,13 +173,24 @@ export default {
   },
   methods: {
     ...mapGetters(['userInfo']),
-    addModel(record,val) {
-      this.form={}
+    addModel(row, name) {
+      this.form.serialNumber = row.serialNumber
+      this.form.title = row.title
+      this.form.subtitle = row.subtitle
+      this.form.applicableSupplement = row.applicableSupplement
+      this.flag = name == this.$t('designComplianceProcess') ? 'design' :'verify'
       this.visible = true
-      this.confirmLoading = false
-      console.log('555',record);
+      this.confirmLoading = true
+      getAction('/project/projectLawsInventoryEO/queryPlatformList', { lawsInventoryId: row.id , flowFlag:this.flag}).then((res) => {
+        if (res.success) {
+          this.dataList = res.result || []
+          this.confirmLoading = false
+        }
+      })
     },
     handleCancel() {
+      this.form = {}
+      this.dataList = []
       this.visible = false
     },
     /** 上传文件的回调 */
@@ -227,9 +205,9 @@ export default {
       this.formInline[this.uploadName] = attIdList.join(',')
       this.formInline = { ...this.formInline }
     },
-    isEdit(){
-      this.disabled=false
-    }
+    down(id,name){
+      downloadFile('/sys/common/downLoadFile', name, { id: id })
+    },
   }
 }
 </script>
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 3676fec0d..7c837d07c 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -273,12 +273,6 @@
                 <a-icon type="setting"/>
                 {{ $t('Associatedplatform') }}
               </div>
-              <div @click="a"
-                   v-if="roleSwitchingCode == 0"
-                   class="operator-text-title">
-                <a-icon type="setting"/>
-                {{ $t('Associatedplatform1') }}
-              </div>
             </div>
           </template>
           <div class="operator-text" style="position: relative">
@@ -1832,7 +1826,11 @@
             primaryKeyId: row.primaryKeyId
           }
         }
-        this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), name)
+        if(row.projectLawsInventoryEOS && row.projectLawsInventoryEOS.length > 1){
+          this.$refs.flowstatusdetialRef.addModel(row, name)
+        }else{
+          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), name)
+        }
 
 
       },
@@ -1963,6 +1961,7 @@
         if(this.selectedRowKeys && this.selectedRowKeys.length > 0){
           this.detailedWarningList = []
           let dataSource = []
+          let status = ''
           for (let i = 0; i < this.dataSource.length; i++) {
             for (let j = 0; j < this.selectedRowKeys.length; j++) {
               if (this.dataSource[i].id == this.selectedRowKeys[j]) {
@@ -1974,12 +1973,17 @@
             if (dataSource[i].verifyFlowStatus == 'List to be released' &&
               dataSource[i].designFlowStatus == 'List to be released') {
               flag = '1'
-              this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
+              status = '1'
             } else {
-              this.$message.warning(this.$t('unpublishedregulationsselected'))
-              return
+              status = '2'
             }
           }
+          console.log(status)
+          if(status == '1'){
+            this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
+          }else{
+            this.$message.warning(this.$t('unpublishedregulationsselected'))
+          }
         }else{
           flag = '2'
           this.selectedRowKeys = this.dataSource.map(val => val.id)

From 79bc3c85441e0bce8c81699dd9b3c42ff565d5c9 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 22 Sep 2023 17:20:55 +0800
Subject: [PATCH 128/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=9C=AA=E5=8C=B9=E9=85=8D=E5=88=B0=E5=B9=B3=E5=8F=B0=E4=BB=B6?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLibraryBaseController.java         |  4 +--
 .../service/IProjectLibraryBaseService.java   |  2 +-
 .../impl/ProjectLibraryBaseServiceImpl.java   | 36 +++++++++++++++++--
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
index ba98706f0..bea4e4c85 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
@@ -71,8 +71,8 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
 	@ApiOperation(value="勾选法规清单进行关联平台件", notes="勾选法规清单进行关联平台件")
 	@PostMapping(value = "/listPlatform")
 	public Result<?> listPlatform(@RequestBody Map<String,Object> params) {
-		List<Map<String, Object>> mapList = projectLibraryBaseService.listPlatform(params);
-		return Result.OK(params.get("cut").toString(),mapList);
+		Map<String, Object> map = projectLibraryBaseService.listPlatform(params);
+		return Result.OK(params.get("cut").toString(),map);
 	}
 	/**
 	 * 不勾选法规清单进行关联平台件
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java
index 4f9f6f60e..d6d57dbae 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java
@@ -91,7 +91,7 @@ public interface IProjectLibraryBaseService extends IService<ProjectLibraryBase>
 	 * @param params
 	 * @return
 	 */
-	List<Map<String,Object>> listPlatform(Map<String, Object> params);
+	Map<String,Object> listPlatform(Map<String, Object> params);
 
 	/**
 	 * 不勾选法规清单进行关联平台件
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 2f55167ee..6654e445d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -1274,7 +1274,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	 * @return
 	 */
 	@Override
-	public List<Map<String,Object>> listPlatform(Map<String,Object> params) {
+	public Map<String,Object> listPlatform(Map<String,Object> params) {
 		String cut = (String) params.get("cut");//
 		String ids = (String) params.get("ids");//法规清单id
 		String projectLibraryIds = (String) params.get("projectLibraryIds");//平台件项目id
@@ -1303,6 +1303,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		List<SysCategory> categoryList = sysCategoryService.list();
 		List<Map<String,Object>> mapList = new ArrayList<>();
 		List<Map<String,Object>> mapListOne = new ArrayList<>();
+		List<ProjectLawsInventoryEO> emptyList = new ArrayList<>();
 		for (ProjectLawsInventoryEO projectLawsInventoryEO : lawsInventoryEOList) {
 			Map<String,Object> map = new HashMap<>();
 			List<ProjectLawsInventoryEO> projectLawsInventoryEOS = new ArrayList<>();
@@ -1360,6 +1361,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 					projectLawsInventoryEOS.add(lawsInventoryEO);
 				}
 			}
+			if(ObjectUtils.isEmpty(projectLawsInventoryEOS)){
+				emptyList.add(projectLawsInventoryEO);
+			}
 
 			if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() > 1){
 				map.put("lawsInventoryId",projectLawsInventoryEO.getId());
@@ -1373,6 +1377,31 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 				mapListOne.add(mapTemp);
 			}
 		}
+		List<String> msgList = new ArrayList<>();
+		//未匹配上法规清单
+		if(ObjectUtils.isNotEmpty(emptyList)){
+			for (ProjectLawsInventoryEO projectLawsInventoryEO : emptyList) {
+				List<String> list = new LinkedList<>();
+				if(StringUtils.isNotBlank(projectLawsInventoryEO.getDutyTerritory())){
+					for (String s : projectLawsInventoryEO.getDutyTerritory().split(",")) {
+						List<SysDictItem> collect = sysDictItemList.stream().filter(e -> e.getItemValue().equals(s)).collect(Collectors.toList());
+						if(CutEnum.CN.getValue().equals(cut) && !collect.isEmpty()){
+							list.add(collect.get(0).getItemText());
+						}else if(CutEnum.EN.getValue().equals(cut) && !collect.isEmpty()){
+							list.add(collect.get(0).getEnName());
+						}
+					}
+				}
+				String serialNumber = projectLawsInventoryEO.getSerialNumber();
+				String dutyTerritoryName = StringUtils.join(list,",");
+				String msg = serialNumber+" "+dutyTerritoryName+"未匹配到数据";
+				msgList.add(msg);
+			}
+		}
+		String html = "";
+		for (String s : msgList) {
+			html += s + "</br>";
+		}
 		if(!mapListOne.isEmpty()){
 			//匹配一条平台件时直接新增
 			List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
@@ -1390,7 +1419,10 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 				lawsInventoryPlatformEOService.saveBatch(lawsInventoryPlatformEOS);
 			}
 		}
-		return mapList;
+		Map<String,Object> map = new HashMap<>();
+		map.put("msg",html);
+		map.put("result",mapList);
+		return map;
 	}
 	/**
 	 * 不勾选法规清单进行关联平台件

From 8510a049e2478205b1c7763890e02791f8ac8d41 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 22 Sep 2023 17:27:30 +0800
Subject: [PATCH 129/288] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BA=93=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E8=A1=A8-=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/LawsInventoryPlatformEOController.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/LawsInventoryPlatformEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/LawsInventoryPlatformEOController.java
index 598c52bff..c05cd93be 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/LawsInventoryPlatformEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/LawsInventoryPlatformEOController.java
@@ -14,6 +14,7 @@ import com.jero.modules.project.service.ILawsInventoryPlatformEOService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -113,7 +114,13 @@ public class LawsInventoryPlatformEOController extends JeroController<LawsInvent
 			lawsInventoryPlatformEOS.add(inventoryPlatformEO);
 		}
 		lawsInventoryPlatformEOService.addBatch(lawsInventoryPlatformEOS);
-		return Result.OK("添加成功！");
+		String msg = "";
+		if(ObjectUtils.isNotEmpty(json.get("msg"))){
+			msg = (String)json.get("msg");
+		}else{
+			msg = "添加成功！";
+		}
+		return Result.OK(msg);
 	}
 
 	/**

From c7018f197548981872be368902a0dadf240a3bc4 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 22 Sep 2023 17:37:04 +0800
Subject: [PATCH 130/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=9C=AA=E5=8C=B9=E9=85=8D=E4=B8=8A=E5=B9=B3=E5=8F=B0=E4=BB=B6?=
 =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLibraryBaseController.java         |  2 +-
 .../service/IProjectLibraryBaseService.java   |  2 +-
 .../impl/ProjectLibraryBaseServiceImpl.java   | 67 ++++++++++++-------
 3 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
index bea4e4c85..8eff66690 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
@@ -83,7 +83,7 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
 	@ApiOperation(value="不勾选法规清单进行关联平台件", notes="不勾选法规清单进行关联平台件")
 	@PostMapping(value = "/listPlatformAll")
 	public Result<?> listPlatformAll(@RequestBody Map<String,Object> params) {
-		List<Map<String, Object>> mapList = projectLibraryBaseService.listPlatformAll(params);
+		Map<String, Object> mapList = projectLibraryBaseService.listPlatformAll(params);
 		return Result.OK(params.get("cut").toString(),mapList);
 	}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java
index d6d57dbae..49fe9059a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java
@@ -98,7 +98,7 @@ public interface IProjectLibraryBaseService extends IService<ProjectLibraryBase>
 	 * @param params
 	 * @return
 	 */
-	List<Map<String,Object>> listPlatformAll(Map<String, Object> params);
+	Map<String,Object> listPlatformAll(Map<String, Object> params);
 //	IPage<ProjectLibraryBase> queryPageList(Map<String, Object> params);
 
 	/**
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 6654e445d..ba55769c4 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -1377,6 +1377,35 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 				mapListOne.add(mapTemp);
 			}
 		}
+
+		if(!mapListOne.isEmpty()){
+			//匹配一条平台件时直接新增
+			List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
+			for (Map<String, Object> map : mapListOne) {
+				LawsInventoryPlatformEO inventoryPlatformEO = new LawsInventoryPlatformEO();
+				inventoryPlatformEO.setCreateTime(new Date());
+				inventoryPlatformEO.setUpdateTime(new Date());
+				inventoryPlatformEO.setLawsInventoryId((String) map.get("lawsInventoryId"));
+				List<ProjectLawsInventoryEO> projectLawsInventoryEOS = (List<ProjectLawsInventoryEO>) map.get("result");
+				inventoryPlatformEO.setPlatformLawsInventoryId(projectLawsInventoryEOS.get(0).getId());
+				lawsInventoryPlatformEOS.add(inventoryPlatformEO);
+			}
+
+			if (!lawsInventoryPlatformEOS.isEmpty()) {
+				lawsInventoryPlatformEOService.saveBatch(lawsInventoryPlatformEOS);
+			}
+		}
+		//法规清单未匹配上平台件的提示语
+		String html = getMsg(cut, sysDictItemList, emptyList);
+
+		Map<String,Object> map = new HashMap<>();
+		map.put("msg",html);
+		map.put("result",mapList);
+		return map;
+	}
+
+	@NotNull
+	private String getMsg(String cut, List<SysDictItem> sysDictItemList, List<ProjectLawsInventoryEO> emptyList) {
 		List<String> msgList = new ArrayList<>();
 		//未匹配上法规清单
 		if(ObjectUtils.isNotEmpty(emptyList)){
@@ -1402,35 +1431,16 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		for (String s : msgList) {
 			html += s + "</br>";
 		}
-		if(!mapListOne.isEmpty()){
-			//匹配一条平台件时直接新增
-			List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
-			for (Map<String, Object> map : mapListOne) {
-				LawsInventoryPlatformEO inventoryPlatformEO = new LawsInventoryPlatformEO();
-				inventoryPlatformEO.setCreateTime(new Date());
-				inventoryPlatformEO.setUpdateTime(new Date());
-				inventoryPlatformEO.setLawsInventoryId((String) map.get("lawsInventoryId"));
-				List<ProjectLawsInventoryEO> projectLawsInventoryEOS = (List<ProjectLawsInventoryEO>) map.get("result");
-				inventoryPlatformEO.setPlatformLawsInventoryId(projectLawsInventoryEOS.get(0).getId());
-				lawsInventoryPlatformEOS.add(inventoryPlatformEO);
-			}
-
-			if (!lawsInventoryPlatformEOS.isEmpty()) {
-				lawsInventoryPlatformEOService.saveBatch(lawsInventoryPlatformEOS);
-			}
-		}
-		Map<String,Object> map = new HashMap<>();
-		map.put("msg",html);
-		map.put("result",mapList);
-		return map;
+		return html;
 	}
+
 	/**
 	 * 不勾选法规清单进行关联平台件
 	 *
 	 * @return
 	 */
 	@Override
-	public List<Map<String,Object>> listPlatformAll(Map<String,Object> params) {
+	public Map<String,Object> listPlatformAll(Map<String,Object> params) {
 		String cut = (String) params.get("cut");//
 		String projectLibraryIds = (String) params.get("projectLibraryIds");//法规清单id
 		String platformProjectLibraryIds = (String) params.get("platformProjectLibraryIds");//平台件法规id
@@ -1462,7 +1472,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		List<SysDictItem> sysDictItemList = sysDictItemMapper.selectItemsByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue());
 		List<Map<String,Object>> mapList = new ArrayList<>();
 		List<Map<String,Object>> mapListOne = new ArrayList<>();
-		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = new ArrayList<>();
+		List<ProjectLawsInventoryEO> emptyList = new ArrayList<>();
 		for (ProjectLawsInventoryEO projectLawsInventoryEO : lawsInventoryEOList) {
 			Map<String,Object> map = new HashMap<>();
 			List<ProjectLawsInventoryEO> projectLawsInventoryEOS = new ArrayList<>();
@@ -1502,6 +1512,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 					projectLawsInventoryEOS.add(lawsInventoryEO);
 				}
 			}
+			if(ObjectUtils.isEmpty(projectLawsInventoryEOS)){
+				emptyList.add(projectLawsInventoryEO);
+			}
 
 
 			if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() > 1){
@@ -1533,7 +1546,13 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 				lawsInventoryPlatformEOService.saveBatch(lawsInventoryPlatformEOS);
 			}
 		}
-		return mapList;
+		//法规清单未匹配上平台件的提示语
+		String html = getMsg(cut, sysDictItemList, emptyList);
+
+		Map<String,Object> map = new HashMap<>();
+		map.put("msg",html);
+		map.put("result",mapList);
+		return map;
 	}
 
 	private void hearSort(Map<String, Object> params, List<ProjectLibraryBase> resultLast) {

From 5edcef950af54e927032c9a272bd9d604bad443a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Sat, 23 Sep 2023 11:38:34 +0800
Subject: [PATCH 131/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collectionOfRegulatoryOpinions/index.vue  |    1 +
 .../components/modules/fillTable.vue          |    6 +-
 .../technologyAssessment/index.vue            |    1 +
 .../library/docDetail/index.vue               | 1712 +++++++++--------
 .../splitting/modules/ImportResult.vue        |    3 +-
 .../splitting/modules/SplitText.vue           |    3 +-
 .../otamanagement/upgradeactivity/index.vue   |    7 +-
 .../vehicleregistration/index.vue             |    8 +-
 .../projectStatusBoard/index.vue              |    2 +-
 9 files changed, 876 insertions(+), 867 deletions(-)

diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
index 7779d9cba..86619097a 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
@@ -116,6 +116,7 @@
 <!--           <a class="text-operation" @click="viewProcessClick(record)">{{$t('viewProcess')}}</a>-->
 <!--           v-if="record.gatherResult == 'Completed'"-->
            <a class="text-operation"
+              v-has="'regulatoryComments:evaluationResult'"
               @click="evaluationResultsClick(record)">{{$t('evaluationResults')}}</a>
           <a class="text-operation"
              v-if="(record.gatherResult == 'Completed' && userInfoQuery.username == record.createBy) || administrators"
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
index d7d00a710..5b0da46b6 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
@@ -14,7 +14,7 @@
         </a-button>
       </template>
       <div class="table-operator-right">
-        <div @click="newlyAddedClick" class="operator-text">
+        <div @click="newlyAddedClick" v-has="'monthlyTitleTemplate:add'" class="operator-text">
           <a-icon type="plus"/>
           {{$t('newlyAdded')}}
         </div>
@@ -32,8 +32,8 @@
         <span slot="operation" slot-scope="text,record,index">
            <a class="text-operation" @click="moveUpClick(record,index)">{{$t('moveUp')}}</a>
            <a class="text-operation" @click="moveDownClick(record,index)">{{$t('moveDown')}}</a>
-           <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>
-           <a class="text-operation" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
+           <a class="text-operation" v-has="'monthlyTitleTemplate:edit'" @click="edit(record)">{{$t('edit')}}</a>
+           <a class="text-operation" v-has="'monthlyTitleTemplate:delete'" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
         </span>
       </a-table>
       <div class="page" v-if="dataSource.length > 0">
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
index cedea358c..888a118d0 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
@@ -117,6 +117,7 @@
 <!--           <a class="text-operation" @click="viewProcessClick(record)">{{$t('viewProcess')}}</a>-->
           <!--           v-if="record.flowStatus == 'Completed'"-->
            <a class="text-operation"
+              v-has="'regulatoryAndTechnicalAssessment:evaluationResult'"
               @click="evaluationResultsClick(record)">{{$t('evaluationResults')}}</a>
           <a class="text-operation"
              v-if="(record.flowStatus == 'Completed' && userInfoQuery.username == record.createBy) || administrators"
diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue
index 0675392fa..db2b191b3 100644
--- a/jero-web/src/views/documentManage/library/docDetail/index.vue
+++ b/jero-web/src/views/documentManage/library/docDetail/index.vue
@@ -17,8 +17,8 @@
         </div>
         <div class="doc-detail-right">
           <div @click="UpdateLog" v-has="'bussLog:page'" class="operator-text-text" :title="$t('UpdateLog')">
-            <a-icon type="reload"/>
-            {{$t('UpdateLog')}}
+            <a-icon type="reload" />
+            {{ $t('UpdateLog') }}
           </div>
           <!--          <div @click="DocumentSplitting" v-has="'bussLog:splitting'" class="operator-text-text"-->
           <!--               :title="$t('DocumentSplitting')">-->
@@ -37,21 +37,21 @@
           <!--          </div>-->
           <div @click="KnowledgeDatabaseClick" v-has="'bussLog:database'" class="operator-text-text"
                :title="$t('problemKnowledgeBase')">
-            <a-icon type="folder"/>
-            {{$t('problemKnowledgeBase')}}
+            <a-icon type="folder" />
+            {{ $t('problemKnowledgeBase') }}
           </div>
           <div @click="CollectionClick({'collectFlag':collectFlag,'id':documentId})"
-               v-has="'document:addCollect'" class="operator-text-text"
+               v-has="'bussLog:collect'" class="operator-text-text"
                :title="$t('Collection')">
-            <a-icon class="icon" type="star"/>
-            {{collectFlag == '1'?$t('CancelCollection'):$t('Collection')}}
+            <a-icon class="icon" type="star" />
+            {{ collectFlag == '1' ? $t('CancelCollection') : $t('Collection') }}
           </div>
 
 
-          <div @click="shareClick" v-has="'document:pullMessage'" class="operator-text-text"
+          <div @click="shareClick" v-has="'bussLog:share'" class="operator-text-text"
                :title="$t('share')">
-            <a-icon type="share-alt"/>
-            {{$t('share')}}
+            <a-icon type="share-alt" />
+            {{ $t('share') }}
           </div>
         </div>
       </div>
@@ -60,24 +60,25 @@
           <div v-for="(item,index) in detailList" class="content-box">
             <div v-for="val in Object.keys(item)" class="content">
               <div class="header-text fixedPosition">
-                {{val}}
+                {{ val }}
               </div>
               <div class="content-text" v-if="val == $t('essentialInformation')">
                 <div class="text-field"
                      :class="{'text-content-button-one':ol.field_show_type == 8 ? true :false,
                      'text-content-button-Two':index1 == 1 || index1 == 9? true:false}"
                      v-for="(ol,index1) in item[val]">
-                  <span v-if="ol.field_show_type == 10" class="text-field-left-Index" :title="ol.db_field_txt">{{ol.db_field_txt}}</span>
-                  <span v-else class="text-field-left" :title="ol.db_field_txt">{{ol.db_field_txt}}</span>
+                  <span v-if="ol.field_show_type == 10" class="text-field-left-Index"
+                        :title="ol.db_field_txt">{{ ol.db_field_txt }}</span>
+                  <span v-else class="text-field-left" :title="ol.db_field_txt">{{ ol.db_field_txt }}</span>
                   <span class="text-field-right text-field-right-text" v-if="index1 == 9"
-                        :title="ol.value">{{ol.value ? ol.value : '--'}}</span>
+                        :title="ol.value">{{ ol.value ? ol.value : '--' }}</span>
                   <span class="text-field-right text-field-right-color" v-else-if="ol.urlClick" @click="urlClick(ol)"
-                        :title="ol.value">{{ol.value ? ol.value : '--'}}</span>
+                        :title="ol.value">{{ ol.value ? ol.value : '--' }}</span>
                   <span class="text-field-right" v-else-if="ol.field_show_type == 7">
                      <a-button type="primary" class="button-text"
                                v-if="ol.value && ol.value.length > 0"
                                @click="clickButtonToUpload(ol.value)">
-                        {{$t('viewUploadedFiles')}}
+                        {{ $t('viewUploadedFiles') }}
                     </a-button>
                     <span v-else>--</span>
                   </span>
@@ -88,18 +89,18 @@
                           @click="relatedClick(valItem)"
                           v-if="ol.list && ol.list.length > 0"
                           v-for="valItem in ol.list">
-                         {{valItem.title}}
+                         {{ valItem.title }}
                     </span>
                     <span v-else>--</span>
                   </span>
-                  <span class="text-field-right" v-else :title="ol.value">{{ol.value ? ol.value : '--'}}</span>
+                  <span class="text-field-right" v-else :title="ol.value">{{ ol.value ? ol.value : '--' }}</span>
                 </div>
               </div>
 
               <div class="TextInformation" v-else-if="val == $t('textInformation')">
                 <div class="TextInformation-box" v-for="(ol,index1) in item[val]">
                   <div class="TextInformation-box-title fixedPosition">
-                    {{ol.db_field_txt}}
+                    {{ ol.db_field_txt }}
                   </div>
                   <div class="TextInformation-box-box">
                     <div class="TextInformation-box-box-text"
@@ -107,16 +108,18 @@
                          v-for="valItem in ol.value">
                       <span @click="pdfPreview(valItem)"
                             :title="valItem.fileName"
-                            class="leftconteTdInformation">{{valItem.fileName}}</span>
+                            class="leftconteTdInformation">{{ valItem.fileName }}</span>
                       <a-icon class="leftconteTdInformation-icon"
                               @click="download(valItem)"
                               :title="$t('download')"
-                              type="vertical-align-bottom"/>
+                              v-has="'bussLog:downLoad'"
+                              type="vertical-align-bottom" />
                       <a-icon class="leftconteTdInformation-icon"
                               @click="breakdown(valItem)"
                               v-if="valItem.splitFlag == 1"
+                              v-has="'bussLog:standardBreakdownSheet'"
                               :title="$t('StandardBreakdown')"
-                              type="profile"/>
+                              type="profile" />
                     </div>
                   </div>
                 </div>
@@ -125,15 +128,16 @@
               <div class="content-text" v-else>
                 <div class="text-field" :class="{'text-content-button-one':ol.field_show_type == 8 ? true :false}"
                      v-for="(ol,index1) in item[val]">
-                  <span v-if="ol.field_show_type == 10" class="text-field-left-Index" :title="ol.db_field_txt">{{ol.db_field_txt}}</span>
-                  <span class="text-field-left" v-else :title="ol.db_field_txt">{{ol.db_field_txt}}</span>
+                  <span v-if="ol.field_show_type == 10" class="text-field-left-Index"
+                        :title="ol.db_field_txt">{{ ol.db_field_txt }}</span>
+                  <span class="text-field-left" v-else :title="ol.db_field_txt">{{ ol.db_field_txt }}</span>
                   <span class="text-field-right text-field-right-color" v-if="ol.urlClick" @click="urlClick(ol)"
-                        :title="ol.value">{{ol.value ? ol.value : '--'}}</span>
+                        :title="ol.value">{{ ol.value ? ol.value : '--' }}</span>
                   <span class="text-field-right" v-else-if="ol.field_show_type == 7">
                      <a-button type="primary" class="button-text"
                                v-if="ol.value && ol.value.length > 0"
                                @click="clickButtonToUpload(ol.value)">
-                      {{$t('viewUploadedFiles')}}
+                      {{ $t('viewUploadedFiles') }}
                     </a-button>
                     <span v-else>--</span>
                   </span>
@@ -144,19 +148,19 @@
                           :title="valItem.title"
                           v-if="ol.list && ol.list.length > 0"
                           v-for="valItem in ol.list">
-                         {{valItem.title}}
+                         {{ valItem.title }}
                     </span>
                     <span v-else>--</span>
                   </span>
-                  <span class="text-field-right" v-else :title="ol.value">{{ol.value ? ol.value : '--'}}</span>
+                  <span class="text-field-right" v-else :title="ol.value">{{ ol.value ? ol.value : '--' }}</span>
                 </div>
               </div>
             </div>
           </div>
-          <div class='content-box'>
+          <div class="content-box">
             <div class="content">
               <div class="header-text fixedPosition">
-                {{$t('DetailsPhasedImplementation')}}
+                {{ $t('DetailsPhasedImplementation') }}
               </div>
               <a-table
                 :pagination="false"
@@ -248,7 +252,7 @@
       >
         <span slot="operation" slot-scope="text,record">
           <a class="text" :title="text" @click="detailClick(record)">
-                {{text && text.length > 18?text.slice(0,17)+'...':text}}
+                {{ text && text.length > 18 ? text.slice(0, 17) + '...' : text }}
           </a>
         </span>
       </a-table>
@@ -262,7 +266,7 @@
     >
       <template slot="footer">
         <a-button key="back" @click="visibleFile = false">
-          {{$t('cancel')}}
+          {{ $t('cancel') }}
         </a-button>
       </template>
       <a-table
@@ -278,18 +282,18 @@
              :disabled="record.fileSuffix == '.pdf' || record.fileSuffix == '.docx' || record.fileSuffix == '.doc'
              || record.fileSuffix == '.jpg' || record.fileSuffix == '.png' || record.fileSuffix == '.gif'|| record.fileSuffix == '.jpeg'
              || record.fileSuffix == '.xlsx' || record.fileSuffix == '.xls' ? false : true">
-                {{$t('See')}}
+                {{ $t('See') }}
           </a>
           <a class="text" @click="download(record)">
-                {{$t('download')}}
+                {{ $t('download') }}
           </a>
           <a class="text" @click="breakdown(record)" v-if="record.splitFlag == 1">
-                {{$t('StandardBreakdown')}}
+                {{ $t('StandardBreakdown') }}
           </a>
         </span>
       </a-table>
     </a-modal>
-    <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
+    <JLoading :loading="loading">{{ $t('dataLoading') }}</JLoading>
     <uploadFile ref="uploadFile" :isUploadFile="true" :disabled="true"></uploadFile>
     <libraryPush
       :url="url"
@@ -298,907 +302,907 @@
   </div>
 </template>
 <script>
-  import { getAction, postAction, downFile, downloadFile } from '@/api/manage'
-  import { Base64 } from 'js-base64'
-  import uploadFile from '@/components/uploadFile/file'
-  import libraryPush from '@/components/libraryPush/index'
-  import { mapGetters } from 'vuex'
-  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
-  import eventBUs from '../../../../common/event'
+import { getAction, postAction, downFile, downloadFile } from '@/api/manage'
+import { Base64 } from 'js-base64'
+import uploadFile from '@/components/uploadFile/file'
+import libraryPush from '@/components/libraryPush/index'
+import { mapGetters } from 'vuex'
+import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+import eventBUs from '../../../../common/event'
 
-  export default {
-    name: 'docIndex',
-    components: {
-      uploadFile,
-      libraryPush
-    },
-    mixins: [ResizeColumnProvide, ResizeHeader],
-    data() {
-      return {
-        url: {
-          getInfo: 'document/bussDocumentLibraryEO/getInfoById',
-          list: 'log/bussLogEO/page',
-          getTitle: '/document/bussDocumentLibraryEO/getTitle',
-          getPage: '/document/phasedImplementationDetailsEO/page',
-          getMenuList: 'document/bussDocumentLibraryEO/getMenuList',
-          pullMessage: 'document/bussDocumentLibraryEO/pullMessage'//推送
+export default {
+  name: 'docIndex',
+  components: {
+    uploadFile,
+    libraryPush
+  },
+  mixins: [ResizeColumnProvide, ResizeHeader],
+  data() {
+    return {
+      url: {
+        getInfo: 'document/bussDocumentLibraryEO/getInfoById',
+        list: 'log/bussLogEO/page',
+        getTitle: '/document/bussDocumentLibraryEO/getTitle',
+        getPage: '/document/phasedImplementationDetailsEO/page',
+        getMenuList: 'document/bussDocumentLibraryEO/getMenuList',
+        pullMessage: 'document/bussDocumentLibraryEO/pullMessage'//推送
+      },
+      titleHeader: '',
+      visibleFile: false,
+      loading: false,
+      columnsRelated: [
+        {
+          title: this.$t('standardName'),
+          dataIndex: 'title',
+          align: 'left',
+          ellipsis: true,
+          scopedSlots: { customRender: 'operation' },
+          width: 544
+        }
+      ],
+      columnsFile: [
+        {
+          title: this.$t('fileName'),
+          dataIndex: 'fileName',
+          align: 'left',
+          width: 260,
+          ellipsis: true
         },
-        titleHeader: '',
-        visibleFile: false,
-        loading: false,
-        columnsRelated: [
-          {
-            title: this.$t('standardName'),
-            dataIndex: 'title',
-            align: 'left',
-            ellipsis: true,
-            scopedSlots: { customRender: 'operation' },
-            width: 544
-          }
-        ],
-        columnsFile: [
-          {
-            title: this.$t('fileName'),
-            dataIndex: 'fileName',
-            align: 'left',
-            width: 260,
-            ellipsis: true
-          },
-          {
-            title: this.$t('operation'),
-            align: 'left',
-            width: 130,
-            scopedSlots: { customRender: 'fileOperation' }
-          }
-        ],
-        dataSourceRelated: [],
-        detailList: [],
-        dataGrad: [],
-        visible: false,
-        serial_number: '',
-        confirmLoading: false,
-        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
-        downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
-        dataSource: [],
-        pageNo: 1,
-        tablepageNo: 1,
-        pageSize: 10,
-        tablepageSize: 10,
-        total: 0,
-        tabletotal: 0,
-        visibleRelated: false,
-        dataSourceFile: [],
-        documentId: this.$route.query.documentId === undefined ? this.$route.query.id : this.$route.query.documentId,
-        rightTitleList: [],
-        columnsGrading: [
-          {
-            title: this.$t('Statutenumberclause'),
-            dataIndex: 'standNumberOrClause',
-            align: 'left',
-            ellipsis: true,
-            width: '25%'
-          },
-          {
-            title: this.$t('Typeofimplementation'),
-            dataIndex: 'implementationTypeText',
-            align: 'left',
-            ellipsis: true,
-            width: '15%'
-          },
-          {
-            title: this.$t('implementationDateTwo'),
-            dataIndex: 'implementationDate',
-            align: 'left',
-            ellipsis: true,
-            width: '15%'
-          },
-          {
-            title: this.$t('remarks'),
-            dataIndex: 'remarks',
-            align: 'left',
-            width: '45%'
-          }
-        ],
-        columns: [
-          {
-            title: this.$t('ModificationContent'),
-            dataIndex: 'content',
-            align: 'left',
-            ellipsis: true,
-            scopedSlots: { customRender: 'content' },
-            width: 484
-          },
-          {
-            title: this.$t('ModificationTime'),
-            dataIndex: 'createTime',
-            align: 'left',
-            ellipsis: true,
-            width: 180
-          },
-          {
-            title: this.$t('personnel'),
-            dataIndex: 'createBy',
-            align: 'left',
-            ellipsis: true,
-            width: 180
-          }
-        ],
-        subscribeFlag: '',
-        collectFlag: ''
-      }
-    },
-    created() {
-      let _this = this
-      this.loading = true
-      document.title = this.$t('documentLibraryDetails')
+        {
+          title: this.$t('operation'),
+          align: 'left',
+          width: 130,
+          scopedSlots: { customRender: 'fileOperation' }
+        }
+      ],
+      dataSourceRelated: [],
+      detailList: [],
+      dataGrad: [],
+      visible: false,
+      serial_number: '',
+      confirmLoading: false,
+      downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+      downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
+      dataSource: [],
+      pageNo: 1,
+      tablepageNo: 1,
+      pageSize: 10,
+      tablepageSize: 10,
+      total: 0,
+      tabletotal: 0,
+      visibleRelated: false,
+      dataSourceFile: [],
+      documentId: this.$route.query.documentId === undefined ? this.$route.query.id : this.$route.query.documentId,
+      rightTitleList: [],
+      columnsGrading: [
+        {
+          title: this.$t('Statutenumberclause'),
+          dataIndex: 'standNumberOrClause',
+          align: 'left',
+          ellipsis: true,
+          width: '25%'
+        },
+        {
+          title: this.$t('Typeofimplementation'),
+          dataIndex: 'implementationTypeText',
+          align: 'left',
+          ellipsis: true,
+          width: '15%'
+        },
+        {
+          title: this.$t('implementationDateTwo'),
+          dataIndex: 'implementationDate',
+          align: 'left',
+          ellipsis: true,
+          width: '15%'
+        },
+        {
+          title: this.$t('remarks'),
+          dataIndex: 'remarks',
+          align: 'left',
+          width: '45%'
+        }
+      ],
+      columns: [
+        {
+          title: this.$t('ModificationContent'),
+          dataIndex: 'content',
+          align: 'left',
+          ellipsis: true,
+          scopedSlots: { customRender: 'content' },
+          width: 484
+        },
+        {
+          title: this.$t('ModificationTime'),
+          dataIndex: 'createTime',
+          align: 'left',
+          ellipsis: true,
+          width: 180
+        },
+        {
+          title: this.$t('personnel'),
+          dataIndex: 'createBy',
+          align: 'left',
+          ellipsis: true,
+          width: 180
+        }
+      ],
+      subscribeFlag: '',
+      collectFlag: ''
+    }
+  },
+  created() {
+    let _this = this
+    this.loading = true
+    document.title = this.$t('documentLibraryDetails')
 
-      this.getTitle(function() {
-        _this.getInfoById()
+    this.getTitle(function() {
+      _this.getInfoById()
+    })
+    this.getPage()
+    this.getRightTitle()
+    this.getWdkCollectAndSubscribeInfoByUser()
+  },
+  methods: {
+    ...mapGetters(['userInfo']),
+    shareClick() {
+      let _id = this.$route.query.documentId === undefined ? this.$route.query.id : this.$route.query.documentId
+      this.$refs.libraryPushRef.getPush(_id.split(','))
+    },
+    getWdkCollectAndSubscribeInfoByUser() {
+      let _id = this.$route.query.documentId === undefined ? this.$route.query.id : this.$route.query.documentId
+      getAction('/collection/onlCgformCollection/getWdkCollectAndSubscribeInfoByUser', { id: _id }).then((res) => {
+        if (res.success) {
+          if (res.result.subscribeList && res.result.subscribeList.length > 0) {
+            this.subscribeFlag = '1'
+          } else {
+            this.subscribeFlag = '0'
+          }
+          if (res.result.collectionList && res.result.collectionList.length > 0) {
+            this.collectFlag = '1'
+          } else {
+            this.collectFlag = '0'
+          }
+        }
       })
-      this.getPage()
-      this.getRightTitle()
-      this.getWdkCollectAndSubscribeInfoByUser()
     },
-    methods: {
-      ...mapGetters(['userInfo']),
-      shareClick() {
-        let _id = this.$route.query.documentId === undefined ? this.$route.query.id : this.$route.query.documentId
-        this.$refs.libraryPushRef.getPush(_id.split(','))
-      },
-      getWdkCollectAndSubscribeInfoByUser() {
-        let _id = this.$route.query.documentId === undefined ? this.$route.query.id : this.$route.query.documentId
-        getAction('/collection/onlCgformCollection/getWdkCollectAndSubscribeInfoByUser', { id: _id }).then((res) => {
-          if (res.success) {
-            if (res.result.subscribeList && res.result.subscribeList.length > 0) {
-              this.subscribeFlag = '1'
+    CollectionClick(val) {
+      let _this = this
+      this.$confirm({
+        content: val.collectFlag == 0 || !val.collectFlag ? _this.$t('ConfirmCollection') : _this.$t('cancelConfirmCollection'),
+        onOk() {
+          let url = ''
+          if (val.collectFlag == 0 || !val.collectFlag) {
+            url = 'document/bussDocumentLibraryEO/addCollect'
+          } else {
+            url = 'document/bussDocumentLibraryEO/cancelCollect'
+          }
+          getAction(url, { id: val.id }).then((res) => {
+            if (res.success) {
+              _this.$message.success(_this.$t('OperationSuccessful'))
+              _this.getWdkCollectAndSubscribeInfoByUser()
             } else {
-              this.subscribeFlag = '0'
-            }
-            if (res.result.collectionList && res.result.collectionList.length > 0) {
-              this.collectFlag = '1'
-            } else {
-              this.collectFlag = '0'
-            }
-          }
-        })
-      },
-      CollectionClick(val) {
-        let _this = this
-        this.$confirm({
-          content: val.collectFlag == 0 || !val.collectFlag ? _this.$t('ConfirmCollection') : _this.$t('cancelConfirmCollection'),
-          onOk() {
-            let url = ''
-            if (val.collectFlag == 0 || !val.collectFlag) {
-              url = 'document/bussDocumentLibraryEO/addCollect'
-            } else {
-              url = 'document/bussDocumentLibraryEO/cancelCollect'
-            }
-            getAction(url, { id: val.id }).then((res) => {
-              if (res.success) {
-                _this.$message.success(_this.$t('OperationSuccessful'))
-                _this.getWdkCollectAndSubscribeInfoByUser()
-              } else {
-                _this.$message.warning(_this.$t('operationFailed'))
-              }
-            })
-          }
-        })
-      },
-      DocumentTranslationClick() {
-        let serial_number = ''
-        if (this.detailList.length > 0) {
-          this.detailList[0][this.$t('essentialInformation')].forEach(res => {
-            if (res.db_field_name == 'serial_number') {
-              serial_number = res.value
+              _this.$message.warning(_this.$t('operationFailed'))
             }
           })
         }
-        let newUrl = this.$router.resolve({
-          path: '/documentTranslation',
-          query: {
-            serial_number: serial_number
-          }
-        })
-        window.open(newUrl.href, '_blank')
-      },
-      DocumentComparisonClick() {
-        let serial_number = ''
-        if (this.detailList.length > 0) {
-          this.detailList[0][this.$t('essentialInformation')].forEach(res => {
-            if (res.db_field_name == 'serial_number') {
-              serial_number = res.value
-            }
-          })
-        }
-        let newUrl = this.$router.resolve({
-          path: '/documentComparison',
-          query: {
-            serial_number: serial_number
-          }
-        })
-        window.open(newUrl.href, '_blank')
-      },
-      KnowledgeDatabaseClick() {
-        let serial_number = ''
-        if (this.detailList.length > 0) {
-          this.detailList[0][this.$t('essentialInformation')].forEach(res => {
-            if (res.db_field_name == 'serial_number') {
-              serial_number = res.value
-            }
-          })
-        }
-        // localStorage.setItem('serial_number',serial_number)
-        let newUrl = this.$router.resolve({
-          path: '/problemknowledgeBase',
-          query: {
-            serial_number: serial_number
-          }
-        })
-        window.open(newUrl.href, '_blank')
-      },
-      getTitle(callback) {
-        let _id = this.$route.query.documentId === undefined ? this.$route.query.id : this.$route.query.documentId
-        getAction(this.url.getTitle, { id: _id }).then((res) => {
-          if (res.success) {
-            this.serial_number = res.result
-            callback && callback()
-          } else {
-            this.serial_number = ''
-          }
-        })
-      },
-      getInfoById() {
-        let _id = this.$route.query.documentId === undefined ? this.$route.query.id : this.$route.query.documentId
-        getAction(this.url.getInfo, { id: _id }).then((res) => {
-          if (res.success) {
-            this.detailList = res.result
-            // this.$nextTick(() => {
-            //   let detailContentRightText = document.getElementsByClassName('detail-content-right-text')
-            //   detailContentRightText[0].classList.add('detail-content-right-text-color')
-            // })
-            this.loading = false
-          } else {
-            this.detailList = []
-          }
-        })
-      },
-      getPage() {
-        let tablequery = {
-          pageNo: this.tablepageNo,
-          pageSize: this.tablepageSize,
-          bussDocumentLibraryId: this.$route.query.id
-        }
-        getAction(this.url.getPage, tablequery).then((res) => {
-          if (res.success) {
-            this.dataGrad = res.result.records
-            this.tabletotal = res.result.total
-            this.loading = false
-          } else {
-            this.dataGrad = []
-            this.loading = false
-          }
-        })
-      },
-      clickButtonToUpload(item) {
-        this.loading = true
-        this.visibleFile = true
-        getAction('document/bussDocumentLibraryEO/getFileInfos', { id: item.join(',') }).then((res) => {
-          if (res.success) {
-            this.dataSourceFile = res.result
-            this.dataSourceFile.forEach((val) => {
-              let fileName = val.fileName
-              let index1 = fileName.lastIndexOf('.')
-              let index2 = fileName.length
-              let fileSuffix = fileName.substring(index1, index2)
-              val.fileSuffix = fileSuffix
-            })
-            this.loading = false
-          } else {
-            this.dataSourceFile = []
-            this.loading = false
-          }
-        })
-      },
-      pdfPreview(fileQuery) {
-        let fileName = fileQuery.fileName
-        let index1 = fileName.lastIndexOf('.')
-        let index2 = fileName.length
-        let fileSuffix = fileName.substring(index1, index2)
-        if (fileSuffix == '.pdf') {
-          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id + '&userName=' + this.userInfo().username))
-        } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
-          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
-          window.open(url, '_blank')
-        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
-          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
-          window.open(url, '_blank')
-        } else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
-          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + fileQuery.id + fileSuffix)
-          window.open(url, '_blank')
-        } else {
-          downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
-        }
-      },
-      download(item) {
-        downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username })
-      },
-      UpdateLog() {
-        this.visible = true
-        this.bussLogList()
-      },
-      handleOk() {
-        this.visible = false
-      },
-      handleCancel() {
-        this.visible = false
-      },
-      urlClick(item) {
-        window.open(item.value)
-      },
-      bussLogList() {
-        let query = {
-          pageNo: this.pageNo,
-          pageSize: this.pageSize,
-          documentId: this.$route.query.id
-        }
-        this.loading = true
-        getAction(this.url.list, query).then((res) => {
-          if (res.success) {
-            this.dataSource = res.result.records
-            this.total = res.result.total
-            this.loading = false
-          } else {
-            this.loading = false
-          }
-        })
-      },
-      onChange(page, pageSize) {
-        this.pageNo = page
-        this.bussLogList()
-      },
-      onTableChange(page, pageSize) {
-        this.tablepageNo = page
-        this.getPage()
-      },
-      SizeChange(page, pageSize) {
-        this.pageNo = 1
-        this.pageSize = pageSize
-        this.bussLogList()
-      },
-      tableSizeChange(page, pageSize) {
-        this.tablepageNo = 1
-        this.tablepageSize = pageSize
-        this.getPage()
-      },
-      DocumentSplitting() {
-        let serial_number = ''
-        if (this.detailList.length > 0) {
-          this.detailList[0][this.$t('essentialInformation')].forEach(res => {
-            if (res.db_field_name == 'serial_number') {
-              serial_number = res.value
-            }
-          })
-        }
-        let newUrl = this.$router.resolve({
-          path: '/docManage/splite',
-          query: {
-            serial_number: serial_number
-          }
-        })
-        window.open(newUrl.href, '_blank')
-      },
-      detailClick(val) {
-        let newUrl = this.$router.resolve({
-          path: '/docManage/library/detail',
-          query: val
-        })
-        this.visibleRelated = false
-        window.open(newUrl.href, '_blank')
-      },
-      relatedClick(val) {
-        let newUrl = this.$router.resolve({
-          path: '/docManage/library/detail',
-          query: val
-        })
-        window.open(newUrl.href, '_blank')
-      },
-      breakdown(item) {
-        let newUrl = this.$router.resolve({
-          path: '/docManage/splitting/splitDetail',
-          query: {
-            infoId: item.splitInfoId
-          }
-        })
-        window.open(newUrl.href, '_blank')
-      },
-      detailTextClick(num, name) {
-        let detailContentRightTextColor = document.getElementsByClassName('detail-content-right-text-color')
-        if (detailContentRightTextColor && detailContentRightTextColor.length > 0) {
-          detailContentRightTextColor[0].classList.remove('detail-content-right-text-color')
-        }
-        let detailContentRightText = document.getElementsByClassName('detail-content-right-text')
-        detailContentRightText[num].classList.add('detail-content-right-text-color')
-
-        let fixedPosition = document.getElementsByClassName('fixedPosition')
-        if (fixedPosition && fixedPosition.length > 0) {
-          for (let i = 0; i < fixedPosition.length; i++) {
-            if (fixedPosition[i].innerText == name) {
-              let offsetTop = fixedPosition[i].offsetTop
-              let body = document.documentElement || document.body
-              body.scrollTop = offsetTop - 68
-            }
-          }
-        }
-      },
-      getRightTitle() {
-        let _id = this.$route.query.documentId === undefined ? this.$route.query.id : this.$route.query.documentId
-        let query = {
-          id: _id
-        }
-        getAction(this.url.getMenuList, query).then((res) => {
-          if (res.success) {
-            this.rightTitleList = res.result
-            this.rightTitleList.push({
-              name: this.$t('DetailsPhasedImplementation')
-            })
-          } else {
-            this.rightTitleList = []
+      })
+    },
+    DocumentTranslationClick() {
+      let serial_number = ''
+      if (this.detailList.length > 0) {
+        this.detailList[0][this.$t('essentialInformation')].forEach(res => {
+          if (res.db_field_name == 'serial_number') {
+            serial_number = res.value
           }
         })
       }
+      let newUrl = this.$router.resolve({
+        path: '/documentTranslation',
+        query: {
+          serial_number: serial_number
+        }
+      })
+      window.open(newUrl.href, '_blank')
+    },
+    DocumentComparisonClick() {
+      let serial_number = ''
+      if (this.detailList.length > 0) {
+        this.detailList[0][this.$t('essentialInformation')].forEach(res => {
+          if (res.db_field_name == 'serial_number') {
+            serial_number = res.value
+          }
+        })
+      }
+      let newUrl = this.$router.resolve({
+        path: '/documentComparison',
+        query: {
+          serial_number: serial_number
+        }
+      })
+      window.open(newUrl.href, '_blank')
+    },
+    KnowledgeDatabaseClick() {
+      let serial_number = ''
+      if (this.detailList.length > 0) {
+        this.detailList[0][this.$t('essentialInformation')].forEach(res => {
+          if (res.db_field_name == 'serial_number') {
+            serial_number = res.value
+          }
+        })
+      }
+      // localStorage.setItem('serial_number',serial_number)
+      let newUrl = this.$router.resolve({
+        path: '/problemknowledgeBase',
+        query: {
+          serial_number: serial_number
+        }
+      })
+      window.open(newUrl.href, '_blank')
+    },
+    getTitle(callback) {
+      let _id = this.$route.query.documentId === undefined ? this.$route.query.id : this.$route.query.documentId
+      getAction(this.url.getTitle, { id: _id }).then((res) => {
+        if (res.success) {
+          this.serial_number = res.result
+          callback && callback()
+        } else {
+          this.serial_number = ''
+        }
+      })
+    },
+    getInfoById() {
+      let _id = this.$route.query.documentId === undefined ? this.$route.query.id : this.$route.query.documentId
+      getAction(this.url.getInfo, { id: _id }).then((res) => {
+        if (res.success) {
+          this.detailList = res.result
+          // this.$nextTick(() => {
+          //   let detailContentRightText = document.getElementsByClassName('detail-content-right-text')
+          //   detailContentRightText[0].classList.add('detail-content-right-text-color')
+          // })
+          this.loading = false
+        } else {
+          this.detailList = []
+        }
+      })
+    },
+    getPage() {
+      let tablequery = {
+        pageNo: this.tablepageNo,
+        pageSize: this.tablepageSize,
+        bussDocumentLibraryId: this.$route.query.id
+      }
+      getAction(this.url.getPage, tablequery).then((res) => {
+        if (res.success) {
+          this.dataGrad = res.result.records
+          this.tabletotal = res.result.total
+          this.loading = false
+        } else {
+          this.dataGrad = []
+          this.loading = false
+        }
+      })
+    },
+    clickButtonToUpload(item) {
+      this.loading = true
+      this.visibleFile = true
+      getAction('document/bussDocumentLibraryEO/getFileInfos', { id: item.join(',') }).then((res) => {
+        if (res.success) {
+          this.dataSourceFile = res.result
+          this.dataSourceFile.forEach((val) => {
+            let fileName = val.fileName
+            let index1 = fileName.lastIndexOf('.')
+            let index2 = fileName.length
+            let fileSuffix = fileName.substring(index1, index2)
+            val.fileSuffix = fileSuffix
+          })
+          this.loading = false
+        } else {
+          this.dataSourceFile = []
+          this.loading = false
+        }
+      })
+    },
+    pdfPreview(fileQuery) {
+      let fileName = fileQuery.fileName
+      let index1 = fileName.lastIndexOf('.')
+      let index2 = fileName.length
+      let fileSuffix = fileName.substring(index1, index2)
+      if (fileSuffix == '.pdf') {
+        window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id + '&userName=' + this.userInfo().username))
+      } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
+        let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
+        window.open(url, '_blank')
+      } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
+        let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
+        window.open(url, '_blank')
+      } else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+        let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + fileQuery.id + fileSuffix)
+        window.open(url, '_blank')
+      } else {
+        downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
+      }
+    },
+    download(item) {
+      downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username })
+    },
+    UpdateLog() {
+      this.visible = true
+      this.bussLogList()
+    },
+    handleOk() {
+      this.visible = false
+    },
+    handleCancel() {
+      this.visible = false
+    },
+    urlClick(item) {
+      window.open(item.value)
+    },
+    bussLogList() {
+      let query = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        documentId: this.$route.query.id
+      }
+      this.loading = true
+      getAction(this.url.list, query).then((res) => {
+        if (res.success) {
+          this.dataSource = res.result.records
+          this.total = res.result.total
+          this.loading = false
+        } else {
+          this.loading = false
+        }
+      })
+    },
+    onChange(page, pageSize) {
+      this.pageNo = page
+      this.bussLogList()
+    },
+    onTableChange(page, pageSize) {
+      this.tablepageNo = page
+      this.getPage()
+    },
+    SizeChange(page, pageSize) {
+      this.pageNo = 1
+      this.pageSize = pageSize
+      this.bussLogList()
+    },
+    tableSizeChange(page, pageSize) {
+      this.tablepageNo = 1
+      this.tablepageSize = pageSize
+      this.getPage()
+    },
+    DocumentSplitting() {
+      let serial_number = ''
+      if (this.detailList.length > 0) {
+        this.detailList[0][this.$t('essentialInformation')].forEach(res => {
+          if (res.db_field_name == 'serial_number') {
+            serial_number = res.value
+          }
+        })
+      }
+      let newUrl = this.$router.resolve({
+        path: '/docManage/splite',
+        query: {
+          serial_number: serial_number
+        }
+      })
+      window.open(newUrl.href, '_blank')
+    },
+    detailClick(val) {
+      let newUrl = this.$router.resolve({
+        path: '/docManage/library/detail',
+        query: val
+      })
+      this.visibleRelated = false
+      window.open(newUrl.href, '_blank')
+    },
+    relatedClick(val) {
+      let newUrl = this.$router.resolve({
+        path: '/docManage/library/detail',
+        query: val
+      })
+      window.open(newUrl.href, '_blank')
+    },
+    breakdown(item) {
+      let newUrl = this.$router.resolve({
+        path: '/docManage/splitting/splitDetail',
+        query: {
+          infoId: item.splitInfoId
+        }
+      })
+      window.open(newUrl.href, '_blank')
+    },
+    detailTextClick(num, name) {
+      let detailContentRightTextColor = document.getElementsByClassName('detail-content-right-text-color')
+      if (detailContentRightTextColor && detailContentRightTextColor.length > 0) {
+        detailContentRightTextColor[0].classList.remove('detail-content-right-text-color')
+      }
+      let detailContentRightText = document.getElementsByClassName('detail-content-right-text')
+      detailContentRightText[num].classList.add('detail-content-right-text-color')
+
+      let fixedPosition = document.getElementsByClassName('fixedPosition')
+      if (fixedPosition && fixedPosition.length > 0) {
+        for (let i = 0; i < fixedPosition.length; i++) {
+          if (fixedPosition[i].innerText == name) {
+            let offsetTop = fixedPosition[i].offsetTop
+            let body = document.documentElement || document.body
+            body.scrollTop = offsetTop - 68
+          }
+        }
+      }
+    },
+    getRightTitle() {
+      let _id = this.$route.query.documentId === undefined ? this.$route.query.id : this.$route.query.documentId
+      let query = {
+        id: _id
+      }
+      getAction(this.url.getMenuList, query).then((res) => {
+        if (res.success) {
+          this.rightTitleList = res.result
+          this.rightTitleList.push({
+            name: this.$t('DetailsPhasedImplementation')
+          })
+        } else {
+          this.rightTitleList = []
+        }
+      })
     }
   }
+}
 </script>
 <style>
-  .highlight-class {
-    color: #00B3BE;
-  }
+.highlight-class {
+  color: #00B3BE;
+}
 
-  .uploadFile .ant-upload {
-    display: none !important;
-  }
+.uploadFile .ant-upload {
+  display: none !important;
+}
 
-  .tooltipColor .ant-tooltip-inner {
-    color: #333;
-    background-color: #fff !important;
-  }
+.tooltipColor .ant-tooltip-inner {
+  color: #333;
+  background-color: #fff !important;
+}
 
-  .tooltipColor .ant-tooltip-arrow::before {
-    background-color: #fff;
-  }
+.tooltipColor .ant-tooltip-arrow::before {
+  background-color: #fff;
+}
 </style>
 <style lang="less" scoped>
-  @import '~@assets/less/common.less';
+@import '~@assets/less/common.less';
 
-  body {
-    height: auto;
-    transition: all .5s linear !important;
+body {
+  height: auto;
+  transition: all .5s linear !important;
+}
+
+.doc-detail {
+  background: #fff;
+  height: 100%;
+
+  .detail-content {
+    /*width: calc(100% - 212px);*/
+    width: 100%;
   }
 
-  .doc-detail {
-    background: #fff;
-    height: 100%;
-
-    .detail-content {
-      /*width: calc(100% - 212px);*/
+  .doc-detail-wrap {
+    .doc-detail-header {
       width: 100%;
+      height: 68px;
+      line-height: 68px;
+      padding: 0 0 0 32px;
+      box-sizing: border-box;
+      display: flex;
+      justify-content: space-between;
+      border-bottom: 2px #eff1f3 solid;
+      background: #fff;
+
+      .doc-detail-title {
+        display: inline-block;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        font-size: 20px;
+        font-weight: 400;
+        color: #040B29;
+        line-height: 68px;
+      }
+
+      .doc-detail-right {
+        /*width: 800px;*/
+        line-height: 68px;
+        display: flex;
+        align-items: center;
+
+        .doc-detail-btn {
+          margin-left: 10px;
+        }
+      }
     }
 
-    .doc-detail-wrap {
-      .doc-detail-header {
-        width: 100%;
-        height: 68px;
-        line-height: 68px;
-        padding: 0 0 0 32px;
-        box-sizing: border-box;
-        display: flex;
-        justify-content: space-between;
-        border-bottom: 2px #eff1f3 solid;
-        background: #fff;
+    .content-box {
+      /*padding: 0 40px 0 32px;*/
+      /*box-sizing: border-box;*/
+    }
 
-        .doc-detail-title {
+    .header-text {
+      font-size: 16px;
+      font-weight: bold;
+      height: 90px;
+      color: #000F16;
+      line-height: 110px;
+    }
+
+    .content-text {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+
+      .text-field {
+        width: 33%;
+        margin-bottom: 8px;
+
+        .text-field-left {
+          width: 114px;
           display: inline-block;
+          font-size: 14px;
+          font-weight: 400;
+          color: #6F7385;
           text-overflow: ellipsis;
           white-space: nowrap;
           overflow: hidden;
-          font-size: 20px;
-          font-weight: 400;
+          margin-right: 6px;
+        }
+
+        .text-field-right {
+          width: calc(100% - 130px);
+          display: inline-block;
+          font-size: 14px;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          overflow: hidden;
+          word-break: break-word;
           color: #040B29;
-          line-height: 68px;
-        }
-
-        .doc-detail-right {
-          /*width: 800px;*/
-          line-height: 68px;
-          display: flex;
-          align-items: center;
-
-          .doc-detail-btn {
-            margin-left: 10px;
-          }
+          /*font-weight: bold;*/
         }
       }
 
-      .content-box {
-        /*padding: 0 40px 0 32px;*/
-        /*box-sizing: border-box;*/
-      }
-
-      .header-text {
-        font-size: 16px;
-        font-weight: bold;
-        height: 90px;
-        color: #000F16;
-        line-height: 110px;
-      }
-
-      .content-text {
+      .text-content-button-one {
         width: 100%;
-        display: flex;
-        flex-wrap: wrap;
 
-        .text-field {
-          width: 33%;
-          margin-bottom: 8px;
-
-          .text-field-left {
-            width: 114px;
-            display: inline-block;
-            font-size: 14px;
-            font-weight: 400;
-            color: #6F7385;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            overflow: hidden;
-            margin-right: 6px;
-          }
-
-          .text-field-right {
-            width: calc(100% - 130px);
-            display: inline-block;
-            font-size: 14px;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            overflow: hidden;
-            word-break: break-word;
-            color: #040B29;
-            /*font-weight: bold;*/
-          }
+        .text-field-left {
+          width: 114px;
+          display: inline-block;
+          font-size: 14px;
+          font-weight: 400;
+          color: #6F7385;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          overflow: hidden;
+          margin-right: 6px;
+          float: left;
         }
 
-        .text-content-button-one {
-          width: 100%;
+        .text-field-right {
+          width: calc(66.6% - 130px);
+          display: inline-block;
+          font-size: 14px;
+          text-overflow: ellipsis;
+          white-space: pre-wrap;
+          word-break: break-word;
+          overflow: visible;
+          float: left;
+          color: #040B29;
+          /*font-weight: bold;*/
+        }
+      }
 
-          .text-field-left {
-            width: 114px;
-            display: inline-block;
-            font-size: 14px;
-            font-weight: 400;
-            color: #6F7385;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            overflow: hidden;
-            margin-right: 6px;
-            float: left;
-          }
+      .text-content-button-Two {
+        width: 67%;
 
-          .text-field-right {
-            width: calc(66.6% - 130px);
-            display: inline-block;
-            font-size: 14px;
-            text-overflow: ellipsis;
-            white-space: pre-wrap;
-            word-break: break-word;
-            overflow: visible;
-            float: left;
-            color: #040B29;
-            /*font-weight: bold;*/
-          }
+        .text-field-left {
+          width: 114px;
+          display: inline-block;
+          font-size: 14px;
+          font-weight: 400;
+          color: #6F7385;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          overflow: hidden;
+          margin-right: 6px;
+          float: left;
         }
 
-        .text-content-button-Two {
-          width: 67%;
+        .text-field-right {
+          width: calc(100% - 130px);
+          display: inline-block;
+          font-size: 14px;
+          text-overflow: ellipsis;
+          white-space: pre-wrap;
+          word-break: break-word;
+          overflow: hidden;
+          float: left;
+          color: #040B29;
+          /*font-weight: bold;*/
+        }
 
-          .text-field-left {
-            width: 114px;
-            display: inline-block;
-            font-size: 14px;
-            font-weight: 400;
-            color: #6F7385;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            overflow: hidden;
-            margin-right: 6px;
-            float: left;
-          }
-
-          .text-field-right {
-            width: calc(100% - 130px);
-            display: inline-block;
-            font-size: 14px;
-            text-overflow: ellipsis;
-            white-space: pre-wrap;
-            word-break: break-word;
-            overflow: hidden;
-            float: left;
-            color: #040B29;
-            /*font-weight: bold;*/
-          }
-
-          .text-field-right-text {
-            width: calc(50% - 140px);
-          }
+        .text-field-right-text {
+          width: calc(50% - 140px);
         }
       }
     }
   }
+}
 
-  /*.detail-box {*/
-  /*  padding: 0 0 0 170px;*/
-  /*  box-sizing: border-box;*/
-  /*}*/
+/*.detail-box {*/
+/*  padding: 0 0 0 170px;*/
+/*  box-sizing: border-box;*/
+/*}*/
 
-  .detail-box {
-    padding: 0 110px 0 110px;
-    box-sizing: border-box;
-  }
+.detail-box {
+  padding: 0 110px 0 110px;
+  box-sizing: border-box;
+}
 
-  .page {
-    text-align: right;
-    margin-top: 20px;
-  }
+.page {
+  text-align: right;
+  margin-top: 20px;
+}
 
-  .operator-text-text {
-    cursor: pointer;
-    margin-right: 16px;
-    font-size: 14px;
-    font-weight: 400;
-    color: #040B29;
-    display: inline-block;
-    width: 130px;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-    text-align: center;
-    height: 40px;
-    border: 1px solid #CED0D8;
-    border-radius: 4px;
-    line-height: 40px;
-    padding: 0 5px;
-  }
+.operator-text-text {
+  cursor: pointer;
+  margin-right: 16px;
+  font-size: 14px;
+  font-weight: 400;
+  color: #040B29;
+  display: inline-block;
+  width: 130px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  text-align: center;
+  height: 40px;
+  border: 1px solid #CED0D8;
+  border-radius: 4px;
+  line-height: 40px;
+  padding: 0 5px;
+}
 
-  .content-box:last-child {
-    margin-bottom: 20px;
-  }
+.content-box:last-child {
+  margin-bottom: 20px;
+}
 
-  .tableInformation {
-    width: 100%;
-    height: auto;
+.tableInformation {
+  width: 100%;
+  height: auto;
 
-  }
+}
 
-  .trInformation {
-    height: 56px;
+.trInformation {
+  height: 56px;
 
-  }
+}
 
-  .tdInformation {
-    border: 1px #eff1f3 solid;
-    text-align: center;
-  }
+.tdInformation {
+  border: 1px #eff1f3 solid;
+  text-align: center;
+}
 
-  .LeftTdInformation {
-    width: 268px;
-    background: #f7f7f8;
-    color: #040B29;
-    font-weight: bold;
-    font-size: 14px;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-  }
+.LeftTdInformation {
+  width: 268px;
+  background: #f7f7f8;
+  color: #040B29;
+  font-weight: bold;
+  font-size: 14px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
 
-  .conteTdInformation {
-    color: #01A0AC;
-    font-size: 14px;
-    font-weight: 400;
-  }
+.conteTdInformation {
+  color: #01A0AC;
+  font-size: 14px;
+  font-weight: 400;
+}
 
-  .leftconteTdInformation {
-    max-width: calc(100% - 30px);
-    display: inline-block;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-    margin-right: 4px;
-    color: #01A0AC;
-    cursor: pointer;
-    font-size: 14px;
-  }
+.leftconteTdInformation {
+  max-width: calc(100% - 30px);
+  display: inline-block;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  margin-right: 4px;
+  color: #01A0AC;
+  cursor: pointer;
+  font-size: 14px;
+}
 
-  .leftconteTdInformation-icon {
-    color: #01A0AC;
-    cursor: pointer;
-    margin-right: 6px;
-    font-size: 14px;
-  }
+.leftconteTdInformation-icon {
+  color: #01A0AC;
+  cursor: pointer;
+  margin-right: 6px;
+  font-size: 14px;
+}
 
-  .rightTdInformation {
-    width: 120px;
-    cursor: pointer;
-    color: #00B3BE;
-    font-size: 14px;
-    font-weight: 400;
-    text-align: right;
-    padding: 0 20px 0 0;
-    box-sizing: border-box;
-    display: inline-block;
-    position: absolute;
-    right: 30px;
-  }
+.rightTdInformation {
+  width: 120px;
+  cursor: pointer;
+  color: #00B3BE;
+  font-size: 14px;
+  font-weight: 400;
+  text-align: right;
+  padding: 0 20px 0 0;
+  box-sizing: border-box;
+  display: inline-block;
+  position: absolute;
+  right: 30px;
+}
 
-  .Standard-breakdown {
-    display: inline-block;
-    position: absolute;
-    right: 153px;
-    margin-top: 1px;
-    cursor: pointer;
-  }
+.Standard-breakdown {
+  display: inline-block;
+  position: absolute;
+  right: 153px;
+  margin-top: 1px;
+  cursor: pointer;
+}
 
-  .TextInformationContentcontentButton {
-    width: calc(100% - 268px);
-    text-align: center;
-    color: #01A0AC;
-    font-size: 14px;
-    font-weight: 400;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-  }
+.TextInformationContentcontentButton {
+  width: calc(100% - 268px);
+  text-align: center;
+  color: #01A0AC;
+  font-size: 14px;
+  font-weight: 400;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
 
-  .TextInformationContentcontent {
-    width: calc(100% - 268px);
-    text-align: center;
-    color: #040B29;
-    font-size: 14px;
-    font-weight: 400;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-  }
+.TextInformationContentcontent {
+  width: calc(100% - 268px);
+  text-align: center;
+  color: #040B29;
+  font-size: 14px;
+  font-weight: 400;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
 
-  .text-field-right-color {
-    color: #00B3BE !important;
-    cursor: pointer;
-  }
+.text-field-right-color {
+  color: #00B3BE !important;
+  cursor: pointer;
+}
 
-  /deep/ .ant-table-placeholder {
-    margin-top: 0px !important;
-  }
+/deep/ .ant-table-placeholder {
+  margin-top: 0px !important;
+}
 
-  .text {
-    margin-right: 10px
-  }
+.text {
+  margin-right: 10px
+}
 
-  .TextInformation {
-    display: flex;
-    flex-wrap: wrap;
-  }
+.TextInformation {
+  display: flex;
+  flex-wrap: wrap;
+}
 
-  .TextInformation-box {
-    width: calc(33.3% - 10px);
-    height: auto;
-    display: inline-block;
-    overflow: hidden;
-    margin-right: 15px;
-  }
+.TextInformation-box {
+  width: calc(33.3% - 10px);
+  height: auto;
+  display: inline-block;
+  overflow: hidden;
+  margin-right: 15px;
+}
 
-  .TextInformation-box:nth-child(3n) {
-    margin-right: 0;
-  }
+.TextInformation-box:nth-child(3n) {
+  margin-right: 0;
+}
 
-  .TextInformation-box-title {
-    background: #f3f6f6;
-    border-radius: 4px;
-    width: 100%;
-    display: inline-block;
-    height: 44px;
-    padding: 0 16px;
-    line-height: 44px;
-    color: #040B29;
-    font-weight: 500;
-    font-size: 14px;
-  }
+.TextInformation-box-title {
+  background: #f3f6f6;
+  border-radius: 4px;
+  width: 100%;
+  display: inline-block;
+  height: 44px;
+  padding: 0 16px;
+  line-height: 44px;
+  color: #040B29;
+  font-weight: 500;
+  font-size: 14px;
+}
 
-  .TextInformation-box-box {
-    width: 100%;
-    height: auto;
-    padding: 10px 16px 10px 16px;
-    overflow: hidden;
-  }
+.TextInformation-box-box {
+  width: 100%;
+  height: auto;
+  padding: 10px 16px 10px 16px;
+  overflow: hidden;
+}
 
-  .TextInformation-box-box-text {
-    width: 100%;
-    margin-right: 20px;
-    height: 36px;
-    float: left;
-    display: flex;
-    align-items: center;
-  }
+.TextInformation-box-box-text {
+  width: 100%;
+  margin-right: 20px;
+  height: 36px;
+  float: left;
+  display: flex;
+  align-items: center;
+}
 
-  .detail-content-right {
-    width: 212px;
-    position: fixed;
-    top: 120px;
-    right: 0;
-    padding: 0 32px 0 0;
-  }
+.detail-content-right {
+  width: 212px;
+  position: fixed;
+  top: 120px;
+  right: 0;
+  padding: 0 32px 0 0;
+}
 
-  .detail-content-right-text {
-    color: #040B29;
-    font-size: 14px;
-    /*font-weight: bolder;*/
-    height: 36px;
-    line-height: 36px;
-    border-left: 2px #CED0D8 solid;
-    padding: 0 0 0 8px;
-    box-sizing: border-box;
-    cursor: pointer;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-  }
+.detail-content-right-text {
+  color: #040B29;
+  font-size: 14px;
+  /*font-weight: bolder;*/
+  height: 36px;
+  line-height: 36px;
+  border-left: 2px #CED0D8 solid;
+  padding: 0 0 0 8px;
+  box-sizing: border-box;
+  cursor: pointer;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
 
-  .detail-content-right-text-one {
-    padding: 0 0 0 20px;
-  }
+.detail-content-right-text-one {
+  padding: 0 0 0 20px;
+}
 
-  .detail-content-right-text-color {
-    color: #01A0AC;
-    border-left: 2px #01A0AC solid;
-  }
+.detail-content-right-text-color {
+  color: #01A0AC;
+  border-left: 2px #01A0AC solid;
+}
 
-  .text-field-left-Index {
-    width: 114px;
-    display: inline-block;
-    font-size: 14px;
-    font-weight: 400;
-    color: #6F7385;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-    margin-right: 6px;
-    float: left;
-  }
+.text-field-left-Index {
+  width: 114px;
+  display: inline-block;
+  font-size: 14px;
+  font-weight: 400;
+  color: #6F7385;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  margin-right: 6px;
+  float: left;
+}
 
-  .text-field-right-Index {
-    width: calc(100% - 130px);
-    display: inline-block;
-    font-size: 14px;
-    word-break: break-word;
-    float: left;
-  }
+.text-field-right-Index {
+  width: calc(100% - 130px);
+  display: inline-block;
+  font-size: 14px;
+  word-break: break-word;
+  float: left;
+}
 
-  .text-field-right-color-text {
-    width: calc(50% - 20px);
-    margin-right: 20px;
-    font-size: 14px;
-    display: inline-block;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-    cursor: pointer;
-    /*font-weight: bold;*/
-    color: #01A0AC;
-  }
+.text-field-right-color-text {
+  width: calc(50% - 20px);
+  margin-right: 20px;
+  font-size: 14px;
+  display: inline-block;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  cursor: pointer;
+  /*font-weight: bold;*/
+  color: #01A0AC;
+}
 
-  ::v-deep .ant-table-column-title {
-    font-weight: 400 !important;
-    color: #040B29 !important;
-  }
+::v-deep .ant-table-column-title {
+  font-weight: 400 !important;
+  color: #040B29 !important;
+}
 
-  ::v-deep .ant-table-column-title {
-    font-weight: 400 !important;
-    color: #040B29 !important;
-  }
+::v-deep .ant-table-column-title {
+  font-weight: 400 !important;
+  color: #040B29 !important;
+}
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
index ff4cf2878..33df79117 100644
--- a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
@@ -43,8 +43,7 @@
                     @click="cancleImports">{{$t('cancel')}}
           </a-button>
           <a-button class="imports-btn imports-sub" type="primary" @click="handleSubmit"
-                    :loading="loading"
-                    v-has="'split:sarFileSplitItems:importSplitResult'">{{$t('submit')}}
+                    :loading="loading">{{$t('submit')}}
           </a-button>
         </div>
       </div>
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue
index 3091e74c0..245591279 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue
@@ -68,8 +68,7 @@
           <a-button class="split-btn" @click="cancelSplit"
                     style='margin-right: 15px'>{{$t('cancel')}}
           </a-button>
-          <a-button class="split-btn split-chai" type="primary" :loading="loading" @click="submitSplit"
-                    v-has="'split:sarFileSplitInfo:add'">{{$t('submit')}}
+          <a-button class="split-btn split-chai" type="primary" :loading="loading" @click="submitSplit">{{$t('submit')}}
           </a-button>
         </div>
       </div>
diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue
index b0737e69a..c49ddb59c 100644
--- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue
@@ -144,18 +144,23 @@
 <!--           <a class="text-operation" @click="viewProcessClick(record)">{{$t('viewProcess')}}</a>-->
           <!--           v-if="record.flowStatus == 'Completed'"-->
            <a class="text-operation"
+              v-has="'otasj:view'"
               @click="detailclick(record)">{{$t('See')}}</a>
           <a class="text-operation"
+             v-has="'otasj:maintenance'"
              @click="maintenanceClick(record)">{{$t('maintenance')}}</a>
 
           <a class="text-operation"
+             v-has="'otasj:endUpgrade'"
              @click="endUpgrade(record , '0')" v-if="record.sjzt == '0' && record.bazt=='4'">{{$t('endUpgrade')}}</a>
              <a class="text-operation"
+                v-has="'otasj:upgradecompletion'"
              @click="endUpgrade(record , '1')" v-if="record.sjzt == '1'">{{$t('upgradecompletion')}}</a>
           <a class="text-operation"
+             v-has="'otasj:export'"
              @click="handleExport(record)">{{$t('export')}}</a>
           <a class="text-operation"
-             v-has="'regulatoryAndTechnicalAssessment:delete'"
+             v-has="'otasj:delete'"
              @click="deleteData(record)">{{$t('delete')}}</a>
         </span>
       </a-table>
diff --git a/jero-web/src/views/otamanagement/vehicleregistration/index.vue b/jero-web/src/views/otamanagement/vehicleregistration/index.vue
index 527118776..2b11369ac 100644
--- a/jero-web/src/views/otamanagement/vehicleregistration/index.vue
+++ b/jero-web/src/views/otamanagement/vehicleregistration/index.vue
@@ -119,10 +119,10 @@
         <span slot="operation" slot-scope="text,record">
           <!--           <a class="text-operation" @click="viewProcessClick(record)">{{$t('viewProcess')}}</a>-->
           <!--           v-if="record.flowStatus == 'Completed'"-->
-          <a class="text-operation" @click="detailclick(record)">{{ $t('See') }}</a>
-          <a class="text-operation" @click="maintenanceClick(record)">{{ $t('maintenance') }}</a>
-          <a class="text-operation" @click="handleExport(record)">{{ $t('export') }}</a>
-          <a class="text-operation" v-has="'regulatoryAndTechnicalAssessment:delete'"
+          <a class="text-operation" v-has="'otacx:view'" @click="detailclick(record)">{{ $t('See') }}</a>
+          <a class="text-operation" v-has="'otacx:maintenance'" @click="maintenanceClick(record)">{{ $t('maintenance') }}</a>
+          <a class="text-operation" v-has="'otacx:export'" @click="handleExport(record)">{{ $t('export') }}</a>
+          <a class="text-operation" v-has="'otacx:delete'"
             @click="deleteData(record)">{{ $t('delete') }}</a>
         </span>
       </a-table>
diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
index a34534245..d4d1345ad 100644
--- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
+++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
@@ -71,7 +71,7 @@
     <div class="box-top" style="position: relative">
       <!--      <span class="box-top-text">{{ $t('regulatoryCertificationTaskPlan') }}</span>-->
       <!--      <span class="box-top-text fullScreenView" @click="TaskPlanListClick">{{ $t('fullScreenView') }}</span>-->
-      <span style="float: right" @click="handleExport" class="box-top-text-right">
+      <span style="float: right" @click="handleExport" v-has="'board:export'" class="box-top-text-right">
               <a-icon type="export" :rotate="-90"/>
                 {{ $t('export') }}
       </span>

From 570e368208764d1a982bb3e813de720e23afb702 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Sat, 23 Sep 2023 11:54:17 +0800
Subject: [PATCH 132/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E8=8B=B1?=
 =?UTF-8?q?=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BussDocumentLibraryEOServiceImpl.java        | 4 ++--
 .../project/enums/CertificationInventoryFlowStatusEnum.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index 1ff4ec1e7..26505d519 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -5468,7 +5468,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 list.add(map4);
                 //文件信息
                 map5.put("db_field_name", "text_info");//字段
-                map5.put("db_field_txt", "Text Info");//字段中文名
+                map5.put("db_field_txt", "Text Status");//字段中文名
                 list.add(map5);
             }
         } else if ("condition".equals(flag)) {
@@ -5551,7 +5551,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 list.add(map3);
                 //文件信息
                 map4.put("db_field_name", "text_info");//字段
-                map4.put("db_field_txt", "Text Info");//字段中文名
+                map4.put("db_field_txt", "Text Status");//字段中文名
                 list.add(map4);
             }
         } else if ("condition".equals(flag)) {
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationInventoryFlowStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationInventoryFlowStatusEnum.java
index ae3e31c20..211b6c269 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationInventoryFlowStatusEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationInventoryFlowStatusEnum.java
@@ -32,8 +32,8 @@ public enum CertificationInventoryFlowStatusEnum {
     RESULTS_TO_BE_SUBMITTED("结果待提交","Results to be submitted","Results to be submitted"),
     //ENGINEER_RETURN("工程师退回","Engineer return","Engineer return"),
     RESULTS_TO_BE_REVIEWED("结果待审查","Results to be reviewed","Results to be reviewed"),
-    REVIEW_AND_PASS("审查通过","Review and pass","Review and pass"),
-    REVIEW_AND_RETURN("审查退回","Review and return","Review and return"),
+    REVIEW_AND_PASS("审查通过","Approve","Review and pass"),
+    REVIEW_AND_RETURN("审查退回","Reject","Review and return"),
     UNINVOLVED("不涉及","NA","NA"),
     ;
 

From 63d5cce6ed35f04e6e58c4214eea578a5ba6ac1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Sat, 23 Sep 2023 15:00:31 +0800
Subject: [PATCH 133/288] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3=3D?=
 =?UTF-8?q?=E5=B0=86=E4=B8=8A=E6=8A=A5=E5=BA=93=E6=95=B0=E6=8D=AE=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E8=87=B3=E6=94=B6=E9=9B=86=E6=B8=85=E5=8D=95(?=
 =?UTF-8?q?=E4=BB=85=E9=99=90=E5=8F=98=E6=9B=B4=E7=8A=B6=E6=80=81)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsManifestEOController.java           | 16 +++++
 .../service/IParamsManifestEOService.java     |  3 +
 .../impl/ParamsManifestEOServiceImpl.java     | 58 +++++++++++++++++++
 .../mapper/xml/ParamsReportDetailEOMapper.xml |  1 +
 4 files changed, 78 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
index 14c8158b0..f9a6525c8 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
@@ -382,4 +382,20 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
         return super.importExcel(request, response, ParamsManifestEO.class);
     }
 
+
+
+	/**
+	 * 将上报库数据同步至收集清单(仅限变更状态)
+	 *
+	 * @param id
+	 * @return
+	 */
+	@ApiOperation(value="参数清单-将上报库数据同步至收集清单(仅限变更状态)", notes="参数清单-将上报库数据同步至收集清单(仅限变更状态)")
+	@GetMapping(value = "/syncChangeDataFromReport")
+	public Result<?> syncChangeDataFromReport(@RequestParam(name="paramsManifestId",required=true) String paramsManifestId,
+									 @RequestParam(name="reportManifestId",required=true) String reportManifestId) {
+		paramsManifestEOService.syncChangeDataFromReport(paramsManifestId, reportManifestId);
+		return Result.OK("操作成功！");
+	}
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java
index 175fc4866..3fadb4d47 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java
@@ -119,4 +119,7 @@ public interface IParamsManifestEOService extends IService<ParamsManifestEO> {
 	 * @param json
 	 */
     void replacementUser(JSONObject json);
+
+
+	void syncChangeDataFromReport(String paramsManifestId, String reportManifestId);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
index 4b8742a10..b475f1391 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
@@ -733,6 +733,63 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
         return updateById(updateManifestEO);
     }
 
+    /**
+     * 将上报库数据同步至收集清单(仅限变更状态)
+     */
+    public void syncChangeDataFromReport(String paramsManifestId, String reportManifestId) {
+        ParamsManifestEO paramsManifestEO = getById(paramsManifestId);
+
+        List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOMapper.queryByParamManifestId(paramsManifestId);
+
+        // 查询配置信息
+        List<ParamsConfigEO> pcList = paramsConfigEOService.queryList(paramsManifestId);
+        List<String> configIdList = pcList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList());
+        Map<String, String> ocNameMap = pcList.stream().collect(Collectors.toMap(ParamsConfigEO::getId, ParamsConfigEO::getConfigName));
+        List<ParamsConfigDataEO> paramsConfigDataEOList = paramsConfigDataEOService.queryListByConfigIdList(configIdList);
+        List<ParamsConfigDataEO> updateList = new ArrayList<>();
+
+        // 查询上报库的项目所有参数项的配置数据
+        ParamsReportEO paramsReportEO = paramsReportEOService.getById(reportManifestId);
+        List<Map<String, Object>> paramsReportConfigDataList = paramsReportDetailEOService.listInfoForChange(paramsReportEO.getId());
+
+        for (ParamsCollectManifestEO pcm : paramsCollectManifestEOList) {
+            if (CollectManifestStateEnum.CHANGE.getValue().equals(pcm.getState()) && !"11".equals(pcm.getControlType())) {
+                List<ParamsConfigDataEO> pcdList = paramsConfigDataEOList.stream().filter(e -> e.getParamsCollectManifestId().equals(pcm.getId())).collect(Collectors.toList());
+                if (CollectionUtils.isNotEmpty(pcdList)) {
+                    for (ParamsConfigDataEO pcd : pcdList) {
+                        boolean flag = false;
+                        List<Map<String, Object>> prcdList = paramsReportConfigDataList.stream().filter(o ->
+                                o.get("nio_number").equals(pcm.getNioNumber())
+                                        && o.get("config_name").equals(ocNameMap.get(pcd.getParamsConfigId()))
+                        ).collect(Collectors.toList());
+                        if (CollectionUtils.isNotEmpty(prcdList) && prcdList.size() == 1) {//多值情况忽略
+                            Map<String, Object> prcdMap = prcdList.get(0);
+                            if (ObjectUtil.isNotEmpty(prcdMap.get("text_data")) && !StringUtils.equals(pcd.getTextData(), String.valueOf(prcdMap.get("text_data")))) {
+                                flag = true;
+                                pcd.setTextData(String.valueOf(prcdMap.get("text_data")));
+                            }
+                            if (ObjectUtil.isNotEmpty(prcdMap.get("pull_data")) && !StringUtils.equals(pcd.getPullData(), String.valueOf(prcdMap.get("pull_data")))) {
+                                flag = true;
+                                pcd.setPullData(String.valueOf(prcdMap.get("pull_data")));
+                            }
+                            if (ObjectUtil.isNotEmpty(prcdMap.get("file_connect_id")) && !StringUtils.equals(pcd.getFileConnectId(), String.valueOf(prcdMap.get("file_connect_id")))) {
+                                flag = true;
+                                pcd.setFileConnectId(String.valueOf(prcdMap.get("file_connect_id")));
+                            }
+                            if(flag){
+                                updateList.add(pcd);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        if(CollectionUtils.isNotEmpty(updateList)){
+            paramsConfigDataEOService.updateBatchById(updateList);
+        }
+    }
+
+
     /**
      * 从历史版本进行扩展变更
      */
@@ -1465,4 +1522,5 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
             }
         }
     }
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
index 1b9ee69da..ca1b9f50a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
@@ -187,6 +187,7 @@
         select
             prcd.*,
             prc.old_params_config_id,
+            prc.config_name,
             prd.nio_number
         from params_report_config_data prcd
         inner join  params_report_detail prd on prd.id = prcd.params_collect_manifest_id

From 44147c1ca16063ee197fe49bd021d59fd3ee3f7d Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 25 Sep 2023 11:07:02 +0800
Subject: [PATCH 134/288] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=20=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6=E5=A4=B1=E8=B4=A5=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  1 +
 jero-web/src/common/lang/zh-cn.js             |  1 +
 .../components/associatedplat.vue             | 21 --------
 .../components/associatedplatthree.vue        | 33 +++++++-----
 .../certificationList/components/addModel.vue | 15 +++++-
 .../components/certificationList/index.vue    | 53 ++++++++++++++++---
 .../components/listOfRegulations.vue          | 53 +++++++++++++++++--
 7 files changed, 130 insertions(+), 47 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index dbccc4ddc..19f020dad 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1977,4 +1977,5 @@ module.exports = {
   unpublishedregulationsselected:'Only unpublished regulations can be selected',
   PlatformInformation:'Platform Information',
   Processdetails:'Process Details',
+  matchempty:'The match is empty'
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 888611cac..f3cb814c8 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -3933,4 +3933,5 @@ module.exports = {
   unpublishedregulationsselected:'仅能选择未发布的法规',
   PlatformInformation:'平台件信息',
   Processdetails:'流程详情',
+  matchempty:'匹配项为空'
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/associatedplat.vue b/jero-web/src/views/projectManagement/components/associatedplat.vue
index e6c0466d5..a9ab5ff37 100644
--- a/jero-web/src/views/projectManagement/components/associatedplat.vue
+++ b/jero-web/src/views/projectManagement/components/associatedplat.vue
@@ -226,27 +226,6 @@
           this.confirmLoading = false
           this.$emit('associatedplatForm',selectedRowKeys.join(','),this.flag,this.type,this.ids)
           this.selectedRowKeys = []
-          // postAction(this.url.addModel, {
-          //   dummyInventoryBaseId: selectedRowKeys.join(','),
-          //   projectLibraryId: this.$route.query.id,
-          //   flag: flag
-          // }).then((res) => {
-          //   if (res.success) {
-          //     this.confirmLoading = false
-          //     this.$message.success(this.$t('OperationSuccessful'))
-          //     this.visible = false
-          //     this.selectedRowKeys = []
-          //     this.$emit('transferListForm')
-          //   } else {
-          //     if (res.message == '该虚拟清单的维护清单中没有数据,是否需要添加') {
-          //       this.confirmLoading = false
-          //       this.getAdd()
-          //       return
-          //     }
-          //     this.$message.warning(this.$t('operationFailed'))
-          //     this.confirmLoading = false
-          //   }
-          // })
         } else {
           this.$message.warning(this.$t('selectLeastOne'))
         }
diff --git a/jero-web/src/views/projectManagement/components/associatedplatthree.vue b/jero-web/src/views/projectManagement/components/associatedplatthree.vue
index 96a610c85..f2e7dbe94 100644
--- a/jero-web/src/views/projectManagement/components/associatedplatthree.vue
+++ b/jero-web/src/views/projectManagement/components/associatedplatthree.vue
@@ -97,6 +97,7 @@
             width: 130
           },
         ],
+        msg:'',
         data: [
           // {
           //   id:'1',
@@ -191,20 +192,19 @@
         this.loading = true
         postAction(this.flag == '2' ? '/project/projectLibraryBase/listPlatformAll' : 'project/projectLibraryBase/listPlatform', this.flag == '2' ? val : query).then((res) => {
           if (res.success) {
-            this.data = res.result || []
+            this.data = res.result.result || []
+            this.msg = res.result.msg || ''
             this.data.forEach((item,index) => {
               let name = 'selectedRowKeys'+index
               this.selectQuery[name] = item.result.map(val => val.id)
-              // for(var i in item.result.map(val => val.id)){
-              //   this.selectedRowKeys.push(item.result.map(val => val.id)[i])
-              // }
-              // this.selectedRow.push(item.result)
             })
             console.log(this.selectQuery)
             // console.log(this.selectedRow)
             this.loading = false
             if(this.data.length >= 1){
               this.visible = true
+            }else {
+              this.$emit('associatedplatthreeFormHomo',this.msg)
             }
           } else {
             this.loading = false
@@ -234,18 +234,25 @@
             })
           })
           arr = arr
-          console.log(arr)
           let query = {
-            list : JSON.parse(JSON.stringify(arr))
+            list : JSON.parse(JSON.stringify(arr)),
+            msg:this.msg
           }
           console.log(query)
           postAction('project/lawsInventoryPlatformEO/addBatch', query).then((res) => {
             if (res.success) {
-              this.confirmLoading = false
-              this.$message.success(this.$t('OperationSuccessful'))
-              this.visible = false
-              this.selectQuery = {}
-              this.$emit('associatedplatthreeForm')
+              if(res.result == ''){
+                this.confirmLoading = false
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.visible = false
+                this.selectQuery = {}
+                this.$emit('associatedplatthreeForm')
+              }else{
+                this.confirmLoading = false
+                this.visible = false
+                this.selectQuery = {}
+                this.$emit('associatedplatthreeFormHomo',res.result)
+              }
             } else {
               this.$message.warning(this.$t('operationFailed'))
               this.confirmLoading = false
@@ -253,7 +260,7 @@
           })
         } else {
           // this.$message.warning(this.$t('selectLeastOne'))
-          this.visible = false
+          this.$emit('associatedplatthreeForm')
         }
       },
       getAdd() {
diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
index b47e38a8d..12c7ddba4 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
@@ -42,7 +42,7 @@
                            :placeholder="$t('PleaseSelect')+$t('regulationNo')"
                            v-model="formInline.serialNumber"></a-input>
                   <a-input class="box-input"
-                           :disabled="true"
+                           :disabled="flowdisabled"
                            v-else
                            v-model.trim="formInline.serialNumber"
                            :placeholder="$t('PleaseEnter')+this.$t('regulationNo')"/>
@@ -504,6 +504,7 @@
                               optionFilterProp="label"
                               @change="handleInput('sdt',formInline.sdt)"
                               showSearch
+                              :disabled="flowdisabled"
                               v-model="formInline.sdt">
                       <a-select-option v-for="(item, key) in engineeringInterfacePersonList"
                                        :label="item.name"
@@ -534,6 +535,7 @@
                       :maxTagCount="1"
                       :getPopupContainer="triggerNode=> triggerNode.parentNode"
                       class="box-input"
+                      :disabled="flowdisabled"
                       style="width: 100%"
                       :tree-data="DeliverableTreeList"
                       :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
@@ -552,6 +554,7 @@
                           :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
                   </div>
                   <a-form-model-item class="itemModel" prop="deliverableTemplate">
+<!--                    this.$refs.uploadFile.disabled = isTrue-->
                     <a-button type="primary" class="button-text"
                               @click="clickButtonToUpload('deliverableTemplate')">
                       {{ (formInline.deliverableTemplate === 'null' || formInline.deliverableTemplate === ''
@@ -577,9 +580,9 @@
                       :query="{db_field_name:'dutyPerson',db_field_txt:$t('personLiable')}"
                       :personneQuery="formInline"
                       :isSingleChoice="true"
+                      :disabled="flowdisabled"
                       v-if="personnelVisible"
                       @change="PersonnelSelectionChange"
-                      :disabled="disabled"
                       v-model="formInline.dutyPersonName"/>
                   </a-form-model-item>
                 </div>
@@ -598,6 +601,7 @@
                                  message: $t('closingDate') + $t('cannotEmpty'), trigger: 'change'}]"
                   >
                     <a-date-picker class="box-input"
+                                   :disabled="flowdisabled"
                                    :placeholder="$t('PleaseSelect')+$t('closingDate')"
                                    @change="dateChange({db_field_name:'endTime'})"
                                    format="YYYY-MM-DD"
@@ -693,6 +697,7 @@
         formInline: {},
         confirmLoading: false,
         visible: false,
+        disabledType:'',
         personnelVisible: false,
         yearNameDataList: [],
         firstLevelDutyTerritoryList: [],
@@ -761,6 +766,7 @@
           ]
         },
         disabled: false,
+        flowdisabled: false,
         projectNameList: [],
         title: '',
         DeliverableTreeList: [],
@@ -869,6 +875,11 @@
         if (value.dutyTerritory && value.dutyTerritory.length > 0) {
           this.queryPersonByProject(value.dutyTerritory.join(','))
         }
+        console.log(value)
+        if(value.projectCertificationInventoryEOS && value.projectCertificationInventoryEOS.length > 0){
+          this.flowdisabled = true
+          this.$refs.uploadFile.disabled = true
+        }
         this.getRegulationNo()
         this.title = this.$t('edit')
         this.$nextTick(() => {
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 645dbe1ea..f9b9692ff 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -464,6 +464,28 @@
         />
       </div>
     </div>
+    <!--    关联错误数据提示-->
+    <a-modal
+      :title="$t('operationFailed')"
+      :width="860"
+      v-model="visibleoperationFailed"
+      :maskClosable="false"
+      :footer="null"
+    >
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <div style='font-size: 18px;margin-bottom: 20px;display: flex;justify-content: center'
+               class="box-title-text-index">
+            <span v-html="visibleoperation"></span>
+          </div>
+        </a-col>
+      </a-row>
+      <div class="imports-footer">
+        <div class="imports-footer-wrap" style='text-align: center;'>
+          <a-button class="imports-btn" type="primary" @click="cancleoperationFailed">{{$t('cancel')}}</a-button>
+        </div>
+      </div>
+    </a-modal>
     <transferList :url="url" @transferListForm="transferListForm" ref="transferListRef"/>
     <certificationDirectory :isDisplayNum="isDisplayNum" :roleSwitchingCode="roleSwitchingCode"
                             :url="url" ref="certificationDirectoryRef"/>
@@ -610,6 +632,8 @@
         pageSize: 50,
         total: 0,
         JTextLoading: false,
+        visibleoperationFailed: false,
+        visibleoperation:'',
         CertificationColor: {
           'Test passed': 'accordColor',
           'Test failed': 'nonConformityColor',
@@ -1278,6 +1302,7 @@
         if(this.selectedRowKeys && this.selectedRowKeys.length > 0){
           this.detailedWarningList = []
           let dataSource = []
+          let status = ''
           for (let i = 0; i < this.dataSource.length; i++) {
             for (let j = 0; j < this.selectedRowKeys.length; j++) {
               if (this.dataSource[i].id == this.selectedRowKeys[j]) {
@@ -1288,12 +1313,16 @@
           for (let i = 0; i < dataSource.length; i++) {
             if (dataSource[i].flowStatus == 'List to be released') {
               flag = '1'
-              this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
+              status = '1'
             } else {
-              this.$message.warning(this.$t('unpublishedregulationsselected'))
-              return
+              status = '2'
             }
           }
+          if(status == '1'){
+            this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
+          }else{
+            this.$message.warning(this.$t('unpublishedregulationsselected'))
+          }
         }else{
           flag = '2'
           this.$message.warning(this.$t('selectLeastOne'))
@@ -1308,9 +1337,15 @@
         if(type == '认证'){
           postAction('/project/projectCertificationInventoryEO/listPlatform', query).then((res) => {
             if (res.success) {
-              this.$refs.associatedplatRef.visible = false
-              this.$message.success(this.$t('OperationSuccessful'))
-              this.getList()
+              if(res.result == ''){
+                this.$refs.associatedplatRef.visible = false
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.selectedRowKeys = []
+                this.getList()
+              }else{
+                this.visibleoperation = res.result
+                this.visibleoperationFailed = true
+              }
             }
           })
         }
@@ -1320,6 +1355,12 @@
         //   this.$refs.associatedplattwoRef.transferModel(id,type,ids)
         // }
       },
+      cancleoperationFailed(){
+        this.visibleoperationFailed = false
+        this.$refs.associatedplatRef.handleCancel()
+        this.selectedRowKeys = []
+        this.getList()
+      },
       associatedplattwoForm(id,type,ids){
         // this.$refs.associatedplatthreeRef.transferModel(id,type,ids)
       },
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 7c837d07c..f2290d886 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -435,7 +435,7 @@
     <transferList :url="url" @transferListForm="transferListForm" ref="transferListRef"/>
     <associatedplat :url="url" @associatedplatForm="associatedplatForm" ref="associatedplatRef"/>
     <associatedplattwo :url="url" @associatedplattwoForm="associatedplattwoForm" ref="associatedplattwoRef"/>
-    <associatedplatthree :url="url" @associatedplatthreeForm="associatedplatthreeForm" ref="associatedplatthreeRef"/>
+    <associatedplatthree :url="url" @associatedplatthreeFormHomo="associatedplatthreeFormHomo" @associatedplatthreeForm="associatedplatthreeForm" ref="associatedplatthreeRef"/>
     <customizeList :url="url" @customizeListForm="customizeListForm" ref="customizeListRef"/>
     <transferListvirtal :url="url" @transferListFormHomo="transferListFormHomo" ref="transferListvirtalRef"/>
     <fixedPlate @fixedPlateForm="addModelList" ref="fixedPlateRef"/>
@@ -688,6 +688,28 @@
         </span>
       </a-table>
     </a-modal>
+    <!--    关联错误数据提示-->
+    <a-modal
+      :title="$t('operationFailed')"
+      :width="860"
+      v-model="visibleoperationFailed"
+      :maskClosable="false"
+      :footer="null"
+    >
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <div style='font-size: 18px;margin-bottom: 20px;display: flex;justify-content: center'
+               class="box-title-text-index">
+            <span v-html="visibleoperation"></span>
+          </div>
+        </a-col>
+      </a-row>
+      <div class="imports-footer">
+        <div class="imports-footer-wrap" style='text-align: center;'>
+          <a-button class="imports-btn" type="primary" @click="cancleoperationFailed">{{$t('cancel')}}</a-button>
+        </div>
+      </div>
+    </a-modal>
     <JLoading :loading="JLoading">{{ $t('dataLoading') }}</JLoading>
     <JLoading :loading="JTextLoading">{{ $t('Submitting') }}</JLoading>
     <resultReportedUpload @resultReportedUploadForm="addModelList" ref="resultReportedUploadRef"/>
@@ -757,6 +779,7 @@
     data() {
       return {
         toggleSearchStatus: false,
+        visibleoperationFailed: false,
         visibleQuestion: false,
         visibleReset: false,
         confirmLoadingReset: false,
@@ -768,6 +791,7 @@
         pageSize: 50,
         total: 0,
         long:'',
+        visibleoperation:'',
         roleSwitchingList: [],
         formInlineQuestion: {},
         formInlineReset: {},
@@ -1955,7 +1979,7 @@
       transferClick() {
         this.$refs.transferListRef.transferModel()
       },
-      // 关联平台件
+      // 关联平台件visibleoperation
       associatedplatformClick(type){
         let flag = ''
         if(this.selectedRowKeys && this.selectedRowKeys.length > 0){
@@ -1978,7 +2002,6 @@
               status = '2'
             }
           }
-          console.log(status)
           if(status == '1'){
             this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
           }else{
@@ -1986,8 +2009,6 @@
           }
         }else{
           flag = '2'
-          this.selectedRowKeys = this.dataSource.map(val => val.id)
-          console.log(this.selectedRowKeys)
           this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
         }
       },
@@ -2002,6 +2023,28 @@
         this.$refs.associatedplatthreeRef.transferModel(id,flag,type,ids)
       },
       associatedplatthreeForm(id){
+        this.$refs.associatedplatRef.handleCancel()
+        this.$refs.associatedplattwoRef.handleCancel()
+        this.selectedRowKeys = []
+        this.getList()
+      },
+      associatedplatthreeFormHomo(msg){
+        if(msg){
+          this.visibleoperation = msg
+          this.visibleoperationFailed = true
+        }else{
+          this.$message.warning(this.$t('matchempty'))
+          this.$refs.associatedplatRef.handleCancel()
+          this.$refs.associatedplattwoRef.handleCancel()
+          this.selectedRowKeys = []
+          this.getList()
+        }
+      },
+      cancleoperationFailed(){
+        this.visibleoperationFailed = false
+        this.$refs.associatedplatRef.handleCancel()
+        this.$refs.associatedplattwoRef.handleCancel()
+        this.selectedRowKeys = []
         this.getList()
       },
       //批量设置

From 5212badb262587dbfcc3da47c70b252a838406a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Mon, 25 Sep 2023 14:24:50 +0800
Subject: [PATCH 135/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E8=8B=B1?=
 =?UTF-8?q?=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index ab21c14ce..f173c46d3 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -424,7 +424,7 @@ module.exports = {
   AllLabelsRead: 'Mark as Read',
   SubscriptionNotification: 'Subscription Notification',
   warningInformation: 'Early Warning Information',
-  ForwardPush: 'Forward Push',
+  ForwardPush: 'Forward & Share',
   PleaseSelectData: 'Please select data first',
   MessageContent: 'Message Content',
   MessageTitle: 'Message Title',

From 61c4471930f2af2658fc4876bad11f61baf28872 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 25 Sep 2023 14:43:41 +0800
Subject: [PATCH 136/288] =?UTF-8?q?=20=E5=B9=B3=E5=8F=B0=E4=BB=B6=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/mapper/xml/TodoCenterMapper.xml    |  3 +-
 .../LawsInventoryPlatformEOController.java    |  2 +-
 ...ectCertificationInventoryEOController.java |  4 +-
 .../ProjectCertificationInventoryEO.java      | 20 ++---
 ...rojectCertificationInventoryEOService.java |  2 +-
 ...ctCertificationInventoryEOServiceImpl.java | 78 +++++++++++++++++--
 .../ProjectLawsInventoryEOServiceImpl.java    |  4 +
 7 files changed, 94 insertions(+), 19 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml
index ff0405564..1a2deaf32 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml
@@ -23,7 +23,8 @@
         SELECT pm.id
         FROM params_manifest pm
                  JOIN ( SELECT id FROM
-            ( SELECT id,substring_index( substring_index( a.certification_engineer, ',', b.help_topic_id + 1 ), ',',- 1 ) user_id
+            ( SELECT id,substring_index( substring_index( a.certification_engineer, ',', b.help_topic_id + 1 ), ',',- 1 ) user_id,
+            a.platform
               FROM
                   project_library_base a
                       JOIN mysql.help_topic b ON b.help_topic_id &lt; ( length( a.certification_engineer ) - length( REPLACE ( a.certification_engineer, ',', '' ) ) + 1 )) temp
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/LawsInventoryPlatformEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/LawsInventoryPlatformEOController.java
index c05cd93be..0433e3699 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/LawsInventoryPlatformEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/LawsInventoryPlatformEOController.java
@@ -118,7 +118,7 @@ public class LawsInventoryPlatformEOController extends JeroController<LawsInvent
 		if(ObjectUtils.isNotEmpty(json.get("msg"))){
 			msg = (String)json.get("msg");
 		}else{
-			msg = "添加成功！";
+			msg = "";
 		}
 		return Result.OK(msg);
 	}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java
index 4c6b640f6..b630cae1a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java
@@ -102,8 +102,8 @@ public class ProjectCertificationInventoryEOController extends JeroController<Pr
 	 @ApiOperation(value="勾选认证清单进行关联平台件", notes="勾选认证清单进行关联平台件")
 	 @PostMapping(value = "/listPlatform")
 	 public Result<?> listPlatform(@RequestBody Map<String,Object> params) {
-		 projectCertificationInventoryEOService.listPlatform(params);
-		 return Result.OK();
+		 String msg = projectCertificationInventoryEOService.listPlatform(params);
+		 return Result.OK(msg);
 	 }
 
     /**
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java
index 7f8c25293..e08add5f6 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java
@@ -1,24 +1,22 @@
 package com.jero.modules.project.entity;
 
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
 import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -261,4 +259,8 @@ public class ProjectCertificationInventoryEO implements Serializable {
     /**一级责任领域**/
     @TableField(exist = false)
     private String firstLevelDutyTerritory;
+
+    @ApiModelProperty(value = "关联平台件数据")
+    @TableField(exist = false)
+    private List<ProjectCertificationInventoryEO> projectCertificationInventoryEOS;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java
index 472446bd3..f205301bb 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java
@@ -344,5 +344,5 @@ public interface IProjectCertificationInventoryEOService extends IService<Projec
 	 * @param params
 	 * @return
 	 */
-	void listPlatform(Map<String, Object> params);
+	String listPlatform(Map<String, Object> params);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index 27ab0fb30..267c06211 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -73,6 +73,7 @@ import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.enums.ProjectRoleEnum;
 import com.jero.modules.system.enums.SysCategoryValueTypeEnum;
 import com.jero.modules.system.mapper.SysCategoryMapper;
+import com.jero.modules.system.mapper.SysDictItemMapper;
 import com.jero.modules.system.mapper.SysRoleMapper;
 import com.jero.modules.system.mapper.SysUserMapper;
 import com.jero.modules.system.service.IProjectUserDutyTerritoryService;
@@ -109,6 +110,7 @@ import org.aspectj.util.FileUtil;
 import org.jeecgframework.poi.excel.ExcelExportUtil;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -230,6 +232,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 	private IProcessHistoryEOService processHistoryEOService;
 	@Autowired
 	private LawsInventoryPlatformEOServiceImpl lawsInventoryPlatformEOService;
+	@Autowired
+	private SysDictItemMapper sysDictItemMapper;
 
 	/**
 	 * 保存
@@ -1953,6 +1957,18 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		}
 		for (ProjectCertificationInventoryEO certificationInventoryEO : result) {
 			if(!projectCertificationInventoryEOS.isEmpty()){
+				List<LawsInventoryPlatformEO> collect = lawsInventoryPlatformEOList.stream()
+						.filter(e -> certificationInventoryEO.getId().equals(e.getLawsInventoryId())).collect(Collectors.toList());
+				if(ObjectUtils.isNotEmpty(collect)){
+					List<String> platformLawsInventoryIdList = collect.stream()
+							.map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).distinct().collect(Collectors.toList());
+
+					List<ProjectCertificationInventoryEO> inventoryEOList = projectCertificationInventoryEOS.stream()
+							.filter(e -> platformLawsInventoryIdList.contains(e.getId())).collect(Collectors.toList());
+					certificationInventoryEO.setProjectCertificationInventoryEOS(inventoryEOList);
+				}
+
+
 				List<LawsInventoryPlatformEO> inventoryPlatformEOList = lawsInventoryPlatformEOList.stream()
 						.filter(e -> certificationInventoryEO.getId().equals(e.getLawsInventoryId())).collect(Collectors.toList());
 				if(!inventoryPlatformEOList.isEmpty()){
@@ -3593,8 +3609,13 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			throw new JeroBootException("无法获取项目库信息，项目库id为：" + projectLibraryId + " 请联系管理员！");
 		}
 
-		List<String> certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
-		List<SysUser> certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList);
+		List<SysUser> certificationEngineerList = new ArrayList<>();
+		List<String> certificationEngineerIdList = new ArrayList<>();
+		if(StringUtils.isNotBlank(projectLibraryBase.getCertificationEngineer())){
+			certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
+			certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList);
+		}
+
 		String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 		String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 
@@ -3717,6 +3738,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			log.error("studio-流程重置失败：" + ex.getMessage());
 			throw new JeroBootException("流程重置失败！");
 		}
+		//流程重置后，将平台件关联信息删除
+		LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.in(LawsInventoryPlatformEO::getLawsInventoryId,Arrays.asList(ids.split(",")));
+		lawsInventoryPlatformEOService.remove(wrapper);
 		return Result.OK("流程重置成功！");
 	}
 
@@ -7029,7 +7054,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 	 * @return
 	 */
 	@Override
-	public void listPlatform(Map<String,Object> params) {
+	public String listPlatform(Map<String,Object> params) {
 		String cut = (String) params.get("cut");//
 		String ids = (String) params.get("ids");//认证清单id
 		String projectLibraryIds = (String) params.get("projectLibraryIds");//平台件项目id
@@ -7052,11 +7077,13 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			wrapper2.in(ProjectLibraryBase::getId,projectIdList);
 			projectLibraryBaseList = projectLibraryBaseService.list(wrapper2);
 		}
+		List<SysDictItem> sysDictItemList = sysDictItemMapper.selectItemsByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue());
 
 		List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
 
 		List<ProjectCertificationInventoryEO> result = new ArrayList<>();
 
+		List<ProjectCertificationInventoryEO> emptyList = new ArrayList<>();
 		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : certificationInventoryEOList) {
 			//类别
 			String category = projectCertificationInventoryEO.getCategory();
@@ -7090,10 +7117,15 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				//责任领域
 				String dutyTerritoryTemp = certificationInventoryEO.getDutyTerritory();
 
-				if(StringUtils.isBlank(configItem) || "标配".equals(configItem)){
-					//如果车型项目库中的配置项为空或为标配时，直接将平台件信息添加到关联表
+				if((StringUtils.isBlank(configItem) || "标配".equals(configItem))
+						&& category.equals(categoryTemp)
+						&& inspectionItem.equals(inspectionItemTemp)
+						&& serialNumber.equals(serialNumberTemp)
+						&& dutyTerritory.equals(dutyTerritoryTemp)){
+					//如果车型项目库中的配置项为空或为标配时，则用类别，检验项目，编号，责任领域去匹配，匹配上后将平台件信息添加到关联表
 					projectCertificationInventoryEOList.add(certificationInventoryEO);
 
+
 				}else if(StringUtils.isNotBlank(configItem) && !"标配".equals(configItem)){
 					//如果车型项目库中的配置项不为空且不为标配时，如果车型项目库认证清单的配置项与平台件认证清单的配置项不一致，则不再匹配
 					//如果一致，则用类别，检验项目，编号，责任领域去做匹配
@@ -7106,6 +7138,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					}
 				}
 			}
+			if(projectCertificationInventoryEOList.isEmpty()){
+				emptyList.add(projectCertificationInventoryEO);
+			}
 
 			if(!projectCertificationInventoryEOList.isEmpty()){
 				setDataTemp(lawsInventoryPlatformEOS, projectCertificationInventoryEO, projectCertificationInventoryEOList.get(0));
@@ -7132,6 +7167,39 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		if(!lawsInventoryPlatformEOS.isEmpty()){
 			lawsInventoryPlatformEOService.saveBatch(lawsInventoryPlatformEOS);
 		}
+		//认证清单未匹配上平台件的提示语
+		String html = getMsg(cut, sysDictItemList, emptyList);
+		return html;
+	}
+
+	@NotNull
+	private String getMsg(String cut, List<SysDictItem> sysDictItemList, List<ProjectCertificationInventoryEO> emptyList) {
+		List<String> msgList = new ArrayList<>();
+		//未匹配上法规清单
+		if(ObjectUtils.isNotEmpty(emptyList)){
+			for (ProjectCertificationInventoryEO projectCertificationInventoryEO : emptyList) {
+				List<String> list = new LinkedList<>();
+				if(com.jero.modules.system.util.StringUtils.isNotBlank(projectCertificationInventoryEO.getDutyTerritory())){
+					for (String s : projectCertificationInventoryEO.getDutyTerritory().split(",")) {
+						List<SysDictItem> collect = sysDictItemList.stream().filter(e -> e.getItemValue().equals(s)).collect(Collectors.toList());
+						if(CutEnum.CN.getValue().equals(cut) && !collect.isEmpty()){
+							list.add(collect.get(0).getItemText());
+						}else if(CutEnum.EN.getValue().equals(cut) && !collect.isEmpty()){
+							list.add(collect.get(0).getEnName());
+						}
+					}
+				}
+				String serialNumber = projectCertificationInventoryEO.getSerialNumber();
+				String dutyTerritoryName = com.jero.modules.system.util.StringUtils.join(list,",");
+				String msg = serialNumber+" "+dutyTerritoryName+"未匹配到数据";
+				msgList.add(msg);
+			}
+		}
+		String html = "";
+		for (String s : msgList) {
+			html += s + "</br>";
+		}
+		return html;
 	}
 
 	private void setDataTemp(List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS,
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index b70756479..582ccdfdd 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -4965,6 +4965,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(), paramsMsg);
 			}
 		}
+		//流程重置后，将平台件关联信息删除
+		LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.in(LawsInventoryPlatformEO::getLawsInventoryId,Arrays.asList(ids.split(",")));
+		lawsInventoryPlatformEOService.remove(wrapper);
 		return Result.OK("变更成功！");
 	}
 

From d3fd25c098dde0345e8a51003e93b32af5274a53 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 25 Sep 2023 14:44:41 +0800
Subject: [PATCH 137/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/associatedplattwo.vue          |  2 +-
 .../components/addModel.vue                   | 72 +++++++++----------
 .../components/nonConformance.vue             | 38 ++--------
 .../components/settingList.vue                |  3 +
 .../platformItemLibraryDetails/index.vue      |  3 +-
 5 files changed, 48 insertions(+), 70 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/associatedplattwo.vue b/jero-web/src/views/projectManagement/components/associatedplattwo.vue
index 3ff14e24c..79c12a746 100644
--- a/jero-web/src/views/projectManagement/components/associatedplattwo.vue
+++ b/jero-web/src/views/projectManagement/components/associatedplattwo.vue
@@ -110,7 +110,7 @@ export default {
         },
         {
           title: this.$t('NareaOfResponsibility'),
-          dataIndex: 'dutyTerritory',
+          dataIndex: 'dutyTerritory_dictText',
           align: 'left',
           ellipsis: true,
           width: 140
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
index d30bae959..fd768320a 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
@@ -19,19 +19,8 @@
                 <span class="title-text-text" :title="$t('entryName')">{{$t('entryName')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="projectNameId">
-                <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('entryName')"
+                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('entryName')"
                          v-model="formInline.projectNameId"></a-input>
-<!--                <a-select :placeholder="$t('PleaseSelect')+$t('modelName')"-->
-<!--                          @change="projectNameChange"-->
-<!--                          v-model="formInline.projectNameId">-->
-<!--                  <a-select-option v-for="(item, key) in projectNameList"-->
-<!--                                   :key="key"-->
-<!--                                   :value="item.id">-->
-<!--                     <span style="display: inline-block;width: 100%" :title=" item.projectName ">-->
-<!--                           {{ item.projectName}}-->
-<!--                     </span>-->
-<!--                  </a-select-option>-->
-<!--                </a-select>-->
               </a-form-model-item>
             </div>
           </a-col>
@@ -45,6 +34,7 @@
                 <j-dict-select-tag class="box-input" v-model="formInline.brand"
                                    :placeholder="$t('PleaseSelect')+$t('brand')"
                                    :type="'select'"
+                                   @input="handleInput('brand')"
                                    :triggerChange="false" :dictCode="'brand'"/>
               </a-form-model-item>
             </div>
@@ -57,8 +47,8 @@
 <!--                <span class="Required">*</span>-->
                 <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
               </div>
-              <a-form-model-item class="itemModel-multi" prop="ipdInfo">
-                <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('configurationItem')"
+              <a-form-model-item class="itemModel" prop="ipdInfo">
+                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('configurationItem')"
                          v-model="formInline.ipdInfo"></a-input>
               </a-form-model-item>
             </div>
@@ -66,12 +56,14 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="title-text-text" :title="$t('explain')">{{$t('explain')}}</span>
+                <span class="title-text-text" :title="$t('certificationProgram')">{{$t('certificationProgram')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="explanation">
-                <a-textarea :placeholder="$t('pleaseEnter')+$t('explain')"
-                            v-model="formInline.explanation"
-                            :rows="2"/>
+              <a-form-model-item class="itemModel" prop="attestationPlan">
+                <a-input class="box-input"
+                         :disabled="disabled"
+                         :maxLength="200"
+                         v-model="formInline.attestationPlan"
+                         :placeholder="$t('PleaseEnter')+$t('certificationProgram')"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -86,6 +78,7 @@
               <a-form-model-item class="itemModel" :prop="'vehicleDevelopmentPlan'">
                 <a-input class="box-input"
                          :disabled="disabled"
+                         :maxLength="200"
                          v-model="formInline.vehicleDevelopmentPlan"
                          :placeholder="$t('PleaseEnter')+$t('dehicleDevelopmentPlan')"/>
               </a-form-model-item>
@@ -94,13 +87,13 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="title-text-text" :title="$t('certificationProgram')">{{$t('certificationProgram')}}</span>
+                <span class="title-text-text" :title="$t('explain')">{{$t('explain')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="attestationPlan">
-                <a-input class="box-input"
-                         :disabled="disabled"
-                         v-model="formInline.attestationPlan"
-                         :placeholder="$t('PleaseEnter')+$t('certificationProgram')"/>
+              <a-form-model-item class="itemModel" prop="explanation">
+                <a-textarea :placeholder="$t('pleaseEnter')+$t('explain')"
+                            v-model="formInline.explanation"
+                            :maxLength="500"
+                            :rows="2"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -278,8 +271,8 @@
               message: this.$t('pleaseEnterTheCorrectWebAddress')
             },
             {
-              max: 300,
-              message: this.$t('configurationInformation') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              max: 200,
+              message: this.$t('configurationInformation') + this.$t('cannotExceed') + 200 + this.$t('Characters'),
               trigger: 'blur'
             }
           ],
@@ -289,8 +282,8 @@
               message: this.$t('pleaseEnterTheCorrectWebAddress')
             },
             {
-              max: 300,
-              message: this.$t('dehicleDevelopmentPlan') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              max: 200,
+              message: this.$t('dehicleDevelopmentPlan') + this.$t('cannotExceed') + 200 + this.$t('Characters'),
               trigger: 'blur'
             }
           ],
@@ -307,15 +300,15 @@
               message: this.$t('pleaseEnterTheCorrectWebAddress')
             },
             {
-              max: 300,
-              message: this.$t('certificationProgram') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              max: 200,
+              message: this.$t('certificationProgram') + this.$t('cannotExceed') + 200 + this.$t('Characters'),
               trigger: 'blur'
             }
           ],
           vehiclePlatform: [
             {
-              max: 100,
-              message: this.$t('ModelPlatform') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              max: 200,
+              message: this.$t('ModelPlatform') + this.$t('cannotExceed') + 200 + this.$t('Characters'),
               trigger: 'blur'
             }
           ],
@@ -324,19 +317,24 @@
               required: true,
               message: this.$t('entryName') + this.$t('cannotEmpty'),
               trigger: 'blur'
+            },
+            {
+              max: 200,
+              message: this.$t('DigitalPlatform') + this.$t('cannotExceed') + 200 + this.$t('Characters'),
+              trigger: 'blur'
             }
           ],
           digitalPlatform: [
             {
-              max: 100,
-              message: this.$t('DigitalPlatform') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              max: 200,
+              message: this.$t('DigitalPlatform') + this.$t('cannotExceed') + 200 + this.$t('Characters'),
               trigger: 'blur'
             }
           ],
           softwareVersion: [
             {
-              max: 300,
-              message: this.$t('softwareVersion') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              max: 200,
+              message: this.$t('softwareVersion') + this.$t('cannotExceed') + 200 + this.$t('Characters'),
               trigger: 'blur'
             }
           ],
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue
index 73b821008..ce5c3daf8 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue
@@ -24,41 +24,17 @@
           </a-col>
           <a-col :md="6" :sm="8">
             <div class="box-title-text">
-              <div class="title-text" :title="$t('RelatedItems')">
-                <span>{{$t('RelatedItems')}}</span>
+              <div class="title-text" :title="$t('problemType')">
+                <span>{{$t('problemType')}}</span>
               </div>
-              <a-select allowClear
-                        class="box-input"
-                        v-model="queryParam.projectId"
-                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                        showSearch
-                        optionFilterProp="label"
-                        :autoClearSearchValue="false"
-                        :placeholder="$t('PleaseSelect')+$t('RelatedItems')">
-                <a-select-option v-for="(item, key) in projectNameList"
-                                 :key="key"
-                                 :label="item.projectName"
-                                 :value="item.id">
-                     <span style="display: inline-block;width: 100%" :title=" item.projectName ">
-                           {{ item.projectName}}
-                     </span>
-                </a-select-option>
-              </a-select>
+              <j-dict-select-tag class="box-input" v-model="queryParam.problemType"
+                                 :placeholder="$t('PleaseSelect')+$t('problemType')"
+                                 :type="'select'"
+                                 @changeQuery="onChange"
+                                 :triggerChange="false" :dictCode="'wen4_ti2_lei4_xing2'"/>
             </div>
           </a-col>
           <template v-if="toggleSearchStatus">
-            <a-col :md="6" :sm="8">
-              <div class="box-title-text">
-                <div class="title-text" :title="$t('problemType')">
-                  <span>{{$t('problemType')}}</span>
-                </div>
-                <j-dict-select-tag class="box-input" v-model="queryParam.problemType"
-                                   :placeholder="$t('PleaseSelect')+$t('problemType')"
-                                   :type="'select'"
-                                   @changeQuery="onChange"
-                                   :triggerChange="false" :dictCode="'wen4_ti2_lei4_xing2'"/>
-              </div>
-            </a-col>
             <a-col :md="6" :sm="8">
               <div class="box-title-text">
                 <div class="title-text" :title="$t('statisticalNodes')">
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
index 05ba0869e..ce86526cb 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
@@ -104,6 +104,9 @@
         getAction(this.url.settingQueryForm, { projectId: this.$route.query.id }).then((res) => {
           if (res.success) {
               this.formInline.list = res.result ? res.result : [{}]
+            if(res.result==null ||res.result.length == 0){
+              this.formInline.list=[{}]
+            }
             console.log(this.formInline.list)
 
           }
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue
index 6f6a4a2c0..4a276140d 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue
@@ -6,7 +6,7 @@
                     <a-icon @click="backClick" type="left-circle" theme="filled"
                             style="margin-right: 8px;font-size: 30px;color: #21c9cc;"/>
                   </span>
-        <span>
+        <span :title='this.title'>
              {{ this.title }}
         </span>
       </div>
@@ -568,6 +568,7 @@ export default {
       display: inline-block;
       text-overflow: ellipsis;
       white-space: nowrap;
+      max-width:810px;
       overflow: hidden;
       font-size: 20px;
       font-weight: 400;

From c6edea4c81b3f41395179c0ad119e56c7140f64d Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 25 Sep 2023 16:03:50 +0800
Subject: [PATCH 138/288] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=A1=B9=E7=9B=AE=E4=B8=8B=E6=8B=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ProblemManagementEOMapper.java     | 10 +--
 .../mapper/xml/ProblemManagementEOMapper.xml  | 39 +++++++++++
 .../impl/ProblemManagementEOServiceImpl.java  | 10 +--
 .../impl/ProjectNameInfoEOServiceImpl.java    | 65 ++++++++++++++-----
 4 files changed, 99 insertions(+), 25 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProblemManagementEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProblemManagementEOMapper.java
index 2ce1e634d..b306ae681 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProblemManagementEOMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProblemManagementEOMapper.java
@@ -1,11 +1,11 @@
 package com.jero.modules.project.mapper;
 
-import java.util.List;
-
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.modules.project.entity.ProblemManagementEO;
 import com.jero.modules.project.entity.ProjectLibraryBase;
 import org.apache.ibatis.annotations.Param;
-import com.jero.modules.project.entity.ProblemManagementEO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
 
 /**
  * @Description: 问题管理
@@ -17,4 +17,6 @@ public interface ProblemManagementEOMapper extends BaseMapper<ProblemManagementE
 
     List<ProjectLibraryBase> queryByIds(@Param("ids") String ids);
 
+    List<ProjectLibraryBase> queryByIdsProblem(@Param("ids") String ids);
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml
index d842006a9..8dce3710c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml
@@ -62,4 +62,43 @@
             </if>
         </where>
     </select>
+    <select id="queryByIdsProblem" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
+        select
+            plb.id,
+            plb.project_name_id,
+            pni.project_name as project_name,
+            pyni.id as year_name_id,
+            pyni.year_name,
+            plb.target_market,
+            plb.project_status,
+            plb.studio_engineer,
+            studiouser.username as studio_engineer_name,
+            plb.certification_engineer,
+            plb.vehicle_platform,
+            plb.digital_platform,
+            plb.ipd_info,
+            plb.vehicle_development_plan,
+            plb.attestation_plan,
+            plb.create_by,
+            plb.create_time,
+            plb.sys_org_code,
+            plb.update_by,
+            plb.update_time,
+            plb.parent_id,
+            plb.project_version,
+            plb.platform
+        from project_library_base as plb
+        left join project_name_info as pni on  plb.project_name_id=pni.id
+        left join sys_user as studiouser on plb.studio_engineer=studiouser.id
+        left join project_year_name_info as pyni on plb.year_name_id=pyni.id
+        <where>
+            <if test="ids != null and ids !=''">
+                plb.id in
+                <foreach collection="ids.split(',')" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        order by plb.platform
+    </select>
 </mapper>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java
index 5751478fe..8cde535b8 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java
@@ -265,10 +265,12 @@ public class ProblemManagementEOServiceImpl extends ServiceImpl<ProblemManagemen
 
 	public String getMarket(String cut, List<DictModel> targetMarketList, ProjectLibraryBase projectLibraryBase) {
 		List<DictModel> dictModelList = new ArrayList<>();
-		for (String s : projectLibraryBase.getTargetMarket().split(",")) {
-			List<DictModel> dictModelListTemp = targetMarketList.stream()
-					.filter(e -> s.equals(e.getValue())).collect(Collectors.toList());
-			dictModelList.addAll(dictModelListTemp);
+		if(StringUtils.isNotBlank(projectLibraryBase.getTargetMarket())){
+			for (String s : projectLibraryBase.getTargetMarket().split(",")) {
+				List<DictModel> dictModelListTemp = targetMarketList.stream()
+						.filter(e -> s.equals(e.getValue())).collect(Collectors.toList());
+				dictModelList.addAll(dictModelListTemp);
+			}
 		}
 		String targetMarket = "";
 		if(dictModelList.size() != 0){
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java
index d8474e4af..d4a2463cd 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java
@@ -17,9 +17,11 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 项目名信息表
@@ -132,27 +134,56 @@ public class ProjectNameInfoEOServiceImpl extends ServiceImpl<ProjectNameInfoEOM
 	 */
 	@Override
 	public List<ProjectLibraryBase> queryProjectNameList(String cut) {
-		List<ProjectLibraryBase> projectLibraryBaseList = problemManagementEOMapper.queryByIds(null);
+		List<ProjectLibraryBase> projectLibraryBaseList = problemManagementEOMapper.queryByIdsProblem(null);
 		//目标市场数据字典
 		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
-		for (ProjectLibraryBase projectLibraryBase : projectLibraryBaseList) {
-			//目标市场
-			String targetMarket = problemManagementEOService.getMarket(cut, targetMarketList, projectLibraryBase);
-			//主项目的版本号
-			String projectVersion = "";
-			if(com.jero.modules.system.util.StringUtils.isBlank(projectLibraryBase.getParentId())){
-				projectVersion = "00";
+
+		List<ProjectLibraryBase> projectLibraryBaseParentList = projectLibraryBaseList.stream().filter(e -> StringUtils.isBlank(e.getParentId())).distinct().collect(Collectors.toList());
+
+		List<ProjectLibraryBase> result = new LinkedList<>();
+		for (ProjectLibraryBase projectLibraryBase : projectLibraryBaseParentList) {
+			//子项目
+			List<ProjectLibraryBase> children = projectLibraryBaseList.stream()
+					.filter(e -> StringUtils.isNotBlank(e.getParentId()) && projectLibraryBase.getId().equals(e.getParentId())).collect(Collectors.toList());
+			if(children.size() != 0){
+				//子项目的基础上添加的子项目
+				List<String> childrenIdList = children.stream().map(ProjectLibraryBase::getId).distinct().collect(Collectors.toList());
+				List<ProjectLibraryBase> childrenList = projectLibraryBaseList.stream()
+						.filter(e -> StringUtils.isNotBlank(e.getParentId()) && childrenIdList.contains(e.getParentId())).collect(Collectors.toList());
+				children.addAll(childrenList);
+
+				//按版本排序
+				Collections.sort(children);
+				result.add(projectLibraryBase);
+				result.addAll(children);
 			}else{
-				projectVersion = projectLibraryBase.getProjectVersion();
-			}
-			if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){
-				projectLibraryBase.setProjectName(projectLibraryBase.getProjectName()
-						+ "-" + projectLibraryBase.getYearName()
-						+ "-" + targetMarket
-						+"-"+projectVersion);
+				result.add(projectLibraryBase);
 			}
 		}
-		return projectLibraryBaseList;
+		for (ProjectLibraryBase projectLibraryBase : result) {
+			if(StringUtils.isBlank(projectLibraryBase.getPlatform())){
+				//目标市场
+				String targetMarket = problemManagementEOService.getMarket(cut, targetMarketList, projectLibraryBase);
+				//主项目的版本号
+				String projectVersion = "";
+				if(StringUtils.isBlank(projectLibraryBase.getParentId())){
+					projectVersion = "00";
+				}else{
+					projectVersion = projectLibraryBase.getProjectVersion();
+				}
+				if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){
+					String projectName = projectLibraryBase.getProjectName();
+					String yearName = projectLibraryBase.getYearName();
+					projectLibraryBase.setProjectName(projectLibraryBase.getProjectName()
+							+ "-" + projectLibraryBase.getYearName()
+							+ "-" + targetMarket
+							+"-"+projectVersion);
+				}
+			}else{
+				projectLibraryBase.setProjectName(projectLibraryBase.getProjectNameId());
+			}
+		}
+		return result;
 	}
 
 /*	@Override

From bd4cfad713cc18b8c0e55601d4abeb6b61b205ce Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 25 Sep 2023 16:07:48 +0800
Subject: [PATCH 139/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E8=B0=83=E5=8F=96=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/certificationList/index.vue         | 14 +++++++-------
 .../components/listOfRegulations.vue               |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
index b66b269b0..d971f2fba 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
@@ -117,7 +117,7 @@
         </div>
 
         <!--        调取-->
-        <div @click="transferClick" v-if="roleSwitchingCode == 0" class="operator-text">
+        <div @click="transferClick" v-if="roleSwitchingCode == 2 || roleSwitchingCode == 1" class="operator-text">
           <a-icon type="profile"/>
           {{ $t('Transfer') }}
         </div>
@@ -182,12 +182,12 @@
               </div>
 
               <!--              导出-->
-              <div @click="handleExport"
-                   v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2 || roleSwitchingCode == 20 || roleSwitchingCode == 21"
-                   class="operator-text-title">
-                <a-icon type="export" :rotate="-90"/>
-                {{ $t('export') }}
-              </div>
+<!--              <div @click="handleExport"-->
+<!--                   v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2 || roleSwitchingCode == 20 || roleSwitchingCode == 21"-->
+<!--                   class="operator-text-title">-->
+<!--                <a-icon type="export" :rotate="-90"/>-->
+<!--                {{ $t('export') }}-->
+<!--              </div>-->
 
               <!--              导入-->
               <div class="operator-text-title" v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2">
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
index a39853031..bf2667d39 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
@@ -276,10 +276,10 @@
           {{ $t('export') }}
         </div>
         <!--        撤回-->
-        <div class="operator-text" @click="withdrawnClick" v-if="this.roleSwitchingCode == '2' || this.roleSwitchingCode == '1'">
-          <a-icon type="rollback"/>
-          {{ $t('withdraw') }}
-        </div>
+<!--        <div class="operator-text" @click="withdrawnClick" v-if="this.roleSwitchingCode == '2' || this.roleSwitchingCode == '1'">-->
+<!--          <a-icon type="rollback"/>-->
+<!--          {{ $t('withdraw') }}-->
+<!--        </div>-->
         <!--        发起任务-->
         <div class="operator-text" @click="submitOrSendBackClick(0)" v-if="this.roleSwitchingCode == '1'">
           <a-icon type="check-circle"/>

From b4061eccc46e4e486b736c23692b2d5b5c43d07d Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 25 Sep 2023 16:28:57 +0800
Subject: [PATCH 140/288] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81=E4=B8=8B=E6=8B=89=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...rojectCertificationInventoryEOServiceImpl.java | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
index 4592a6b41..ea4305ab3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
@@ -1805,12 +1805,17 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 		for (CertificationInventoryFlowStatusEnum value : values) {
 			Map<String,Object> flowStatusMap = new HashMap<>();
 			String name = value.getCnName();
-			if(StringUtils.equals(cut,CutEnum.EN.getValue())){
-				name = value.getEnName();
+			if(!CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getCnName().equals(name)
+					&& !CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getEnName().equals(name)
+					&& !CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getCnName().equals(name)
+					&& !CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getEnName().equals(name)){
+				if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+					name = value.getEnName();
+				}
+				flowStatusMap.put("name",name);
+				flowStatusMap.put("value",value.getValue());
+				result.add(flowStatusMap);
 			}
-			flowStatusMap.put("name",name);
-			flowStatusMap.put("value",value.getValue());
-			result.add(flowStatusMap);
 		}
 		return Result.OK(result);
 	}

From fe206a0935492ba4db2321cefc215e5eaf75802c Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 25 Sep 2023 16:42:44 +0800
Subject: [PATCH 141/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95--?=
 =?UTF-8?q?=E6=B3=95=E8=A7=84=E5=B7=A5=E7=A8=8B=E5=B8=88=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PlatformProjectLawsInventoryEOServiceImpl.java       | 1 +
 .../jero/modules/project/entity/ProjectLawsInventoryEO.java   | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index 016f7b15e..c3b4cf27c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -1649,6 +1649,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 						String regulationOwnerName = sysUsers.stream().filter(e -> regulationOwnerId.equals(e.getId())).
 								map(SysUser::getUsername).collect(Collectors.joining(","));
 						projectLawsInventoryEO.setRegulationOwnerName(regulationOwnerName);
+						projectLawsInventoryEO.setRegulationOwnerIdName(regulationOwnerName);
 					}
 					String engineeringInterfacePerson = projectLawsInventoryEO.getEngineeringInterfacePerson();
 					if (StringUtils.isNotEmpty(engineeringInterfacePerson)) {
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
index 1092df44a..042171f70 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
@@ -186,6 +186,10 @@ public class ProjectLawsInventoryEO implements Serializable {
     @ApiModelProperty(value = "法规工程师名称")
     private String regulationOwnerName;//法规工程师名称
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "法规工程师名称（前端指定要的）")
+    private String regulationOwnerIdName;//法规工程师名称（前端指定要的）
+
 	/**认证工程师id*/
     @ApiModelProperty(value = "认证工程师id")
     private String homologationEngineerId;

From d880ff6adef0e85f2bb03729b7f47ab2942ac7d4 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 25 Sep 2023 17:08:25 +0800
Subject: [PATCH 142/288] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctCertificationInventoryEOServiceImpl.java |  12 +-
 ...tionInventoryDutyEnginnerEOEnPlatform.java | 218 +++++++++++++++
 ...cationInventoryDutyEnginnerEOPlatform.java | 218 +++++++++++++++
 ...ectCertificationInventoryEOEnPlatform.java | 224 +++++++++++++++
 ...ojectCertificationInventoryEOPlatform.java | 264 ++++++++++++++++++
 5 files changed, 932 insertions(+), 4 deletions(-)
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOEnPlatform.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOPlatform.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEnPlatform.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOPlatform.java

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
index ea4305ab3..7e9dd96f1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
@@ -37,8 +37,12 @@ import com.jero.modules.platform.service.IPlatformProjectLawsInventoryEOService;
 import com.jero.modules.platform.service.IPlatformProjectLibraryBaseService;
 import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEO;
 import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOEn;
+import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOEnPlatform;
+import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOPlatform;
 import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
 import com.jero.modules.project.entity.ProjectCertificationInventoryEOEn;
+import com.jero.modules.project.entity.ProjectCertificationInventoryEOEnPlatform;
+import com.jero.modules.project.entity.ProjectCertificationInventoryEOPlatform;
 import com.jero.modules.project.entity.ProjectCertificationInventoryLogEO;
 import com.jero.modules.project.entity.ProjectLawsInventoryEO;
 import com.jero.modules.project.entity.ProjectLibraryBase;
@@ -5547,9 +5551,9 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
 				if(ProjectRoleEnum.INTERFACE_PERSON.getValue().equals(roleCode) ||
 						ProjectRoleEnum.PERSON_LIABLE.getValue().equals(roleCode)){
-					workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryDutyEnginnerEO.class, copy);
+					workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryDutyEnginnerEOPlatform.class, copy);
 				}else{
-					workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryEO.class, dataList);
+					workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryEOPlatform.class, dataList);
 				}
 			}else{
 				if(ProjectRoleEnum.INTERFACE_PERSON.getValue().equals(roleCode) ||
@@ -5560,7 +5564,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 						BeanUtils.copyProperties(projectCertificationInventoryDutyEnginnerEOTemp,projectCertificationInventoryDutyEnginnerEOEn);
 						copyEn.add(projectCertificationInventoryDutyEnginnerEOEn);
 					}
-					workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryDutyEnginnerEOEn.class, copyEn);
+					workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryDutyEnginnerEOEnPlatform.class, copyEn);
 				}else{
 					List<ProjectCertificationInventoryEOEn> dataListEn = new ArrayList<>();
 					for (ProjectCertificationInventoryEO projectCertificationInventoryEOTemp : dataList) {
@@ -5570,7 +5574,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 					}
 					//下拉选中英文转换
 //				transition(dataListEn,projectCertificationInventoryEO);
-					workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryEOEn.class, dataListEn);
+					workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryEOEnPlatform.class, dataListEn);
 				}
 			}
 			workbook.write(excelOS);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOEnPlatform.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOEnPlatform.java
new file mode 100644
index 000000000..e76c51206
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOEnPlatform.java
@@ -0,0 +1,218 @@
+package com.jero.modules.project.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+
+/**
+ * @Description: 认证清单工程接口人和责任人导出类
+ * @Author: jero-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("project_certification_inventory")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="project_certification_inventory对象", description="项目库-认证清单表")
+public class ProjectCertificationInventoryDutyEnginnerEOEnPlatform implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    /**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+    /**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+    /**更新日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+    /**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+    /**类别*/
+    @Excel(name = "Category", width = 20)
+    @ApiModelProperty(value = "类别")
+    private String category;
+
+    /**检验项目*/
+    @Excel(name = "Inspection Items", width = 20)
+    @ApiModelProperty(value = "检验项目")
+    private String inspectionItem;
+
+    /**配置项*/
+    @ApiModelProperty(value = "配置项")
+    @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4")
+    private String configItem;
+
+    /**WVTA ID*/
+    @Excel(name = "WVTA ID", width = 20)
+    @ApiModelProperty(value = "WVTA ID")
+    private String wvtaId;
+
+    /**标准编号*/
+    @Excel(name = "Standard No", width = 20)
+    @ApiModelProperty(value = "标准编号")
+    private String serialNumber;
+
+    /**责任领域*/
+    @ApiModelProperty(value = "责任领域")
+    private String dutyTerritory;
+    /**责任领域名称**/
+    @Excel(name = "Responsible Field", width = 20)
+    @TableField(exist = false)
+    private String dutyTerritoryName;
+    /**责任领域名称-英文**/
+    @TableField(exist = false)
+    private String dutyTerritoryNameEn;
+
+    /**工程接口人*/
+    @ApiModelProperty(value = "工程接口人")
+    private String sdt;
+    /**工程接口人名称**/
+    @Excel(name = "Eng. Interface", width = 20)
+    @TableField(exist = false)
+    private String sdtName;
+
+    /**责任人*/
+    @ApiModelProperty(value = "责任人")
+    private String dutyPerson;
+    /**责任人名称**/
+    @Excel(name = "Assignee", width = 20)
+    @TableField(exist = false)
+    private String dutyPersonName;
+
+    /**交付物模板*/
+    @ApiModelProperty(value = "交付物模板")
+    private String deliverableTemplate;
+    /**交付物模板名称**/
+    @TableField(exist = false)
+    @Excel(name = "Deliverable Template", width = 40)
+    private String deliverableTemplateName;
+
+    /**交付物类型*/
+    @ApiModelProperty(value = "交付物类型")
+    private String deliverableType;
+    // 交付物类型名称
+    @Excel(name = "Deliverable Type", width = 20)
+    @TableField(exist = false)
+    private String deliverableTypeName;
+    // 交付物类型名称-英文
+    @TableField(exist = false)
+    private String deliverableTypeNameEn;
+
+    /**交付物*/
+//	@Excel(name = "交付物", width = 15)
+    @ApiModelProperty(value = "交付物")
+    private String deliverable;
+
+    /**文档库id*/
+//	@Excel(name = "文档库id", width = 15)
+    @ApiModelProperty(value = "文档库id")
+    private String bussDocumentLibraryId;
+
+
+
+    /**交付结果*/
+    @Excel(name = "Deliverables Result", width = 20)
+    @ApiModelProperty(value = "交付结果")
+    private String deliveryResult;
+
+    /**截止日期*/
+    @Excel(name = "Due Date", width = 20, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "截止日期")
+    private java.util.Date endTime;
+
+    /**流程状态*/
+    @ApiModelProperty(value = "流程状态")
+    private String flowStatus;
+    // 流程状态展示名称
+    @Excel(name = "Process Status", width = 20)
+    @TableField(exist = false)
+    private String flowStatusName;
+
+    /**报告编号*/
+//    @Excel(name = "Report No", width = 20)
+    @ApiModelProperty(value = "报告编号")
+    private String reportNumber;
+
+    /**产品型号*/
+//    @Excel(name = "Product Model", width = 20)
+    @ApiModelProperty(value = "产品型号")
+    private String productModel;
+
+    /**生产企业名称*/
+//    @Excel(name = "Name Of Manufacturer", width = 40)
+    @ApiModelProperty(value = "生产企业名称")
+    private String productionEnterpriseName;
+
+    /**认证进度*/
+
+    @ApiModelProperty(value = "认证进度")
+    private String certificationProgress;
+
+    /**认证进度展示名称**/
+    @TableField(exist = false)
+//    @Excel(name = "Homologation Progress", width = 40)
+    private String certificationProgress_dictText;
+
+    //	@Excel(name = "认证进度备注", width = 15)
+    @ApiModelProperty(value = "认证进度备注")
+    private String certificationProgressRemark;
+
+    /**项目库id*/
+    @ApiModelProperty(value = "项目库id")
+    private String projectLibraryId;
+
+    @TableField(exist = false)
+    private String cut;
+
+    @TableField(exist = false)
+    private String ids;
+
+    @TableField(exist = false)
+    private String roleCode;
+
+    /**值类型，对应SysCategoryValueTypeEnum中value**/
+    @TableField(exist = false)
+    private String valueType;
+
+    @TableField(exist = false)
+    private String excelName;
+
+    //    @Excel(name = "截止日期", width = 20, format = "yyyy-MM-dd")
+    @TableField(exist = false)
+    private String endTimeStr;
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOPlatform.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOPlatform.java
new file mode 100644
index 000000000..9a75018d5
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOPlatform.java
@@ -0,0 +1,218 @@
+package com.jero.modules.project.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * @Description: 认证清单工程接口人和责任人导出类
+ * @Author: jero-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("project_certification_inventory")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="project_certification_inventory对象", description="项目库-认证清单表")
+public class ProjectCertificationInventoryDutyEnginnerEOPlatform implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+	/**类别*/
+	@Excel(name = "类别", width = 20)
+    @ApiModelProperty(value = "类别")
+    private String category;
+
+	/**检验项目*/
+	@Excel(name = "检验项目", width = 20)
+    @ApiModelProperty(value = "检验项目")
+    private String inspectionItem;
+
+	/**配置项*/
+    @ApiModelProperty(value = "配置项")
+    @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4")
+    private String configItem;
+
+	/**WVTA ID*/
+	@Excel(name = "WVTA ID", width = 20)
+    @ApiModelProperty(value = "WVTA ID")
+    private String wvtaId;
+
+	/**标准编号*/
+	@Excel(name = "标准编号", width = 20)
+    @ApiModelProperty(value = "标准编号")
+    private String serialNumber;
+
+	/**责任领域*/
+    @ApiModelProperty(value = "责任领域")
+    private String dutyTerritory;
+    /**责任领域名称**/
+    @Excel(name = "责任领域", width = 20)
+    @TableField(exist = false)
+    private String dutyTerritoryName;
+    /**责任领域名称-英文**/
+    @TableField(exist = false)
+    private String dutyTerritoryNameEn;
+
+    /**工程接口人*/
+    @ApiModelProperty(value = "工程接口人")
+    private String sdt;
+    /**工程接口人名称**/
+    @Excel(name = "工程接口人", width = 20)
+    @TableField(exist = false)
+    private String sdtName;
+
+    /**责任人*/
+    @ApiModelProperty(value = "责任人")
+    private String dutyPerson;
+    /**责任人名称**/
+    @Excel(name = "责任人", width = 20)
+    @TableField(exist = false)
+    private String dutyPersonName;
+
+    /**交付物模板*/
+    @ApiModelProperty(value = "交付物模板")
+    private String deliverableTemplate;
+    /**交付物模板名称**/
+    @TableField(exist = false)
+    @Excel(name = "交付物模板", width = 20)
+    private String deliverableTemplateName;
+
+    /**交付物类型*/
+    @ApiModelProperty(value = "交付物类型")
+    private String deliverableType;
+    // 交付物类型名称
+    @Excel(name = "交付物类型", width = 20)
+    @TableField(exist = false)
+    private String deliverableTypeName;
+    // 交付物类型名称-英文
+    @TableField(exist = false)
+    private String deliverableTypeNameEn;
+
+	/**交付物*/
+//	@Excel(name = "交付物", width = 15)
+    @ApiModelProperty(value = "交付物")
+    private String deliverable;
+
+	/**文档库id*/
+//	@Excel(name = "文档库id", width = 15)
+    @ApiModelProperty(value = "文档库id")
+    private String bussDocumentLibraryId;
+
+
+
+	/**交付结果*/
+	@Excel(name = "交付结果", width = 20)
+    @ApiModelProperty(value = "交付结果")
+    private String deliveryResult;
+
+	/**截止日期*/
+	@Excel(name = "截止日期", width = 20, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "截止日期")
+    private Date endTime;
+	/**流程状态*/
+    @ApiModelProperty(value = "流程状态")
+    private String flowStatus;
+    // 流程状态展示名称
+    @Excel(name = "流程状态", width = 20)
+    @TableField(exist = false)
+    private String flowStatusName;
+
+	/**报告编号*/
+//	@Excel(name = "报告编号", width = 20)
+    @ApiModelProperty(value = "报告编号")
+    private String reportNumber;
+
+	/**产品型号*/
+//	@Excel(name = "产品型号", width = 20)
+    @ApiModelProperty(value = "产品型号")
+    private String productModel;
+
+	/**生产企业名称*/
+//	@Excel(name = "生产企业名称", width = 20)
+    @ApiModelProperty(value = "生产企业名称")
+    private String productionEnterpriseName;
+
+	/**认证进度*/
+
+    @ApiModelProperty(value = "认证进度")
+    private String certificationProgress;
+
+	/**认证进度展示名称**/
+//    @Excel(name = "认证进度", width = 20)
+	@TableField(exist = false)
+    private String certificationProgress_dictText;
+
+//	@Excel(name = "认证进度备注", width = 15)
+    @ApiModelProperty(value = "认证进度备注")
+    private String certificationProgressRemark;
+
+    /**项目库id*/
+    @ApiModelProperty(value = "项目库id")
+    private String projectLibraryId;
+
+    @TableField(exist = false)
+    private String cut;
+
+    @TableField(exist = false)
+    private String ids;
+
+    @TableField(exist = false)
+    private String roleCode;
+
+    /**值类型，对应SysCategoryValueTypeEnum中value**/
+    @TableField(exist = false)
+    private String valueType;
+
+    @TableField(exist = false)
+    private String excelName;
+
+//    @Excel(name = "*截止日期", width = 20, format = "yyyy-MM-dd")
+    @TableField(exist = false)
+    private String endTimeStr;
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEnPlatform.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEnPlatform.java
new file mode 100644
index 000000000..96ea4494c
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEnPlatform.java
@@ -0,0 +1,224 @@
+package com.jero.modules.project.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+
+/**
+ * @Description: 项目库-认证清单表
+ * @Author: jero-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("project_certification_inventory")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="project_certification_inventory对象", description="项目库-认证清单表")
+public class ProjectCertificationInventoryEOEnPlatform implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    /**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+    /**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+    /**更新日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+    /**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+    /**类别*/
+    @Excel(name = "Category", width = 20)
+    @ApiModelProperty(value = "类别")
+    private String category;
+
+    /**检验项目*/
+    @Excel(name = "Inspection Items", width = 20)
+    @ApiModelProperty(value = "检验项目")
+    private String inspectionItem;
+
+    /**配置项*/
+    @ApiModelProperty(value = "配置项")
+    @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4")
+    private String configItem;
+
+    /**认证类型*/
+    @Excel(name = "Certification Type", width = 20)
+    @ApiModelProperty(value = "认证类型")
+    @TableField(exist = false)
+    private String attestationTypeName;
+
+    /**WVTA ID*/
+    @Excel(name = "WVTA ID", width = 20)
+    @ApiModelProperty(value = "WVTA ID")
+    private String wvtaId;
+
+    /**标准编号*/
+    @Excel(name = "Standard No", width = 20)
+    @ApiModelProperty(value = "标准编号")
+    private String serialNumber;
+
+    /**责任领域*/
+    @ApiModelProperty(value = "责任领域")
+    private String dutyTerritory;
+    /**责任领域名称**/
+    @Excel(name = "Responsible Field", width = 20)
+    @TableField(exist = false)
+    private String dutyTerritoryName;
+    /**责任领域名称-英文**/
+    @TableField(exist = false)
+    private String dutyTerritoryNameEn;
+
+    /**工程接口人*/
+    @ApiModelProperty(value = "工程接口人")
+    private String sdt;
+    /**工程接口人名称**/
+    @Excel(name = "Eng. Interface", width = 20)
+    @TableField(exist = false)
+    private String sdtName;
+
+    /**责任人*/
+    @ApiModelProperty(value = "责任人")
+    private String dutyPerson;
+    /**责任人名称**/
+    @Excel(name = "Assignee", width = 20)
+    @TableField(exist = false)
+    private String dutyPersonName;
+
+    /**交付物模板*/
+    @ApiModelProperty(value = "交付物模板")
+    private String deliverableTemplate;
+    /**交付物模板名称**/
+    @TableField(exist = false)
+    @Excel(name = "Deliverable Template", width = 40)
+    private String deliverableTemplateName;
+
+    /**交付物类型*/
+    @ApiModelProperty(value = "交付物类型")
+    private String deliverableType;
+    // 交付物类型名称
+    @Excel(name = "Deliverable Type", width = 20)
+    @TableField(exist = false)
+    private String deliverableTypeName;
+    // 交付物类型名称-英文
+    @TableField(exist = false)
+    private String deliverableTypeNameEn;
+
+    /**交付物*/
+//	@Excel(name = "交付物", width = 15)
+    @ApiModelProperty(value = "交付物")
+    private String deliverable;
+
+    /**文档库id*/
+//	@Excel(name = "文档库id", width = 15)
+    @ApiModelProperty(value = "文档库id")
+    private String bussDocumentLibraryId;
+
+
+
+    /**交付结果*/
+    @Excel(name = "Deliverables Result", width = 20)
+    @ApiModelProperty(value = "交付结果")
+    private String deliveryResult;
+
+    /**截止日期*/
+    @Excel(name = "Due Date", width = 20, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "截止日期")
+    private java.util.Date endTime;
+
+    /**流程状态*/
+    @ApiModelProperty(value = "流程状态")
+    private String flowStatus;
+    // 流程状态展示名称
+    @Excel(name = "Process Status", width = 20)
+    @TableField(exist = false)
+    private String flowStatusName;
+
+    /**报告编号*/
+    @Excel(name = "Report No", width = 20)
+    @ApiModelProperty(value = "报告编号")
+    private String reportNumber;
+
+    /**产品型号*/
+    @Excel(name = "Product Model", width = 20)
+    @ApiModelProperty(value = "产品型号")
+    private String productModel;
+
+    /**生产企业名称*/
+    @Excel(name = "Name Of Manufacturer", width = 40)
+    @ApiModelProperty(value = "生产企业名称")
+    private String productionEnterpriseName;
+
+    /**认证进度*/
+
+    @ApiModelProperty(value = "认证进度")
+    private String certificationProgress;
+
+    /**认证进度展示名称**/
+    @TableField(exist = false)
+    private String certificationProgress_dictText;
+
+    //	@Excel(name = "认证进度备注", width = 15)
+    @ApiModelProperty(value = "认证进度备注")
+    private String certificationProgressRemark;
+
+    /**项目库id*/
+    @ApiModelProperty(value = "项目库id")
+    private String projectLibraryId;
+
+    @TableField(exist = false)
+    private String cut;
+
+    @TableField(exist = false)
+    private String ids;
+
+    @TableField(exist = false)
+    private String roleCode;
+
+    /**值类型，对应SysCategoryValueTypeEnum中value**/
+    @TableField(exist = false)
+    private String valueType;
+
+    @TableField(exist = false)
+    private String excelName;
+
+    //    @Excel(name = "截止日期", width = 20, format = "yyyy-MM-dd")
+    @TableField(exist = false)
+    private String endTimeStr;
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOPlatform.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOPlatform.java
new file mode 100644
index 000000000..2acf6a6a1
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOPlatform.java
@@ -0,0 +1,264 @@
+package com.jero.modules.project.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * @Description: 项目库-认证清单表
+ * @Author: jero-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("project_certification_inventory")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="project_certification_inventory对象", description="项目库-认证清单表")
+public class ProjectCertificationInventoryEOPlatform implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+	/**类别*/
+	@Excel(name = "类别", width = 20)
+    @ApiModelProperty(value = "类别")
+    private String category;
+
+	/**检验项目*/
+	@Excel(name = "检验项目", width = 20)
+    @ApiModelProperty(value = "检验项目")
+    private String inspectionItem;
+
+	/**配置项*/
+    @ApiModelProperty(value = "配置项")
+    @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4")
+    private String configItem;
+
+    /**认证类型名称**/
+    @Excel(name = "认证类型", width = 20)
+    @TableField(exist = false)
+    private String attestationTypeName;
+
+	/**WVTA ID*/
+	@Excel(name = "WVTA ID", width = 20)
+    @ApiModelProperty(value = "WVTA ID")
+    private String wvtaId;
+
+	/**标准编号*/
+	@Excel(name = "标准编号", width = 20)
+    @ApiModelProperty(value = "标准编号")
+    private String serialNumber;
+
+	/**责任领域*/
+    @ApiModelProperty(value = "责任领域")
+    private String dutyTerritory;
+    /**责任领域名称**/
+    @Excel(name = "责任领域", width = 20)
+    @TableField(exist = false)
+    private String dutyTerritoryName;
+    /**责任领域名称-英文**/
+    @TableField(exist = false)
+    private String dutyTerritoryNameEn;
+
+    /**责任部门*/
+    @ApiModelProperty(value = "责任部门")
+    private String dutyDepart;
+    /**工程接口人*/
+    @ApiModelProperty(value = "工程接口人")
+    private String sdt;
+    /**工程接口人名称**/
+    @Excel(name = "工程接口人", width = 20)
+    @TableField(exist = false)
+    private String sdtName;
+
+    /**责任人*/
+    @ApiModelProperty(value = "责任人")
+    private String dutyPerson;
+    /**责任人名称**/
+    @Excel(name = "责任人", width = 20)
+    @TableField(exist = false)
+    private String dutyPersonName;
+
+    /**交付物模板*/
+    @ApiModelProperty(value = "交付物模板")
+    private String deliverableTemplate;
+    /**交付物模板名称**/
+    @TableField(exist = false)
+    @Excel(name = "交付物模板", width = 20)
+    private String deliverableTemplateName;
+
+    /**交付物类型*/
+    @ApiModelProperty(value = "交付物类型")
+    private String deliverableType;
+    // 交付物类型名称
+    @Excel(name = "交付物类型", width = 20)
+    @TableField(exist = false)
+    private String deliverableTypeName;
+    // 交付物类型名称-英文
+    @TableField(exist = false)
+    private String deliverableTypeNameEn;
+
+	/**交付物*/
+//	@Excel(name = "交付物", width = 15)
+    @ApiModelProperty(value = "交付物")
+    private String deliverable;
+
+	/**文档库id*/
+//	@Excel(name = "文档库id", width = 15)
+    @ApiModelProperty(value = "文档库id")
+    private String bussDocumentLibraryId;
+
+
+
+	/**交付结果*/
+	@Excel(name = "交付结果", width = 20)
+    @ApiModelProperty(value = "交付结果")
+    private String deliveryResult;
+
+	/**截止日期*/
+	@Excel(name = "截止日期", width = 20, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "截止日期")
+    private Date endTime;
+	/**流程状态*/
+    @ApiModelProperty(value = "流程状态")
+    private String flowStatus;
+    // 流程状态展示名称
+    @Excel(name = "流程状态", width = 20)
+    @TableField(exist = false)
+    private String flowStatusName;
+
+	/**报告编号*/
+	@Excel(name = "报告编号", width = 20)
+    @ApiModelProperty(value = "报告编号")
+    private String reportNumber;
+
+	/**产品型号*/
+	@Excel(name = "产品型号", width = 20)
+    @ApiModelProperty(value = "产品型号")
+    private String productModel;
+
+	/**生产企业名称*/
+	@Excel(name = "生产企业名称", width = 20)
+    @ApiModelProperty(value = "生产企业名称")
+    private String productionEnterpriseName;
+
+	/**认证进度*/
+    @ApiModelProperty(value = "认证进度")
+    private String certificationProgress;
+
+    // 认证进度排序字段
+    @TableField(exist = false)
+    private String certificationProgressNumber;
+
+	/**认证进度展示名称**/
+	@TableField(exist = false)
+    private String certificationProgress_dictText;
+
+//	@Excel(name = "认证进度备注", width = 15)
+    @ApiModelProperty(value = "认证进度备注")
+    private String certificationProgressRemark;
+
+    /**项目库id*/
+    @ApiModelProperty(value = "项目库id")
+    private String projectLibraryId;
+
+    @TableField(exist = false)
+    private String cut;
+
+    @TableField(exist = false)
+    private String ids;
+
+    @TableField(exist = false)
+    private String roleCode;
+
+    /**值类型，对应SysCategoryValueTypeEnum中value**/
+    @TableField(exist = false)
+    private String valueType;
+
+    @TableField(exist = false)
+    private String excelName;
+
+//    @Excel(name = "*截止日期", width = 20, format = "yyyy-MM-dd")
+    @TableField(exist = false)
+    private String endTimeStr;
+
+    @TableField(exist = false)
+    private String reasonForReturn;
+
+    //排序（1->正序， 2->倒序）
+    @TableField(exist = false)
+    private String orderBy;
+
+    //排序字段
+    @TableField(exist = false)
+    private String orderByField;
+
+    /**清单校核截止时间*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "清单校核截止时间")
+    private Date inventoryVerifyEndTime;
+
+    /**责任确认截止时间*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "责任确认截止时间")
+    private Date taskConfirmEndTime;
+
+    /**认证类型*/
+    @ApiModelProperty(value = "认证类型")
+    private String attestationType;
+
+    /**一级责任领域**/
+    @TableField(exist = false)
+    private String firstLevelDutyTerritory;
+
+    @ApiModelProperty(value = "关联平台件数据")
+    @TableField(exist = false)
+    private List<ProjectCertificationInventoryEOPlatform> projectCertificationInventoryEOS;
+}

From 973809184692009e26dabcf10e4d5b885949d432 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 25 Sep 2023 17:17:49 +0800
Subject: [PATCH 143/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...latformProjectCertificationInventoryEOServiceImpl.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
index 7e9dd96f1..feaf08c34 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
@@ -536,7 +536,9 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 					List<String> userIdList = new ArrayList<>();
 					userIdList.add(oldPciEo.getDutyPerson());
 					if(role == ProjectRoleEnum.STUDIO_ENGINEER.getIntValue()){
-						userIdList.addAll(Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")));
+						if(StringUtils.isNotBlank(projectLibraryBase.getCertificationEngineer())){
+							userIdList.addAll(Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")));
+						}
 					}
 					List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
 					oldPciEo.setEndTime(newPciEo.getEndTime());
@@ -793,7 +795,9 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 					List<String> userIdList = new ArrayList<>();
 					userIdList.add(oldPciEo.getDutyPerson());
 					if(role == ProjectRoleEnum.STUDIO_ENGINEER.getIntValue()){
-						userIdList.addAll(Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")));
+						if(StringUtils.isNotBlank(projectLibraryBase.getCertificationEngineer())){
+							userIdList.addAll(Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")));
+						}
 					}else if(role == ProjectRoleEnum.HOMOLOGATION_ENGINEER.getIntValue()){
 						userIdList.add(projectLibraryBase.getStudioEngineer());
 					}

From 2a63464f1e1d158267515d9148fa65eb5f204220 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 25 Sep 2023 17:59:09 +0800
Subject: [PATCH 144/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PlatformProjectLawsInventoryEOServiceImpl.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index c3b4cf27c..f09d765ef 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -8831,6 +8831,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 			}
 
 		}
+		sysRoles = sysRoles.stream().distinct().collect(Collectors.toList());
 		return sysRoles;
 	}
 

From 6bf56e4752c486bf85c0823dd26e26152be0ddd2 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 26 Sep 2023 09:03:43 +0800
Subject: [PATCH 145/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js                             | 3 ++-
 jero-web/src/common/lang/zh-cn.js                             | 1 +
 .../components/certificationDirectory.vue                     | 4 ++--
 .../components/certificationList/components/addModel.vue      | 2 +-
 .../components/certificationList/index.vue                    | 4 ++--
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 19f020dad..60a3b785c 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1977,5 +1977,6 @@ module.exports = {
   unpublishedregulationsselected:'Only unpublished regulations can be selected',
   PlatformInformation:'Platform Information',
   Processdetails:'Process Details',
-  matchempty:'The match is empty'
+  matchempty:'The match is empty',
+  onlyDataProcessStatusDeleted:'Only data whose flow status is to be started can be deleted',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index f3cb814c8..69c317448 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1551,6 +1551,7 @@ module.exports = {
   type: '类型',
   select: '选择',
   onlyDataWithProcessStatusDeleted: '只能删除流程状态为清单待发布和审查通过的数据',
+  onlyDataProcessStatusDeleted: '只能删除流程状态为任务待发起的数据',
   complianceCertificationProgram: '合规认证计划',
   listPublishing: '清单发布',
   responsibilityConfirmation: '责任确认',
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationDirectory.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationDirectory.vue
index e15fbb63f..c6021f680 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationDirectory.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationDirectory.vue
@@ -11,7 +11,7 @@
       style="height: 100%;overflow: auto;padding-bottom: 53px;">
       <div style="margin-bottom: 60px">
         <div class="table-operator">
-          <div class="operator-text" v-if="isDisplayNum == 2 && roleSwitchingCode == 2"
+          <div class="operator-text" v-if="isDisplayNum == 2 && roleSwitchingCode == 1"
                @click="addData">
             <a-icon type="plus"/>
             {{$t('add')}}
@@ -159,7 +159,7 @@
     computed: {
       columns() {
         let columnResult = JSON.parse(JSON.stringify(this.columnsAll))
-        if (this.roleSwitchingCode == 2 && this.isDisplayNum == 2){
+        if (this.roleSwitchingCode == 1 && this.isDisplayNum == 2){
         }else{
           for (var i = 0; i < columnResult.length; i++) {
             if (columnResult[i].title === this.$t('operation')) {
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
index bb67b377b..9b887b4c3 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
@@ -362,7 +362,7 @@
                     <span class="Required" v-if="formInline.deliverableType != '1635545748968783874'">*</span>
                     <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.deliverableType == '1635545748968783874'?'':'dutyPersonName'"
                                      :rules="[{ required: formInline.deliverableType=='1635545748968783874'?false:true,
                                  message: $t('personLiable') + $t('cannotEmpty'), trigger: 'change'}]"
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
index d971f2fba..8bb58749c 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
@@ -1500,7 +1500,7 @@
       },
       deleteLib(val) {
         let _this = this
-        if (val.flowStatus == 'List to be released' || val.flowStatus == 'Review and pass') {
+        if (val.flowStatus == 'List to be checked') {
           this.$confirm({
             content: _this.$t('ConfirmDelete'),
             onOk() {
@@ -1515,7 +1515,7 @@
             }
           })
         } else {
-          this.$message.warning(this.$t('onlyDataWithProcessStatusDeleted'))
+          this.$message.warning(this.$t('onlyDataProcessStatusDeleted'))
         }
       },
       modifyHistoryClick(row) {

From 9ce40f9a7f5cde14a6fed18d5c9ad04b3f4017e0 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 26 Sep 2023 09:50:59 +0800
Subject: [PATCH 146/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE-=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85-=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E9=A1=B5=E9=9D=A2=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectManagement/platformItemLibraryDetails/index.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue
index 4a276140d..663ec2e0c 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue
@@ -509,7 +509,7 @@ export default {
     },
     backClick() {
       this.$router.push({
-        path: '/platformItemLibraryDetails'
+        path: '/platformItemLibrary'
       })
     },
     roleSwitchingClick(roleCode) {

From 91bad749d40473ca878eb4f40ad003307639c5c4 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 26 Sep 2023 10:16:01 +0800
Subject: [PATCH 147/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6--=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95=EF=BC=8C=E8=B4=A3=E4=BB=BB=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctCertificationInventoryEOServiceImpl.java | 28 +------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
index feaf08c34..712f7eee0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
@@ -25,7 +25,6 @@ import com.jero.modules.document.entity.BussDocumentLibraryEO;
 import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper;
 import com.jero.modules.document.service.IBussDocumentLibraryEOService;
 import com.jero.modules.dummy.enums.OrderEnum;
-import com.jero.modules.enums.DictCodeEnum;
 import com.jero.modules.feishu.enums.TemplateInfoEnum2;
 import com.jero.modules.feishu.service.IFeishuService;
 import com.jero.modules.oss.entity.OSSFile;
@@ -1840,32 +1839,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 		// 根据一级责任领域（统计节点），查询该一级责任领域下所有子责任领域的法规清单数据。
 		String dutyTerritoryStr = "";
 		if(StringUtils.isNotEmpty(projectCertificationInventoryEO.getFirstLevelDutyTerritory())){
-			List<SysDictItem> sysDictItems = this.sysDictItemServiceImpl.selectItemsAll();
-			List<SysDictItem> dutyTerritorys = new ArrayList<>();
-			Map<String, List<SysDictItem>> firstLevelDTMap = this.sysDictItemServiceImpl.getFirstLevelSysDictItemByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue(), sysDictItems);
-			String[] firstLevelDTArr = projectCertificationInventoryEO.getFirstLevelDutyTerritory().split(",");
-			for (String firstLevelDT : firstLevelDTArr){
-				if(CollectionUtils.isNotEmpty(firstLevelDTMap.get(firstLevelDT))){
-					dutyTerritorys.addAll(firstLevelDTMap.get(firstLevelDT));
-				}
-			}
-			if(CollectionUtils.isNotEmpty(dutyTerritorys)){
-				dutyTerritoryStr = dutyTerritorys.stream().map(SysDictItem::getItemValue).distinct().collect(Collectors.joining(","));
-			}
-		}
-		if (StringUtils.isNotEmpty(dutyTerritoryStr)) {
-			String finalDutyTerritoryStr = dutyTerritoryStr.replaceAll("\\*","");
-			queryWrapper.and(query -> {
-				query.lambda().like(ProjectCertificationInventoryEO::getDutyTerritory, finalDutyTerritoryStr);
-				if(StringUtils.contains(finalDutyTerritoryStr,",")){
-					String[] dutyTerritoryArr = finalDutyTerritoryStr.split(",");
-					for (String duty : dutyTerritoryArr) {
-						query.or(q -> {
-							q.like("duty_territory",duty);
-						});
-					}
-				}
-			});
+			queryWrapper.lambda().like(ProjectCertificationInventoryEO::getDutyDepart,projectCertificationInventoryEO.getFirstLevelDutyTerritory());
 		}
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		int isProjectRole = Integer.parseInt(roleCode);

From ac167460f93d3668969402ec88233fc88842604b Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 26 Sep 2023 10:22:02 +0800
Subject: [PATCH 148/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/listEditModel.vue              | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
index 53fac2abb..103c66b22 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
@@ -250,7 +250,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'}]">
@@ -381,7 +381,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'}]">
@@ -653,14 +653,14 @@
               trigger: 'change'
             }
           ],
-          regulationOwnerId: [
+          regulationOwnerIdName: [
             {
               required: true,
               message: this.$t('regulatoryEngineer') + this.$t('cannotEmpty'),
               trigger: 'change'
             }
           ],
-          engineeringInterfacePerson: [
+          engineeringInterfacePersonName: [
             {
               required: true,
               message: this.$t('engineeringInterfacePerson') + this.$t('cannotEmpty'),
@@ -830,9 +830,9 @@
         })
       },
       DutyDepartChange(event) {
-        this.formInline.dutyTerritory = []
+        // this.formInline.dutyTerritory = []
         this.formInline = { ...this.formInline }
-        this.getDutyTerritory(event.join(','))
+        // this.getDutyTerritory(event.join(','))
       },
       getDutyTerritory(row) {
         let query = {
@@ -851,7 +851,7 @@
         this.formInline.designInitiatorId = undefined
         this.formInline.prehomoInitiatorId = undefined
         this.formInline.verifyInitiatorId = undefined
-        this.queryPersonByProject(event.join(','))
+        // this.queryPersonByProject(event.join(','))
       },
 
       queryPersonByProject(row) {
@@ -932,12 +932,11 @@
         item.prehomoDeliverableType = item.prehomoDeliverableType ? item.prehomoDeliverableType.split(',') : []
         item.verifyDeliverableType = item.verifyDeliverableType ? item.verifyDeliverableType.split(',') : []
         item.dutyDepart = item.dutyDepart ? item.dutyDepart.split(',') : []
-        item.dutyTerritory = item.dutyTerritory ? item.dutyTerritory.split(',') : []
+        // item.dutyTerritory = item.dutyTerritory ? item.dutyTerritory.split(',') : []
         this.getRejectCause(item.id)
         if (item.dutyDepart && item.dutyDepart.length > 0) {
           this.getDutyTerritory(item.dutyDepart.join(','))
         }
-        console.log(item.dutyTerritory)
         // if (item.dutyTerritory && item.dutyTerritory.length > 0) {
         //   this.queryPersonByProject(item)
         // } else {
@@ -945,7 +944,7 @@
           this.formInline = { ...this.formInline }
         // }
         console.log(this.formInline)
-        console.log(this.formInline.regulationOwnerIdName)
+        console.log(this.formInline.dutyTerritory)
         this.$nextTick(() => {
           this.$refs.ruleForm.clearValidate()
         })

From d22ef821a9c66b0ea8dc5590990d6cc8f66b3080 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 26 Sep 2023 10:28:30 +0800
Subject: [PATCH 149/288] =?UTF-8?q?=E5=BA=94=E7=94=A8=E4=BA=A4=E4=BB=98?=
 =?UTF-8?q?=E7=89=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectLawsInventoryEOServiceImpl.java       | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 582ccdfdd..c8c2b6595 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -9918,6 +9918,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 		String resultMsg = "";
 		ProcessHistoryEO citePhEo = null;
+		String flag = "";
 		if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
 			resultMsg = "引用交付物成功！";
 		} else {
@@ -9998,19 +9999,27 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			if (ObjectUtils.isEmpty(citePhEo)) {
 				if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+					flag = "error";
 					resultMsg = "所选引用项目中，没有匹配到数据，请重新选择！";
 				} else {
+					flag = "error";
 					resultMsg = "There is no matching data in the selected reference project. Please reselect!";
 				}
 			}
 		} else {
 			if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+				flag = "error";
 				resultMsg = "所选引用项目中流程完成数据为空，请重新选择！";
 			} else {
+				flag = "error";
 				resultMsg = "The process completion data in the selected reference project is empty, please reselect!";
 			}
 		}
-		return Result.OK(resultMsg, citePhEo);
+		if(StringUtils.isNotBlank(flag)){
+			return Result.error(resultMsg);
+		}else{
+			return Result.OK(resultMsg, citePhEo);
+		}
 	}
 
 	@Override

From d60ebb4a3c990cc1021bcb5e89934c2fff46906d Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 26 Sep 2023 10:46:44 +0800
Subject: [PATCH 150/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctCertificationInventoryEOServiceImpl.java | 46 ++++++++++++++-----
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
index 712f7eee0..6b8908ef6 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
@@ -35,11 +35,9 @@ import com.jero.modules.platform.service.IPlatformProjectCertificationInventoryE
 import com.jero.modules.platform.service.IPlatformProjectLawsInventoryEOService;
 import com.jero.modules.platform.service.IPlatformProjectLibraryBaseService;
 import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEO;
-import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOEn;
 import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOEnPlatform;
 import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOPlatform;
 import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
-import com.jero.modules.project.entity.ProjectCertificationInventoryEOEn;
 import com.jero.modules.project.entity.ProjectCertificationInventoryEOEnPlatform;
 import com.jero.modules.project.entity.ProjectCertificationInventoryEOPlatform;
 import com.jero.modules.project.entity.ProjectCertificationInventoryLogEO;
@@ -5529,26 +5527,50 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
 				if(ProjectRoleEnum.INTERFACE_PERSON.getValue().equals(roleCode) ||
 						ProjectRoleEnum.PERSON_LIABLE.getValue().equals(roleCode)){
-					workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryDutyEnginnerEOPlatform.class, copy);
+					List<ProjectCertificationInventoryDutyEnginnerEOPlatform> projectCertificationInventoryDutyEnginnerEOPlatformList = new ArrayList<>();
+					for (ProjectCertificationInventoryDutyEnginnerEO projectCertificationInventoryDutyEnginnerEO : copy) {
+						ProjectCertificationInventoryDutyEnginnerEOPlatform projectCertificationInventoryDutyEnginnerEOPlatform = new ProjectCertificationInventoryDutyEnginnerEOPlatform();
+						BeanUtils.copyProperties(projectCertificationInventoryDutyEnginnerEO,projectCertificationInventoryDutyEnginnerEOPlatform);
+						projectCertificationInventoryDutyEnginnerEOPlatformList.add(projectCertificationInventoryDutyEnginnerEOPlatform);
+					}
+					workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryDutyEnginnerEOPlatform.class, projectCertificationInventoryDutyEnginnerEOPlatformList);
 				}else{
-					workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryEOPlatform.class, dataList);
+					List<ProjectCertificationInventoryEOPlatform> projectCertificationInventoryEOPlatformList = new ArrayList<>();
+					for (ProjectCertificationInventoryEO certificationInventoryEO : dataList) {
+						ProjectCertificationInventoryEOPlatform projectCertificationInventoryEOPlatform = new ProjectCertificationInventoryEOPlatform();
+						BeanUtils.copyProperties(certificationInventoryEO,projectCertificationInventoryEOPlatform);
+						projectCertificationInventoryEOPlatformList.add(projectCertificationInventoryEOPlatform);
+					}
+					workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryEOPlatform.class, projectCertificationInventoryEOPlatformList);
 				}
 			}else{
 				if(ProjectRoleEnum.INTERFACE_PERSON.getValue().equals(roleCode) ||
 						ProjectRoleEnum.PERSON_LIABLE.getValue().equals(roleCode)){
-					List<ProjectCertificationInventoryDutyEnginnerEOEn> copyEn = new ArrayList<>();
+//					List<ProjectCertificationInventoryDutyEnginnerEOEn> copyEn = new ArrayList<>();
+//					for (ProjectCertificationInventoryDutyEnginnerEO projectCertificationInventoryDutyEnginnerEOTemp : copy) {
+//						ProjectCertificationInventoryDutyEnginnerEOEn projectCertificationInventoryDutyEnginnerEOEn = new ProjectCertificationInventoryDutyEnginnerEOEn();
+//						BeanUtils.copyProperties(projectCertificationInventoryDutyEnginnerEOTemp,projectCertificationInventoryDutyEnginnerEOEn);
+//						copyEn.add(projectCertificationInventoryDutyEnginnerEOEn);
+//					}
+					List<ProjectCertificationInventoryDutyEnginnerEOEnPlatform> copyEn = new ArrayList<>();
 					for (ProjectCertificationInventoryDutyEnginnerEO projectCertificationInventoryDutyEnginnerEOTemp : copy) {
-						ProjectCertificationInventoryDutyEnginnerEOEn projectCertificationInventoryDutyEnginnerEOEn = new ProjectCertificationInventoryDutyEnginnerEOEn();
-						BeanUtils.copyProperties(projectCertificationInventoryDutyEnginnerEOTemp,projectCertificationInventoryDutyEnginnerEOEn);
-						copyEn.add(projectCertificationInventoryDutyEnginnerEOEn);
+						ProjectCertificationInventoryDutyEnginnerEOEnPlatform projectCertificationInventoryDutyEnginnerEOEnPlatform = new ProjectCertificationInventoryDutyEnginnerEOEnPlatform();
+						BeanUtils.copyProperties(projectCertificationInventoryDutyEnginnerEOTemp,projectCertificationInventoryDutyEnginnerEOEnPlatform);
+						copyEn.add(projectCertificationInventoryDutyEnginnerEOEnPlatform);
 					}
 					workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryDutyEnginnerEOEnPlatform.class, copyEn);
 				}else{
-					List<ProjectCertificationInventoryEOEn> dataListEn = new ArrayList<>();
+//					List<ProjectCertificationInventoryEOEn> dataListEn = new ArrayList<>();
+//					for (ProjectCertificationInventoryEO projectCertificationInventoryEOTemp : dataList) {
+//						ProjectCertificationInventoryEOEn projectCertificationInventoryEOEn = new ProjectCertificationInventoryEOEn();
+//						BeanUtils.copyProperties(projectCertificationInventoryEOTemp,projectCertificationInventoryEOEn);
+//						dataListEn.add(projectCertificationInventoryEOEn);
+//					}
+					List<ProjectCertificationInventoryEOEnPlatform> dataListEn = new ArrayList<>();
 					for (ProjectCertificationInventoryEO projectCertificationInventoryEOTemp : dataList) {
-						ProjectCertificationInventoryEOEn projectCertificationInventoryEOEn = new ProjectCertificationInventoryEOEn();
-						BeanUtils.copyProperties(projectCertificationInventoryEOTemp,projectCertificationInventoryEOEn);
-						dataListEn.add(projectCertificationInventoryEOEn);
+						ProjectCertificationInventoryEOEnPlatform projectCertificationInventoryEOEnPlatform = new ProjectCertificationInventoryEOEnPlatform();
+						BeanUtils.copyProperties(projectCertificationInventoryEOTemp,projectCertificationInventoryEOEnPlatform);
+						dataListEn.add(projectCertificationInventoryEOEnPlatform);
 					}
 					//下拉选中英文转换
 //				transition(dataListEn,projectCertificationInventoryEO);

From 9ba433461c5f233cd9ad4e2193b3196ed9cb7e8d Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 26 Sep 2023 11:24:23 +0800
Subject: [PATCH 151/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/certificationList/index.vue                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
index 8bb58749c..e5c25409f 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
@@ -1199,7 +1199,7 @@
               onOk() {
                 _this.JTextLoading = true
                 let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
-                postAction('/project/projectCertificationInventoryEO/resetFlow', {
+                postAction('/platform/projectCertificationInventoryEO/resetFlow', {
                   ids: idList.join(','),
                   projectLibraryId: _this.$route.query.id,
                   operatorType: 'certificationInventoryStudioReset'

From cc13dc56992cb7c81bd8b54aa49d4d8bdba6ef31 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 26 Sep 2023 11:43:11 +0800
Subject: [PATCH 152/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6--=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95=E9=87=8D=E7=BD=AE=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...rmProjectCertificationInventoryEOServiceImpl.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
index 6b8908ef6..332cabe4c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
@@ -3727,9 +3727,13 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 		if(ObjectUtils.isEmpty(projectLibraryBase)){
 			throw new JeroBootException("无法获取项目库信息，项目库id为：" + projectLibraryId + " 请联系管理员！");
 		}
+		List<String> certificationEngineerIdList = new ArrayList<>();
+		List<SysUser> certificationEngineerList = new ArrayList<>();
+		if(StringUtils.isNotBlank(projectLibraryBase.getCertificationEngineer())){
+			certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
+			certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList);
+		}
 
-		List<String> certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
-		List<SysUser> certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList);
 		String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 		String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 
@@ -3744,7 +3748,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 
 		QueryWrapper<ProjectCertificationInventoryEO> queryWrapper = new QueryWrapper<>();
 		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getId,idList);
-		queryWrapper.lambda().ne(ProjectCertificationInventoryEO::getFlowStatus,CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+		queryWrapper.lambda().ne(ProjectCertificationInventoryEO::getFlowStatus,CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
 		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.list(queryWrapper);
 
 		// 根据结束时间进行排序，获取最近的时间，发消息时使用。
@@ -3772,7 +3776,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 					updateWrap.set(ProjectCertificationInventoryEO::getEndTime,null);
 				}
 
-				updateWrap.set(ProjectCertificationInventoryEO::getFlowStatus,CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+				updateWrap.set(ProjectCertificationInventoryEO::getFlowStatus,CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
 				updateWrap.eq(ProjectCertificationInventoryEO::getId,projectCertificationInventoryEO.getId());
 				this.update(updateWrap);
 			}

From b3464ee4b7382377b1d77507eeec4bf7e7ec069d Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 26 Sep 2023 11:54:02 +0800
Subject: [PATCH 153/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PersonnelSelection/index.vue   |  3 ++
 .../components/listEditModel.vue              | 39 +++++++++++--------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue
index 24fdc6166..f740d653b 100644
--- a/jero-web/src/components/PersonnelSelection/index.vue
+++ b/jero-web/src/components/PersonnelSelection/index.vue
@@ -72,6 +72,9 @@
         fetching: false,
         selectValue: this.isSingleChoice ? '' : []
       }
+    },
+    watch:{
+
     },
     mounted() {
       this.selectValue = []
diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index f3d71970a..07107ca79 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -840,24 +840,29 @@
               _this.dataList = _this.dataList.filter(item => item.id !== val.id);
               _this.dataList = [..._this.dataList]
               console.log(this.platformIds)
-              if(this.platformIds){
-                this.formInline.platformIds = this.platformIds.join(',')
+              if(_this.platformIds){
+                _this.formInline.platformIds = _this.platformIds.join(',')
               }
-              this.formInline.designDutyIdName = this.dataList && this.dataList.length>0 ? this.dataList[0].designDutyIdName : ''
-              this.formInline.verifyDutyIdName = this.dataList && this.dataList.length>0 ? this.dataList[0].verifyDutyIdName : ''
-              this.formInline.designDutyId = this.dataList && this.dataList.length>0 ? this.dataList[0].designDutyId : ''
-              this.formInline.verifyDutyId = this.dataList && this.dataList.length>0 ? this.dataList[0].verifyDutyId : ''
-              this.formInline.designDueDate = this.dataList && this.dataList.length>0 ? this.dataList[0].designDueDate : ''
-              this.formInline.verifyDueDate = this.dataList && this.dataList.length>0 ? this.dataList[0].verifyDueDate : ''
-              this.formInline.designDeliverableTemplate = this.dataList && this.dataList.length>0 ? this.dataList[0].designDeliverableTemplate : ''
-              this.formInline.verifyDeliverableTemplate = this.dataList && this.dataList.length>0 ? this.dataList[0].verifyDeliverableTemplate : ''
-              this.formInline.designDutyDueDate = this.dataList && this.dataList.length>0 ? this.dataList[0].designDutyDueDate : ''
-              this.formInline.verifyDutyDueDate = this.dataList && this.dataList.length>0 ? this.dataList[0].verifyDutyDueDate : ''
-              this.formInline.designRemark = this.dataList && this.dataList.length>0 ? this.dataList[0].designRemark : ''
-              this.formInline.verifyRemark = this.dataList && this.dataList.length>0 ? this.dataList[0].verifyRemark : ''
-              this.formInline.designDeliverableType = this.dataList && this.dataList.length>0 ? this.dataList[0].designDeliverableType.split(',') : []
-              this.formInline.verifyDeliverableType = this.dataList && this.dataList.length>0 ? this.dataList[0].verifyDeliverableType.split(',') : []
-              this.formInline = {...this.formInline}
+              _this.visible = false
+              _this.formInline.designDutyIdName = _this.dataList && this.dataList.length>0 ? _this.dataList[0].designDutyIdName : ''
+              _this.formInline.verifyDutyIdName = _this.dataList && this.dataList.length>0 ? _this.dataList[0].verifyDutyIdName : ''
+              _this.formInline.designDutyId = _this.dataList && _this.dataList.length>0 ? _this.dataList[0].designDutyId : ''
+              _this.formInline.verifyDutyId = _this.dataList && _this.dataList.length>0 ? _this.dataList[0].verifyDutyId : ''
+              _this.formInline.designDueDate = _this.dataList && _this.dataList.length>0 ? _this.dataList[0].designDueDate : ''
+              _this.formInline.verifyDueDate = _this.dataList && _this.dataList.length>0 ? _this.dataList[0].verifyDueDate : ''
+              _this.formInline.designDeliverableTemplate = _this.dataList && _this.dataList.length>0 ? _this.dataList[0].designDeliverableTemplate : ''
+              _this.formInline.verifyDeliverableTemplate = _this.dataList && _this.dataList.length>0 ? _this.dataList[0].verifyDeliverableTemplate : ''
+              _this.formInline.designDutyDueDate = _this.dataList && _this.dataList.length>0 ? _this.dataList[0].designDutyDueDate : ''
+              _this.formInline.verifyDutyDueDate = _this.dataList && _this.dataList.length>0 ? _this.dataList[0].verifyDutyDueDate : ''
+              _this.formInline.designRemark = _this.dataList && _this.dataList.length>0 ? _this.dataList[0].designRemark : ''
+              _this.formInline.verifyRemark = _this.dataList && _this.dataList.length>0 ? _this.dataList[0].verifyRemark : ''
+              _this.formInline.designDeliverableType = _this.dataList && _this.dataList.length>0 ? _this.dataList[0].designDeliverableType.split(',') : []
+              _this.formInline.verifyDeliverableType = _this.dataList && _this.dataList.length>0 ? _this.dataList[0].verifyDeliverableType.split(',') : []
+              _this.$nextTick(() => {
+                _this.formInline = {..._this.formInline}
+                _this.visible = true
+              })
+              _this.$forceUpdate()
             }
         })
       },

From 688cf6fd62c391498f6a9724ac624ab3ab6e5f7d Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 26 Sep 2023 13:56:16 +0800
Subject: [PATCH 154/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6=E5=90=8E=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=A6=86=E7=9B=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index c8c2b6595..64e303d33 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -11897,25 +11897,31 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 							} else {
 								inventoryEO.setVerifyDutyIdName("");
 							}
-							//设计交付物类型
-							lawsInventoryEO.setDesignDeliverableType(lawsInventoryEOS.get(0).getDesignDeliverableType());
-							lawsInventoryEO.setDesignDeliverableTypeName(lawsInventoryEOS.get(0).getDesignDeliverableTypeName());
-							//验证交付物类型
-							lawsInventoryEO.setVerifyDeliverableType(lawsInventoryEOS.get(0).getVerifyDeliverableType());
-							lawsInventoryEO.setVerifyDeliverableTypeName(lawsInventoryEOS.get(0).getVerifyDeliverableTypeName());
-							//交付物类型模板
-							lawsInventoryEO.setDesignDeliverableTemplate(lawsInventoryEOS.get(0).getDesignDeliverableTemplate());
-							lawsInventoryEO.setDesignDeliverableTemplateName(lawsInventoryEOS.get(0).getDesignDeliverableTemplateName());
-
-							lawsInventoryEO.setVerifyDeliverableTemplate(lawsInventoryEOS.get(0).getVerifyDeliverableTemplate());
-							lawsInventoryEO.setVerifyDeliverableTemplateName(lawsInventoryEOS.get(0).getVerifyDeliverableTemplateName());
-
-							lawsInventoryEO.setVerifyDutyId(lawsInventoryEOS.get(0).getDesignDutyId());
-							lawsInventoryEO.setDesignDutyIdName(lawsInventoryEOS.get(0).getDesignDutyIdName());
-
-							lawsInventoryEO.setVerifyDutyId(lawsInventoryEOS.get(0).getVerifyDutyId());
-							lawsInventoryEO.setVerifyDutyIdName(lawsInventoryEOS.get(0).getVerifyDutyIdName());
 						}
+						//设计交付物类型
+						lawsInventoryEO.setDesignDeliverableType(lawsInventoryEOS.get(0).getDesignDeliverableType());
+						lawsInventoryEO.setDesignDeliverableTypeName(lawsInventoryEOS.get(0).getDesignDeliverableTypeName());
+						//验证交付物类型
+						lawsInventoryEO.setVerifyDeliverableType(lawsInventoryEOS.get(0).getVerifyDeliverableType());
+						lawsInventoryEO.setVerifyDeliverableTypeName(lawsInventoryEOS.get(0).getVerifyDeliverableTypeName());
+						//交付物类型模板
+						lawsInventoryEO.setDesignDeliverableTemplate(lawsInventoryEOS.get(0).getDesignDeliverableTemplate());
+						lawsInventoryEO.setDesignDeliverableTemplateName(lawsInventoryEOS.get(0).getDesignDeliverableTemplateName());
+
+						lawsInventoryEO.setVerifyDeliverableTemplate(lawsInventoryEOS.get(0).getVerifyDeliverableTemplate());
+						lawsInventoryEO.setVerifyDeliverableTemplateName(lawsInventoryEOS.get(0).getVerifyDeliverableTemplateName());
+
+						lawsInventoryEO.setVerifyDutyId(lawsInventoryEOS.get(0).getDesignDutyId());
+						lawsInventoryEO.setDesignDutyIdName(lawsInventoryEOS.get(0).getDesignDutyIdName());
+
+						lawsInventoryEO.setVerifyDutyId(lawsInventoryEOS.get(0).getVerifyDutyId());
+						lawsInventoryEO.setVerifyDutyIdName(lawsInventoryEOS.get(0).getVerifyDutyIdName());
+
+						lawsInventoryEO.setDesignDueDate(lawsInventoryEOS.get(0).getDesignDueDate());
+						lawsInventoryEO.setVerifyDueDate(lawsInventoryEOS.get(0).getVerifyDueDate());
+
+						lawsInventoryEO.setDesignRemark(lawsInventoryEOS.get(0).getDesignRemark());
+						lawsInventoryEO.setVerifyRemark(lawsInventoryEOS.get(0).getVerifyRemark());
 					}
 				}
 			}

From e9f11d5391582ea63f5b28604b35b7e6fbcc55b0 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 26 Sep 2023 14:04:01 +0800
Subject: [PATCH 155/288] =?UTF-8?q?=20=E5=B9=B3=E5=8F=B0=E4=BB=B6=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95=E8=B0=83=E5=8F=96-=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E7=8A=B6=E6=80=81=E4=B8=BA=E4=BB=BB=E5=8A=A1=E5=BE=85?=
 =?UTF-8?q?=E5=8F=91=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformProjectCertificationInventoryEOServiceImpl.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
index 332cabe4c..ad34b90f8 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
@@ -4496,7 +4496,8 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 
 					projectCertificationInventoryEOTemp.setId(UUID.randomUUID().toString().replace("-", ""));
 					projectCertificationInventoryEOTemp.setProjectLibraryId(projectLibraryId);
-					projectCertificationInventoryEOTemp.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+					projectCertificationInventoryEOTemp.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
+//					projectCertificationInventoryEOTemp.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
 					projectCertificationInventoryEOTemp.setCreateTime(new Date());
 					projectCertificationInventoryEOTemp.setUpdateTime(new Date());
 					projectCertificationInventoryEOTemp.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());

From 1085bb11768bc822faa7a26e930ad7c03eefc2f2 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 26 Sep 2023 14:15:41 +0800
Subject: [PATCH 156/288] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=20=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6=E6=88=90=E5=8A=9F=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/projectManagement/components/listOfRegulations.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index f2290d886..f88f7421e 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -2033,7 +2033,7 @@
           this.visibleoperation = msg
           this.visibleoperationFailed = true
         }else{
-          this.$message.warning(this.$t('matchempty'))
+          this.$message.warning(this.$t('OperationSuccessful'))
           this.$refs.associatedplatRef.handleCancel()
           this.$refs.associatedplattwoRef.handleCancel()
           this.selectedRowKeys = []

From b2960fe901d0749c95f93896a4a8b586d5480398 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 26 Sep 2023 14:35:25 +0800
Subject: [PATCH 157/288] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=20=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=85=B3=E8=81=94=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/projectManagement/components/listEditModel.vue  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index 07107ca79..f29c1d6ca 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -856,6 +856,10 @@
               _this.formInline.verifyDutyDueDate = _this.dataList && _this.dataList.length>0 ? _this.dataList[0].verifyDutyDueDate : ''
               _this.formInline.designRemark = _this.dataList && _this.dataList.length>0 ? _this.dataList[0].designRemark : ''
               _this.formInline.verifyRemark = _this.dataList && _this.dataList.length>0 ? _this.dataList[0].verifyRemark : ''
+              _this.formInline.designFlowStatus = _this.dataList && _this.dataList.length>0 ? _this.dataList[0].designFlowStatus : 'List to be released'
+              _this.formInline.verifyFlowStatus = _this.dataList && _this.dataList.length>0 ? _this.dataList[0].verifyFlowStatus : 'List to be released'
+              _this.formInline.designFlowStatusName = _this.dataList && _this.dataList.length>0 ? _this.dataList[0].designFlowStatusName : this.$t('listToBeReleased')
+              _this.formInline.verifyFlowStatusName = _this.dataList && _this.dataList.length>0 ? _this.dataList[0].verifyFlowStatusName : this.$t('listToBeReleased')
               _this.formInline.designDeliverableType = _this.dataList && _this.dataList.length>0 ? _this.dataList[0].designDeliverableType.split(',') : []
               _this.formInline.verifyDeliverableType = _this.dataList && _this.dataList.length>0 ? _this.dataList[0].verifyDeliverableType.split(',') : []
               _this.$nextTick(() => {

From ed0d0725b9b44fdc45516ecb02b89151442a62f9 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 26 Sep 2023 14:36:50 +0800
Subject: [PATCH 158/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...formProjectLawsInventoryEOServiceImpl.java | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index f09d765ef..8d13eb542 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -682,13 +682,13 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 	public void deleteById(String id, String projectLibraryId, String cut) {
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		int isProjectRole = this.checkUserRole(projectLibraryId, currentUser.getId(), "");
-		if (!ProjectRoleEnum.STUDIO_ENGINEER.getValue().equals(String.valueOf(isProjectRole))) {
-			if (CutEnum.CN.getValue().equals(cut)) {
-				throw new JeroBootException("该用户没有删除权限");
-			} else {
-				throw new JeroBootException("The user has no deletion permission");
-			}
-		}
+//		if (!ProjectRoleEnum.STUDIO_ENGINEER.getValue().equals(String.valueOf(isProjectRole))) {
+//			if (CutEnum.CN.getValue().equals(cut)) {
+//				throw new JeroBootException("该用户没有删除权限");
+//			} else {
+//				throw new JeroBootException("The user has no deletion permission");
+//			}
+//		}
 
 		//更新log
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -734,13 +734,13 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 		}
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		int isProjectRole = this.checkUserRole(projectLibraryId, currentUser.getId(), "");
-		if (!ProjectRoleEnum.STUDIO_ENGINEER.getValue().equals(String.valueOf(isProjectRole))) {
-			if (CutEnum.CN.getValue().equals(cut)) {
-				throw new JeroBootException("该用户没有删除权限");
-			} else {
-				throw new JeroBootException("The user has no deletion permission");
-			}
-		}
+//		if (!ProjectRoleEnum.STUDIO_ENGINEER.getValue().equals(String.valueOf(isProjectRole))) {
+//			if (CutEnum.CN.getValue().equals(cut)) {
+//				throw new JeroBootException("该用户没有删除权限");
+//			} else {
+//				throw new JeroBootException("The user has no deletion permission");
+//			}
+//		}
 
 		//更新log
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();

From 02fde85171c2469d8950bec40b11eae7d54985cd Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 26 Sep 2023 14:51:15 +0800
Subject: [PATCH 159/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E8=B0=83=E5=8F=96=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81=E4=B8=BA=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=BE=85=E5=8F=91=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PlatformProjectLawsInventoryEOServiceImpl.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index 8d13eb542..2100df96e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -399,8 +399,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 						projectLawsInventoryEOTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
 						projectLawsInventoryEOTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
 						projectLawsInventoryEOTemp.setStandId(dummyInventoryInfoEO.getBussDocumentLibraryId());
-						projectLawsInventoryEOTemp.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
-						projectLawsInventoryEOTemp.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+						projectLawsInventoryEOTemp.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
+						projectLawsInventoryEOTemp.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
 						projectLawsInventoryEOTemp.setCreateTime(new Date());
 						projectLawsInventoryEOTemp.setUpdateTime(new Date());
 						projectLawsInventoryEOS.add(projectLawsInventoryEOTemp);
@@ -425,8 +425,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 							projectLawsInventoryEOTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
 							projectLawsInventoryEOTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
 							projectLawsInventoryEOTemp.setStandId(dummyInventoryInfoEO.getBussDocumentLibraryId());
-							projectLawsInventoryEOTemp.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
-							projectLawsInventoryEOTemp.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+							projectLawsInventoryEOTemp.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
+							projectLawsInventoryEOTemp.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
 							projectLawsInventoryEOTemp.setCreateTime(new Date());
 							projectLawsInventoryEOTemp.setUpdateTime(new Date());
 							projectLawsInventoryEOS.add(projectLawsInventoryEOTemp);

From 7ceffc9c9515e5f0749f8ee37242052b120fe604 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 26 Sep 2023 14:54:45 +0800
Subject: [PATCH 160/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificationList/components/addModel.vue | 60 +++++++++++--------
 .../components/listEditModel.vue              | 52 ++++++++--------
 2 files changed, 62 insertions(+), 50 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
index 9b887b4c3..562412cfa 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
@@ -475,28 +475,28 @@
                   <a-form-model-item class="itemModel-multi"
                                      :prop="'dutyTerritory'"
                   >
-<!--                    <a-select :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
-<!--                              class="box-input"-->
-<!--                              optionFilterProp="label"-->
-<!--                              mode="multiple"-->
-<!--                              @change="handleChange"-->
-<!--                              :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
-<!--                              v-model="formInline.dutyTerritory">-->
-<!--                      <a-select-option v-for="(item, key) in dutyTerritoryList"-->
-<!--                                       :key="key"-->
-<!--                                       :label="item.itemText"-->
-<!--                                       :value="item.itemValue">-->
-<!--                               <span style="display: inline-block;width: 100%" :title=" item.itemText ">-->
-<!--                                     {{ item.itemText }}-->
-<!--                               </span>-->
-<!--                      </a-select-option>-->
-<!--                    </a-select>-->
-                    <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
-                                       @input="handleInput('dutyTerritory')"
-                                       @changeQuery="handleChange"
-                                       :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                       :type="'select'"
-                                       :triggerChange="false" :dictCode="'duty_territory'"/>
+                    <a-select :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                              class="box-input"
+                              optionFilterProp="label"
+                              mode="multiple"
+                              @change="handleChange"
+                              :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                              v-model="formInline.dutyTerritory">
+                      <a-select-option v-for="(item, key) in dutyTerritoryList"
+                                       :key="key"
+                                       :label="item.itemText"
+                                       :value="item.itemValue">
+                               <span style="display: inline-block;width: 100%" :title=" item.itemText ">
+                                     {{ item.itemText }}
+                               </span>
+                      </a-select-option>
+                    </a-select>
+<!--                    <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"-->
+<!--                                       @input="handleInput('dutyTerritory')"-->
+<!--                                       @changeQuery="handleChange"-->
+<!--                                       :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
+<!--                                       :type="'select'"-->
+<!--                                       :triggerChange="false" :dictCode="'duty_territory'"/>-->
                   </a-form-model-item>
                 </div>
               </a-col>
@@ -774,9 +774,21 @@
         })
       },
       DutyDepartChangeOne(event) {
-        // this.formInline.dutyTerritory = []
+        this.formInline.dutyTerritory = []
         this.formInline = {...this.formInline}
-        // this.getDutyTerritoryOne(event.join(','))
+        this.getDutyTerritoryOne(event.join(','))
+      },
+      getDutyTerritoryOne(row) {
+        let query = {
+          dutyDepart: row
+        }
+        getAction('/sys/dict/getDutyTeryByDD', query).then((res) => {
+          if (res.success) {
+            this.dutyTerritoryList = res.result || []
+          } else {
+            this.dutyTerritoryList = []
+          }
+        })
       },
       addModel() {
         this.visible = true
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
index 103c66b22..697327a95 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
@@ -132,29 +132,29 @@
                       :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
               </div>
               <a-form-model-item class="itemModel-multi" prop="dutyTerritory">
-<!--                <a-select :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
-<!--                          class="box-input"-->
-<!--                          optionFilterProp="label"-->
-<!--                          mode="multiple"-->
-<!--                          @change="dutyTerritoryChange"-->
-<!--                          :disabled="formInline.roleCodeIndex == 0 ? false : true"-->
-<!--                          :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
-<!--                          v-model="formInline.dutyTerritory">-->
-<!--                  <a-select-option v-for="(item, key) in dutyTerritoryList"-->
-<!--                                   :key="key"-->
-<!--                                   :label="item.itemText"-->
-<!--                                   :value="item.itemValue">-->
-<!--                               <span style="display: inline-block;width: 100%" :title=" item.itemText ">-->
-<!--                                     {{ item.itemText }}-->
-<!--                               </span>-->
-<!--                  </a-select-option>-->
-<!--                </a-select>-->
-                <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
-                                    @change="dutyTerritoryChange"
-                                    :disabled="formInline.roleCodeIndex == 1 ? false : true"
-                                    :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                    :type="'select'"
-                                    :triggerChange="false" :dictCode="'duty_territory'"/>
+                <a-select :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                          class="box-input"
+                          optionFilterProp="label"
+                          mode="multiple"
+                          @change="dutyTerritoryChange"
+                          :disabled="formInline.roleCodeIndex == 1 ? false : true"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          v-model="formInline.dutyTerritory">
+                  <a-select-option v-for="(item, key) in dutyTerritoryList"
+                                   :key="key"
+                                   :label="item.itemText"
+                                   :value="item.itemValue">
+                               <span style="display: inline-block;width: 100%" :title=" item.itemText ">
+                                     {{ item.itemText }}
+                               </span>
+                  </a-select-option>
+                </a-select>
+<!--                <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"-->
+<!--                                    @change="dutyTerritoryChange"-->
+<!--                                    :disabled="formInline.roleCodeIndex == 1 ? false : true"-->
+<!--                                    :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
+<!--                                    :type="'select'"-->
+<!--                                    :triggerChange="false" :dictCode="'duty_territory'"/>-->
               </a-form-model-item>
             </div>
           </a-col>
@@ -830,9 +830,9 @@
         })
       },
       DutyDepartChange(event) {
-        // this.formInline.dutyTerritory = []
+        this.formInline.dutyTerritory = []
         this.formInline = { ...this.formInline }
-        // this.getDutyTerritory(event.join(','))
+        this.getDutyTerritory(event.join(','))
       },
       getDutyTerritory(row) {
         let query = {
@@ -932,7 +932,7 @@
         item.prehomoDeliverableType = item.prehomoDeliverableType ? item.prehomoDeliverableType.split(',') : []
         item.verifyDeliverableType = item.verifyDeliverableType ? item.verifyDeliverableType.split(',') : []
         item.dutyDepart = item.dutyDepart ? item.dutyDepart.split(',') : []
-        // item.dutyTerritory = item.dutyTerritory ? item.dutyTerritory.split(',') : []
+        item.dutyTerritory = item.dutyTerritory ? item.dutyTerritory.split(',') : []
         this.getRejectCause(item.id)
         if (item.dutyDepart && item.dutyDepart.length > 0) {
           this.getDutyTerritory(item.dutyDepart.join(','))

From cd3b077d7e1470bada892de3a601374e9b6a0daf Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 26 Sep 2023 15:23:58 +0800
Subject: [PATCH 161/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 64e303d33..2e2925cfc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -12229,8 +12229,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			}
 
 			List<String> fileIdList = new ArrayList<>();
-			List<String> collect3 = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getDesignDeliverableTemplate).distinct().collect(Collectors.toList());
-			List<String> collect4 = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getVerifyDeliverableTemplate).distinct().collect(Collectors.toList());
+			List<String> collect3 = projectLawsInventoryEOList.stream()
+					.filter(e->StringUtils.isNotBlank(e.getDesignDeliverableTemplate())).map(ProjectLawsInventoryEO::getDesignDeliverableTemplate).distinct().collect(Collectors.toList());
+			List<String> collect4 = projectLawsInventoryEOList.stream()
+					.filter(e->StringUtils.isNotBlank(e.getVerifyDeliverableTemplate())).map(ProjectLawsInventoryEO::getVerifyDeliverableTemplate).distinct().collect(Collectors.toList());
 			if(ObjectUtils.isNotEmpty(collect3)){
 				fileIdList.addAll(collect3);
 			}

From c1e9483aba31beac7c39923b343ea761f6be27bd Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 26 Sep 2023 15:59:39 +0800
Subject: [PATCH 162/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificationList/components/addModel.vue |  2 +-
 .../components/flowstatusdetial.vue           |  5 ++
 .../components/addModelconformance.vue        | 48 ++++---------------
 .../components/detilModel.vue                 | 46 ++++--------------
 .../components/nonConformance.vue             | 22 ++++-----
 5 files changed, 36 insertions(+), 87 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
index 12c7ddba4..b0e712ec4 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
@@ -876,7 +876,7 @@
           this.queryPersonByProject(value.dutyTerritory.join(','))
         }
         console.log(value)
-        if(value.projectCertificationInventoryEOS && value.projectCertificationInventoryEOS.length > 0){
+        if(value.projectCertificationInventoryEOS && (value.projectCertificationInventoryEOS.length > 0 || value.projectCertificationInventoryEOS == null)){
           this.flowdisabled = true
           this.$refs.uploadFile.disabled = true
         }
diff --git a/jero-web/src/views/projectManagement/components/flowstatusdetial.vue b/jero-web/src/views/projectManagement/components/flowstatusdetial.vue
index a708b55dc..3d115990a 100644
--- a/jero-web/src/views/projectManagement/components/flowstatusdetial.vue
+++ b/jero-web/src/views/projectManagement/components/flowstatusdetial.vue
@@ -246,6 +246,11 @@ export default {
   left: 33%;
   font-size: 14px;
   color: #040B29;
+  width: 60%;
+  overflow: hidden; /*超出部分隐藏*/
+  text-overflow: ellipsis; /*超出部分省略号表示*/
+  white-space: nowrap; /*强制单行显示*/
+  display: inline-block; /*转换为行内块元素*/
 }
 .title-text-description{
   display: inline-block;
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue
index 0bdd14ac0..decbb240e 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue
@@ -84,25 +84,24 @@
                 <div class="title-text">
                   <!--                  <span class="Required">*</span>-->
                   <span class="title-text-text"
-                        :title="$t('RelatedItems')">{{$t('RelatedItems')}}</span>
+                        :title="$t('Problemstate')">{{$t('Problemstate')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="contentTemplate">
                   <a-select allowClear
                             class="box-input"
-                            v-model="formInline.projectId"
+                            v-model="formInline.problemState"
                             :getPopupContainer="triggerNode=> triggerNode.parentNode"
                             showSearch
-                            mode="multiple"
                             optionFilterProp="label"
                             :autoClearSearchValue="false"
-                            :placeholder="$t('PleaseSelect')+$t('RelatedItems')">
-                    <a-select-option v-for="(item, key) in projectNameList"
+                            :placeholder="$t('PleaseSelect')+$t('Problemstate')">
+                    <a-select-option v-for="(item, key) in ProblemstateList"
+                                     :label='item'
                                      :key="key"
-                                     :label="item.projectName"
-                                     :value="item.id">
-                     <span style="display: inline-block;width: 100%" :title=" item.projectName ">
-                           {{ item.projectName}}
-                     </span>
+                                     :value="item">
+                  <span style="display: inline-block;width: 100%" :title=" item">
+                    {{ item }}
+                  </span>
                     </a-select-option>
                   </a-select>
                 </a-form-model-item>
@@ -138,34 +137,7 @@
                 </a-form-model-item>
               </div>
             </a-col>
-            <a-col :span="12">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <!--                  <span class="Required">*</span>-->
-                  <span class="title-text-text"
-                        :title="$t('Problemstate')">{{$t('Problemstate')}}</span>
-                </div>
-                <a-form-model-item class="itemModel" prop="contentTemplate">
-                  <a-select allowClear
-                            class="box-input"
-                            v-model="formInline.problemState"
-                            :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                            showSearch
-                            optionFilterProp="label"
-                            :autoClearSearchValue="false"
-                            :placeholder="$t('PleaseSelect')+$t('Problemstate')">
-                    <a-select-option v-for="(item, key) in ProblemstateList"
-                                     :label='item'
-                                     :key="key"
-                                     :value="item">
-                  <span style="display: inline-block;width: 100%" :title=" item">
-                    {{ item }}
-                  </span>
-                    </a-select-option>
-                  </a-select>
-                </a-form-model-item>
-              </div>
-            </a-col>
+
           </a-row>
           <a-row :gutter="24">
             <a-col :span="24">
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/detilModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/detilModel.vue
index 1fed49c1b..62eea355b 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/detilModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/detilModel.vue
@@ -78,25 +78,24 @@
                 <div class="title-text">
                   <!--                  <span class="Required">*</span>-->
                   <span class="title-text-text"
-                        :title="$t('RelatedItems')">{{$t('RelatedItems')}}</span>
+                        :title="$t('Problemstate')">{{$t('Problemstate')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="contentTemplate">
                   <a-select allowClear
                             class="box-input"
-                            v-model="formInline.projectId"
+                            v-model="formInline.problemState"
                             :getPopupContainer="triggerNode=> triggerNode.parentNode"
                             showSearch
-                            mode="multiple"
                             :disabled="disabled"
                             optionFilterProp="label"
                             :autoClearSearchValue="false">
-                    <a-select-option v-for="(item, key) in projectNameList"
+                    <a-select-option v-for="(item, key) in ProblemstateList"
+                                     :label='item'
                                      :key="key"
-                                     :label="item.projectName"
-                                     :value="item.id">
-                     <span style="display: inline-block;width: 100%" :title=" item.projectName ">
-                           {{ item.projectName}}
-                     </span>
+                                     :value="item">
+                  <span style="display: inline-block;width: 100%" :title=" item">
+                    {{ item }}
+                  </span>
                     </a-select-option>
                   </a-select>
                 </a-form-model-item>
@@ -133,34 +132,7 @@
                 </a-form-model-item>
               </div>
             </a-col>
-            <a-col :span="12">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <!--                  <span class="Required">*</span>-->
-                  <span class="title-text-text"
-                        :title="$t('Problemstate')">{{$t('Problemstate')}}</span>
-                </div>
-                <a-form-model-item class="itemModel" prop="contentTemplate">
-                  <a-select allowClear
-                            class="box-input"
-                            v-model="formInline.problemState"
-                            :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                            showSearch
-                            :disabled="disabled"
-                            optionFilterProp="label"
-                            :autoClearSearchValue="false">
-                    <a-select-option v-for="(item, key) in ProblemstateList"
-                                     :label='item'
-                                     :key="key"
-                                     :value="item">
-                  <span style="display: inline-block;width: 100%" :title=" item">
-                    {{ item }}
-                  </span>
-                    </a-select-option>
-                  </a-select>
-                </a-form-model-item>
-              </div>
-            </a-col>
+
           </a-row>
           <a-row :gutter="24">
             <a-col :span="24">
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue
index ce5c3daf8..b742f6763 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue
@@ -230,14 +230,14 @@ export default {
           sorter:true,
           ellipsis: true
         },
-        {
-          title: this.$t('RelatedItems'),
-          align: 'left',
-          dataIndex: 'projectName',
-          width: 170,
-          sorter:true,
-          ellipsis: true
-        },
+        // {
+        //   title: this.$t('RelatedItems'),
+        //   align: 'left',
+        //   dataIndex: 'projectName',
+        //   width: 170,
+        //   sorter:true,
+        //   ellipsis: true
+        // },
         {
           title: this.$t('problemType'),
           align: 'left',
@@ -404,9 +404,9 @@ export default {
       this.queryParam.problemType_dictText = value
     },
     getList() {
-      if(this.queryParam.problemType_dictText){
-        delete this.queryParam.problemType
-      }
+      // if(this.queryParam.problemType_dictText){
+      //   delete this.queryParam.problemType
+      // }
       let query = {
         pageNo: this.pageNo,
         pageSize: this.pageSize,

From 7244fe0ab9d8760371226deddec6f5dc8e26bc03 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 26 Sep 2023 17:11:55 +0800
Subject: [PATCH 163/288] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=E5=B1=95=E7=A4=BA=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E4=BB=B6=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...rojectCertificationInventoryEOServiceImpl.java | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index 267c06211..ce0939d77 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -1957,6 +1957,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		}
 		for (ProjectCertificationInventoryEO certificationInventoryEO : result) {
 			if(!projectCertificationInventoryEOS.isEmpty()){
+				List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
 				List<LawsInventoryPlatformEO> collect = lawsInventoryPlatformEOList.stream()
 						.filter(e -> certificationInventoryEO.getId().equals(e.getLawsInventoryId())).collect(Collectors.toList());
 				if(ObjectUtils.isNotEmpty(collect)){
@@ -1966,6 +1967,15 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					List<ProjectCertificationInventoryEO> inventoryEOList = projectCertificationInventoryEOS.stream()
 							.filter(e -> platformLawsInventoryIdList.contains(e.getId())).collect(Collectors.toList());
 					certificationInventoryEO.setProjectCertificationInventoryEOS(inventoryEOList);
+
+					if(ObjectUtils.isNotEmpty(inventoryEOList)){
+						List<String> projectLibraryIdList = inventoryEOList.stream()
+								.map(ProjectCertificationInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList());
+						LambdaQueryWrapper<ProjectLibraryBase> wrapper = new LambdaQueryWrapper<>();
+						wrapper.in(ProjectLibraryBase::getId,projectLibraryIdList);
+						projectLibraryBaseList = projectLibraryBaseService.list(wrapper);
+					}
+
 				}
 
 
@@ -1979,6 +1989,11 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					if(!certificationInventoryEOS.isEmpty()){
 						setProjectCertificationInventoryEO(certificationInventoryEOS.get(0),certificationInventoryEO);
 					}
+					List<ProjectLibraryBase> libraryBaseList = projectLibraryBaseList.stream()
+							.filter(e -> certificationInventoryEOS.get(0).getProjectLibraryId().equals(e.getId())).collect(Collectors.toList());
+					if(ObjectUtils.isNotEmpty(libraryBaseList)){
+						certificationInventoryEO.setConfigItem(libraryBaseList.get(0).getProjectNameId());
+					}
 				}
 			}
 		}

From fea23ae5c4872e72e95fa8dc9c1024165df0947c Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 26 Sep 2023 17:19:56 +0800
Subject: [PATCH 164/288] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=9C=AA=E5=85=B3=E8=81=94=E5=88=B0=E5=B9=B3=E5=8F=B0=E4=BB=B6?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=EF=BC=88=E4=B8=AD=E8=8B=B1=E6=96=87?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectCertificationInventoryEOServiceImpl.java   | 7 ++++++-
 .../service/impl/ProjectLibraryBaseServiceImpl.java        | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index ce0939d77..a583167ed 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -7206,7 +7206,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				}
 				String serialNumber = projectCertificationInventoryEO.getSerialNumber();
 				String dutyTerritoryName = com.jero.modules.system.util.StringUtils.join(list,",");
-				String msg = serialNumber+" "+dutyTerritoryName+"未匹配到数据";
+				String msg = "";
+				if(CutEnum.CN.getValue().equals(cut)){
+					msg = serialNumber+" "+dutyTerritoryName+"未匹配到数据";
+				}else{
+					msg = serialNumber+" "+dutyTerritoryName+" no data matched";
+				}
 				msgList.add(msg);
 			}
 		}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index ba55769c4..6d5f66965 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -1423,7 +1423,12 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 				}
 				String serialNumber = projectLawsInventoryEO.getSerialNumber();
 				String dutyTerritoryName = StringUtils.join(list,",");
-				String msg = serialNumber+" "+dutyTerritoryName+"未匹配到数据";
+				String msg = "";
+				if(CutEnum.CN.getValue().equals(cut)){
+					msg = serialNumber+" "+dutyTerritoryName+"未匹配到数据";
+				}else{
+					msg = serialNumber+" "+dutyTerritoryName+" no data matched";
+				}
 				msgList.add(msg);
 			}
 		}

From 552f196a0b236d1f9bf04282d5e15cc361e5f155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 26 Sep 2023 17:46:26 +0800
Subject: [PATCH 165/288] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectExportController.java        | 177 +++++++++++++++++
 .../collect/entity/ParamsCollectExport.java   |  88 ++++++++
 .../cert/collect/enums/ExportStateEnum.java   |  63 ++++++
 .../mapper/ParamsCollectExportMapper.java     |  17 ++
 .../mapper/xml/ParamsCollectExportMapper.xml  |  16 ++
 .../service/IParamsCollectExportService.java  |  61 ++++++
 .../impl/ParamsCollectExportServiceImpl.java  |  89 +++++++++
 .../ParamsCollectManifestEOServiceImpl.java   |  49 +++--
 .../project/mapper/xml/NcrTrackMapper.xml     |   5 +-
 jero-web/src/common/lang/en-us.js             |   2 +
 jero-web/src/common/lang/zh-cn.js             |   2 +
 .../ParameterItemCollectionList.vue           | 188 +++++++++++++++++-
 12 files changed, 737 insertions(+), 20 deletions(-)
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectExportController.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectExport.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/ExportStateEnum.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectExportMapper.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectExportMapper.xml
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectExportService.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectExportServiceImpl.java

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectExportController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectExportController.java
new file mode 100644
index 000000000..48cc1e0bc
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectExportController.java
@@ -0,0 +1,177 @@
+package com.jero.modules.cert.collect.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.cert.collect.entity.ParamsCollectExport;
+import com.jero.modules.cert.collect.enums.ExportStateEnum;
+import com.jero.modules.cert.collect.service.IParamsCollectExportService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import com.jero.common.system.base.controller.JeroController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.jero.common.aspect.annotation.AutoLog;
+
+
+ /**
+ * @Description: 参数收集导出列表
+ * @Author: jero-boot
+ * @Date:   2023-09-26
+ * @Version: V1.0
+ */
+@Api(tags="参数收集导出列表")
+@RestController
+@RequestMapping("/params/paramsCollectExport")
+@Slf4j
+public class ParamsCollectExportController extends JeroController<ParamsCollectExport, IParamsCollectExportService> {
+	@Autowired
+	private IParamsCollectExportService paramsCollectExportService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param paramsCollectExport
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "参数收集导出列表-分页列表查询")
+	@ApiOperation(value="参数收集导出列表-分页列表查询", notes="参数收集导出列表-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(ParamsCollectExport paramsCollectExport,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   @RequestParam(name = "cut") String cut,
+								   HttpServletRequest req) {
+		QueryWrapper<ParamsCollectExport> queryWrapper = QueryGenerator.initQueryWrapper(paramsCollectExport, req.getParameterMap());
+		queryWrapper.orderByDesc("create_time");
+		Page<ParamsCollectExport> page = new Page<ParamsCollectExport>(pageNo, pageSize);
+		IPage<ParamsCollectExport> pageList = paramsCollectExportService.page(page, queryWrapper);
+		List<ParamsCollectExport> resList = pageList.getRecords();
+		for (ParamsCollectExport pce : resList) {
+			pce.setStateText(ExportStateEnum.getNameByVal(pce.getState(),cut));
+		}
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "参数收集导出列表-列表查询")
+    @ApiOperation(value="参数收集导出列表-列表查询", notes="参数收集导出列表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<ParamsCollectExport>> queryList() {
+        List<ParamsCollectExport> list = paramsCollectExportService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param paramsCollectExport
+	 * @return
+	 */
+	@AutoLog(value = "参数收集导出列表-添加")
+	@ApiOperation(value="参数收集导出列表-添加", notes="参数收集导出列表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody ParamsCollectExport paramsCollectExport) {
+		paramsCollectExportService.add(paramsCollectExport);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param paramsCollectExport
+	 * @return
+	 */
+	@AutoLog(value = "参数收集导出列表-编辑")
+	@ApiOperation(value="参数收集导出列表-编辑", notes="参数收集导出列表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody ParamsCollectExport paramsCollectExport) {
+		paramsCollectExportService.editById(paramsCollectExport);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "参数收集导出列表-通过id删除")
+	@ApiOperation(value="参数收集导出列表-通过id删除", notes="参数收集导出列表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		paramsCollectExportService.deleteById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "参数收集导出列表-批量删除")
+	@ApiOperation(value="参数收集导出列表-批量删除", notes="参数收集导出列表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.paramsCollectExportService.deleteByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "参数收集导出列表-通过id查询")
+	@ApiOperation(value="参数收集导出列表-通过id查询", notes="参数收集导出列表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		ParamsCollectExport paramsCollectExport = paramsCollectExportService.queryById(id);
+		if(paramsCollectExport==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(paramsCollectExport);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param paramsCollectExport
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ParamsCollectExport paramsCollectExport) {
+        return super.exportXls(request, paramsCollectExport, ParamsCollectExport.class, "参数收集导出列表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ParamsCollectExport.class);
+    }
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectExport.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectExport.java
new file mode 100644
index 000000000..c7d0126ab
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectExport.java
@@ -0,0 +1,88 @@
+package com.jero.modules.cert.collect.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @Description: 参数收集导出列表
+ * @Author: jero-boot
+ * @Date:   2023-09-26
+ * @Version: V1.0
+ */
+@Data
+@TableName("params_collect_export")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="params_collect_export对象", description="参数收集导出列表")
+public class ParamsCollectExport implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+	/**文件名称*/
+	@Excel(name = "文件名称", width = 15)
+    @ApiModelProperty(value = "文件名称")
+    private String fileName;
+
+	/**导出状态*/
+	@Excel(name = "导出状态", width = 15)
+    @ApiModelProperty(value = "导出状态")
+    private String state;
+
+    @TableField(exist = false)
+    private String stateText;
+
+	/**文件关联ID*/
+	@Excel(name = "文件关联ID", width = 15)
+    @ApiModelProperty(value = "文件关联ID")
+    private String fileId;
+
+	/**参数清单id*/
+	@Excel(name = "参数清单id", width = 15)
+    @ApiModelProperty(value = "参数清单id")
+    private String paramsManifestId;
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/ExportStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/ExportStateEnum.java
new file mode 100644
index 000000000..b0ac95358
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/ExportStateEnum.java
@@ -0,0 +1,63 @@
+package com.jero.modules.cert.collect.enums;
+
+import com.jero.common.constant.enums.CutEnum;
+
+/**
+ * @Author: liyawei
+ * @Description: 参数收集清单-配置数据单个类型
+ * @Date: Created in 11:33 2022/5/7
+ */
+public enum ExportStateEnum {
+    EXPORTING("导出中", "Exporting", "0"),
+    SUCCESSFULLY("导出成功", "Export Successfully", "1"),
+    FAILURE("导出失败", "Export Failure", "2");
+
+    String nameCn;
+    String nameEn;
+    String value;
+
+    ExportStateEnum(String nameCn, String nameEn, String value) {
+        this.nameCn = nameCn;
+        this.nameEn = nameEn;
+        this.value = value;
+    }
+
+    public String getNameCn() {
+        return nameCn;
+    }
+
+    public void setNameCn(String nameCn) {
+        this.nameCn = nameCn;
+    }
+
+    public String getNameEn() {
+        return nameEn;
+    }
+
+    public void setNameEn(String nameEn) {
+        this.nameEn = nameEn;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public static String getNameByVal(String val, String cut) {
+        ExportStateEnum res = EXPORTING;
+        for (ExportStateEnum es : ExportStateEnum.values()) {
+            if (es.getValue().equals(val)) {
+                res = es;
+                break;
+            }
+        }
+        if (CutEnum.CN.getValue().equals(cut)) {
+            return res.getNameCn();
+        } else {
+            return res.getNameEn();
+        }
+    }
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectExportMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectExportMapper.java
new file mode 100644
index 000000000..db1f18b93
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectExportMapper.java
@@ -0,0 +1,17 @@
+package com.jero.modules.cert.collect.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.cert.collect.entity.ParamsCollectExport;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 参数收集导出列表
+ * @Author: jero-boot
+ * @Date:   2023-09-26
+ * @Version: V1.0
+ */
+public interface ParamsCollectExportMapper extends BaseMapper<ParamsCollectExport> {
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectExportMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectExportMapper.xml
new file mode 100644
index 000000000..e6b6f60d0
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectExportMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.cert.collect.mapper.ParamsCollectExportMapper">
+    <resultMap id="ParamsCollectExportResultMap" type="com.jero.modules.cert.collect.entity.ParamsCollectExport">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="file_name" property="fileName" />
+        <result column="state" property="state" />
+        <result column="file_id" property="fileId" />
+        <result column="params_manifest_id" property="paramsManifestId" />
+    </resultMap>
+</mapper>
\ No newline at end of file
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectExportService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectExportService.java
new file mode 100644
index 000000000..cdb92ff4e
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectExportService.java
@@ -0,0 +1,61 @@
+package com.jero.modules.cert.collect.service;
+
+import com.jero.modules.cert.collect.entity.ParamsCollectExport;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 参数收集导出列表
+ * @Author: jero-boot
+ * @Date:   2023-09-26
+ * @Version: V1.0
+ */
+public interface IParamsCollectExportService extends IService<ParamsCollectExport> {
+
+	/**
+	 * 保存
+	 *
+	 * @param paramsCollectExport
+	 * @return
+	 */
+    void add(ParamsCollectExport paramsCollectExport);
+
+	/**
+	 * 更新
+	 *
+	 * @param paramsCollectExport
+	 * @return
+	 */
+    void editById(ParamsCollectExport paramsCollectExport);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ParamsCollectExport queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ParamsCollectExport> queryList();
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectExportServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectExportServiceImpl.java
new file mode 100644
index 000000000..a7bef6f57
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectExportServiceImpl.java
@@ -0,0 +1,89 @@
+package com.jero.modules.cert.collect.service.impl;
+
+import com.jero.modules.cert.collect.entity.ParamsCollectExport;
+import com.jero.modules.cert.collect.mapper.ParamsCollectExportMapper;
+import com.jero.modules.cert.collect.service.IParamsCollectExportService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Date;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 参数收集导出列表
+ * @Author: jero-boot
+ * @Date:   2023-09-26
+ * @Version: V1.0
+ */
+@Service
+public class ParamsCollectExportServiceImpl extends ServiceImpl<ParamsCollectExportMapper, ParamsCollectExport> implements IParamsCollectExportService {
+
+	/**
+	 * 保存
+	 *
+	 * @param paramsCollectExport
+	 * @return
+	 */
+	@Override
+    public void add(ParamsCollectExport paramsCollectExport) {
+        Date now = new Date();
+        paramsCollectExport.setCreateTime(now);
+        paramsCollectExport.setUpdateTime(now);
+        save(paramsCollectExport);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param paramsCollectExport
+	 * @return
+	 */
+	@Override
+    public void editById(ParamsCollectExport paramsCollectExport) {
+    	Date now = new Date();
+        paramsCollectExport.setUpdateTime(now);
+    	saveOrUpdate(paramsCollectExport);
+    }
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public void deleteById(String id) {
+        removeById(id);
+    }
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+    public void deleteByIds(List<String> ids) {
+        removeByIds(ids);
+    }
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public ParamsCollectExport queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<ParamsCollectExport> queryList() {
+        return list();
+    }
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index cf0973a09..df429adf7 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -183,6 +183,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
     private IProjectUserDutyTerritoryService projectUserDutyTerritoryService;
 	@Autowired
 	private IParamsCollectManifestUserTypeLogEOService paramsCollectManifestUserTypeLogEOService;
+    @Autowired
+    private IParamsCollectExportService paramsCollectExportService;
 
     /**
      * 保存
@@ -3596,6 +3598,15 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         if (StringUtils.isNotEmpty(paramsCollectManifestVO.getExportName())) {
             fileOriName = paramsCollectManifestVO.getExportName();
         }
+        //创建导出记录
+        ParamsCollectExport pce = new ParamsCollectExport();
+        String pceId = UUID.randomUUID().toString().replace("-", "");
+        pce.setId(pceId);
+        pce.setParamsManifestId(paramsCollectManifestVO.getParamsManifestId());
+        pce.setState(ExportStateEnum.EXPORTING.getValue());
+        pce.setFileName(fileOriName+ ".zip");
+        paramsCollectExportService.add(pce);
+
         //创建临时文件夹
         String fileNowPath = uploadpath + "/tempZip/" + UUID.randomUUID().toString().replace("-", "") + File.separator + fileOriName;
         File nowFile = new File(fileNowPath);
@@ -3691,17 +3702,17 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
             excelOS.flush();
             excelOS.close();
             ZipUtil.zip(fileNowPath, fileNowPath + ".zip");
-            FileInputStream fis = new FileInputStream(fileNowPath + ".zip");
-            int len = 0;
-            while ((len = fis.read()) != -1) {
-                os.write(len);
-            }
+//            FileInputStream fis = new FileInputStream(fileNowPath + ".zip");
+//            int len = 0;
+//            while ((len = fis.read()) != -1) {
+//                os.write(len);
+//            }
 
-//			// 将导出文件上传到cos上
-//			String uploadFileName = fileOriName + ".zip";
-//			InputStream uploadFileio = new FileInputStream(new File(fileNowPath+".zip"));
-//			MultipartFile mFile = new MockMultipartFile(uploadFileName, uploadFileName, "text/plain", uploadFileio); // 用于上传
-//			OSSFile ossFile = ossFileService.uploadLocalOfCos(mFile, "/manifest", "", CutEnum.CN.getValue()); // 上传导出的压缩包
+			// 将导出文件上传到cos上
+			String uploadFileName = fileOriName + ".zip";
+			InputStream uploadFileio = new FileInputStream(new File(fileNowPath+".zip"));
+			MultipartFile mFile = new MockMultipartFile(uploadFileName, uploadFileName, "text/plain", uploadFileio); // 用于上传
+			OSSFile ossFile = ossFileService.uploadLocalOfCos(mFile, "/manifest", "", CutEnum.CN.getValue()); // 上传导出的压缩包
 //
 //			// 系统向用户发消息
 //			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录人
@@ -3733,8 +3744,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 //			uploadFileio.close();
             os.flush();
             os.close(); // 后开先关
-            fis.close(); // 先开后关
+//            fis.close(); // 先开后关
+            pce.setState(ExportStateEnum.SUCCESSFULLY.getValue());
+            pce.setFileId(ossFile.getId());
+            paramsCollectExportService.updateById(pce);
         } catch (Exception e) {
+            pce.setState(ExportStateEnum.FAILURE.getValue());
+            paramsCollectExportService.updateById(pce);
             if (e instanceof JeroBootException) {
                 throw new JeroBootException(e.getMessage());
             } else {
@@ -3744,7 +3760,6 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                 } else {
                     throw new JeroBootException("下载文件失败，请重试");
                 }
-
             }
         } finally {
             IOUtils.closeQuietly(os);
@@ -7447,10 +7462,12 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         JSONArray resList = new JSONArray();
         if(ObjectUtils.isNotEmpty(dtList)){
             for (String dtId : dtList) {
-                JSONObject dt = new JSONObject();
-                dt.put("key",dtId);
-                dt.put("value",dictItemsMap.get(dtId));
-                resList.add(dt);
+                if(StringUtils.isNotBlank(dtId)){
+                    JSONObject dt = new JSONObject();
+                    dt.put("key",dtId);
+                    dt.put("value",dictItemsMap.get(dtId));
+                    resList.add(dt);
+                }
             }
         }
         return Result.OK(resList);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
index e74921d7a..b3336ee26 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
@@ -91,8 +91,8 @@
             and
         </if>-->
         (
-        design_flow_status =#{ncrTrackVO.inconformity}
-        or verify_flow_status =#{ncrTrackVO.inconformity}
+        design_flow_status =#{ncrTrackVO.inconformity} or design_flow_status =#{ncrTrackVO.track}
+        or verify_flow_status =#{ncrTrackVO.inconformity} or verify_flow_status =#{ncrTrackVO.track}
         )
         <!--(
         design_flow_status =#{ncrTrackVO.inconformity} or design_flow_status =#{ncrTrackVO.track}
@@ -104,7 +104,6 @@
                 and (pli.regulation_owner_id =#{ncrTrackVO.userId}
                 or pli.homologation_engineer_id =#{ncrTrackVO.userId}
                 or pli.engineering_interface_person =#{ncrTrackVO.userId}
-                or ptid.user_id =#{ncrTrackVO.userId}
                 )
             </if>
         </if>
diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index f173c46d3..30ee4dfa2 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1973,4 +1973,6 @@ module.exports = {
   by:'By',
   Changeto:'Change to',
   emptyc:'empty',
+  Exportsuccessexportlist:'Export success! Check in the export list',
+  Derivedlist:'Derived list',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 61034b24d..ceca6440b 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -3929,4 +3929,6 @@ module.exports = {
   by:'由',
   Changeto:'改为了',
   emptyc:'空',
+  Exportsuccessexportlist:'导出成功！请在导出列表中查看',
+  Derivedlist:'导出列表',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index daeb1d5b5..518ff5f00 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -185,6 +185,11 @@
                   <a-icon type="export" :rotate="-90"/>
                   {{$t('dataExport')}}
                 </div>
+                <!--      导出列表-->
+                <div @click="Derivedlist" class="operator-text-title" v-if='currentPersonRole == "homo"'>
+                  <a-icon type="export" :rotate="-90"/>
+                  {{$t('Derivedlist')}}
+                </div>
                 <!--     一键下发收集 -->
                 <div @click="defOneclickCollection" class="operator-text-title" v-if='currentPersonRole == "homo"'>
                   <a-icon type="solution"/>
@@ -266,6 +271,11 @@
               <a-icon type="export"/>
               {{$t('dataExport')}}
             </div>
+            <!--      导出列表-->
+            <div @click="Derivedlist" class="operator-text" v-if='currentPersonRole == "sdt" || currentPersonRole == "admin" || currentPersonRole == "studio"'>
+              <a-icon type="export"/>
+              {{$t('Derivedlist')}}
+            </div>
             <!--      引用参数-->
             <div @click="referenceparameter" class="operator-text" v-if='currentPersonRole == "dre" || currentPersonRole == "homo"'>
               <a-icon type="plus"/>
@@ -598,6 +608,50 @@
         </div>
       </div>
     </a-modal>
+    <!--    导出列表-->
+    <a-modal
+      :title="$t('Derivedlist')"
+      :width="900"
+      :visible="exportvisible"
+      :confirm-loading="confirmLoading"
+      :maskClosable="false"
+      @ok="exportok"
+      @cancel="exportvisiblecancel"
+    >
+<!--      <historyTable :columnshistory='columnshistory' :dataSourcehistory='dataSourcehistory'></historyTable>-->
+            <a-table
+              class="table"
+              :components="drag(columnsexport,'columnsexport')"
+              :columns="columnsexport"
+              :pagination="false"
+              rowKey="id"
+              :scroll="{x: '100%',y: 400}"
+              :data-source="dataSourceexport"
+              :loading="loading"
+            >
+             <span slot="operation" slot-scope="text,record">
+                <a @click="exportdata(record)" v-if="record.state == '1'">{{$t('download')}}</a>
+                <a style="margin-left: 5px;" @click="exportdelete(record)">{{$t('delete')}}</a>
+             </span>
+<!--              <span slot="detailText" slot-scope="text,record">-->
+<!--                    <span class="text" :title="text">-->
+<!--                     {{text && text.length > 40?text.slice(0,39)+'...':text}}-->
+<!--                    </span>-->
+<!--              </span>-->
+            </a-table>
+      <div class="page" v-if="dataSourceexport.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSizehistory"
+          :total="total"
+          :current="pageNohistory"
+          @change="onChangehistory"
+          @showSizeChange="SizeChangehistory"
+        />
+      </div>
+    </a-modal>
     <!--    数据导出弹框-->
     <a-modal
       :title="$t('dataExport')"
@@ -639,6 +693,27 @@
         </a-row>
       </a-form-model>
     </a-modal>
+<!--    数据导出异步弹窗-->
+    <a-modal
+      :title="$t('dataExport')"
+      :width="500"
+      :visible="ExportFailed"
+      :maskClosable="false"
+      @ok="exportsubmit"
+      @cancel="exportcancel"
+    >
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <div style='font-size: 18px;margin-bottom: 20px;display: flex;justify-content: center'
+               class="box-title-text-index">
+            <span>{{$t('Exportsuccessexportlist')}}</span>
+            <!--            <div>{{$t('NiOnumberis')}}{{ item.nioNumber }},{{$t('Statusis')}}-->
+            <!--              <span style='color: red'>{{ item.state }}</span>,{{$t('NoOperationPermissionForthisbutton')}}。-->
+            <!--            </div>-->
+          </div>
+        </a-col>
+      </a-row>
+    </a-modal>
     <JLoading :loading="textLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
     <batchUpdateDeadline ref="batchUpdateDeadlineRef" @batchUpdateDeadlineForm="batchUpdateDeadlineForm"/>
 
@@ -666,6 +741,7 @@
   import { ACCESS_TOKEN } from '@/store/mutation-types'
   import Vue from 'vue'
   import { mapGetters } from 'vuex'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'ParameterItemCollectionList',
@@ -685,6 +761,7 @@
       globalAdvancedQuery,
       batchUpdateDeadline
     },
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       this.statusList = [
         {
@@ -742,6 +819,10 @@
         // 系统管理员 admin
         // 游客 guest
         toggleSearchStatus: false,
+        ExportFailed: false,
+        pageNohistory: 1,
+        pageSizehistory: 10,
+        exportvisible: false,
         columns: [
           {
             title: this.$t('title'),
@@ -787,6 +868,35 @@
             scopedSlots: { customRender: 'operation' }
           }
         ],
+        columnsexport: [
+          {
+            title: this.$t('fileName'),
+            align: 'left',
+            dataIndex: 'fileName',
+            width: 300,
+            ellipsis: true,
+            scopedSlots: { customRender: 'detailText' }
+          },
+          {
+            title: this.$t('status'),
+            align: 'left',
+            dataIndex: 'stateText',
+            width: 120,
+          },
+          {
+            title: this.$t('Exporttime'),
+            align: 'left',
+            dataIndex: 'createTime',
+            width: 200
+          },
+          {
+            title: this.$t('operation'),
+            align: 'left',
+            fixed: 'right',
+            width: 100,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
         fieldList: [
           {
             type: '',
@@ -829,6 +939,7 @@
         checkAll: false,
         visible: false,
         selectedValue: [],
+        dataSourceexport: [],
         checkedList: ['nio_number', 'params_name', 'operation'],
         // customizeList: [
         //   {
@@ -1448,6 +1559,75 @@
         // let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip'
         // downloadFile('/params/collectManifest/exportAll', name, query, this.selectClear)
       },
+      // 导出列表
+      Derivedlist(){
+        this.exportvisible = true
+        this.expoteList()
+      },
+      onChangehistory(page, pageSize) {
+        this.pageNohistory = page
+        this.expoteList()
+      },
+      SizeChangehistory(page, pageSize) {
+        this.pageNohistory = 1
+        this.pageSizehistory = pageSize
+        this.expoteList()
+      },
+      exportok(){
+        this.exportvisible = false
+      },
+      exportvisiblecancel(){
+        this.exportvisible = false
+      },
+      exportsubmit(){
+        this.ExportFailed = false
+      },
+      exportcancel(){
+        this.ExportFailed = false
+      },
+      exportdata(item){
+        downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.fileId })
+      },
+      exportdelete(item){
+        this.$confirm({
+          title: this.$t('confirmDeletion'),
+          content: '',
+          onOk:
+            async () => {
+              getAction(`tag/onlCgformArea/delete`, { id: item.id }).then((res) => {
+                if (res.success) {
+                  this.$message.success(this.$t('OperationSuccessful'))
+                  this.expoteList()
+                } else {
+                  this.$message.warning(this.$t('operationFailed'))
+                }
+              })
+            }
+        })
+      },
+      expoteList(val) {
+        let query = {
+          pageNo: this.pageNohistory,
+          pageSize: this.pageSizehistory,
+          paramsManifestId: this.$route.query.id,
+          paramsCollectManifestId: this.paramsReportDetailId
+        }
+        this.loading = true
+        getAction('params/paramsCollectExport/page', query).then((res) => {
+          if (res.success) {
+            this.dataSourceexport = res.result.records
+            // if (this.dataSourcehistory && this.dataSourcehistory.length > 0) {
+            //   this.dataSourcehistory.forEach(val => {
+            //     val.logContent = val.logContent.replace(/\"/g, '<span class=\'textData\'>"</span>')
+            //   })
+            // }
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
       // 导出确定
       handleExportSubmit() {
         this.$refs.dataExportruleForm.validate(valid => {
@@ -1470,7 +1650,13 @@
               exportName: this.$route.query.projectName + '(' + this.$route.query.title + ')'
             }
             let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip'
-            downloadFile('/params/collectManifest/exportAll', name, query, this.selectClear)
+            getAction('/params/collectManifest/exportAll', query).then((res) => {
+              // if (res.success) {
+              this.dataExportFailed = false
+              this.ExportFailed = true
+              // }
+            })
+            // downloadFile('/params/collectManifest/exportAll', name, query, this.selectClear)
           }
         })
       },

From 2b70e816b9f9c66579de8ed9e2805998ae453f15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 26 Sep 2023 17:50:54 +0800
Subject: [PATCH 166/288] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/jero/JLoading.vue                  | 2 +-
 .../components/TaskParameterCollection.vue                 | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/components/jero/JLoading.vue b/jero-web/src/components/jero/JLoading.vue
index f6f42d096..a44392c7e 100644
--- a/jero-web/src/components/jero/JLoading.vue
+++ b/jero-web/src/components/jero/JLoading.vue
@@ -57,7 +57,7 @@
     z-index: 1009;
     width: 100%;
     height: 100%;
-    background-color: rgba(255, 255, 255, 0.9);
+    background-color: rgba(255, 255, 255, 0.3);
     border-radius: 8px;
     user-select: none;
     .loading-content{
diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
index b4d36af61..202a71554 100644
--- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
@@ -129,6 +129,7 @@
 
       </project-collection-parameters>
     </a-drawer>
+    <JLoading style="position: fixed" :loading="handleModuleLoading">{{$t('pleaseWaitWhileRunning')}}</JLoading>
   </a-card>
 </template>
 
@@ -268,7 +269,8 @@
         drawerVisible: false,
         drawerVisibleitem: false,
         titleTag: '',
-        selectedRowKeysvalArray: []
+        selectedRowKeysvalArray: [],
+        handleModuleLoading:false,
       }
     },
     created() {
@@ -397,13 +399,16 @@
         } else if (this.selectedRowKeys.length > 1) {
           this.$message.warning(_this.$t('OnlyOneSelected'))
         } else if (this.selectedRowKeysvalArray[0].state === '已完成' || this.selectedRowKeysvalArray[0].state === 'Finished') {
+          this.handleModuleLoading = true
           getAction(_this.url.changeExtension, { id: this.selectedRowKeys[0] }).then((res) => {
             if (res.success) {
               _this.$message.success(_this.$t('OperationSuccessful'))
               _this.getlist()
+              _this.handleModuleLoading = false
             } else {
               _this.$message.warning(res.message)
               this.selectedRowKeys = []
+              _this.handleModuleLoading = false
             }
           })
         } else {

From 7084816766725d2cf4447129b68bdfaca1329047 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 27 Sep 2023 09:29:01 +0800
Subject: [PATCH 167/288] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6=E5=90=8E=E5=AF=B9?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=9B=E8=A1=8C=E7=BC=96=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=93=8D=E4=BD=9C=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificationList/components/addModel.vue | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
index b0e712ec4..573f45019 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
@@ -900,11 +900,21 @@
             if (this.formInline.id) {
               url = this.url.edit
               Action = putAction
-              Object.keys(query).forEach(res => {
-                if (query[res] && query[res] instanceof Array) {
-                  query[res] = query[res].join(',')
-                }
-              })
+              // if(Object.keys(query) == 'projectCertificationInventoryEOS'){
+              //
+              // }else{
+              //   Object.keys(query).forEach(res => {
+              //     if (query[res] && query[res] instanceof Array) {
+              //       query[res] = query[res].join(',')
+              //     }
+              //   })
+              // }
+              if (query.dutyDepart) {
+                query.dutyDepart = query.dutyDepart.join(',')
+              }
+              if (query.dutyTerritory) {
+                query.dutyTerritory = query.dutyTerritory.join(',')
+              }
               query.projectLibraryId = this.$route.query.id
             } else {
               url = this.url.add

From 2f44a7bcb683880d8a77fc23950a2585c1ece0a9 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 27 Sep 2023 09:35:47 +0800
Subject: [PATCH 168/288] =?UTF-8?q?=E3=80=90=E8=8B=B1=E6=96=87=E3=80=91?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9=E7=9B=AE-=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95-=E5=B9=B3=E5=8F=B0=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E4=B8=8D?=
 =?UTF-8?q?=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectManagement/components/addModelconformance.vue   | 7 +++++++
 .../views/projectManagement/components/listEditModel.vue   | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/addModelconformance.vue b/jero-web/src/views/projectManagement/components/addModelconformance.vue
index 0bdd14ac0..b432e6eb9 100644
--- a/jero-web/src/views/projectManagement/components/addModelconformance.vue
+++ b/jero-web/src/views/projectManagement/components/addModelconformance.vue
@@ -21,6 +21,7 @@
                 </div>
                 <a-form-model-item class="itemModel" prop="title">
                   <a-input class="box-input"
+                           :maxLength="200"
                            v-model='formInline.title'
                            :disabled="disabled"
                            :placeholder="$t('PleaseEnter')+$t('title')"/>
@@ -53,6 +54,7 @@
                 </div>
                 <a-form-model-item class="itemModel" prop="issue">
                   <a-input class="box-input"
+                           :maxLength="200"
                            v-model='formInline.psIssue'
                            :disabled="disabled"
                            :placeholder="$t('PleaseEnter')+'PS-issue'"/>
@@ -177,6 +179,7 @@
                 </div>
                 <a-form-model-item class="itemModel" prop="descriptions">
                   <a-input class="box-input"
+                           :maxLength="200"
                            v-model='formInline.description'
                            :disabled="disabled"
                            :placeholder="$t('PleaseEnter')+$t('descriptions')"/>
@@ -195,6 +198,7 @@
                 <a-form-model-item class="itemModel" prop="fileLink">
                   <div v-for="(item,index) in formInline.fileLinkList" :key="index">
                     <a-input class="box-input"
+                             :maxLength="200"
                              style='width: 88%'
                              v-model='item.fileLink'
                              :disabled="disabled"
@@ -229,6 +233,7 @@
                     <!--                    <span>{{item}}</span>-->
                     <a-input class="box-input"
                              style='width: 88%'
+                             :maxLength="200"
                              v-model='item.progressTracking'
                              :disabled="true"
                              :title='item.progressTracking'
@@ -250,6 +255,7 @@
                 </div>
                 <a-form-model-item class="itemModel" prop="conclusion">
                   <a-input class="box-input"
+                           :maxLength="200"
                            v-model='formInline.conclusion'
                            :disabled="disabled"
                            :placeholder="$t('PleaseEnter')+$t('conculsion')"/>
@@ -269,6 +275,7 @@
                   <div v-for="(item,index) in formInline.approvalEvidenceLinkList" :key="index">
                     <a-input class="box-input"
                              style='width: 88%'
+                             :maxLength="200"
                              v-model='item.approvalEvidenceLink'
                              :disabled="disabled"
                              :placeholder="$t('PleaseEnter')+$t('Addresslink')"/>
diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index f29c1d6ca..4542416a6 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -662,20 +662,20 @@
             dataIndex: 'verifyDeliverableTypeName',
             align: 'left',
             ellipsis: true,
-            width: 180
+            width: 200
           },
           {
             title: this.$t('verify')+ this.$t('deliverableTemplate'),
             dataIndex: 'verifyDeliverableTemplateName',
             align: 'left',
             ellipsis: true,
-            width: 180
+            width: 200
           },
           {
             title: this.$t('operation'),
             align: 'left',
             fixed: 'right',
-            width: 110,
+            width: 130,
             scopedSlots: { customRender: 'operation' }
           }
         ],

From b62660472cd34a314970e3a5cdf6b8043f0dfd20 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 27 Sep 2023 09:42:51 +0800
Subject: [PATCH 169/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95-=E6=A8=A1=E6=9D=BF=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E5=8E=BB=E6=8E=89=E9=85=8D=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...latformProjectCertificationInventoryEOServiceImpl.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
index ad34b90f8..70bc3fe14 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
@@ -5816,11 +5816,11 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 		try {
 			String title = "";
 			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
-				title = "*类别,*检验项目,*配置项,*认证类型,*WVTA ID," +
+				title = "*类别,*检验项目,*认证类型,*WVTA ID," +
 						"*标准编号,*责任领域,*工程接口人,*责任人," +
 						"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称";
 			}else {
-				title = "*Category,*Inspection Items,*Configuration Item,*Certification Type,*WVTA ID," +
+				title = "*Category,*Inspection Items,*Certification Type,*WVTA ID," +
 						"*Standard No,*Responsible Field,*Eng. Interface,*Assignee," +
 						"Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer";
 			}
@@ -5862,14 +5862,14 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 						"1.导入数据从第三行开始\n" +
 						"2.所有带*号的字段必须填写\n"+
 						"3.责任人,交付物类型,工程接口人,编号,责任领域,字段是单选属性,必须和系统中的对应字段选项相匹配\n" +
-						"4.类别,WVTA ID,检验项目,配置项,填写文本内容\n" +
+						"4.类别,WVTA ID,检验项目,填写文本内容\n" +
 						"5.交付物模板字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.docx,则应填写AAA/B.docx";
 			}else{
 				explain = "Filling explanation\n" +
 						"1.Import data starts at the third line\n" +
 						"2.All fields marked with * must be filled in\n"+
 						"3.Assignee,Deliverable Type,Eng. Interface,Standard No,Responsible Field,Fields are radio attributes that must match the corresponding field option in the system\n" +
-						"4.Category,WVTA ID,Configuration Item,Inspection Items,Fill in the text\n" +
+						"4.Category,WVTA ID,Configuration Item,Fill in the text\n" +
 						"5.Deliverable Template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. docx is stored under the AAA standard number, enter AAA/B. docx";
 			}
 			for(int i = 0; i < 2; i++){

From c8a03c76bc9434eb53708ca207785fcee87f21c3 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 27 Sep 2023 09:42:55 +0800
Subject: [PATCH 170/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95-=E5=AF=BC=E5=87=BA=E7=9A=84?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/listOfRegulations.vue                          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
index bf2667d39..c6241d136 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
@@ -1879,10 +1879,10 @@
           ids: selectedRowKeys.join(','),
           ...this.queryParamQuery,
           roleCode: roleCodeIndex,
-          excelName: this.$route.query.projectName,
+          excelName: this.$route.query.projectNameId,
           projectLibraryId: this.$route.query.id
         }
-        downloadFile(this.url.exportData, this.$route.query.projectName + '.zip', query, this.Deselect)
+        downloadFile(this.url.exportData, this.$route.query.projectNameId + '.zip', query, this.Deselect)
       },
       //复制
       copyClick(operateType) {

From cdd5a096b36600538191f88dff0fa4c1feef1e60 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 27 Sep 2023 09:50:25 +0800
Subject: [PATCH 171/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=AF=A6=E6=83=85-=E9=97=AE=E9=A2=98=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E5=88=A0=E9=99=A4=EF=BC=8C=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=9C=AA=E6=89=BE=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/listOfRegulations.vue          |  1 +
 .../components/addModelconformance.vue        | 48 +++++++++++++++----
 .../components/nonConformance.vue             |  2 +-
 3 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index f88f7421e..38997122e 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -2002,6 +2002,7 @@
               status = '2'
             }
           }
+          console.log(status)
           if(status == '1'){
             this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
           }else{
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue
index decbb240e..0bdd14ac0 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue
@@ -84,24 +84,25 @@
                 <div class="title-text">
                   <!--                  <span class="Required">*</span>-->
                   <span class="title-text-text"
-                        :title="$t('Problemstate')">{{$t('Problemstate')}}</span>
+                        :title="$t('RelatedItems')">{{$t('RelatedItems')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="contentTemplate">
                   <a-select allowClear
                             class="box-input"
-                            v-model="formInline.problemState"
+                            v-model="formInline.projectId"
                             :getPopupContainer="triggerNode=> triggerNode.parentNode"
                             showSearch
+                            mode="multiple"
                             optionFilterProp="label"
                             :autoClearSearchValue="false"
-                            :placeholder="$t('PleaseSelect')+$t('Problemstate')">
-                    <a-select-option v-for="(item, key) in ProblemstateList"
-                                     :label='item'
+                            :placeholder="$t('PleaseSelect')+$t('RelatedItems')">
+                    <a-select-option v-for="(item, key) in projectNameList"
                                      :key="key"
-                                     :value="item">
-                  <span style="display: inline-block;width: 100%" :title=" item">
-                    {{ item }}
-                  </span>
+                                     :label="item.projectName"
+                                     :value="item.id">
+                     <span style="display: inline-block;width: 100%" :title=" item.projectName ">
+                           {{ item.projectName}}
+                     </span>
                     </a-select-option>
                   </a-select>
                 </a-form-model-item>
@@ -137,7 +138,34 @@
                 </a-form-model-item>
               </div>
             </a-col>
-
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <!--                  <span class="Required">*</span>-->
+                  <span class="title-text-text"
+                        :title="$t('Problemstate')">{{$t('Problemstate')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="contentTemplate">
+                  <a-select allowClear
+                            class="box-input"
+                            v-model="formInline.problemState"
+                            :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                            showSearch
+                            optionFilterProp="label"
+                            :autoClearSearchValue="false"
+                            :placeholder="$t('PleaseSelect')+$t('Problemstate')">
+                    <a-select-option v-for="(item, key) in ProblemstateList"
+                                     :label='item'
+                                     :key="key"
+                                     :value="item">
+                  <span style="display: inline-block;width: 100%" :title=" item">
+                    {{ item }}
+                  </span>
+                    </a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </div>
+            </a-col>
           </a-row>
           <a-row :gutter="24">
             <a-col :span="24">
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue
index b742f6763..1270d9913 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue
@@ -451,7 +451,7 @@ export default {
       this.$confirm({
         content: _this.$t('ConfirmDelete'),
         onOk() {
-          deleteAction('/platform/problemManagementEO/deleteBatch', { ids: record.uuid }).then((res) => {
+          deleteAction('/project/problemManagementEO/deleteBatch', { ids: record.uuid }).then((res) => {
             if (res.success) {
               _this.$message.success(_this.$t('OperationSuccessful'))
               _this.getList()

From c33efe00fe5cb262cd391b85f27d7ee4ee1b7a04 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 27 Sep 2023 09:53:25 +0800
Subject: [PATCH 172/288] =?UTF-8?q?=E3=80=90=E8=8B=B1=E6=96=87=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E3=80=91=E8=8B=B1=E6=96=87=E7=89=88=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E9=A1=B9=E7=9B=AE=E5=BA=93=EF=BC=8C=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=B1=95=E7=A4=BA=E4=B8=8D=E7=BE=8E=E8=A7=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/projectManagement/platformItemLibrary/index.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibrary/index.vue b/jero-web/src/views/projectManagement/platformItemLibrary/index.vue
index b8f3dad00..58b9fa055 100644
--- a/jero-web/src/views/projectManagement/platformItemLibrary/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibrary/index.vue
@@ -181,7 +181,7 @@
             title: this.$t('operation'),
             align: 'left',
             fixed: 'right',
-            width: 160,
+            width: 230,
             scopedSlots: { customRender: 'operation' }
           }
         ],

From e6683bb4a58c96a619948d17828364da69bac481 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 27 Sep 2023 10:05:13 +0800
Subject: [PATCH 173/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95-=E7=BC=96=E8=BE=91-=E8=B4=A3?=
 =?UTF-8?q?=E4=BB=BB=E9=83=A8=E9=97=A8=E5=92=8C=E8=B4=A3=E4=BB=BB=E9=A2=86?=
 =?UTF-8?q?=E5=9F=9F=E6=B2=A1=E6=9C=89=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificationList/components/addModel.vue | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
index 562412cfa..64c42a5fa 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
@@ -217,12 +217,22 @@
                                        :prop="'dataList.'+index+'.dutyTerritory'"
                                        :rules="[{ required: true, message: $t('areaOfResponsibility') + $t('cannotEmpty'), trigger: 'change'},]"
                     >
-                      <j-dict-select-tag class="box-input" v-model="item.dutyTerritory"
-                                         @input="handleInput('dataList.'+index+'.dutyTerritory')"
-                                         @changeQuery="dutyHandleChange(index)"
-                                         :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                         :type="'select'"
-                                         :triggerChange="false" :dictCode="'duty_territory'"/>
+                      <a-select :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                class="box-input"
+                                optionFilterProp="label"
+                                mode="multiple"
+                                @change="dutyHandleChange(index)"
+                                :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                                v-model="item.dutyTerritory">
+                        <a-select-option v-for="(val, key) in item.dutyTerritoryList"
+                                         :key="key"
+                                         :label="val.itemText"
+                                         :value="val.itemValue">
+                               <span style="display: inline-block;width: 100%" :title=" val.itemText ">
+                                     {{ val.itemText }}
+                               </span>
+                        </a-select-option>
+                      </a-select>
                     </a-form-model-item>
                   </div>
                 </a-col>
@@ -810,9 +820,12 @@
         value.dutyDepart = value.dutyDepart ? value.dutyDepart.split(',') : []
         value.dutyTerritory = value.dutyTerritory ? value.dutyTerritory.split(',') : []
         this.formInline = JSON.parse(JSON.stringify(value))
-        // if (value.dutyTerritory && value.dutyTerritory.length > 0) {
-        //   this.queryPersonByProject(value.dutyTerritory.join(','))
-        // }
+        if (value.dutyDepart && value.dutyDepart.length > 0) {
+          this.getDutyTerritoryOne(value.dutyDepart.join(','))
+        }
+        if (value.dutyTerritory && value.dutyTerritory.length > 0) {
+          this.queryPersonByProject(value.dutyTerritory.join(','))
+        }
         this.getRegulationNo()
         this.title = this.$t('edit')
         this.$nextTick(() => {

From 0e692a4e4d4b76a5fbf92c5509ff95dfc57cc191 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 27 Sep 2023 10:06:03 +0800
Subject: [PATCH 174/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E4=B8=AD=E9=97=AE=E9=A2=98=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=B8=AD=E5=8E=BB=E6=8E=89=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformProjectLawsInventoryEOServiceImpl.java    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index 2100df96e..540ba1425 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -10842,7 +10842,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 		String sheetName = "";
 		if (StringUtils.equals(cut,CutEnum.CN.getValue())) {
 			sheetName = "问题管理";
-			header = "标题,问题类型,PS_ISSUE,创建人,创建时间,相关法规,相关项目,责任部门,问题状态,描述和分析";
+			header = "标题,问题类型,PS_ISSUE,创建人,创建时间,相关法规,责任部门,问题状态,描述和分析";
+//			header = "标题,问题类型,PS_ISSUE,创建人,创建时间,相关法规,相关项目,责任部门,问题状态,描述和分析";
 		} else if (StringUtils.equals(cut,CutEnum.EN.getValue())) {
 			header = "Title,Issue Type,PS-ISSUE,Creator,Create Date,Related Regualtions,Related Project,Resonsible Field,Status,Description";
 			sheetName = "Problem management";
@@ -10888,10 +10889,10 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 				row.createCell(3).setCellValue((String) dataList.get(i).get("createBy"));
 				row.createCell(4).setCellValue((String) dataList.get(i).get("createTime"));
 				row.createCell(5).setCellValue((String) dataList.get(i).get("lawsName"));
-				row.createCell(6).setCellValue((String) dataList.get(i).get("projectName"));
-				row.createCell(7).setCellValue((String) dataList.get(i).get("dutyTerritory"));
-				row.createCell(8).setCellValue((String) dataList.get(i).get("problemState"));
-				row.createCell(9).setCellValue((String) dataList.get(i).get("description"));
+//				row.createCell(6).setCellValue((String) dataList.get(i).get("projectName"));
+				row.createCell(6).setCellValue((String) dataList.get(i).get("dutyTerritory"));
+				row.createCell(7).setCellValue((String) dataList.get(i).get("problemState"));
+				row.createCell(8).setCellValue((String) dataList.get(i).get("description"));
 			}
 		}
 		try {

From fb2f1558e2cc37eab1637d2654a4d25fc123d579 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 27 Sep 2023 10:09:33 +0800
Subject: [PATCH 175/288] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BA=93-=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-=E4=B8=8D?=
 =?UTF-8?q?=E5=8B=BE=E9=80=89=E6=B3=95=E8=A7=84=EF=BC=8C=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=8C=B9=E9=85=8D=E4=B8=8D=E4=B8=8A=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/projectManagement/components/listOfRegulations.vue   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 38997122e..d6c47d187 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -2009,6 +2009,9 @@
             this.$message.warning(this.$t('unpublishedregulationsselected'))
           }
         }else{
+          this.dataSource.forEach(item => {
+            this.selectedRowKeys.push(item.id)
+          })
           flag = '2'
           this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
         }

From 4a68d4b2838b7fd49b167acc1ce0a1f3c0953dbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 27 Sep 2023 10:34:13 +0800
Subject: [PATCH 176/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ParamsCollectManifestEOServiceImpl.java | 9 +++++++--
 .../components/ParameterItemCollectionList.vue           | 8 ++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index df429adf7..768997041 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -3605,8 +3605,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         pce.setParamsManifestId(paramsCollectManifestVO.getParamsManifestId());
         pce.setState(ExportStateEnum.EXPORTING.getValue());
         pce.setFileName(fileOriName+ ".zip");
-        paramsCollectExportService.add(pce);
-
+        Thread thread1 = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                paramsCollectExportService.add(pce);
+            }
+        });
+        thread1.start();
         //创建临时文件夹
         String fileNowPath = uploadpath + "/tempZip/" + UUID.randomUUID().toString().replace("-", "") + File.separator + fileOriName;
         File nowFile = new File(fileNowPath);
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 518ff5f00..eaa63105b 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -723,7 +723,7 @@
 <script>
   import TableCollection from '@/components/tableCollection/index'
   import parameterColumn from '../dialog/parametercolumn'
-  import { getAction, postAction, downloadFile } from '../../../api/manage'
+  import { getAction, postAction, downloadFile ,deleteAction } from '../../../api/manage'
   import eventBUs from '../../../common/event'
   import customizeList from './customizeList'
   import ParameterLibraryAdd from '@/components/ParameterLibraryAdd/index'
@@ -1594,7 +1594,7 @@
           content: '',
           onOk:
             async () => {
-              getAction(`tag/onlCgformArea/delete`, { id: item.id }).then((res) => {
+              deleteAction(`params/paramsCollectExport/delete`, { id: item.id }).then((res) => {
                 if (res.success) {
                   this.$message.success(this.$t('OperationSuccessful'))
                   this.expoteList()
@@ -1652,10 +1652,10 @@
             let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip'
             getAction('/params/collectManifest/exportAll', query).then((res) => {
               // if (res.success) {
-              this.dataExportFailed = false
-              this.ExportFailed = true
               // }
             })
+            this.dataExportFailed = false
+            this.ExportFailed = true
             // downloadFile('/params/collectManifest/exportAll', name, query, this.selectClear)
           }
         })

From b72071eb1fe00d839f741e1fe545f5a4c348b308 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 27 Sep 2023 11:06:39 +0800
Subject: [PATCH 177/288] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BA=93-=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-=E5=8B=BE?=
 =?UTF-8?q?=E9=80=89=E5=A4=9A=E6=9D=A1=E6=95=B0=E6=8D=AE=E5=8C=B9=E9=85=8D?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9=E7=9B=AE=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/listOfRegulations.vue                  | 11 +++++------
 .../components/certificationDirectory.vue             |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index d6c47d187..67b63745f 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1994,19 +1994,18 @@
             }
           }
           for (let i = 0; i < dataSource.length; i++) {
-            if (dataSource[i].verifyFlowStatus == 'List to be released' &&
-              dataSource[i].designFlowStatus == 'List to be released') {
+            if (dataSource[i].verifyFlowStatus !== 'List to be released' &&
+              dataSource[i].designFlowStatus !== 'List to be released') {
               flag = '1'
               status = '1'
-            } else {
-              status = '2'
             }
           }
           console.log(status)
           if(status == '1'){
-            this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
-          }else{
             this.$message.warning(this.$t('unpublishedregulationsselected'))
+
+          }else{
+            this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
           }
         }else{
           this.dataSource.forEach(item => {
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationDirectory.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationDirectory.vue
index c6021f680..2badb0e82 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationDirectory.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationDirectory.vue
@@ -11,7 +11,7 @@
       style="height: 100%;overflow: auto;padding-bottom: 53px;">
       <div style="margin-bottom: 60px">
         <div class="table-operator">
-          <div class="operator-text" v-if="isDisplayNum == 2 && roleSwitchingCode == 1"
+          <div class="operator-text" v-if="roleSwitchingCode == 1"
                @click="addData">
             <a-icon type="plus"/>
             {{$t('add')}}
@@ -159,7 +159,7 @@
     computed: {
       columns() {
         let columnResult = JSON.parse(JSON.stringify(this.columnsAll))
-        if (this.roleSwitchingCode == 1 && this.isDisplayNum == 2){
+        if (this.roleSwitchingCode == 1){
         }else{
           for (var i = 0; i < columnResult.length; i++) {
             if (columnResult[i].title === this.$t('operation')) {

From 8e316015ab062dd8838aa89901fac3ff4e178358 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 27 Sep 2023 11:36:45 +0800
Subject: [PATCH 178/288] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=BA=93=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E5=92=8C=E5=B9=B3=E5=8F=B0=E4=BB=B6?=
 =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E5=88=A0=E9=99=A4-?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=90=8C=E6=AD=A5=E5=88=A0=E9=99=A4=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...formProjectLawsInventoryEOServiceImpl.java | 95 +++---------------
 .../ProjectLawsInventoryEOServiceImpl.java    | 97 +++----------------
 2 files changed, 26 insertions(+), 166 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index 540ba1425..0169059a1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -690,6 +690,10 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 //			}
 //		}
 
+		//引用流程重置的逻辑
+		String operateType= "lawsInventoryAllResetFlow";
+		resetFlow(id,projectLibraryId,operateType);
+
 		//更新log
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		String username = sysUser.getUsername();
@@ -742,6 +746,10 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 //			}
 //		}
 
+		//引用流程重置的逻辑
+		String operateType= "lawsInventoryAllResetFlow";
+		resetFlow(StringUtils.join(ids,","),projectLibraryId,operateType);
+
 		//更新log
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		String username = sysUser.getUsername();
@@ -4832,6 +4840,11 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 		String ids = parmas.getString("ids");
 		String projectLibraryId = parmas.getString("projectLibraryId");
 		String operateType = parmas.getString("operateType");
+		resetFlow(ids, projectLibraryId, operateType);
+		return Result.OK("变更成功！");
+	}
+
+	private void resetFlow(String ids, String projectLibraryId, String operateType) {
 		if (StringUtils.isNotEmpty(ids)) {
 
 			List<String> piFlowTypeList = new ArrayList<>();
@@ -4862,7 +4875,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 			updateWrapper.set(ProjectLawsInventoryEO::getTaskAffirmDueDate, null);
 
 			// 区分重置设计、验证、全部流程
-			if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_ALL_RESET_FLOW.getValue())){
+			if(StringUtils.equals(operateType, OperatorTypeEnum.LAWS_INVENTORY_ALL_RESET_FLOW.getValue())){
 				updateWrapper.set(ProjectLawsInventoryEO::getDesignFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
 				updateWrapper.set(ProjectLawsInventoryEO::getVerifyFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
 				piFlowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue());
@@ -4889,85 +4902,6 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 
 			pIds = actiProcInstIdList.stream().map(String::valueOf).collect(Collectors.joining(","));
 
-			/*QueryWrapper<ProjectTaskInventoryEO> taskInventoryQueryWrapper = new QueryWrapper<>();
-			taskInventoryQueryWrapper.lambda().in(ProjectTaskInventoryEO::getProjectLawsInventoryId,idList);
-			List<ProjectTaskInventoryEO> projectTaskInventoryList = this.projectTaskInventoryEOService.getBaseMapper().selectList(taskInventoryQueryWrapper);
-
-			//删除流程历史
-			if(CollectionUtils.isNotEmpty(projectTaskInventoryList)){
-				List<String> actiProcInstIdList = new ArrayList<>();
-				List<String> verifyPIdList = projectTaskInventoryList.stream().map(ProjectTaskInventoryEO::getVerifyPId).distinct().collect(Collectors.toList());
-				List<String> prehomoPIdList = projectTaskInventoryList.stream().map(ProjectTaskInventoryEO::getPrehomoPId).distinct().collect(Collectors.toList());
-				List<String> designPIdList = projectTaskInventoryList.stream().map(ProjectTaskInventoryEO::getDesignPId).distinct().collect(Collectors.toList());
-
-				actiProcInstIdList.addAll(verifyPIdList);
-				actiProcInstIdList.addAll(prehomoPIdList);
-				actiProcInstIdList.addAll(designPIdList);
-
-				actiProcInstIdList = actiProcInstIdList.stream().distinct().collect(Collectors.toList());;
-				if(CollectionUtils.isNotEmpty(actiProcInstIdList)){
-					QueryWrapper<ProcessHistoryEO> processHistoryDeleteWrapper = new QueryWrapper<>();
-					processHistoryDeleteWrapper.lambda().in(ProcessHistoryEO::getActiProcInstId,actiProcInstIdList);
-					processHistoryEOService.remove(processHistoryDeleteWrapper);
-				}
-				pIds = actiProcInstIdList.stream().map(String::valueOf).collect(Collectors.joining(","));
-			}
-
-			QueryWrapper<ProjectLawsInventoryEO> queryLawsInventoryWrapper = new QueryWrapper<>();
-			queryLawsInventoryWrapper.lambda().in(ProjectLawsInventoryEO::getId,idList);
-
-			List<ProjectTaskInventoryEO> projectTaskInventoryEOList = new ArrayList<>();
-			List<ProjectLawsInventoryEO> projectLawsInventoryEOList = this.baseMapper.selectList(queryLawsInventoryWrapper);
-			projectLawsInventoryEOList.forEach(projectLawsInventory -> {
-				ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
-				String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
-				projectTaskInventoryEO.setId(projectTaskInventoryId);
-				projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventory.getId());
-				projectTaskInventoryEO.setStandId(projectLawsInventory.getStandId());
-				projectTaskInventoryEO.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
-				projectTaskInventoryEOList.add(projectTaskInventoryEO);
-			});
-//			idList.forEach(id -> {
-//				ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
-//				String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
-//				projectTaskInventoryEO.setId(projectTaskInventoryId);
-//				projectTaskInventoryEO.setProjectLawsInventoryId(id);
-//				projectTaskInventoryEOList.add(projectTaskInventoryEO);
-//			});
-			//项目任务清单数据初始化。
-			this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(idList);
-			this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
-
-			//初始化项目状态评估
-			projectTaskInventoryEOList.forEach(taskInventory -> {
-				this.initConditionAssessmentEO(taskInventory.getProjectLawsInventoryId());
-			});
-
-			//删除该法规的任务明细数据
-			QueryWrapper<ProjectTaskInventoryDetailEO> deleteTaskInventoryDetailWrapper = new QueryWrapper<>();
-			deleteTaskInventoryDetailWrapper.lambda().in(ProjectTaskInventoryDetailEO::getProjectTaskInventoryId,idList);
-			this.projectTaskInventoryDetailEOService.remove(deleteTaskInventoryDetailWrapper);
-
-			//查询反馈意见表 获取id  用于删除 反馈意见历史数据。
-			QueryWrapper<ProjectTaskInventoryFeedbackEO> queryTaskInventoryFeedbackWrapper = new QueryWrapper<>();
-			queryTaskInventoryFeedbackWrapper.lambda().in(ProjectTaskInventoryFeedbackEO::getProjectTaskInventoryId,idList);
-			List<ProjectTaskInventoryFeedbackEO> projectTaskInventoryFeedbackEOList = projectTaskInventoryFeedbackEOService.getBaseMapper().selectList(queryTaskInventoryFeedbackWrapper);
-			List<String> feedbackIdList = projectTaskInventoryFeedbackEOList.stream().map(ProjectTaskInventoryFeedbackEO::getId).distinct().collect(Collectors.toList());
-			if(CollectionUtils.isNotEmpty(feedbackIdList)){
-				QueryWrapper<FeedbackHistory> deleteFeedbackHistoryWrapper = new QueryWrapper<>();
-				deleteFeedbackHistoryWrapper.lambda().in(FeedbackHistory::getFeedbackId,feedbackIdList);
-				feedbackHistoryService.remove(deleteFeedbackHistoryWrapper);
-			}
-
-			//删除反馈意见数据
-			QueryWrapper<ProjectTaskInventoryFeedbackEO> deleteTaskInventoryFeedbackWrapper = new QueryWrapper<>();
-			deleteTaskInventoryFeedbackWrapper.lambda().in(ProjectTaskInventoryFeedbackEO::getProjectTaskInventoryId,idList);
-			this.projectTaskInventoryFeedbackEOService.remove(deleteTaskInventoryFeedbackWrapper);
-
-			//删除当前项目状态表
-			QueryWrapper<ConditionAssessmentEO> deleteConditionAssessmentWrapper = new QueryWrapper<>();
-			deleteConditionAssessmentWrapper.lambda().in(ConditionAssessmentEO::getProjectLawsInventoryId,idList);
-			this.conditionAssessmentEOService.remove(deleteConditionAssessmentWrapper);*/
 
 			JSONObject params = new JSONObject();
 			params.put("projectLawsInventoryIds", projectLawsInventoryIds);
@@ -5016,7 +4950,6 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 				this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(), paramsMsg);
 			}
 		}
-		return Result.OK("变更成功！");
 	}
 
 	private void importDatas(List<ProjectLawsInventoryEO> dataList,
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 2e2925cfc..1731b1408 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -639,6 +639,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				throw new JeroBootException("The user has no deletion permission");
 			}
 		}
+		//引用流程重置的逻辑
+		String operateType = "lawsInventoryAllResetFlow";
+		resetFolw(id, projectLibraryId, operateType);
 
 		//更新log
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -691,6 +694,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				throw new JeroBootException("The user has no deletion permission");
 			}
 		}
+		//引用流程重置的逻辑
+		String operateType = "lawsInventoryAllResetFlow";
+		resetFolw(StringUtils.join(ids,","), projectLibraryId, operateType);
 
 		//更新log
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -4781,6 +4787,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		String ids = parmas.getString("ids");
 		String projectLibraryId = parmas.getString("projectLibraryId");
 		String operateType = parmas.getString("operateType");
+		resetFolw(ids, projectLibraryId, operateType);
+		return Result.OK("变更成功！");
+	}
+
+	private void resetFolw(String ids, String projectLibraryId, String operateType) {
 		if (StringUtils.isNotEmpty(ids)) {
 
 			List<String> piFlowTypeList = new ArrayList<>();
@@ -4804,14 +4815,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerSubmitStatus, null);
 			updateWrapper.set(ProjectLawsInventoryEO::getSendMsgFlag, null);
 			updateWrapper.set(ProjectLawsInventoryEO::getSendMsgCurrentFlag, null);
-			//updateWrapper.set(ProjectLawsInventoryEO::getDesignDueDate,null);
-			//updateWrapper.set(ProjectLawsInventoryEO::getPrehomoDueDate,null);
-			//updateWrapper.set(ProjectLawsInventoryEO::getVerifyDueDate,null);
 			updateWrapper.set(ProjectLawsInventoryEO::getInventoryAffirmDueDate, null);
 			updateWrapper.set(ProjectLawsInventoryEO::getTaskAffirmDueDate, null);
 
 			// 区分重置设计、验证、全部流程
-			if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_ALL_RESET_FLOW.getValue())){
+			if(StringUtils.equals(operateType, OperatorTypeEnum.LAWS_INVENTORY_ALL_RESET_FLOW.getValue())){
 				updateWrapper.set(ProjectLawsInventoryEO::getDesignFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
 				updateWrapper.set(ProjectLawsInventoryEO::getVerifyFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
 				piFlowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue());
@@ -4838,86 +4846,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			pIds = actiProcInstIdList.stream().map(String::valueOf).collect(Collectors.joining(","));
 
-			/*QueryWrapper<ProjectTaskInventoryEO> taskInventoryQueryWrapper = new QueryWrapper<>();
-			taskInventoryQueryWrapper.lambda().in(ProjectTaskInventoryEO::getProjectLawsInventoryId,idList);
-			List<ProjectTaskInventoryEO> projectTaskInventoryList = this.projectTaskInventoryEOService.getBaseMapper().selectList(taskInventoryQueryWrapper);
-
-			//删除流程历史
-			if(CollectionUtils.isNotEmpty(projectTaskInventoryList)){
-				List<String> actiProcInstIdList = new ArrayList<>();
-				List<String> verifyPIdList = projectTaskInventoryList.stream().map(ProjectTaskInventoryEO::getVerifyPId).distinct().collect(Collectors.toList());
-				List<String> prehomoPIdList = projectTaskInventoryList.stream().map(ProjectTaskInventoryEO::getPrehomoPId).distinct().collect(Collectors.toList());
-				List<String> designPIdList = projectTaskInventoryList.stream().map(ProjectTaskInventoryEO::getDesignPId).distinct().collect(Collectors.toList());
-
-				actiProcInstIdList.addAll(verifyPIdList);
-				actiProcInstIdList.addAll(prehomoPIdList);
-				actiProcInstIdList.addAll(designPIdList);
-
-				actiProcInstIdList = actiProcInstIdList.stream().distinct().collect(Collectors.toList());;
-				if(CollectionUtils.isNotEmpty(actiProcInstIdList)){
-					QueryWrapper<ProcessHistoryEO> processHistoryDeleteWrapper = new QueryWrapper<>();
-					processHistoryDeleteWrapper.lambda().in(ProcessHistoryEO::getActiProcInstId,actiProcInstIdList);
-					processHistoryEOService.remove(processHistoryDeleteWrapper);
-				}
-				pIds = actiProcInstIdList.stream().map(String::valueOf).collect(Collectors.joining(","));
-			}
-
-			QueryWrapper<ProjectLawsInventoryEO> queryLawsInventoryWrapper = new QueryWrapper<>();
-			queryLawsInventoryWrapper.lambda().in(ProjectLawsInventoryEO::getId,idList);
-
-			List<ProjectTaskInventoryEO> projectTaskInventoryEOList = new ArrayList<>();
-			List<ProjectLawsInventoryEO> projectLawsInventoryEOList = this.baseMapper.selectList(queryLawsInventoryWrapper);
-			projectLawsInventoryEOList.forEach(projectLawsInventory -> {
-				ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
-				String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
-				projectTaskInventoryEO.setId(projectTaskInventoryId);
-				projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventory.getId());
-				projectTaskInventoryEO.setStandId(projectLawsInventory.getStandId());
-				projectTaskInventoryEO.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
-				projectTaskInventoryEOList.add(projectTaskInventoryEO);
-			});
-//			idList.forEach(id -> {
-//				ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
-//				String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
-//				projectTaskInventoryEO.setId(projectTaskInventoryId);
-//				projectTaskInventoryEO.setProjectLawsInventoryId(id);
-//				projectTaskInventoryEOList.add(projectTaskInventoryEO);
-//			});
-			//项目任务清单数据初始化。
-			this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(idList);
-			this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
-
-			//初始化项目状态评估
-			projectTaskInventoryEOList.forEach(taskInventory -> {
-				this.initConditionAssessmentEO(taskInventory.getProjectLawsInventoryId());
-			});
-
-			//删除该法规的任务明细数据
-			QueryWrapper<ProjectTaskInventoryDetailEO> deleteTaskInventoryDetailWrapper = new QueryWrapper<>();
-			deleteTaskInventoryDetailWrapper.lambda().in(ProjectTaskInventoryDetailEO::getProjectTaskInventoryId,idList);
-			this.projectTaskInventoryDetailEOService.remove(deleteTaskInventoryDetailWrapper);
-
-			//查询反馈意见表 获取id  用于删除 反馈意见历史数据。
-			QueryWrapper<ProjectTaskInventoryFeedbackEO> queryTaskInventoryFeedbackWrapper = new QueryWrapper<>();
-			queryTaskInventoryFeedbackWrapper.lambda().in(ProjectTaskInventoryFeedbackEO::getProjectTaskInventoryId,idList);
-			List<ProjectTaskInventoryFeedbackEO> projectTaskInventoryFeedbackEOList = projectTaskInventoryFeedbackEOService.getBaseMapper().selectList(queryTaskInventoryFeedbackWrapper);
-			List<String> feedbackIdList = projectTaskInventoryFeedbackEOList.stream().map(ProjectTaskInventoryFeedbackEO::getId).distinct().collect(Collectors.toList());
-			if(CollectionUtils.isNotEmpty(feedbackIdList)){
-				QueryWrapper<FeedbackHistory> deleteFeedbackHistoryWrapper = new QueryWrapper<>();
-				deleteFeedbackHistoryWrapper.lambda().in(FeedbackHistory::getFeedbackId,feedbackIdList);
-				feedbackHistoryService.remove(deleteFeedbackHistoryWrapper);
-			}
-
-			//删除反馈意见数据
-			QueryWrapper<ProjectTaskInventoryFeedbackEO> deleteTaskInventoryFeedbackWrapper = new QueryWrapper<>();
-			deleteTaskInventoryFeedbackWrapper.lambda().in(ProjectTaskInventoryFeedbackEO::getProjectTaskInventoryId,idList);
-			this.projectTaskInventoryFeedbackEOService.remove(deleteTaskInventoryFeedbackWrapper);
-
-			//删除当前项目状态表
-			QueryWrapper<ConditionAssessmentEO> deleteConditionAssessmentWrapper = new QueryWrapper<>();
-			deleteConditionAssessmentWrapper.lambda().in(ConditionAssessmentEO::getProjectLawsInventoryId,idList);
-			this.conditionAssessmentEOService.remove(deleteConditionAssessmentWrapper);*/
-
 			JSONObject params = new JSONObject();
 			params.put("projectLawsInventoryIds", projectLawsInventoryIds);
 			params.put("pIds", pIds);
@@ -4969,7 +4897,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();
 		wrapper.in(LawsInventoryPlatformEO::getLawsInventoryId,Arrays.asList(ids.split(",")));
 		lawsInventoryPlatformEOService.remove(wrapper);
-		return Result.OK("变更成功！");
 	}
 
 	private void importDatas(List<ProjectLawsInventoryEO> dataList,

From 54fe31c744f3c9cd1dc324b161713aa86ace642c Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 27 Sep 2023 13:40:13 +0800
Subject: [PATCH 179/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95-=E7=BC=96=E8=BE=91=20=E8=B4=A3?=
 =?UTF-8?q?=E4=BB=BB=E4=BA=BA=E4=B8=8D=E8=83=BD=E4=B8=BA=E7=A9=BA=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/PersonnelSelection/index.vue           | 3 ++-
 .../components/certificationList/components/addModel.vue       | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue
index f740d653b..b214e423f 100644
--- a/jero-web/src/components/PersonnelSelection/index.vue
+++ b/jero-web/src/components/PersonnelSelection/index.vue
@@ -140,9 +140,10 @@
           let content = this.selectData.filter(res => {
             return res.id === selectValue
           })
-          this.$emit('input', content[0].username)
+          this.$emit('input', content.length > 0 ? content[0].username:'')
           this.$emit('change', this.query.db_field_name, selectValue, this.query.subscript)
         } else {
+          console.log(1)
           Object.assign(this, {
             selectValue,
             fetching: false
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
index 64c42a5fa..606624bfd 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
@@ -380,7 +380,6 @@
                     <PersonnelSelection
                       :query="{db_field_name:'dutyPerson',db_field_txt:$t('personLiable')}"
                       :personneQuery="formInline"
-                      :isSingleChoice="true"
                       v-if="personnelVisible"
                       @change="PersonnelSelectionChange"
                       :disabled="disabled"

From a1dac17ee8cc65e9d5c438ccb477d05c29756650 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 27 Sep 2023 13:48:53 +0800
Subject: [PATCH 180/288] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E5=B9=B3=E5=8F=B0=E4=BB=B6?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctCertificationInventoryEOServiceImpl.java | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index a583167ed..b84d9dd84 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -1986,14 +1986,18 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 							.map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).collect(Collectors.toList());
 					List<ProjectCertificationInventoryEO> certificationInventoryEOS = projectCertificationInventoryEOS.stream()
 							.filter(e -> idList.contains(e.getId())).collect(Collectors.toList());
-					if(!certificationInventoryEOS.isEmpty()){
-						setProjectCertificationInventoryEO(certificationInventoryEOS.get(0),certificationInventoryEO);
-					}
+
 					List<ProjectLibraryBase> libraryBaseList = projectLibraryBaseList.stream()
 							.filter(e -> certificationInventoryEOS.get(0).getProjectLibraryId().equals(e.getId())).collect(Collectors.toList());
 					if(ObjectUtils.isNotEmpty(libraryBaseList)){
 						certificationInventoryEO.setConfigItem(libraryBaseList.get(0).getProjectNameId());
 					}
+
+					if(!certificationInventoryEOS.isEmpty()){
+						setProjectCertificationInventoryEO(certificationInventoryEOS.get(0),certificationInventoryEO);
+					}
+
+
 				}
 			}
 		}
@@ -7046,6 +7050,25 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 
 	private void setProjectCertificationInventoryEO(ProjectCertificationInventoryEO certificationInventoryEO,
 													ProjectCertificationInventoryEO projectCertificationInventoryEO) {
+		//类别  category
+		projectCertificationInventoryEO.setCategory(StringUtils.isNotEmpty(certificationInventoryEO.getCategory()) ? certificationInventoryEO.getCategory() : "");
+		//检验项目  inspectionItem
+		projectCertificationInventoryEO.setInspectionItem(StringUtils.isNotEmpty(certificationInventoryEO.getInspectionItem()) ? certificationInventoryEO.getInspectionItem() : "");
+		//认证类型  attestationType
+		projectCertificationInventoryEO.setAttestationType(StringUtils.isNotEmpty(certificationInventoryEO.getAttestationType()) ? certificationInventoryEO.getAttestationType() : "");
+		//WVTA ID  wvtaId
+		projectCertificationInventoryEO.setWvtaId(StringUtils.isNotEmpty(certificationInventoryEO.getWvtaId()) ? certificationInventoryEO.getWvtaId() : "");
+		//标准编号  serialNumber
+		projectCertificationInventoryEO.setSerialNumber(StringUtils.isNotEmpty(certificationInventoryEO.getSerialNumber()) ? certificationInventoryEO.getSerialNumber() : "");
+		//责任部门  dutyDepart
+		projectCertificationInventoryEO.setDutyDepart(StringUtils.isNotEmpty(certificationInventoryEO.getDutyDepart()) ? certificationInventoryEO.getDutyDepart() : "");
+		//责任领域  firstLevelDutyTerritory
+		projectCertificationInventoryEO.setFirstLevelDutyTerritory(StringUtils.isNotEmpty(certificationInventoryEO.getFirstLevelDutyTerritory()) ? certificationInventoryEO.getFirstLevelDutyTerritory() : "");
+		//工程接口人  sdt
+		projectCertificationInventoryEO.setSdt(StringUtils.isNotEmpty(certificationInventoryEO.getSdt()) ? certificationInventoryEO.getSdt() : "");
+		//责任人  dutyPerson
+		projectCertificationInventoryEO.setDutyPerson(StringUtils.isNotEmpty(certificationInventoryEO.getDutyPerson()) ? certificationInventoryEO.getDutyPerson() : "");
+
 		//交付物模板-deliverableTemplate
 		projectCertificationInventoryEO.setDeliverableTemplate(StringUtils.isNotEmpty(certificationInventoryEO.getDeliverableTemplate()) ? certificationInventoryEO.getDeliverableTemplate() : "");
 		//交付物类型-deliverableType

From aaed9f0ee324918b7dbf0376772f3301bf00d5a8 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 27 Sep 2023 14:24:07 +0800
Subject: [PATCH 181/288] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=BA=93-=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E7=BB=91=E5=AE=9A=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8E=EF=BC=8C=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 1731b1408..7275e56ff 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -11747,6 +11747,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 							List<ProjectLawsInventoryEO> collect = lawsInventoryEOS.stream()
 									.filter(e -> value.equals(e.getDesignFlowStatus())).collect(Collectors.toList());
 							if(ObjectUtils.isNotEmpty(collect)){
+								//流程状态
 								lawsInventoryEO.setDesignFlowStatus(value);
 								break;
 							}
@@ -11755,6 +11756,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 							List<ProjectLawsInventoryEO> collect = lawsInventoryEOS.stream()
 									.filter(e -> value.equals(e.getVerifyFlowStatus())).collect(Collectors.toList());
 							if(ObjectUtils.isNotEmpty(collect)){
+								//流程状态
 								lawsInventoryEO.setVerifyFlowStatus(value);
 								break;
 							}
@@ -11838,17 +11840,42 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						lawsInventoryEO.setVerifyDeliverableTemplate(lawsInventoryEOS.get(0).getVerifyDeliverableTemplate());
 						lawsInventoryEO.setVerifyDeliverableTemplateName(lawsInventoryEOS.get(0).getVerifyDeliverableTemplateName());
 
+						//责任人
 						lawsInventoryEO.setVerifyDutyId(lawsInventoryEOS.get(0).getDesignDutyId());
 						lawsInventoryEO.setDesignDutyIdName(lawsInventoryEOS.get(0).getDesignDutyIdName());
 
 						lawsInventoryEO.setVerifyDutyId(lawsInventoryEOS.get(0).getVerifyDutyId());
 						lawsInventoryEO.setVerifyDutyIdName(lawsInventoryEOS.get(0).getVerifyDutyIdName());
 
+						//截止时间
 						lawsInventoryEO.setDesignDueDate(lawsInventoryEOS.get(0).getDesignDueDate());
 						lawsInventoryEO.setVerifyDueDate(lawsInventoryEOS.get(0).getVerifyDueDate());
 
+						//交付物说明
 						lawsInventoryEO.setDesignRemark(lawsInventoryEOS.get(0).getDesignRemark());
 						lawsInventoryEO.setVerifyRemark(lawsInventoryEOS.get(0).getVerifyRemark());
+						//编号  serialNumber
+						lawsInventoryEO.setSerialNumber(lawsInventoryEOS.get(0).getSerialNumber());
+						//标题  title
+						lawsInventoryEO.setTitle(lawsInventoryEOS.get(0).getTitle());
+						//子标题  subtitle
+						lawsInventoryEO.setSubtitle(lawsInventoryEOS.get(0).getSubtitle());
+						//使用增补件  applicableSupplement
+						lawsInventoryEO.setApplicableSupplement(lawsInventoryEOS.get(0).getApplicableSupplement());
+						//认证类型  attestationType
+						lawsInventoryEO.setAttestationType(lawsInventoryEOS.get(0).getAttestationType());
+						//认证级别  attestationRank
+						lawsInventoryEO.setAttestationRank(lawsInventoryEOS.get(0).getAttestationRank());
+						//责任部门  dutyDepart
+						lawsInventoryEO.setDutyDepart(lawsInventoryEOS.get(0).getDutyDepart());
+						//责任领域  dutyTerritory
+						lawsInventoryEO.setDutyTerritory(lawsInventoryEOS.get(0).getDutyTerritory());
+						//法规工程师  regulationOwnerId
+						lawsInventoryEO.setRegulationOwnerId(lawsInventoryEOS.get(0).getRegulationOwnerId());
+						//工程接口人  engineeringInterfacePerson
+						lawsInventoryEO.setEngineeringInterfacePerson(lawsInventoryEOS.get(0).getEngineeringInterfacePerson());
+						//备注  remark
+						lawsInventoryEO.setRemark(lawsInventoryEOS.get(0).getRemark());
 					}
 				}
 			}

From 67e3908c2bff77ed9b9bf8ab857cfa28b91aca95 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 27 Sep 2023 14:28:35 +0800
Subject: [PATCH 182/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   2 +-
 jero-web/src/common/lang/zh-cn.js             |   2 +-
 .../components/flowstatusdetial.vue           | 130 +++++++++---------
 .../components/addModelconformance.vue        |   7 +
 .../components/certificationList/index.vue    |   2 +-
 5 files changed, 76 insertions(+), 67 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 60a3b785c..8c523b79d 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1978,5 +1978,5 @@ module.exports = {
   PlatformInformation:'Platform Information',
   Processdetails:'Process Details',
   matchempty:'The match is empty',
-  onlyDataProcessStatusDeleted:'Only data whose flow status is to be started can be deleted',
+  onlyDataProcessStatusDeleted:'Data can only be deleted if the process status is task ready, approved, or rejected by the responsible person',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 69c317448..5f96284a8 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1551,7 +1551,7 @@ module.exports = {
   type: '类型',
   select: '选择',
   onlyDataWithProcessStatusDeleted: '只能删除流程状态为清单待发布和审查通过的数据',
-  onlyDataProcessStatusDeleted: '只能删除流程状态为任务待发起的数据',
+  onlyDataProcessStatusDeleted: '只能删除流程状态为任务待发起、审查通过和责任人拒绝的数据',
   complianceCertificationProgram: '合规认证计划',
   listPublishing: '清单发布',
   responsibilityConfirmation: '责任确认',
diff --git a/jero-web/src/views/projectManagement/components/flowstatusdetial.vue b/jero-web/src/views/projectManagement/components/flowstatusdetial.vue
index 3d115990a..cb72fef94 100644
--- a/jero-web/src/views/projectManagement/components/flowstatusdetial.vue
+++ b/jero-web/src/views/projectManagement/components/flowstatusdetial.vue
@@ -48,77 +48,79 @@
 
           </a-col>
         </a-row>
-        <div v-for='(item,index) in dataList' :key='index'>
-          <div class='title' :title="item.projectName">{{item.projectName}}</div>
-          <div style='height:100%'>
-            <a-row :gutter="24">
-              <a-col :span="12">
-                <div class='detail-box'>
-                  <span class='detail-text' :title="$t('ProcessStatus')">{{$t('ProcessStatus')}}</span>
-                  <span class="title-text-text" :title="flag == 'design'?item.designFlowStatusName : item.verifyFlowStatusName">
+        <div style='margin-bottom: 30px'>
+          <div v-for='(item,index) in dataList' :key='index'>
+            <div class='title' :title="item.projectName">{{item.projectName}}</div>
+            <div style='height:100%'>
+              <a-row :gutter="24">
+                <a-col :span="12">
+                  <div class='detail-box'>
+                    <span class='detail-text' :title="$t('ProcessStatus')">{{$t('ProcessStatus')}}</span>
+                    <span class="title-text-text" :title="flag == 'design'?item.designFlowStatusName : item.verifyFlowStatusName">
                 {{flag == 'design'?item.designFlowStatusName : item.verifyFlowStatusName}}</span>
-                </div>
-              </a-col>
-              <a-col :span="12">
-              </a-col>
-            </a-row>
-            <a-row :gutter="24">
-              <a-col :span="12">
-                <div class='detail-box'>
-                  <span class='detail-text' :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
-                  <span class="title-text-text" :title="item.createBy">
+                  </div>
+                </a-col>
+                <a-col :span="12">
+                </a-col>
+              </a-row>
+              <a-row :gutter="24">
+                <a-col :span="12">
+                  <div class='detail-box'>
+                    <span class='detail-text' :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
+                    <span class="title-text-text" :title="item.createBy">
                 {{item.createBy}}</span>
-                </div>
-              </a-col>
-              <a-col :span="12">
-                <div class='detail-box'>
-                  <span class='detail-text' :title="$t('personLiable')">{{$t('personLiable')}}</span>
-                  <span class="title-text-text" :title="flag == 'design'?item.designDutyIdName : item.verifyDutyIdName">
+                  </div>
+                </a-col>
+                <a-col :span="12">
+                  <div class='detail-box'>
+                    <span class='detail-text' :title="$t('personLiable')">{{$t('personLiable')}}</span>
+                    <span class="title-text-text" :title="flag == 'design'?item.designDutyIdName : item.verifyDutyIdName">
                 {{flag == 'design'?item.designDutyIdName : item.verifyDutyIdName}}</span>
-                </div>
-              </a-col>
-            </a-row>
-            <a-row :gutter="24">
-              <a-col :span="12">
-                <div class='detail-box'>
-                  <span class='detail-text' :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
-                  <span class="title-text-text" :title="item.dutyDepart">
+                  </div>
+                </a-col>
+              </a-row>
+              <a-row :gutter="24">
+                <a-col :span="12">
+                  <div class='detail-box'>
+                    <span class='detail-text' :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
+                    <span class="title-text-text" :title="item.dutyDepart">
                 {{item.dutyDepart}}</span>
-                </div>
-              </a-col>
-              <a-col :span="12">
-                <div class='detail-box'>
-                  <span class='detail-text' :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
-                  <span class="title-text-text" :title="item.dutyTerritory_dictText">
+                  </div>
+                </a-col>
+                <a-col :span="12">
+                  <div class='detail-box'>
+                    <span class='detail-text' :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
+                    <span class="title-text-text" :title="item.dutyTerritory_dictText">
                 {{item.dutyTerritory_dictText}}</span>
-                </div>
-              </a-col>
-            </a-row>
-            <a-row :gutter="24">
-              <a-col :span="12">
-                <div class='detail-box'>
-                  <span class='detail-text' :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
-                  <a style='color:#00B3BE' class="title-text-text text-operation" @click="down(flag == 'design'?item.designDeliverableTemplate : item.verifyDeliverableTemplate),flag == 'design'?item.designDeliverableTemplateName : item.verifyDeliverableTemplateName" :title="flag == 'design'?item.designDeliverableTemplateName : item.verifyDeliverableTemplateName">
-                {{flag == 'design'?item.designDeliverableTemplateName : item.verifyDeliverableTemplateName }}</a>
-                </div>
-              </a-col>
-              <a-col :span="12">
-                <div class='detail-box'>
-                  <span class='detail-text' :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
-                  <span class="title-text-text" :title="flag == 'design'?item.designDeliverableTypeName : item.verifyDeliverableTypeName">
+                  </div>
+                </a-col>
+              </a-row>
+              <a-row :gutter="24">
+                <a-col :span="12">
+                  <div class='detail-box'>
+                    <span class='detail-text' :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
+                    <a style='color:#00B3BE' class="title-text-text text-operation" @click="down(flag == 'design'?item.designDeliverableTemplate : item.verifyDeliverableTemplate),flag == 'design'?item.designDeliverableTemplateName : item.verifyDeliverableTemplateName" :title="flag == 'design'?item.designDeliverableTemplateName : item.verifyDeliverableTemplateName">
+                      {{flag == 'design'?item.designDeliverableTemplateName : item.verifyDeliverableTemplateName }}</a>
+                  </div>
+                </a-col>
+                <a-col :span="12">
+                  <div class='detail-box'>
+                    <span class='detail-text' :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
+                    <span class="title-text-text" :title="flag == 'design'?item.designDeliverableTypeName : item.verifyDeliverableTypeName">
                 {{flag == 'design'?item.designDeliverableTypeName : item.verifyDeliverableTypeName}}</span>
-                </div>
-              </a-col>
-            </a-row>
-            <a-row :gutter="24">
-              <a-col :span="24">
-                <div class='detail-box' style='display:flex'>
-                  <span class='detail-text' :title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
-                  <span class="title-text-description" :title="flag == 'design'?item.designRemark : item.verifyRemark">
+                  </div>
+                </a-col>
+              </a-row>
+              <a-row :gutter="24">
+                <a-col :span="24">
+                  <div class='detail-box' style='display:flex'>
+                    <span class='detail-text' :title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
+                    <span class="title-text-description" :title="flag == 'design'?item.designRemark : item.verifyRemark">
                 {{flag == 'design'?item.designRemark : item.verifyRemark}}</span>
-                </div>
-              </a-col>
-            </a-row>
+                  </div>
+                </a-col>
+              </a-row>
+            </div>
           </div>
         </div>
 
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue
index 0bdd14ac0..e00a217bf 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue
@@ -21,6 +21,7 @@
                 </div>
                 <a-form-model-item class="itemModel" prop="title">
                   <a-input class="box-input"
+                           :maxLength="200"
                            v-model='formInline.title'
                            :disabled="disabled"
                            :placeholder="$t('PleaseEnter')+$t('title')"/>
@@ -53,6 +54,7 @@
                 </div>
                 <a-form-model-item class="itemModel" prop="issue">
                   <a-input class="box-input"
+                           :maxLength="200"
                            v-model='formInline.psIssue'
                            :disabled="disabled"
                            :placeholder="$t('PleaseEnter')+'PS-issue'"/>
@@ -177,6 +179,7 @@
                 </div>
                 <a-form-model-item class="itemModel" prop="descriptions">
                   <a-input class="box-input"
+                           :maxLength="200"
                            v-model='formInline.description'
                            :disabled="disabled"
                            :placeholder="$t('PleaseEnter')+$t('descriptions')"/>
@@ -195,6 +198,7 @@
                 <a-form-model-item class="itemModel" prop="fileLink">
                   <div v-for="(item,index) in formInline.fileLinkList" :key="index">
                     <a-input class="box-input"
+                             :maxLength="200"
                              style='width: 88%'
                              v-model='item.fileLink'
                              :disabled="disabled"
@@ -228,6 +232,7 @@
                   <div v-for="(item,index) in formInline.progressTrackingList" :key="index">
                     <!--                    <span>{{item}}</span>-->
                     <a-input class="box-input"
+                             :maxLength="200"
                              style='width: 88%'
                              v-model='item.progressTracking'
                              :disabled="true"
@@ -250,6 +255,7 @@
                 </div>
                 <a-form-model-item class="itemModel" prop="conclusion">
                   <a-input class="box-input"
+                           :maxLength="200"
                            v-model='formInline.conclusion'
                            :disabled="disabled"
                            :placeholder="$t('PleaseEnter')+$t('conculsion')"/>
@@ -269,6 +275,7 @@
                   <div v-for="(item,index) in formInline.approvalEvidenceLinkList" :key="index">
                     <a-input class="box-input"
                              style='width: 88%'
+                             :maxLength="200"
                              v-model='item.approvalEvidenceLink'
                              :disabled="disabled"
                              :placeholder="$t('PleaseEnter')+$t('Addresslink')"/>
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
index e5c25409f..56fd57180 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
@@ -1500,7 +1500,7 @@
       },
       deleteLib(val) {
         let _this = this
-        if (val.flowStatus == 'List to be checked') {
+        if (val.flowStatus == 'List to be checked' || val.flowStatus == 'Review and pass' || val.flowStatus == 'Duty Person Rejected') {
           this.$confirm({
             content: _this.$t('ConfirmDelete'),
             onOk() {

From ac5728f0187228ded6ce86db8b16e2d3719723a6 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 27 Sep 2023 14:49:19 +0800
Subject: [PATCH 183/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/service/impl/ProjectLibraryBaseServiceImpl.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 6d5f66965..624172269 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -1277,7 +1277,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	public Map<String,Object> listPlatform(Map<String,Object> params) {
 		String cut = (String) params.get("cut");//
 		String ids = (String) params.get("ids");//法规清单id
-		String projectLibraryIds = (String) params.get("projectLibraryIds");//平台件项目id
+		String projectLibraryIds = (String) params.get("projectLibraryIds");//平台件法规清单id
 
 		//法规清单数据
 		LambdaQueryWrapper<ProjectLawsInventoryEO> wrapper = new LambdaQueryWrapper<>();
@@ -1286,7 +1286,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 
 		//平台件项目对应的法规清单数据
 		LambdaQueryWrapper<ProjectLawsInventoryEO> wrapper1 = new LambdaQueryWrapper<>();
-		wrapper1.in(ProjectLawsInventoryEO::getProjectLibraryId,Arrays.asList(projectLibraryIds.split(",")));
+		wrapper1.in(ProjectLawsInventoryEO::getId,Arrays.asList(projectLibraryIds.split(",")));
 		List<ProjectLawsInventoryEO> lawsInventoryEOS = projectLawsInventoryEOService.list(wrapper1);
 
 		//平台件项目信息

From 24dfd2850ffae8a2678f0498f7369c72328bc9fe Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 27 Sep 2023 14:49:32 +0800
Subject: [PATCH 184/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificationList/components/addModel.vue | 58 +++++++------------
 1 file changed, 20 insertions(+), 38 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
index 606624bfd..92905cb59 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
@@ -380,6 +380,7 @@
                     <PersonnelSelection
                       :query="{db_field_name:'dutyPerson',db_field_txt:$t('personLiable')}"
                       :personneQuery="formInline"
+                      :isSingleChoice="true"
                       v-if="personnelVisible"
                       @change="PersonnelSelectionChange"
                       :disabled="disabled"
@@ -387,44 +388,6 @@
                   </a-form-model-item>
                 </div>
               </a-col>
-              <a-col :span="12" v-if="formInline.taskConfirmEndTime">
-                <div class="box-title-text">
-                  <div class="title-text">
-                    <span class="title-text-text" :title="$t('taskConfirmEndTime')">{{$t('taskConfirmEndTime')}}</span>
-                  </div>
-                  <a-form-model-item class="itemModel">
-                    <a-date-picker class="box-input"
-                                   @change="dateChange({db_field_name:'taskConfirmEndTime'})"
-                                   format="YYYY-MM-DD"
-                                   :disabled="true"
-                                   :disabledDate="disabledDate"
-                                   :getCalendarContainer="(trigger) => trigger.parentNode"
-                                   v-model="formInline.taskConfirmEndTime"
-                                   style="width: 100%"/>
-                  </a-form-model-item>
-                </div>
-              </a-col>
-<!--              <a-col :span="12">-->
-<!--                <div class="box-title-text">-->
-<!--                  <div class="title-text">-->
-<!--                    <span class="Required">*</span>-->
-<!--                    <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>-->
-<!--                  </div>-->
-<!--                  <a-form-model-item-->
-<!--                    class="itemModel"-->
-<!--                    :prop="'configItem'"-->
-<!--                  >-->
-<!--                    <a-input class="box-input"-->
-<!--                             v-model.trim="formInline.configItem"-->
-<!--                             :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>-->
-<!--                    &lt;!&ndash;                    <j-dict-select-tag class="box-input" v-model="formInline.configItem"&ndash;&gt;-->
-<!--                    &lt;!&ndash;                                       @input="handleInput('configItem')"&ndash;&gt;-->
-<!--                    &lt;!&ndash;                                       :placeholder="$t('PleaseSelect')+$t('configurationItem')"&ndash;&gt;-->
-<!--                    &lt;!&ndash;                                       :type="'select'"&ndash;&gt;-->
-<!--                    &lt;!&ndash;                                       :triggerChange="false" :dictCode="'ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4'"/>&ndash;&gt;-->
-<!--                  </a-form-model-item>-->
-<!--                </div>-->
-<!--              </a-col>-->
               <a-col :span="12">
                 <div class="box-title-text">
                   <div class="title-text">
@@ -511,6 +474,25 @@
               </a-col>
 
             </a-row>
+            <a-row :gutter="24"  v-if="formInline.taskConfirmEndTime">
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="title-text-text" :title="$t('taskConfirmEndTime')">{{$t('taskConfirmEndTime')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel">
+                    <a-date-picker class="box-input"
+                                   @change="dateChange({db_field_name:'taskConfirmEndTime'})"
+                                   format="YYYY-MM-DD"
+                                   :disabled="true"
+                                   :disabledDate="disabledDate"
+                                   :getCalendarContainer="(trigger) => trigger.parentNode"
+                                   v-model="formInline.taskConfirmEndTime"
+                                   style="width: 100%"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+            </a-row>
 
             <a-row :gutter="24">
               <a-col :span="12">

From c91ccf9b36ae6b75b0f412d3789ed49ca10301e3 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 27 Sep 2023 15:08:45 +0800
Subject: [PATCH 185/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  1 +
 jero-web/src/common/lang/zh-cn.js             |  3 ++-
 .../components/listOfRegulations.vue          | 20 ++++++++++++-------
 .../components/settingList.vue                |  1 +
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 8c523b79d..77f5bc836 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1979,4 +1979,5 @@ module.exports = {
   Processdetails:'Process Details',
   matchempty:'The match is empty',
   onlyDataProcessStatusDeleted:'Data can only be deleted if the process status is task ready, approved, or rejected by the responsible person',
+  platformitemhasbeenassociated:'A platform item has been associated',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 5f96284a8..892faa965 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -3934,5 +3934,6 @@ module.exports = {
   unpublishedregulationsselected:'仅能选择未发布的法规',
   PlatformInformation:'平台件信息',
   Processdetails:'流程详情',
-  matchempty:'匹配项为空'
+  matchempty:'匹配项为空',
+  platformitemhasbeenassociated:'已关联平台件项目',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 67b63745f..5f95c5ba6 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1986,6 +1986,7 @@
           this.detailedWarningList = []
           let dataSource = []
           let status = ''
+          flag = '1'
           for (let i = 0; i < this.dataSource.length; i++) {
             for (let j = 0; j < this.selectedRowKeys.length; j++) {
               if (this.dataSource[i].id == this.selectedRowKeys[j]) {
@@ -1996,7 +1997,6 @@
           for (let i = 0; i < dataSource.length; i++) {
             if (dataSource[i].verifyFlowStatus !== 'List to be released' &&
               dataSource[i].designFlowStatus !== 'List to be released') {
-              flag = '1'
               status = '1'
             }
           }
@@ -2008,11 +2008,12 @@
             this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
           }
         }else{
+          let ids = []
           this.dataSource.forEach(item => {
-            this.selectedRowKeys.push(item.id)
+            ids.push(item.id)
           })
           flag = '2'
-          this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
+          this.$refs.associatedplatRef.transferModel(flag,type,ids)
         }
       },
       associatedplatForm(id,flag,type,ids){
@@ -2916,11 +2917,16 @@
               dataSource[i].verifyFlowStatus == 'Regulatory engineer returns' ||
               dataSource[i].designFlowStatus == 'List to be released' ||
               dataSource[i].designFlowStatus == 'Regulatory engineer returns') {
-              if (dataSource[i].regulationOwnerId) {
-                this.detailedSuccessList.push(dataSource[i])
-              } else {
+              if(dataSource[i].projectLawsInventoryEOS && (dataSource[i].projectLawsInventoryEOS.length > 0 || dataSource[i].projectLawsInventoryEOS !== null)){
+                if (dataSource[i].regulationOwnerId) {
+                  this.detailedSuccessList.push(dataSource[i])
+                } else {
+                  this.detailedWarningList.push(
+                    < div > { dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } < /div>)
+                }
+              }else{
                 this.detailedWarningList.push(
-                < div > { dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } < /div>)
+                  < div > { dataSource[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>)
               }
             } else {
               this.detailedWarningList.push(
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
index ce86526cb..4833b0c05 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
@@ -22,6 +22,7 @@
                   <a-form-model-item class="itemModel">
                     <a-input class="box-input"
                              v-model="item.nodeName"
+                             :maxLength="200"
                              :placeholder="$t('PleaseEnter')+$t('Nodename')"/>
                   </a-form-model-item>
                 </div>

From 2cd835eb9bb768bfe9a3d38bbef75c3366369722 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 27 Sep 2023 15:23:48 +0800
Subject: [PATCH 186/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/service/impl/ProjectLibraryBaseServiceImpl.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 624172269..e7288fcd9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -1286,12 +1286,12 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 
 		//平台件项目对应的法规清单数据
 		LambdaQueryWrapper<ProjectLawsInventoryEO> wrapper1 = new LambdaQueryWrapper<>();
-		wrapper1.in(ProjectLawsInventoryEO::getId,Arrays.asList(projectLibraryIds.split(",")));
+		wrapper1.in(ProjectLawsInventoryEO::getProjectLibraryId,Arrays.asList(projectLibraryIds.split(",")));
 		List<ProjectLawsInventoryEO> lawsInventoryEOS = projectLawsInventoryEOService.list(wrapper1);
 
 		//平台件项目信息
 		List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
-		if(!lawsInventoryEOList.isEmpty()){
+		if(!lawsInventoryEOList.isEmpty() && ObjectUtils.isNotEmpty(lawsInventoryEOS)){
 			List<String> projectIdList = lawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList());
 			LambdaQueryWrapper<ProjectLibraryBase> wrapper2 = new LambdaQueryWrapper<>();
 			wrapper2.in(ProjectLibraryBase::getId,projectIdList);

From 4a868e3708d0db71b769348b6e657982d9b6d5b3 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 27 Sep 2023 15:29:09 +0800
Subject: [PATCH 187/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ota/service/impl/OtaManageApplyEOServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
index 3d5ba5b49..b13b6f95c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
@@ -1832,7 +1832,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
     public List<Map<String, Object>> getStatisticalStatus(String projectId, String plannedBpLaunchBatch, String cut, List<ProjectLibraryBase> plbEoList) {
         List<Map<String, Object>> result = new ArrayList<>();
         List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
-        if (!plbEoList.isEmpty()) {
+        if (ObjectUtils.isNotEmpty(plbEoList)) {
             projectLibraryBaseList = plbEoList.stream().filter(e -> e.getId().equals(projectId)).collect(Collectors.toList());
         }
         List<OtaManageApplyEO> receiveList = this.getBaseMapper().getListByProjectId(projectId, plannedBpLaunchBatch);

From 5892bbc79f69334ac40ec9476f4f8b16c5c4ceb7 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 27 Sep 2023 15:45:48 +0800
Subject: [PATCH 188/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...formProjectLawsInventoryEOServiceImpl.java | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index 0169059a1..412ed239c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -3955,16 +3955,16 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 		}
 		queryWrapper.orderByDesc("create_time", "serial_number");
 
-		int isProjectRole = Integer.parseInt(projectLawsInventoryEO.getRoleCode());
-		if (isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())
-				&& isProjectRole != Integer.parseInt(ProjectRoleEnum.MANAGER.getValue())
-				&& isProjectRole != Integer.parseInt(ProjectRoleEnum.ADMIN.getValue())) {
-			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-			queryWrapper.and(q -> {
-				q.eq("regulation_owner_id", currentUser.getId()).
-						or().eq("homologation_engineer_id", currentUser.getId());
-			});
-		}
+//		int isProjectRole = Integer.parseInt(projectLawsInventoryEO.getRoleCode());
+//		if (isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())
+//				&& isProjectRole != Integer.parseInt(ProjectRoleEnum.MANAGER.getValue())
+//				&& isProjectRole != Integer.parseInt(ProjectRoleEnum.ADMIN.getValue())) {
+//			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//			queryWrapper.and(q -> {
+//				q.eq("regulation_owner_id", currentUser.getId()).
+//						or().eq("homologation_engineer_id", currentUser.getId());
+//			});
+//		}
 		//导出的数据
 		dataList = this.list(queryWrapper);
 

From 49c675e1eee7369f75d967334710c66df8610981 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 27 Sep 2023 15:52:30 +0800
Subject: [PATCH 189/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ProjectDetails.vue                        | 2 +-
 .../components/settingList.vue                           | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
index 9c8b4c7c5..9d1842670 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
@@ -199,7 +199,7 @@
           projectLibraryId: this.$route.query.id
         }
         downloadFile('/platform/projectLibraryBase/exportProjectProgressStatisticsXls',
-          this.queryForm.projectName+'-'+this.queryForm.projectVersion+'-'+this.$t('projectProgressStatistics') + '.xls', query)
+          this.queryForm.projectNameId+'-'+this.queryForm.projectVersion+'-'+this.$t('projectProgressStatistics') + '.xls', query)
       },
 
       versionStatisticsClick() {
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
index 4833b0c05..f4968da09 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
@@ -115,9 +115,16 @@
       },
       handleOk() {
         if(this.formInline.list){
-          this.formInline.list.forEach(item => {
+          this.formInline.list.forEach((item,index) => {
             item.projectId = this.$route.query.id
+            console.log(item.nodeName)
+            console.log(item.nodeTime)
+            if((item.nodeName == '' || item.nodeName == undefined) && (item.nodeTime == ''| item.nodeTime == undefined)){
+              console.log(index)
+              this.formInline.list.splice(index, 1) // 调用splice方法删除指定的对象
+            }
           })
+          this.formInline.list = this.formInline.list
         }
         this.$refs.ruleForm.validate(valid => {
           if (valid) {

From 613fe0e82b830211938a4701ae1c9b0e5ab396f0 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 27 Sep 2023 15:56:34 +0800
Subject: [PATCH 190/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/projectManagement/components/listOfRegulations.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 5f95c5ba6..a5e7839cd 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -2013,7 +2013,7 @@
             ids.push(item.id)
           })
           flag = '2'
-          this.$refs.associatedplatRef.transferModel(flag,type,ids)
+          this.$refs.associatedplatRef.transferModel(flag,type,ids.join(','))
         }
       },
       associatedplatForm(id,flag,type,ids){

From 62dc5843917a02a56cb51665fa36ec92d8f294fa Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 27 Sep 2023 16:33:15 +0800
Subject: [PATCH 191/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectRegulationTasks/components/projectInformation.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue
index f685a2d3d..f3719541d 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue
@@ -78,7 +78,7 @@
           if (res.success) {
             this.queryForm = res.result[0] || {}
             if (this.queryProject) {
-              this.queryForm = { ...this.queryForm, ...this.queryProject }
+              this.queryForm = { ...this.queryProject, ...this.queryForm }
             }
           } else {
             this.queryForm = {}

From 550658aef16c78c3df882a895095f63ae4700dce Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 27 Sep 2023 16:48:44 +0800
Subject: [PATCH 192/288] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E5=B7=B2?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E7=9A=84=E4=B8=8D=E8=83=BD=E8=B5=B0=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E6=8F=90=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/listOfRegulations.vue          | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index a5e7839cd..bb22e1442 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -2917,17 +2917,17 @@
               dataSource[i].verifyFlowStatus == 'Regulatory engineer returns' ||
               dataSource[i].designFlowStatus == 'List to be released' ||
               dataSource[i].designFlowStatus == 'Regulatory engineer returns') {
-              if(dataSource[i].projectLawsInventoryEOS && (dataSource[i].projectLawsInventoryEOS.length > 0 || dataSource[i].projectLawsInventoryEOS !== null)){
+              // if(dataSource[i].projectLawsInventoryEOS && (dataSource[i].projectLawsInventoryEOS.length > 0 || dataSource[i].projectLawsInventoryEOS !== null)){
                 if (dataSource[i].regulationOwnerId) {
                   this.detailedSuccessList.push(dataSource[i])
                 } else {
                   this.detailedWarningList.push(
                     < div > { dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } < /div>)
                 }
-              }else{
-                this.detailedWarningList.push(
-                  < div > { dataSource[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>)
-              }
+              // }else{
+              //   this.detailedWarningList.push(
+              //     < div > { dataSource[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>)
+              // }
             } else {
               this.detailedWarningList.push(
               < div > { dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected') } < /div>)
@@ -3085,8 +3085,13 @@
               dataSource[i].designFlowStatus == 'List to be checked' ||
               dataSource[i].verifyFlowStatus == 'Duty Person Rejected' ||
               dataSource[i].designFlowStatus == 'Duty Person Rejected') {
-              idList.push(dataSource[i].id)
-              this.rowKeysSuccessList.push(dataSource[i])
+              if (dataSource[i].projectLawsInventoryEOS && (dataSource[i].projectLawsInventoryEOS.length > 0 || dataSource[i].projectLawsInventoryEOS !== null)) {
+                this.detailedWarningList.push(
+                  < div > { dataSource[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>)
+              }else{
+                idList.push(dataSource[i].id)
+                this.rowKeysSuccessList.push(dataSource[i])
+              }
             } else if (dataSource[i].designFlowStatus == 'NA' || dataSource[i].verifyFlowStatus == 'NA') {
               this.detailedWarningList.push(
               < div > { dataSource[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>)

From 51d32188aa199ab46457ea5b16eed0de27f8a7a9 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 27 Sep 2023 17:01:21 +0800
Subject: [PATCH 193/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/project/enums/FlowStateEnum.java  |  2 +-
 .../ProjectLawsInventoryEOServiceImpl.java    | 27 +++++++++++++++----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java
index 2425ed44d..10ba287e5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java
@@ -14,7 +14,7 @@ public enum FlowStateEnum {
     LIST_TO_BE_RELEASED("清单待发布","List to be released","List to be released"),
     LIST_TO_BE_CHECKED("任务待发起","Task to be initiated","List to be checked"),
     REGULATORY_ENGINEER_RETURNS("法规工程师退回","Regulatory engineer returns","Regulatory engineer returns"),
-    REFUSAL_OF_RESPONSIBLE_PERSON("责任人拒绝","Refusal of responsible person","Refusal of responsible person"),
+    REFUSAL_OF_RESPONSIBLE_PERSON("责任人拒绝","Refusal of responsible person","Duty Person Rejected"),
     TASK_TO_BE_CONFIRMED("任务待确认","Task to be confirmed","Task to be confirmed"),
     RESULTS_TO_BE_SUBMITTED("结果待提交","Results to be submitted","Results to be submitted"),
     RESULTS_TO_BE_REVIEWED("结果待审查","Results to be reviewed","Results to be reviewed"),
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 7275e56ff..316f33b3b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -12222,7 +12222,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 				if (StringUtils.isNotEmpty(flowStatus)) {
 					String designFlowStatusName = ComplianceFlowStatusEnum.getTextByValue(flowStatus, cut);
-					projectLawsInventoryEO.setDesignFlowStatusName(designFlowStatusName);
+					if("design".equals(flowFlag)){
+						projectLawsInventoryEO.setDesignFlowStatusName(designFlowStatusName);
+					}else{
+						projectLawsInventoryEO.setVerifyFlowStatusName(designFlowStatusName);
+					}
 				}
 
 				//发起人.
@@ -12242,7 +12246,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					String finalDutyId = dutyId;
 					String designDutyName = sysUsers.stream().filter(e -> finalDutyId.equals(e.getId())).
 							map(SysUser::getUsername).collect(Collectors.joining(","));
-					projectLawsInventoryEO.setDesignDutyIdName(designDutyName);
+					if("design".equals(flowFlag)){
+						projectLawsInventoryEO.setDesignDutyIdName(designDutyName);
+					}else{
+						projectLawsInventoryEO.setVerifyDutyIdName(designDutyName);
+					}
 				} else {
 					projectLawsInventoryEO.setDesignDutyIdName("");
 				}
@@ -12256,8 +12264,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 				if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())) {
 					String fileName = this.editService.getFileName(projectLawsInventoryEO, fileInfos, projectLawsInventoryEO.getDesignDeliverableTemplate());
-					if (org.apache.commons.lang3.StringUtils.isNotBlank(fileName)) {
-						projectLawsInventoryEO.setDesignDeliverableTemplateName(fileName);
+					if (StringUtils.isNotBlank(fileName)) {
+						if("design".equals(flowFlag)){
+							projectLawsInventoryEO.setDesignDeliverableTemplateName(fileName);
+						}else{
+							projectLawsInventoryEO.setVerifyDeliverableTemplateName(fileName);
+						}
 					}
 				}
 				//交付物类型
@@ -12270,7 +12282,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				if (StringUtils.isNotBlank(deliverableType)) {
 					List<String> designDeliverableTypeList = Arrays.asList(deliverableType.split(","));
 					String name = getTreeName(cut, categoryList, designDeliverableTypeList);
-					projectLawsInventoryEO.setDesignDeliverableTypeName(name);
+					if("design".equals(flowFlag)){
+						projectLawsInventoryEO.setDesignDeliverableTypeName(name);
+					}else{
+						projectLawsInventoryEO.setVerifyDeliverableTypeName(name);
+					}
+
 				}
 
 				//责任领域

From b31e9e4382c79219e853dfbd9bd42f5bca160d00 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 27 Sep 2023 17:04:06 +0800
Subject: [PATCH 194/288] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BA=93-=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-=E5=8B=BE?=
 =?UTF-8?q?=E9=80=89=E4=B8=80=E6=9D=A1=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D=E6=88=90=E5=8A=9F=E5=90=8E=EF=BC=8C=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E8=AF=AD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/projectManagement/components/listOfRegulations.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index bb22e1442..822b1ad18 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -2037,7 +2037,7 @@
           this.visibleoperation = msg
           this.visibleoperationFailed = true
         }else{
-          this.$message.warning(this.$t('OperationSuccessful'))
+          this.$message.success(this.$t('OperationSuccessful'))
           this.$refs.associatedplatRef.handleCancel()
           this.$refs.associatedplattwoRef.handleCancel()
           this.selectedRowKeys = []

From f283e510a090be3f08040d758b87f697dfb4d91a Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 27 Sep 2023 17:29:39 +0800
Subject: [PATCH 195/288] =?UTF-8?q?=20=E5=B9=B3=E5=8F=B0=E4=BB=B6--?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PlatformProjectLibraryBaseServiceImpl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
index b9533899f..515b9be66 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
@@ -2520,7 +2520,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 		this.exportRegulatoryManagement(workbook,params);
 		this.exportCertificationManagement(workbook,params);
 		this.exportParameterCollecting(workbook,params);
-		this.exportOtaCollecting(workbook,params);
+//		this.exportOtaCollecting(workbook,params);
 		try {
 			response.setHeader("Content-Disposition",
 					"attachment; filename=" + fileName);

From a575eab2b747f54f01bec2ec18e64552f786731c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 27 Sep 2023 17:30:17 +0800
Subject: [PATCH 196/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../documentComparison/index.vue              |  6 ++++-
 .../views/virtualAuthenticationList/index.vue | 14 +++++------
 .../certificationListMaintenance.vue          | 23 ++++++++++---------
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue
index f7e13f6ec..a914ffb2e 100644
--- a/jero-web/src/views/documentTools/documentComparison/index.vue
+++ b/jero-web/src/views/documentTools/documentComparison/index.vue
@@ -66,16 +66,20 @@
       >
         <!--         -->
         <span slot="operation" slot-scope="text,record">
-           <a class="text-operation" @click="comparisonResultsClick(record)">{{$t('comparisonResults')}}</a>
+           <a class="text-operation" v-has="'documentComparison:comparisonResult'"
+              @click="comparisonResultsClick(record)">{{$t('comparisonResults')}}</a>
            <a class="text-operation"
+              v-has="'documentComparison:publishOrRevocation'"
               v-if="record.createBy == userInfoQuery.username || administrators"
               @click="subscribe(record)">
             {{!record.releaseState || record.releaseState == 'draft' ? $t('release') :$t('withdraw')}}
            </a>
           <a class="text-operation"
+             v-has="'documentComparison:edit'"
              v-if="(record.createBy == userInfoQuery.username || administrators) && record.releaseState == 'draft'"
              @click="edit(record)">{{$t('edit')}}</a>
           <a class="text-operation"
+             v-has="'documentComparison:delete'"
              v-if="(record.createBy == userInfoQuery.username || administrators) && record.releaseState == 'draft'"
              @click="deleteData(record)">{{$t('delete')}}</a>
         </span>
diff --git a/jero-web/src/views/virtualAuthenticationList/index.vue b/jero-web/src/views/virtualAuthenticationList/index.vue
index 809103a57..bc577a8e4 100644
--- a/jero-web/src/views/virtualAuthenticationList/index.vue
+++ b/jero-web/src/views/virtualAuthenticationList/index.vue
@@ -33,11 +33,11 @@
       </a-form>
     </div>
     <div class="table-operator">
-      <div @click="handleAdd" class="operator-text" v-has="'dummyInventoryBase:add'">
+      <div @click="handleAdd" class="operator-text" v-has="'certificationList:add'">
         <a-icon type="plus"/>
         {{$t('newlyAdded')}}
       </div>
-      <div @click="handleDel" class="operator-text" v-has="'dummyInventoryBase:deleteBatch'">
+      <div @click="handleDel" class="operator-text" v-has="'certificationList:batchDelete'">
         <a-icon type="delete"/>
         {{$t('BatchDelete')}}
       </div>
@@ -61,26 +61,26 @@
       <span slot="operation" slot-scope="text,record">
 <!--          v-if="record.createBy == userData.username || administrators"-->
            <a class="text-operation" @click="edit(record)"
-              v-has="'dummyInventoryBase:deleteBatch'"
+              v-has="'certificationList:edit'"
               :disabled="record.state == 1?true:false">{{$t('edit')}}</a>
         <!--          v-if="record.createBy == userData.username || administrators"-->
            <a class="text-operation"
-              v-has="'dummyInventoryBase:issue'"
+              v-has="'certificationList:publishOrRevocation'"
               @click="withdraw(record)">
              {{!record.state || record.state == 2 ? $t('release') : $t('withdraw')}}
            </a>
         <!--          v-if="record.createBy == userData.username || administrators"-->
            <a class="text-operation" :disabled="record.state == 1?true:false"
-              v-has="'dummyInventoryBase:deleteBatch'"
+              v-has="'certificationList:maintenanceList'"
               @click="maintenanceList(record)">{{$t('maintenanceList')}}</a>
            <a class="text-operation"
-              v-has="'dummyInventoryBase:read'"
+              v-has="'certificationList:subscribeOrUnsubscribe'"
               @click="subscribe(record)">
                {{!record.readFlag || record.readFlag == 0 ? $t('subscribe') :$t('CancelSubscribe')}}
            </a>
         <!--          v-if="record.createBy == userData.username || administrators"-->
            <a class="text-operation" :disabled="record.state == 1?true:false"
-              v-has="'dummyInventoryBase:deleteBatch'"
+              v-has="'certificationList:delete'"
               @click="deleteLib(record)">{{$t('deleteLib')}}</a>
         </span>
     </a-table>
diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
index 974aacf88..2cbaa8960 100644
--- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
+++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
@@ -7,7 +7,7 @@
         </span>
       </div>
       <div class="Virtual-detail-right">
-        <div @click="UpdateLogClick" v-has="'dummyLog:page'" class="operator-text-text"
+        <div @click="UpdateLogClick" v-has="'maintainMarketList:updateLog'" class="operator-text-text"
              style="margin-right: 37px;cursor: pointer"
              :title="$t('UpdateLog')">
           <a-icon type="reload"/>
@@ -123,7 +123,7 @@
             <!--              {{$t('DocumentStandard')}}-->
             <!--            </div>-->
             <!--                        v-if="isTrue"-->
-            <div v-if="isTrue" class="operator-text" v-has="'dummyInventoryInfo:importData'">
+            <div v-if="isTrue" class="operator-text" v-has="'maintainMarketList:Import'">
               <ImportFile :url="url" :authDummyInventoryBaseId="$route.query.id" :isTrue="true"
                           @getList="getPersonnelList"
                           :accept="'.zip'"/>
@@ -132,14 +132,14 @@
             <!--            v-if="isTrue"-->
             <div @click="handleModule"
                  v-if="isTrue"
-                 v-has="'dummyInventoryInfo:exportTemplate'"
+                 v-has="'maintainMarketList:templateDownload'"
                  class="operator-text">
               <a-icon type="download"/>
               {{$t('templateDownload')}}
             </div>
             <!--            导出-->
             <div @click="handleExport"
-                 v-has="'dummyInventoryInfo:exportData'"
+                 v-has="'maintainMarketList:export'"
                  class="operator-text">
               <a-icon type="export" :rotate="-90"/>
               {{$t('export')}}
@@ -148,7 +148,7 @@
             <!--            v-if="isTrue"-->
             <div v-if="isTrue"
                  @click="transferClick"
-                 v-has="'dummyInventoryInfo:copyInfoByIds'"
+                 v-has="'maintainMarketList:transfer'"
                  class="operator-text">
               <a-icon type="profile"/>
               {{$t('Transfer')}}
@@ -157,7 +157,7 @@
             <!--            v-if="isTrue"-->
             <div v-if="isTrue"
                  @click="handleAdd"
-                 v-has="'dummyInventoryInfo:add'"
+                 v-has="'maintainMarketList:add'"
                  class="operator-text">
               <a-icon type="plus"/>
               {{$t('add')}}
@@ -166,7 +166,7 @@
             <!--            v-if="isTrue"-->
             <div @click="copyClick"
                  v-if="isTrue"
-                 v-has="'dummyInventoryInfo:copyInfoByIds'"
+                 v-has="'maintainMarketList:copy'"
                  class="operator-text">
               <a-icon type="copy"/>
               {{$t('copy')}}
@@ -175,7 +175,7 @@
             <!--            v-if="isTrue"-->
             <div v-if="isTrue"
                  @click="batSettingClick"
-                 v-has="'dummyInventoryInfo:setBatch'"
+                 v-has="'maintainMarketList:batchSetting'"
                  class="operator-text">
               <a-icon type="setting"/>
               {{$t('batSetting')}}
@@ -184,7 +184,7 @@
             <!--            v-if="isTrue"-->
             <div @click="handleDel"
                  v-if="isTrue"
-                 v-has="'dummyInventoryInfo:deleteBatch'"
+                 v-has="'maintainMarketList:batchDelete'"
                  class="operator-text">
               <a-icon type="delete"/>
               {{$t('BatchDelete')}}
@@ -248,14 +248,15 @@
               <span slot="operation" slot-scope="text,record">
                 <a v-if="isTrue"
                    class="text-operation"
-                   v-has="'dummyInventoryInfo:edit'"
+                   v-has="'maintainMarketList:edit'"
                    @click="edit(record)">{{$t('edit')}}</a>
                 <a v-if="isTrue"
                    class="text-operation"
-                   v-has="'dummyInventoryInfo:deleteBatch'"
+                   v-has="'maintainMarketList:delete'"
                    @click="deleteLib(record)">{{$t('deleteLib')}}</a>
                 <a v-if="isFalse"
                    class="text-operation"
+                   v-has="'maintainMarketList:view'"
                    @click="view(record)">{{$t('view')}}</a>
               </span>
 

From e880f299ad08685267b29521deab9639148e6cfd Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 27 Sep 2023 17:50:08 +0800
Subject: [PATCH 197/288] =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92--=E8=AE=BE=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PlatformTaskPlanningEOServiceImpl.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java
index ca1985b85..eb4e6032c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java
@@ -43,12 +43,18 @@ public class PlatformTaskPlanningEOServiceImpl extends ServiceImpl<PlatformTaskP
 	@Override
     public void addBatch(List<PlatformTaskPlanningEO> platformTaskPlanningEOList) {
 		if(!platformTaskPlanningEOList.isEmpty()){
+			//先删除在新增
+//			LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			LambdaQueryWrapper<PlatformTaskPlanningEO> wrapper = new LambdaQueryWrapper<>();
+//			wrapper.eq(PlatformTaskPlanningEO::getCreateBy,loginUser.getUsername());
+			wrapper.eq(PlatformTaskPlanningEO::getProjectId,platformTaskPlanningEOList.get(0).getProjectId());
+			this.remove(wrapper);
 			for (PlatformTaskPlanningEO platformTaskPlanningEO : platformTaskPlanningEOList) {
 				Date now = new Date();
 				platformTaskPlanningEO.setCreateTime(now);
 				platformTaskPlanningEO.setUpdateTime(now);
 			}
-			saveOrUpdateBatch(platformTaskPlanningEOList);
+			saveBatch(platformTaskPlanningEOList);
 		}
     }
 

From 2093e0d7b87e3ecfd376d4a1bd9e030e30236bce Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 27 Sep 2023 18:04:20 +0800
Subject: [PATCH 198/288] =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PlatformTaskPlanningEOServiceImpl.java   | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java
index eb4e6032c..3ee5b2e4d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java
@@ -6,6 +6,7 @@ import com.jero.modules.platform.entity.PlatformTaskPlanningEO;
 import com.jero.modules.platform.mapper.PlatformTaskPlanningEOMapper;
 import com.jero.modules.platform.service.IPlatformTaskPlanningEOService;
 import com.jero.modules.project.enums.PlanStatusEnum;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.stereotype.Service;
 
 import java.text.ParseException;
@@ -126,12 +127,14 @@ public class PlatformTaskPlanningEOServiceImpl extends ServiceImpl<PlatformTaskP
 			platformTaskPlanningEO.setName(platformTaskPlanningEO.getNodeName());
 			platformTaskPlanningEO.setTime(platformTaskPlanningEO.getNodeTime());
 			platformTaskPlanningEO.setG(false);
-			if(platformTaskPlanningEO.getNodeTime().after(date)){
-				platformTaskPlanningEO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
-			}else if(platformTaskPlanningEO.getNodeTime().before(date)){
-				platformTaskPlanningEO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
-			}else{
-				platformTaskPlanningEO.setStatus(PlanStatusEnum.ON_GOING.getValue());
+			if(ObjectUtils.isNotEmpty(platformTaskPlanningEO.getNodeTime())){
+				if(platformTaskPlanningEO.getNodeTime().after(date)){
+					platformTaskPlanningEO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
+				}else if(platformTaskPlanningEO.getNodeTime().before(date)){
+					platformTaskPlanningEO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
+				}else{
+					platformTaskPlanningEO.setStatus(PlanStatusEnum.ON_GOING.getValue());
+				}
 			}
 		}
 		return taskPlanningEOList;

From ce5ba36d094548ccaa9f0ad276ff6409a4be17d4 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 27 Sep 2023 18:37:50 +0800
Subject: [PATCH 199/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E4=B8=BA=E9=80=89=E6=95=B0=E6=8D=AE=E6=97=B6=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java   | 2 +-
 .../service/impl/ProjectLibraryBaseServiceImpl.java       | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 316f33b3b..889883d41 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -11677,7 +11677,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		return pageList;
 	}
 
-	private void platformDispose(ProjectLawsInventoryEO projectLawsInventoryEO, List<ProjectLawsInventoryEO> result) {
+	public void platformDispose(ProjectLawsInventoryEO projectLawsInventoryEO, List<ProjectLawsInventoryEO> result) {
 		List<String> valueList = FlowStateEnum.getValueInfo();
 		List<LawsInventoryPlatformEO> lawsInventoryPlatformEOList = new ArrayList<>();
 		List<ProjectLawsInventoryEO> projectLawsInventoryEOS = new ArrayList<>();
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index e7288fcd9..cf2c10e3a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -1449,11 +1449,14 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		String cut = (String) params.get("cut");//
 		String projectLibraryIds = (String) params.get("projectLibraryIds");//法规清单id
 		String platformProjectLibraryIds = (String) params.get("platformProjectLibraryIds");//平台件法规id
-
 		//法规清单数据
 		LambdaQueryWrapper<ProjectLawsInventoryEO> wrapper = new LambdaQueryWrapper<>();
 		wrapper.in(ProjectLawsInventoryEO::getId,Arrays.asList(projectLibraryIds.split(",")));
 		List<ProjectLawsInventoryEO> lawsInventoryEOList = projectLawsInventoryEOService.list(wrapper);
+
+		ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO();
+		projectLawsInventoryEOTemp.setCut(cut);
+		projectLawsInventoryEOService.platformDispose(projectLawsInventoryEOTemp,lawsInventoryEOList);
 		//只有法规的设计符合性确认和验证符合性确认中的流程状态均为清单待发布的时候，才能关联平台件数据
 		lawsInventoryEOList = lawsInventoryEOList.stream()
 				.filter(e->ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue().equals(e.getDesignFlowStatus())
@@ -1484,8 +1487,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 			//serialNumber dutyTerritory
 			String serialNumber = projectLawsInventoryEO.getSerialNumber();
 			String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
-			String subtitle = projectLawsInventoryEO.getSubtitle();
-
+			String subtitle = StringUtils.isNotEmpty(projectLawsInventoryEO.getSubtitle()) ? projectLawsInventoryEO.getSubtitle() : "";;
 			//责任领域
 			List<String> list = new LinkedList<>();
 			if(StringUtils.isNotBlank(dutyTerritory)){

From 75045db5272b04c0473c40dc4b394d8ee82ce702 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 27 Sep 2023 19:24:41 +0800
Subject: [PATCH 200/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=EF=BC=8C=E5=B9=B3=E5=8F=B0=E4=BB=B6=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessHistoryEOServiceImpl.java     | 31 +++++++++++++++++--
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java
index 85c46b992..25d315360 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java
@@ -2,15 +2,21 @@ package com.jero.modules.wkflow.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
+import com.jero.modules.project.entity.LawsInventoryPlatformEO;
+import com.jero.modules.project.entity.ProjectLawsInventoryEO;
 import com.jero.modules.project.enums.CertificationFlowNodeEnum;
 import com.jero.modules.project.enums.OperatorTypeEnum;
 import com.jero.modules.project.enums.RequestSourceEnum;
 import com.jero.modules.project.enums.ReviewResultEnum;
+import com.jero.modules.project.service.impl.LawsInventoryPlatformEOServiceImpl;
+import com.jero.modules.project.service.impl.ProjectLawsInventoryEOServiceImpl;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.todoCenter.entity.ProcessInfoEO;
@@ -23,18 +29,17 @@ import com.jero.modules.wkflow.enums.FlowTypeEnum;
 import com.jero.modules.wkflow.mapper.ProcessHistoryEOMapper;
 import com.jero.modules.wkflow.service.IProcessHistoryEOService;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 /**
  * @Description: 流程历史表
  * @Author: jero-boot
@@ -50,6 +55,10 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl<ProcessHistoryEOMap
 	private IProcessInfoEOService processInfoEOService;
 	@Autowired
 	private IOSSFileService ossFileService;
+	@Autowired
+	private LawsInventoryPlatformEOServiceImpl lawsInventoryPlatformEOService;
+	@Autowired
+	private ProjectLawsInventoryEOServiceImpl projectLawsInventoryEOService;
 
 	/**
 	 * 保存
@@ -296,6 +305,22 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl<ProcessHistoryEOMap
 		if (StringUtils.isEmpty(projectLawsInventoryId)) {
 			throw new JeroBootException("法规清单id不能为空！");
 		}
+		//查询是否关联平台件
+		LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(LawsInventoryPlatformEO::getLawsInventoryId,projectLawsInventoryId);
+		List<LawsInventoryPlatformEO> platformEOList = lawsInventoryPlatformEOService.list(wrapper);
+
+		//List<String> valueList = FlowStateEnum.getValueInfo();
+		List<ProjectLawsInventoryEO> lawsInventoryEOList = new ArrayList<>();
+		if(ObjectUtils.isNotEmpty(platformEOList)){
+			List<String> lawsInventoryIdList = platformEOList.stream()
+					.map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).distinct().collect(Collectors.toList());
+			lawsInventoryEOList = projectLawsInventoryEOService.listByIds(lawsInventoryIdList);
+			if(ObjectUtils.isNotEmpty(lawsInventoryEOList)){
+				projectLawsInventoryId = lawsInventoryEOList.get(0).getId();
+			}
+		}
+
 		String flowType = (String) params.get("flowType");
 		List<String> flowTypeList = new ArrayList<>();
 		flowTypeList.add(flowType);

From c03c978717ead3d5060cff3f4da1c6bd77595491 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 27 Sep 2023 20:11:25 +0800
Subject: [PATCH 201/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5-=E5=A4=84=E7=90=86=E6=B3=95=E8=A7=84=E5=B7=A5?=
 =?UTF-8?q?=E7=A8=8B=E5=B8=88=E5=92=8C=E5=B7=A5=E7=A8=8B=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...formProjectLawsInventoryEOServiceImpl.java | 71 ++++++++++++++++++-
 1 file changed, 69 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index 412ed239c..917180cee 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -5440,6 +5440,24 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 		userNameList.addAll(Arrays.asList(verifyDutyIds.split(",")));
 		List<SysUser> sysUserList = this.sysUserService.querySysUserByUserNameList(userNameList);
 
+		List<String> userIdList = new ArrayList<>();
+		if(ObjectUtils.isNotEmpty(dataList)){
+			//regulationOwnerId  engineeringInterfacePerson
+			List<String> collect1 = dataList.stream().filter(e -> StringUtils.isNotBlank(e.getRegulationOwnerId()))
+					.map(ProjectLawsInventoryEO::getRegulationOwnerId).distinct().collect(Collectors.toList());
+			List<String> collect2 = dataList.stream().filter(e -> StringUtils.isNotBlank(e.getEngineeringInterfacePerson()))
+					.map(ProjectLawsInventoryEO::getEngineeringInterfacePerson).distinct().collect(Collectors.toList());
+			if(ObjectUtils.isNotEmpty(collect1)){
+				userIdList.addAll(collect1);
+			}
+			if(ObjectUtils.isNotEmpty(collect2)){
+				userIdList.addAll(collect2);
+			}
+		}
+		List<SysUser> userList = new ArrayList<>();
+		if(ObjectUtils.isNotEmpty(userIdList)){
+			userList = sysUserService.queryUserIdListByNameList(userIdList);
+		}
 		//编号验证
 		verifySerialNumber(dataList, projectLawsInventoryEOTemp, dataSource);
 		for (ProjectLawsInventoryEO projectLawsInventoryEO : dataList) {
@@ -5594,8 +5612,9 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 					if (StringUtils.isNotBlank(regulationOwnerId)) {
 						nameCn = "法规工程师";
 						nameEn = "regulatory engineer";
+						List<SysUser> sysUsers = userList.stream().filter(e -> regulationOwnerId.equals(e.getUsername())).collect(Collectors.toList());
 						//验证人员是否存在
-						personnelVerify(projectLawsInventoryEO, errorMsg, msgList, regulationOwnerId, mapLawList, nameCn, nameEn, ProjectRoleEnum.REGULATI_ENGINEER.getValue());
+						personnelVerifyTemp(projectLawsInventoryEO, errorMsg, msgList, regulationOwnerId, sysUsers, nameCn, nameEn, ProjectRoleEnum.REGULATI_ENGINEER.getValue());
 					}
 
 					//认证工程师
@@ -5611,7 +5630,10 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 						nameCn = "工程接口人";
 						nameEn = "Engineering Interface ";
 						//验证人员是否存在
-						personnelVerify(projectLawsInventoryEO, errorMsg, msgList, engineeringInterfacePerson, mapPersonList, nameCn, nameEn, ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue());
+						List<SysUser> sysUsers = userList.stream().filter(e -> engineeringInterfacePerson.equals(e.getUsername())).collect(Collectors.toList());
+						//验证人员是否存在
+						personnelVerifyTemp(projectLawsInventoryEO, errorMsg, msgList, engineeringInterfacePerson, sysUsers, nameCn, nameEn, ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue());
+//						personnelVerify(projectLawsInventoryEO, errorMsg, msgList, engineeringInterfacePerson, mapPersonList, nameCn, nameEn, ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue());
 					}
 				}
 			}
@@ -6258,6 +6280,51 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 			msgList.add(errorMsg);
 		}
 	}
+	private void personnelVerifyTemp(ProjectLawsInventoryEO projectLawsInventoryEO,
+								 String errorMsg, List<String> msgList,
+								 String regulationOwnerId,
+									 List<SysUser> sysUserList,
+								 String nameCn, String nameEn,
+								 String fieldNumber) {
+		//单选
+		if (regulationOwnerId.contains(",")) {
+			if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+				errorMsg += nameCn + "导入只能填写一个用户名, ";
+			} else {
+				errorMsg += "Only one user name can be entered for" + nameEn + "import, ";
+			}
+			msgList.add(errorMsg);
+		}
+
+		if (ObjectUtils.isNotEmpty(sysUserList)) {
+			if (ProjectRoleEnum.REGULATI_ENGINEER.getValue().equals(fieldNumber)) {
+				projectLawsInventoryEO.setRegulationOwnerId(sysUserList.get(0).getId());
+			} else if (ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(fieldNumber)) {
+				projectLawsInventoryEO.setHomologationEngineerId(sysUserList.get(0).getId());
+			} else if (ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(fieldNumber)) {
+				projectLawsInventoryEO.setEngineeringInterfacePerson(sysUserList.get(0).getId());
+			} else if (ProjectRoleEnum.DESIGNINITIATOR.getValue().equals(fieldNumber)) {
+				projectLawsInventoryEO.setDesignInitiatorId(sysUserList.get(0).getId());
+			} else if (ProjectRoleEnum.DESIGNDUTY.getValue().equals(fieldNumber)) {
+				projectLawsInventoryEO.setDesignDutyId(sysUserList.get(0).getId());
+			} else if (ProjectRoleEnum.PREHOMOINITIATOR.getValue().equals(fieldNumber)) {
+				projectLawsInventoryEO.setPrehomoInitiatorId(sysUserList.get(0).getId());
+			} else if (ProjectRoleEnum.PREHOMODUTY.getValue().equals(fieldNumber)) {
+				projectLawsInventoryEO.setPrehomoDutyId(sysUserList.get(0).getId());
+			} else if (ProjectRoleEnum.VERIFYINITIATOR.getValue().equals(fieldNumber)) {
+				projectLawsInventoryEO.setVerifyInitiatorId(sysUserList.get(0).getId());
+			} else if (ProjectRoleEnum.VERIFYDUTY.getValue().equals(fieldNumber)) {
+				projectLawsInventoryEO.setVerifyDutyId(sysUserList.get(0).getId());
+			}
+		}else{
+			if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) {
+				errorMsg += nameCn + regulationOwnerId + "不存在， ";
+			} else {
+				errorMsg += nameEn + regulationOwnerId + "absent, ";
+			}
+			msgList.add(errorMsg);
+		}
+	}
 
 	private boolean dateVerify(ProjectLawsInventoryEO projectLawsInventoryEO, String errorMsg,
 							   Date field, List<String> msgList,

From fbdb09056df5301a13b5c5531fcd0ba8249b550d Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 27 Sep 2023 20:54:07 +0800
Subject: [PATCH 202/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctCertificationInventoryEOServiceImpl.java | 101 +++++++++++++-----
 1 file changed, 72 insertions(+), 29 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
index 70bc3fe14..a568a77b3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
@@ -4553,11 +4553,11 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 	public void importData(MultipartFile file, ProjectCertificationInventoryEO projectCertificationInventoryEO) {
 		String title = "";
 		if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
-			title = "*类别,*检验项目,*配置项,*认证类型,*WVTA ID," +
+			title = "*类别,*检验项目,*认证类型,*WVTA ID," +
 					"*标准编号,*责任领域,*工程接口人,*责任人," +
 					"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称";
 		}else {
-			title = "*Category,*Inspection Items,*Configuration Item,*Certification Type,*WVTA ID," +
+			title = "*Category,*Inspection Items,*Certification Type,*WVTA ID," +
 					"*Standard No,*Responsible Field,*Eng. Interface,*Assignee," +
 					"Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer";
 		}
@@ -4675,7 +4675,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 								if (i == 0) {
 									cell.setCellType(HSSFCell.CELL_TYPE_STRING);
 									headerSb.append(cell.getStringCellValue() + ",");
-									if(j == 15){
+									if(j == 14){
 										break;
 									}
 								} else if(i > 1){
@@ -4719,7 +4719,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 						ProjectCertificationInventoryEO projectCertificationInventoryEOTemp = JSON.parseObject(JSON.toJSONString(stringStringMap), ProjectCertificationInventoryEO.class);
 						projectCertificationInventoryEOTemp.setCut(projectCertificationInventoryEO.getCut());
 						projectCertificationInventoryEOTemp.setProjectLibraryId(projectCertificationInventoryEO.getProjectLibraryId());
-						projectCertificationInventoryEOTemp.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+						projectCertificationInventoryEOTemp.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
 						projectCertificationInventoryEOTemp.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
 						datas.add(projectCertificationInventoryEOTemp);
 					}
@@ -4746,7 +4746,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 					for(int k = 0 ; k <datas.size(); k++){
 						if(((datas.get(k).getCategory() == null)||(StringUtils.equals("",datas.get(k).getCategory()))) ||
 								((datas.get(k).getInspectionItem() == null)||(StringUtils.equals("",datas.get(k).getInspectionItem()))) ||
-								((datas.get(k).getConfigItem() == null)||(StringUtils.equals("",datas.get(k).getConfigItem()))) ||
+//								((datas.get(k).getConfigItem() == null)||(StringUtils.equals("",datas.get(k).getConfigItem()))) ||
 								((datas.get(k).getWvtaId() == null)||(StringUtils.equals("",datas.get(k).getWvtaId()))) ||
 								((datas.get(k).getSerialNumber() == null)||(StringUtils.equals("",datas.get(k).getSerialNumber()))) ||
 								((datas.get(k).getDutyTerritoryName() == null)||(StringUtils.equals("",datas.get(k).getDutyTerritoryName()))) ||
@@ -4767,7 +4767,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 					for(int k = 0 ; k <datas.size(); k++){
 						if(((datas.get(k).getCategory() == null)||(StringUtils.equals("",datas.get(k).getCategory()))) ||
 								((datas.get(k).getInspectionItem() == null)||(StringUtils.equals("",datas.get(k).getInspectionItem()))) ||
-								((datas.get(k).getConfigItem() == null)||(StringUtils.equals("",datas.get(k).getConfigItem()))) ||
+//								((datas.get(k).getConfigItem() == null)||(StringUtils.equals("",datas.get(k).getConfigItem()))) ||
 								((datas.get(k).getWvtaId() == null)||(StringUtils.equals("",datas.get(k).getWvtaId()))) ||
 								((datas.get(k).getSerialNumber() == null)||(StringUtils.equals("",datas.get(k).getSerialNumber()))) ||
 								((datas.get(k).getDutyTerritoryName() == null)||(StringUtils.equals("",datas.get(k).getDutyTerritoryName()))) ||
@@ -4866,6 +4866,21 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 
 		//编号验证
 		verifySerialNumber(datas,projectCertificationInventoryEOTemp);
+
+		List<String> userIdList = new ArrayList<>();
+		if(ObjectUtils.isNotEmpty(datas)){
+			//sdtName
+			List<String> collect1 = datas.stream().filter(e -> StringUtils.isNotBlank(e.getSdtName()))
+					.map(ProjectCertificationInventoryEO::getSdtName).distinct().collect(Collectors.toList());
+			if(ObjectUtils.isNotEmpty(collect1)){
+				userIdList.addAll(collect1);
+			}
+		}
+		List<SysUser> userList = new ArrayList<>();
+		if(ObjectUtils.isNotEmpty(userIdList)){
+			userList = sysUserService.queryUserIdListByNameList(userIdList);
+		}
+
 		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : datas) {
 			i++;
 			String errorMsg = "";
@@ -4992,7 +5007,9 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 				nameCn = "工程接口人";
 				nameEn = "Eng. Interface ";
 				//验证人员是否存在
-				personnelVerify(projectCertificationInventoryEO, errorMsg, msgList, sdt, mapPersonList,nameCn,nameEn, com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue());
+				List<SysUser> sysUsers = userList.stream().filter(e -> sdt.equals(e.getUsername())).collect(Collectors.toList());
+				personnelVerify(projectCertificationInventoryEO, errorMsg, msgList, sdt, sysUsers,nameCn,nameEn, com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue());
+//				personnelVerify(projectCertificationInventoryEO, errorMsg, msgList, sdt, mapPersonList,nameCn,nameEn, com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue());
 			}
 
 			//责任人
@@ -5294,7 +5311,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 	}
 	private void personnelVerify(ProjectCertificationInventoryEO projectCertificationInventoryEO,
 								 String errorMsg, List<String> msgList, String regulationOwnerId,
-								 List<Map<String, String>> mapList, String nameCn, String nameEn, String fieldNumber) {
+								 List<SysUser> sysUserList, String nameCn, String nameEn, String fieldNumber) {
 		//单选
 		if(regulationOwnerId.contains(",")){
 			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
@@ -5305,35 +5322,61 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 			msgList.add(errorMsg);
 		}
 
-		if(mapList.size() != 0){
-			int count = 0;
-			for (Map<String, String> stringStringMap : mapList) {
-				String name = stringStringMap.get("name");
-				if(regulationOwnerId.equals(name)){
-					count ++;
-					if(com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(fieldNumber)){
-						projectCertificationInventoryEO.setSdt(stringStringMap.get("value"));
-					}
-					break;
-				}
-			}
-			if(count == 0){
-				if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
-					errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配";
-				}else{
-					errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list";
-				}
-				msgList.add(errorMsg);
+		if(ObjectUtils.isNotEmpty(sysUserList)){
+			if(com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(fieldNumber)){
+				projectCertificationInventoryEO.setSdt(sysUserList.get(0).getId());
 			}
 		}else{
 			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
-				errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配";
+				errorMsg += nameCn+regulationOwnerId+"不存在";
 			}else{
-				errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list";
+				errorMsg += nameEn+regulationOwnerId+"absent";
 			}
 			msgList.add(errorMsg);
 		}
 	}
+//	private void personnelVerify(ProjectCertificationInventoryEO projectCertificationInventoryEO,
+//								 String errorMsg, List<String> msgList, String regulationOwnerId,
+//								 List<Map<String, String>> mapList, String nameCn, String nameEn, String fieldNumber) {
+//		//单选
+//		if(regulationOwnerId.contains(",")){
+//			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+//				errorMsg += nameCn + "导入只能填写一个用户名";
+//			}else{
+//				errorMsg += "Only one user name can be entered for"+ nameEn +"import";
+//			}
+//			msgList.add(errorMsg);
+//		}
+//
+//		if(mapList.size() != 0){
+//			int count = 0;
+//			for (Map<String, String> stringStringMap : mapList) {
+//				String name = stringStringMap.get("name");
+//				if(regulationOwnerId.equals(name)){
+//					count ++;
+//					if(com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(fieldNumber)){
+//						projectCertificationInventoryEO.setSdt(stringStringMap.get("value"));
+//					}
+//					break;
+//				}
+//			}
+//			if(count == 0){
+//				if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+//					errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配";
+//				}else{
+//					errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list";
+//				}
+//				msgList.add(errorMsg);
+//			}
+//		}else{
+//			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+//				errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配";
+//			}else{
+//				errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list";
+//			}
+//			msgList.add(errorMsg);
+//		}
+//	}
 
 	private String pullMore(List<SysDictItem> dictItemList, ProjectCertificationInventoryEO projectCertificationInventoryEO,
 							String errorMsg, String value, List<String> msgList,

From 3ffc4a9bfd9385369d2f9a314a38b05f4202e31c Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 27 Sep 2023 23:11:56 +0800
Subject: [PATCH 203/288] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E4=BA=A4=E4=BB=98=E7=89=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ProjectLibraryBaseController.java   | 10 ++++++++++
 .../mapper/xml/ProjectLibraryBaseMapper.xml        | 14 ++++++++++++--
 .../impl/ProjectLibraryBaseServiceImpl.java        |  3 +++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
index 8eff66690..2f4fcbf67 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
@@ -61,6 +61,16 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
 		Page pages = projectLibraryBaseService.getPages(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()), pageList);
 		return Result.OK(params.get("cut").toString(),pages);
 	}
+	@AutoLog(value = "认证清单引用交付物")
+	@ApiOperation(value="认证清单引用交付物", notes="认证清单引用交付物")
+	@PostMapping(value = "/quotePage")
+//	@PostMapping(value = "/page")
+	public Result<?> quotePage(@RequestBody Map<String,Object> params) {
+		params.put("flag","quote");
+		List<ProjectLibraryBase> pageList= projectLibraryBaseService.queryPageList(params);
+		Page pages = projectLibraryBaseService.getPages(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()), pageList);
+		return Result.OK(params.get("cut").toString(),pages);
+	}
 
 	/**
 	 * 勾选法规清单进行关联平台件
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
index 2e5692fe3..82cecb02a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
@@ -66,7 +66,11 @@
         <include refid="select_item"/>
 
         <where>
-            plb.platform is null
+        1=1
+            <if test="params.flag != 'quote'">
+                and plb.platform is null
+            </if>
+
             <if test="params.projectName != null and params.projectName != ''">
                 <!--搜索条件:项目名称,包含%,单独搜索-->
                 <choose>
@@ -128,7 +132,13 @@
                 and plb.brand = #{params.brand}
             </if>
         </where>
-        order by plb.sort desc, plb.create_time desc
+        <if test="params.flag = 'quote'">
+            order by plb.platform, plb.sort desc, plb.create_time desc
+        </if>
+        <if test="params.flag != 'quote'">
+            order by plb.sort desc, plb.create_time desc
+        </if>
+
     </select>
     <select id="queryMaimList" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index cf2c10e3a..977b15d06 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -1084,6 +1084,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	 */
 	@Override
 	public List<ProjectLibraryBase> queryPageList(Map<String,Object> params) {
+		String quote = (String) params.get("quote");
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		Integer isViewer = sysRoleMapper.queryUserRoleByCode(ProjectRoleEnum.VIEWER.getName(), loginUser.getId());
 		Set<String> projectIds = new HashSet<>();
@@ -1148,6 +1149,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 						+ "-" + projectLibraryBase.getYearName()
 						+ "-" + targetMarket
 						+ "-" + projectVersion);
+			}else{
+				projectLibraryBase.setProjectName(projectLibraryBase.getProjectNameId());
 			}
 		}
 

From f5b5921e82094af20eec8ffae1e6d6db2506b370 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 28 Sep 2023 09:10:16 +0800
Subject: [PATCH 204/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95-=E5=BC=95=E7=94=A8=E4=BA=A4?=
 =?UTF-8?q?=E4=BB=98=E7=89=A9=EF=BC=8C=E5=8F=AA=E5=B1=95=E7=A4=BA=E4=BA=86?=
 =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE=E5=BA=93=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificationList/components/referenceDeliverablesList.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/referenceDeliverablesList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/referenceDeliverablesList.vue
index ff924378a..e14a2a026 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/referenceDeliverablesList.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/referenceDeliverablesList.vue
@@ -144,7 +144,7 @@
           ...this.queryParam
         }
         this.loading = true
-        postAction('project/projectLibraryBase/page', query).then((res) => {
+        postAction('project/projectLibraryBase/quotePage', query).then((res) => {
           if (res.success) {
             this.dataList = res.result.records || []
             this.total = res.result.total

From 71a31e83ac8beec1953d6f0ffa6412861145c006 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 28 Sep 2023 09:40:15 +0800
Subject: [PATCH 205/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95-=E5=B7=A5=E7=A8=8B=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BA=BA=E5=9C=A8=E7=BC=96=E8=BE=91=E4=B8=AD=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E6=AD=A3=E5=B8=B8=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/certificationList/components/addModel.vue   | 6 +++---
 .../components/certificationList/index.vue                 | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
index 92905cb59..9fc29bdf5 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
@@ -804,9 +804,9 @@
         if (value.dutyDepart && value.dutyDepart.length > 0) {
           this.getDutyTerritoryOne(value.dutyDepart.join(','))
         }
-        if (value.dutyTerritory && value.dutyTerritory.length > 0) {
-          this.queryPersonByProject(value.dutyTerritory.join(','))
-        }
+        // if (value.dutyTerritory && value.dutyTerritory.length > 0) {
+        //   this.queryPersonByProject(value.dutyTerritory.join(','))
+        // }
         this.getRegulationNo()
         this.title = this.$t('edit')
         this.$nextTick(() => {
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
index 56fd57180..2aee9c74d 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
@@ -1136,8 +1136,9 @@
           let ids = []
           let notConditions = []
           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') {
+            if (this.selectedRowKeysList[i].flowStatus == 'List to be checked' ||
+              this.selectedRowKeysList[i].flowStatus == 'Review and pass'  ||
+              this.selectedRowKeysList[i].flowStatus == 'Duty Person Rejected') {
               ids.push(this.selectedRowKeysList[i].id)
             } else {
               notConditions.push(this.selectedRowKeysList[i].inspectionItem)
@@ -1145,7 +1146,7 @@
           }
           let data = ''
           if (notConditions && notConditions.length > 0) {
-            data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataWithProcessStatusDeleted')
+            data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataProcessStatusDeleted')
           }
           if (ids && ids.length > 0) {
             this.$confirm({

From 2f4305f41fc02c0b6d85850b6f46bccd1c6989f5 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 28 Sep 2023 09:52:34 +0800
Subject: [PATCH 206/288] =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...PlatformProjectLibraryBaseServiceImpl.java | 63 ++++++++++++-------
 .../PlatformTaskPlanningEOServiceImpl.java    |  2 +
 2 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
index 515b9be66..dd8e7a866 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
@@ -2519,7 +2519,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 		HSSFWorkbook workbook = new HSSFWorkbook();
 		this.exportRegulatoryManagement(workbook,params);
 		this.exportCertificationManagement(workbook,params);
-		this.exportParameterCollecting(workbook,params);
+//		this.exportParameterCollecting(workbook,params);
 //		this.exportOtaCollecting(workbook,params);
 		try {
 			response.setHeader("Content-Disposition",
@@ -2775,23 +2775,37 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 	 */
 	private void exportCertificationManagement(HSSFWorkbook workbook,Map<String,Object> params){
 		String cut = (String) params.get("cut");
+//		String sheetName = "认证活动管理";
+//		String firstTitle = "认证任务确认," +
+//				"Pre-Homo," +
+//				"认证进度";
+//		String secondTitle = "责任领域（一级）," +
+//				"未发起,待确认,接受,拒绝,完成度," +
+//				"未发起,待确认,审查通过,审查退回,完成度," +
+//				"未开始,进行中,实验通过,实验失败,部件报告未上传,部件报告已上传,部件报告已入库,完成度";
+//		if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+//			sheetName = "Certification Activity Management";
+//			firstTitle = "Authentication task confirmation," +
+//					"Pre-Homo," +
+//					"Certification progress";
+//			secondTitle = "Area of responsibility (level 1)," +
+//					"Not launched,To be confirmed,Accept,Refuse,Degree of completion," +
+//					"Not launched,To be confirmed,Review of the adoption,Review return,Degree of completion," +
+//					"Not started,In progress,Experiment passed,Experiment failed,Parts report not uploaded,Parts report uploaded,Parts report in stock,Degree of completion";
+//		}
 		String sheetName = "认证活动管理";
 		String firstTitle = "认证任务确认," +
-				"Pre-Homo," +
-				"认证进度";
+				"Pre-Homo";
 		String secondTitle = "责任领域（一级）," +
 				"未发起,待确认,接受,拒绝,完成度," +
-				"未发起,待确认,审查通过,审查退回,完成度," +
-				"未开始,进行中,实验通过,实验失败,部件报告未上传,部件报告已上传,部件报告已入库,完成度";
+				"未发起,待确认,审查通过,审查退回,完成度";
 		if(StringUtils.equals(cut,CutEnum.EN.getValue())){
 			sheetName = "Certification Activity Management";
 			firstTitle = "Authentication task confirmation," +
-					"Pre-Homo," +
-					"Certification progress";
+					"Pre-Homo";
 			secondTitle = "Area of responsibility (level 1)," +
 					"Not launched,To be confirmed,Accept,Refuse,Degree of completion," +
-					"Not launched,To be confirmed,Review of the adoption,Review return,Degree of completion," +
-					"Not started,In progress,Experiment passed,Experiment failed,Parts report not uploaded,Parts report uploaded,Parts report in stock,Degree of completion";
+					"Not launched,To be confirmed,Review of the adoption,Review return,Degree of completion";
 		}
 		HSSFSheet sheet = workbook.createSheet(sheetName);
 
@@ -2800,10 +2814,10 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 		sheet.addMergedRegion(region1);
 		CellRangeAddress region2 = new CellRangeAddress(0, 0, 6, 10);
 		sheet.addMergedRegion(region2);
-		CellRangeAddress region3 = new CellRangeAddress(0, 0, 11, 18);
-		sheet.addMergedRegion(region3);
-		CellRangeAddress region4 = new CellRangeAddress(0, 0, 19, 23);
-		sheet.addMergedRegion(region4);
+//		CellRangeAddress region3 = new CellRangeAddress(0, 0, 11, 18);
+//		sheet.addMergedRegion(region3);
+//		CellRangeAddress region4 = new CellRangeAddress(0, 0, 19, 23);
+//		sheet.addMergedRegion(region4);
 
 		String[] firstTitleArr = firstTitle.split(",");
 		String[] secondTitleArr = secondTitle.split(",");
@@ -2812,7 +2826,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 
 		CellStyle cellStyleTitle = workbook.createCellStyle();
 		cellStyleTitle.setAlignment(HorizontalAlignment.CENTER);
-		for (int i = 0; i <= 18; i++){
+		for (int i = 0; i <= 10; i++){
 			sheet.setColumnWidth(i, 3500);
 			Cell firstRowCell = firstRow.createCell(i);
 			firstRowCell.setCellStyle(cellStyleTitle);
@@ -2822,9 +2836,10 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 				firstRowCell.setCellValue(firstTitleArr[1]);
 			}else if(i==11){
 				firstRowCell.setCellValue(firstTitleArr[2]);
-			}else if(i==19){
-				firstRowCell.setCellValue(firstTitleArr[3]);
 			}
+//			else if(i==19){
+//				firstRowCell.setCellValue(firstTitleArr[3]);
+//			}
 			Cell secondRowCell = secondRow.createCell(i);
 			secondRowCell.setCellValue(secondTitleArr[i]);
 		}
@@ -2943,20 +2958,20 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 		double certificationProgressSubmitAmount = (double) certificationProgressSubmitMap.get("amount");
 		Map<String, Object> certificationProgressStoredMap = (Map<String, Object>)certificationProgressMap.get(CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue());
 		double certificationProgressStoredAmount = (double) certificationProgressStoredMap.get("amount");
-		dataRow.createCell(11).setCellValue(certificationProgressNotStartAmount);
-		dataRow.createCell(12).setCellValue(certificationProgressInProgressAmount);
-		dataRow.createCell(13).setCellValue(certificationProgressTestPassedAmount);
-		dataRow.createCell(14).setCellValue(certificationProgressTestFailedAmount);
-		dataRow.createCell(15).setCellValue(certificationProgressNotSubmitAmount);
-		dataRow.createCell(16).setCellValue(certificationProgressSubmitAmount);
-		dataRow.createCell(17).setCellValue(certificationProgressStoredAmount);
+//		dataRow.createCell(11).setCellValue(certificationProgressNotStartAmount);
+//		dataRow.createCell(12).setCellValue(certificationProgressInProgressAmount);
+//		dataRow.createCell(13).setCellValue(certificationProgressTestPassedAmount);
+//		dataRow.createCell(14).setCellValue(certificationProgressTestFailedAmount);
+//		dataRow.createCell(15).setCellValue(certificationProgressNotSubmitAmount);
+//		dataRow.createCell(16).setCellValue(certificationProgressSubmitAmount);
+//		dataRow.createCell(17).setCellValue(certificationProgressStoredAmount);
 		double certificationProgressCount = certificationProgressNotStartAmount + certificationProgressInProgressAmount
 				+ certificationProgressTestPassedAmount + certificationProgressTestFailedAmount
 				+ certificationProgressNotSubmitAmount + certificationProgressSubmitAmount
 				+ certificationProgressStoredAmount;
 		double certificationProgressPercentage = (certificationProgressTestPassedAmount / certificationProgressCount) * 100;
 		String certificationProgressPercentageStr = (certificationProgressPercentage != 0 && (certificationProgressCount !=0 )) ? df.format(certificationProgressPercentage) : "0";
-		dataRow.createCell(18).setCellValue(certificationProgressPercentageStr + percentSign);
+//		dataRow.createCell(18).setCellValue(certificationProgressPercentageStr + percentSign);
 	}
 
 	/**
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java
index 3ee5b2e4d..c66620ffa 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java
@@ -13,6 +13,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 平台件合规认证计划
@@ -137,6 +138,7 @@ public class PlatformTaskPlanningEOServiceImpl extends ServiceImpl<PlatformTaskP
 				}
 			}
 		}
+		taskPlanningEOList = taskPlanningEOList.stream().filter(e->ObjectUtils.isNotEmpty(e.getNodeTime())).collect(Collectors.toList());
 		return taskPlanningEOList;
     }
 }

From c2aa29efb3660696ab44388eff09f4c4b4d0983a Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 28 Sep 2023 10:02:45 +0800
Subject: [PATCH 207/288] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=A1=B9=E7=9B=AE=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PlatformProjectLawsInventoryEOServiceImpl.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index 917180cee..772cb72a5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -10676,6 +10676,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 			map.put("uuid",problemManagementEO.getId());
 			map.put("id",problemManagementEO.getId());
 			map.put("flag",DataEnum.NEW.getValue());
+			map.put("projectId",problemManagementEO.getProjectId());
 
 			List<DictModel> dictModelList = problemTypeList.stream().filter(e -> e.getValue().equals(problemManagementEO.getProblemType())).collect(Collectors.toList());
 

From 47b5c99cfb6829e5e30a32b9b843d6211c3eca59 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 28 Sep 2023 10:05:19 +0800
Subject: [PATCH 208/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=AF=A6=E6=83=85--=E8=AE=BE=E5=AE=9A=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=A4=9A=E4=B8=AA=E7=A9=BA=E6=95=B0=E6=8D=AE=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E7=A1=AE=E5=AE=9A=EF=BC=8C=E6=97=B6=E9=97=B4=E8=BD=B4?=
 =?UTF-8?q?=E4=B8=8D=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/settingList.vue                | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
index f4968da09..1c64a71b0 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
@@ -17,9 +17,14 @@
               <a-col :span="12">
                 <div class="box-title-text">
                   <div class="title-text">
+                    <span class="Required">*</span>
                     <span class="title-text-text" :title="$t('Nodename')">{{$t('Nodename')}}</span>
                   </div>
-                  <a-form-model-item class="itemModel">
+                  <a-form-model-item class="itemModel"
+                                     :prop="'list.'+index+'.nodeName'"
+                                     :rules="[{ required:true,
+                                     message: $t('Nodename') + $t('cannotEmpty'), trigger: 'blur'}]"
+                  >
                     <a-input class="box-input"
                              v-model="item.nodeName"
                              :maxLength="200"
@@ -114,20 +119,17 @@
         })
       },
       handleOk() {
-        if(this.formInline.list){
-          this.formInline.list.forEach((item,index) => {
-            item.projectId = this.$route.query.id
-            console.log(item.nodeName)
-            console.log(item.nodeTime)
-            if((item.nodeName == '' || item.nodeName == undefined) && (item.nodeTime == ''| item.nodeTime == undefined)){
-              console.log(index)
-              this.formInline.list.splice(index, 1) // 调用splice方法删除指定的对象
-            }
-          })
-          this.formInline.list = this.formInline.list
-        }
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
+            if(this.formInline.list){
+              this.formInline.list.forEach((item,index) => {
+                item.projectId = this.$route.query.id
+                if((item.nodeName == '' || item.nodeName == undefined) && (item.nodeTime == ''| item.nodeTime == undefined)){
+                  this.formInline.list.splice(index, 1) // 调用splice方法删除指定的对象
+                }
+              })
+              this.formInline.list = this.formInline.list
+            }
             let query = {
               ...this.formInline,
               // projectId: this.$route.query.id

From 1ce9e4768f15a262ecf6f8cd7bc7bf800f4db61b Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 28 Sep 2023 10:35:17 +0800
Subject: [PATCH 209/288] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E5=A2=9E=E5=88=A0=E6=94=B9=E7=9A=84=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctCertificationDirectoryEOServiceImpl.java | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java
index 014883c0d..31bce9294 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java
@@ -59,7 +59,7 @@ public class ProjectCertificationDirectoryEOServiceImpl extends ServiceImpl<Proj
 	 */
 	@Override
     public void add(ProjectCertificationDirectoryEO projectCertificationDirectoryEO) {
-		checkData(projectCertificationDirectoryEO.getProjectLibraryId(),null,projectCertificationDirectoryEO.getCut());
+		checkDataLaws(projectCertificationDirectoryEO.getProjectLibraryId(),null,projectCertificationDirectoryEO.getCut());
         Date now = new Date();
         projectCertificationDirectoryEO.setCreateTime(now);
         projectCertificationDirectoryEO.setUpdateTime(now);
@@ -75,7 +75,7 @@ public class ProjectCertificationDirectoryEOServiceImpl extends ServiceImpl<Proj
 	 */
 	@Override
     public void editById(ProjectCertificationDirectoryEO projectCertificationDirectoryEO) {
-		checkData(projectCertificationDirectoryEO.getProjectLibraryId(),projectCertificationDirectoryEO.getId(),projectCertificationDirectoryEO.getCut());
+		checkDataLaws(projectCertificationDirectoryEO.getProjectLibraryId(),projectCertificationDirectoryEO.getId(),projectCertificationDirectoryEO.getCut());
     	Date now = new Date();
         projectCertificationDirectoryEO.setUpdateTime(now);
     	saveOrUpdate(projectCertificationDirectoryEO);
@@ -90,7 +90,7 @@ public class ProjectCertificationDirectoryEOServiceImpl extends ServiceImpl<Proj
 	@Override
     public void deleteById(String id,String cut) {
 		ProjectCertificationDirectoryEO projectCertificationDirectoryEO = queryById(id);
-		checkData(projectCertificationDirectoryEO.getProjectLibraryId(),id,cut);
+		checkDataLaws(projectCertificationDirectoryEO.getProjectLibraryId(),id,cut);
         removeById(id);
     }
 
@@ -257,4 +257,23 @@ public class ProjectCertificationDirectoryEOServiceImpl extends ServiceImpl<Proj
 //		}
 		return true;
 	}
+	/**
+	 * 验证数据权限，只有法规工程师，并且创建人是当前登陆人，才能进行增、删、改操作。
+	 * @return
+	 */
+	public boolean checkDataLaws(String projectLibraryId,String id,String cut){
+		int roleCode = checkUserRole(projectLibraryId);
+		if(roleCode != Integer.parseInt(ProjectRoleEnum.REGULATI_ENGINEER.getValue())
+				&& roleCode != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())
+				&& roleCode != Integer.parseInt(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){
+			String message = "";
+			if(StringUtils.equals(cut, CutEnum.CN.getValue())){
+				message = "没有权限操作，只有法规工程师才可以操作。";
+			}else if(StringUtils.equals(cut, CutEnum.EN.getValue())){
+				message = "Only regulatory engineer can perform this operation.";
+			}
+			throw new JeroBootException(message);
+		}
+		return true;
+	}
 }

From fcf32c46765d429c579e8b8dc80beb634c56e1b4 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 28 Sep 2023 10:45:35 +0800
Subject: [PATCH 210/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5--=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=BB=BB=E5=8A=A1=E5=BE=85=E5=8F=91=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PlatformProjectLawsInventoryEOServiceImpl.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index 772cb72a5..409dde28c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -4556,8 +4556,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 						projectLawsInventoryEOTemp.setProjectLibraryId(projectLawsInventoryEO.getProjectLibraryId());
 						projectLawsInventoryEOTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
 						projectLawsInventoryEOTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
-						projectLawsInventoryEOTemp.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
-						projectLawsInventoryEOTemp.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+						projectLawsInventoryEOTemp.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
+						projectLawsInventoryEOTemp.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
 						datas.add(projectLawsInventoryEOTemp);
 					}
 				}

From a852f53e9973fc5632cb192611083a7df72c79e0 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 28 Sep 2023 10:47:03 +0800
Subject: [PATCH 211/288] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6=E5=90=8E=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=E4=B8=AD=E5=9D=87=E4=B8=8D=E5=8F=AF=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificationList/components/addModel.vue |  9 ++++-
 .../components/listEditModel.vue              | 33 ++++++++++++++++---
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
index 573f45019..633656b76 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
@@ -57,6 +57,7 @@
                 </div>
                 <a-form-model-item class="itemModel" prop="wvtaId">
                   <a-input class="box-input"
+                           :disabled="flowdisabled"
                            v-model.trim="formInline.wvtaId"
                            :placeholder="$t('PleaseEnter')+'WVTA ID'"/>
                 </a-form-model-item>
@@ -359,6 +360,7 @@
                     prop="category"
                   >
                     <a-input class="box-input"
+                             :disabled="flowdisabled"
                              v-model.trim="formInline.category"
                              :placeholder="$t('PleaseEnter')+$t('category')"/>
                   </a-form-model-item>
@@ -373,6 +375,7 @@
                   <a-form-model-item class="itemModel"
                                      :prop="'inspectionItem'">
                     <a-input class="box-input"
+                             :disabled="flowdisabled"
                              v-model.trim="formInline.inspectionItem"
                              :placeholder="$t('PleaseEnter')+$t('inspectionItems')"/>
                   </a-form-model-item>
@@ -392,6 +395,7 @@
                   >
                     <a-input class="box-input"
                              v-model.trim="formInline.configItem"
+                             :disabled="flowdisabled"
                              :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>
                     <!--                    <j-dict-select-tag class="box-input" v-model="formInline.configItem"-->
                     <!--                                       @input="handleInput('configItem')"-->
@@ -415,6 +419,7 @@
                     <j-multi-select-tag class="box-input" v-model="formInline.attestationType"
                                         :placeholder="$t('PleaseSelect')+$t('certificationType')"
                                         :type="'select'"
+                                        :disabled="flowdisabled"
                                         :triggerChange="false"
                                         :dictCode="'ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2'"/>
                   </a-form-model-item>
@@ -434,6 +439,7 @@
                     <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
                               class="box-input"
                               optionFilterProp="label"
+                              :disabled="flowdisabled"
                               @change="DutyDepartChangeOne"
                               mode="multiple"
                               :getPopupContainer="triggerNode=> triggerNode.parentNode"
@@ -464,6 +470,7 @@
                               class="box-input"
                               optionFilterProp="label"
                               mode="multiple"
+                              :disabled="flowdisabled"
                               @change="handleChange"
                               :getPopupContainer="triggerNode=> triggerNode.parentNode"
                               v-model="formInline.dutyTerritory">
@@ -876,7 +883,7 @@
           this.queryPersonByProject(value.dutyTerritory.join(','))
         }
         console.log(value)
-        if(value.projectCertificationInventoryEOS && (value.projectCertificationInventoryEOS.length > 0 || value.projectCertificationInventoryEOS == null)){
+        if(value.projectCertificationInventoryEOS && (value.projectCertificationInventoryEOS.length > 0 || value.projectCertificationInventoryEOS != null)){
           this.flowdisabled = true
           this.$refs.uploadFile.disabled = true
         }
diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index 4542416a6..cedc088b7 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -18,7 +18,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="serialNumber">
                 <a-input class="box-input"
-                         :disabled="false"
+                         :disabled="this.dataList && this.dataList.length > 0?true:false"
                          v-model="formInline.serialNumber"
                          :placeholder="$t('PleaseEnter')+$t('standard')"/>
               </a-form-model-item>
@@ -31,6 +31,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="title">
                 <a-input class="box-input"
+                         :disabled="this.dataList && this.dataList.length > 0?true:false"
                          v-model="formInline.title"
                          :placeholder="$t('PleaseEnter')+$t('title')"/>
               </a-form-model-item>
@@ -45,6 +46,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="subtitle">
                 <a-input class="box-input"
+                         :disabled="this.dataList && this.dataList.length > 0?true:false"
                          v-model="formInline.subtitle"
                          :placeholder="$t('PleaseEnter')+$t('subtitle')"/>
               </a-form-model-item>
@@ -58,6 +60,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="applicableSupplement">
                 <a-input class="box-input"
+                         :disabled="this.dataList && this.dataList.length > 0?true:false"
                          v-model="formInline.applicableSupplement"
                          :placeholder="$t('PleaseEnter')+$t('applicableSupplement')"/>
               </a-form-model-item>
@@ -75,6 +78,7 @@
                 <j-multi-select-tag class="box-input" v-model="formInline.attestationType"
                                     :placeholder="$t('PleaseSelect')+$t('certificationType')"
                                     :type="'select'"
+                                    :disabled="this.dataList && this.dataList.length > 0?true:false"
                                     :triggerChange="false" :dictCode="'attestation_type'"/>
               </a-form-model-item>
             </div>
@@ -90,6 +94,7 @@
                 <j-multi-select-tag class="box-input" v-model="formInline.attestationRank"
                                     :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
                                     :type="'select'"
+                                    :disabled="this.dataList && this.dataList.length > 0?true:false"
                                     :triggerChange="false" :dictCode="'attestation_rank'"/>
               </a-form-model-item>
             </div>
@@ -109,7 +114,7 @@
                           optionFilterProp="label"
                           @change="DutyDepartChange"
                           mode="multiple"
-                          :disabled="formInline.roleCodeIndex == 0 ? false : true"
+                          :disabled="isdata(this.formInline)"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           v-model="formInline.dutyDepart">
                   <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
@@ -137,7 +142,7 @@
                           optionFilterProp="label"
                           mode="multiple"
                           @change="dutyTerritoryChange"
-                          :disabled="formInline.roleCodeIndex == 0 ? false : true"
+                          :disabled="isdata(this.formInline)"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           v-model="formInline.dutyTerritory">
                   <a-select-option v-for="(item, key) in dutyTerritoryList"
@@ -169,7 +174,7 @@
               <a-form-model-item class="itemModel" :prop="'regulationOwnerId'">
                 <a-select :placeholder="$t('PleaseSelect')+$t('regulatoryEngineer')"
                           class="box-input"
-                          :disabled="formInline.roleCodeIndex == 0 ? false : true"
+                          :disabled="isdata(this.formInline)"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           allowClear
                           v-model="formInline.regulationOwnerId">
@@ -194,6 +199,7 @@
                 <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
                           class="box-input"
                           allowClear
+                          :disabled="this.dataList && this.dataList.length > 0 ? true : false"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           v-model="formInline.engineeringInterfacePerson">
                   <a-select-option v-for="(item, key) in engineeringInterfacePersonList"
@@ -218,7 +224,7 @@
                 <a-textarea
                   style="width: 100%"
                   :placeholder="$t('PleaseEnter')+$t('remarks')"
-                  :disabled="false"
+                  :disabled="this.dataList && this.dataList.length > 0?true:false"
                   v-model="formInline.remark" :rows="4"/>
               </a-form-model-item>
             </div>
@@ -887,6 +893,23 @@
           return true
         }
       },
+      isdata(val) {
+        // if (val.designFlowStatus == 'Task to be confirmed' || val.designFlowStatus == 'Results to be submitted' ||
+        //   val.designFlowStatus == 'Results to be reviewed') {
+        //   return true
+        // } else {
+        //   return false
+        // }
+        if (val.roleCodeIndex == '0') {
+          if(this.dataList && this.dataList.length > 0) {
+            return true
+          }else{
+            return false
+          }
+        } else {
+          return false
+        }
+      },
       isEditVerifi(val) {
         // if (val.verifyFlowStatus == 'Task to be confirmed' || val.verifyFlowStatus == 'Results to be submitted' ||
         //   val.verifyFlowStatus == 'Results to be reviewed') {

From 95ad465998057cf6cdcc57ee463336879d9d76fe Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 28 Sep 2023 11:06:33 +0800
Subject: [PATCH 212/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  2 +
 jero-web/src/common/lang/zh-cn.js             |  2 +
 .../components/listOfRegulations.vue          | 72 +++++++++----------
 3 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 77f5bc836..22bd59663 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -955,6 +955,7 @@ module.exports = {
   modelName: 'Model Name',
   modelYear: 'Model Year',
   NoteConfirmTheChange: 'Note: After resetting, the status of the selected items will be changed to To Be Released and the historical data will disappear. Please confirm whether to reset',
+  NoteConfirmTheChangeplatform:'Note: After the reset, the selected item data will be changed to the task ready state, and the historical data will disappear. Please confirm whether to reset the process',
   onlyDataChanged: 'Only data with task confirmation status of Accepted can be changed',
   inquiry: 'Inquiry',
   ConfirmationDeadline: 'Confirm Deadline',
@@ -1119,6 +1120,7 @@ module.exports = {
   pleaseSelectinitiatedOrRejected: 'Please select the data whose design compliance confirmation process status is List Pending Release, Regulatory Engineer Returned or Verification Compliance Confirmation Process status is List Pending Release, Regulatory Engineer Returned',
   TheEngineerAndCertification: 'The Homo Engineer cannot be empty',
   pleaseSelectTheDataverificationVerified:'Please select the data whose design compliance confirmation process status is List Pending Verification, Responsible Person Rejected, or Verification Compliance Confirmation process status is List Pending Verification, Responsible Person Rejected',
+  pleaseSelectTheDataverification:'Select the data whose status of the design conformance verification process is Task ready to start and the responsible person rejects it, or the verification conformance verification process is list to be checked and the responsible person rejects it',
   theResponsiblePersonAndDeadlineClank: 'The responsible person and deadline of cannot be blank',
   bringInTheProjectInterface: 'Assign to Owner',
   theCurrentListSaved: 'The current list data has been submitted and cannot be temporarily saved',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 892faa965..13bbd7e5c 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -968,6 +968,7 @@ module.exports = {
   modelName: '车型名称',
   modelYear: '年款',
   NoteConfirmTheChange: '注意：重置后所选条目数据将变为清单待发布状态，历史数据将消失，请确认是否进行流程重置',
+  NoteConfirmTheChangeplatform: '注意：重置后所选条目数据将变为任务待发起状态，历史数据将消失，请确认是否进行流程重置',
   onlyDataChanged: '只能变更任务确认状态为接受的数据',
   inquiry: '询问',
   ConfirmationDeadline: '确认截止时间',
@@ -2621,6 +2622,7 @@ module.exports = {
   dataConfirmation: '请选择清单确认状态为未发起或拒绝的数据,以及法规工程师、认证工程师不为空',
   pleaseSelectinitiatedOrRejected: '请选择设计符合性确认流程状态为清单待发布、法规工程师退回或验证符合性确认流程状态为清单待发布、法规工程师退回的数据',
   pleaseSelectTheDataverificationVerified: '请选择设计符合性确认流程状态为清单待校核、责任人拒绝或验证符合性确认流程状态为清单待校核、责任人拒绝的数据',
+  pleaseSelectTheDataverification: '请选择设计符合性确认流程状态为任务待发起、责任人拒绝或验证符合性确认流程状态为清单待校核、责任人拒绝的数据',
   TheEngineerAndCertification: '的法规工程师不能为空',
   taskDataConfirmation: '请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据,以及工程接口人不为空',
   theProjectContactEmpty: '的工程接口人不能为空',
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
index c6241d136..07adf9468 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
@@ -204,10 +204,10 @@
                 {{ $t('add') }}
               </div>
               <!--              复制-->
-              <div @click="copyClick('lawsInventoryStudioCopy')" class="operator-text-title">
-                <a-icon type="copy"/>
-                {{ $t('copy') }}
-              </div>
+<!--              <div @click="copyClick('lawsInventoryStudioCopy')" class="operator-text-title">-->
+<!--                <a-icon type="copy"/>-->
+<!--                {{ $t('copy') }}-->
+<!--              </div>-->
               <!--              批量删除-->
               <div @click="handleDel" class="operator-text-title">
                 <a-icon type="delete"/>
@@ -224,10 +224,10 @@
                             @getList="getPersonnelList"/>
               </div>
               <!--              导出-->
-              <div @click="handleExport" v-has="'projectLawsInventory:exportData'" class="operator-text-title">
-                <a-icon type="export" :rotate="-90"/>
-                {{ $t('export') }}
-              </div>
+<!--              <div @click="handleExport" v-has="'projectLawsInventory:exportData'" class="operator-text-title">-->
+<!--                <a-icon type="export" :rotate="-90"/>-->
+<!--                {{ $t('export') }}-->
+<!--              </div>-->
               <!--              定版-->
               <div class="operator-text-title" @click="fixedPlateClick">
                 <a-icon type="pushpin"/>
@@ -239,10 +239,10 @@
                 {{ $t('compliancereport') }}
               </div>
               <!--              修改操作人-->
-              <div class="operator-text-title" @click="modifyOperatorClick('studio')">
-                <a-icon type="export" :rotate="-90"/>
-                {{ $t('modifyOperator') }}
-              </div>
+<!--              <div class="operator-text-title" @click="modifyOperatorClick('studio')">-->
+<!--                <a-icon type="export" :rotate="-90"/>-->
+<!--                {{ $t('modifyOperator') }}-->
+<!--              </div>-->
               <!--              <div class="operator-text-title" @click="batSettingClick">-->
               <!--                <a-icon type="setting" />-->
               <!--                {{ $t('batchSettingInformation') }}-->
@@ -286,10 +286,10 @@
           {{ $t('initiateTask') }}
         </div>
         <!--        退回-->
-        <div class="operator-text" @click="submitOrSendBackClick(1)" v-if="this.roleSwitchingCode == '1'">
-          <a-icon type="close-circle"/>
-          {{ $t('sendBack') }}
-        </div>
+<!--        <div class="operator-text" @click="submitOrSendBackClick(1)" v-if="this.roleSwitchingCode == '1'">-->
+<!--          <a-icon type="close-circle"/>-->
+<!--          {{ $t('sendBack') }}-->
+<!--        </div>-->
         <!--        催办-->
         <div class="operator-text" @click="questionClick"
              v-if="this.roleSwitchingCode == '2' || this.roleSwitchingCode == '1' || this.roleSwitchingCode == '30'">
@@ -602,7 +602,7 @@
       @cancel="handleCancelReset"
     >
       <div class="noteConfirm">
-        {{$t('NoteConfirmTheChange')}}
+        {{$t('NoteConfirmTheChangeplatform')}}
       </div>
       <a-form-model :model="formInlineReset" class="formAdd" :rules="rulesRoleReset"
                     ref="ruleFormReset">
@@ -1372,16 +1372,16 @@
           // }
         ],
         listOptions: [
-          {
-            value: 'List to be released',
-            key: 'List to be released',
-            label: this.$t('listToBeReleased')
-          },
-          {
-            value: 'Regulatory engineer returns',
-            key: 'Regulatory engineer returns',
-            label: this.$t('regulatoryEngineerReturns')
-          },
+          // {
+          //   value: 'List to be released',
+          //   key: 'List to be released',
+          //   label: this.$t('listToBeReleased')
+          // },
+          // {
+          //   value: 'Regulatory engineer returns',
+          //   key: 'Regulatory engineer returns',
+          //   label: this.$t('regulatoryEngineerReturns')
+          // },
           {
             value: 'Duty Person Rejected',
             key: 'Duty Person Rejected',
@@ -2012,10 +2012,10 @@
               idList.push(contentList[i].id)
             } else if (contentList[i].designFlowStatus == 'NA' || contentList[i].verifyFlowStatus == 'NA') {
               detailedWarningList.push(
-              < div > { contentList[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
+              < div > { contentList[i].serialNumber + this.$t('pleaseSelectTheDataverification') } < /div>)
             } else {
               detailedWarningList.push(
-              < div > { contentList[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
+              < div > { contentList[i].serialNumber + this.$t('pleaseSelectTheDataverification') } < /div>)
             }
           }
 
@@ -2276,7 +2276,7 @@
         let _this = this
         this.$confirm({
           width: 760,
-          content: _this.$t('NoteConfirmTheChange'),
+          content: _this.$t('NoteConfirmTheChangeplatform'),
           onOk() {
             let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
             postAction('/platform/projectLawsInventoryEO/change', {
@@ -2944,10 +2944,10 @@
               this.rowKeysSuccessList.push(dataSource[i])
             } else if (dataSource[i].designFlowStatus == 'NA' || dataSource[i].verifyFlowStatus == 'NA') {
               this.detailedWarningList.push(
-              < div > { dataSource[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
+              < div > { dataSource[i].serialNumber + this.$t('pleaseSelectTheDataverification') } < /div>)
             } else {
               this.detailedWarningList.push(
-              < div > { dataSource[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
+              < div > { dataSource[i].serialNumber + this.$t('pleaseSelectTheDataverification') } < /div>)
             }
           }
           if (idList && idList.length > 0) {
@@ -3029,10 +3029,10 @@
             }
           } else if (dataList[i].designFlowStatus == 'NA') {
             _this.detailedWarningList.push(
-            < div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
+            < div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverification') } < /div>)
           } else {
             _this.detailedWarningList.push(
-            < div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
+            < div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverification') } < /div>)
           }
           if (dataList[i].verifyFlowStatus == 'List to be checked' || dataList[i].verifyFlowStatus == 'Duty Person Rejected') {
             if (dataList[i].verifyDeliverableType && dataList[i].verifyDutyId && dataList[i].verifyDueDate) {
@@ -3050,10 +3050,10 @@
             }
           } else if (dataList[i].verifyFlowStatus == 'NA') {
             _this.detailedWarningList.push(
-            < div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
+            < div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverification') } < /div>)
           } else {
             _this.detailedWarningList.push(
-            < div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
+            < div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverification') } < /div>)
           }
         }
         if (this.requestsNum == 0) {

From 2036747adfdba6fdfe000220d6c391d7bafc54f9 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 28 Sep 2023 11:36:38 +0800
Subject: [PATCH 213/288] =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E4=BB=B6=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-=E8=B4=A3?=
 =?UTF-8?q?=E4=BB=BB=E4=BA=BA=E5=AF=B9=E4=BB=BB=E5=8A=A1=E5=BE=85=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E7=9A=84=E6=95=B0=E6=8D=AE=E8=BF=9B=E8=A1=8C=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=97=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E4=B8=BA=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/certificationList/index.vue    | 128 +++++++++++++++---
 .../components/listOfRegulations.vue          |  20 ++-
 2 files changed, 126 insertions(+), 22 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index f9b9692ff..91c1a32d1 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -1528,7 +1528,12 @@
           let notConditions = []
           for (let i = 0; i < this.selectedRowKeysList.length; i++) {
             if (this.selectedRowKeysList[i].flowStatus == 'List to be checked') {
-              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)
             }
@@ -1587,7 +1592,12 @@
                 this.selectedRowKeysList[i].flowStatus == 'Engineer return' ||
                 this.selectedRowKeysList[i].flowStatus == 'Results to be reviewed' ||
                 this.selectedRowKeysList[i].flowStatus == 'Review and return') {
-                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)
               }
@@ -1605,7 +1615,12 @@
               if (this.selectedRowKeysList[i].flowStatus == 'Task to be confirmed' ||
                 this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' ||
                 this.selectedRowKeysList[i].flowStatus == 'Review and return') {
-                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)
               }
@@ -1623,7 +1638,12 @@
               if (this.selectedRowKeysList[i].flowStatus == 'Task to be confirmed' ||
                 this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' ||
                 this.selectedRowKeysList[i].flowStatus == 'Review and return') {
-                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)
               }
@@ -1818,7 +1838,12 @@
             for (let i = 0; i < this.selectedRowKeysList.length; i++) {
               if (this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) {
                 if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted') {
-                  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)
                 }
@@ -1829,7 +1854,12 @@
           } else {
             for (let i = 0; i < this.selectedRowKeysList.length; i++) {
               if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted') {
-                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)
               }
@@ -1865,7 +1895,12 @@
             if (this.selectedRowKeysList[i].flowStatus == 'Task to be confirmed' ||
               this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' ||
               this.selectedRowKeysList[i].flowStatus == 'Review and return') {
-              this.toDoIds.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{
+                this.toDoIds.push(this.selectedRowKeysList[i].id)
+              }
             } else {
               this.toDoNotConditions.push(this.selectedRowKeysList[i].inspectionItem)
             }
@@ -1982,10 +2017,20 @@
             if (this.selectedRowKeysList[i].flowStatus == 'List to be checked' ||
               this.selectedRowKeysList[i].flowStatus == 'Refusal of responsible person') {
               if (this.selectedRowKeysList[i].deliverableType == '1635545748968783874') {
-                NAId.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{
+                  NAId.push(this.selectedRowKeysList[i].id)
+                }
               } else if (this.selectedRowKeysList[i].dutyPerson && this.selectedRowKeysList[i].deliverableType &&
                 this.selectedRowKeysList[i].sdt && this.selectedRowKeysList[i].endTime) {
-                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)
               }
@@ -2025,7 +2070,12 @@
           for (let i = 0; i < this.selectedRowKeysList.length; i++) {
             if (this.selectedRowKeysList[i].flowStatus == 'List to be checked' ||
               this.selectedRowKeysList[i].flowStatus == 'Refusal of responsible person') {
-              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)
             }
@@ -2055,7 +2105,12 @@
           let notConditions = []
           for (let i = 0; i < this.selectedRowKeysList.length; i++) {
             if (this.selectedRowKeysList[i].flowStatus == 'Task to be confirmed') {
-              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)
             }
@@ -2084,7 +2139,12 @@
         for (let i = 0; i < this.selectedRowKeysList.length; i++) {
           if (this.selectedRowKeysList[i].flowStatus == 'Task to be confirmed' &&
             this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) {
-            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)
           }
@@ -2126,7 +2186,12 @@
           for (let i = 0; i < this.selectedRowKeysList.length; i++) {
             if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' ||
               this.selectedRowKeysList[i].flowStatus == 'Review and return') {
-              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)
             }
@@ -2153,7 +2218,12 @@
           if ((this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' ||
             this.selectedRowKeysList[i].flowStatus == 'Review and return') &&
             this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) {
-            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)
           }
@@ -2179,10 +2249,20 @@
           let _this = this
           for (let i = 0; i < this.selectedRowKeysList.length; i++) {
             if (this.selectedRowKeysList[i].flowStatus == 'Results to be reviewed') {
-              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 if (this.selectedRowKeysList[i].flowStatus == 'Review and pass' && value == 'rzgcssc_th') {
-              ids.push(this.selectedRowKeysList[i].id)
-              isTrue = true
+              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)
+                isTrue = true
+              }
             } else {
               notConditions.push(this.selectedRowKeysList[i].inspectionItem)
             }
@@ -2346,9 +2426,19 @@
           for (let i = 0; i < this.selectedRowKeysList.length; i++) {
             if (this.selectedRowKeysList[i].flowStatus == 'Review and pass') {
               if (this.roleSwitchingCode == 20 && this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) {
-                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 if (this.roleSwitchingCode == 21) {
-                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)
               }
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 822b1ad18..2392a3867 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -2149,7 +2149,12 @@
               contentList[i].designFlowStatus == 'List to be checked' ||
               contentList[i].verifyFlowStatus == 'Duty Person Rejected' ||
               contentList[i].designFlowStatus == 'Duty Person Rejected') {
-              idList.push(contentList[i].id)
+              if (contentList[i].projectLawsInventoryEOS && (contentList[i].projectLawsInventoryEOS.length > 0 || contentList[i].projectLawsInventoryEOS !== null)) {
+                detailedWarningList.push(
+                  < div > { contentList[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>)
+              }else{
+                idList.push(contentList[i].id)
+              }
             } else if (contentList[i].designFlowStatus == 'NA' || contentList[i].verifyFlowStatus == 'NA') {
               detailedWarningList.push(
               < div > { contentList[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
@@ -2268,7 +2273,12 @@
                 content[i].designFlowStatus == 'Results to be submitted' ||
                 content[i].verifyFlowStatus == 'Results to be reviewed' ||
                 content[i].designFlowStatus == 'Results to be reviewed') {
-                this.questionIdList.push(content[i].id)
+                if (content[i].projectLawsInventoryEOS && (content[i].projectLawsInventoryEOS.length > 0 || content[i].projectLawsInventoryEOS !== null)) {
+                  this.questionWarning.push(
+                    < div > { content[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>)
+                }else{
+                  this.questionIdList.push(content[i].id)
+                }
               } else {
                 detailedWarningList.push(content[i].serialNumber)
               }
@@ -3459,7 +3469,11 @@
             isVerify = true
           }
           if (isDesign || isVerify) {
-            this.$refs.toResubmitFormRef.getData(dataSource[0], isDesign, isVerify)
+            if (dataSource[0].projectLawsInventoryEOS && (dataSource[0].projectLawsInventoryEOS.length > 0 || dataSource[0].projectLawsInventoryEOS !== null)) {
+              this.$message.warning(dataSource[0].serialNumber + this.$t('platformitemhasbeenassociated'))
+            }else{
+              this.$refs.toResubmitFormRef.getData(dataSource[0], isDesign, isVerify)
+            }
           } else {
             this.$message.warning(this.$t('selectDesignConformanceAsConformance'))
           }

From 2da4375803c4d42d8cb9514690620e2689acff1b Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 28 Sep 2023 11:46:45 +0800
Subject: [PATCH 214/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PlatformProjectLawsInventoryEOServiceImpl.java | 2 +-
 .../project/service/impl/ProjectLawsInventoryEOServiceImpl.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index 409dde28c..ad4ee47d0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -760,7 +760,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 		String contentLog = username + "删除了清单中的“" + serialNumber + "”";
 		String enContentLog = username + " deleted “" + serialNumber + "” from the list";
 		projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId, CutEnum.CN.getValue());
-		projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId, CutEnum.EN.getValue());
+		projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId, CutEnum.EN.getValue());
 		removeByIds(ids);
 		this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(ids);
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 889883d41..65587a46f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -708,7 +708,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		String contentLog = username + "删除了清单中的“" + serialNumber + "”";
 		String enContentLog = username + " deleted “" + serialNumber + "” from the list";
 		projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId, CutEnum.CN.getValue());
-		projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId, CutEnum.EN.getValue());
+		projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId, CutEnum.EN.getValue());
 		removeByIds(ids);
 		this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(ids);
 

From 25b7273c1a1ce43c63537baefbb2c8a27f889374 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 28 Sep 2023 13:59:42 +0800
Subject: [PATCH 215/288] =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E4=BB=B6-=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E6=A8=A1?=
 =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2=EF=BC=8C=E8=8B=B1=E6=96=87=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...latformProjectLawsInventoryEOServiceImpl.java |  6 +++++-
 .../impl/ProjectLibraryBaseServiceImpl.java      | 16 ++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index ad4ee47d0..4fa0795d0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -11619,8 +11619,12 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 				dutyTerritoryStr = dutyTerritorys.stream().map(SysDictItem::getItemValue).distinct().collect(Collectors.joining(","));
 			}
 		}
-
+		String serialNumber = projectLawsInventoryEO.getSerialNumber();
+		projectLawsInventoryEO.setSerialNumber(null);
 		QueryWrapper<ProjectLawsInventoryEO> queryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO, req.getParameterMap());
+		if(StringUtils.isNotBlank(serialNumber)){
+			queryWrapper.lambda().like(ProjectLawsInventoryEO::getSerialNumber,serialNumber);
+		}
 		queryWrapper.orderByDesc("create_time","serial_number");
 
 		if (StringUtils.isNotEmpty(dutyTerritoryStr)) {
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 977b15d06..a1737190b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -1367,10 +1367,16 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 			if(ObjectUtils.isEmpty(projectLawsInventoryEOS)){
 				emptyList.add(projectLawsInventoryEO);
 			}
+			String msg = "";
+			if(CutEnum.CN.getValue().equals(cut)){
+				msg = "在平台件项目中包含多条匹配内容，请选择关联";
+			}else{
+				msg = " multiple matching contents are included in the platform component project, please select association";
+			}
 
 			if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() > 1){
 				map.put("lawsInventoryId",projectLawsInventoryEO.getId());
-				map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+"在平台件项目中包含多条匹配内容，请选择关联");
+				map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+msg);
 				map.put("result",projectLawsInventoryEOS);
 				mapList.add(map);
 			}else if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() == 1){
@@ -1526,10 +1532,16 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 				emptyList.add(projectLawsInventoryEO);
 			}
 
+			String msg = "";
+			if(CutEnum.CN.getValue().equals(cut)){
+				msg = "在平台件项目中包含多条匹配内容，请选择关联";
+			}else{
+				msg = " multiple matching contents are included in the platform component project, please select association";
+			}
 
 			if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() > 1){
 				map.put("lawsInventoryId",projectLawsInventoryEO.getId());
-				map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+"在平台件项目中包含多条匹配内容，请选择关联");
+				map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+msg);
 				map.put("result",projectLawsInventoryEOS);
 				mapList.add(map);
 			}else if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() == 1){

From a7f813040e511ec0d2aab8e1dd3d64fe25de0109 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 28 Sep 2023 13:59:51 +0800
Subject: [PATCH 216/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/projectManagement/components/listEditModel.vue     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index cedc088b7..fbc2945fb 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -1133,6 +1133,7 @@
             if(formInline.dutyDepart){
               formInline.dutyDepart = formInline.dutyDepart.join(',')
             }
+
             if(formInline.dutyTerritory){
               formInline.dutyTerritory = formInline.dutyTerritory.join(',')
             }

From ea64fdea008f75bf00c9046236ca4d4062ae90de Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 28 Sep 2023 14:10:13 +0800
Subject: [PATCH 217/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PlatformProjectLawsInventoryEOServiceImpl.java        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index 4fa0795d0..2cc8f60b9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -11620,6 +11620,9 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 			}
 		}
 		String serialNumber = projectLawsInventoryEO.getSerialNumber();
+		if(StringUtils.isNotBlank(serialNumber) && serialNumber.contains("*")){
+			serialNumber = serialNumber.replaceAll("\\*","");
+		}
 		projectLawsInventoryEO.setSerialNumber(null);
 		QueryWrapper<ProjectLawsInventoryEO> queryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO, req.getParameterMap());
 		if(StringUtils.isNotBlank(serialNumber)){

From b564ccd6be9883b056da6dbdb8585365fffc2cba Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 28 Sep 2023 14:18:57 +0800
Subject: [PATCH 218/288] =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E4=BB=B6=E6=8F=90=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectLibraryBaseServiceImpl.java    | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index a1737190b..d7ca2b6f9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -1367,16 +1367,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 			if(ObjectUtils.isEmpty(projectLawsInventoryEOS)){
 				emptyList.add(projectLawsInventoryEO);
 			}
-			String msg = "";
-			if(CutEnum.CN.getValue().equals(cut)){
-				msg = "在平台件项目中包含多条匹配内容，请选择关联";
-			}else{
-				msg = " multiple matching contents are included in the platform component project, please select association";
-			}
-
 			if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() > 1){
 				map.put("lawsInventoryId",projectLawsInventoryEO.getId());
-				map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+msg);
+				map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle);
 				map.put("result",projectLawsInventoryEOS);
 				mapList.add(map);
 			}else if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() == 1){
@@ -1532,16 +1525,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 				emptyList.add(projectLawsInventoryEO);
 			}
 
-			String msg = "";
-			if(CutEnum.CN.getValue().equals(cut)){
-				msg = "在平台件项目中包含多条匹配内容，请选择关联";
-			}else{
-				msg = " multiple matching contents are included in the platform component project, please select association";
-			}
-
 			if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() > 1){
 				map.put("lawsInventoryId",projectLawsInventoryEO.getId());
-				map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+msg);
+				map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle);
 				map.put("result",projectLawsInventoryEOS);
 				mapList.add(map);
 			}else if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() == 1){

From f4fac0213bd3e9099366187e963c7c4def5b9427 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Thu, 28 Sep 2023 14:28:39 +0800
Subject: [PATCH 219/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/project/mapper/xml/NcrTrackMapper.xml    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
index b3336ee26..8b86952d5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
@@ -91,8 +91,8 @@
             and
         </if>-->
         (
-        design_flow_status =#{ncrTrackVO.inconformity} or design_flow_status =#{ncrTrackVO.track}
-        or verify_flow_status =#{ncrTrackVO.inconformity} or verify_flow_status =#{ncrTrackVO.track}
+        design_flow_status =#{ncrTrackVO.inconformity}
+        or verify_flow_status =#{ncrTrackVO.inconformity}
         )
         <!--(
         design_flow_status =#{ncrTrackVO.inconformity} or design_flow_status =#{ncrTrackVO.track}
@@ -185,8 +185,8 @@
             and
         </if>
         (
-        design_flow_status =#{ncrTrackVO.inconformity} or design_flow_status =#{ncrTrackVO.track}
-        or verify_flow_status =#{ncrTrackVO.inconformity} or verify_flow_status =#{ncrTrackVO.track}
+        design_flow_status =#{ncrTrackVO.inconformity}
+        or verify_flow_status =#{ncrTrackVO.inconformity}
         )
         and pli.duty_territory in
         <foreach collection="list" index="index" item="item" open="(" close=")" separator=",">

From d383d27838638637509ea6b8edb7fac2663cdafd Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 28 Sep 2023 15:10:12 +0800
Subject: [PATCH 220/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E5=92=8C=E8=AE=A4=E8=AF=81=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=85=A5=EF=BC=88=E8=B4=A3=E4=BB=BB=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...atformProjectCertificationInventoryEOServiceImpl.java | 5 +++++
 .../impl/PlatformProjectLawsInventoryEOServiceImpl.java  | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
index a568a77b3..31f23a177 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
@@ -4991,6 +4991,11 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 				value = pullMore(dictItemList, projectCertificationInventoryEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field","duty_territory");
 				if(StringUtils.isNotBlank(value)){
 					projectCertificationInventoryEO.setDutyTerritory(value);
+					List<String> list = Arrays.asList(value.split(","));
+					List<SysDictItem> ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList());
+					List<String> valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList());
+					projectCertificationInventoryEO.setDutyDepart(StringUtils.join(valueList,","));
+
 				}
 			}
 			//工程接口人(责任领域下的工程接口人)
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index 2cc8f60b9..902dcf898 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -5592,6 +5592,15 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 			flag = must(projectLawsInventoryEO, errorMsg, msgList, dutyTerritory, "责任领域", "Responsible Field");
 			if (flag) {
 				value = pullMore(dictItemList, projectLawsInventoryEO, errorMsg, dutyTerritory, msgList, "责任领域", "Responsible Field", DicCodeEnum.DUTY_TERRITORY.getCode());
+
+				if(StringUtils.isNotBlank(value)){
+					projectLawsInventoryEO.setDutyTerritory(value);
+					List<String> list = Arrays.asList(value.split(","));
+					List<SysDictItem> ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList());
+					List<String> valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList());
+					projectLawsInventoryEO.setDutyDepart(StringUtils.join(valueList,","));
+				}
+
 				if (StringUtils.isNotBlank(value)) {
 					//工程接口人(责任领域下的工程接口人)
 					Map<String, Object> objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value);

From 4108fbd48a22e6e9b1a3a78340a6d6e8b28ee1a7 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 28 Sep 2023 15:17:48 +0800
Subject: [PATCH 221/288] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=92=8C=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectCertificationInventoryEOServiceImpl.java     | 4 ++++
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java      | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index b84d9dd84..c9c01689f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -4880,6 +4880,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				value = pullMore(dictItemList, projectCertificationInventoryEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field","duty_territory");
 				if(StringUtils.isNotBlank(value)){
 					projectCertificationInventoryEO.setDutyTerritory(value);
+					List<String> list = Arrays.asList(value.split(","));
+					List<SysDictItem> ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList());
+					List<String> valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList());
+					projectCertificationInventoryEO.setDutyDepart(StringUtils.join(valueList,","));
 				}
 			}
 			//工程接口人(责任领域下的工程接口人)
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 65587a46f..d68ac9d55 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -5522,6 +5522,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			if (flag) {
 				value = pullMore(dictItemList, projectLawsInventoryEO, errorMsg, dutyTerritory, msgList, "责任领域", "Responsible Field", DicCodeEnum.DUTY_TERRITORY.getCode());
 				if (StringUtils.isNotBlank(value)) {
+					List<String> list = Arrays.asList(value.split(","));
+					List<SysDictItem> ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList());
+					List<String> valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList());
+					projectLawsInventoryEO.setDutyDepart(StringUtils.join(valueList,","));
+
 					//工程接口人(责任领域下的工程接口人)
 					Map<String, Object> objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value);
 

From 7c37803d43d29a793b747b257bb1ba7751c3e936 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 28 Sep 2023 15:24:20 +0800
Subject: [PATCH 222/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js | 2 +-
 jero-web/src/common/lang/zh-cn.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 22bd59663..9e94e6906 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1120,7 +1120,7 @@ module.exports = {
   pleaseSelectinitiatedOrRejected: 'Please select the data whose design compliance confirmation process status is List Pending Release, Regulatory Engineer Returned or Verification Compliance Confirmation Process status is List Pending Release, Regulatory Engineer Returned',
   TheEngineerAndCertification: 'The Homo Engineer cannot be empty',
   pleaseSelectTheDataverificationVerified:'Please select the data whose design compliance confirmation process status is List Pending Verification, Responsible Person Rejected, or Verification Compliance Confirmation process status is List Pending Verification, Responsible Person Rejected',
-  pleaseSelectTheDataverification:'Select the data whose status of the design conformance verification process is Task ready to start and the responsible person rejects it, or the verification conformance verification process is list to be checked and the responsible person rejects it',
+  pleaseSelectTheDataverification:'Select the data whose design conformance verification process state is Task ready to start and the responsible person refuses, or verify conformance verification process state is task ready to start and the responsible person refuses',
   theResponsiblePersonAndDeadlineClank: 'The responsible person and deadline of cannot be blank',
   bringInTheProjectInterface: 'Assign to Owner',
   theCurrentListSaved: 'The current list data has been submitted and cannot be temporarily saved',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 13bbd7e5c..2e896649a 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -2622,7 +2622,7 @@ module.exports = {
   dataConfirmation: '请选择清单确认状态为未发起或拒绝的数据,以及法规工程师、认证工程师不为空',
   pleaseSelectinitiatedOrRejected: '请选择设计符合性确认流程状态为清单待发布、法规工程师退回或验证符合性确认流程状态为清单待发布、法规工程师退回的数据',
   pleaseSelectTheDataverificationVerified: '请选择设计符合性确认流程状态为清单待校核、责任人拒绝或验证符合性确认流程状态为清单待校核、责任人拒绝的数据',
-  pleaseSelectTheDataverification: '请选择设计符合性确认流程状态为任务待发起、责任人拒绝或验证符合性确认流程状态为清单待校核、责任人拒绝的数据',
+  pleaseSelectTheDataverification: '请选择设计符合性确认流程状态为任务待发起、责任人拒绝或验证符合性确认流程状态为任务待发起、责任人拒绝的数据',
   TheEngineerAndCertification: '的法规工程师不能为空',
   taskDataConfirmation: '请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据,以及工程接口人不为空',
   theProjectContactEmpty: '的工程接口人不能为空',

From f3e5b3628b0a546923f2b2f46367c0230bb411fe Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 28 Sep 2023 15:30:41 +0800
Subject: [PATCH 223/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95-=E5=88=A0=E9=99=A4=E6=AD=A3?=
 =?UTF-8?q?=E5=9C=A8=E8=B5=B0=E6=B5=81=E7=A8=8B=E7=9A=84=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=EF=BC=8C=E6=8F=90=E7=A4=BA=E8=AF=AD=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/certificationList/index.vue                    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
index 2aee9c74d..ee67a06a4 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
@@ -1138,7 +1138,7 @@
           for (let i = 0; i < this.selectedRowKeysList.length; i++) {
             if (this.selectedRowKeysList[i].flowStatus == 'List to be checked' ||
               this.selectedRowKeysList[i].flowStatus == 'Review and pass'  ||
-              this.selectedRowKeysList[i].flowStatus == 'Duty Person Rejected') {
+              this.selectedRowKeysList[i].flowStatus == 'Refusal of responsible person') {
               ids.push(this.selectedRowKeysList[i].id)
             } else {
               notConditions.push(this.selectedRowKeysList[i].inspectionItem)
@@ -1501,7 +1501,7 @@
       },
       deleteLib(val) {
         let _this = this
-        if (val.flowStatus == 'List to be checked' || val.flowStatus == 'Review and pass' || val.flowStatus == 'Duty Person Rejected') {
+        if (val.flowStatus == 'List to be checked' || val.flowStatus == 'Review and pass' || val.flowStatus == 'Refusal of responsible person') {
           this.$confirm({
             content: _this.$t('ConfirmDelete'),
             onOk() {

From d4e9fcd6dd5b6e6261c6f3345db3abe1079f27f5 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 28 Sep 2023 15:42:39 +0800
Subject: [PATCH 224/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E9=95=BF=E5=BA=A6SQL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index 51b763aec..6df33616f 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -1241,3 +1241,10 @@ CREATE TABLE `laws_inventory_platform`  (
   `platform_laws_inventory_id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '平台件项目库法规清单id',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+--车修改字段长度2023-09-28
+ALTER TABLE `project_certification_directory`
+MODIFY COLUMN `directory_name` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '目录名称' AFTER `project_library_id`,
+MODIFY COLUMN `lot` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '批次' AFTER `directory_name`,
+MODIFY COLUMN `detection_report_location` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '检测报告位置' AFTER `experiment_file`,
+MODIFY COLUMN `explain_info` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '说明' AFTER `detection_report_location`;

From b69fb099d0655aba5f37643eab1eab8b207736a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Thu, 28 Sep 2023 16:29:30 +0800
Subject: [PATCH 225/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9=E5=92=8C=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/project/service/impl/NcrTrackServiceImpl.java    | 5 +++--
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java      | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
index 91c89f8d2..3b16afe41 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
@@ -392,8 +392,9 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
             trackVOList = parameterQuery(ncrTrackVO, trackVOList);
             //表头排序
             heartSort(ncrTrackVO, trackVOList);
-
-
+            for (NcrTrackVO trackVO : trackVOList) {
+                trackVO.setAdministrator(administrator ? "true" : "false");
+            }
             return trackVOList;
         }
     }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index d68ac9d55..7acebb8ff 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -10248,6 +10248,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	@Override
 	public List<Map<String,Object>> queryNotComplianList(Map<String, Object> params) {
+		//如果当前登录用户是系统管理员角色，可以查看所有的数据
+		boolean administrator = this.sysUserService.isAdministrator();
 		String cut = (String) params.get("cut");
 
 		List<String> complianceFlowStatusList = new ArrayList<>();
@@ -10311,6 +10313,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				dataMap.put("createTime",dataMap.get("createTime"));
 				//更新时间
 				dataMap.put("updateTime",dataMap.get("updateTime"));
+				
+				dataMap.put("administrator",administrator ? "true" : "false");
 
 				String dutyTerritory = (String) dataMap.get("dutyTerritory");
 				if(StringUtils.isNotEmpty(dutyTerritory)){
@@ -10436,7 +10440,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		//表头排序
 		heartSort(params, result);
 
-
 		return result;
 	}
 

From e5655ba28bd53c5c302983771b89fb22c1aa178a Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 28 Sep 2023 16:40:57 +0800
Subject: [PATCH 226/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificationList/components/addModel.vue |  1 +
 .../components/certificationList/index.vue    | 31 ++++++++------
 .../components/dealtWith.vue                  |  2 +
 .../components/designCompliance.vue           |  4 ++
 .../components/projectInformation.vue         | 41 ++++++++++++++-----
 5 files changed, 55 insertions(+), 24 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
index 633656b76..d25284a75 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
+++ b/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(',') : []
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 91c1a32d1..80400b7d4 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -1707,19 +1707,24 @@
       deleteLib(val) {
         let _this = this
         if (val.flowStatus == 'List to be released' || val.flowStatus == 'Review and pass') {
-          this.$confirm({
-            content: _this.$t('ConfirmDelete'),
-            onOk() {
-              deleteAction(_this.url.deleteOne, { id: val.id, projectLibraryId: _this.$route.query.id }).then((res) => {
-                if (res.success) {
-                  _this.$message.success(_this.$t('OperationSuccessful'))
-                  _this.getList()
-                } else {
-                  _this.$message.warning(_this.$t('operationFailed'))
-                }
-              })
-            }
-          })
+          console.log(val)
+          if(val.projectCertificationInventoryEOS && (val.projectCertificationInventoryEOS.length > 0 || val.projectCertificationInventoryEOS !== null)){
+            this.$message.warning(val.serialNumber + this.$t('platformitemhasbeenassociated'))
+          }else{
+            this.$confirm({
+              content: _this.$t('ConfirmDelete'),
+              onOk() {
+                deleteAction(_this.url.deleteOne, { id: val.id, projectLibraryId: _this.$route.query.id }).then((res) => {
+                  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'))
         }
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
index 765c8d342..570ee3989 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+++ b/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,
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
index c55695f3e..a5623af7c 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
+++ b/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
             // }
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue
index f3719541d..e88c17ea3 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue
+++ b/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({
-          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')
+        if(this.platform == 'YES'){
+          let newUrl = this.$router.resolve({
+            path: '/platformItemLibraryDetails',
+            query: {
+              id: item.projectLibraryId,
+              projectName: item.projectName+'-'+item.projectVersion,
+              projectNameId: item.projectName,
+              targetMarket: item.targetMarket,
+              studioEngineer: item.studioEngineer
+            }
+          })
+          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')
+        }
+
       },
     }
   }

From 20ea7b8230ed33fe7cfe07c9581f60b6e0b21c8f Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 28 Sep 2023 17:05:42 +0800
Subject: [PATCH 227/288] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E8=B7=9F=E8=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/mapper/xml/NcrTrackMapper.xml     |  4 +++-
 .../service/impl/NcrTrackServiceImpl.java     | 21 ++++++++++++-------
 .../jero/modules/project/vo/NcrTrackVO.java   |  4 ++++
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
index a700a3eaa..b513a9e93 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
+++ b/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
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
index 91c89f8d2..c6ad83b4a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
+++ b/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)){
-                trackVO.setProjectName(projectName+"-"+yearName+"-"+market+"-"+projectVersion);
+            if(StringUtils.isNotBlank(trackVO.getPlatform())){
+                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());
@@ -783,10 +788,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(",")) {
-            List<DictModel> dictModelListTemp = targetMarketList.stream()
-                    .filter(e -> s.equals(e.getValue())).collect(Collectors.toList());
-            dictModelList.addAll(dictModelListTemp);
+        if(StringUtils.isNotBlank(trackVO.getTargetMarket())){
+            for (String s : trackVO.getTargetMarket().split(",")) {
+                List<DictModel> dictModelListTemp = targetMarketList.stream()
+                        .filter(e -> s.equals(e.getValue())).collect(Collectors.toList());
+                dictModelList.addAll(dictModelListTemp);
+            }
         }
         String targetMarket = "";
         if(dictModelList.size() != 0){
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java
index f1f1e1264..fd3b3a862 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java
+++ b/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;
+
 
 
 

From d13e2ee61fd263df47cb5c425e2047d997f26e57 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 28 Sep 2023 17:07:31 +0800
Subject: [PATCH 228/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/projectManagement/components/listEditModel.vue     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index fbc2945fb..eaf7c6f8f 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -1332,6 +1332,7 @@
 
   .formAdd {
     margin-bottom: 40px;
+
   }
 
   .button-text {

From 63bfd2c91c5237e88b9f234c8b4f9bd051b7fb3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Thu, 28 Sep 2023 17:08:27 +0800
Subject: [PATCH 229/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9=E5=92=8C=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java   | 7 ++++---
 .../views/projectManagement/components/nonConformance.vue | 8 +++++---
 .../projectManagement/projectNonConformance/index.vue     | 6 ++++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 7acebb8ff..ecf1766f9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -10313,7 +10313,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				dataMap.put("createTime",dataMap.get("createTime"));
 				//更新时间
 				dataMap.put("updateTime",dataMap.get("updateTime"));
-				
+
 				dataMap.put("administrator",administrator ? "true" : "false");
 
 				String dutyTerritory = (String) dataMap.get("dutyTerritory");
@@ -10431,7 +10431,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 		}
 		//新数据
-		List<Map<String, Object>> mapList = getNewData(params, cut);
+		List<Map<String, Object>> mapList = getNewData(params, cut, administrator);
 		if(ObjectUtils.isNotEmpty(mapList)){
 			result.addAll(mapList);
 		}
@@ -10587,7 +10587,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 	}
 
 	@NotNull
-	private List<Map<String, Object>> getNewData(Map<String, Object> params, String cut) {
+	private List<Map<String, Object>> getNewData(Map<String, Object> params, String cut,boolean administrator) {
 		//新数据
 		LambdaQueryWrapper<ProblemManagementEO> wrapper = new LambdaQueryWrapper<>();
 		wrapper.like(ProblemManagementEO::getProjectId,params.get("projectLibraryId"));
@@ -10659,6 +10659,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			map.put("uuid",problemManagementEO.getId());
 			map.put("id",problemManagementEO.getId());
 			map.put("flag",DataEnum.NEW.getValue());
+			map.put("administrator",administrator ? "true" : "false");
 
 			List<DictModel> dictModelList = problemTypeList.stream().filter(e -> e.getValue().equals(problemManagementEO.getProblemType())).collect(Collectors.toList());
 
diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue
index 70b02c278..808cc8872 100644
--- a/jero-web/src/views/projectManagement/components/nonConformance.vue
+++ b/jero-web/src/views/projectManagement/components/nonConformance.vue
@@ -173,11 +173,11 @@
              @click="detil(record)">
                 {{ $t('See') }}
               </a>
-              <a class="text-operation" v-if="record.flag == 'NEW'" v-has="'ncrTrack:edit'"
-                 @click="edit(record)">
+          <a class="text-operation" v-if="record.flag == 'NEW' && record.createBy == userInfo().username" v-has="'ncrTrack:edit'"
+             @click="edit(record)">
                 {{ $t('edit') }}
               </a>
-              <a class="text-operation" v-if="record.flag == 'NEW'" v-has="'ncrTrack:delete'"
+              <a class="text-operation" v-if="record.flag == 'NEW' && (record.administrator == 'true' || record.createBy == userInfo().username)" v-has="'ncrTrack:delete'"
                  @click="deleteLib(record)">
                 {{ $t('deleteLib') }}
               </a>
@@ -211,6 +211,7 @@ import addModel from './addModelconformance'
 import moment from 'moment'
 import detilModel from './detilModel'
 import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+import { mapGetters } from 'vuex'
 
 export default {
   name: 'projectNonConformance',
@@ -355,6 +356,7 @@ export default {
     }
   },
   methods: {
+    ...mapGetters(['userInfo']),
     getFirstLevelDutyTerritory() {
       getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
         if (res.success) {
diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
index 81519f9a6..cf457048e 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
@@ -173,11 +173,11 @@
              @click="detil(record)">
                 {{ $t('See') }}
               </a>
-              <a class="text-operation" v-if="record.flag == 'NEW'" v-has="'ncrTrack:edit'"
+              <a class="text-operation" v-if="record.flag == 'NEW' && record.createBy == userInfo().username" v-has="'ncrTrack:edit'"
                  @click="edit(record)">
                 {{ $t('edit') }}
               </a>
-              <a class="text-operation" v-if="record.flag == 'NEW'" v-has="'ncrTrack:delete'"
+              <a class="text-operation" v-if="record.flag == 'NEW' && (record.administrator == 'true' || record.createBy == userInfo().username)" v-has="'ncrTrack:delete'"
                  @click="deleteLib(record)">
                 {{ $t('deleteLib') }}
               </a>
@@ -211,6 +211,7 @@
   import detilModel from './moudles/detilModel'
   import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
   import moment from 'moment'
+  import { mapGetters } from 'vuex'
 
   export default {
     name: 'projectNonConformance',
@@ -355,6 +356,7 @@
       }
     },
     methods: {
+      ...mapGetters(['userInfo']),
       getFirstLevelDutyTerritory() {
         getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
           if (res.success) {

From bb062d4eb4394315a6aec5e2f457d40c4cb5a30f Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 28 Sep 2023 17:14:14 +0800
Subject: [PATCH 230/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/projectManagement/components/listEditModel.vue  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index eaf7c6f8f..dac7d0fda 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/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'}]">

From 3ad9f77b93b29ea1061f95584b2d16e81606db3e Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 28 Sep 2023 17:33:03 +0800
Subject: [PATCH 231/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/certificationList/index.vue                 | 7 ++++++-
 .../components/projectInformation.vue                      | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 80400b7d4..bb101e315 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/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)
             }
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue
index e88c17ea3..d7920faa6 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue
@@ -109,7 +109,7 @@
           let newUrl = this.$router.resolve({
             path: '/platformItemLibraryDetails',
             query: {
-              id: item.projectLibraryId,
+              id: item.id,
               projectName: item.projectName+'-'+item.projectVersion,
               projectNameId: item.projectName,
               targetMarket: item.targetMarket,

From bc2f397673fef3f83dd3480a40120c64ecd245e0 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Sat, 7 Oct 2023 11:25:30 +0800
Subject: [PATCH 232/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E7=BC=96=E8=BE=91=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...formProjectLawsInventoryEOServiceImpl.java |   2 +-
 ...ProjectLawsInventoryEOEditServiceImpl.java | 264 +++++++++++++++++-
 2 files changed, 261 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index 902dcf898..4e9c06391 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -569,7 +569,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 
 	@Override
 	public void editById(ProjectLawsInventoryEO projectLawsInventoryEO) {
-		this.editService.editById(projectLawsInventoryEO);
+		this.editService.editByIdPlatform(projectLawsInventoryEO);
 	}
 
 	/**
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/editImpl/ProjectLawsInventoryEOEditServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/editImpl/ProjectLawsInventoryEOEditServiceImpl.java
index 3f12952e8..ffc3b1571 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/editImpl/ProjectLawsInventoryEOEditServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/editImpl/ProjectLawsInventoryEOEditServiceImpl.java
@@ -14,8 +14,21 @@ import com.jero.modules.dummy.util.ListDiff;
 import com.jero.modules.feishu.enums.TemplateInfoEnum2;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
-import com.jero.modules.project.entity.*;
-import com.jero.modules.project.enums.*;
+import com.jero.modules.project.entity.ProjectLawsInventoryEO;
+import com.jero.modules.project.entity.ProjectLibraryBase;
+import com.jero.modules.project.entity.ProjectLibraryRoleRelEO;
+import com.jero.modules.project.entity.ProjectRelatedPersonnel;
+import com.jero.modules.project.entity.ProjectUserPermission;
+import com.jero.modules.project.enums.ComplianceFlowStatusEnum;
+import com.jero.modules.project.enums.InventoryAffirmNodeEnum;
+import com.jero.modules.project.enums.JumpLinkEnum;
+import com.jero.modules.project.enums.PermissionDescriptionEnum;
+import com.jero.modules.project.enums.ProjectInventoryFieldEnum;
+import com.jero.modules.project.enums.ProjectMessageEnum;
+import com.jero.modules.project.enums.ProjectRoleEnum;
+import com.jero.modules.project.enums.ProjectUserLocationEnum;
+import com.jero.modules.project.enums.RoleRelModelTypeEnum;
+import com.jero.modules.project.enums.TaskStatusEnum;
 import com.jero.modules.project.service.IProjectLawsInventoryEOService;
 import com.jero.modules.project.service.IProjectLibraryRoleRelEOService;
 import com.jero.modules.project.service.IProjectUserPermissionService;
@@ -43,14 +56,20 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.SerializationUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
-import org.apache.xmlbeans.impl.xb.xsdschema.Public;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -1248,6 +1267,243 @@ public class ProjectLawsInventoryEOEditServiceImpl {
             throw new JeroBootException("该用户没有权限操作该数据！");
         }
     }
+    public void editByIdPlatform(ProjectLawsInventoryEO projectLawsInventoryEO) {
+        Date now = new Date();
+        LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//        boolean checkResult = checkData(projectLawsInventoryEO.getProjectLibraryId(), currentUser.getId(), projectLawsInventoryEO.getId());
+//        if (checkResult) {
+            QueryWrapper<ProjectLawsInventoryEO> oldPliQueryWrap = new QueryWrapper<>();
+            oldPliQueryWrap.lambda().eq(ProjectLawsInventoryEO::getId, projectLawsInventoryEO.getId());
+            List<ProjectLawsInventoryEO> oldPliEoList = projectLawsInventoryEOService.list(oldPliQueryWrap);
+
+            this.updateProjectLawsInventorySendMessage(projectLawsInventoryEO);
+
+            // 根据法规清单id，获取该法规清单在待办中心的任务明细。
+            List<String> oldPliEoIdList = oldPliEoList.stream().map(ProjectLawsInventoryEO::getId).distinct().collect(Collectors.toList());
+            QueryWrapper<ProcessInfoDetailEO> pidEoQueryWrap = new QueryWrapper<>();
+            pidEoQueryWrap.lambda().in(ProcessInfoDetailEO::getProjectLawsInventoryId, oldPliEoIdList);
+            List<ProcessInfoDetailEO> pidEoList = this.processInfoDetailEOService.list(pidEoQueryWrap);
+            if (CollectionUtils.isNotEmpty(pidEoList)) {
+                // 处理编辑法规工程师的逻辑
+                this.updateRegulationOwner(projectLawsInventoryEO, oldPliEoList, pidEoList);
+                // 处理编辑责任人的逻辑
+                this.updateDutyPerson(projectLawsInventoryEO, oldPliEoList, pidEoList);
+            }
+            // 处理修改设计或验证符合性截止日期的逻辑
+            this.updateDesignOrVerifyEndTime(projectLawsInventoryEO, oldPliEoList);
+
+            projectLawsInventoryEO.setUpdateTime(now);
+            ProjectLawsInventoryEO projectLawsInventoryEOCopy = SerializationUtils.clone(projectLawsInventoryEO);//复制
+
+            //更新log
+            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+            String username = sysUser.getUsername();
+
+            String contentLog = username + "编辑了清单中的“" + projectLawsInventoryEO.getSerialNumber() + "”:</br>";
+            String enContentLog = username + " edited the “" + projectLawsInventoryEO.getSerialNumber() + "” in the list:</br>";
+
+            List<ProjectLawsInventoryEO> infoEOList = new ArrayList<>();
+            infoEOList.add(projectLawsInventoryEO);
+            List<ProjectLawsInventoryEO> infoEOListCopy = new ArrayList<>();
+            infoEOListCopy.add(projectLawsInventoryEOCopy);
+
+            //查询数据库里原来的数据
+            QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
+            List<ProjectLawsInventoryEO> dataList = projectLawsInventoryEOService.list(queryWrapper.eq("id", projectLawsInventoryEO.getId()));
+            List<ProjectLawsInventoryEO> dataListCopy = DeepCopyListUtil.depCopy(dataList);
+            LambdaUpdateWrapper<ProjectLawsInventoryEO> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.in(ProjectLawsInventoryEO::getId, projectLawsInventoryEO.getId());
+            setDateNull(projectLawsInventoryEO, updateWrapper);
+            //保存
+            projectLawsInventoryEOService.update(projectLawsInventoryEO, updateWrapper);
+//			saveOrUpdate(projectLawsInventoryEO);
+
+            //获取编辑中的责任领域
+            List<String> dutyTerritoryList = new ArrayList<>();
+            dutyTerritoryList = Arrays.asList(projectLawsInventoryEO.getDutyTerritory().split(","));
+            dutyTerritoryList = dutyTerritoryList.stream().distinct().collect(Collectors.toList());
+            //获取当前的projectLibrartId
+            String projectLibrartId = projectLawsInventoryEO.getProjectLibraryId();
+            String cut = projectLawsInventoryEO.getCut();
+
+            Map<String, Object> params = new HashMap<>();
+            params.put("projectLibraryId", projectLibrartId);
+            params.put("userId", currentUser.getId());
+            params.put("modelType", RoleRelModelTypeEnum.LAWS_INVENTORY.getValue());
+            ProjectLibraryRoleRelEO projectLibraryRoleRelEO = projectLibraryRoleRelEOService.queryByProjectLibraryIdAndUserId(params);
+            String roleCode1 = projectLibraryRoleRelEO.getRoleCode();
+            //分别获取当前编辑中的设计符合性和认证符合性责任人
+            List<String> designDutyIdList = new ArrayList<>();
+            designDutyIdList = Arrays.asList(projectLawsInventoryEO.getDesignDutyId().split(","));
+            List<String> verifyDutyIdList = new ArrayList<>();
+            verifyDutyIdList = Arrays.asList(projectLawsInventoryEO.getVerifyDutyId().split(","));
+
+            //allDutyList 为法规工程师中验证符合性和确认符合中的责任人
+            List<String> allDutyList = new ArrayList<>();
+            allDutyList.addAll(designDutyIdList);
+            allDutyList.addAll(verifyDutyIdList);
+            allDutyList = allDutyList.stream().distinct().collect(Collectors.toList());
+
+            //获取相关责任领域下的和projectLibrartId的相关人员名单的信息
+            List<ProjectRelatedPersonnel> projectRelatedPersonnelList = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritoy(projectLibrartId, dutyTerritoryList);
+
+            List<String> allList = new ArrayList<>();
+            List<String> enginnerList = new ArrayList<>();
+            List<String> lawEnginnerList = new ArrayList<>();
+            List<String> enginnerLawSetList = new ArrayList<>();
+            List<String> enginnerAttSetList = new ArrayList<>();
+            //根据相关人员名单获取的工程接口人
+            for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) {
+                String enginneringInterfacePerson = relatedPersonnel.getEngineeringInterfacePerson();
+                if (!StringUtils.isEmpty(enginneringInterfacePerson)) {
+                    enginnerList = Arrays.stream(enginneringInterfacePerson.split(",")).collect(Collectors.toList());
+                    allList.addAll(enginnerList);
+                }
+            }
+            //获取相关人员名单中的法规工程师
+            for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) {
+                String lawEngineer = relatedPersonnel.getLawEngineer();
+                if (!StringUtils.isEmpty(lawEngineer)) {
+                    lawEnginnerList = Arrays.stream(lawEngineer.split(",")).collect(Collectors.toList());
+                    allList.addAll(lawEnginnerList);
+                }
+            }
+            //获取相关人员名单中的工程接口-法规工程师设置
+            for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) {
+                String engineerLawSet = relatedPersonnel.getEngineerLawSet();
+                if (!StringUtils.isEmpty(engineerLawSet)) {
+                    enginnerLawSetList = Arrays.stream(engineerLawSet.split(",")).collect(Collectors.toList());
+                    allList.addAll(enginnerLawSetList);
+                }
+            }
+            //获取相关人员名单中的工程接口-认证工程师设置
+            for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) {
+                String engineerAttSet = relatedPersonnel.getEngineerAttSet();
+                if (!StringUtils.isEmpty(engineerAttSet)) {
+                    enginnerAttSetList = Arrays.stream(engineerAttSet.split(",")).collect(Collectors.toList());
+                    allList.addAll(enginnerAttSetList);
+                }
+            }
+            //获取当前项目库id的studio工程师和认证工程师
+            List<String> studionList = new ArrayList<>();
+            List<String> certificationEngineerList = new ArrayList<>();
+            List<ProjectLibraryBase> projectLibraryBases = projectLibraryBaseService.queryById(projectLibrartId, cut);
+            for (ProjectLibraryBase projectLibraryBase : projectLibraryBases) {
+                studionList.add(projectLibraryBase.getStudioEngineer());
+
+                String certificationEngineer = projectLibraryBase.getCertificationEngineer();
+                if (!StringUtils.isEmpty(certificationEngineer)) {
+                    certificationEngineerList = Arrays.stream(certificationEngineer.split(",")).collect(Collectors.toList());
+                    allList.addAll(certificationEngineerList);
+                }
+            }
+            allList = allList.stream().filter(all -> {
+                return StringUtils.isNotBlank(all);
+            }).distinct().collect(Collectors.toList());
+			/*
+			for(String all : allList){
+				if(all.equals("")){
+					allList.remove(all);
+				}
+			}
+			*/
+            //遍历所有人alllist中是否包含责任人,如果包含，不用操作。
+            //-------如果不包含,再去判断当前用户的角色是studio、法规还是认证
+            for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) {
+                if (allList.size() > 0) {
+                    for (String allDuty : allDutyList) {
+                        String dutyPerson = allDuty;
+                        if (StringUtils.isNotEmpty(dutyPerson) && !allList.contains(dutyPerson) && StringUtils.isNotEmpty(roleCode1)) {
+                            if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())) {
+                                if (relatedPersonnel.getEngineeringInterfacePerson() != null) {
+                                    String engineeringInterfacePerson = dutyPerson + "," + relatedPersonnel.getEngineeringInterfacePerson();
+                                    relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson);
+                                } else {
+                                    relatedPersonnel.setEngineeringInterfacePerson(dutyPerson);
+                                }
+                            } else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())) {
+                                if (relatedPersonnel.getEngineerLawSet() != null) {
+                                    String engineerLawSet = dutyPerson + "," + relatedPersonnel.getEngineerLawSet();
+                                    relatedPersonnel.setEngineerLawSet(engineerLawSet);
+                                } else {
+                                    relatedPersonnel.setEngineerLawSet(dutyPerson);
+                                }
+                            } else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) {
+                                if (relatedPersonnel.getEngineerAttSet() != null) {
+                                    String engineerAttSet = dutyPerson + "," + relatedPersonnel.getEngineerAttSet();
+                                    relatedPersonnel.setEngineerAttSet(engineerAttSet);
+                                } else {
+                                    relatedPersonnel.setEngineerAttSet(dutyPerson);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            this.projectRelatedPersonnelService.updateBatchById(projectRelatedPersonnelList);
+
+
+            //翻译-中文
+            translateData(infoEOList);
+            translateData(dataList);
+            //翻译-英文
+            translateDataToEn(infoEOListCopy);
+            translateDataToEn(dataListCopy);
+
+            //比对不同字段
+            Map<String, String> infoDiff = ListDiff.compareObject(dataList.get(0), projectLawsInventoryEO);
+            Map<String, String> infoDiffEn = ListDiff.compareObject(dataListCopy.get(0), projectLawsInventoryEOCopy);
+
+            //设置更新log
+            setContentLog(infoDiff, contentLog, infoDiffEn, enContentLog, projectLawsInventoryEO.getProjectLibraryId());
+
+
+            //验证用户是否是该法规上级 项目库的studio， 如果是，则同步更新流程
+            int roleCode = projectLawsInventoryEOService.checkUserRole(projectLawsInventoryEO.getProjectLibraryId(), currentUser.getId(), "");
+            if (StringUtils.equals(String.valueOf(roleCode), ProjectRoleEnum.STUDIO_ENGINEER.getValue())) {
+                //更新流程信息
+                projectLawsInventoryEOService.updateFlowInfo(projectLawsInventoryEO);
+            }
+
+            //设置权限 先删后加
+            List<ProjectUserPermission> adds = new ArrayList<>();
+            if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId())) {
+                setProjectLawsInventoryPermission(projectLawsInventoryEO.getRegulationOwnerId(), projectLawsInventoryEO.getProjectLibraryId(), projectLawsInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_REGULATION.getValue());
+            }
+            if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId())) {
+                setProjectLawsInventoryPermission(projectLawsInventoryEO.getHomologationEngineerId(), projectLawsInventoryEO.getProjectLibraryId(), projectLawsInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_HOMOLOGATION.getValue());
+            }
+            if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getEngineeringInterfacePerson())) {
+                setProjectLawsInventoryPermission(projectLawsInventoryEO.getEngineeringInterfacePerson(), projectLawsInventoryEO.getProjectLibraryId(), projectLawsInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_INTERFACE.getValue());
+            }
+            if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getDesignInitiatorId())) {
+                setProjectLawsInventoryPermission(projectLawsInventoryEO.getDesignInitiatorId(), projectLawsInventoryEO.getProjectLibraryId(), projectLawsInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_DESIGN_INITIATOR.getValue());
+            }
+            if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getDesignDutyId())) {
+                setProjectLawsInventoryPermission(projectLawsInventoryEO.getDesignDutyId(), projectLawsInventoryEO.getProjectLibraryId(), projectLawsInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_DESIGN_DUTY.getValue());
+            }
+            if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoInitiatorId())) {
+                setProjectLawsInventoryPermission(projectLawsInventoryEO.getPrehomoInitiatorId(), projectLawsInventoryEO.getProjectLibraryId(), projectLawsInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_PREHOMO_INITIATOR.getValue());
+            }
+            if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoDutyId())) {
+                setProjectLawsInventoryPermission(projectLawsInventoryEO.getPrehomoDutyId(), projectLawsInventoryEO.getProjectLibraryId(), projectLawsInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_PREHOMO_DUTY.getValue());
+            }
+            if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getVerifyInitiatorId())) {
+                setProjectLawsInventoryPermission(projectLawsInventoryEO.getVerifyInitiatorId(), projectLawsInventoryEO.getProjectLibraryId(), projectLawsInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_VERIFY_INITIATOR.getValue());
+            }
+            if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getVerifyDutyId())) {
+                setProjectLawsInventoryPermission(projectLawsInventoryEO.getVerifyDutyId(), projectLawsInventoryEO.getProjectLibraryId(), projectLawsInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_VERIFY_DUTY.getValue());
+            }
+            if (ObjectUtils.isNotEmpty(adds)) {
+                projectUserPermissionService.saveBatch(adds);
+            }
+
+
+//        }
+//        else {
+//            throw new JeroBootException("该用户没有权限操作该数据！");
+//        }
+    }
 
     /**
      * 发送消息

From 46cfb10d9f150900a9117e75e9b84df30ad85508 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 9 Oct 2023 10:28:18 +0800
Subject: [PATCH 233/288] =?UTF-8?q?=20=E5=B9=B3=E5=8F=B0=E4=BB=B6SQL?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql |  31 ++++++
 ...PlatformProjectLibraryBaseServiceImpl.java |  12 +++
 .../project/entity/ProjectLibraryBase.java    | 100 ++++++++++++++++++
 3 files changed, 143 insertions(+)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index 6df33616f..7f3547aba 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -1248,3 +1248,34 @@ MODIFY COLUMN `directory_name` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb
 MODIFY COLUMN `lot` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '批次' AFTER `directory_name`,
 MODIFY COLUMN `detection_report_location` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '检测报告位置' AFTER `experiment_file`,
 MODIFY COLUMN `explain_info` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '说明' AFTER `detection_report_location`;
+
+--添加平台件项目库字段2023-09-28
+ALTER TABLE `project_library_base`
+ADD COLUMN `power` varchar(255) NULL COMMENT '功率' AFTER `platform`,
+ADD COLUMN `producer` varchar(255) NULL COMMENT '生产商' AFTER `power`,
+ADD COLUMN `duty_depart` varchar(255) NULL COMMENT '责任部门' AFTER `producer`,
+ADD COLUMN `regulation_owner_id` varchar(255) NULL COMMENT '法规工程师' AFTER `duty_depart`,
+ADD COLUMN `engineering_interface_person` varchar(255) NULL COMMENT '工程接口人' AFTER `regulation_owner_id`,
+ADD COLUMN `brand_label` varchar(255) NULL COMMENT '名牌标签' AFTER `engineering_interface_person`,
+ADD COLUMN `product_model` varchar(255) NULL COMMENT '产品型号' AFTER `brand_label`,
+ADD COLUMN `cell_enterprise` varchar(255) NULL COMMENT '电芯生产企业' AFTER `product_model`,
+ADD COLUMN `assembly_enterprise` varchar(255) NULL COMMENT '总成生产企业' AFTER `cell_enterprise`,
+ADD COLUMN `part_number_cn` varchar(255) NULL COMMENT '零件号（国内）' AFTER `assembly_enterprise`,
+ADD COLUMN `part_number_en` varchar(255) NULL COMMENT '零件号（国外）' AFTER `part_number_cn`,
+ADD COLUMN `filing_code` varchar(255) NULL COMMENT '24位备案码' AFTER `part_number_en`,
+ADD COLUMN `supplier_code` varchar(255) NULL COMMENT '供应商代码' AFTER `filing_code`,
+ADD COLUMN `product_type_code` varchar(255) NULL COMMENT '产品类型代码' AFTER `supplier_code`,
+ADD COLUMN `battery_type_code` varchar(255) NULL COMMENT '电池类型代码' AFTER `Product_type _code`,
+ADD COLUMN `specification_code` varchar(255) NULL COMMENT '规格代码' AFTER `battery_type_code`,
+ADD COLUMN `traceability_code` varchar(255) NULL COMMENT '追溯代码' AFTER `specification_code`,
+ADD COLUMN `ymd_number` varchar(255) NULL COMMENT '生产也月日序列号' AFTER `traceability_code`,
+ADD COLUMN `size` double(255, 0) NULL COMMENT '尺寸' AFTER `ymd_number`,
+ADD COLUMN `rated_capacity` varchar(255) NULL COMMENT '额定容量' AFTER `size`,
+ADD COLUMN `nominal_voltage` varchar(255) NULL COMMENT '标称电压' AFTER `rated_capacity`,
+ADD COLUMN `rated_mass` varchar(255) NULL COMMENT '额定质量' AFTER `nominal_voltage`,
+ADD COLUMN `module_number` varchar(0) NULL COMMENT '包含模块个数' AFTER `rated_mass`,
+ADD COLUMN `connection_type` varchar(255) NULL COMMENT '模块串并联方式' AFTER `module_number`,
+ADD COLUMN `module_specification_code` varchar(255) NULL COMMENT '所用模块或单体规格代码' AFTER `connection_type`,
+ADD COLUMN `cooling_method` varchar(255) NULL COMMENT '冷却方式' AFTER `module_specification_code`,
+ADD COLUMN `filing_completion_time` datetime(0) NULL COMMENT '备案完成时间' AFTER `cooling_method`,
+ADD COLUMN `remark` varchar(1000) NULL COMMENT '备注' AFTER `filing_completion_time`;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
index dd8e7a866..69d3ad695 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
@@ -1068,6 +1068,8 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 			wrapper.in(TopProjectEO::getCreateBy,loginUser.getUsername()).in(TopProjectEO::getProjectLibraryBaseId,idList).orderByDesc(TopProjectEO::getSort);
 			topProjectEOList = iTopProjectEOService.list(wrapper);
 		}
+		//目标市场数据字典
+		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
 		for(ProjectLibraryBase projectLibraryBase: result){
 			//处理品牌
 			List<SysDictItem> sysDictItemList = dictItemList.stream()
@@ -1094,6 +1096,16 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 			}else{
 				projectLibraryBase.setSort("0");
 			}
+
+			//目标市场
+			Map<String,Object> param = new HashMap<>();
+			param.put("cut",cut);
+			String targetMarket = getMarket(param, targetMarketList, projectLibraryBase);
+			//项目名称（功率-生产商-目标市场）
+			String projectName = projectLibraryBase.getPower() + "-" + projectLibraryBase.getProducer() + "-" + targetMarket;
+			projectLibraryBase.setProjectNameId(projectName);//原设计平台件项目名称去这个字段值
+			//平台件项目名称改为拼接的形式，projectNameId不在存数据，如果这个变更影响其他的地方，项目名称取值可以取projectName的值
+			projectLibraryBase.setProjectName(projectName);
 		}
 
 		if(ObjectUtils.isEmpty(params.get("orderByField"))){
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
index 0b80aafd2..614332f72 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
@@ -164,6 +164,106 @@ public class ProjectLibraryBase implements Comparable<ProjectLibraryBase> {
     @ApiModelProperty(value = "平台件数据标识，platform = YES，为平台件数据，platform为空是项目库数据")
     private String platform;
 
+    //平台件项目库字段--------------------------------------------------------------------------------------------------------------
+
+    @ApiModelProperty(value = "功率")
+    private String power;
+
+    @ApiModelProperty(value = "生产商")
+    private String producer;
+
+    @ApiModelProperty(value = "责任部门")
+    private String dutyDepart;
+
+    @ApiModelProperty(value = "法规工程师")
+    private String regulationOwnerId;
+
+    @ApiModelProperty(value = "工程接口人")
+    private String engineeringInterfacePerson;
+
+    @ApiModelProperty(value = "名牌标签")
+    private String brandLabel;
+
+    @ApiModelProperty(value = "产品型号")
+    private String productModel;
+
+    @ApiModelProperty(value = "电芯生产企业")
+    private String cellEnterprise;
+
+    @ApiModelProperty(value = "总成生产企业")
+    private String assemblyEnterprise;
+
+    @ApiModelProperty(value = "零件号（国内）")
+    private String partNumberCn;
+
+    @ApiModelProperty(value = "零件号（国外）")
+    private String part_numberEn;
+
+    @ApiModelProperty(value = "24位备案码")
+    private String filingCode;
+
+    @ApiModelProperty(value = "供应商代码（1-3）")
+    private String supplierCode;
+
+    @ApiModelProperty(value = "产品类型代码（4）")
+    private String productTypeCode;
+
+    @ApiModelProperty(value = "电池类型代码（5）")
+    private String batteryTypeCode;
+
+    @ApiModelProperty(value = "规格代码（6-7）")
+    private String specificationCode;
+
+    @ApiModelProperty(value = "追溯代码（8）")
+    private String traceabilityCode;
+
+    @ApiModelProperty(value = "生产也月日序列号")
+    private String ymdNumber;
+
+    @ApiModelProperty(value = "尺寸")
+    private String size;
+
+    @ApiModelProperty(value = "额定容量")
+    private String ratedCapacity;
+
+    @ApiModelProperty(value = "标称电压")
+    private String nominalVoltage;
+
+    @ApiModelProperty(value = "额定质量")
+    private String ratedMass;
+
+    @ApiModelProperty(value = "包含模块个数")
+    private String moduleNumber;
+
+    @ApiModelProperty(value = "模块串并联方式")
+    private String connectionType;
+
+    @ApiModelProperty(value = "所用模块或单体规格代码")
+    private String moduleSpecificationCode;
+
+    @ApiModelProperty(value = "冷却方式")
+    private String coolingMethod;
+
+    @ApiModelProperty(value = "备案完成时间")
+    private String filingCompletionTime;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     @Override
     public int compareTo(ProjectLibraryBase o) {
         if (!this.getProjectName().equals(o.getProjectName())) {

From ab9a028f3e72af73d08189e0c6374b9be5bd4e20 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 9 Oct 2023 10:49:01 +0800
Subject: [PATCH 234/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A=E6=8E=89=E5=B9=B3=E5=8F=B0=E4=BB=B6=E6=96=B0=E6=B7=BB?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...PlatformProjectLibraryBaseServiceImpl.java |  18 +-
 .../project/entity/ProjectLibraryBase.java    | 179 ++++++++----------
 2 files changed, 92 insertions(+), 105 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
index 69d3ad695..47ab2c106 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
@@ -1069,7 +1069,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 			topProjectEOList = iTopProjectEOService.list(wrapper);
 		}
 		//目标市场数据字典
-		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
+//		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
 		for(ProjectLibraryBase projectLibraryBase: result){
 			//处理品牌
 			List<SysDictItem> sysDictItemList = dictItemList.stream()
@@ -1098,14 +1098,14 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 			}
 
 			//目标市场
-			Map<String,Object> param = new HashMap<>();
-			param.put("cut",cut);
-			String targetMarket = getMarket(param, targetMarketList, projectLibraryBase);
-			//项目名称（功率-生产商-目标市场）
-			String projectName = projectLibraryBase.getPower() + "-" + projectLibraryBase.getProducer() + "-" + targetMarket;
-			projectLibraryBase.setProjectNameId(projectName);//原设计平台件项目名称去这个字段值
-			//平台件项目名称改为拼接的形式，projectNameId不在存数据，如果这个变更影响其他的地方，项目名称取值可以取projectName的值
-			projectLibraryBase.setProjectName(projectName);
+//			Map<String,Object> param = new HashMap<>();
+//			param.put("cut",cut);
+//			String targetMarket = getMarket(param, targetMarketList, projectLibraryBase);
+//			//项目名称（功率-生产商-目标市场）
+//			String projectName = projectLibraryBase.getPower() + "-" + projectLibraryBase.getProducer() + "-" + targetMarket;
+//			projectLibraryBase.setProjectNameId(projectName);//原设计平台件项目名称去这个字段值
+//			//平台件项目名称改为拼接的形式，projectNameId不在存数据，如果这个变更影响其他的地方，项目名称取值可以取projectName的值
+//			projectLibraryBase.setProjectName(projectName);
 		}
 
 		if(ObjectUtils.isEmpty(params.get("orderByField"))){
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
index 614332f72..6c08fb090 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
@@ -166,102 +166,89 @@ public class ProjectLibraryBase implements Comparable<ProjectLibraryBase> {
 
     //平台件项目库字段--------------------------------------------------------------------------------------------------------------
 
-    @ApiModelProperty(value = "功率")
-    private String power;
-
-    @ApiModelProperty(value = "生产商")
-    private String producer;
-
-    @ApiModelProperty(value = "责任部门")
-    private String dutyDepart;
-
-    @ApiModelProperty(value = "法规工程师")
-    private String regulationOwnerId;
-
-    @ApiModelProperty(value = "工程接口人")
-    private String engineeringInterfacePerson;
-
-    @ApiModelProperty(value = "名牌标签")
-    private String brandLabel;
-
-    @ApiModelProperty(value = "产品型号")
-    private String productModel;
-
-    @ApiModelProperty(value = "电芯生产企业")
-    private String cellEnterprise;
-
-    @ApiModelProperty(value = "总成生产企业")
-    private String assemblyEnterprise;
-
-    @ApiModelProperty(value = "零件号（国内）")
-    private String partNumberCn;
-
-    @ApiModelProperty(value = "零件号（国外）")
-    private String part_numberEn;
-
-    @ApiModelProperty(value = "24位备案码")
-    private String filingCode;
-
-    @ApiModelProperty(value = "供应商代码（1-3）")
-    private String supplierCode;
-
-    @ApiModelProperty(value = "产品类型代码（4）")
-    private String productTypeCode;
-
-    @ApiModelProperty(value = "电池类型代码（5）")
-    private String batteryTypeCode;
-
-    @ApiModelProperty(value = "规格代码（6-7）")
-    private String specificationCode;
-
-    @ApiModelProperty(value = "追溯代码（8）")
-    private String traceabilityCode;
-
-    @ApiModelProperty(value = "生产也月日序列号")
-    private String ymdNumber;
-
-    @ApiModelProperty(value = "尺寸")
-    private String size;
-
-    @ApiModelProperty(value = "额定容量")
-    private String ratedCapacity;
-
-    @ApiModelProperty(value = "标称电压")
-    private String nominalVoltage;
-
-    @ApiModelProperty(value = "额定质量")
-    private String ratedMass;
-
-    @ApiModelProperty(value = "包含模块个数")
-    private String moduleNumber;
-
-    @ApiModelProperty(value = "模块串并联方式")
-    private String connectionType;
-
-    @ApiModelProperty(value = "所用模块或单体规格代码")
-    private String moduleSpecificationCode;
-
-    @ApiModelProperty(value = "冷却方式")
-    private String coolingMethod;
-
-    @ApiModelProperty(value = "备案完成时间")
-    private String filingCompletionTime;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-
-
-
-
-
-
-
-
-
-
-
-
+//    @ApiModelProperty(value = "功率")
+//    private String power;
+//
+//    @ApiModelProperty(value = "生产商")
+//    private String producer;
+//
+//    @ApiModelProperty(value = "责任部门")
+//    private String dutyDepart;
+//
+//    @ApiModelProperty(value = "法规工程师")
+//    private String regulationOwnerId;
+//
+//    @ApiModelProperty(value = "工程接口人")
+//    private String engineeringInterfacePerson;
+//
+//    @ApiModelProperty(value = "名牌标签")
+//    private String brandLabel;
+//
+//    @ApiModelProperty(value = "产品型号")
+//    private String productModel;
+//
+//    @ApiModelProperty(value = "电芯生产企业")
+//    private String cellEnterprise;
+//
+//    @ApiModelProperty(value = "总成生产企业")
+//    private String assemblyEnterprise;
+//
+//    @ApiModelProperty(value = "零件号（国内）")
+//    private String partNumberCn;
+//
+//    @ApiModelProperty(value = "零件号（国外）")
+//    private String part_numberEn;
+//
+//    @ApiModelProperty(value = "24位备案码")
+//    private String filingCode;
+//
+//    @ApiModelProperty(value = "供应商代码（1-3）")
+//    private String supplierCode;
+//
+//    @ApiModelProperty(value = "产品类型代码（4）")
+//    private String productTypeCode;
+//
+//    @ApiModelProperty(value = "电池类型代码（5）")
+//    private String batteryTypeCode;
+//
+//    @ApiModelProperty(value = "规格代码（6-7）")
+//    private String specificationCode;
+//
+//    @ApiModelProperty(value = "追溯代码（8）")
+//    private String traceabilityCode;
+//
+//    @ApiModelProperty(value = "生产也月日序列号")
+//    private String ymdNumber;
+//
+//    @ApiModelProperty(value = "尺寸")
+//    private String size;
+//
+//    @ApiModelProperty(value = "额定容量")
+//    private String ratedCapacity;
+//
+//    @ApiModelProperty(value = "标称电压")
+//    private String nominalVoltage;
+//
+//    @ApiModelProperty(value = "额定质量")
+//    private String ratedMass;
+//
+//    @ApiModelProperty(value = "包含模块个数")
+//    private String moduleNumber;
+//
+//    @ApiModelProperty(value = "模块串并联方式")
+//    private String connectionType;
+//
+//    @ApiModelProperty(value = "所用模块或单体规格代码")
+//    private String moduleSpecificationCode;
+//
+//    @ApiModelProperty(value = "冷却方式")
+//    private String coolingMethod;
+//
+//    @ApiModelProperty(value = "备案完成时间")
+//    private String filingCompletionTime;
+//
+//    @ApiModelProperty(value = "备注")
+//    private String remark;
 
 
     @Override

From fecc568c3d6b0866ec386f54c37f4bd265f5041d Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 9 Oct 2023 14:09:45 +0800
Subject: [PATCH 235/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E6=96=B0=E5=A2=9E=E5=BC=B9=E6=A1=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  27 +
 jero-web/src/common/lang/zh-cn.js             |  27 +
 .../components/addModel.vue                   | 731 ++++++++++++++----
 3 files changed, 614 insertions(+), 171 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 9e94e6906..3158a6629 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1982,4 +1982,31 @@ module.exports = {
   matchempty:'The match is empty',
   onlyDataProcessStatusDeleted:'Data can only be deleted if the process status is task ready, approved, or rejected by the responsible person',
   platformitemhasbeenassociated:'A platform item has been associated',
+  power:'power',
+  producer:'producer',
+  Nameplatelabel:'Nameplate label',
+  Batteryfilingrecord:'Battery filing record',
+  Modelinformation:'Model information',
+  Batterynationalcode:'Battery national code',
+  Recordnformation:'Record information',
+  Electriccellproductionenterprises:'Electric cell production enterprises',
+  Assemblymanufacturer:'Assembly manufacturer',
+  PartNumberCN:'Part Number (Domestic)',
+  PartNumberEU:'Part Number (Foreign)',
+  bitfilecode:'24-bit file code',
+  Vendorcode:'Vendor code',
+  Productclasscode:'Product class code',
+  Batterytypecode:'Battery type code',
+  Specificationcode:'Specification code',
+  Traceinformationcode:'Trace information code',
+  Productionyearmonthdateserialnumber:'Production year month date serial number',
+  dimension:'dimension(mm)',
+  Ratedcapacity:'Rated capacity(Ah)',
+  Nominalvoltage:'Nominal voltage(V)',
+  Ratedmass:'Rated mass(kg)',
+  Numbercontainedmodules:'Number of contained modules',
+  Moduleseriesparallelmode:'Module series parallel mode',
+  modulspecificationcodeused:'The module or monomer specification code used',
+  Coolingmode:'Cooling mode',
+  Filingcompletiontime:'Filing completion time',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 2e896649a..7ab96d38a 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -3938,4 +3938,31 @@ module.exports = {
   Processdetails:'流程详情',
   matchempty:'匹配项为空',
   platformitemhasbeenassociated:'已关联平台件项目',
+  power:'功率',
+  producer:'生产商',
+  Nameplatelabel:'铭牌标签',
+  Batteryfilingrecord:'电池备案记录',
+  Modelinformation:'型号信息',
+  Batterynationalcode:'电池国标码',
+  Recordnformation:'备案信息',
+  Electriccellproductionenterprises:'电芯生产企业',
+  Assemblymanufacturer:'总成生产企业',
+  PartNumberCN:'零件号（国内）',
+  PartNumberEU:'零件号（国外）',
+  bitfilecode:'24位备案码',
+  Vendorcode:'供应商代码',
+  Productclasscode:'产品类型代码',
+  Batterytypecode:'电池类型代码',
+  Specificationcode:'规格代码',
+  Traceinformationcode:'追溯信息代码',
+  Productionyearmonthdateserialnumber:'生产年月日序列号',
+  dimension:'尺寸(mm)',
+  Ratedcapacity:'额定容量(Ah)',
+  Nominalvoltage:'标称电压(V)',
+  Ratedmass:'额定质量(kg)',
+  Numbercontainedmodules:'包含模块个数',
+  Moduleseriesparallelmode:'模块串并联方式',
+  modulspecificationcodeused:'所用模块或单体规格代码',
+  Coolingmode:'冷却方式',
+  Filingcompletiontime:'备案完成时间',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
index fd768320a..69b9bd99c 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
@@ -11,16 +11,49 @@
     style="height: 100%;overflow: auto;padding-bottom: 53px;">
     <a-spin :spinning="confirmLoading">
       <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+<!--        项目基本信息-->
+        <div class="header-text">
+          {{$t('basicInformationOfParameters')}}
+        </div>
         <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
                 <span class="Required">*</span>
-                <span class="title-text-text" :title="$t('entryName')">{{$t('entryName')}}</span>
+                <span class="title-text-text" :title="$t('power')">{{$t('power')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="projectNameId">
-                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('entryName')"
-                         v-model="formInline.projectNameId"></a-input>
+              <a-form-model-item class="itemModel" prop="power">
+                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('power')"
+                         v-model="formInline.power"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('producer')">{{$t('producer')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="producer">
+                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('producer')"
+                         v-model="formInline.producer"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('targetMarket')">{{$t('targetMarket')}}</span>
+              </div>
+              <a-form-model-item class="itemModel-multi" prop="targetMarket">
+                <j-multi-select-tag class="box-input" v-model="formInline.targetMarket"
+                                    :disabled="disabled"
+                                    :placeholder="$t('PleaseSelect')+$t('targetMarket')"
+                                    :type="'select'"
+                                    :triggerChange="false" :dictCode="'region'"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -45,25 +78,41 @@
             <div class="box-title-text">
               <div class="title-text">
 <!--                <span class="Required">*</span>-->
-                <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
+                <span class="title-text-text" :title="$t('projectStatus')">{{$t('projectStatus')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="ipdInfo">
-                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('configurationItem')"
-                         v-model="formInline.ipdInfo"></a-input>
+              <a-form-model-item class="itemModel-multi" prop="projectStatus">
+                <j-multi-select-tag class="box-input" v-model="formInline.projectStatus"
+                                    :disabled="disabled"
+                                    :placeholder="$t('PleaseSelect')+$t('projectStatus')"
+                                    :type="'select'"
+                                    :triggerChange="false" :dictCode="'project_status'"/>
               </a-form-model-item>
             </div>
           </a-col>
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="title-text-text" :title="$t('certificationProgram')">{{$t('certificationProgram')}}</span>
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="attestationPlan">
-                <a-input class="box-input"
-                         :disabled="disabled"
-                         :maxLength="200"
-                         v-model="formInline.attestationPlan"
-                         :placeholder="$t('PleaseEnter')+$t('certificationProgram')"/>
+              <a-form-model-item class="itemModel" prop="dutyTerritory">
+                <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
+                          allowClear
+                          show-search
+                          mode="multiple"
+                          class="box-input"
+                          optionFilterProp="label"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          v-model="formInline.dutyTerritory">
+                  <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
+                                   :key="key"
+                                   :label="item.key"
+                                   :value="item.key">
+                               <span style="display: inline-block;width: 100%" :title=" item.key ">
+                                     {{ item.key }}
+                               </span>
+                  </a-select-option>
+                </a-select>
               </a-form-model-item>
             </div>
           </a-col>
@@ -72,19 +121,80 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('dehicleDevelopmentPlan')">{{$t('dehicleDevelopmentPlan')}}</span>
+<!--                <span class="Required">*</span>-->
+                <span class="title-text-text" :title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span>
               </div>
-              <a-form-model-item class="itemModel" :prop="'vehicleDevelopmentPlan'">
-                <a-input class="box-input"
-                         :disabled="disabled"
-                         :maxLength="200"
-                         v-model="formInline.vehicleDevelopmentPlan"
-                         :placeholder="$t('PleaseEnter')+$t('dehicleDevelopmentPlan')"/>
+              <a-form-model-item class="itemModel" :prop="'regulationOwnerIdName'">
+                <PersonnelSelection :query="{db_field_name:'regulationOwnerId',db_field_txt:$t('regulatoryEngineer')}"
+                                    :isSingleChoice="true"
+                                    :personneQuery="formInline"
+                                    @change="PersonnelSelectionChange"
+                                    v-model="formInline.regulationOwnerIdName"/>
               </a-form-model-item>
             </div>
           </a-col>
           <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="designDutyIdName">
+                <PersonnelSelection :query="{db_field_name:'designDutyId',db_field_txt:$t('regulatoryEngineer')}"
+                                    :isSingleChoice="true"
+                                    :personneQuery="formInline"
+                                    @change="PersonnelSelectionChange"
+                                    v-model="formInline.designDutyIdName"/>
+              </a-form-model-item>
+            </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('Nameplatelabel')">{{$t('Nameplatelabel')}}</span>
+              </div>
+              <a-form-model-item class="itemModelimg" prop="explanation">
+                <div>
+                  <a-upload
+                    :action="uploadAction+'?cut='+cut"
+                    list-type="picture-card"
+                    :file-list="fileList"
+                    @preview="handlePreview"
+                    @change="handleChange"
+                  >
+                    <div v-if="fileList.length < 20">
+                      <a-icon type="plus" />
+                      <div class="ant-upload-text">
+<!--                        Upload-->
+                      </div>
+                    </div>
+                  </a-upload>
+                  <a-modal :visible="previewVisible" :footer="null" @cancel="handleCancelimg">
+                    <img alt="example" style="width: 100%" :src="previewImage" />
+                  </a-modal>
+                </div>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+<!--          <a-col :span="12">-->
+<!--            <div class="box-title-text">-->
+<!--              <div class="title-text">-->
+<!--                <span class="title-text-text"-->
+<!--                      :title="$t('dehicleDevelopmentPlan')">{{$t('dehicleDevelopmentPlan')}}</span>-->
+<!--              </div>-->
+<!--              <a-form-model-item class="itemModel" :prop="'vehicleDevelopmentPlan'">-->
+<!--                <a-input class="box-input"-->
+<!--                         :disabled="disabled"-->
+<!--                         :maxLength="200"-->
+<!--                         v-model="formInline.vehicleDevelopmentPlan"-->
+<!--                         :placeholder="$t('PleaseEnter')+$t('dehicleDevelopmentPlan')"/>-->
+<!--              </a-form-model-item>-->
+<!--            </div>-->
+<!--          </a-col>-->
+          <a-col :span="24">
             <div class="box-title-text">
               <div class="title-text">
                 <span class="title-text-text" :title="$t('explain')">{{$t('explain')}}</span>
@@ -93,151 +203,306 @@
                 <a-textarea :placeholder="$t('pleaseEnter')+$t('explain')"
                             v-model="formInline.explanation"
                             :maxLength="500"
-                            :rows="2"/>
+                            :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <!--        电池备案记录-->
+        <div class="header-text">
+          {{$t('Batteryfilingrecord')}}
+        </div>
+        <!--        型号信息-->
+        <div class='header-title'>
+          <span class='header-title-text'>{{$t('Modelinformation')}}</span>
+        </div>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('productModel')">{{$t('productModel')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="productModel">
+                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('productModel')"
+                         v-model="formInline.productModel"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('Electriccellproductionenterprises')">{{$t('Electriccellproductionenterprises')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="Electriccellproductionenterprises">
+                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Electriccellproductionenterprises')"
+                         v-model="formInline.Electriccellproductionenterprises"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('Assemblymanufacturer')">{{$t('Assemblymanufacturer')}}</span>
+              </div>
+              <a-form-model-item class="itemModel-multi" prop="Assemblymanufacturer">
+                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Assemblymanufacturer')"
+                         v-model="formInline.Assemblymanufacturer"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('PartNumberCN')">{{$t('PartNumberCN')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="PartNumberCN">
+                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('PartNumberCN')"
+                         v-model="formInline.PartNumberCN"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('PartNumberEU')">{{$t('PartNumberEU')}}</span>
+              </div>
+              <a-form-model-item class="itemModel-multi" prop="PartNumberEU">
+                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('PartNumberEU')"
+                         v-model="formInline.PartNumberEU"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <!--        电池国标码-->
+        <div class='header-title'>
+          <span class='header-title-text'>{{$t('Batterynationalcode')}}</span>
+        </div>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('bitfilecode')">{{$t('bitfilecode')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="bitfilecode">
+                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('bitfilecode')"
+                         v-model="formInline.bitfilecode"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('Vendorcode') + '(1～3)'">{{$t('Vendorcode') + '(1～3)'}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="endorcode">
+                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Vendorcode') + '(1～3)'"
+                         v-model="formInline.endorcode"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('Productclasscode') + '(4)'">{{$t('Productclasscode') + '(4)'}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="Productclasscode">
+                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Productclasscode') + '(4)'"
+                         v-model="formInline.Productclasscode"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('Batterytypecode') + '(5)'">{{$t('Batterytypecode') + '(5)'}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="Batterytypecode">
+                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Batterytypecode') + '(5)'"
+                         v-model="formInline.Batterytypecode"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('Specificationcode') + '(6～7)'">{{$t('Specificationcode') + '(6～7)'}}</span>
+              </div>
+              <a-form-model-item class="itemModel-multi" prop="Specificationcode">
+                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Specificationcode') + '(6～7)'"
+                         v-model="formInline.Specificationcode"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('Traceinformationcode') + '(8～14)'">{{$t('Traceinformationcode') + '(8～14)'}}</span>
+              </div>
+              <a-form-model-item class="itemModel-multi" prop="Traceinformationcode">
+                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Traceinformationcode') + '(8～14)'"
+                         v-model="formInline.Traceinformationcode"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('Productionyearmonthdateserialnumber') + '(15～20)'">{{$t('Productionyearmonthdateserialnumber') + '(15～20)'}}</span>
+              </div>
+              <a-form-model-item class="itemModel-multi" prop="Productionyearmonthdateserialnumber">
+                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Productionyearmonthdateserialnumber') + '(15～20)'"
+                         v-model="formInline.Productionyearmonthdateserialnumber"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <!--        备案信息-->
+        <div class='header-title'>
+          <span class='header-title-text'>{{$t('Recordnformation')}}</span>
+        </div>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('dimension')">{{$t('dimension')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="dimension">
+                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('dimension')"
+                         v-model="formInline.dimension"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('Ratedcapacity')">{{$t('Ratedcapacity')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="Ratedcapacity">
+                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Ratedcapacity')"
+                         v-model="formInline.Ratedcapacity"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('Nominalvoltage')">{{$t('Nominalvoltage')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="Nominalvoltage">
+                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Nominalvoltage')"
+                         v-model="formInline.Nominalvoltage"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('Ratedmass')">{{$t('Ratedmass')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="Ratedmass">
+                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Ratedmass')"
+                         v-model="formInline.Ratedmass"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('Numbercontainedmodules')">{{$t('Numbercontainedmodules')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="Numbercontainedmodules">
+                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Numbercontainedmodules')"
+                         v-model="formInline.Numbercontainedmodules"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('Moduleseriesparallelmode')">{{$t('Moduleseriesparallelmode')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="Moduleseriesparallelmode">
+                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Moduleseriesparallelmode')"
+                         v-model="formInline.Moduleseriesparallelmode"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('modulspecificationcodeused')">{{$t('modulspecificationcodeused')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="modulspecificationcodeused">
+                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('modulspecificationcodeused')"
+                         v-model="formInline.modulspecificationcodeused"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('Coolingmode')">{{$t('Coolingmode')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="dimension">
+                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Coolingmode')"
+                         v-model="formInline.Coolingmode"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <!--        备注-->
+        <div class='header-title'>
+          <span class='header-title-text'>{{$t('remarks')}}</span>
+        </div>
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('Filingcompletiontime')">{{$t('Filingcompletiontime')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="designDueDate">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+$t('Filingcompletiontime')"
+                               @change="dateChange({db_field_name:'designDueDate'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.designDueDate"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </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" prop="remarks">
+                <a-textarea
+                  :placeholder="$t('remarks')"
+                  :maxLength="500"
+                  v-model="formInline.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">-->
-<!--              <div class="title-text">-->
-<!--                <span class="Required">*</span>-->
-<!--                <span class="title-text-text" :title="$t('projectStatus')">{{$t('projectStatus')}}</span>-->
-<!--              </div>-->
-<!--              <a-form-model-item class="itemModel" prop="projectStatus">-->
-<!--                <j-dict-select-tag class="box-input" v-model="formInline.projectStatus"-->
-<!--                                   :disabled="disabled"-->
-<!--                                   @input="handleInput('projectStatus')"-->
-<!--                                   :placeholder="$t('PleaseSelect')+$t('projectStatus')"-->
-<!--                                   :type="'select'"-->
-<!--                                   :triggerChange="false" :dictCode="'project_status'"/>-->
-<!--              </a-form-model-item>-->
-<!--            </div>-->
-<!--          </a-col>-->
-<!--          <a-col :span="12">-->
-<!--            <div class="box-title-text">-->
-<!--              <div class="title-text">-->
-<!--                <span class="title-text-text"-->
-<!--                      :title="$t('brand')">{{$t('brand')}}</span>-->
-<!--              </div>-->
-<!--              <a-form-model-item class="itemModel" :prop="'brand'">-->
-<!--                <j-dict-select-tag v-model="formInline.brand"-->
-<!--                                   :placeholder="$t('PleaseSelect')+$t('brand')"-->
-<!--                                   :type="'select'"-->
-<!--                                   :triggerChange="false" :dictCode="'brand'"/>-->
-<!--              </a-form-model-item>-->
-<!--            </div>-->
-<!--          </a-col>-->
-<!--        </a-row>-->
-<!--        <a-row :gutter="24">-->
-<!--          <a-col :span="12">-->
-<!--            <div class="box-title-text">-->
-<!--              <div class="title-text">-->
-<!--                <span class="Required">*</span>-->
-<!--                <span class="title-text-text" :title="$t('StudioEngineer')">{{$t('StudioEngineer')}}</span>-->
-<!--              </div>-->
-<!--              <a-form-model-item class="itemModel-multi" :prop="'studioEngineerName'">-->
-<!--                <PersonnelSelection :query="{db_field_name:'studioEngineer',db_field_txt:$t('StudioEngineer')}"-->
-<!--                                    :isSingleChoice="true"-->
-<!--                                    :personneQuery="formInline"-->
-<!--                                    v-if="visible"-->
-<!--                                    @change="PersonnelSelectionChange"-->
-<!--                                    :disabled="disabled"-->
-<!--                                    v-model="formInline.studioEngineerName"/>-->
-<!--              </a-form-model-item>-->
-<!--            </div>-->
-<!--          </a-col>-->
-<!--          <a-col :span="12">-->
-<!--            <div class="box-title-text">-->
-<!--              <div class="title-text">-->
-<!--                <span class="title-text-text" :title="$t('certifiedEngineer')">{{$t('certifiedEngineer')}}</span>-->
-<!--              </div>-->
-<!--              <a-form-model-item class="itemModel-multi" :prop="'certificationEngineerName'">-->
-<!--                <PersonnelSelection-->
-<!--                  :query="{db_field_name:'certificationEngineer',db_field_txt:$t('certifiedEngineer')}"-->
-<!--                  :personneQuery="formInline"-->
-<!--                  v-if="visible"-->
-<!--                  @change="PersonnelSelectionChange"-->
-<!--                  :disabled="disabled"-->
-<!--                  v-model="formInline.certificationEngineerName"/>-->
-<!--              </a-form-model-item>-->
-<!--            </div>-->
-<!--          </a-col>-->
-<!--        </a-row>-->
-<!--        <a-row :gutter="24">-->
-<!--          <a-col :span="12">-->
-<!--            <div class="box-title-text">-->
-<!--              <div class="title-text">-->
-<!--                <span class="title-text-text" :title="$t('DigitalPlatform')">{{$t('DigitalPlatform')}}</span>-->
-<!--              </div>-->
-<!--              <a-form-model-item class="itemModel" :prop="'digitalPlatform'">-->
-<!--                <a-input class="box-input"-->
-<!--                         :disabled="disabled"-->
-<!--                         v-model="formInline.digitalPlatform"-->
-<!--                         :placeholder="$t('PleaseEnter')+$t('DigitalPlatform')"/>-->
-<!--              </a-form-model-item>-->
-<!--            </div>-->
-<!--          </a-col>-->
-<!--          <a-col :span="12">-->
-<!--            <div class="box-title-text">-->
-<!--              <div class="title-text">-->
-<!--                <span class="title-text-text" :title="$t('ModelPlatform')">{{$t('ModelPlatform')}}</span>-->
-<!--              </div>-->
-<!--              <a-form-model-item class="itemModel" prop="vehiclePlatform">-->
-<!--                <a-input class="box-input"-->
-<!--                         :disabled="disabled"-->
-<!--                         v-model="formInline.vehiclePlatform"-->
-<!--                         :placeholder="$t('PleaseEnter')+$t('ModelPlatform')"/>-->
-<!--              </a-form-model-item>-->
-<!--            </div>-->
-<!--          </a-col>-->
-<!--        </a-row>-->
-<!--        <a-row :gutter="24">-->
-<!--          <a-col :span="12">-->
-<!--            <div class="box-title-text">-->
-<!--              <div class="title-text">-->
-<!--                <span class="title-text-text" :title="$t('certificationProgram')">{{$t('certificationProgram')}}</span>-->
-<!--              </div>-->
-<!--              <a-form-model-item class="itemModel" prop="attestationPlan">-->
-<!--                <a-input class="box-input"-->
-<!--                         :disabled="disabled"-->
-<!--                         v-model="formInline.attestationPlan"-->
-<!--                         :placeholder="$t('PleaseEnter')+$t('certificationProgram')"/>-->
-<!--              </a-form-model-item>-->
-<!--            </div>-->
-<!--          </a-col>-->
-<!--          <a-col :span="12">-->
-<!--            <div class="box-title-text">-->
-<!--              <div class="title-text">-->
-<!--                <span class="title-text-text"-->
-<!--                      :title="$t('configurationInformation')">{{$t('configurationInformation')}}</span>-->
-<!--              </div>-->
-<!--              <a-form-model-item class="itemModel" prop="ipdInfo">-->
-<!--                <a-input class="box-input"-->
-<!--                         :disabled="disabled"-->
-<!--                         v-model="formInline.ipdInfo"-->
-<!--                         :placeholder="$t('PleaseEnter')+$t('configurationInformation')"/>-->
-<!--              </a-form-model-item>-->
-<!--            </div>-->
-<!--            &lt;!&ndash;            ^(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&amp;%\$#_]*)?$-->
-<!--            &ndash;&gt;-->
-<!--          </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('explain')">{{$t('explain')}}</span>-->
-<!--              </div>-->
-<!--              <a-form-model-item class="itemModel" prop="explanation">-->
-<!--                <a-textarea :placeholder="$t('pleaseEnter')+$t('explain')"-->
-<!--                            v-model="formInline.explanation"-->
-<!--                            :rows="4"/>-->
-<!--              </a-form-model-item>-->
-<!--            </div>-->
-<!--          </a-col>-->
-<!--        </a-row>-->
       </a-form-model>
     </a-spin>
     <div class="drawer-bootom-button">
@@ -251,6 +516,16 @@
   import PersonnelSelection from '@/components/PersonnelSelection/index'
   import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
   import { mapGetters } from 'vuex'
+  import moment from 'moment'
+
+  function getBase64(file) {
+    return new Promise((resolve, reject) => {
+      const reader = new FileReader()
+      reader.readAsDataURL(file)
+      reader.onload = () => resolve(reader.result)
+      reader.onerror = (error) => reject(error)
+    })
+  }
 
   export default {
     name: 'addModel',
@@ -324,6 +599,30 @@
               trigger: 'blur'
             }
           ],
+          power:[
+            {
+              required: true,
+              message: this.$t('power') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
+            {
+              max: 200,
+              message: this.$t('DigitalPlatform') + this.$t('cannotExceed') + 200 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          producer:[
+            {
+              required: true,
+              message: this.$t('producer') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
+            {
+              max: 200,
+              message: this.$t('DigitalPlatform') + this.$t('cannotExceed') + 200 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
           digitalPlatform: [
             {
               max: 200,
@@ -345,6 +644,13 @@
               trigger: 'change'
             }
           ],
+          targetMarket: [
+            {
+              required: true,
+              message: this.$t('targetMarket') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
           brand: [
             {
               required: true,
@@ -371,24 +677,82 @@
               trigger: 'change'
             }
           ],
-          certificationEngineerName: [
+          dutyTerritory: [
             {
-              max: 100,
-              message: this.$t('certifiedEngineer') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              required: true,
+              message: this.$t('statisticalNodes') + this.$t('cannotEmpty'),
               trigger: 'change'
             }
-          ]
+          ],
+          regulationOwnerIdName: [
+            {
+              required: true,
+              message: this.$t('regulatoryEngineer') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          designDutyIdName: [
+            {
+              required: true,
+              message: this.$t('engineeringInterfacePerson') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
         },
         disabled: false,
+        previewVisible: false,
+        previewImage: '',
+        cut: '',
+        fileList: [],
         projectNameList: [],
-        title: ''
+        firstLevelDutyTerritoryList:[],
+        title: '',
+        uploadAction: window._CONFIG['domianURL'] + '/sys/common/upload',
+        state: undefined,
+        myuploadAction: window._CONFIG['domianURL'] + this.thisFileUploadUrl,
+        upDataList: [],
+        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
       }
     },
     mounted() {
       this.getNameList()
+      let long = localStorage.getItem('language')
+      this.cut = ''
+      if (long && long == 'zh-cn') {
+        this.cut = 'cn'
+      } else if (long && long == 'en-us') {
+        this.cut = 'en'
+      }
     },
     methods: {
       ...mapGetters(['userInfo']),
+      handleCancelimg() {
+        this.previewVisible = false;
+      },
+      async handlePreview(file) {
+        if (!file.url && !file.preview) {
+          file.preview = await getBase64(file.originFileObj);
+        }
+        this.previewImage = file.url || file.preview;
+        this.previewVisible = true;
+      },
+      handleChange({ fileList }) {
+        this.fileList = fileList;
+        console.log(this.fileList)
+      },
+      getFirstLevelDutyTerritory() {
+        getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
+          if (res.success) {
+            this.firstLevelDutyTerritoryList = res.result
+          } else {
+            this.firstLevelDutyTerritoryList = []
+          }
+        })
+      },
+      dateChange(item) {
+        this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
+      },
       getNameList(value) {
         getAction('project/projectNameInfoEO/list', {}).then((res) => {
           if (res.success) {
@@ -411,8 +775,9 @@
         this.title = this.$t('add')
         this.formInline = {}
         this.getNameList()
-        this.formInline.studioEngineerName = this.userInfo().username
-        this.formInline.studioEngineer = this.userInfo().id
+        this.getFirstLevelDutyTerritory()
+        this.formInline.regulationOwnerIdName = this.userInfo().username
+        this.formInline.regulationOwnerId = this.userInfo().id
         this.formInline.projectVersion = '00'
         this.formInline = { ...this.formInline }
         this.$nextTick(() => {
@@ -582,7 +947,31 @@
     height: 40px;
     margin-bottom: 24px;
   }
+  .itemModelimg {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+    margin-bottom: 24px;
+  }
+  .header-text {
+    font-size: 16px;
+    color: #000000;
+    font-weight: bold;
 
+  }
+  .header-title-text{
+    font-size: 16px;
+    color: #000000;
+    line-height: 50px;
+    margin: 0 19px;
+  }
+  .header-title{
+    background: #F5F6F7;
+    width: 100%;
+    height: 50px;
+    margin-top: 10px;
+    margin-bottom: 10px;
+  }
   .Required {
     color: red;
     margin-right: 4px;

From e035f46fda61bd3489e609fb7b59226184f1580f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Mon, 9 Oct 2023 14:26:12 +0800
Subject: [PATCH 236/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=8F=91=E6=B6=88=E6=81=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/project/job/PrehomoJob.java  |  4 +-
 ...ojectTaskInventoryDetailEOServiceImpl.java | 26 ++++-----
 .../ProjectTaskInventoryEOServiceImpl.java    | 54 +++++++++----------
 ...ectTaskInventoryFeedbackEOServiceImpl.java | 52 +++++++++---------
 4 files changed, 69 insertions(+), 67 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java
index 04736c68e..2c0a4ac94 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java
@@ -73,7 +73,7 @@ public class PrehomoJob implements Job {
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
         log.info("prehomo流程，定时任务开启 =====================================================");
-
+/*
         //查询出已经启动了prehomo流程的数据。 并且流程没有结束。
         QueryWrapper<ProjectTaskInventoryEO> queryProjectTaskInventoryWrapper = new QueryWrapper<>();
         queryProjectTaskInventoryWrapper.isNotNull("prehomo_p_id");
@@ -367,5 +367,7 @@ public class PrehomoJob implements Job {
             }
         }
         log.info("prehomo流程，定时任务结束 =====================================================");
+
+ */
     }
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
index 6be203fab..582a40d6c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
@@ -543,19 +543,19 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 			if(CollectionUtils.isNotEmpty(sysUsers)){
 				thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList());
 			}
-			try {
-				FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
-				feishuMsgVo.setTitle(msgTitle);
-				feishuMsgVo.setCnContentUpper(cnContentUpper);
-				feishuMsgVo.setCnContentLower(cnContentLower);
-				feishuMsgVo.setEnContentUpper(enContentUpper);
-				feishuMsgVo.setEnContentLower(enContentLower);
-				feishuMsgVo.setUrl(hrefFeishu);
-				feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
-				feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
-			} catch (IOException e) {
-				log.error("飞书消息推送失败");
-			}
+//			try {
+//				FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+//				feishuMsgVo.setTitle(msgTitle);
+//				feishuMsgVo.setCnContentUpper(cnContentUpper);
+//				feishuMsgVo.setCnContentLower(cnContentLower);
+//				feishuMsgVo.setEnContentUpper(enContentUpper);
+//				feishuMsgVo.setEnContentLower(enContentLower);
+//				feishuMsgVo.setUrl(hrefFeishu);
+//				feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
+////				feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
+//			} catch (IOException e) {
+//				log.error("飞书消息推送失败");
+//			}
 		}
 	}
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
index 3ef531cac..d7437e8fc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
@@ -800,22 +800,22 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 			if(CollectionUtils.isNotEmpty(sysUsers)){
 				thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList());
 			}
-			try {
-				FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
-				feishuMsgVo.setTitle(msgTitle);
-				feishuMsgVo.setCnContentUpper(cnContentUpper);
-				feishuMsgVo.setCnContentLower(cnContentLower);
-				feishuMsgVo.setEnContentUpper(enContentUpper);
-				feishuMsgVo.setEnContentLower(enContentLower);
-				feishuMsgVo.setUrl(hrefFeishu);
-				feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
-				feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
-			} catch (IOException e) {
-				log.error("飞书消息推送失败");
-			}
+//
 			//系统内部跳转链接
 			//String href = "<a href='"
-			//		+ JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType()
+			//		+ JumpLinkEnum.INVENTORtry {
+			////				FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+			////				feishuMsgVo.setTitle(msgTitle);
+			////				feishuMsgVo.setCnContentUpper(cnContentUpper);
+			////				feishuMsgVo.setCnContentLower(cnContentLower);
+			////				feishuMsgVo.setEnContentUpper(enContentUpper);
+			////				feishuMsgVo.setEnContentLower(enContentLower);
+			////				feishuMsgVo.setUrl(hrefFeishu);
+			////				feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
+			//////				feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
+			////			} catch (IOException e) {
+			////				log.error("飞书消息推送失败");
+			////			}Y_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType()
 			//		+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
 			//		+ projectYearNameInfoEO.getYearName()
 			//		+ "&targetMarket=" + projectLibraryBase.getTargetMarket()
@@ -1510,19 +1510,19 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 			if(CollectionUtils.isNotEmpty(sysUsers)){
 				thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList());
 			}
-			try {
-				FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
-				feishuMsgVo.setTitle(msgTitle);
-				feishuMsgVo.setCnContentUpper(cnContentUpper);
-				feishuMsgVo.setCnContentLower(cnContentLower);
-				feishuMsgVo.setEnContentUpper(enContentUpper);
-				feishuMsgVo.setEnContentLower(enContentLower);
-				feishuMsgVo.setUrl(hrefFeishu);
-				feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
-				feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
-			} catch (IOException e) {
-				log.error("飞书消息推送失败");
-			}
+//			try {
+//				FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+//				feishuMsgVo.setTitle(msgTitle);
+//				feishuMsgVo.setCnContentUpper(cnContentUpper);
+//				feishuMsgVo.setCnContentLower(cnContentLower);
+//				feishuMsgVo.setEnContentUpper(enContentUpper);
+//				feishuMsgVo.setEnContentLower(enContentLower);
+//				feishuMsgVo.setUrl(hrefFeishu);
+//				feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
+////				feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
+//			} catch (IOException e) {
+//				log.error("飞书消息推送失败");
+//			}
 			//系统内部跳转链接
 			//String href = "<a href='"
 			//		+ JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType()
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java
index 726fdca56..d426afc92 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java
@@ -290,19 +290,19 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 				if(CollectionUtils.isNotEmpty(sysUsers)){
 					thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList());
 				}
-				try {
-					FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
-					feishuMsgVo.setTitle(msgTitle);
-					feishuMsgVo.setCnContentUpper(cnContentUpper);
-					feishuMsgVo.setCnContentLower(cnContentLower);
-					feishuMsgVo.setEnContentUpper(enContentUpper);
-					feishuMsgVo.setEnContentLower(enContentLower);
-					feishuMsgVo.setUrl(hrefFeishu);
-					feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
-					feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
-				} catch (IOException e) {
-					log.error("飞书消息推送失败");
-				}
+//				try {
+//					FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+//					feishuMsgVo.setTitle(msgTitle);
+//					feishuMsgVo.setCnContentUpper(cnContentUpper);
+//					feishuMsgVo.setCnContentLower(cnContentLower);
+//					feishuMsgVo.setEnContentUpper(enContentUpper);
+//					feishuMsgVo.setEnContentLower(enContentLower);
+//					feishuMsgVo.setUrl(hrefFeishu);
+//					feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
+////					feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
+//				} catch (IOException e) {
+//					log.error("飞书消息推送失败");
+//				}
 				//系统内部跳转链接
 				//String href = "<a href='"
 				//		+ JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + projectLibraryBaseInfo.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType()
@@ -610,19 +610,19 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 				if(CollectionUtils.isNotEmpty(sysUsers)){
 					thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList());
 				}
-				try {
-					FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
-					feishuMsgVo.setTitle(msgTitle);
-					feishuMsgVo.setCnContentUpper(cnContentUpper);
-					feishuMsgVo.setCnContentLower(cnContentLower);
-					feishuMsgVo.setEnContentUpper(enContentUpper);
-					feishuMsgVo.setEnContentLower(enContentLower);
-					feishuMsgVo.setUrl(hrefFeishu);
-					feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
-					feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
-				} catch (IOException e) {
-					log.error("飞书消息推送失败");
-				}
+//				try {
+//					FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+//					feishuMsgVo.setTitle(msgTitle);
+//					feishuMsgVo.setCnContentUpper(cnContentUpper);
+//					feishuMsgVo.setCnContentLower(cnContentLower);
+//					feishuMsgVo.setEnContentUpper(enContentUpper);
+//					feishuMsgVo.setEnContentLower(enContentLower);
+//					feishuMsgVo.setUrl(hrefFeishu);
+//					feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
+////					feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
+//				} catch (IOException e) {
+//					log.error("飞书消息推送失败");
+//				}
 				//系统内部跳转链接
 				//String href = "<a href='"
 				//		+ JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + projectLibraryBaseInfo.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType()

From e4f72182ff30dcd557c6670860431a738ef27ff5 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 9 Oct 2023 14:52:32 +0800
Subject: [PATCH 237/288] =?UTF-8?q?=20=E5=B9=B3=E5=8F=B0=E4=BB=B6=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5=20=20=E5=B9=B3=E5=8F=B0=E4=BB=B6?=
 =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AE=A4=E8=AF=81=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql |   4 +
 .../PlatformTaskPlanningEOController.java     |  20 +-
 .../entity/PlatformTaskPlanningEO.java        |   3 +
 .../modules/platform/enums/UpAndDownEnum.java |  45 +++++
 .../IPlatformTaskPlanningEOService.java       |   8 +-
 ...PlatformProjectLibraryBaseServiceImpl.java |  58 +++++-
 .../PlatformTaskPlanningEOServiceImpl.java    |  78 ++++++--
 .../project/entity/ProjectLibraryBase.java    | 174 +++++++++---------
 8 files changed, 268 insertions(+), 122 deletions(-)
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/enums/UpAndDownEnum.java

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index 7f3547aba..19ad40a3f 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -1279,3 +1279,7 @@ ADD COLUMN `module_specification_code` varchar(255) NULL COMMENT '所用模块
 ADD COLUMN `cooling_method` varchar(255) NULL COMMENT '冷却方式' AFTER `module_specification_code`,
 ADD COLUMN `filing_completion_time` datetime(0) NULL COMMENT '备案完成时间' AFTER `cooling_method`,
 ADD COLUMN `remark` varchar(1000) NULL COMMENT '备注' AFTER `filing_completion_time`;
+
+--平台件合规认证计划添加标识字段2023-09-28
+ALTER TABLE `platform_task_planning`
+ADD COLUMN `flag` varchar(255) NULL COMMENT '位置标识（用来区分上下两部分数据，up->上，down->下）' AFTER `project_id`,
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformTaskPlanningEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformTaskPlanningEOController.java
index eb2e32349..005fc3917 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformTaskPlanningEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformTaskPlanningEOController.java
@@ -78,9 +78,9 @@ public class PlatformTaskPlanningEOController extends JeroController<PlatformTas
 	@AutoLog(value = "平台件合规认证计划-列表查询")
     @ApiOperation(value="平台件合规认证计划-列表查询", notes="平台件合规认证计划-列表查询")
 	@GetMapping(value = "/list")
-	public Result<List<PlatformTaskPlanningEO>> queryList(String projectId) {
-        List<PlatformTaskPlanningEO> list = platformTaskPlanningEOService.queryList(projectId);
-        return Result.OK(list);
+	public Result<?> queryList(String projectId) {
+		Map<String,Object> result = platformTaskPlanningEOService.queryList(projectId);
+        return Result.OK(result);
 	}
 
 	/**
@@ -106,9 +106,17 @@ public class PlatformTaskPlanningEOController extends JeroController<PlatformTas
 	@ApiOperation(value="平台件合规认证计划-批量添加", notes="平台件合规认证计划-批量添加")
 	@PostMapping(value = "/addBatch")
 	public Result<?> addBatch(@RequestBody Map<String,Object> data) {
-		JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(data.get("list")));
-		List<PlatformTaskPlanningEO> platformTaskPlanningEOList = jsonArray.toJavaList(PlatformTaskPlanningEO.class);
-		platformTaskPlanningEOService.addBatch(platformTaskPlanningEOList);
+//		JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(data.get("list")));
+//		JSONArray jsonArrayUp = JSONArray.parseArray(JSON.toJSONString(data.get("listUp")));
+//		JSONArray jsonArrayDown = JSONArray.parseArray(JSON.toJSONString(data.get("listDown")));
+//		List<PlatformTaskPlanningEO> platformTaskPlanningEOListUp = jsonArray.toJavaList(PlatformTaskPlanningEO.class);
+//		List<PlatformTaskPlanningEO> platformTaskPlanningEOListDown = jsonArray.toJavaList(PlatformTaskPlanningEO.class);
+//		platformTaskPlanningEOService.addBatch(platformTaskPlanningEOListUp,platformTaskPlanningEOListDown);
+		JSONArray jsonArrayUp = JSONArray.parseArray(JSON.toJSONString(data.get("listUp")));
+		JSONArray jsonArrayDown = JSONArray.parseArray(JSON.toJSONString(data.get("listDown")));
+		List<PlatformTaskPlanningEO> platformTaskPlanningEOListUp = jsonArrayUp.toJavaList(PlatformTaskPlanningEO.class);
+		List<PlatformTaskPlanningEO> platformTaskPlanningEOListDown = jsonArrayDown.toJavaList(PlatformTaskPlanningEO.class);
+		platformTaskPlanningEOService.addBatch(platformTaskPlanningEOListUp,platformTaskPlanningEOListDown);
 		return Result.OK("添加成功！");
 	}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/entity/PlatformTaskPlanningEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/entity/PlatformTaskPlanningEO.java
index e49019c50..fc9e52a8f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/entity/PlatformTaskPlanningEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/entity/PlatformTaskPlanningEO.java
@@ -93,4 +93,7 @@ public class PlatformTaskPlanningEO implements Serializable {
     @TableField(exist = false)
     private boolean isG;
 
+    //标识（用来区分上下两部分数据，up->上，down->下）
+    private String Flag;
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/enums/UpAndDownEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/enums/UpAndDownEnum.java
new file mode 100644
index 000000000..2bd57ebfb
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/enums/UpAndDownEnum.java
@@ -0,0 +1,45 @@
+package com.jero.modules.platform.enums;
+
+/**
+ * 任务状态枚举类
+ */
+public enum UpAndDownEnum {
+    UP("上部分","up"),
+    DOWN("下部分","down"),
+    ;
+
+
+    String name;
+    String value;
+
+    private UpAndDownEnum(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public static String getTextByValue(String value) {
+        UpAndDownEnum[] values = values();
+        for (UpAndDownEnum taskStatusEnum : values) {
+            if (taskStatusEnum.value.equals(value)) {
+                return taskStatusEnum.name;
+            }
+        }
+        return null;
+    }
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformTaskPlanningEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformTaskPlanningEOService.java
index 4e965dc96..08873412b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformTaskPlanningEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformTaskPlanningEOService.java
@@ -3,6 +3,7 @@ package com.jero.modules.platform.service;
 import com.jero.modules.platform.entity.PlatformTaskPlanningEO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 平台件合规认证计划
@@ -22,9 +23,10 @@ public interface IPlatformTaskPlanningEOService extends IService<PlatformTaskPla
 
 	/**
 	 * 平台件合规认证计划-批量添加
-	 * @param platformTaskPlanningEOList
+	 * @param platformTaskPlanningEOListUp
+	 * @param platformTaskPlanningEOListDown
 	 */
-	void addBatch(List<PlatformTaskPlanningEO> platformTaskPlanningEOList);
+	void addBatch(List<PlatformTaskPlanningEO> platformTaskPlanningEOListUp,List<PlatformTaskPlanningEO> platformTaskPlanningEOListDown);
 
 	/**
 	 * 更新
@@ -63,5 +65,5 @@ public interface IPlatformTaskPlanningEOService extends IService<PlatformTaskPla
 	 *
 	 * @return
 	 */
-    List<PlatformTaskPlanningEO> queryList(String projectId);
+	Map<String,Object> queryList(String projectId);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
index 47ab2c106..0fa1ddf45 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
@@ -1057,7 +1057,6 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 
 		List<ProjectLibraryBase> result = this.list(queryWrapper);
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-
 		List<SysDictItem> dictItemList = sysDictItemMapper.selectItemsByDictCode(DictCodeEnum.BRAND.getValue());
 
 		//置顶
@@ -1068,9 +1067,29 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 			wrapper.in(TopProjectEO::getCreateBy,loginUser.getUsername()).in(TopProjectEO::getProjectLibraryBaseId,idList).orderByDesc(TopProjectEO::getSort);
 			topProjectEOList = iTopProjectEOService.list(wrapper);
 		}
+		//列表中的法规工程师和工程接口人
+		List<SysUser> sysUserList = getSysUserList(result);
 		//目标市场数据字典
-//		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
+		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
 		for(ProjectLibraryBase projectLibraryBase: result){
+			if(ObjectUtils.isNotEmpty(sysUserList)){
+				//法规工程师
+				if(StringUtils.isNotBlank(projectLibraryBase.getRegulationOwnerId())){
+					List<SysUser> collect = sysUserList.stream()
+							.filter(e -> e.getId().equals(projectLibraryBase.getRegulationOwnerId())).collect(Collectors.toList());
+					if(ObjectUtils.isNotEmpty(collect)){
+						projectLibraryBase.setRegulationOwnerIdName(collect.get(0).getUsername());
+					}
+				}
+				//工程接口人
+				if(StringUtils.isNotBlank(projectLibraryBase.getEngineeringInterfacePerson())){
+					List<SysUser> collect = sysUserList.stream()
+							.filter(e -> e.getId().equals(projectLibraryBase.getEngineeringInterfacePerson())).collect(Collectors.toList());
+					if(ObjectUtils.isNotEmpty(collect)){
+						projectLibraryBase.setEngineeringInterfacePersonName(collect.get(0).getUsername());
+					}
+				}
+			}
 			//处理品牌
 			List<SysDictItem> sysDictItemList = dictItemList.stream()
 					.filter(e -> e.getItemValue().equals(projectLibraryBase.getBrand())).collect(Collectors.toList());
@@ -1098,14 +1117,14 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 			}
 
 			//目标市场
-//			Map<String,Object> param = new HashMap<>();
-//			param.put("cut",cut);
-//			String targetMarket = getMarket(param, targetMarketList, projectLibraryBase);
-//			//项目名称（功率-生产商-目标市场）
-//			String projectName = projectLibraryBase.getPower() + "-" + projectLibraryBase.getProducer() + "-" + targetMarket;
-//			projectLibraryBase.setProjectNameId(projectName);//原设计平台件项目名称去这个字段值
-//			//平台件项目名称改为拼接的形式，projectNameId不在存数据，如果这个变更影响其他的地方，项目名称取值可以取projectName的值
-//			projectLibraryBase.setProjectName(projectName);
+			Map<String,Object> param = new HashMap<>();
+			param.put("cut",cut);
+			String targetMarket = getMarket(param, targetMarketList, projectLibraryBase);
+			//项目名称（功率-生产商-目标市场）
+			String projectName = projectLibraryBase.getPower() + "-" + projectLibraryBase.getProducer() + "-" + targetMarket;
+			projectLibraryBase.setProjectNameId(projectName);//原设计平台件项目名称去这个字段值
+			//平台件项目名称改为拼接的形式，projectNameId不在存数据，如果这个变更影响其他的地方，项目名称取值可以取projectName的值
+			projectLibraryBase.setProjectName(projectName);
 		}
 
 		if(ObjectUtils.isEmpty(params.get("orderByField"))){
@@ -1121,6 +1140,25 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 		return result;
 	}
 
+	private List<SysUser> getSysUserList(List<ProjectLibraryBase> result) {
+		List<String> RegulationOwnerIdList = result.stream().map(ProjectLibraryBase::getRegulationOwnerId).distinct().collect(Collectors.toList());
+		List<String> EngineeringInterfacePersonList = result.stream().map(ProjectLibraryBase::getEngineeringInterfacePerson).distinct().collect(Collectors.toList());
+		List<String> userIdList = new ArrayList<>();
+		if(ObjectUtils.isNotEmpty(RegulationOwnerIdList)){
+			userIdList.addAll(RegulationOwnerIdList);
+		}
+		if(ObjectUtils.isNotEmpty(EngineeringInterfacePersonList)){
+			userIdList.addAll(EngineeringInterfacePersonList);
+		}
+		List<SysUser> sysUserList = new ArrayList<>();
+		if(ObjectUtils.isNotEmpty(userIdList)){
+			QueryWrapper<SysUser> userqueryWrapper = new QueryWrapper<>();
+			userqueryWrapper.in("id ", userIdList);
+			sysUserList = sysUserMapper.selectList(userqueryWrapper);
+		}
+		return sysUserList;
+	}
+
 	private void hearSort(Map<String, Object> params, List<ProjectLibraryBase> resultList) {
 		if(ObjectUtils.isNotEmpty(params.get("orderByField"))){
 			Collator comparator = Collator.getInstance(Locale.CHINESE);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java
index c66620ffa..fed2b22e6 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java
@@ -3,16 +3,20 @@ package com.jero.modules.platform.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.modules.platform.entity.PlatformTaskPlanningEO;
+import com.jero.modules.platform.enums.UpAndDownEnum;
 import com.jero.modules.platform.mapper.PlatformTaskPlanningEOMapper;
 import com.jero.modules.platform.service.IPlatformTaskPlanningEOService;
 import com.jero.modules.project.enums.PlanStatusEnum;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -40,23 +44,33 @@ public class PlatformTaskPlanningEOServiceImpl extends ServiceImpl<PlatformTaskP
 
 	/**
 	 * 平台件合规认证计划-批量添加
-	 * @param platformTaskPlanningEOList
+	 * @param platformTaskPlanningEOListUp
+	 * @param platformTaskPlanningEOListDown
 	 */
 	@Override
-    public void addBatch(List<PlatformTaskPlanningEO> platformTaskPlanningEOList) {
-		if(!platformTaskPlanningEOList.isEmpty()){
+    public void addBatch(List<PlatformTaskPlanningEO> platformTaskPlanningEOListUp,List<PlatformTaskPlanningEO> platformTaskPlanningEOListDown) {
+		if(!platformTaskPlanningEOListUp.isEmpty()){
 			//先删除在新增
 //			LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 			LambdaQueryWrapper<PlatformTaskPlanningEO> wrapper = new LambdaQueryWrapper<>();
 //			wrapper.eq(PlatformTaskPlanningEO::getCreateBy,loginUser.getUsername());
-			wrapper.eq(PlatformTaskPlanningEO::getProjectId,platformTaskPlanningEOList.get(0).getProjectId());
+			wrapper.eq(PlatformTaskPlanningEO::getProjectId,platformTaskPlanningEOListUp.get(0).getProjectId());
 			this.remove(wrapper);
-			for (PlatformTaskPlanningEO platformTaskPlanningEO : platformTaskPlanningEOList) {
+
+			for (PlatformTaskPlanningEO platformTaskPlanningEO : platformTaskPlanningEOListUp) {
 				Date now = new Date();
 				platformTaskPlanningEO.setCreateTime(now);
 				platformTaskPlanningEO.setUpdateTime(now);
+				platformTaskPlanningEO.setFlag("up");
 			}
-			saveBatch(platformTaskPlanningEOList);
+			for (PlatformTaskPlanningEO platformTaskPlanningEO : platformTaskPlanningEOListDown) {
+				Date now = new Date();
+				platformTaskPlanningEO.setCreateTime(now);
+				platformTaskPlanningEO.setUpdateTime(now);
+				platformTaskPlanningEO.setFlag("down");
+			}
+			saveBatch(platformTaskPlanningEOListUp);
+			saveBatch(platformTaskPlanningEOListDown);
 		}
     }
 
@@ -112,7 +126,7 @@ public class PlatformTaskPlanningEOServiceImpl extends ServiceImpl<PlatformTaskP
 	 * @return
 	 */
 	@Override
-    public List<PlatformTaskPlanningEO> queryList(String projectId) {
+    public Map<String,Object> queryList(String projectId) {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd");
 		Date date = null;
 		try {
@@ -124,21 +138,45 @@ public class PlatformTaskPlanningEOServiceImpl extends ServiceImpl<PlatformTaskP
 		wrapper.eq(PlatformTaskPlanningEO::getProjectId,projectId);
 		wrapper.orderByAsc(PlatformTaskPlanningEO::getNodeTime);
 		List<PlatformTaskPlanningEO> taskPlanningEOList = list(wrapper);
-		for (PlatformTaskPlanningEO platformTaskPlanningEO : taskPlanningEOList) {
-			platformTaskPlanningEO.setName(platformTaskPlanningEO.getNodeName());
-			platformTaskPlanningEO.setTime(platformTaskPlanningEO.getNodeTime());
-			platformTaskPlanningEO.setG(false);
-			if(ObjectUtils.isNotEmpty(platformTaskPlanningEO.getNodeTime())){
-				if(platformTaskPlanningEO.getNodeTime().after(date)){
-					platformTaskPlanningEO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
-				}else if(platformTaskPlanningEO.getNodeTime().before(date)){
-					platformTaskPlanningEO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
-				}else{
-					platformTaskPlanningEO.setStatus(PlanStatusEnum.ON_GOING.getValue());
+		Map<String,Object> result = new HashMap<>();
+		if(ObjectUtils.isEmpty(taskPlanningEOList)){
+			LambdaQueryWrapper<PlatformTaskPlanningEO> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper.isNull(PlatformTaskPlanningEO::getProjectId);
+			List<PlatformTaskPlanningEO> list = list(queryWrapper);
+
+			List<PlatformTaskPlanningEO> up = list.stream()
+					.filter(e -> StringUtils.isNotBlank(e.getFlag()) && UpAndDownEnum.UP.getValue().equals(e.getFlag())).collect(Collectors.toList());
+			List<PlatformTaskPlanningEO> down = list.stream()
+					.filter(e -> StringUtils.isNotBlank(e.getFlag()) && UpAndDownEnum.DOWN.getValue().equals(e.getFlag())).collect(Collectors.toList());
+
+			result.put("listUp",up);
+			result.put("listDown",down);
+
+		}else{
+			for (PlatformTaskPlanningEO platformTaskPlanningEO : taskPlanningEOList) {
+				platformTaskPlanningEO.setName(platformTaskPlanningEO.getNodeName());
+				platformTaskPlanningEO.setTime(platformTaskPlanningEO.getNodeTime());
+				platformTaskPlanningEO.setG(false);
+				if(ObjectUtils.isNotEmpty(platformTaskPlanningEO.getNodeTime())){
+					if(platformTaskPlanningEO.getNodeTime().after(date)){
+						platformTaskPlanningEO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
+					}else if(platformTaskPlanningEO.getNodeTime().before(date)){
+						platformTaskPlanningEO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
+					}else{
+						platformTaskPlanningEO.setStatus(PlanStatusEnum.ON_GOING.getValue());
+					}
 				}
 			}
+			taskPlanningEOList = taskPlanningEOList.stream().filter(e->ObjectUtils.isNotEmpty(e.getNodeTime())).collect(Collectors.toList());
+
+			List<PlatformTaskPlanningEO> up = taskPlanningEOList.stream()
+					.filter(e -> StringUtils.isNotBlank(e.getFlag()) && UpAndDownEnum.UP.getValue().equals(e.getFlag())).collect(Collectors.toList());
+			List<PlatformTaskPlanningEO> down = taskPlanningEOList.stream()
+					.filter(e -> StringUtils.isNotBlank(e.getFlag()) && UpAndDownEnum.DOWN.getValue().equals(e.getFlag())).collect(Collectors.toList());
+
+			result.put("listUp",up);
+			result.put("listDown",down);
 		}
-		taskPlanningEOList = taskPlanningEOList.stream().filter(e->ObjectUtils.isNotEmpty(e.getNodeTime())).collect(Collectors.toList());
-		return taskPlanningEOList;
+		return result;
     }
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
index 6c08fb090..c88c5812e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
@@ -166,89 +166,97 @@ public class ProjectLibraryBase implements Comparable<ProjectLibraryBase> {
 
     //平台件项目库字段--------------------------------------------------------------------------------------------------------------
 
-//    @ApiModelProperty(value = "功率")
-//    private String power;
-//
-//    @ApiModelProperty(value = "生产商")
-//    private String producer;
-//
-//    @ApiModelProperty(value = "责任部门")
-//    private String dutyDepart;
-//
-//    @ApiModelProperty(value = "法规工程师")
-//    private String regulationOwnerId;
-//
-//    @ApiModelProperty(value = "工程接口人")
-//    private String engineeringInterfacePerson;
-//
-//    @ApiModelProperty(value = "名牌标签")
-//    private String brandLabel;
-//
-//    @ApiModelProperty(value = "产品型号")
-//    private String productModel;
-//
-//    @ApiModelProperty(value = "电芯生产企业")
-//    private String cellEnterprise;
-//
-//    @ApiModelProperty(value = "总成生产企业")
-//    private String assemblyEnterprise;
-//
-//    @ApiModelProperty(value = "零件号（国内）")
-//    private String partNumberCn;
-//
-//    @ApiModelProperty(value = "零件号（国外）")
-//    private String part_numberEn;
-//
-//    @ApiModelProperty(value = "24位备案码")
-//    private String filingCode;
-//
-//    @ApiModelProperty(value = "供应商代码（1-3）")
-//    private String supplierCode;
-//
-//    @ApiModelProperty(value = "产品类型代码（4）")
-//    private String productTypeCode;
-//
-//    @ApiModelProperty(value = "电池类型代码（5）")
-//    private String batteryTypeCode;
-//
-//    @ApiModelProperty(value = "规格代码（6-7）")
-//    private String specificationCode;
-//
-//    @ApiModelProperty(value = "追溯代码（8）")
-//    private String traceabilityCode;
-//
-//    @ApiModelProperty(value = "生产也月日序列号")
-//    private String ymdNumber;
-//
-//    @ApiModelProperty(value = "尺寸")
-//    private String size;
-//
-//    @ApiModelProperty(value = "额定容量")
-//    private String ratedCapacity;
-//
-//    @ApiModelProperty(value = "标称电压")
-//    private String nominalVoltage;
-//
-//    @ApiModelProperty(value = "额定质量")
-//    private String ratedMass;
-//
-//    @ApiModelProperty(value = "包含模块个数")
-//    private String moduleNumber;
-//
-//    @ApiModelProperty(value = "模块串并联方式")
-//    private String connectionType;
-//
-//    @ApiModelProperty(value = "所用模块或单体规格代码")
-//    private String moduleSpecificationCode;
-//
-//    @ApiModelProperty(value = "冷却方式")
-//    private String coolingMethod;
-//
-//    @ApiModelProperty(value = "备案完成时间")
-//    private String filingCompletionTime;
-//
-//    @ApiModelProperty(value = "备注")
-//    private String remark;
+    @ApiModelProperty(value = "功率")
+    private String power;
+
+    @ApiModelProperty(value = "生产商")
+    private String producer;
+
+    @ApiModelProperty(value = "责任部门")
+    private String dutyDepart;
+
+    @ApiModelProperty(value = "法规工程师")
+    private String regulationOwnerId;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "法规工程师回显")
+    private String regulationOwnerIdName;
+
+    @ApiModelProperty(value = "工程接口人")
+    private String engineeringInterfacePerson;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "工程接口人回显")
+    private String engineeringInterfacePersonName;
+
+    @ApiModelProperty(value = "名牌标签")
+    private String brandLabel;
+
+    @ApiModelProperty(value = "产品型号")
+    private String productModel;
+
+    @ApiModelProperty(value = "电芯生产企业")
+    private String cellEnterprise;
+
+    @ApiModelProperty(value = "总成生产企业")
+    private String assemblyEnterprise;
+
+    @ApiModelProperty(value = "零件号（国内）")
+    private String partNumberCn;
+
+    @ApiModelProperty(value = "零件号（国外）")
+    private String part_numberEn;
+
+    @ApiModelProperty(value = "24位备案码")
+    private String filingCode;
+
+    @ApiModelProperty(value = "供应商代码（1-3）")
+    private String supplierCode;
+
+    @ApiModelProperty(value = "产品类型代码（4）")
+    private String productTypeCode;
+
+    @ApiModelProperty(value = "电池类型代码（5）")
+    private String batteryTypeCode;
+
+    @ApiModelProperty(value = "规格代码（6-7）")
+    private String specificationCode;
+
+    @ApiModelProperty(value = "追溯代码（8）")
+    private String traceabilityCode;
+
+    @ApiModelProperty(value = "生产也月日序列号")
+    private String ymdNumber;
+
+    @ApiModelProperty(value = "尺寸")
+    private String size;
+
+    @ApiModelProperty(value = "额定容量")
+    private String ratedCapacity;
+
+    @ApiModelProperty(value = "标称电压")
+    private String nominalVoltage;
+
+    @ApiModelProperty(value = "额定质量")
+    private String ratedMass;
+
+    @ApiModelProperty(value = "包含模块个数")
+    private String moduleNumber;
+
+    @ApiModelProperty(value = "模块串并联方式")
+    private String connectionType;
+
+    @ApiModelProperty(value = "所用模块或单体规格代码")
+    private String moduleSpecificationCode;
+
+    @ApiModelProperty(value = "冷却方式")
+    private String coolingMethod;
+
+    @ApiModelProperty(value = "备案完成时间")
+    private String filingCompletionTime;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
 
 
     @Override

From 31e3c04b5ff9e6b485d9ee9505ff41090b189fa1 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 9 Oct 2023 16:01:41 +0800
Subject: [PATCH 238/288] =?UTF-8?q?=20=E5=B9=B3=E5=8F=B0=E4=BB=B6-?=
 =?UTF-8?q?=E5=90=8D=E7=89=8C=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...PlatformProjectLibraryBaseServiceImpl.java | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
index 0fa1ddf45..1a2b323e6 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
@@ -23,6 +23,8 @@ import com.jero.modules.cert.template.enums.ControlTypeEnum;
 import com.jero.modules.dummy.enums.OrderEnum;
 import com.jero.modules.enums.DictCodeEnum;
 import com.jero.modules.feishu.enums.TemplateInfoEnum2;
+import com.jero.modules.oss.entity.OSSFile;
+import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.modules.ota.service.impl.OtaManageApplyEOServiceImpl;
 import com.jero.modules.platform.mapper.PlatformProjectLawsInventoryEOMapper;
 import com.jero.modules.platform.mapper.PlatformProjectLibraryBaseMapper;
@@ -194,6 +196,8 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 	private OtaManageApplyEOServiceImpl otaManageApplyEOService;
 	@Autowired
 	private SysDictItemMapper sysDictItemMapper;
+	@Autowired
+	private IOSSFileService iOSSFileService;
 
 	private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 	private static DecimalFormat df = new DecimalFormat("#.00");
@@ -217,7 +221,21 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 		projectLibraryBase.setCreateBy(sysUser.getUsername());
 		projectLibraryBase.setUpdateBy(sysUser.getUsername());
 
-		checkExitData(projectLibraryBase);
+//		checkExitData(projectLibraryBase);
+
+		if(StringUtils.isNotBlank(projectLibraryBase.getBrandLabel())){
+			String valueTemp = UUID.randomUUID().toString().replace("-", "");
+			projectLibraryBase.setBrandLabel(valueTemp);
+
+			List<OSSFile> oSSFileList = new ArrayList<>();
+			for (String fileId : projectLibraryBase.getBrandLabel().split(",")) {
+				OSSFile ossFile = new OSSFile();
+				ossFile.setId(fileId);
+				ossFile.setConnectId(valueTemp);
+				oSSFileList.add(ossFile);
+			}
+			iOSSFileService.updateFileInfo(oSSFileList);
+		}
 		save(projectLibraryBase);
 
 		//创建任务计划时间轴

From bc887fe1898f2c0e23bebb04201dfcafec1fc44f Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 9 Oct 2023 16:13:18 +0800
Subject: [PATCH 239/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ProjectDetails.vue             | 109 ++++++++++++++----
 .../components/addModel.vue                   |  99 ++++++++--------
 2 files changed, 141 insertions(+), 67 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
index 9d1842670..0187711b7 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
@@ -15,42 +15,52 @@
 
     <div class="content-text">
       <div class="text-field">
-        <span class="text-field-left" :title="$t('entryName')">{{$t('entryName')}}</span>
-        <span class="text-field-right" :title="queryForm.projectNameId"
-        >{{queryForm.projectNameId}}</span>
+        <span class="text-field-left" :title="$t('power')">{{$t('power')}}</span>
+        <span class="text-field-right" :title="queryForm.power"
+        >{{queryForm.power}}</span>
       </div>
+      <div class="text-field">
+        <span class="text-field-left" :title="$t('producer')">{{$t('producer')}}</span>
+        <span class="text-field-right" :title="queryForm.producer"
+        >{{queryForm.producer}}</span>
+      </div>
+      <div class="text-field">
+        <span class="text-field-left" :title="$t('targetMarket')">{{$t('targetMarket')}}</span>
+        <span class="text-field-right text-field-right-color"
+              :title="queryForm.targetMarket"
+        >{{queryForm.targetMarket}}</span>
+      </div>
+    </div>
+    <div class="content-text">
       <div class="text-field">
         <span class="text-field-left" :title="$t('brand')">{{$t('brand')}}</span>
         <span class="text-field-right" :title="queryForm.brandText"
         >{{queryForm.brandText}}</span>
       </div>
       <div class="text-field">
-        <span class="text-field-left" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
+        <span class="text-field-left" :title="$t('projectStatus')">{{$t('projectStatus')}}</span>
         <span class="text-field-right text-field-right-color"
-              :title="queryForm.ipdInfo"
-              @click="urlClick(queryForm.ipdInfo)"
-        >{{queryForm.ipdInfo}}</span>
+              :title="queryForm.projectStatus"
+        >{{queryForm.projectStatus}}</span>
+      </div>
+      <div class="text-field">
+        <span class="text-field-left" :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
+        <span class="text-field-right text-field-right-color"
+              :title="queryForm.dutyTerritory"
+        >{{queryForm.dutyTerritory}}</span>
       </div>
     </div>
     <div class="content-text">
       <div class="text-field">
         <span class="text-field-left" :title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span>
-        <span class="text-field-right" :title="queryForm.createBy"
-        >{{queryForm.createBy}}</span>
+        <span class="text-field-right" :title="queryForm.regulationOwnerIdName"
+        >{{queryForm.regulationOwnerIdName}}</span>
       </div>
       <div class="text-field">
-        <span class="text-field-left" :title="$t('dehicleDevelopmentPlan')">{{$t('dehicleDevelopmentPlan')}}</span>
+        <span class="text-field-left" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
         <span class="text-field-right text-field-right-color"
-              :title="queryForm.vehicleDevelopmentPlan"
-              @click="urlClick(queryForm.vehicleDevelopmentPlan)"
-        >{{queryForm.vehicleDevelopmentPlan}}</span>
-      </div>
-      <div class="text-field">
-        <span class="text-field-left" :title="$t('certificationProgram')">{{$t('certificationProgram')}}</span>
-        <span class="text-field-right text-field-right-color"
-              :title="queryForm.attestationPlan"
-              @click="urlClick(queryForm.attestationPlan)"
-        >{{queryForm.attestationPlan}}</span>
+              :title="queryForm.engineeringInterfacePersonName"
+        >{{queryForm.engineeringInterfacePersonName}}</span>
       </div>
     </div>
     <div class="content-text">
@@ -60,6 +70,31 @@
         >{{queryForm.explanation}}</span>
       </div>
     </div>
+    <div class="content-text">
+      <div class="text-field">
+        <span class="text-field-left" :title="$t('Nameplatelabel')">{{$t('Nameplatelabel')}}</span>
+        <div>
+          <!--                  brandLabel-->
+          <a-upload
+            :action="uploadAction+'?cut='+cut"
+            list-type="picture-card"
+            :file-list="fileList"
+            @preview="handlePreview"
+            @change="handleChange"
+          >
+            <div v-if="fileList.length < 20">
+              <a-icon type="plus" />
+              <div class="ant-upload-text">
+                <!--                        Upload-->
+              </div>
+            </div>
+          </a-upload>
+          <a-modal :visible="previewVisible" :footer="null" @cancel="handleCancelimg">
+            <img alt="example" style="width: 100%" :src="previewImage" />
+          </a-modal>
+        </div>
+      </div>
+    </div>
     <div class="box-text" style="margin-top: 10px;margin-bottom: 10px">
       <div class="header-text">
         {{$t('complianceCertificationProgram')}}
@@ -136,12 +171,31 @@
         },
         selectedRowKeys: [],
         idList: [],
+        previewVisible: false,
+        previewImage: '',
+        fileList: [],
+        projectNameList: [],
+        firstLevelDutyTerritoryList:[],
+        title: '',
+        uploadAction: window._CONFIG['domianURL'] + '/sys/common/upload',
+        state: undefined,
+        myuploadAction: window._CONFIG['domianURL'] + this.thisFileUploadUrl,
+        upDataList: [],
+        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
         regulatoryCertificationTaskPlanList: []
       }
     },
     mounted() {
       this.getForm()
       this.administrators = false
+      let long = localStorage.getItem('language')
+      this.cut = ''
+      if (long && long == 'zh-cn') {
+        this.cut = 'cn'
+      } else if (long && long == 'en-us') {
+        this.cut = 'en'
+      }
       this.activeKey = this.$t('regulatoryComplianceManagement')
       if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
         this.userInfo().userRoleList.forEach(res => {
@@ -201,7 +255,20 @@
         downloadFile('/platform/projectLibraryBase/exportProjectProgressStatisticsXls',
           this.queryForm.projectNameId+'-'+this.queryForm.projectVersion+'-'+this.$t('projectProgressStatistics') + '.xls', query)
       },
-
+      handleCancelimg() {
+        this.previewVisible = false;
+      },
+      async handlePreview(file) {
+        if (!file.url && !file.preview) {
+          file.preview = await getBase64(file.originFileObj);
+        }
+        this.previewImage = file.url || file.preview;
+        this.previewVisible = true;
+      },
+      handleChange({ fileList }) {
+        this.fileList = fileList;
+        console.log(this.fileList)
+      },
       versionStatisticsClick() {
         this.$refs.versionStatisticsRef.addModel(JSON.parse(JSON.stringify(this.selectedRowKeys)))
       },
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
index 69b9bd99c..369d89a3b 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
@@ -77,7 +77,7 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-<!--                <span class="Required">*</span>-->
+                <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('projectStatus')">{{$t('projectStatus')}}</span>
               </div>
               <a-form-model-item class="itemModel-multi" prop="projectStatus">
@@ -100,7 +100,6 @@
                           allowClear
                           show-search
                           mode="multiple"
-                          class="box-input"
                           optionFilterProp="label"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           v-model="formInline.dutyTerritory">
@@ -121,7 +120,7 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-<!--                <span class="Required">*</span>-->
+                <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span>
               </div>
               <a-form-model-item class="itemModel" :prop="'regulationOwnerIdName'">
@@ -136,14 +135,15 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
+                <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="designDutyIdName">
-                <PersonnelSelection :query="{db_field_name:'designDutyId',db_field_txt:$t('regulatoryEngineer')}"
+              <a-form-model-item class="itemModel" prop="engineeringInterfacePersonName">
+                <PersonnelSelection :query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('regulatoryEngineer')}"
                                     :isSingleChoice="true"
                                     :personneQuery="formInline"
                                     @change="PersonnelSelectionChange"
-                                    v-model="formInline.designDutyIdName"/>
+                                    v-model="formInline.engineeringInterfacePersonName"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -156,12 +156,14 @@
               </div>
               <a-form-model-item class="itemModelimg" prop="explanation">
                 <div>
+<!--                  brandLabel-->
                   <a-upload
-                    :action="uploadAction+'?cut='+cut"
+                    :action="uploadAction+'?state='+state+'&cut='+cut"
                     list-type="picture-card"
                     :file-list="fileList"
                     @preview="handlePreview"
                     @change="handleChange"
+                    :headers="headers"
                   >
                     <div v-if="fileList.length < 20">
                       <a-icon type="plus" />
@@ -179,21 +181,6 @@
           </a-col>
         </a-row>
         <a-row :gutter="24">
-<!--          <a-col :span="12">-->
-<!--            <div class="box-title-text">-->
-<!--              <div class="title-text">-->
-<!--                <span class="title-text-text"-->
-<!--                      :title="$t('dehicleDevelopmentPlan')">{{$t('dehicleDevelopmentPlan')}}</span>-->
-<!--              </div>-->
-<!--              <a-form-model-item class="itemModel" :prop="'vehicleDevelopmentPlan'">-->
-<!--                <a-input class="box-input"-->
-<!--                         :disabled="disabled"-->
-<!--                         :maxLength="200"-->
-<!--                         v-model="formInline.vehicleDevelopmentPlan"-->
-<!--                         :placeholder="$t('PleaseEnter')+$t('dehicleDevelopmentPlan')"/>-->
-<!--              </a-form-model-item>-->
-<!--            </div>-->
-<!--          </a-col>-->
           <a-col :span="24">
             <div class="box-title-text">
               <div class="title-text">
@@ -203,7 +190,7 @@
                 <a-textarea :placeholder="$t('pleaseEnter')+$t('explain')"
                             v-model="formInline.explanation"
                             :maxLength="500"
-                            :rows="4"/>
+                            :rows="2"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -235,7 +222,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="Electriccellproductionenterprises">
                 <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Electriccellproductionenterprises')"
-                         v-model="formInline.Electriccellproductionenterprises"></a-input>
+                         v-model="formInline.cellEnterprise"></a-input>
               </a-form-model-item>
             </div>
           </a-col>
@@ -248,7 +235,7 @@
               </div>
               <a-form-model-item class="itemModel-multi" prop="Assemblymanufacturer">
                 <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Assemblymanufacturer')"
-                         v-model="formInline.Assemblymanufacturer"></a-input>
+                         v-model="formInline.assemblyEnterprise"></a-input>
               </a-form-model-item>
             </div>
           </a-col>
@@ -259,7 +246,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="PartNumberCN">
                 <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('PartNumberCN')"
-                         v-model="formInline.PartNumberCN"></a-input>
+                         v-model="formInline.partNumberCn"></a-input>
               </a-form-model-item>
             </div>
           </a-col>
@@ -272,7 +259,7 @@
               </div>
               <a-form-model-item class="itemModel-multi" prop="PartNumberEU">
                 <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('PartNumberEU')"
-                         v-model="formInline.PartNumberEU"></a-input>
+                         v-model="formInline.part_numberEn"></a-input>
               </a-form-model-item>
             </div>
           </a-col>
@@ -289,7 +276,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="bitfilecode">
                 <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('bitfilecode')"
-                         v-model="formInline.bitfilecode"></a-input>
+                         v-model="formInline.filingCode"></a-input>
               </a-form-model-item>
             </div>
           </a-col>
@@ -300,7 +287,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="endorcode">
                 <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Vendorcode') + '(1～3)'"
-                         v-model="formInline.endorcode"></a-input>
+                         v-model="formInline.supplierCode"></a-input>
               </a-form-model-item>
             </div>
           </a-col>
@@ -313,7 +300,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="Productclasscode">
                 <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Productclasscode') + '(4)'"
-                         v-model="formInline.Productclasscode"></a-input>
+                         v-model="formInline.productTypeCode"></a-input>
               </a-form-model-item>
             </div>
           </a-col>
@@ -324,7 +311,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="Batterytypecode">
                 <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Batterytypecode') + '(5)'"
-                         v-model="formInline.Batterytypecode"></a-input>
+                         v-model="formInline.batteryTypeCode"></a-input>
               </a-form-model-item>
             </div>
           </a-col>
@@ -337,7 +324,7 @@
               </div>
               <a-form-model-item class="itemModel-multi" prop="Specificationcode">
                 <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Specificationcode') + '(6～7)'"
-                         v-model="formInline.Specificationcode"></a-input>
+                         v-model="formInline.specificationCode"></a-input>
               </a-form-model-item>
             </div>
           </a-col>
@@ -348,7 +335,7 @@
               </div>
               <a-form-model-item class="itemModel-multi" prop="Traceinformationcode">
                 <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Traceinformationcode') + '(8～14)'"
-                         v-model="formInline.Traceinformationcode"></a-input>
+                         v-model="formInline.traceabilityCode"></a-input>
               </a-form-model-item>
             </div>
           </a-col>
@@ -361,7 +348,7 @@
               </div>
               <a-form-model-item class="itemModel-multi" prop="Productionyearmonthdateserialnumber">
                 <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Productionyearmonthdateserialnumber') + '(15～20)'"
-                         v-model="formInline.Productionyearmonthdateserialnumber"></a-input>
+                         v-model="formInline.ymdNumber"></a-input>
               </a-form-model-item>
             </div>
           </a-col>
@@ -378,7 +365,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="dimension">
                 <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('dimension')"
-                         v-model="formInline.dimension"></a-input>
+                         v-model="formInline.size"></a-input>
               </a-form-model-item>
             </div>
           </a-col>
@@ -389,7 +376,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="Ratedcapacity">
                 <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Ratedcapacity')"
-                         v-model="formInline.Ratedcapacity"></a-input>
+                         v-model="formInline.ratedCapacity"></a-input>
               </a-form-model-item>
             </div>
           </a-col>
@@ -402,7 +389,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="Nominalvoltage">
                 <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Nominalvoltage')"
-                         v-model="formInline.Nominalvoltage"></a-input>
+                         v-model="formInline.nominalVoltage"></a-input>
               </a-form-model-item>
             </div>
           </a-col>
@@ -413,7 +400,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="Ratedmass">
                 <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Ratedmass')"
-                         v-model="formInline.Ratedmass"></a-input>
+                         v-model="formInline.ratedMass"></a-input>
               </a-form-model-item>
             </div>
           </a-col>
@@ -426,7 +413,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="Numbercontainedmodules">
                 <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Numbercontainedmodules')"
-                         v-model="formInline.Numbercontainedmodules"></a-input>
+                         v-model="formInline.moduleNumber"></a-input>
               </a-form-model-item>
             </div>
           </a-col>
@@ -437,7 +424,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="Moduleseriesparallelmode">
                 <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Moduleseriesparallelmode')"
-                         v-model="formInline.Moduleseriesparallelmode"></a-input>
+                         v-model="formInline.connectionType"></a-input>
               </a-form-model-item>
             </div>
           </a-col>
@@ -450,7 +437,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="modulspecificationcodeused">
                 <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('modulspecificationcodeused')"
-                         v-model="formInline.modulspecificationcodeused"></a-input>
+                         v-model="formInline.moduleSpecificationCode"></a-input>
               </a-form-model-item>
             </div>
           </a-col>
@@ -461,7 +448,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="dimension">
                 <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('Coolingmode')"
-                         v-model="formInline.Coolingmode"></a-input>
+                         v-model="formInline.coolingMethod"></a-input>
               </a-form-model-item>
             </div>
           </a-col>
@@ -479,10 +466,10 @@
               <a-form-model-item class="itemModel" prop="designDueDate">
                 <a-date-picker class="box-input"
                                :placeholder="$t('PleaseSelect')+$t('Filingcompletiontime')"
-                               @change="dateChange({db_field_name:'designDueDate'})"
+                               @change="dateChange({db_field_name:'filingCompletionTime'})"
                                format="YYYY-MM-DD"
                                :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="formInline.designDueDate"
+                               v-model="formInline.filingCompletionTime"
                                style="width: 100%"/>
               </a-form-model-item>
             </div>
@@ -498,7 +485,7 @@
                 <a-textarea
                   :placeholder="$t('remarks')"
                   :maxLength="500"
-                  v-model="formInline.remark" :rows="4"/>
+                  v-model="formInline.remark" :rows="2"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -514,9 +501,11 @@
 
 <script>
   import PersonnelSelection from '@/components/PersonnelSelection/index'
+  import { ACCESS_TOKEN } from '@/store/mutation-types'
   import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
   import { mapGetters } from 'vuex'
   import moment from 'moment'
+  import Vue from 'vue'
 
   function getBase64(file) {
     return new Promise((resolve, reject) => {
@@ -691,7 +680,7 @@
               trigger: 'change'
             }
           ],
-          designDutyIdName: [
+          engineeringInterfacePersonName: [
             {
               required: true,
               message: this.$t('engineeringInterfacePerson') + this.$t('cannotEmpty'),
@@ -707,6 +696,7 @@
         projectNameList: [],
         firstLevelDutyTerritoryList:[],
         title: '',
+        headers: {},
         uploadAction: window._CONFIG['domianURL'] + '/sys/common/upload',
         state: undefined,
         myuploadAction: window._CONFIG['domianURL'] + this.thisFileUploadUrl,
@@ -715,6 +705,9 @@
         downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
       }
     },
+    created() {
+      this.containerId = 'container-ty-' + new Date().getTime()
+    },
     mounted() {
       this.getNameList()
       let long = localStorage.getItem('language')
@@ -740,6 +733,17 @@
       handleChange({ fileList }) {
         this.fileList = fileList;
         console.log(this.fileList)
+        let filelist = []
+        let filelistId = []
+        this.fileList.forEach((item => {
+          filelist.push(item.response)
+        }))
+        console.log(filelist,'111')
+        filelist.forEach((item => {
+          filelistId.push(item.result.id)
+        }))
+        this.formInline.brandLabel = filelistId.join(',')
+        this.formInline = { ...this.formInline }
       },
       getFirstLevelDutyTerritory() {
         getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
@@ -776,6 +780,9 @@
         this.formInline = {}
         this.getNameList()
         this.getFirstLevelDutyTerritory()
+        const token = Vue.ls.get(ACCESS_TOKEN)
+        this.headers = { 'X-Access-Token': token }
+        console.log(this.headers)
         this.formInline.regulationOwnerIdName = this.userInfo().username
         this.formInline.regulationOwnerId = this.userInfo().id
         this.formInline.projectVersion = '00'

From 4a20372ca3857735b804668443b4e65ba7e2baac Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 9 Oct 2023 16:18:58 +0800
Subject: [PATCH 240/288] =?UTF-8?q?=20=E5=B9=B3=E5=8F=B0=E4=BB=B6sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index 19ad40a3f..4a6488e9e 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -1249,7 +1249,7 @@ MODIFY COLUMN `lot` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_c
 MODIFY COLUMN `detection_report_location` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '检测报告位置' AFTER `experiment_file`,
 MODIFY COLUMN `explain_info` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '说明' AFTER `detection_report_location`;
 
---添加平台件项目库字段2023-09-28
+--添加平台件项目库字段2023-10-09
 ALTER TABLE `project_library_base`
 ADD COLUMN `power` varchar(255) NULL COMMENT '功率' AFTER `platform`,
 ADD COLUMN `producer` varchar(255) NULL COMMENT '生产商' AFTER `power`,
@@ -1269,17 +1269,17 @@ ADD COLUMN `battery_type_code` varchar(255) NULL COMMENT '电池类型代码' AF
 ADD COLUMN `specification_code` varchar(255) NULL COMMENT '规格代码' AFTER `battery_type_code`,
 ADD COLUMN `traceability_code` varchar(255) NULL COMMENT '追溯代码' AFTER `specification_code`,
 ADD COLUMN `ymd_number` varchar(255) NULL COMMENT '生产也月日序列号' AFTER `traceability_code`,
-ADD COLUMN `size` double(255, 0) NULL COMMENT '尺寸' AFTER `ymd_number`,
+ADD COLUMN `size` varchar(255) NULL COMMENT '尺寸' AFTER `ymd_number`,
 ADD COLUMN `rated_capacity` varchar(255) NULL COMMENT '额定容量' AFTER `size`,
 ADD COLUMN `nominal_voltage` varchar(255) NULL COMMENT '标称电压' AFTER `rated_capacity`,
 ADD COLUMN `rated_mass` varchar(255) NULL COMMENT '额定质量' AFTER `nominal_voltage`,
-ADD COLUMN `module_number` varchar(0) NULL COMMENT '包含模块个数' AFTER `rated_mass`,
+ADD COLUMN `module_number` varchar(255) NULL COMMENT '包含模块个数' AFTER `rated_mass`,
 ADD COLUMN `connection_type` varchar(255) NULL COMMENT '模块串并联方式' AFTER `module_number`,
 ADD COLUMN `module_specification_code` varchar(255) NULL COMMENT '所用模块或单体规格代码' AFTER `connection_type`,
 ADD COLUMN `cooling_method` varchar(255) NULL COMMENT '冷却方式' AFTER `module_specification_code`,
 ADD COLUMN `filing_completion_time` datetime(0) NULL COMMENT '备案完成时间' AFTER `cooling_method`,
 ADD COLUMN `remark` varchar(1000) NULL COMMENT '备注' AFTER `filing_completion_time`;
 
---平台件合规认证计划添加标识字段2023-09-28
+--平台件合规认证计划添加标识字段2023-10-09
 ALTER TABLE `platform_task_planning`
 ADD COLUMN `flag` varchar(255) NULL COMMENT '位置标识（用来区分上下两部分数据，up->上，down->下）' AFTER `project_id`,

From fad98d6fe8ad32bcba891ecd4b4845438929b86b Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 9 Oct 2023 17:11:41 +0800
Subject: [PATCH 241/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platformItemLibrary/index.vue             | 34 +++++++++----------
 .../components/ProjectDetails.vue             | 14 ++++----
 .../components/addModel.vue                   |  2 +-
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibrary/index.vue b/jero-web/src/views/projectManagement/platformItemLibrary/index.vue
index 58b9fa055..80e157daf 100644
--- a/jero-web/src/views/projectManagement/platformItemLibrary/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibrary/index.vue
@@ -23,15 +23,15 @@
                                  :triggerChange="false" :dictCode="'brand'"/>
             </div>
           </a-col>
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('configurationItem')">
-                <span>{{$t('configurationItem')}}</span>
-              </div>
-              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('configurationItem')"
-                       v-model="queryParam.ipdInfo"></a-input>
-            </div>
-          </a-col>
+<!--          <a-col :md="6" :sm="8">-->
+<!--            <div class="box-title-text">-->
+<!--              <div class="title-text" :title="$t('configurationItem')">-->
+<!--                <span>{{$t('configurationItem')}}</span>-->
+<!--              </div>-->
+<!--              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('configurationItem')"-->
+<!--                       v-model="queryParam.ipdInfo"></a-input>-->
+<!--            </div>-->
+<!--          </a-col>-->
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
 
@@ -161,14 +161,14 @@
             ellipsis: true,
             dataIndex: 'brandText'
           },
-          {
-            title: this.$t('configurationItem'),
-            align: 'left',
-            width: 180,
-            sorter:true,
-            ellipsis: true,
-            dataIndex: 'ipdInfo'
-          },
+          // {
+          //   title: this.$t('configurationItem'),
+          //   align: 'left',
+          //   width: 180,
+          //   sorter:true,
+          //   ellipsis: true,
+          //   dataIndex: 'ipdInfo'
+          // },
           {
             title: this.$t('explain'),
             align: 'left',
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
index 0187711b7..35b7f1650 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
@@ -26,7 +26,7 @@
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('targetMarket')">{{$t('targetMarket')}}</span>
-        <span class="text-field-right text-field-right-color"
+        <span class="text-field-right"
               :title="queryForm.targetMarket"
         >{{queryForm.targetMarket}}</span>
       </div>
@@ -39,13 +39,13 @@
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('projectStatus')">{{$t('projectStatus')}}</span>
-        <span class="text-field-right text-field-right-color"
-              :title="queryForm.projectStatus"
-        >{{queryForm.projectStatus}}</span>
+        <span class="text-field-right"
+              :title="queryForm.projectStatus_dictText"
+        >{{queryForm.projectStatus_dictText}}</span>
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
-        <span class="text-field-right text-field-right-color"
+        <span class="text-field-right"
               :title="queryForm.dutyTerritory"
         >{{queryForm.dutyTerritory}}</span>
       </div>
@@ -58,7 +58,7 @@
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
-        <span class="text-field-right text-field-right-color"
+        <span class="text-field-right"
               :title="queryForm.engineeringInterfacePersonName"
         >{{queryForm.engineeringInterfacePersonName}}</span>
       </div>
@@ -82,7 +82,7 @@
             @preview="handlePreview"
             @change="handleChange"
           >
-            <div v-if="fileList.length < 20">
+            <div v-if="fileList.length">
               <a-icon type="plus" />
               <div class="ant-upload-text">
                 <!--                        Upload-->
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
index 369d89a3b..0700f52f2 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
@@ -259,7 +259,7 @@
               </div>
               <a-form-model-item class="itemModel-multi" prop="PartNumberEU">
                 <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('PartNumberEU')"
-                         v-model="formInline.part_numberEn"></a-input>
+                         v-model="formInline.partNumberEn"></a-input>
               </a-form-model-item>
             </div>
           </a-col>

From db08300b48d2dc9eba1539c29194211b0997f755 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 9 Oct 2023 17:18:02 +0800
Subject: [PATCH 242/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E6=96=B0=E5=A2=9E-=E8=B4=A3=E4=BB=BB?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platformItemLibraryDetails/components/ProjectDetails.vue  | 4 ++--
 .../platformItemLibraryDetails/components/addModel.vue        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
index 35b7f1650..c32c87081 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
@@ -46,8 +46,8 @@
       <div class="text-field">
         <span class="text-field-left" :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
         <span class="text-field-right"
-              :title="queryForm.dutyTerritory"
-        >{{queryForm.dutyTerritory}}</span>
+              :title="queryForm.dutyTerritoryName"
+        >{{queryForm.dutyTerritoryName}}</span>
       </div>
     </div>
     <div class="content-text">
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
index 0700f52f2..ceaefcfc1 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
@@ -102,7 +102,7 @@
                           mode="multiple"
                           optionFilterProp="label"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                          v-model="formInline.dutyTerritory">
+                          v-model="formInline.dutyTerritoryName">
                   <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
                                    :key="key"
                                    :label="item.key"

From a400b959213939ded0eade97d8bf87545b4c8f99 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 9 Oct 2023 17:47:57 +0800
Subject: [PATCH 243/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E6=96=B0=E5=A2=9E-=E8=B4=A3=E4=BB=BB?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platformItemLibraryDetails/components/addModel.vue        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
index ceaefcfc1..c106be9c8 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
@@ -95,7 +95,7 @@
                 <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="dutyTerritory">
+              <a-form-model-item class="itemModel" prop="dutyTerritoryName">
                 <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
                           allowClear
                           show-search
@@ -666,7 +666,7 @@
               trigger: 'change'
             }
           ],
-          dutyTerritory: [
+          dutyTerritoryName: [
             {
               required: true,
               message: this.$t('statisticalNodes') + this.$t('cannotEmpty'),

From 8aaa0b02879246ac25453eaf6b0558aecc442b8e Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 9 Oct 2023 18:05:14 +0800
Subject: [PATCH 244/288] =?UTF-8?q?=20=E5=B9=B3=E5=8F=B0=E4=BB=B6=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xml/PlatformProjectLibraryBaseMapper.xml  | 28 +++++++++++++++++++
 ...PlatformProjectLibraryBaseServiceImpl.java | 24 ++++++++++++++++
 .../project/entity/ProjectLibraryBase.java    |  9 ++++--
 3 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectLibraryBaseMapper.xml
index 950018869..39c14ed4e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectLibraryBaseMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectLibraryBaseMapper.xml
@@ -52,6 +52,34 @@
             plb.sort,
             plb.flag,
             plb.brand,
+            plb.power,
+            plb.producer,
+            plb.duty_depart,
+            plb.regulation_owner_id,
+            plb.engineering_interface_person,
+            plb.brand_label,
+            plb.product_model,
+            plb.cell_enterprise,
+            plb.assembly_enterprise,
+            plb.part_number_cn,
+            plb.part_number_en,
+            plb.filing_code,
+            plb.supplier_code,
+            plb.product_type_code,
+            plb.battery_type_code,
+            plb.specification_code,
+            plb.traceability_code,
+            plb.ymd_number,
+            plb.size,
+            plb.rated_capacity,
+            plb.nominal_voltage,
+            plb.rated_mass,
+            plb.module_number,
+            plb.connection_type,
+            plb.module_specification_code,
+            plb.cooling_method,
+            plb.filing_completion_time,
+            plb.remark,
             sdi.item_text brandText,
             sdi.en_name brandTextEn
         from project_library_base as plb
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
index 1a2b323e6..ddfb25845 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
@@ -47,6 +47,7 @@ import com.jero.modules.project.enums.DesignComplianceStatusEnum;
 import com.jero.modules.project.enums.HSStatisticalNodesEnum;
 import com.jero.modules.project.enums.OperatorTypeEnum;
 import com.jero.modules.project.enums.PermissionDescriptionEnum;
+import com.jero.modules.project.enums.ProjectInventoryFieldEnum;
 import com.jero.modules.project.enums.ProjectRoleEnum;
 import com.jero.modules.project.enums.ProjectTaskPlanningNameEnum;
 import com.jero.modules.project.enums.ProjectUserLocationEnum;
@@ -1474,6 +1475,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 	@Override
 	public void disposeData(List<ProjectLibraryBase> records,String cut,boolean disposeTargetMarketFlag) {
 		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
+		List<SysUser> sysUserList = getSysUserList(records);
 		for (ProjectLibraryBase projectLibraryBase : records) {
 			List<SysUser> sysUsers = new ArrayList<>();
 			//认证工程师多个id查询
@@ -1504,6 +1506,28 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 					}
 				}
 			}
+			//法规工程师
+			if(StringUtils.isNotBlank(projectLibraryBase.getRegulationOwnerId())){
+				List<SysUser> collect = sysUserList.stream()
+						.filter(e -> e.getId().equals(projectLibraryBase.getRegulationOwnerId())).collect(Collectors.toList());
+				if(ObjectUtils.isNotEmpty(collect)){
+					projectLibraryBase.setRegulationOwnerIdName(collect.get(0).getUsername());
+				}
+			}
+			//工程接口人
+			if(StringUtils.isNotBlank(projectLibraryBase.getEngineeringInterfacePerson())){
+				List<SysUser> collect = sysUserList.stream()
+						.filter(e -> e.getId().equals(projectLibraryBase.getEngineeringInterfacePerson())).collect(Collectors.toList());
+				if(ObjectUtils.isNotEmpty(collect)){
+					projectLibraryBase.setEngineeringInterfacePersonName(collect.get(0).getUsername());
+				}
+			}
+			//责任部门
+			if(StringUtils.isNotBlank(projectLibraryBase.getDutyDepart())){
+				List<SysDictItem> sysDictItems = sysDictItemServiceImpl.getBaseMapper().selectItemsAll();
+				String dutyDepartName = platformProjectLawsInventoryEOService.disposeShowDictItemValue(sysDictItems, projectLibraryBase.getDutyDepart(), cut, ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
+				projectLibraryBase.setDutyDepartName(dutyDepartName);
+			}
 
 			if(disposeTargetMarketFlag){
 				if(StringUtils.isNotEmpty(projectLibraryBase.getTargetMarket())){
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
index c88c5812e..a26c94a13 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
@@ -175,6 +175,9 @@ public class ProjectLibraryBase implements Comparable<ProjectLibraryBase> {
     @ApiModelProperty(value = "责任部门")
     private String dutyDepart;
 
+    @TableField(exist = false)
+    private String dutyDepartName;
+
     @ApiModelProperty(value = "法规工程师")
     private String regulationOwnerId;
 
@@ -205,7 +208,7 @@ public class ProjectLibraryBase implements Comparable<ProjectLibraryBase> {
     private String partNumberCn;
 
     @ApiModelProperty(value = "零件号（国外）")
-    private String part_numberEn;
+    private String partNumberEn;
 
     @ApiModelProperty(value = "24位备案码")
     private String filingCode;
@@ -253,7 +256,9 @@ public class ProjectLibraryBase implements Comparable<ProjectLibraryBase> {
     private String coolingMethod;
 
     @ApiModelProperty(value = "备案完成时间")
-    private String filingCompletionTime;
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private java.util.Date filingCompletionTime;
 
     @ApiModelProperty(value = "备注")
     private String remark;

From c2f89cc447477bca8d5d14a4c00b12cec3673740 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Mon, 9 Oct 2023 18:07:23 +0800
Subject: [PATCH 245/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=92=8C=E5=B8=82=E5=9C=BA=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=20=20=E6=B7=BB=E5=8A=A0=E5=A4=87=E6=B3=A8?=
 =?UTF-8?q?=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/AuthDummyInventoryInfoEO.java      |  5 ++
 .../AuthDummyInventoryInfoEOServiceImpl.java  | 22 +++++----
 .../ProjectCertificationInventoryEO.java      |  5 ++
 ...ctCertificationInventoryEOServiceImpl.java | 30 +++++++++---
 .../certificationList/components/addModel.vue | 49 ++++++++++++++++++-
 .../components/certificationList/index.vue    |  7 +++
 .../components/addModel.vue                   | 24 +++++++++
 .../components/editModel.vue                  | 31 +++++++++++-
 .../certificationListMaintenance.vue          |  7 +++
 9 files changed, 161 insertions(+), 19 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java
index f627832be..43f046ec2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java
+++ b/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;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
index 6ddfe2164..091cf57c6 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
+++ b/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());
-				authDummyInventoryInfoEO.setBussDocumentLibraryId(collect.get(0).getId());
+						.filter(e -> e.getSerialNumber().trim().equals(authDummyInventoryInfoEO.getSerialNumber().trim())).collect(Collectors.toList());
+				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;
 			}
 
 			//创建临时文件夹
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java
index e08add5f6..816d2d002 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java
+++ b/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;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index c9c01689f..2bfe78073 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/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;
 			}
 
 			//创建临时文件夹
diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
index 633656b76..3bb460671 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
+++ b/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 {
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 38bf2c360..a190ab5c6 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/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',
diff --git a/jero-web/src/views/virtualAuthenticationList/components/addModel.vue b/jero-web/src/views/virtualAuthenticationList/components/addModel.vue
index afafd88e3..a77a5f720 100644
--- a/jero-web/src/views/virtualAuthenticationList/components/addModel.vue
+++ b/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>
\ No newline at end of file
diff --git a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue
index 741455b05..0e5e4a6eb 100644
--- a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue
+++ b/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>
\ No newline at end of file
diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
index 2cbaa8960..229b5bca9 100644
--- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
+++ b/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',

From 65e421194054ea0b9d68c458c9ef2dd44dc37c50 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 10 Oct 2023 09:10:23 +0800
Subject: [PATCH 246/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platformItemLibraryDetails/components/addModel.vue      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
index c106be9c8..0700f52f2 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
@@ -95,14 +95,14 @@
                 <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="dutyTerritoryName">
+              <a-form-model-item class="itemModel" prop="dutyTerritory">
                 <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
                           allowClear
                           show-search
                           mode="multiple"
                           optionFilterProp="label"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                          v-model="formInline.dutyTerritoryName">
+                          v-model="formInline.dutyTerritory">
                   <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
                                    :key="key"
                                    :label="item.key"
@@ -666,7 +666,7 @@
               trigger: 'change'
             }
           ],
-          dutyTerritoryName: [
+          dutyTerritory: [
             {
               required: true,
               message: this.$t('statisticalNodes') + this.$t('cannotEmpty'),

From 5517232554529e5311e194b2bf8223c2cf8c45fc Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 10 Oct 2023 09:31:13 +0800
Subject: [PATCH 247/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E6=96=B0=E5=A2=9E-=E8=B4=A3=E4=BB=BB?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ProjectDetails.vue                         | 8 ++++----
 .../platformItemLibraryDetails/components/addModel.vue    | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
index c32c87081..03c37202d 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
@@ -27,8 +27,8 @@
       <div class="text-field">
         <span class="text-field-left" :title="$t('targetMarket')">{{$t('targetMarket')}}</span>
         <span class="text-field-right"
-              :title="queryForm.targetMarket"
-        >{{queryForm.targetMarket}}</span>
+              :title="queryForm.targetMarket_dictText"
+        >{{queryForm.targetMarket_dictText}}</span>
       </div>
     </div>
     <div class="content-text">
@@ -46,8 +46,8 @@
       <div class="text-field">
         <span class="text-field-left" :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
         <span class="text-field-right"
-              :title="queryForm.dutyTerritoryName"
-        >{{queryForm.dutyTerritoryName}}</span>
+              :title="queryForm.dutyDepartName"
+        >{{queryForm.dutyDepartName}}</span>
       </div>
     </div>
     <div class="content-text">
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
index 0700f52f2..80e23eaf1 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
@@ -95,14 +95,14 @@
                 <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="dutyTerritory">
+              <a-form-model-item class="itemModel" prop="dutyDepart">
                 <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
                           allowClear
                           show-search
                           mode="multiple"
                           optionFilterProp="label"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                          v-model="formInline.dutyTerritory">
+                          v-model="formInline.dutyDepart">
                   <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
                                    :key="key"
                                    :label="item.key"
@@ -666,7 +666,7 @@
               trigger: 'change'
             }
           ],
-          dutyTerritory: [
+          dutyDepart: [
             {
               required: true,
               message: this.$t('statisticalNodes') + this.$t('cannotEmpty'),

From 771ea4868a4db943172ca11899a55987963e6d56 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 10 Oct 2023 09:54:00 +0800
Subject: [PATCH 248/288] =?UTF-8?q?=20=E5=B9=B3=E5=8F=B0=E4=BB=B6->?=
 =?UTF-8?q?=E5=90=8D=E7=89=8C=E6=A0=87=E7=AD=BEURL=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PlatformProjectLibraryBaseServiceImpl.java  | 12 ++++++++++--
 .../modules/project/entity/ProjectLibraryBase.java   |  3 +++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
index ddfb25845..9e4d6b8d3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
@@ -226,8 +226,6 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 
 		if(StringUtils.isNotBlank(projectLibraryBase.getBrandLabel())){
 			String valueTemp = UUID.randomUUID().toString().replace("-", "");
-			projectLibraryBase.setBrandLabel(valueTemp);
-
 			List<OSSFile> oSSFileList = new ArrayList<>();
 			for (String fileId : projectLibraryBase.getBrandLabel().split(",")) {
 				OSSFile ossFile = new OSSFile();
@@ -236,6 +234,8 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 				oSSFileList.add(ossFile);
 			}
 			iOSSFileService.updateFileInfo(oSSFileList);
+
+			projectLibraryBase.setBrandLabel(valueTemp);
 		}
 		save(projectLibraryBase);
 
@@ -1528,6 +1528,14 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 				String dutyDepartName = platformProjectLawsInventoryEOService.disposeShowDictItemValue(sysDictItems, projectLibraryBase.getDutyDepart(), cut, ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
 				projectLibraryBase.setDutyDepartName(dutyDepartName);
 			}
+			//名牌标签
+			if(StringUtils.isNotBlank(projectLibraryBase.getBrandLabel())){
+				List<OSSFile> fileList = iOSSFileService.getFileInfosByConnectId(projectLibraryBase.getBrandLabel());
+				if(ObjectUtils.isNotEmpty(fileList)){
+					List<String> urlList = fileList.stream().map(OSSFile::getUrl).collect(Collectors.toList());
+					projectLibraryBase.setUrlList(urlList);
+				}
+			}
 
 			if(disposeTargetMarketFlag){
 				if(StringUtils.isNotEmpty(projectLibraryBase.getTargetMarket())){
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
index a26c94a13..0fa5d5c54 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
@@ -263,6 +263,9 @@ public class ProjectLibraryBase implements Comparable<ProjectLibraryBase> {
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    @TableField(exist = false)
+    private List<String> urlList;
+
 
     @Override
     public int compareTo(ProjectLibraryBase o) {

From 12d4c293b9d58a597c119a5930094fee35b1186b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 10 Oct 2023 10:20:01 +0800
Subject: [PATCH 249/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E8=BD=A6=E5=9E=8B?=
 =?UTF-8?q?-=E7=94=B5=E5=AD=90=E6=8E=A7=E5=88=B6=E5=99=A8=E6=96=87?=
 =?UTF-8?q?=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/zh-cn.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 2ec4f21a5..849acdc3e 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1863,7 +1863,7 @@ module.exports = {
   NA: '不涉及',
   reviewAndPass: '审查通过',
   reviewAndReturn: '审查退回',
-  electroniccontrollerparameter: '电子控制器参数',
+  electroniccontrollerparameter: '控制器参数',
   marketRegulationListDetails: '市场法规清单详情',
   marketRegulationList: '市场法规清单',
   onlyDataWithTheCurrentCanBeManipulated: '仅能操作责任人为当前用户的数据',
@@ -3769,7 +3769,7 @@ module.exports = {
   NA: '不涉及',
   reviewAndPass: '审查通过',
   reviewAndReturn: '审查退回',
-  electroniccontrollerparameter: '电子控制器参数',
+  electroniccontrollerparameter: '控制器参数',
   marketRegulationListDetails: '市场法规清单详情',
   marketRegulationList: '市场法规清单',
   onlyDataWithTheCurrentCanBeManipulated: '仅能操作责任人为当前用户的数据',

From 7a52087ec3265f25ec961e172c2d269df21011ba Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 10 Oct 2023 11:18:04 +0800
Subject: [PATCH 250/288] =?UTF-8?q?=20=E5=B9=B3=E5=8F=B0=E4=BB=B6-?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E6=A8=A1=E6=9D=BF=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E5=92=8C=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctCertificationInventoryEOServiceImpl.java | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
index 31f23a177..8878e44fe 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
@@ -4555,11 +4555,11 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 		if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
 			title = "*类别,*检验项目,*认证类型,*WVTA ID," +
 					"*标准编号,*责任领域,*工程接口人,*责任人," +
-					"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称";
+					"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称,备注";
 		}else {
 			title = "*Category,*Inspection Items,*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(".");
@@ -4675,7 +4675,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 								if (i == 0) {
 									cell.setCellType(HSSFCell.CELL_TYPE_STRING);
 									headerSb.append(cell.getStringCellValue() + ",");
-									if(j == 14){
+									if(j == 15){
 										break;
 									}
 								} else if(i > 1){
@@ -5823,6 +5823,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 			case "产品型号": return "productModel";
 			case "生产企业名称": return "productionEnterpriseName";
 			case "认证进度": return "certificationProgress";
+			case "备注": return "remark";
 
 			case "*Category": return "category";
 			case "*Inspection Items": return "inspectionItem";
@@ -5842,6 +5843,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 			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," +
@@ -5866,19 +5868,19 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
 				title = "*类别,*检验项目,*认证类型,*WVTA ID," +
 						"*标准编号,*责任领域,*工程接口人,*责任人," +
-						"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称";
+						"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称,备注";
 			}else {
 				title = "*Category,*Inspection Items,*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;
 			}
 
 			//创建临时文件夹
@@ -5902,7 +5904,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 			cellStyleTemp.setWrapText(true);//自动换行
 
 			CellRangeAddress region =
-					new CellRangeAddress(1, 1, 0, 13); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列
+					new CellRangeAddress(1, 1, 0, 14); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列
 			sheet.addMergedRegion(region);
 			String explain= "";
 			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
@@ -6071,8 +6073,10 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 			String projectLibraryId = pciList.get(0).getProjectLibraryId();
 			ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
 			if(ObjectUtils.isNotEmpty(projectLibraryBase)){
-				List<SysUser> studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(Arrays.asList(projectLibraryBase.getStudioEngineer().split(",")));
-
+				List<SysUser> studioEngineerUserInfo = new ArrayList<>();
+				if(StringUtils.isNotBlank(projectLibraryBase.getStudioEngineer())){
+					studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(Arrays.asList(projectLibraryBase.getStudioEngineer().split(",")));
+				}
 				String certificationEngineerUserNames = "";
 				if(StringUtils.isNotBlank(projectLibraryBase.getCertificationEngineer())){
 					List<String> certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));

From e58f12a973083d7d6e07cba1d65adb649225dc72 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 10 Oct 2023 11:36:28 +0800
Subject: [PATCH 251/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E5=90=88=E8=A7=84=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   2 +
 jero-web/src/common/lang/zh-cn.js             |   2 +
 .../components/ProjectDetails.vue             |  34 ++++--
 .../components/addModel.vue                   |  27 +++++
 .../components/settingList.vue                | 113 +++++++++++++++---
 5 files changed, 154 insertions(+), 24 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 6d135d413..b83a7c3c3 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -2015,4 +2015,6 @@ module.exports = {
   modulspecificationcodeused:'The module or monomer specification code used',
   Coolingmode:'Cooling mode',
   Filingcompletiontime:'Filing completion time',
+  Platformdevelopmentvalvepoint:'Platform development valve point',
+  Compliancemanagementvalvepoint:'Compliance management valve point',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 96aabdcd6..eb0d941b9 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -3971,4 +3971,6 @@ module.exports = {
   modulspecificationcodeused:'所用模块或单体规格代码',
   Coolingmode:'冷却方式',
   Filingcompletiontime:'备案完成时间',
+  Platformdevelopmentvalvepoint:'平台件开发阀点',
+  Compliancemanagementvalvepoint:'合规管理阀点',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
index 03c37202d..47dfb37fa 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
@@ -46,8 +46,8 @@
       <div class="text-field">
         <span class="text-field-left" :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
         <span class="text-field-right"
-              :title="queryForm.dutyDepartName"
-        >{{queryForm.dutyDepartName}}</span>
+              :title="queryForm.dutyDepart"
+        >{{queryForm.dutyDepart}}</span>
       </div>
     </div>
     <div class="content-text">
@@ -79,15 +79,16 @@
             :action="uploadAction+'?cut='+cut"
             list-type="picture-card"
             :file-list="fileList"
+            :disabled='true'
             @preview="handlePreview"
             @change="handleChange"
           >
-            <div v-if="fileList.length">
-              <a-icon type="plus" />
-              <div class="ant-upload-text">
-                <!--                        Upload-->
-              </div>
-            </div>
+<!--            <div v-if="fileList.length">-->
+<!--              <a-icon type="plus" />-->
+<!--              <div class="ant-upload-text">-->
+<!--                &lt;!&ndash;                        Upload&ndash;&gt;-->
+<!--              </div>-->
+<!--            </div>-->
           </a-upload>
           <a-modal :visible="previewVisible" :footer="null" @cancel="handleCancelimg">
             <img alt="example" style="width: 100%" :src="previewImage" />
@@ -217,6 +218,23 @@
             } else {
               this.queryForm.brandText = this.queryForm.brandText
             }
+            let file = []
+            getAction('sys/common/getFileInfos', { id: this.queryForm.brandLabel }).then((res) => {
+              if (res.success) {
+                console.log(res.result)
+                res.result.forEach((item =>{
+                  file.push({
+                    name : item.fileName,
+                    uid : item.id,
+                    url : item.url
+                  })
+                }))
+                console.log(file)
+                this.fileList = file
+              } else {
+                // this.$refs.uploadFile.perentHandleFunc()
+              }
+            })
           } else {
             this.queryForm = {}
           }
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
index 80e23eaf1..f0da57ff2 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
@@ -765,9 +765,32 @@
               let content = this.projectNameList.filter(res => {
                 return res.id == value.projectNameId
               })
+              if(value.dutyDepart){
+                value.dutyDepart = value.dutyDepart.split(',')
+              }
+              let file = []
+              getAction('sys/common/getFileInfos', { id: value.brandLabel }).then((res) => {
+                if (res.success) {
+                  console.log(res.result)
+                  res.result.forEach((item =>{
+                    file.push({
+                      name : item.fileName,
+                      uid : item.id,
+                      url : item.url
+                    })
+                  }))
+                  console.log(file)
+                  this.fileList = file
+                } else {
+                  // this.$refs.uploadFile.perentHandleFunc()
+                }
+              })
               this.formInline = value
               console.log(this.formInline)
+              this.formInline.engineeringInterfacePersonName = this.formInline.engineeringInterfacePersonName
+              this.formInline.regulationOwnerIdName = this.formInline.regulationOwnerIdName
               this.formInline = { ...this.formInline }
+              this.$forceUpdate()
             }
           } else {
             this.projectNameList = []
@@ -794,6 +817,9 @@
       editModel(value) {
         this.visible = true
         this.title = this.$t('edit')
+        const token = Vue.ls.get(ACCESS_TOKEN)
+        this.headers = { 'X-Access-Token': token }
+        console.log(this.headers)
         this.getNameList(value)
         this.$nextTick(() => {
           this.$refs.ruleForm.clearValidate()
@@ -815,6 +841,7 @@
               Action = postAction
             }
             let query = JSON.parse(JSON.stringify(this.formInline))
+            delete query.urlList
             Object.keys(query).forEach(res => {
               if (query[res] && query[res] instanceof Array) {
                 query[res] = query[res].join(',')
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
index 1c64a71b0..29e86e54d 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
@@ -11,7 +11,10 @@
     style="height: 100%;overflow: auto;padding-bottom: 53px;">
     <a-spin :spinning="confirmLoading">
       <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
-        <div v-for="(item,index) in formInline.list" :key="index">
+        <div class="header-text">
+          {{$t('Platformdevelopmentvalvepoint')}}
+        </div>
+        <div v-for="(item,index) in formInline.listUp" :key="index">
           <div style='margin-left: 25px'>
             <a-row :gutter="24">
               <a-col :span="12">
@@ -21,7 +24,7 @@
                     <span class="title-text-text" :title="$t('Nodename')">{{$t('Nodename')}}</span>
                   </div>
                   <a-form-model-item class="itemModel"
-                                     :prop="'list.'+index+'.nodeName'"
+                                     :prop="'listUp.'+index+'.nodeName'"
                                      :rules="[{ required:true,
                                      message: $t('Nodename') + $t('cannotEmpty'), trigger: 'blur'}]"
                   >
@@ -50,7 +53,55 @@
                 </div>
               </a-col>
               <a-icon class="icon-text" style='font-size: 20px;margin-top: 10px;' @click="addClick(index)" type="plus"/>
-              <a-icon class="icon-text" style='font-size: 20px;margin-top: 10px;' v-if="formInline.list.length > 1" @click="deleteClick(index)"
+              <a-icon class="icon-text" style='font-size: 20px;margin-top: 10px;' v-if="formInline.listUp.length > 1" @click="deleteClick(index)"
+                      type="minus" />
+            </a-row>
+          </div>
+
+        </div>
+        <div class="header-text">
+          {{$t('Compliancemanagementvalvepoint')}}
+        </div>
+        <div v-for="(item,index) in formInline.listDown" :key="index">
+          <div style='margin-left: 25px'>
+            <a-row :gutter="24">
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required">*</span>
+                    <span class="title-text-text" :title="$t('Nodename')">{{$t('Nodename')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel"
+                                     :prop="'listDown.'+index+'.nodeName'"
+                                     :rules="[{ required:true,
+                                     message: $t('Nodename') + $t('cannotEmpty'), trigger: 'blur'}]"
+                  >
+                    <a-input class="box-input"
+                             v-model="item.nodeName"
+                             :maxLength="200"
+                             :placeholder="$t('PleaseEnter')+$t('Nodename')"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+              <a-col :span="12"  style='margin-left: -49px'>
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="title-text-text" :title="$t('Nodedate')">{{$t('Nodedate')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel">
+                    <a-date-picker class="box-input"
+                                   :placeholder="$t('PleaseSelect')+$t('Nodedate')"
+                                   @change="dateChange(item,index)"
+                                   format="YYYY-MM-DD"
+                                   :getCalendarContainer="(trigger) => trigger.parentNode"
+                                   v-model="item.nodeTime"
+                                   :disabled="false"
+                                   style="width: 100%"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+              <a-icon class="icon-text" style='font-size: 20px;margin-top: 10px;' @click="addClickdown(index)" type="plus"/>
+              <a-icon class="icon-text" style='font-size: 20px;margin-top: 10px;' v-if="formInline.listDown.length > 1" @click="deleteClickdown(index)"
                       type="minus" />
             </a-row>
           </div>
@@ -77,7 +128,8 @@
         visible: false,
         confirmLoading: false,
         formInline: {
-          list:[{}]
+          listUp:[{}],
+          listDown:[{}],
         },
         rules: {
         },
@@ -88,15 +140,27 @@
     },
     methods: {
       addClick(index){
-        if(this.formInline.list.length > 19){
+        if(this.formInline.listUp.length > 19){
           this.$message.warning(this.$t('maximum'))
         }else{
-          this.formInline.list.splice(index + 1, 0, {})
+          this.formInline.listUp.splice(index + 1, 0, {})
         }
         this.formInline = { ...this.formInline }
       },
       deleteClick(index) {
-        this.formInline.list.splice(index, 1)
+        this.formInline.listUp.splice(index, 1)
+        this.formInline = { ...this.formInline }
+      },
+      addClickdown(index){
+        if(this.formInline.listDown.length > 19){
+          this.$message.warning(this.$t('maximum'))
+        }else{
+          this.formInline.listDown.splice(index + 1, 0, {})
+        }
+        this.formInline = { ...this.formInline }
+      },
+      deleteClickdown(index) {
+        this.formInline.listDown.splice(index, 1)
         this.formInline = { ...this.formInline }
       },
       edit() {
@@ -109,11 +173,12 @@
       settingQueryForm() {
         getAction(this.url.settingQueryForm, { projectId: this.$route.query.id }).then((res) => {
           if (res.success) {
-              this.formInline.list = res.result ? res.result : [{}]
+              this.formInline.listUp = res.result.listUp ? res.result.listUp : [{}]
+              this.formInline.listDown = res.result.listDown ? res.result.listDown : [{}]
             if(res.result==null ||res.result.length == 0){
-              this.formInline.list=[{}]
+              this.formInline.listUp=[{}]
+              this.formInline.listDown=[{}]
             }
-            console.log(this.formInline.list)
 
           }
         })
@@ -121,14 +186,23 @@
       handleOk() {
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
-            if(this.formInline.list){
-              this.formInline.list.forEach((item,index) => {
+            if(this.formInline.listUp){
+              this.formInline.listUp.forEach((item,index) => {
                 item.projectId = this.$route.query.id
                 if((item.nodeName == '' || item.nodeName == undefined) && (item.nodeTime == ''| item.nodeTime == undefined)){
-                  this.formInline.list.splice(index, 1) // 调用splice方法删除指定的对象
+                  this.formInline.listUp.splice(index, 1) // 调用splice方法删除指定的对象
                 }
               })
-              this.formInline.list = this.formInline.list
+              this.formInline.listUp = this.formInline.listUp
+            }
+            if(this.formInline.listDown){
+              this.formInline.listDown.forEach((item,index) => {
+                item.projectId = this.$route.query.id
+                if((item.nodeName == '' || item.nodeName == undefined) && (item.nodeTime == ''| item.nodeTime == undefined)){
+                  this.formInline.listDown.splice(index, 1) // 调用splice方法删除指定的对象
+                }
+              })
+              this.formInline.listDown = this.formInline.listDown
             }
             let query = {
               ...this.formInline,
@@ -160,12 +234,14 @@
       },
       handleCancel() {
         this.formInline = {
-          list:[{}]
+          listUp:[{}],
+          listDown:[{}],
         }
         this.visible = false
       },
       dateChange(item,index) {
-        this.formInline.list[index].danodeTimete = this.formInline.list[index].nodeTime ? moment(this.formInline.list[index].nodeTime).format('YYYY-MM-DD') : ''
+        this.formInline.listUp[index].danodeTimete = this.formInline.listUp[index].nodeTime ? moment(this.formInline.listUp[index].nodeTime).format('YYYY-MM-DD') : ''
+        this.formInline.listDown[index].danodeTimete = this.formInline.listDown[index].nodeTime ? moment(this.formInline.listDown[index].nodeTime).format('YYYY-MM-DD') : ''
       }
     }
   }
@@ -184,7 +260,12 @@
   /*.formAdd .ant-form-item {*/
   /*  margin-bottom: 20px;*/
   /*}*/
+  .header-text {
+    font-size: 16px;
+    color: #000000;
+    font-weight: bold;
 
+  }
   .itemModel .ant-form-item-control-wrapper {
     width: 100%;
   }

From 931c4fce8ddb548b9aa58ba1d01b8b3338069d0a Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 10 Oct 2023 11:39:23 +0800
Subject: [PATCH 252/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/certificationList/index.vue                 | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
index ee67a06a4..cd2d47208 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
@@ -820,6 +820,13 @@
             ellipsis: true,
             scopedSlots: { customRender: 'nameOfManufacturer' }
           },
+          {
+            title: this.$t('remarks'),
+            align: 'left',
+            dataIndex: 'remark',
+            width: 180,
+            ellipsis: true,
+          },
           {
             title: this.$t('operation'),
             align: 'left',

From 437abc423888bcca333040de6d951d47df48a1be Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 10 Oct 2023 13:59:42 +0800
Subject: [PATCH 253/288] =?UTF-8?q?=20=E5=B9=B3=E5=8F=B0=E4=BB=B6-?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProjectCertificationInventoryDutyEnginnerEO.java  | 4 ++++
 ...rojectCertificationInventoryDutyEnginnerEOEnPlatform.java | 4 ++++
 .../ProjectCertificationInventoryDutyEnginnerEOPlatform.java | 5 +++++
 .../entity/ProjectCertificationInventoryEOEnPlatform.java    | 4 ++++
 .../entity/ProjectCertificationInventoryEOPlatform.java      | 4 ++++
 5 files changed, 21 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEO.java
index 3aa2f9a18..c4734bc86 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEO.java
@@ -216,4 +216,8 @@ public class ProjectCertificationInventoryDutyEnginnerEO implements Serializable
 //    @Excel(name = "*截止日期", width = 20, format = "yyyy-MM-dd")
     @TableField(exist = false)
     private String endTimeStr;
+
+    @ApiModelProperty(value = "备注")
+//    @Excel(name = "备注", width = 50)
+    private String remark;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOEnPlatform.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOEnPlatform.java
index e76c51206..a615b5bd9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOEnPlatform.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOEnPlatform.java
@@ -215,4 +215,8 @@ public class ProjectCertificationInventoryDutyEnginnerEOEnPlatform implements Se
     //    @Excel(name = "截止日期", width = 20, format = "yyyy-MM-dd")
     @TableField(exist = false)
     private String endTimeStr;
+
+    @ApiModelProperty(value = "备注")
+    @Excel(name = "Remark", width = 50)
+    private String remark;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOPlatform.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOPlatform.java
index 9a75018d5..f667414db 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOPlatform.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOPlatform.java
@@ -192,6 +192,7 @@ public class ProjectCertificationInventoryDutyEnginnerEOPlatform implements Seri
     @ApiModelProperty(value = "认证进度备注")
     private String certificationProgressRemark;
 
+
     /**项目库id*/
     @ApiModelProperty(value = "项目库id")
     private String projectLibraryId;
@@ -215,4 +216,8 @@ public class ProjectCertificationInventoryDutyEnginnerEOPlatform implements Seri
 //    @Excel(name = "*截止日期", width = 20, format = "yyyy-MM-dd")
     @TableField(exist = false)
     private String endTimeStr;
+
+    @ApiModelProperty(value = "备注")
+    @Excel(name = "备注", width = 50)
+    private String remark;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEnPlatform.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEnPlatform.java
index 96ea4494c..c8a58fed9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEnPlatform.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEnPlatform.java
@@ -221,4 +221,8 @@ public class ProjectCertificationInventoryEOEnPlatform implements Serializable {
     @TableField(exist = false)
     private String endTimeStr;
 
+    @ApiModelProperty(value = "备注")
+    @Excel(name = "Remark", width = 50)
+    private String remark;
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOPlatform.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOPlatform.java
index 2acf6a6a1..0f0a69806 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOPlatform.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOPlatform.java
@@ -261,4 +261,8 @@ public class ProjectCertificationInventoryEOPlatform implements Serializable {
     @ApiModelProperty(value = "关联平台件数据")
     @TableField(exist = false)
     private List<ProjectCertificationInventoryEOPlatform> projectCertificationInventoryEOS;
+
+    @ApiModelProperty(value = "备注")
+    @Excel(name = "备注", width = 50)
+    private String remark;
 }

From e83f71ab0d1fd2df4924d7269328ca90687f3c3b Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 10 Oct 2023 14:20:58 +0800
Subject: [PATCH 254/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E5=90=88=E8=A7=84=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E8=AE=BE=E5=AE=9A=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platformItemLibraryDetails/components/settingList.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
index 29e86e54d..a86d844fa 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
@@ -171,7 +171,7 @@
         this.settingQueryForm()
       },
       settingQueryForm() {
-        getAction(this.url.settingQueryForm, { projectId: this.$route.query.id }).then((res) => {
+        getAction('platform/platformTaskPlanningEO/queryListUpdate', { projectId: this.$route.query.id }).then((res) => {
           if (res.success) {
               this.formInline.listUp = res.result.listUp ? res.result.listUp : [{}]
               this.formInline.listDown = res.result.listDown ? res.result.listDown : [{}]

From 38a8cb3d3345e87c3dab500570fd16b56393d3ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 10 Oct 2023 14:29:11 +0800
Subject: [PATCH 255/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/mapper/xml/ParamsManifestEOMapper.xml    | 12 ++++++------
 .../service/impl/ParamsManifestEOServiceImpl.java    |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
index ff57d79f1..3b8f336e0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
@@ -133,7 +133,7 @@
         left join project_name_info as pni on plb.project_name_id = pni.id
         left join project_year_name_info as pyni on plb.year_name_id=pyni.id
         ) tmp_tb
-        where 1=1 and state = #{state} and plb.platform is null
+        where 1=1 and state = #{state}
           <if test="projectName !=null and projectName !=''">
             AND project_name LIKE CONCAT(CONCAT('%',#{projectName}),'%')
           </if>
@@ -153,7 +153,7 @@
         left join project_name_info as pni on plb.project_name_id = pni.id
         left join project_year_name_info as pyni on plb.year_name_id=pyni.id
         ) tmp_tb
-        where 1=1 and plb.platform is null and id in
+        where 1=1 and id in
             <foreach collection="idList" index="index" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
@@ -175,7 +175,7 @@
         left join project_name_info as pni on plb.project_name_id = pni.id
         left join project_year_name_info as pyni on plb.year_name_id=pyni.id
         ) tmp_tb
-        where 1=1 and plb.platform is null and state = #{state}
+        where 1=1 and state = #{state}
           and id in(
                 SELECT pm.id AS pm FROM params_manifest pm
                 JOIN ( SELECT id FROM
@@ -183,7 +183,7 @@
                     FROM
                     project_library_base a
                     JOIN mysql.help_topic b ON b.help_topic_id &lt; ( length( a.certification_engineer ) - length( REPLACE ( a.certification_engineer, ',', '' ) ) + 1 )) temp
-                    WHERE user_id = #{userId} and platform is null) a ON pm.project_id = a.id
+                    WHERE user_id = #{userId}) a ON pm.project_id = a.id
 
                 UNION
                 SELECT DISTINCT pcm.params_manifest_id AS pm FROM params_collect_manifest pcm WHERE sdt = #{userName} and state in('2','5')
@@ -211,7 +211,7 @@
         left join project_name_info as pni on plb.project_name_id = pni.id
         left join project_year_name_info as pyni on plb.year_name_id = pyni.id
         ) tmp_tb
-        where project_id = #{projectId} and plb.platform is null
+        where project_id = #{projectId}
     </select>
 
     <select id="labelListForProjectDetails" resultType="java.util.LinkedHashMap">
@@ -232,7 +232,7 @@
               FROM
                   project_library_base a
                       JOIN mysql.help_topic b ON b.help_topic_id &lt; ( length( a.certification_engineer ) - length( REPLACE ( a.certification_engineer, ',', '' ) ) + 1 )) temp
-                        WHERE user_id = #{userId} and platform is null) a ON pm.project_id = a.id
+                        WHERE user_id = #{userId}) a ON pm.project_id = a.id
         where pm.state = #{state}
     </select>
 </mapper>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
index b475f1391..ae78fd2a6 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
@@ -619,6 +619,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
             for (ParamsCollectManifestEO oldCollectManifestEO : diffList) {
                 ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO();
                 updateCollectManifestEO.setId(oldCollectManifestEO.getId());
+                updateCollectManifestEO.setNioNumber(oldCollectManifestEO.getNioNumber());
                 updateCollectManifestEO.setState(CollectManifestStateEnum.CHANGE.getValue());
                 updateCollectManifestEO.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_BEFORE.getValue()); // 标记为变更前参数项
                 updateCollectManifestEO.setDelFlag(CollectManifestChangeFlagEnum.DELETE_AFTER.getValue()); // 因新发布模板中没有该参数项，标记为变更时已删除参数项

From c680aa7aa5ccef5cf398f5784d6039c7b5bae0f6 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 10 Oct 2023 15:00:09 +0800
Subject: [PATCH 256/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=20=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platformItemLibraryDetails/components/addModel.vue       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
index f0da57ff2..40bd35b50 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
@@ -787,8 +787,6 @@
               })
               this.formInline = value
               console.log(this.formInline)
-              this.formInline.engineeringInterfacePersonName = this.formInline.engineeringInterfacePersonName
-              this.formInline.regulationOwnerIdName = this.formInline.regulationOwnerIdName
               this.formInline = { ...this.formInline }
               this.$forceUpdate()
             }
@@ -817,6 +815,9 @@
       editModel(value) {
         this.visible = true
         this.title = this.$t('edit')
+        this.formInline.engineeringInterfacePersonName = value.engineeringInterfacePersonName
+        this.formInline.regulationOwnerIdName = value.regulationOwnerIdName
+        console.log(this.formInline.engineeringInterfacePersonName,this.formInline.engineeringInterfacePersonName)
         const token = Vue.ls.get(ACCESS_TOKEN)
         this.headers = { 'X-Access-Token': token }
         console.log(this.headers)

From af2573e5b3674283a1166036214a3eb9c823c757 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 10 Oct 2023 15:00:41 +0800
Subject: [PATCH 257/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E5=90=88?=
 =?UTF-8?q?=E8=A7=84=E8=AE=A4=E8=AF=81=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformTaskPlanningEOController.java     |  9 +++-
 .../IPlatformTaskPlanningEOService.java       |  9 +++-
 .../PlatformTaskPlanningEOServiceImpl.java    | 48 ++++++++++++++++++-
 3 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformTaskPlanningEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformTaskPlanningEOController.java
index 005fc3917..e63cfacc7 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformTaskPlanningEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformTaskPlanningEOController.java
@@ -79,7 +79,14 @@ public class PlatformTaskPlanningEOController extends JeroController<PlatformTas
     @ApiOperation(value="平台件合规认证计划-列表查询", notes="平台件合规认证计划-列表查询")
 	@GetMapping(value = "/list")
 	public Result<?> queryList(String projectId) {
-		Map<String,Object> result = platformTaskPlanningEOService.queryList(projectId);
+		List<PlatformTaskPlanningEO> platformTaskPlanningEOList = platformTaskPlanningEOService.queryList(projectId);
+		return Result.OK(platformTaskPlanningEOList);
+	}
+	@AutoLog(value = "平台件合规认证计划-编辑数据回显")
+    @ApiOperation(value="平台件合规认证计划-编辑数据回显", notes="平台件合规认证计划-编辑数据回显")
+	@GetMapping(value = "/queryListUpdate")
+	public Result<?> queryListUpdate(String projectId) {
+		Map<String,Object> result = platformTaskPlanningEOService.queryListUpdate(projectId);
         return Result.OK(result);
 	}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformTaskPlanningEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformTaskPlanningEOService.java
index 08873412b..475b182cf 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformTaskPlanningEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformTaskPlanningEOService.java
@@ -65,5 +65,12 @@ public interface IPlatformTaskPlanningEOService extends IService<PlatformTaskPla
 	 *
 	 * @return
 	 */
-	Map<String,Object> queryList(String projectId);
+	List<PlatformTaskPlanningEO> queryList(String projectId);
+
+	/**
+	 * 平台件合规认证计划-编辑数据回显
+	 * @param projectId
+	 * @return
+	 */
+	Map<String,Object> queryListUpdate(String projectId);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java
index fed2b22e6..8eb57ed93 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java
@@ -62,12 +62,14 @@ public class PlatformTaskPlanningEOServiceImpl extends ServiceImpl<PlatformTaskP
 				platformTaskPlanningEO.setCreateTime(now);
 				platformTaskPlanningEO.setUpdateTime(now);
 				platformTaskPlanningEO.setFlag("up");
+				platformTaskPlanningEO.setId(null);
 			}
 			for (PlatformTaskPlanningEO platformTaskPlanningEO : platformTaskPlanningEOListDown) {
 				Date now = new Date();
 				platformTaskPlanningEO.setCreateTime(now);
 				platformTaskPlanningEO.setUpdateTime(now);
 				platformTaskPlanningEO.setFlag("down");
+				platformTaskPlanningEO.setId(null);
 			}
 			saveBatch(platformTaskPlanningEOListUp);
 			saveBatch(platformTaskPlanningEOListDown);
@@ -126,7 +128,50 @@ public class PlatformTaskPlanningEOServiceImpl extends ServiceImpl<PlatformTaskP
 	 * @return
 	 */
 	@Override
-    public Map<String,Object> queryList(String projectId) {
+    public List<PlatformTaskPlanningEO> queryList(String projectId) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd");
+		Date date = null;
+		try {
+			date = sdf.parse(sdf.format(new Date()));
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+		LambdaQueryWrapper<PlatformTaskPlanningEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(PlatformTaskPlanningEO::getProjectId,projectId);
+		wrapper.isNotNull(PlatformTaskPlanningEO::getNodeTime);
+		wrapper.orderByAsc(PlatformTaskPlanningEO::getNodeTime);
+		List<PlatformTaskPlanningEO> taskPlanningEOList = list(wrapper);
+		if(ObjectUtils.isNotEmpty(taskPlanningEOList)){
+			for (PlatformTaskPlanningEO platformTaskPlanningEO : taskPlanningEOList) {
+				platformTaskPlanningEO.setName(platformTaskPlanningEO.getNodeName());
+				platformTaskPlanningEO.setTime(platformTaskPlanningEO.getNodeTime());
+
+				if(ObjectUtils.isNotEmpty(platformTaskPlanningEO.getNodeTime())){
+					if(platformTaskPlanningEO.getNodeTime().after(date)){
+						platformTaskPlanningEO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
+					}else if(platformTaskPlanningEO.getNodeTime().before(date)){
+						platformTaskPlanningEO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
+					}else{
+						platformTaskPlanningEO.setStatus(PlanStatusEnum.ON_GOING.getValue());
+					}
+				}
+
+				if(UpAndDownEnum.UP.getValue().equals(platformTaskPlanningEO.getFlag())){
+					platformTaskPlanningEO.setG(true);
+				}else if(UpAndDownEnum.DOWN.getValue().equals(platformTaskPlanningEO.getFlag())){
+					platformTaskPlanningEO.setG(false);
+				}
+			}
+		}
+		return taskPlanningEOList;
+    }
+    /**
+	 * 平台件合规认证计划-编辑数据回显
+	 *
+	 * @return
+	 */
+	@Override
+    public Map<String,Object> queryListUpdate(String projectId) {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd");
 		Date date = null;
 		try {
@@ -167,7 +212,6 @@ public class PlatformTaskPlanningEOServiceImpl extends ServiceImpl<PlatformTaskP
 					}
 				}
 			}
-			taskPlanningEOList = taskPlanningEOList.stream().filter(e->ObjectUtils.isNotEmpty(e.getNodeTime())).collect(Collectors.toList());
 
 			List<PlatformTaskPlanningEO> up = taskPlanningEOList.stream()
 					.filter(e -> StringUtils.isNotBlank(e.getFlag()) && UpAndDownEnum.UP.getValue().equals(e.getFlag())).collect(Collectors.toList());

From d8b272b48721f90ae972896931546c709b5894c0 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 10 Oct 2023 15:35:28 +0800
Subject: [PATCH 258/288] =?UTF-8?q?=20=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PlatformProjectLibraryBaseServiceImpl.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
index 9e4d6b8d3..888ce7c63 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
@@ -235,7 +235,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 			}
 			iOSSFileService.updateFileInfo(oSSFileList);
 
-			projectLibraryBase.setBrandLabel(valueTemp);
+//			projectLibraryBase.setBrandLabel(valueTemp);
 		}
 		save(projectLibraryBase);
 
@@ -1530,7 +1530,8 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 			}
 			//名牌标签
 			if(StringUtils.isNotBlank(projectLibraryBase.getBrandLabel())){
-				List<OSSFile> fileList = iOSSFileService.getFileInfosByConnectId(projectLibraryBase.getBrandLabel());
+				List<OSSFile> fileList = iOSSFileService.getFileInfos(projectLibraryBase.getBrandLabel());
+//				List<OSSFile> fileList = iOSSFileService.getFileInfosByConnectId(projectLibraryBase.getBrandLabel());
 				if(ObjectUtils.isNotEmpty(fileList)){
 					List<String> urlList = fileList.stream().map(OSSFile::getUrl).collect(Collectors.toList());
 					projectLibraryBase.setUrlList(urlList);

From c810bf73524c9b4521a4af15e4d6c179fdc49e2f Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 10 Oct 2023 15:40:48 +0800
Subject: [PATCH 259/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E5=90=88?=
 =?UTF-8?q?=E8=A7=84=E8=AE=A4=E8=AF=81=E8=AE=A1=E5=88=92=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index 4a6488e9e..11f8f6fc8 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -1283,3 +1283,21 @@ ADD COLUMN `remark` varchar(1000) NULL COMMENT '备注' AFTER `filing_completion
 --平台件合规认证计划添加标识字段2023-10-09
 ALTER TABLE `platform_task_planning`
 ADD COLUMN `flag` varchar(255) NULL COMMENT '位置标识（用来区分上下两部分数据，up->上，down->下）' AFTER `project_id`,
+
+--平台件合规认证计划初始化数据  2023-10-10
+INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `node_name`, `node_time`, `project_id`, `flag`) VALUES ('08ecf06f4f947836d0e95285fd8afb96', NULL, NULL, NULL, NULL, NULL, 'KO', NULL, NULL, 'up');
+INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `node_name`, `node_time`, `project_id`, `flag`) VALUES ('09e577fa7afa3a8cb26b9c8f29eaf8d9', NULL, NULL, NULL, NULL, NULL, 'RF', NULL, NULL, 'up');
+INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `node_name`, `node_time`, `project_id`, `flag`) VALUES ('17323a3d13e747e493c41e2e09bedc92', NULL, NULL, NULL, NULL, NULL, 'ADF', NULL, NULL, 'up');
+INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `node_name`, `node_time`, `project_id`, `flag`) VALUES ('1d8e6f4286e402ab55845fac79576683', NULL, NULL, NULL, NULL, NULL, 'BDF', NULL, NULL, 'up');
+INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `node_name`, `node_time`, `project_id`, `flag`) VALUES ('3f6174140af490d111a9b087580e29fc', NULL, NULL, NULL, NULL, NULL, 'BDR', NULL, NULL, 'up');
+INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `node_name`, `node_time`, `project_id`, `flag`) VALUES ('50dcbff0377f68f2e01f89b3677f7cef', NULL, NULL, NULL, NULL, NULL, 'CDF', NULL, NULL, 'up');
+INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `node_name`, `node_time`, `project_id`, `flag`) VALUES ('5b22bcbc6ac90933f96faa1371fe16dc', NULL, NULL, NULL, NULL, NULL, 'ESO', NULL, NULL, 'up');
+INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `node_name`, `node_time`, `project_id`, `flag`) VALUES ('7e98edcee56a14394e0fd9448132f2e0', NULL, NULL, NULL, NULL, NULL, 'SOP', NULL, NULL, 'up');
+INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `node_name`, `node_time`, `project_id`, `flag`) VALUES ('85fa6eb0b58d93d4cc76b8fb1d5248ca', NULL, NULL, NULL, NULL, NULL, '法规清单（KO+2~4w）', NULL, NULL, 'down');
+INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `node_name`, `node_time`, `project_id`, `flag`) VALUES ('97aaf07d156b6a4278e0ac3627566c8b', NULL, NULL, NULL, NULL, NULL, '责任确认（RF）', NULL, NULL, 'down');
+INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `node_name`, `node_time`, `project_id`, `flag`) VALUES ('a533416284ab81c7f6ee95b5e9e06d38', NULL, NULL, NULL, NULL, NULL, '设计核查（BDF）', NULL, NULL, 'down');
+INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `node_name`, `node_time`, `project_id`, `flag`) VALUES ('cd7d6332a42dd3855f0117ffb188f5b1', NULL, NULL, NULL, NULL, NULL, '强检报告（CDF前）', NULL, NULL, 'down');
+INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `node_name`, `node_time`, `project_id`, `flag`) VALUES ('e611b793756bf9caeb4a1c09526ceb76', NULL, NULL, NULL, NULL, NULL, 'E-mark（CDF前）', NULL, NULL, 'down');
+INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `node_name`, `node_time`, `project_id`, `flag`) VALUES ('e76e63a251aa6d64cac96125315805e1', NULL, NULL, NULL, NULL, NULL, 'CAMDS提交（CDF前）', NULL, NULL, 'down');
+INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `node_name`, `node_time`, `project_id`, `flag`) VALUES ('ee85c1b1964586e512ef0b2b401b16b5', NULL, NULL, NULL, NULL, NULL, '验证检查（ESO）', NULL, NULL, 'down');
+

From 7acfa5a34b6b08f5e99fe9e50055d28458d7da20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 10 Oct 2023 15:59:34 +0800
Subject: [PATCH 260/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=9B=BE=E7=89=87=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-dev.yml             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
index f8349666e..fe132998b 100644
--- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
+++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
@@ -130,7 +130,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://121.36.69.172:3307/laws_weilai_20230531?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
+          url: jdbc:mysql://121.36.69.172:3307/laws_weilai?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
 #          url: jdbc:mysql://127.0.0.1:3306/laws_weilai?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
           username: root
           password: hzwlsoft.com
@@ -220,12 +220,12 @@ jero :
     staticDomain: ??
   #腾讯云cos存储配置 测试桶
   cos:
-    secretId: AKIDoTt3xbz82g4C4f05tRjlX2HGEwOZU8Xf
-    secretKey: uYv3vXsxnNgjW4MN9j36tPfeNp1xe5GB
+    secretId: AKID4vWqtgCRP6WfaFdka9QQ8acMr88qHQJv
+    secretKey: LQDjywd3C3cuve6HBn7AvPbW9WbPwCAr
     region: ap-beijing
-    bucketName: dd-grp-laws-test-1253431691
+    bucketName: dd-grp-laws-1253431691
     appId: 1253431691
-    endPoint: https://dd-grp-laws-test-1253431691.cos.ap-beijing.myqcloud.com
+    endPoint: https://dd-grp-laws-1253431691.cos.ap-beijing.myqcloud.com
   # ElasticSearch 6设置
   elasticsearch:
     cluster-name: elasticsearch

From a556edcc35bb08a6ec1bc1818674840751cfe6ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 10 Oct 2023 16:00:08 +0800
Subject: [PATCH 261/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=9B=BE=E7=89=87=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ProjectDetails.vue             | 37 ++++++-----
 .../components/addModel.vue                   | 64 +++++++++++--------
 2 files changed, 58 insertions(+), 43 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
index 47dfb37fa..fc6ffae2a 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
@@ -219,22 +219,27 @@
               this.queryForm.brandText = this.queryForm.brandText
             }
             let file = []
-            getAction('sys/common/getFileInfos', { id: this.queryForm.brandLabel }).then((res) => {
-              if (res.success) {
-                console.log(res.result)
-                res.result.forEach((item =>{
-                  file.push({
-                    name : item.fileName,
-                    uid : item.id,
-                    url : item.url
-                  })
-                }))
-                console.log(file)
-                this.fileList = file
-              } else {
-                // this.$refs.uploadFile.perentHandleFunc()
-              }
-            })
+            if(this.queryForm.brandLabel){
+              let list = this.queryForm.brandLabel.split(',')
+              list.forEach((item => {
+                getAction('sys/common/getFileInfos', { id: item }).then((res) => {
+                  if (res.success) {
+                    console.log(res.result)
+                    res.result.forEach((item =>{
+                      file.push({
+                        name : item.fileName,
+                        uid : item.id,
+                        url : window._CONFIG['domianURL']+'/sys/split/file/getImage?fileUrl='+item.url
+                      })
+                    }))
+                    console.log(file)
+                    this.fileList = file
+                  } else {
+                    // this.$refs.uploadFile.perentHandleFunc()
+                  }
+                })
+              }))
+            }
           } else {
             this.queryForm = {}
           }
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
index 40bd35b50..16883fcf2 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
@@ -732,18 +732,23 @@
       },
       handleChange({ fileList }) {
         this.fileList = fileList;
-        console.log(this.fileList)
-        let filelist = []
         let filelistId = []
-        this.fileList.forEach((item => {
-          filelist.push(item.response)
-        }))
-        console.log(filelist,'111')
-        filelist.forEach((item => {
-          filelistId.push(item.result.id)
-        }))
-        this.formInline.brandLabel = filelistId.join(',')
-        this.formInline = { ...this.formInline }
+        let file = []
+        console.log(this.fileList)
+          this.fileList.forEach((item => {
+            if (item.response) {
+              file.push(item.response.result)
+            } else {
+              file.push(item)
+            }
+          }))
+        console.log(file)
+        file.forEach((item => {
+            filelistId.push(item.id || item.uid)
+          }))
+          console.log(filelistId,'111')
+          this.formInline.brandLabel = filelistId.join(',')
+          this.formInline = { ...this.formInline }
       },
       getFirstLevelDutyTerritory() {
         getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
@@ -769,22 +774,27 @@
                 value.dutyDepart = value.dutyDepart.split(',')
               }
               let file = []
-              getAction('sys/common/getFileInfos', { id: value.brandLabel }).then((res) => {
-                if (res.success) {
-                  console.log(res.result)
-                  res.result.forEach((item =>{
-                    file.push({
-                      name : item.fileName,
-                      uid : item.id,
-                      url : item.url
-                    })
-                  }))
-                  console.log(file)
-                  this.fileList = file
-                } else {
-                  // this.$refs.uploadFile.perentHandleFunc()
-                }
-              })
+              if(value.brandLabel){
+                let list = value.brandLabel.split(',')
+                list.forEach((item => {
+                  getAction('sys/common/getFileInfos', { id: item }).then((res) => {
+                    if (res.success) {
+                      console.log(res.result)
+                      res.result.forEach((item =>{
+                        file.push({
+                          name : item.fileName,
+                          uid : item.id,
+                          url : window._CONFIG['domianURL']+'/sys/split/file/getImage?fileUrl='+item.url
+                        })
+                      }))
+                      console.log(file)
+                      this.fileList = file
+                    } else {
+                      // this.$refs.uploadFile.perentHandleFunc()
+                    }
+                  })
+                }))
+              }
               this.formInline = value
               console.log(this.formInline)
               this.formInline = { ...this.formInline }

From 18da4e701a4d016830aae2590e0abd2f281a8270 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 10 Oct 2023 16:07:47 +0800
Subject: [PATCH 262/288] =?UTF-8?q?=20=E5=B9=B3=E5=8F=B0=E4=BB=B6=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95-=E5=8E=86=E5=8F=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...rojectCertificationInventoryEOServiceImpl.java | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
index 8878e44fe..02f0d6a96 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
@@ -6478,6 +6478,21 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 
 							savePciLogFlag = true;
 						}
+						if(!StringUtils.equals(editBeforePciEo.getRemark(),editAfterPciEo.getRemark())){
+							contentCnSb.append("\"").append("备注").append("\" ")
+									.append(StringUtils.isNotEmpty(editBeforePciEo.getRemark()) ? editBeforePciEo.getRemark() : "空")
+									.append(" 修改为 ")
+									.append(StringUtils.isNotEmpty(editAfterPciEo.getRemark()) ? editAfterPciEo.getRemark() : "空")
+									.append(",");
+
+							contentEnSb.append("\"").append("Remark").append("\" ")
+									.append(StringUtils.isNotEmpty(editBeforePciEo.getRemark()) ? editBeforePciEo.getRemark() : "null")
+									.append(" to ")
+									.append(StringUtils.isNotEmpty(editAfterPciEo.getRemark()) ? editAfterPciEo.getRemark() : "null")
+									.append(",");
+
+							savePciLogFlag = true;
+						}
 
 						if(savePciLogFlag){
 							ProjectCertificationInventoryLogEO pciLogEO = new ProjectCertificationInventoryLogEO();

From 5cf3c0c31a577de7aac85173e50fda5efd62ccb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 10 Oct 2023 16:13:57 +0800
Subject: [PATCH 263/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=20=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95=E5=A4=87=E6=B3=A8=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificationList/components/addModel.vue | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
index 9fc29bdf5..9329d3222 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
@@ -304,7 +304,20 @@
                     </a-form-model-item>
                   </div>
                 </a-col>
-
+                <a-col :span="12">
+                  <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" prop="remark">
+                      <a-textarea
+                        :placeholder="$t('PleaseEnter')+$t('remarks')"
+                        :disabled="false"
+                        class="box-input"
+                        v-model="item.remark" :rows="6"/>
+                    </a-form-model-item>
+                  </div>
+                </a-col>
               </a-row>
 
               <!--              <a-row :gutter="24">-->
@@ -559,6 +572,20 @@
                   </a-form-model-item>
                 </div>
               </a-col>
+              <a-col :span="12">
+                <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" prop="remark">
+                    <a-textarea
+                      :placeholder="$t('PleaseEnter')+$t('remarks')"
+                      :disabled="false"
+                      class="box-input"
+                      v-model="formInline.remark" :rows="6"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
             </a-row>
             <a-row :gutter="24">
               <a-col :span="12">

From f2d42fbf84f99823fba3c62541deca493a863682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 10 Oct 2023 17:15:13 +0800
Subject: [PATCH 264/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E4=BB=B6xml=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql                 | 4 ++--
 .../modules/cert/report/mapper/xml/ParamsReportEOMapper.xml   | 1 -
 .../report/mapper/xml/ParamsReportExportHistoryEOMapper.xml   | 1 -
 .../jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml    | 3 +--
 .../modules/project/mapper/xml/LawsComplianceBoardMapper.xml  | 2 +-
 .../com/jero/modules/project/mapper/xml/NcrTrackMapper.xml    | 1 -
 .../modules/project/mapper/xml/ProblemManagementEOMapper.xml  | 1 -
 .../jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml | 3 +--
 8 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index 11f8f6fc8..a02c7e021 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -1265,7 +1265,7 @@ ADD COLUMN `part_number_en` varchar(255) NULL COMMENT '零件号（国外）' AF
 ADD COLUMN `filing_code` varchar(255) NULL COMMENT '24位备案码' AFTER `part_number_en`,
 ADD COLUMN `supplier_code` varchar(255) NULL COMMENT '供应商代码' AFTER `filing_code`,
 ADD COLUMN `product_type_code` varchar(255) NULL COMMENT '产品类型代码' AFTER `supplier_code`,
-ADD COLUMN `battery_type_code` varchar(255) NULL COMMENT '电池类型代码' AFTER `Product_type _code`,
+ADD COLUMN `battery_type_code` varchar(255) NULL COMMENT '电池类型代码' AFTER `product_type_code`,
 ADD COLUMN `specification_code` varchar(255) NULL COMMENT '规格代码' AFTER `battery_type_code`,
 ADD COLUMN `traceability_code` varchar(255) NULL COMMENT '追溯代码' AFTER `specification_code`,
 ADD COLUMN `ymd_number` varchar(255) NULL COMMENT '生产也月日序列号' AFTER `traceability_code`,
@@ -1282,7 +1282,7 @@ ADD COLUMN `remark` varchar(1000) NULL COMMENT '备注' AFTER `filing_completion
 
 --平台件合规认证计划添加标识字段2023-10-09
 ALTER TABLE `platform_task_planning`
-ADD COLUMN `flag` varchar(255) NULL COMMENT '位置标识（用来区分上下两部分数据，up->上，down->下）' AFTER `project_id`,
+ADD COLUMN `flag` varchar(255) NULL COMMENT '位置标识（用来区分上下两部分数据，up->上，down->下）' AFTER `project_id`
 
 --平台件合规认证计划初始化数据  2023-10-10
 INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `node_name`, `node_time`, `project_id`, `flag`) VALUES ('08ecf06f4f947836d0e95285fd8afb96', NULL, NULL, NULL, NULL, NULL, 'KO', NULL, NULL, 'up');
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml
index 435a7ec0c..8f9924712 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml
@@ -34,7 +34,6 @@
 
     <sql id="BaseQuerySql">
         <where>
-            platform is null
             <if test="paramsReportEO != null">
                 <if test="paramsReportEO.title !=null and paramsReportEO.title !=''">
                     AND title LIKE CONCAT(CONCAT('%',#{paramsReportEO.title}),'%')
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml
index 4087b2fcd..75f07be76 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml
@@ -30,7 +30,6 @@
 
     <sql id="BaseQuerySql">
         <where>
-            plb.platform is null
             <if test="paramsReportExportHistoryEO != null">
                 <if test="paramsReportExportHistoryEO.projectName !=null and paramsReportExportHistoryEO.projectName !=''">
                     AND project_name LIKE CONCAT(CONCAT('%',#{paramsReportExportHistoryEO.projectName}),'%')
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
index 2c25f3741..7c83b88f7 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
@@ -135,7 +135,6 @@
 	    JOIN project_year_name_info pyni ON pyni.id = plb.year_name_id
         where plb.target_market =#{market}
         and pni.project_name =#{car}
-        and plb.platform is null
         GROUP BY plb.id
         ORDER BY project_version asc
     </select>
@@ -159,7 +158,7 @@
 	    LEFT JOIN ota_manage_apply oma ON oma.project_version = plb.id
 	    LEFT JOIN project_name_info pni ON pni.id = plb.project_name_id
 	    LEFT JOIN project_year_name_info pyni ON pyni.project_name_id = pni.id
-        WHERE oma.vdr = #{vdr} and plb.platform is null
+        WHERE oma.vdr = #{vdr}
         GROUP BY plb.id
     </select>
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml
index 001fd64de..ba76e12e3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml
@@ -108,7 +108,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
-            1=1 and plb.platform is null
+            1=1
             <if test="params.id != null and params.id != null">
                 and pli.stand_id = #{params.id}
             </if>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
index 2dfe3aea0..323bd8b58 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
@@ -196,7 +196,6 @@
         <foreach collection="list" index="index" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>
-        and plb.platform is null
         order by pli.create_time desc
 
     </select>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml
index 8dce3710c..cbb36f8ad 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml
@@ -53,7 +53,6 @@
         left join sys_user as studiouser on plb.studio_engineer=studiouser.id
         left join project_year_name_info as pyni on plb.year_name_id=pyni.id
         <where>
-            plb.platform is null
             <if test="ids != null and ids !=''">
                 and plb.id in
                 <foreach collection="ids.split(',')" index="index" item="item" open="(" separator="," close=")">
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml
index 145e0c75e..1d03212f0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml
@@ -34,9 +34,8 @@
         	LEFT JOIN project_name_info AS pni ON plb.project_name_id = pni.id
         	LEFT JOIN project_year_name_info AS pyni ON plb.year_name_id = pyni.id
         	LEFT JOIN sys_dict_item AS sdi ON sdi.item_value = plb.target_market
-        	where plb.platform is null and(
+        	where
         	plb.parent_id = #{parentId}
         	or plb.id = #{id}
-        	)
     </select>
 </mapper>

From 9da671305258a8f0b78cd6ec2242ab65a4ef78b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 11 Oct 2023 14:56:28 +0800
Subject: [PATCH 265/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ParamsCollectManifestHistoryEOServiceImpl.java       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
index 8ccda8b35..b54d7325b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
@@ -80,6 +80,10 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
 	@Override
 	public IPage queryList(IPage page, ParamsCollectManifestHistoryEO paramsCollectManifestHistoryEO, String cut, HttpServletRequest req) {
 		QueryWrapper<ParamsCollectManifestHistoryEO> queryWrapper = QueryGenerator.initQueryWrapper(paramsCollectManifestHistoryEO, req.getParameterMap());
+		String allNumber = req.getParameter("allNumber");
+		if(StringUtils.isNotBlank(allNumber)){
+			queryWrapper.lambda().eq(ParamsCollectManifestHistoryEO::getNioNumber,allNumber);
+		}
 		queryWrapper.lambda().notIn(ParamsCollectManifestHistoryEO::getControlType, ControlTypeEnum.Title.getValue())
 				.orderByAsc(ParamsCollectManifestHistoryEO::getNioNumber);
 

From ed9f70b178e64dd731354f1cebe3f9127fd34152 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 11 Oct 2023 16:24:56 +0800
Subject: [PATCH 266/288] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=EF=BC=88=E8=BD=A6=E5=9E=8B=E5=BA=93=EF=BC=8C=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E7=8A=B6=E6=80=81=E7=9C=8B=E6=9D=BF=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ParamsManifestEOServiceImpl.java     | 50 ++++++++++----
 ...formProjectLawsInventoryEOServiceImpl.java | 12 ++--
 ...PlatformProjectLibraryBaseServiceImpl.java | 66 +++----------------
 .../ProjectLawsInventoryEOServiceImpl.java    | 12 ++--
 .../impl/ProjectLibraryBaseServiceImpl.java   | 56 ----------------
 5 files changed, 65 insertions(+), 131 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
index ae78fd2a6..0cbc8deb9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
@@ -8,16 +8,32 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jero.common.api.vo.Result;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.vo.DictModel;
-import com.jero.modules.cert.collect.entity.*;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestHistoryEO;
+import com.jero.modules.cert.collect.entity.ParamsConfigDataEO;
+import com.jero.modules.cert.collect.entity.ParamsConfigDataHistoryEO;
+import com.jero.modules.cert.collect.entity.ParamsConfigEO;
+import com.jero.modules.cert.collect.entity.ParamsConfigHistoryEO;
+import com.jero.modules.cert.collect.entity.ParamsManifestEO;
+import com.jero.modules.cert.collect.entity.ParamsManifestHistoryEO;
 import com.jero.modules.cert.collect.enums.CollectManifestChangeFlagEnum;
 import com.jero.modules.cert.collect.enums.CollectManifestStateEnum;
 import com.jero.modules.cert.collect.enums.ManifestStateEnum;
-import com.jero.modules.cert.collect.mapper.*;
-import com.jero.modules.cert.collect.service.*;
+import com.jero.modules.cert.collect.mapper.ParamsCollectManifestEOMapper;
+import com.jero.modules.cert.collect.mapper.ParamsCollectManifestHistoryEOMapper;
+import com.jero.modules.cert.collect.mapper.ParamsConfigEOMapper;
+import com.jero.modules.cert.collect.mapper.ParamsManifestEOMapper;
+import com.jero.modules.cert.collect.mapper.ParamsManifestHistoryEOMapper;
+import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
+import com.jero.modules.cert.collect.service.IParamsConfigDataEOService;
+import com.jero.modules.cert.collect.service.IParamsConfigDataHistoryEOService;
+import com.jero.modules.cert.collect.service.IParamsConfigEOService;
+import com.jero.modules.cert.collect.service.IParamsConfigHistoryEOService;
+import com.jero.modules.cert.collect.service.IParamsManifestEOService;
+import com.jero.modules.cert.collect.service.IParamsManifestHistoryEOService;
 import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO;
 import com.jero.modules.cert.collect.vo.ParamsManifestVO;
 import com.jero.modules.cert.report.entity.ParamsReportEO;
@@ -29,7 +45,6 @@ import com.jero.modules.cert.template.enums.ControlTypeEnum;
 import com.jero.modules.cert.template.service.IParamsInfoPublishEOService;
 import com.jero.modules.cert.template.service.IParamsTemplateEOService;
 import com.jero.modules.enums.DictCodeEnum;
-import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
 import com.jero.modules.project.entity.ProjectRelatedPersonnel;
 import com.jero.modules.project.service.IProjectLibraryBaseService;
 import com.jero.modules.project.service.IProjectRelatedPersonnelService;
@@ -50,7 +65,16 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.NumberFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 /**
@@ -1241,20 +1265,24 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
                 for (SysDictItem dictItem : dutyTerritoryList) {
                     // 计算数量
                     notStartNumber += listAll.stream().filter(e -> (CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.get("state"))
-                            || CollectManifestStateEnum.SDT_BACK.getValue().equals(e.get("state"))
-                            || CollectManifestStateEnum.CHANGE.getValue().equals(e.get("state"))) && dictItem.getItemValue().equals(e.get("duty_territory")))
+                            || CollectManifestStateEnum.SDT_BACK.getValue().equals(e.get("state")))
+                            && dictItem.getItemValue().equals(e.get("duty_territory")))
                             .count(); // 未开始的参数项 数量
 
                     collectingNumber += listAll.stream().filter(e -> (CollectManifestStateEnum.WAIT_SDT.getValue().equals(e.get("state"))
                             || CollectManifestStateEnum.WAIT_FILL.getValue().equals(e.get("state"))
                             || CollectManifestStateEnum.DRE_BACK.getValue().equals(e.get("state"))
-                            || CollectManifestStateEnum.CERT_BACK.getValue().equals(e.get("state"))) && dictItem.getItemValue().equals(e.get("duty_territory")))
+                            || CollectManifestStateEnum.CERT_BACK.getValue().equals(e.get("state")))
+                            && dictItem.getItemValue().equals(e.get("duty_territory")))
                             .count(); // 收集中的参数项 数量
 
-                    submitNumber += listAll.stream().filter(e -> CollectManifestStateEnum.SUBMIT.getValue().equals(e.get("state")) && dictItem.getItemValue().equals(e.get("duty_territory")))
+                    submitNumber += listAll.stream().filter(e -> (CollectManifestStateEnum.SUBMIT.getValue().equals(e.get("state"))
+                            || CollectManifestStateEnum.CHANGE.getValue().equals(e.get("state")))
+                            && dictItem.getItemValue().equals(e.get("duty_territory")))
                             .count(); // 已提交的参数项 数量
 
-                    syncReportNumber += listAll.stream().filter(e -> CollectManifestStateEnum.SYNC_REPORT.getValue().equals(e.get("state")) && dictItem.getItemValue().equals(e.get("duty_territory")))
+                    syncReportNumber += listAll.stream().filter(e -> CollectManifestStateEnum.SYNC_REPORT.getValue().equals(e.get("state"))
+                            && dictItem.getItemValue().equals(e.get("duty_territory")))
                             .count(); // 已同步上报库的参数项 数量
                 }
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index 4e9c06391..f25ae55b1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -10147,7 +10147,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
 								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
 								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
-								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+//								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
 				);
 				return flag;
 			}).count();
@@ -10157,7 +10157,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 				boolean flag = (
 						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
 						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
-						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
+						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+//						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
 				);
 				return flag;
 			}).count();
@@ -10174,6 +10175,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 			nonComplianceCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
 				boolean flag = (
 						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue())
+						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
 				);
 				return flag;
 			}).count();
@@ -10219,7 +10221,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
 								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
 								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
-								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+//								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
 				);
 				return flag;
 			}).count();
@@ -10229,7 +10231,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 				boolean flag = (
 						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
 								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
-								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+//								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
 				);
 				return flag;
 			}).count();
@@ -10246,6 +10249,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 			nonComplianceCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
 				boolean flag = (
 						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue())
+						|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
 				);
 				return flag;
 			}).count();
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
index 888ce7c63..8f45a7c6a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
@@ -1007,7 +1007,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 	@Override
 	public List<ProjectLibraryBase> queryById(String id,String cut) {
 		List<ProjectLibraryBase> records = platformProjectLibraryBaseMapper.queryById(id);
-		disposeData(records,"",false);
+		disposeData(records,cut,false);
 		//目标市场数据字典
 		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
 		for(ProjectLibraryBase projectLibraryBase: records){
@@ -1537,6 +1537,15 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 					projectLibraryBase.setUrlList(urlList);
 				}
 			}
+			//目标市场
+			Map<String,Object> param = new HashMap<>();
+			param.put("cut",cut);
+			String targetMarketTemp = getMarket(param, targetMarketList, projectLibraryBase);
+			//项目名称（功率-生产商-目标市场）
+			String projectName = projectLibraryBase.getPower() + "-" + projectLibraryBase.getProducer() + "-" + targetMarketTemp;
+			projectLibraryBase.setProjectNameId(projectName);//原设计平台件项目名称去这个字段值
+			//平台件项目名称改为拼接的形式，projectNameId不在存数据，如果这个变更影响其他的地方，项目名称取值可以取projectName的值
+			projectLibraryBase.setProjectName(projectName);
 
 			if(disposeTargetMarketFlag){
 				if(StringUtils.isNotEmpty(projectLibraryBase.getTargetMarket())){
@@ -1615,31 +1624,6 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 			taskToConfirmMap.put("count",taskAffirmStatusCount);
 			result.put("taskToConfirmMap",taskToConfirmMap);
 
-			//当前项目状态统计   获取一个 最差的结果 统计的数据 就是studio看到的数据。
-			/*List<Map<String,Object>> currentProjectStatusMapList = new ArrayList<>();
-			CurrentProjectStatusEnum[] values = CurrentProjectStatusEnum.values();
-			for (CurrentProjectStatusEnum value : values) {
-				Map<String,Object> map = new HashMap<>();
-				map.put("color",value.getValue());
-				currentProjectStatusMapList.add(map);
-			}
-			int currentProjectStatusTotal;
-			List<ConditionAssessmentEO> projectStatusAssessList = this.conditionAssessmentEOService.getProjectStatusAssessList(projectLawsInventoryIdList);
-
-			for (Map<String, Object> map : currentProjectStatusMapList) {
-				List<ConditionAssessmentEO> collect = projectStatusAssessList.stream().filter(
-						projectStatusAssess -> StringUtils.equals(projectStatusAssess.getConditionAssessment(),map.get("color").toString())
-				).collect(Collectors.toList());
-				map.put("conditionAssessmentCount",collect.size());
-			}
-
-			currentProjectStatusTotal = currentProjectStatusMapList.stream().filter(
-					currentProjectStatus -> Integer.parseInt(currentProjectStatus.get("conditionAssessmentCount").toString()) != 0
-			).mapToInt(currentProjectStatus -> Integer.parseInt(currentProjectStatus.get("conditionAssessmentCount").toString())).sum();
-
-			currentProjectStatusMap.put("currentProjectStatusMapList",currentProjectStatusMapList);
-			currentProjectStatusMap.put("currentProjectStatusTotal",currentProjectStatusTotal);
-			result.put("currentProjectStatusMap",currentProjectStatusMap);*/
 
 			//设计符合性
 			List<Map<String,Object>> designComplianceMapList = this.platformProjectLawsInventoryEOService.getDesignComplianceStatistice(projectLawsInventoryEOList);
@@ -1664,36 +1648,6 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 			verifyComplianceMap.put("verifyComplianceMapList",verifyComplianceMapList);
 			verifyComplianceMap.put("count",verifyFlowTaskStatusCount);
 			result.put("verifyComplianceMap",verifyComplianceMap);
-
-			//认证进度统计
-			/*int certificationProgressTotal;
-			List<Map<String,Object>> certificationProgressMapList = this.projectTaskInventoryEOMapper.getCertificationProgressStatistics(projectLawsInventoryIdList);
-			certificationProgressTotal = certificationProgressMapList.stream().filter(
-					certificationProgress -> Integer.parseInt(certificationProgress.get("certificationProgressCount").toString()) != 0
-			).mapToInt(certificationProgress -> Integer.parseInt(certificationProgress.get("certificationProgressCount").toString())).sum();
-
-			CertificationProgressEnum[] CertificationProgressEnumValues = CertificationProgressEnum.values();
-			for (CertificationProgressEnum certificationProgressEnumValue : CertificationProgressEnumValues) {
-				boolean flag = true;
-				for (Map<String, Object> map : certificationProgressMapList) {
-					if(map.get("certificationProgress") != null){
-						if(StringUtils.equals(certificationProgressEnumValue.getValue(),map.get("certificationProgress").toString())){
-							flag = false;
-							break;
-						}
-					}
-				}
-				if(flag){
-					Map<String,Object> map = new HashMap<>();
-					map.put("certificationProgress",certificationProgressEnumValue.getValue());
-					map.put("certificationProgressCount",0);
-					certificationProgressMapList.add(map);
-				}
-			}
-
-			certificationProgressMap.put("certificationProgressTotal",certificationProgressTotal);
-			certificationProgressMap.put("certificationProgressMapList",certificationProgressMapList);
-			result.put("certificationProgressMap",certificationProgressMap);*/
 		}
 
 		QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index ecf1766f9..564b436ea 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -10118,7 +10118,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
 								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
 								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
-								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+//								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
 				);
 				return flag;
 			}).count();
@@ -10128,7 +10128,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				boolean flag = (
 						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
 						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
-						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
+						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+//						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
 				);
 				return flag;
 			}).count();
@@ -10145,6 +10146,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			nonComplianceCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
 				boolean flag = (
 						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue())
+						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
 				);
 				return flag;
 			}).count();
@@ -10190,7 +10192,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
 								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
 								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
-								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+//								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
 				);
 				return flag;
 			}).count();
@@ -10200,7 +10202,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				boolean flag = (
 						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
 								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
-								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+//								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
 				);
 				return flag;
 			}).count();
@@ -10217,6 +10220,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			nonComplianceCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
 				boolean flag = (
 						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue())
+						|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
 				);
 				return flag;
 			}).count();
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index d7ca2b6f9..21a021e7f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -1935,32 +1935,6 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 			taskToConfirmMap.put("count",taskAffirmStatusCount);
 			result.put("taskToConfirmMap",taskToConfirmMap);
 
-			//当前项目状态统计   获取一个 最差的结果 统计的数据 就是studio看到的数据。
-			/*List<Map<String,Object>> currentProjectStatusMapList = new ArrayList<>();
-			CurrentProjectStatusEnum[] values = CurrentProjectStatusEnum.values();
-			for (CurrentProjectStatusEnum value : values) {
-				Map<String,Object> map = new HashMap<>();
-				map.put("color",value.getValue());
-				currentProjectStatusMapList.add(map);
-			}
-			int currentProjectStatusTotal;
-			List<ConditionAssessmentEO> projectStatusAssessList = this.conditionAssessmentEOService.getProjectStatusAssessList(projectLawsInventoryIdList);
-
-			for (Map<String, Object> map : currentProjectStatusMapList) {
-				List<ConditionAssessmentEO> collect = projectStatusAssessList.stream().filter(
-						projectStatusAssess -> StringUtils.equals(projectStatusAssess.getConditionAssessment(),map.get("color").toString())
-				).collect(Collectors.toList());
-				map.put("conditionAssessmentCount",collect.size());
-			}
-
-			currentProjectStatusTotal = currentProjectStatusMapList.stream().filter(
-					currentProjectStatus -> Integer.parseInt(currentProjectStatus.get("conditionAssessmentCount").toString()) != 0
-			).mapToInt(currentProjectStatus -> Integer.parseInt(currentProjectStatus.get("conditionAssessmentCount").toString())).sum();
-
-			currentProjectStatusMap.put("currentProjectStatusMapList",currentProjectStatusMapList);
-			currentProjectStatusMap.put("currentProjectStatusTotal",currentProjectStatusTotal);
-			result.put("currentProjectStatusMap",currentProjectStatusMap);*/
-
 			//设计符合性
 			List<Map<String,Object>> designComplianceMapList = this.projectLawsInventoryEOService.getDesignComplianceStatistice(projectLawsInventoryEOList);
 			int designFlowTaskStatusCount = 0;
@@ -1984,36 +1958,6 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 			verifyComplianceMap.put("verifyComplianceMapList",verifyComplianceMapList);
 			verifyComplianceMap.put("count",verifyFlowTaskStatusCount);
 			result.put("verifyComplianceMap",verifyComplianceMap);
-
-			//认证进度统计
-			/*int certificationProgressTotal;
-			List<Map<String,Object>> certificationProgressMapList = this.projectTaskInventoryEOMapper.getCertificationProgressStatistics(projectLawsInventoryIdList);
-			certificationProgressTotal = certificationProgressMapList.stream().filter(
-					certificationProgress -> Integer.parseInt(certificationProgress.get("certificationProgressCount").toString()) != 0
-			).mapToInt(certificationProgress -> Integer.parseInt(certificationProgress.get("certificationProgressCount").toString())).sum();
-
-			CertificationProgressEnum[] CertificationProgressEnumValues = CertificationProgressEnum.values();
-			for (CertificationProgressEnum certificationProgressEnumValue : CertificationProgressEnumValues) {
-				boolean flag = true;
-				for (Map<String, Object> map : certificationProgressMapList) {
-					if(map.get("certificationProgress") != null){
-						if(StringUtils.equals(certificationProgressEnumValue.getValue(),map.get("certificationProgress").toString())){
-							flag = false;
-							break;
-						}
-					}
-				}
-				if(flag){
-					Map<String,Object> map = new HashMap<>();
-					map.put("certificationProgress",certificationProgressEnumValue.getValue());
-					map.put("certificationProgressCount",0);
-					certificationProgressMapList.add(map);
-				}
-			}
-
-			certificationProgressMap.put("certificationProgressTotal",certificationProgressTotal);
-			certificationProgressMap.put("certificationProgressMapList",certificationProgressMapList);
-			result.put("certificationProgressMap",certificationProgressMap);*/
 		}
 
 		QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();

From 522479c105bc090a432a05e235fac1021b2f9a50 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 11 Oct 2023 17:37:35 +0800
Subject: [PATCH 267/288] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=BA=93-=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=AF=BC=E5=87=BA=EF=BC=88=E6=B3=95=E8=A7=84=E7=AC=A6?=
 =?UTF-8?q?=E5=90=88=E6=80=A7=E7=AE=A1=E7=90=86-=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectLibraryStatisticsServiceImpl.java    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java
index fd57d530d..18dcc91c1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java
@@ -155,7 +155,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
                                 || StringUtils.equals(data.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
                                 || StringUtils.equals(data.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
                                 || StringUtils.equals(data.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
-                                || StringUtils.equals(data.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+//                                || StringUtils.equals(data.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
                 );
                 return flag;
             }).collect(Collectors.toList());
@@ -170,7 +170,8 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
                 boolean flag = (
                         StringUtils.equals(data.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
                                 || StringUtils.equals(data.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
-                                || StringUtils.equals(data.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
+                                || StringUtils.equals(data.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+//                                || StringUtils.equals(data.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
                 );
                 return flag;
             }).collect(Collectors.toList());
@@ -197,6 +198,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
             List<ProjectLawsInventoryEO> nonComplianceDesignPliEoList = datas.stream().filter(data -> {
                 boolean flag = (
                         StringUtils.equals(data.getDesignFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue())
+                        || StringUtils.equals(data.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
                 );
                 return flag;
             }).collect(Collectors.toList());
@@ -229,7 +231,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
                                 || StringUtils.equals(data.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
                                 || StringUtils.equals(data.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
                                 || StringUtils.equals(data.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
-                                || StringUtils.equals(data.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+//                                || StringUtils.equals(data.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
                 );
                 return flag;
             }).collect(Collectors.toList());
@@ -244,7 +246,8 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
                 boolean flag = (
                         StringUtils.equals(data.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
                                 || StringUtils.equals(data.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
-                                || StringUtils.equals(data.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
+                                || StringUtils.equals(data.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+//                                || StringUtils.equals(data.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
                 );
                 return flag;
             }).collect(Collectors.toList());
@@ -271,6 +274,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
             List<ProjectLawsInventoryEO> nonComplianceVerifyPliEoList = datas.stream().filter(data -> {
                 boolean flag = (
                         StringUtils.equals(data.getVerifyFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue())
+                        || StringUtils.equals(data.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
                 );
                 return flag;
             }).collect(Collectors.toList());

From b0f3ba8dc235837863c4253bc76d69abd7256298 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 12 Oct 2023 11:13:13 +0800
Subject: [PATCH 268/288] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=BA=93=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85-=E7=8A=B6=E6=80=81=E5=AF=BC=E5=87=BA=EF=BC=88?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86=EF=BC=89?=
 =?UTF-8?q?=20=E8=BD=A6=E5=9E=8B=E5=BA=93=E8=AF=A6=E6=83=85-=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86Pre-Homo=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=B9=B6=E5=BC=A0=E5=9B=BE=E5=B1=95=E7=A4=BA=E4=B8=AD?=
 =?UTF-8?q?=E5=BE=85=E7=A1=AE=E8=AE=A4=E6=94=B9=E4=B8=BA=E5=BE=85=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctCertificationInventoryEOServiceImpl.java |  4 +-
 ...PlatformProjectLibraryBaseServiceImpl.java |  3 +-
 .../IProjectLibraryStatisticsService.java     |  2 +
 ...ctCertificationInventoryEOServiceImpl.java |  4 +-
 .../impl/ProjectLibraryBaseServiceImpl.java   | 47 ++++++------
 .../ProjectLibraryStatisticsServiceImpl.java  | 76 ++++++++++++++++++-
 6 files changed, 108 insertions(+), 28 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
index 02f0d6a96..3c6a98c03 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
@@ -80,6 +80,7 @@ import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
 import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
 import com.jero.modules.todoCenter.entity.ProcessInfoEO;
+import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum;
 import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService;
 import com.jero.modules.todoCenter.service.IProcessInfoEOService;
 import com.jero.modules.wkflow.enums.FlowTypeEnum;
@@ -3489,7 +3490,8 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 		notStartedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue());
 		notStartedMap.put("taskAffirmStatusCount",notStartedCount);
 
-		toConfirmMap.put("taskAffirmStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue());
+		toConfirmMap.put("taskAffirmStatus", TodoCenterStatusEnum.TO_SUBMIT.getValue());
+//		toConfirmMap.put("taskAffirmStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue());
 		toConfirmMap.put("taskAffirmStatusCount",toConfirmCount);
 
 		acceptedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue());
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
index 8f45a7c6a..ff237b1bb 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
@@ -77,6 +77,7 @@ import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
 import com.jero.modules.system.util.StringUtils;
 import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
+import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum;
 import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService;
 import com.jero.modules.top.entity.TopProjectEO;
 import com.jero.modules.top.service.ITopProjectEOService;
@@ -2983,7 +2984,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 		Map<String, Object> prehomoMap = this.projectLibraryStatisticsService.getPrehomoStatisticeGroupByTerritory(pciEoList, params);
 		Map<String, Object> prehomoNotStartedMap = (Map<String, Object>) prehomoMap.get(TaskAffirmStatusEnum.NOT_STARTED.getValue());
 		double prehomoNotStartedAmount = (double) prehomoNotStartedMap.get("amount");
-		Map<String, Object> prehomoToConfirmMap = (Map<String, Object>) prehomoMap.get(TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue());
+		Map<String, Object> prehomoToConfirmMap = (Map<String, Object>) prehomoMap.get(TodoCenterStatusEnum.TO_SUBMIT.getValue());
 		double prehomoToConfirmAmount = (double) prehomoToConfirmMap.get("amount");
 		Map<String, Object> prehomoAcceptedMap = (Map<String, Object>) prehomoMap.get(CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue());
 		double prehomoAcceptedAmount = (double) prehomoAcceptedMap.get("amount");
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryStatisticsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryStatisticsService.java
index 8bac94398..c9db860f1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryStatisticsService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryStatisticsService.java
@@ -75,6 +75,8 @@ public interface IProjectLibraryStatisticsService {
      */
     Map<String, Object> getPartCertificationProgressStatisticsGroupByTerritory(List<ProjectCertificationInventoryEO> datas, Map<String, Object> params);
 
+    Map<String, Object> getPartCertificationProgressStatisticsGroupByTerritoryTemp(List<ProjectCertificationInventoryEO> datas, Map<String, Object> params);
+
     /**
      * 获取认证参数收集-统计信息
      * @param datas
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index 2bfe78073..50a1033e7 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -83,6 +83,7 @@ import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
 import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
 import com.jero.modules.todoCenter.entity.ProcessInfoEO;
+import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum;
 import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService;
 import com.jero.modules.todoCenter.service.IProcessInfoEOService;
 import com.jero.modules.wkflow.enums.FlowTypeEnum;
@@ -3389,7 +3390,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		notStartedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue());
 		notStartedMap.put("taskAffirmStatusCount",notStartedCount);
 
-		toConfirmMap.put("taskAffirmStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue());
+		toConfirmMap.put("taskAffirmStatus", TodoCenterStatusEnum.TO_SUBMIT.getValue());
+//		toConfirmMap.put("taskAffirmStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue());
 		toConfirmMap.put("taskAffirmStatusCount",toConfirmCount);
 
 		acceptedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue());
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 21a021e7f..0ae3ab0ef 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -75,6 +75,7 @@ import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
 import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
 import com.jero.modules.system.util.StringUtils;
 import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
+import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum;
 import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService;
 import com.jero.modules.top.entity.TopProjectEO;
 import com.jero.modules.top.service.ITopProjectEOService;
@@ -3147,7 +3148,11 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		String secondTitle = "责任领域（一级）," +
 				"未发起,待确认,接受,拒绝,完成度," +
 				"未发起,待确认,审查通过,审查退回,完成度," +
-				"未开始,进行中,实验通过,实验失败,部件报告未上传,部件报告已上传,部件报告已入库,完成度";
+				"未开始,进行中,实验通过,实验失败,完成度";
+//		String secondTitle = "责任领域（一级）," +
+//				"未发起,待确认,接受,拒绝,完成度," +
+//				"未发起,待确认,审查通过,审查退回,完成度," +
+//				"未开始,进行中,实验通过,实验失败,部件报告未上传,部件报告已上传,部件报告已入库,完成度";
 		if(StringUtils.equals(cut,CutEnum.EN.getValue())){
 			sheetName = "Certification Activity Management";
 			firstTitle = "Authentication task confirmation," +
@@ -3156,7 +3161,11 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 			secondTitle = "Area of responsibility (level 1)," +
 					"Not launched,To be confirmed,Accept,Refuse,Degree of completion," +
 					"Not launched,To be confirmed,Review of the adoption,Review return,Degree of completion," +
-					"Not started,In progress,Experiment passed,Experiment failed,Parts report not uploaded,Parts report uploaded,Parts report in stock,Degree of completion";
+					"Not started,In progress,Experiment passed,Experiment failed,Degree of completion";
+//			secondTitle = "Area of responsibility (level 1)," +
+//					"Not launched,To be confirmed,Accept,Refuse,Degree of completion," +
+//					"Not launched,To be confirmed,Review of the adoption,Review return,Degree of completion," +
+//					"Not started,In progress,Experiment passed,Experiment failed,Parts report not uploaded,Parts report uploaded,Parts report in stock,Degree of completion";
 		}
 		HSSFSheet sheet = workbook.createSheet(sheetName);
 
@@ -3165,10 +3174,11 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		sheet.addMergedRegion(region1);
 		CellRangeAddress region2 = new CellRangeAddress(0, 0, 6, 10);
 		sheet.addMergedRegion(region2);
-		CellRangeAddress region3 = new CellRangeAddress(0, 0, 11, 18);
+		CellRangeAddress region3 = new CellRangeAddress(0, 0, 11, 15);
+//		CellRangeAddress region3 = new CellRangeAddress(0, 0, 11, 18);
 		sheet.addMergedRegion(region3);
-		CellRangeAddress region4 = new CellRangeAddress(0, 0, 19, 23);
-		sheet.addMergedRegion(region4);
+//		CellRangeAddress region4 = new CellRangeAddress(0, 0, 19, 23);
+//		sheet.addMergedRegion(region4);
 
 		String[] firstTitleArr = firstTitle.split(",");
 		String[] secondTitleArr = secondTitle.split(",");
@@ -3177,7 +3187,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 
 		CellStyle cellStyleTitle = workbook.createCellStyle();
 		cellStyleTitle.setAlignment(HorizontalAlignment.CENTER);
-		for (int i = 0; i <= 18; i++){
+		for (int i = 0; i <= 15; i++){
 			sheet.setColumnWidth(i, 3500);
 			Cell firstRowCell = firstRow.createCell(i);
 			firstRowCell.setCellStyle(cellStyleTitle);
@@ -3187,9 +3197,10 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 				firstRowCell.setCellValue(firstTitleArr[1]);
 			}else if(i==11){
 				firstRowCell.setCellValue(firstTitleArr[2]);
-			}else if(i==19){
-				firstRowCell.setCellValue(firstTitleArr[3]);
 			}
+//			else if(i==19){
+//				firstRowCell.setCellValue(firstTitleArr[3]);
+//			}
 			Cell secondRowCell = secondRow.createCell(i);
 			secondRowCell.setCellValue(secondTitleArr[i]);
 		}
@@ -3278,7 +3289,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		Map<String, Object> prehomoMap = this.projectLibraryStatisticsService.getPrehomoStatisticeGroupByTerritory(pciEoList, params);
 		Map<String, Object> prehomoNotStartedMap = (Map<String, Object>) prehomoMap.get(TaskAffirmStatusEnum.NOT_STARTED.getValue());
 		double prehomoNotStartedAmount = (double) prehomoNotStartedMap.get("amount");
-		Map<String, Object> prehomoToConfirmMap = (Map<String, Object>) prehomoMap.get(TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue());
+		Map<String, Object> prehomoToConfirmMap = (Map<String, Object>) prehomoMap.get(TodoCenterStatusEnum.TO_SUBMIT.getValue());
+//		Map<String, Object> prehomoToConfirmMap = (Map<String, Object>) prehomoMap.get(TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue());
 		double prehomoToConfirmAmount = (double) prehomoToConfirmMap.get("amount");
 		Map<String, Object> prehomoAcceptedMap = (Map<String, Object>) prehomoMap.get(CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue());
 		double prehomoAcceptedAmount = (double) prehomoAcceptedMap.get("amount");
@@ -3293,7 +3305,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		String prehomoPercentageStr = (prehomoPercentage != 0 && (prehomoCount !=0 )) ? df.format(prehomoPercentage) : "0";
 		dataRow.createCell(10).setCellValue(prehomoPercentageStr + percentSign);
 
-		Map<String, Object> certificationProgressMap = this.projectLibraryStatisticsService.getPartCertificationProgressStatisticsGroupByTerritory(pciEoList, params);
+		Map<String, Object> certificationProgressMap = this.projectLibraryStatisticsService.getPartCertificationProgressStatisticsGroupByTerritoryTemp(pciEoList, params);
 		Map<String, Object> certificationProgressNotStartMap = (Map<String, Object>)certificationProgressMap.get(CertificationProgressEnum.NOT_START.getValue());
 		double certificationProgressNotStartAmount = (double) certificationProgressNotStartMap.get("amount");
 		Map<String, Object> certificationProgressInProgressMap = (Map<String, Object>)certificationProgressMap.get(CertificationProgressEnum.IN_PROGRESS.getValue());
@@ -3302,26 +3314,15 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		double certificationProgressTestPassedAmount = (double) certificationProgressTestPassedMap.get("amount");
 		Map<String, Object> certificationProgressTestFailedMap = (Map<String, Object>)certificationProgressMap.get(CertificationProgressEnum.TEST_FAILED.getValue());
 		double certificationProgressTestFailedAmount = (double) certificationProgressTestFailedMap.get("amount");
-		Map<String, Object> certificationProgressNotSubmitMap = (Map<String, Object>)certificationProgressMap.get(CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue());
-		double certificationProgressNotSubmitAmount = (double) certificationProgressNotSubmitMap.get("amount");
-		Map<String, Object> certificationProgressSubmitMap = (Map<String, Object>)certificationProgressMap.get(CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue());
-		double certificationProgressSubmitAmount = (double) certificationProgressSubmitMap.get("amount");
-		Map<String, Object> certificationProgressStoredMap = (Map<String, Object>)certificationProgressMap.get(CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue());
-		double certificationProgressStoredAmount = (double) certificationProgressStoredMap.get("amount");
 		dataRow.createCell(11).setCellValue(certificationProgressNotStartAmount);
 		dataRow.createCell(12).setCellValue(certificationProgressInProgressAmount);
 		dataRow.createCell(13).setCellValue(certificationProgressTestPassedAmount);
 		dataRow.createCell(14).setCellValue(certificationProgressTestFailedAmount);
-		dataRow.createCell(15).setCellValue(certificationProgressNotSubmitAmount);
-		dataRow.createCell(16).setCellValue(certificationProgressSubmitAmount);
-		dataRow.createCell(17).setCellValue(certificationProgressStoredAmount);
 		double certificationProgressCount = certificationProgressNotStartAmount + certificationProgressInProgressAmount
-				+ certificationProgressTestPassedAmount + certificationProgressTestFailedAmount
-				+ certificationProgressNotSubmitAmount + certificationProgressSubmitAmount
-				+ certificationProgressStoredAmount;
+				+ certificationProgressTestPassedAmount + certificationProgressTestFailedAmount;
 		double certificationProgressPercentage = (certificationProgressTestPassedAmount / certificationProgressCount) * 100;
 		String certificationProgressPercentageStr = (certificationProgressPercentage != 0 && (certificationProgressCount !=0 )) ? df.format(certificationProgressPercentage) : "0";
-		dataRow.createCell(18).setCellValue(certificationProgressPercentageStr + percentSign);
+		dataRow.createCell(15).setCellValue(certificationProgressPercentageStr + percentSign);
 	}
 
 	/**
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java
index 18dcc91c1..bcd80f318 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java
@@ -12,6 +12,7 @@ import com.jero.modules.project.enums.TaskAffirmStatusEnum;
 import com.jero.modules.project.service.IProjectCertificationInventoryEOService;
 import com.jero.modules.project.service.IProjectLawsInventoryEOService;
 import com.jero.modules.project.service.IProjectLibraryStatisticsService;
+import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -360,6 +361,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
 
             result.put(TaskAffirmStatusEnum.NOT_STARTED.getValue(),notStartedMap);
             result.put(TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue(),toConfirmMap);
+//            result.put(TodoCenterStatusEnum.TO_SUBMIT.getValue(),acceptedMap);
             result.put(TaskAffirmStatusEnum.ACCEPTED.getValue(),acceptedMap);
             result.put(TaskAffirmStatusEnum.REJECTED.getValue(),rejectedMap);
         }
@@ -436,7 +438,8 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
             rejectedMap.put("percentage",rejectedPercentageStr + percentSign);
 
             result.put(TaskAffirmStatusEnum.NOT_STARTED.getValue(),notStartedMap);
-            result.put(TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue(),toConfirmMap);
+//            result.put(TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue(),toConfirmMap);
+            result.put(TodoCenterStatusEnum.TO_SUBMIT.getValue(),acceptedMap);
             result.put(CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue(),acceptedMap);
             result.put(CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue(),rejectedMap);
         }
@@ -514,7 +517,6 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
         }
         return result;
     }
-
     @Override
     public Map<String, Object> getCarCertificationProgressStatisticsGroupByTerritory(List<ProjectCertificationInventoryEO> datas, Map<String, Object> params) {
         Map<String, Object> result = new HashMap<>();
@@ -695,6 +697,76 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
         }
         return result;
     }
+    @Override
+    public Map<String, Object> getPartCertificationProgressStatisticsGroupByTerritoryTemp(List<ProjectCertificationInventoryEO> datas, Map<String, Object> params) {
+        Map<String, Object> result = new HashMap<>();
+        if(CollectionUtils.isNotEmpty(datas)){
+            Map<String,Object> notStartMap = new HashMap<>();
+            Map<String,Object> inProgressMap = new HashMap<>();
+            Map<String,Object> testPassedMap = new HashMap<>();
+            Map<String,Object> testFailedMap = new HashMap<>();
+
+
+            // 未开始
+            List<ProjectCertificationInventoryEO> notStartPciEoList = datas.stream().filter(data -> {
+                boolean flag = (
+                        StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.NOT_START.getValue())
+                );
+                return flag;
+            }).collect(Collectors.toList());
+            double notStartCount = (double) notStartPciEoList.size();
+            double notStartPercentage = (notStartCount / (datas.size())) * 100;
+            String notStartPercentageStr = notStartPercentage != 0 ? df.format(notStartPercentage) : "0";
+            notStartMap.put("amount",notStartCount);
+            notStartMap.put("percentage",notStartPercentageStr + percentSign);
+            // 进行中
+            List<ProjectCertificationInventoryEO> inProgressPciEoList = datas.stream().filter(data -> {
+                boolean flag = (
+                        StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.IN_PROGRESS.getValue())
+                        || StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue())
+                );
+                return flag;
+            }).collect(Collectors.toList());
+            double inProgressCount = (double) inProgressPciEoList.size();
+            double inProgressPercentage = (inProgressCount / (datas.size())) * 100;
+            String inProgressPercentageStr = inProgressPercentage != 0 ? df.format(inProgressPercentage) : "0";
+            inProgressMap.put("amount",inProgressCount);
+            inProgressMap.put("percentage",inProgressPercentageStr + percentSign);
+            // 实验通过
+            List<ProjectCertificationInventoryEO> testPassedPciEoList = datas.stream().filter(data -> {
+                boolean flag = (
+                        StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.TEST_PASSED.getValue())
+                        || StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue())
+                        || StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue())
+                );
+                return flag;
+            }).collect(Collectors.toList());
+            double testPassedCount = (double) testPassedPciEoList.size();
+            double testPassedPercentage = (testPassedCount / (datas.size())) * 100;
+            String testPassedPercentageStr = testPassedPercentage != 0 ? df.format(testPassedPercentage) : "0";
+            testPassedMap.put("amount",testPassedCount);
+            testPassedMap.put("percentage",testPassedPercentageStr + percentSign);
+
+            // 实验失败
+            List<ProjectCertificationInventoryEO> testFailedPciEoList = datas.stream().filter(data -> {
+                boolean flag = (
+                        StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.TEST_FAILED.getValue())
+                );
+                return flag;
+            }).collect(Collectors.toList());
+            double testFailedCount = (double) testFailedPciEoList.size();
+            double testFailedPercentage = (testFailedCount / (datas.size())) * 100;
+            String testFailedPercentageStr = testFailedPercentage != 0 ? df.format(testFailedPercentage) : "0";
+            testFailedMap.put("amount",testFailedCount);
+            testFailedMap.put("percentage",testFailedPercentageStr + percentSign);
+
+            result.put(CertificationProgressEnum.NOT_START.getValue(),notStartMap);
+            result.put(CertificationProgressEnum.IN_PROGRESS.getValue(),inProgressMap);
+            result.put(CertificationProgressEnum.TEST_PASSED.getValue(),testPassedMap);
+            result.put(CertificationProgressEnum.TEST_FAILED.getValue(),testFailedMap);
+        }
+        return result;
+    }
 
     @Override
     public Map<String, Object> getParameterCollectingStatisticsGroupByTerritory(List<ParamsCollectManifestEO> datas, Map<String, Object> params) {

From 4473a4cf043a6ac3a44ac7d932c8c530766416d3 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 12 Oct 2023 13:51:29 +0800
Subject: [PATCH 269/288] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=BA=93=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85-=E7=8A=B6=E6=80=81=E5=AF=BC=E5=87=BA-=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=90=9C=E9=9B=86=E8=BF=9B=E5=BA=A6=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IProjectLibraryStatisticsService.java     |  2 +
 .../impl/ProjectLibraryBaseServiceImpl.java   |  2 +-
 .../ProjectLibraryStatisticsServiceImpl.java  | 64 ++++++++++++++++++-
 3 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryStatisticsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryStatisticsService.java
index c9db860f1..4046b8f59 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryStatisticsService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryStatisticsService.java
@@ -84,4 +84,6 @@ public interface IProjectLibraryStatisticsService {
      * @return
      */
     Map<String, Object> getParameterCollectingStatisticsGroupByTerritory(List<ParamsCollectManifestEO> datas, Map<String, Object> params);
+
+    Map<String, Object> getParameterCollectingStatisticsGroupByTerritoryExport(List<ParamsCollectManifestEO> datas, Map<String, Object> params);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 0ae3ab0ef..db4ccc29b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -3515,7 +3515,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	 * @param pcmEos
 	 */
 	private void exportParameterCollectingSetData(Map<String, Object> params, HSSFSheet sheet, int dataIndex, String key, List<ParamsCollectManifestEO> pcmEos) {
-		Map<String, Object> parameterCollectingMap = this.projectLibraryStatisticsService.getParameterCollectingStatisticsGroupByTerritory(pcmEos,params);
+		Map<String, Object> parameterCollectingMap = this.projectLibraryStatisticsService.getParameterCollectingStatisticsGroupByTerritoryExport(pcmEos,params);
 		Map<String, Object> notStartMap = (Map<String, Object>) parameterCollectingMap.get(CollectManifestStatisticsStateEnum.NOT_START.getValue());
 		double notStartAmount = (double) notStartMap.get("amount");
 		Map<String, Object> collectingMap = (Map<String, Object>) parameterCollectingMap.get(CollectManifestStatisticsStateEnum.COLLECTING.getValue());
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java
index bcd80f318..d5903a0f2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java
@@ -776,7 +776,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
             Map<String,Object> collectingMap = new HashMap<>();
             Map<String,Object> submitMap = new HashMap<>();
             Map<String,Object> syncReporMap = new HashMap<>();
-
+            //未发起
             List<ParamsCollectManifestEO> notStartPcmEoList = datas.stream().filter(data -> {
                 boolean flag = (
                         StringUtils.equals(data.getState(), CollectManifestStateEnum.WAIT_COLLECT.getValue())
@@ -787,7 +787,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
             }).collect(Collectors.toList());
             double notStartCount = (double) notStartPcmEoList.size();
             notStartMap.put("amount",notStartCount);
-
+            //收集中
             List<ParamsCollectManifestEO> collectingPcmEoList = datas.stream().filter(data -> {
                 boolean flag = (
                         StringUtils.equals(data.getState(), CollectManifestStateEnum.WAIT_FILL.getValue())
@@ -799,7 +799,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
             }).collect(Collectors.toList());
             double collectingCount = (double) collectingPcmEoList.size();
             collectingMap.put("amount",collectingCount);
-
+            //已提交
             List<ParamsCollectManifestEO> submitPcmEoList = datas.stream().filter(data -> {
                 boolean flag = (
                         StringUtils.equals(data.getState(), CollectManifestStateEnum.SUBMIT.getValue())
@@ -808,7 +808,65 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
             }).collect(Collectors.toList());
             double submitCount = (double) submitPcmEoList.size();
             submitMap.put("amount",submitCount);
+            //已同步至上报库
+            List<ParamsCollectManifestEO> syncReporPcmEoList = datas.stream().filter(data -> {
+                boolean flag = (
+                        StringUtils.equals(data.getState(), CollectManifestStateEnum.SYNC_REPORT.getValue())
+                );
+                return flag;
+            }).collect(Collectors.toList());
+            double syncReporCount = (double) syncReporPcmEoList.size();
+            syncReporMap.put("amount",syncReporCount);
 
+            result.put(CollectManifestStatisticsStateEnum.NOT_START.getValue(),notStartMap);
+            result.put(CollectManifestStatisticsStateEnum.COLLECTING.getValue(),collectingMap);
+            result.put(CollectManifestStatisticsStateEnum.SUBMIT.getValue(),submitMap);
+            result.put(CollectManifestStatisticsStateEnum.SYNC_REPORT.getValue(),syncReporMap);
+        }
+        return result;
+    }
+    @Override
+    public Map<String, Object> getParameterCollectingStatisticsGroupByTerritoryExport(List<ParamsCollectManifestEO> datas, Map<String, Object> params) {
+        Map<String, Object> result = new HashMap<>();
+        if(CollectionUtils.isNotEmpty(datas)){
+            Map<String,Object> notStartMap = new HashMap<>();
+            Map<String,Object> collectingMap = new HashMap<>();
+            Map<String,Object> submitMap = new HashMap<>();
+            Map<String,Object> syncReporMap = new HashMap<>();
+            //未发起
+            List<ParamsCollectManifestEO> notStartPcmEoList = datas.stream().filter(data -> {
+                boolean flag = (
+                        StringUtils.equals(data.getState(), CollectManifestStateEnum.WAIT_COLLECT.getValue())
+                                || StringUtils.equals(data.getState(), CollectManifestStateEnum.SDT_BACK.getValue())
+//                                || StringUtils.equals(data.getState(), CollectManifestStateEnum.CHANGE.getValue())
+                );
+                return flag;
+            }).collect(Collectors.toList());
+            double notStartCount = (double) notStartPcmEoList.size();
+            notStartMap.put("amount",notStartCount);
+            //收集中
+            List<ParamsCollectManifestEO> collectingPcmEoList = datas.stream().filter(data -> {
+                boolean flag = (
+                        StringUtils.equals(data.getState(), CollectManifestStateEnum.WAIT_FILL.getValue())
+                                || StringUtils.equals(data.getState(),CollectManifestStateEnum.WAIT_SDT.getValue())
+                                || StringUtils.equals(data.getState(),CollectManifestStateEnum.DRE_BACK.getValue())
+                                || StringUtils.equals(data.getState(),CollectManifestStateEnum.CERT_BACK.getValue())
+                );
+                return flag;
+            }).collect(Collectors.toList());
+            double collectingCount = (double) collectingPcmEoList.size();
+            collectingMap.put("amount",collectingCount);
+            //已提交
+            List<ParamsCollectManifestEO> submitPcmEoList = datas.stream().filter(data -> {
+                boolean flag = (
+                        StringUtils.equals(data.getState(), CollectManifestStateEnum.SUBMIT.getValue())
+                        || StringUtils.equals(data.getState(), CollectManifestStateEnum.CHANGE.getValue())
+                );
+                return flag;
+            }).collect(Collectors.toList());
+            double submitCount = (double) submitPcmEoList.size();
+            submitMap.put("amount",submitCount);
+            //已同步至上报库
             List<ParamsCollectManifestEO> syncReporPcmEoList = datas.stream().filter(data -> {
                 boolean flag = (
                         StringUtils.equals(data.getState(), CollectManifestStateEnum.SYNC_REPORT.getValue())

From 4fd2a4b402773b8c6a128b5a65bf35df0b5c735e Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 12 Oct 2023 14:23:19 +0800
Subject: [PATCH 270/288] =?UTF-8?q?=E7=BB=9F=E8=AE=A1-=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86=EF=BC=88=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=94=B1=E5=BE=85=E7=A1=AE=E8=AE=A4=E6=94=B9=E4=B8=BA=E5=BE=85?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/certificationActivity.vue                  | 8 ++++----
 .../components/certificationActivity.vue                  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/certificationActivity.vue b/jero-web/src/views/projectManagement/components/certificationActivity.vue
index ef669653b..6e56fc29e 100644
--- a/jero-web/src/views/projectManagement/components/certificationActivity.vue
+++ b/jero-web/src/views/projectManagement/components/certificationActivity.vue
@@ -118,10 +118,10 @@
                 status: res.taskAffirmStatus
               })
               color.push('#00B3BE')
-            } else if (res.taskAffirmStatus == 'List to confirm') {
+            } else if (res.taskAffirmStatus == 'To submit') {
               data.push({
                 value: res.taskAffirmStatusCount,
-                name: this.$t('listToConfirm'),
+                name: this.$t('toSubmit'),
                 color: '#FDA71C',
                 status: res.taskAffirmStatus
               })
@@ -163,10 +163,10 @@
                 status: res.taskAffirmStatus
               })
               color.push('#00B3BE')
-            } else if (res.taskAffirmStatus == 'List to confirm') {
+            } else if (res.taskAffirmStatus == 'To submit') {
               data.push({
                 value: res.taskAffirmStatusCount,
-                name: this.$t('listToConfirm'),
+                name: this.$t('toSubmit'),
                 color: '#FDA71C',
                 status: res.taskAffirmStatus
               })
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue
index d4780313a..2013d4d78 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue
@@ -117,10 +117,10 @@
                 status: res.taskAffirmStatus
               })
               color.push('#00B3BE')
-            } else if (res.taskAffirmStatus == 'List to confirm') {
+            } else if (res.taskAffirmStatus == 'To submit') {
               data.push({
                 value: res.taskAffirmStatusCount,
-                name: this.$t('listToConfirm'),
+                name: this.$t('toSubmit'),
                 color: '#FDA71C',
                 status: res.taskAffirmStatus
               })
@@ -162,10 +162,10 @@
                 status: res.taskAffirmStatus
               })
               color.push('#00B3BE')
-            } else if (res.taskAffirmStatus == 'List to confirm') {
+            } else if (res.taskAffirmStatus == 'To submit') {
               data.push({
                 value: res.taskAffirmStatusCount,
-                name: this.$t('listToConfirm'),
+                name: this.$t('toSubmit'),
                 color: '#FDA71C',
                 status: res.taskAffirmStatus
               })

From d4c5825cf581bf8403e7c9dd9de969477a6873e6 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 12 Oct 2023 14:41:43 +0800
Subject: [PATCH 271/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85-=E7=8A=B6=E6=80=81=E5=AF=BC=E5=87=BA-=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86Pre-Homo=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E4=B8=AD=E7=8A=B6=E6=80=81=E7=94=B1=E5=BE=85=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E6=94=B9=E4=B8=BA=E5=BE=85=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PlatformProjectLibraryBaseServiceImpl.java | 6 ++++--
 .../service/impl/ProjectLibraryStatisticsServiceImpl.java   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
index ff237b1bb..5fe52592d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
@@ -2854,14 +2854,16 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 				"Pre-Homo";
 		String secondTitle = "责任领域（一级）," +
 				"未发起,待确认,接受,拒绝,完成度," +
-				"未发起,待确认,审查通过,审查退回,完成度";
+				"未发起,待提交,审查通过,审查退回,完成度";
+//				"未发起,待确认,审查通过,审查退回,完成度";
 		if(StringUtils.equals(cut,CutEnum.EN.getValue())){
 			sheetName = "Certification Activity Management";
 			firstTitle = "Authentication task confirmation," +
 					"Pre-Homo";
 			secondTitle = "Area of responsibility (level 1)," +
 					"Not launched,To be confirmed,Accept,Refuse,Degree of completion," +
-					"Not launched,To be confirmed,Review of the adoption,Review return,Degree of completion";
+					"Not launched,To submit,Review of the adoption,Review return,Degree of completion";
+//					"Not launched,To be confirmed,Review of the adoption,Review return,Degree of completion";
 		}
 		HSSFSheet sheet = workbook.createSheet(sheetName);
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java
index d5903a0f2..e3d1b0330 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java
@@ -397,7 +397,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
             notStartedMap.put("amount",notStartedCount);
             notStartedMap.put("percentage",notStartedPercentageStr + percentSign);
 
-            // 待确认
+            // 待提交
             List<ProjectCertificationInventoryEO> toConfirmPciEoList = datas.stream().filter(data -> {
                 boolean flag = (
                             StringUtils.equals(data.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())

From 3ee392f27fc4377f860d7c282508588f1d467f2d Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 12 Oct 2023 15:08:18 +0800
Subject: [PATCH 272/288] =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AF=BC=E5=87=BA-?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86Pre-Homo?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=AD=E7=8A=B6=E6=80=81=E7=94=B1=E5=BE=85?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=94=B9=E4=B8=BA=E5=BE=85=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/service/impl/ProjectLibraryBaseServiceImpl.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index db4ccc29b..ef5926884 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -3147,7 +3147,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 				"认证进度";
 		String secondTitle = "责任领域（一级）," +
 				"未发起,待确认,接受,拒绝,完成度," +
-				"未发起,待确认,审查通过,审查退回,完成度," +
+				"未发起,待提交,审查通过,审查退回,完成度," +
 				"未开始,进行中,实验通过,实验失败,完成度";
 //		String secondTitle = "责任领域（一级）," +
 //				"未发起,待确认,接受,拒绝,完成度," +
@@ -3160,7 +3160,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 					"Certification progress";
 			secondTitle = "Area of responsibility (level 1)," +
 					"Not launched,To be confirmed,Accept,Refuse,Degree of completion," +
-					"Not launched,To be confirmed,Review of the adoption,Review return,Degree of completion," +
+					"Not launched,To submit,Review of the adoption,Review return,Degree of completion," +
 					"Not started,In progress,Experiment passed,Experiment failed,Degree of completion";
 //			secondTitle = "Area of responsibility (level 1)," +
 //					"Not launched,To be confirmed,Accept,Refuse,Degree of completion," +

From 42a65fa97a0c3d8edbce79214f955af713afad65 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 12 Oct 2023 15:09:48 +0800
Subject: [PATCH 273/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9ota=E8=BD=AF=E4=BB=B6?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=8B=B1=E6=96=87=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js                    | 12 +++++++-----
 jero-web/src/common/lang/zh-cn.js                    |  2 ++
 .../otaAuthentication/components/detil.vue           |  8 ++++----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index b83a7c3c3..7b510f439 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1933,12 +1933,14 @@ module.exports = {
   softwarereleasetime:'Software release time',
   theme:'Theme',
   influencestatute:'Influence statute',
-  vdrste:'VDR status',
+  influencestatuteCN:'Impact CN Homo',
+  influencestatuteEU:'Impact EU Homo',
+  vdrste:'VDR Status',
   impactdescription:'Impact description',
-  authenticationimpact:'Authentication impact',
-  impactstatement:'Impact statement',
-  certificationdeclaration:'Certification declaration',
-  matchingstate:'Matching state',
+  authenticationimpact:'Homo Impact',
+  impactstatement:'Impact Statement',
+  certificationdeclaration:'Application Submitted',
+  matchingstate:'Matching State',
   issuenotice:'Issue notice',
   applyforrematch:'Apply for rematch',
   notificationsent:'Is a notification sent?',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index a6a08fbe6..653497dc2 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -3891,6 +3891,8 @@ module.exports = {
   softwarereleasetime:'软件发布时间',
   theme:'主题',
   influencestatute:'影响法规',
+  influencestatuteCN:'影响法规',
+  influencestatuteEU:'影响法规',
   vdrste:'VDR状态',
   impactdescription:'影响描述',
   authenticationimpact:'认证影响',
diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
index 7b48ee6e3..feb8311ff 100644
--- a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
+++ b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
@@ -516,7 +516,7 @@ export default {
         },
         {
           sort: '',
-          name: this.$t('influencestatute') + '-CN',
+          name: this.$t('influencestatuteCN'),
           headFieldCn: '影响法规-CN',
           headFieldEn: 'Influence statute-CN',
           field: 'impactCnHomo',
@@ -525,7 +525,7 @@ export default {
         },
         {
           sort: '',
-          name: this.$t('influencestatute') + '-EU',
+          name: this.$t('influencestatuteEU'),
           headFieldCn: '影响法规-EU',
           headFieldEn: 'Influence statute-EU',
           field: 'impactEuHomo',
@@ -601,7 +601,7 @@ export default {
         },
         {
           sort: '',
-          name: this.$t('influencestatute') + '-CN',
+          name: this.$t('influencestatuteCN'),
           headFieldCn: '影响法规-CN',
           headFieldEn: 'Influence statute-CN',
           field: 'impactCnHomo',
@@ -610,7 +610,7 @@ export default {
         },
         {
           sort: '',
-          name: this.$t('influencestatute') + '-EU',
+          name: this.$t('influencestatuteEU'),
           headFieldCn: '影响法规-EU',
           headFieldEn: 'Influence statute-EU',
           field: 'impactEuHomo',

From 808d0e3aa17fb7f41c738f4effa10d7511de784b Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 12 Oct 2023 16:19:26 +0800
Subject: [PATCH 274/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9ota=E8=BD=AF=E4=BB=B6?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=8B=B1=E6=96=87=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 7b510f439..9e234ec69 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1707,7 +1707,7 @@ module.exports = {
   addfunction:'Add function',
   controllername:'Controller name',
   hardwaremanufacturer:'Hardware manufacturer',
-  softwareversion:'Software version',
+  softwareversion:'Software Version',
   returntofill:'Return to fill',
   thereAreCurrentlyNoRegulationsToHandle:'No regulations to be processed now',
   certificationSubmission:'Application Submitted',
@@ -1928,9 +1928,9 @@ module.exports = {
   processInitiationOne:'Process Initiation',
   taskHandlingOne:'Task Handling',
   taskReview:'Task Review',
-  softwareversion:'Software version',
+  softwareversion:'Software Version',
   softwareplatform:'Software platform',
-  softwarereleasetime:'Software release time',
+  softwarereleasetime:'Software Release Time',
   theme:'Theme',
   influencestatute:'Influence statute',
   influencestatuteCN:'Impact CN Homo',
@@ -1973,7 +1973,7 @@ module.exports = {
   Listcreationtime:'List creation time',
   Chinesecharacters:'The role code cannot enter Chinese characters',
   alreadyexistssystem:'The role encoding already exists',
-  releaseType:'releaseType',
+  releaseType:'Release Type',
   by:'By',
   Changeto:'Change to',
   emptyc:'empty',

From ffddd03a4aa89d3c4dfc3a2f74fa5bf14da04bca Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 12 Oct 2023 17:16:48 +0800
Subject: [PATCH 275/288] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=9C=8B=E6=9D=BF-=E5=AF=BC=E5=87=BA=EF=BC=88=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=BF=9B=E5=BA=A6sheet=E9=A1=B5=E8=A1=A8=E5=A4=B4?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectStatusBoardServiceImpl.java   | 188 ++++++++++--------
 1 file changed, 110 insertions(+), 78 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
index d4b7de890..83daf1b74 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
@@ -15,7 +15,6 @@ import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
 import com.jero.modules.cert.collect.service.IParamsCollectManifestHistoryEOService;
 import com.jero.modules.cert.collect.service.IParamsManifestEOService;
 import com.jero.modules.cert.collect.service.IParamsManifestHistoryEOService;
-import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO;
 import com.jero.modules.cert.template.enums.ControlTypeEnum;
 import com.jero.modules.ota.entity.OtaManageApplyEO;
 import com.jero.modules.ota.service.impl.OtaManageApplyEOServiceImpl;
@@ -840,38 +839,71 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
     private HSSFSheet createCorssProjectProgressSheet(HSSFWorkbook workbook, ProjectLibraryBase projectLibraryBase) {
         String cut = projectLibraryBase.getCut();
         String sheetName = "项目进度";
+//        String firstTitle = "项目," +
+//                "法规任务确认," +
+//                "设计符合性确认," +
+//                "验证符合性确认," +
+//                "认证任务确认," +
+//                "Pre-Homo确认," +
+//                "认证进度," +
+//                "参数收集";
+//                String secondTitle = "待发布,待校核,待确认,接受,拒绝,完成度,责任确认日期," +
+//                "未发起,待提交,待审查,符合,不符合,待追踪,不涉及,任务终止,完成度,设计核查日期," +
+//                "未发起,待提交,待审查,符合,不符合,待追踪,不涉及,任务终止,完成度,验证核查日期," +
+//                "待发布,待校核,待确认,接受,拒绝,完成度,责任确认日期," +
+//                "未发起,待提交,待审查,审查通过,审查退回,完成度,认证开始日期," +
+//                "待开始,进行中,实验通过,实验失败,部件报告未提交,部件报告已提交,部件报告已入库,完成度,认证提交时间," +
+//                "未开始,收集中,已提交,已同步至上报库,完成度,认证提交时间";
         String firstTitle = "项目," +
                 "法规任务确认," +
-                "设计符合性确认," +
-                "验证符合性确认," +
+                "设计符合性," +
+                "验证符合性," +
                 "认证任务确认," +
-                "Pre-Homo确认," +
+                "Pre-Homo流程," +
                 "认证进度," +
-                "参数收集";
-        String secondTitle = "待发布,待校核,待确认,接受,拒绝,完成度,责任确认日期," +
-                "未发起,待提交,待审查,符合,不符合,待追踪,不涉及,任务终止,完成度,设计核查日期," +
-                "未发起,待提交,待审查,符合,不符合,待追踪,不涉及,任务终止,完成度,验证核查日期," +
-                "待发布,待校核,待确认,接受,拒绝,完成度,责任确认日期," +
-                "未发起,待提交,待审查,审查通过,审查退回,完成度,认证开始日期," +
-                "待开始,进行中,实验通过,实验失败,部件报告未提交,部件报告已提交,部件报告已入库,完成度,认证提交时间," +
-                "未开始,收集中,已提交,已同步至上报库,完成度,认证提交时间";
+                "参数收集进度";
+        String secondTitle = "清单待发布,任务待发起,任务待确认,责任人接受,责任人拒绝,完成度,责任确认日期," +
+                "任务待确认,结果待提交,结果待审查,符合,不符合,待追踪,完成度,设计核查日期," +//去掉不涉及，任务终止
+                "任务待确认,结果待提交,结果待审查,符合,不符合,待追踪,完成度,验证核查日期," +//删掉2个
+                "清单待发布,任务待发起,任务待确认,责任人接受,责任人拒绝,完成度,责任确认日期," +
+                "任务待确认,结果待提交,结果待审查,审查通过,审查退回,完成度,认证开始日期," +
+                "待开始,进行中,实验通过,实验失败,完成度,认证提交时间," +//删掉3个
+                "未发起,收集中,已提交,已同步至上报库,完成度,认证提交时间";
+
         if(com.jero.modules.system.util.StringUtils.equals(cut,CutEnum.EN.getValue())){
             sheetName = "Project Progress";
             firstTitle = "Project," +
                     "Confirmation of regulatory tasks," +
-                    "Confirmation of design compliance," +
-                    "Verification of compliance confirmation," +
+                    "Design compliance," +
+                    "Verification compliance," +
                     "Certification task confirmation," +
-                    "Pre Homo confirmation," +
+                    "Pre Homo process," +
                     "Certification progress," +
-                    "Parameter collection";
-            secondTitle = "To be released,To be verified,To be confirmed,Accept,Refuse,Completion degree,Responsibility confirmation date," +
-                    "Not initiated,To be submitted,Pending review,Conform to,Non Conformance,To be tracked,Not involved,Task Termination,Completion degree,Design verification date," +
-                    "Not initiated,To be submitted,Pending review,Conform to,Non Conformance,To be tracked,Not involved,Task Termination,Completion degree,Verification verification date," +
-                    "To be released,To be verified,To be confirmed,Accept,Refuse,Completion degree,Responsibility confirmation date," +
-                    "Not initiated,To be submitted,Pending review,Review passed,Review return,Completion degree,Certification start date," +
-                    "To begin,In progress,Experiment passed,Experimental failure,Component report not submitted,Component report submitted,Component report has been stored,Completion degree,Certification submission time," +
-                    "Not started,Collecting,Submitted,Synchronized to the upper report library,Completion degree,Certification submission time";
+                    "Parameter collection progress";
+            secondTitle = "List to be released,Task to be initiated,Task to be confirmed,Assignee accept,Assignee refuse,Completion degree,Responsibility confirmation date," +
+                    "Task to be confirmed,Results to be submitted,Results to be reviewed,Compliance,Non-compliance,To be tracked,Completion degree,Design verification date," +
+                    "Task to be confirmed,Results to be submitted,Results to be reviewed,Compliance,Non-compliance,To be tracked,Completion degree,Verification verification date," +
+                    "List to be released,Task to be initiated,Task to be confirmed,Assignee accept,Assignee refuse,Completion degree,Responsibility confirmation date," +
+                    "Task to be confirmed,Results to be submitted,Results to be reviewed,Review passed,Review return,Completion degree,Certification start date," +
+                    "To begin,In progress,Experiment passed,Experimental failure,Completion degree,Certification submission time," +
+                    "Not initiated,Collecting,Submitted,Synchronized to the upper report library,Completion degree,Certification submission time";
+
+            //            firstTitle = "Project," +
+//                    "Confirmation of regulatory tasks," +
+//                    "Confirmation of design compliance," +
+//                    "Verification of compliance confirmation," +
+//                    "Certification task confirmation," +
+//                    "Pre Homo confirmation," +
+//                    "Certification progress," +
+//                    "Parameter collection";
+            //            secondTitle = "To be released,To be verified,To be confirmed,Accept,Refuse,Completion degree,Responsibility confirmation date," +
+//                    "Not initiated,To be submitted,Pending review,Conform to,Non Conformance,To be tracked,Not involved,Task Termination,Completion degree,Design verification date," +
+//                    "Not initiated,To be submitted,Pending review,Conform to,Non Conformance,To be tracked,Not involved,Task Termination,Completion degree,Verification verification date," +
+//                    "To be released,To be verified,To be confirmed,Accept,Refuse,Completion degree,Responsibility confirmation date," +
+//                    "Not initiated,To be submitted,Pending review,Review passed,Review return,Completion degree,Certification start date," +
+//                    "To begin,In progress,Experiment passed,Experimental failure,Component report not submitted,Component report submitted,Component report has been stored,Completion degree,Certification submission time," +
+//                    "Not started,Collecting,Submitted,Synchronized to the upper report library,Completion degree,Certification submission time";
+
         }
         HSSFSheet sheet = workbook.createSheet(sheetName);
 
@@ -879,17 +911,17 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
         sheet.addMergedRegion(region1);
         CellRangeAddress region6 = new CellRangeAddress(0, 0, 1, 7);
         sheet.addMergedRegion(region6);
-        CellRangeAddress region7 = new CellRangeAddress(0, 0, 8, 17);
+        CellRangeAddress region7 = new CellRangeAddress(0, 0, 8, 15);
         sheet.addMergedRegion(region7);
-        CellRangeAddress region8 = new CellRangeAddress(0, 0, 18, 27);
+        CellRangeAddress region8 = new CellRangeAddress(0, 0, 16, 23);
         sheet.addMergedRegion(region8);
-        CellRangeAddress region9 = new CellRangeAddress(0, 0, 28, 34);
+        CellRangeAddress region9 = new CellRangeAddress(0, 0, 24, 30);
         sheet.addMergedRegion(region9);
-        CellRangeAddress region10 = new CellRangeAddress(0, 0, 35, 41);
+        CellRangeAddress region10 = new CellRangeAddress(0, 0, 31, 37);
         sheet.addMergedRegion(region10);
-        CellRangeAddress region11 = new CellRangeAddress(0, 0, 42, 50);
+        CellRangeAddress region11 = new CellRangeAddress(0, 0, 38, 43);
         sheet.addMergedRegion(region11);
-        CellRangeAddress region12 = new CellRangeAddress(0, 0, 51, 56);
+        CellRangeAddress region12 = new CellRangeAddress(0, 0, 44, 49);
         sheet.addMergedRegion(region12);
 
         String[] firstTitleArr = firstTitle.split(",");
@@ -900,7 +932,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
         CellStyle cellStyleTitle = workbook.createCellStyle();
         cellStyleTitle.setAlignment(HorizontalAlignment.CENTER);//垂直居中
         cellStyleTitle.setVerticalAlignment(VerticalAlignment.CENTER);//水平居中
-        for (int i = 0; i <= 56; i++){
+        for (int i = 0; i <= 49; i++){
             sheet.setColumnWidth(i, 4000);
             Cell firstRowCell = firstRow.createCell(i);
             firstRowCell.setCellStyle(cellStyleTitle);
@@ -910,15 +942,15 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                 firstRowCell.setCellValue(firstTitleArr[1]);
             }else if(i == 8){
                 firstRowCell.setCellValue(firstTitleArr[2]);
-            }else if(i == 18){
+            }else if(i == 16){
                 firstRowCell.setCellValue(firstTitleArr[3]);
-            }else if(i == 28){
+            }else if(i == 24){
                 firstRowCell.setCellValue(firstTitleArr[4]);
-            }else if(i == 35){
+            }else if(i == 31){
                 firstRowCell.setCellValue(firstTitleArr[5]);
-            }else if(i == 42){
+            }else if(i == 38){
                 firstRowCell.setCellValue(firstTitleArr[6]);
-            }else if(i == 51){
+            }else if(i == 44){
                 firstRowCell.setCellValue(firstTitleArr[7]);
             }
             if(i >= 1){
@@ -1024,13 +1056,13 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
             dataRow.createCell(11).setCellValue(designCompliance);
             dataRow.createCell(12).setCellValue(designNonCompliance);
             dataRow.createCell(13).setCellValue(designToBeTracked);
-            dataRow.createCell(14).setCellValue(designNotInvolved);
-            dataRow.createCell(15).setCellValue(designTaskTermination);
-            cell = dataRow.createCell(16);
+//            dataRow.createCell(14).setCellValue(designNotInvolved);
+//            dataRow.createCell(15).setCellValue(designTaskTermination);
+            cell = dataRow.createCell(14);
             cell.setCellStyle(style);
             cell.setCellType(CellType.NUMERIC);
             cell.setCellValue(Double.valueOf(designPercentage.replace("%",""))/100);
-            dataRow.createCell(17).setCellValue(designDeadlineStr);
+            dataRow.createCell(15).setCellValue(designDeadlineStr);
 
             Map<String,Object> verifyMap = this.projectLawsInventoryEOService.groupByVerifyStatus(pliEos);
             Map<String,Object> verifyMapProjectScheduleExportMap = (Map<String, Object>) verifyMap.get("projectScheduleExportMap");
@@ -1044,19 +1076,19 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
             double verifyTaskTermination = (double) verifyMapProjectScheduleExportMap.get("taskTermination");
             double verifyCount = (double) verifyMapProjectScheduleExportMap.get("count");
             String verifyPercentage = (String) verifyMapProjectScheduleExportMap.get("percentage");
-            dataRow.createCell(18).setCellValue(verifyNotStart);
-            dataRow.createCell(19).setCellValue(verifyToBeSubmitted);
-            dataRow.createCell(20).setCellValue(verifyToBeReviewed);
-            dataRow.createCell(21).setCellValue(verifyCompliance);
-            dataRow.createCell(22).setCellValue(verifyNonCompliance);
-            dataRow.createCell(23).setCellValue(verifyToBeTracked);
-            dataRow.createCell(24).setCellValue(verifyNotInvolved);
-            dataRow.createCell(25).setCellValue(verifyTaskTermination);
-            cell = dataRow.createCell(26);
+            dataRow.createCell(16).setCellValue(verifyNotStart);
+            dataRow.createCell(17).setCellValue(verifyToBeSubmitted);
+            dataRow.createCell(18).setCellValue(verifyToBeReviewed);
+            dataRow.createCell(19).setCellValue(verifyCompliance);
+            dataRow.createCell(20).setCellValue(verifyNonCompliance);
+            dataRow.createCell(21).setCellValue(verifyToBeTracked);
+//            dataRow.createCell(24).setCellValue(verifyNotInvolved);
+//            dataRow.createCell(25).setCellValue(verifyTaskTermination);
+            cell = dataRow.createCell(22);
             cell.setCellStyle(style);
             cell.setCellType(CellType.NUMERIC);
             cell.setCellValue(Double.valueOf(verifyPercentage.replace("%",""))/100);
-            dataRow.createCell(27).setCellValue(verifyDeadlineStr);
+            dataRow.createCell(23).setCellValue(verifyDeadlineStr);
 
             List<ProjectCertificationInventoryEO> pciEos = pciEoList.stream().filter(pciEo -> StringUtils.equals(pciEo.getProjectLibraryId(), plbEo.getId())).collect(Collectors.toList());
             Map<String,Object> rzRwqrMap = this.projectCertificationInventoryEOService.groupByFGRwqrStatus(pciEos);
@@ -1067,16 +1099,16 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
             double rzRqqrAccept = (double) rzRwqrProjectScheduleExportMap.get("accept");
             double rzRqqrRefuse = (double) rzRwqrProjectScheduleExportMap.get("refuse");
             String rzRqqrPercentage = (String) rzRwqrProjectScheduleExportMap.get("percentage");
-            dataRow.createCell(28).setCellValue(rzRqqrToBeReleased);
-            dataRow.createCell(29).setCellValue(rzRqqrToBeVerified);
-            dataRow.createCell(30).setCellValue(rzRqqrToBeConfirmed);
-            dataRow.createCell(31).setCellValue(rzRqqrAccept);
-            dataRow.createCell(32).setCellValue(rzRqqrRefuse);
-            cell = dataRow.createCell(33);
+            dataRow.createCell(24).setCellValue(rzRqqrToBeReleased);
+            dataRow.createCell(25).setCellValue(rzRqqrToBeVerified);
+            dataRow.createCell(26).setCellValue(rzRqqrToBeConfirmed);
+            dataRow.createCell(27).setCellValue(rzRqqrAccept);
+            dataRow.createCell(28).setCellValue(rzRqqrRefuse);
+            cell = dataRow.createCell(29);
             cell.setCellStyle(style);
             cell.setCellType(CellType.NUMERIC);
             cell.setCellValue(Double.valueOf(rzRqqrPercentage.replace("%",""))/100);
-            dataRow.createCell(34).setCellValue(legalTaskConfirmationStr);
+            dataRow.createCell(30).setCellValue(legalTaskConfirmationStr);
 
             Map<String,Object> preHomoMap = this.projectCertificationInventoryEOService.groupByPreHomoStatus(pciEos);
             Map<String,Object> preHomoProjectScheduleExportMap = (Map<String, Object>) preHomoMap.get("projectScheduleExportMap");
@@ -1086,16 +1118,16 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
             double preHomoAccept = (double) preHomoProjectScheduleExportMap.get("accept");
             double preHomoRefuse = (double) preHomoProjectScheduleExportMap.get("refuse");
             String preHomoPercentage = (String) preHomoProjectScheduleExportMap.get("percentage");
-            dataRow.createCell(35).setCellValue(preHomoNotStartCount);
-            dataRow.createCell(36).setCellValue(preHomoToBeSubmittedCount);
-            dataRow.createCell(37).setCellValue(preHomoToBeReviewedCount);
-            dataRow.createCell(38).setCellValue(preHomoAccept);
-            dataRow.createCell(39).setCellValue(preHomoRefuse);
-            cell = dataRow.createCell(40);
+            dataRow.createCell(31).setCellValue(preHomoNotStartCount);
+            dataRow.createCell(32).setCellValue(preHomoToBeSubmittedCount);
+            dataRow.createCell(33).setCellValue(preHomoToBeReviewedCount);
+            dataRow.createCell(34).setCellValue(preHomoAccept);
+            dataRow.createCell(35).setCellValue(preHomoRefuse);
+            cell = dataRow.createCell(36);
             cell.setCellStyle(style);
             cell.setCellType(CellType.NUMERIC);
             cell.setCellValue(Double.valueOf(preHomoPercentage.replace("%",""))/100);
-            dataRow.createCell(41).setCellValue(attestationStartTimeStr);
+            dataRow.createCell(37).setCellValue(attestationStartTimeStr);
 
             Map<String,Object> certificationProgressMap = this.projectCertificationInventoryEOService.groupByCertificationProgress(pciEos);
             Map<String,Object> certificationProgressMapProjectScheduleExportMap = (Map<String, Object>) certificationProgressMap.get("projectScheduleExportMap");
@@ -1108,18 +1140,18 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
             double certificationProgressStoredCount = (double) certificationProgressMapProjectScheduleExportMap.get("storedCount");
             // String certificationProgressCount = (String) certificationProgressMapProjectScheduleExportMap.get("count");
             String certificationProgressPercentage = (String) certificationProgressMapProjectScheduleExportMap.get("percentage");
-            dataRow.createCell(42).setCellValue(certificationProgressNotStartCount);
-            dataRow.createCell(43).setCellValue(certificationProgressInProgressCount);
-            dataRow.createCell(44).setCellValue(certificationProgressTestPassedCount);
-            dataRow.createCell(45).setCellValue(certificationProgressTestFailedCount);
-            dataRow.createCell(46).setCellValue(certificationProgressNotSubmitCount);
-            dataRow.createCell(47).setCellValue(certificationProgressReportSubmitCount);
-            dataRow.createCell(48).setCellValue(certificationProgressStoredCount);
-            cell = dataRow.createCell(49);
+            dataRow.createCell(38).setCellValue(certificationProgressNotStartCount);
+            dataRow.createCell(39).setCellValue(certificationProgressInProgressCount);
+            dataRow.createCell(40).setCellValue(certificationProgressTestPassedCount);
+            dataRow.createCell(41).setCellValue(certificationProgressTestFailedCount);
+//            dataRow.createCell(46).setCellValue(certificationProgressNotSubmitCount);
+//            dataRow.createCell(47).setCellValue(certificationProgressReportSubmitCount);
+//            dataRow.createCell(48).setCellValue(certificationProgressStoredCount);
+            cell = dataRow.createCell(42);
             cell.setCellStyle(style);
             cell.setCellType(CellType.NUMERIC);
             cell.setCellValue(Double.valueOf(certificationProgressPercentage.replace("%",""))/100);
-            dataRow.createCell(50).setCellValue(certificationSubmissionStr);
+            dataRow.createCell(43).setCellValue(certificationSubmissionStr);
 
 
             List<ParamsManifestEO> pmEos = pmEoList.stream().filter(pmEo -> {
@@ -1164,15 +1196,15 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                 double parameterCollectingPercentage = (completionCount / parameterCollectingCount) * 100;
                 parameterCollectingPercentageStr = (parameterCollectingPercentage != 0 && (completionCount !=0 )) ? df.format(parameterCollectingPercentage) : "0";
             }
-            dataRow.createCell(51).setCellValue(notStartAmount);
-            dataRow.createCell(52).setCellValue(collectingAmount);
-            dataRow.createCell(53).setCellValue(submitAmount);
-            dataRow.createCell(54).setCellValue(syncReporAmount);
-            cell = dataRow.createCell(55);
+            dataRow.createCell(44).setCellValue(notStartAmount);
+            dataRow.createCell(45).setCellValue(collectingAmount);
+            dataRow.createCell(46).setCellValue(submitAmount);
+            dataRow.createCell(47).setCellValue(syncReporAmount);
+            cell = dataRow.createCell(48);
             cell.setCellStyle(style);
             cell.setCellType(CellType.NUMERIC);
             cell.setCellValue(Double.valueOf(parameterCollectingPercentageStr)/100);
-            dataRow.createCell(56).setCellValue(certificationSubmissionStr);
+            dataRow.createCell(49).setCellValue(certificationSubmissionStr);
             dataIndex ++;
 
             log.info("11111处理"+ dataIndex +"个项目消耗时间：" + (System.currentTimeMillis() - startTime));

From b4b70564a97aa59afe9e6344c6cd7ea95dd4d0b8 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 12 Oct 2023 18:02:10 +0800
Subject: [PATCH 276/288] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=9C=8B=E6=9D=BF-=E5=AF=BC=E5=87=BA=EF=BC=88=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E4=BB=BB=E5=8A=A1=E7=A1=AE=E8=AE=A4=EF=BC=8C=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E7=AC=A6=E5=90=88=E6=80=A7=EF=BC=8C=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E7=AC=A6=E5=90=88=E6=80=A7=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    | 79 ++++++++++---------
 .../impl/ProjectStatusBoardServiceImpl.java   | 10 +--
 2 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 564b436ea..b1ba0d549 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -11361,8 +11361,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		double complianceCount = 0;    // 符合
 		double nonComplianceCount = 0; // 不符合
 		double toBeTrackedCount = 0;   // 待追踪
-		double notInvolvedCount = 0;   // 不涉及
-		double taskTerminationCount = 0;   // 任务终止
+//		double notInvolvedCount = 0;   // 不涉及
+//		double taskTerminationCount = 0;   // 任务终止
 		double count = 0;
 		// 计算百分比
 		double percentage = 0;
@@ -11414,19 +11414,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				return flag;
 			}).collect(Collectors.toList());
 
-			List<ProjectLawsInventoryEO> designNotInvolved = pliEos.stream().filter(pliEo -> {
-				boolean flag = (
-						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.UNINVOLVED.getValue())
-				);
-				return flag;
-			}).collect(Collectors.toList());
+//			List<ProjectLawsInventoryEO> designNotInvolved = pliEos.stream().filter(pliEo -> {
+//				boolean flag = (
+//						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.UNINVOLVED.getValue())
+//				);
+//				return flag;
+//			}).collect(Collectors.toList());
 
-			List<ProjectLawsInventoryEO> taskTermination = pliEos.stream().filter(pliEo -> {
-				boolean flag = (
-						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TERMINATION_OF_TASK.getValue())
-				);
-				return flag;
-			}).collect(Collectors.toList());
+//			List<ProjectLawsInventoryEO> taskTermination = pliEos.stream().filter(pliEo -> {
+//				boolean flag = (
+//						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TERMINATION_OF_TASK.getValue())
+//				);
+//				return flag;
+//			}).collect(Collectors.toList());
 
 			notStartCount = designNotStart.size();
 			toBeSubmittedCount = designToBeSubmitted.size();
@@ -11434,9 +11434,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			complianceCount = designCompliance.size();
 			nonComplianceCount = designNonCompliance.size();
 			toBeTrackedCount = designToBeTracked.size();
-			notInvolvedCount = designNotInvolved.size();
-			taskTerminationCount = taskTermination.size();
-			count = notStartCount + toBeSubmittedCount + toBeReviewedCount + complianceCount + nonComplianceCount + toBeTrackedCount + taskTerminationCount;
+//			notInvolvedCount = designNotInvolved.size();
+//			taskTerminationCount = taskTermination.size();
+//			count = notStartCount + toBeSubmittedCount + toBeReviewedCount + complianceCount + nonComplianceCount + toBeTrackedCount + taskTerminationCount;
+			count = notStartCount + toBeSubmittedCount + toBeReviewedCount + complianceCount + nonComplianceCount + toBeTrackedCount;
 			// 计算百分比
 			if(count <= 0){
 				percentage = 0;
@@ -11452,8 +11453,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		projectScheduleExportMap.put("compliance",complianceCount);
 		projectScheduleExportMap.put("nonCompliance",nonComplianceCount);
 		projectScheduleExportMap.put("toBeTracked",toBeTrackedCount);
-		projectScheduleExportMap.put("notInvolved",notInvolvedCount);
-		projectScheduleExportMap.put("taskTermination",taskTerminationCount);
+//		projectScheduleExportMap.put("notInvolved",notInvolvedCount);
+//		projectScheduleExportMap.put("taskTermination",taskTerminationCount);
 		projectScheduleExportMap.put("count",count);
 		projectScheduleExportMap.put("percentage",percentageStr + percentSign);
 		result.put("projectScheduleExportMap",projectScheduleExportMap);
@@ -11472,8 +11473,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		double complianceCount = 0;    // 符合
 		double nonComplianceCount = 0; // 不符合
 		double toBeTrackedCount = 0;   // 待追踪
-		double notInvolvedCount = 0;   // 不涉及
-		double taskTerminationCount = 0;   // 任务终止
+//		double notInvolvedCount = 0;   // 不涉及
+//		double taskTerminationCount = 0;   // 任务终止
 		double count = 0;
 		// 计算百分比
 		double percentage = 0;
@@ -11525,19 +11526,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				return flag;
 			}).collect(Collectors.toList());
 
-			List<ProjectLawsInventoryEO> verifyNotInvolved = pliEos.stream().filter(pliEo -> {
-				boolean flag = (
-						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.UNINVOLVED.getValue())
-				);
-				return flag;
-			}).collect(Collectors.toList());
+//			List<ProjectLawsInventoryEO> verifyNotInvolved = pliEos.stream().filter(pliEo -> {
+//				boolean flag = (
+//						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.UNINVOLVED.getValue())
+//				);
+//				return flag;
+//			}).collect(Collectors.toList());
 
-			List<ProjectLawsInventoryEO> taskTermination = pliEos.stream().filter(pliEo -> {
-				boolean flag = (
-						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TERMINATION_OF_TASK.getValue())
-				);
-				return flag;
-			}).collect(Collectors.toList());
+//			List<ProjectLawsInventoryEO> taskTermination = pliEos.stream().filter(pliEo -> {
+//				boolean flag = (
+//						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TERMINATION_OF_TASK.getValue())
+//				);
+//				return flag;
+//			}).collect(Collectors.toList());
 
 			notStartCount = verifyNotStart.size();
 			toBeSubmittedCount = verifyToBeSubmitted.size();
@@ -11545,10 +11546,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			complianceCount = verifyCompliance.size();
 			nonComplianceCount = verifyNonCompliance.size();
 			toBeTrackedCount = verifyToBeTracked.size();
-			notInvolvedCount = verifyNotInvolved.size();
-			taskTerminationCount = taskTermination.size();
-
-			count = notStartCount + toBeSubmittedCount + toBeReviewedCount + complianceCount + nonComplianceCount + toBeTrackedCount + taskTerminationCount;
+//			notInvolvedCount = verifyNotInvolved.size();
+//			taskTerminationCount = taskTermination.size();
+//			count = notStartCount + toBeSubmittedCount + toBeReviewedCount + complianceCount + nonComplianceCount + toBeTrackedCount + taskTerminationCount;
+			count = notStartCount + toBeSubmittedCount + toBeReviewedCount + complianceCount + nonComplianceCount + toBeTrackedCount;
 			if(count <= 0){
 				percentage = 0;
 			}else{
@@ -11564,8 +11565,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		projectScheduleExportMap.put("compliance",complianceCount);
 		projectScheduleExportMap.put("nonCompliance",nonComplianceCount);
 		projectScheduleExportMap.put("toBeTracked",toBeTrackedCount);
-		projectScheduleExportMap.put("notInvolved",notInvolvedCount);
-		projectScheduleExportMap.put("taskTermination",taskTerminationCount);
+//		projectScheduleExportMap.put("notInvolved",notInvolvedCount);
+//		projectScheduleExportMap.put("taskTermination",taskTerminationCount);
 		projectScheduleExportMap.put("count",count);
 		projectScheduleExportMap.put("percentage",percentageStr + percentSign);
 		result.put("projectScheduleExportMap",projectScheduleExportMap);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
index 83daf1b74..375232f46 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
@@ -1046,8 +1046,8 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
             double designCompliance = (double) designMapProjectScheduleExportMap.get("compliance");
             double designNonCompliance = (double) designMapProjectScheduleExportMap.get("nonCompliance");
             double designToBeTracked = (double) designMapProjectScheduleExportMap.get("toBeTracked");
-            double designNotInvolved = (double) designMapProjectScheduleExportMap.get("notInvolved");
-            double designTaskTermination = (double) designMapProjectScheduleExportMap.get("taskTermination");
+//            double designNotInvolved = (double) designMapProjectScheduleExportMap.get("notInvolved");
+//            double designTaskTermination = (double) designMapProjectScheduleExportMap.get("taskTermination");
             // double designCount = (double) designMapProjectScheduleExportMap.get("count");
             String designPercentage = (String) designMapProjectScheduleExportMap.get("percentage");
             dataRow.createCell(8).setCellValue(designNotStart);
@@ -1072,9 +1072,9 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
             double verifyCompliance = (double) verifyMapProjectScheduleExportMap.get("compliance");
             double verifyNonCompliance = (double) verifyMapProjectScheduleExportMap.get("nonCompliance");
             double verifyToBeTracked = (double) verifyMapProjectScheduleExportMap.get("toBeTracked");
-            double verifyNotInvolved = (double) verifyMapProjectScheduleExportMap.get("notInvolved");
-            double verifyTaskTermination = (double) verifyMapProjectScheduleExportMap.get("taskTermination");
-            double verifyCount = (double) verifyMapProjectScheduleExportMap.get("count");
+//            double verifyNotInvolved = (double) verifyMapProjectScheduleExportMap.get("notInvolved");
+//            double verifyTaskTermination = (double) verifyMapProjectScheduleExportMap.get("taskTermination");
+//            double verifyCount = (double) verifyMapProjectScheduleExportMap.get("count");
             String verifyPercentage = (String) verifyMapProjectScheduleExportMap.get("percentage");
             dataRow.createCell(16).setCellValue(verifyNotStart);
             dataRow.createCell(17).setCellValue(verifyToBeSubmitted);

From 3774b14d25dc04390042e76d1b34d67bf0c708fd Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 13 Oct 2023 10:14:45 +0800
Subject: [PATCH 277/288] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=9C=8B=E6=9D=BF-=E5=AF=BC=E5=87=BA=EF=BC=88=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E4=BB=BB=E5=8A=A1=E7=A1=AE=E8=AE=A4=EF=BC=8CPre-Homo?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=EF=BC=8C=E8=AE=A4=E8=AF=81=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctCertificationInventoryEOServiceImpl.java | 60 ++++++++++---------
 .../ProjectLibraryStatisticsServiceImpl.java  |  3 +-
 .../impl/ProjectStatusBoardServiceImpl.java   |  6 +-
 3 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index 50a1033e7..a1522a076 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -6563,9 +6563,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		double inProgressCount = 0;    // 进行中
 		double testPassedCount = 0;    // 实验通过
 		double testFailedCount = 0;    // 实验失败
-		double notSubmitCount = 0;     // 部件报告未上传
-		double reportSubmitCount = 0;  // 部件报告已上传
-		double storedCount = 0;        // 部件报告已入库
+//		double notSubmitCount = 0;     // 部件报告未上传
+//		double reportSubmitCount = 0;  // 部件报告已上传
+//		double storedCount = 0;        // 部件报告已入库
 		double count = 0;
 		// 计算百分比
 		double percentage = 0;
@@ -6585,6 +6585,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			List<ProjectCertificationInventoryEO> inProgressPciEoList = pciEos.stream().filter(data -> {
 				boolean flag = (
 						StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.IN_PROGRESS.getValue())
+								|| StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue())
 				);
 				return flag;
 			}).collect(Collectors.toList());
@@ -6594,6 +6595,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			List<ProjectCertificationInventoryEO> testPassedPciEoList = pciEos.stream().filter(data -> {
 				boolean flag = (
 						StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.TEST_PASSED.getValue())
+						|| StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue())
+						|| StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue())
 				);
 				return flag;
 			}).collect(Collectors.toList());
@@ -6609,33 +6612,34 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			testFailedCount = (double) testFailedPciEoList.size();
 
 			// 部件报告未提交
-			List<ProjectCertificationInventoryEO> notSubmitPciEoList = pciEos.stream().filter(data -> {
-				boolean flag = (
-						StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue())
-				);
-				return flag;
-			}).collect(Collectors.toList());
-			notSubmitCount = (double) notSubmitPciEoList.size();
+//			List<ProjectCertificationInventoryEO> notSubmitPciEoList = pciEos.stream().filter(data -> {
+//				boolean flag = (
+//						StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue())
+//				);
+//				return flag;
+//			}).collect(Collectors.toList());
+//			notSubmitCount = (double) notSubmitPciEoList.size();
 
 			// 部件报告已提交
-			List<ProjectCertificationInventoryEO> reportSubmitPciEoList = pciEos.stream().filter(data -> {
-				boolean flag = (
-						StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue())
-				);
-				return flag;
-			}).collect(Collectors.toList());
-			reportSubmitCount = (double) reportSubmitPciEoList.size();
+//			List<ProjectCertificationInventoryEO> reportSubmitPciEoList = pciEos.stream().filter(data -> {
+//				boolean flag = (
+//						StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue())
+//				);
+//				return flag;
+//			}).collect(Collectors.toList());
+//			reportSubmitCount = (double) reportSubmitPciEoList.size();
 
 			// 部件报告已入库
-			List<ProjectCertificationInventoryEO> storedPciEoList = pciEos.stream().filter(data -> {
-				boolean flag = (
-						StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue())
-				);
-				return flag;
-			}).collect(Collectors.toList());
-			storedCount = (double) storedPciEoList.size();
+//			List<ProjectCertificationInventoryEO> storedPciEoList = pciEos.stream().filter(data -> {
+//				boolean flag = (
+//						StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue())
+//				);
+//				return flag;
+//			}).collect(Collectors.toList());
+//			storedCount = (double) storedPciEoList.size();
 
-			count = notStartCount + inProgressCount + testPassedCount + testFailedCount + testFailedCount + notSubmitCount + reportSubmitCount + storedCount;
+//			count = notStartCount + inProgressCount + testPassedCount + testFailedCount + testFailedCount + notSubmitCount + reportSubmitCount + storedCount;
+			count = notStartCount + inProgressCount + testPassedCount + testFailedCount + testFailedCount;
 			if(count<=0){
 				percentage = 0;
 			}else {
@@ -6648,9 +6652,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		projectScheduleExportMap.put("inProgressCount",inProgressCount);
 		projectScheduleExportMap.put("testPassedCount",testPassedCount);
 		projectScheduleExportMap.put("testFailedCount",testFailedCount);
-		projectScheduleExportMap.put("notSubmitCount",notSubmitCount);
-		projectScheduleExportMap.put("reportSubmitCount",reportSubmitCount);
-		projectScheduleExportMap.put("storedCount",storedCount);
+//		projectScheduleExportMap.put("notSubmitCount",notSubmitCount);
+//		projectScheduleExportMap.put("reportSubmitCount",reportSubmitCount);
+//		projectScheduleExportMap.put("storedCount",storedCount);
 		projectScheduleExportMap.put("count",count);
 		projectScheduleExportMap.put("percentage",percentageStr + percentSign);
 		result.put("projectScheduleExportMap",projectScheduleExportMap);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java
index e3d1b0330..16cfa30a5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java
@@ -781,7 +781,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
                 boolean flag = (
                         StringUtils.equals(data.getState(), CollectManifestStateEnum.WAIT_COLLECT.getValue())
                                 || StringUtils.equals(data.getState(), CollectManifestStateEnum.SDT_BACK.getValue())
-                                || StringUtils.equals(data.getState(), CollectManifestStateEnum.CHANGE.getValue())
+//                                || StringUtils.equals(data.getState(), CollectManifestStateEnum.CHANGE.getValue())
                 );
                 return flag;
             }).collect(Collectors.toList());
@@ -803,6 +803,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
             List<ParamsCollectManifestEO> submitPcmEoList = datas.stream().filter(data -> {
                 boolean flag = (
                         StringUtils.equals(data.getState(), CollectManifestStateEnum.SUBMIT.getValue())
+                        || StringUtils.equals(data.getState(), CollectManifestStateEnum.CHANGE.getValue())
                 );
                 return flag;
             }).collect(Collectors.toList());
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
index 375232f46..cf38c9ff3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
@@ -1135,9 +1135,9 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
             double certificationProgressInProgressCount = (double) certificationProgressMapProjectScheduleExportMap.get("inProgressCount");
             double certificationProgressTestPassedCount = (double) certificationProgressMapProjectScheduleExportMap.get("testPassedCount");
             double certificationProgressTestFailedCount = (double) certificationProgressMapProjectScheduleExportMap.get("testFailedCount");
-            double certificationProgressNotSubmitCount = (double) certificationProgressMapProjectScheduleExportMap.get("notSubmitCount");
-            double certificationProgressReportSubmitCount = (double) certificationProgressMapProjectScheduleExportMap.get("reportSubmitCount");
-            double certificationProgressStoredCount = (double) certificationProgressMapProjectScheduleExportMap.get("storedCount");
+//            double certificationProgressNotSubmitCount = (double) certificationProgressMapProjectScheduleExportMap.get("notSubmitCount");
+//            double certificationProgressReportSubmitCount = (double) certificationProgressMapProjectScheduleExportMap.get("reportSubmitCount");
+//            double certificationProgressStoredCount = (double) certificationProgressMapProjectScheduleExportMap.get("storedCount");
             // String certificationProgressCount = (String) certificationProgressMapProjectScheduleExportMap.get("count");
             String certificationProgressPercentage = (String) certificationProgressMapProjectScheduleExportMap.get("percentage");
             dataRow.createCell(38).setCellValue(certificationProgressNotStartCount);

From 198742388964cb810808df617bc031e1b1fe334b Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 13 Oct 2023 10:23:16 +0800
Subject: [PATCH 278/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9ota=E8=BD=AF=E4=BB=B6?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=8B=B1=E6=96=87=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 9e234ec69..93e296293 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -513,7 +513,7 @@ module.exports = {
   ProcessName: 'Process Name',
   ProcessType: 'Process Type',
   AddProcess: 'Add Process',
-  RelatedItems: 'Project',
+  RelatedItems: 'Relevant Projects',
   Sponsor: 'Creator',
   CurrentProcessor: 'Current Operator',
   LastProcessor: 'Last Operator',
@@ -1873,7 +1873,7 @@ module.exports = {
   technicalAssessmentOfRegulations:'Regulation Technical Assessment',
   legalOpinionCollection:'Opinion Collection on Regulation',
   authenticationParameterCollectionData:'Homo Parameter Collection Data',
-  phoneRelatedItems:'Project',
+  phoneRelatedItems:'Relevant Projects',
   listHeading:'List Title',
   phoneVersionNumber:'Version',
   node:'Node',
@@ -1959,13 +1959,13 @@ module.exports = {
   Reasonforreturn:'Reason for return',
   maintenanceTemplate:'Maintenance template',
   UserFeedback:'User Feedback',
-  Relevantlawsregulations:'Relevant laws and regulations',
-  Problemstate:'Problem state',
+  Relevantlawsregulations:'Relevant Regulations',
+  Problemstate:'Issue State',
   descriptions:'Descriptions',
   documents:'Documents',
-  examineapproveevidence:'Examine and approve evidence',
+  examineapproveevidence:'Approval',
   conculsion:'Conculsion',
-  progresstracking:'Progress Tracking',
+  progresstracking:'Progress Track',
   Fileupload:'File upload',
   Addresslink:'Address link',
   Problemanagement:'Problem management',

From 2b21e65506f31ad76b2251d1278228cea57b522c Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 13 Oct 2023 11:16:14 +0800
Subject: [PATCH 279/288] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=BA=93-=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E7=BB=9F=E8=AE=A1=E5=9B=BE=E7=BB=9F=E8=AE=A1=E9=A2=86?=
 =?UTF-8?q?=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectLibraryStatisticsServiceImpl.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java
index 16cfa30a5..7f87f897c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java
@@ -439,7 +439,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
 
             result.put(TaskAffirmStatusEnum.NOT_STARTED.getValue(),notStartedMap);
 //            result.put(TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue(),toConfirmMap);
-            result.put(TodoCenterStatusEnum.TO_SUBMIT.getValue(),acceptedMap);
+            result.put(TodoCenterStatusEnum.TO_SUBMIT.getValue(),toConfirmMap);
             result.put(CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue(),acceptedMap);
             result.put(CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue(),rejectedMap);
         }

From 645a031785d49be92f253fbb38bd6fd533ce7f86 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 13 Oct 2023 13:50:45 +0800
Subject: [PATCH 280/288] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=BA=93-=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E8=AE=A4=E8=AF=81=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?-=E8=AE=A4=E8=AF=81=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectManagement/components/certificationActivity.vue    | 4 ++--
 .../components/certificationActivity.vue                      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/certificationActivity.vue b/jero-web/src/views/projectManagement/components/certificationActivity.vue
index 6e56fc29e..b19a1314f 100644
--- a/jero-web/src/views/projectManagement/components/certificationActivity.vue
+++ b/jero-web/src/views/projectManagement/components/certificationActivity.vue
@@ -118,10 +118,10 @@
                 status: res.taskAffirmStatus
               })
               color.push('#00B3BE')
-            } else if (res.taskAffirmStatus == 'To submit') {
+            } else if (res.taskAffirmStatus == 'List to confirm') {
               data.push({
                 value: res.taskAffirmStatusCount,
-                name: this.$t('toSubmit'),
+                name: this.$t('listToConfirm'),
                 color: '#FDA71C',
                 status: res.taskAffirmStatus
               })
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue
index 2013d4d78..a2da1a598 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue
@@ -117,10 +117,10 @@
                 status: res.taskAffirmStatus
               })
               color.push('#00B3BE')
-            } else if (res.taskAffirmStatus == 'To submit') {
+            } else if (res.taskAffirmStatus == 'List to confirm') {
               data.push({
                 value: res.taskAffirmStatusCount,
-                name: this.$t('toSubmit'),
+                name: this.$t('listToConfirm'),
                 color: '#FDA71C',
                 status: res.taskAffirmStatus
               })

From 34256de75770dfabfa0e9b6fa3e2fdbd8e70673b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Fri, 13 Oct 2023 14:20:22 +0800
Subject: [PATCH 281/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/IParamsReportConfigDataEOService.java |  3 +++
 .../impl/ParamsReportConfigDataEOServiceImpl.java | 15 +++++++++++++++
 .../impl/ParamsReportDetailEOServiceImpl.java     | 12 +++++++++++-
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java
index 94b9c8c6c..ab3698f26 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java
@@ -39,4 +39,7 @@ public interface IParamsReportConfigDataEOService extends IService<ParamsReportC
 	 * @return
 	 */
 	int deleteByParamsReportDetailIdList(List<String> paramsReportDetailIdList);
+
+
+	List<ParamsReportConfigDataEO> queryListByCollectManifestIdList(List<String> paramsCollectManifestIdList);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java
index 7168c6649..0f72783e3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java
@@ -78,4 +78,19 @@ public class ParamsReportConfigDataEOServiceImpl extends ServiceImpl<ParamsRepor
 		return baseMapper.delete(queryWrapper);
 	}
 
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param paramsConfigId
+	 * @param paramsCollectManifestId
+	 * @return
+	 */
+	@Override
+	public List<ParamsReportConfigDataEO> queryListByCollectManifestIdList(List<String> paramsCollectManifestIdList) {
+		LambdaQueryWrapper<ParamsReportConfigDataEO> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.in(ParamsReportConfigDataEO::getParamsCollectManifestId, paramsCollectManifestIdList);
+		queryWrapper.orderByDesc(ParamsReportConfigDataEO::getOrderNum);
+		return this.list(queryWrapper);
+	}
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
index 4acc8c899..2786b024c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
@@ -154,6 +154,9 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 			dictItemList.addAll(dictItems);
 		}
 
+		List<String> collectManifestIdList = list.stream().map(ParamsReportDetailEO::getId).distinct().collect(Collectors.toList());
+		List<ParamsReportConfigDataEO> paramsReportConfigDataEOList = this.paramsReportConfigDataEOService.queryListByCollectManifestIdList(collectManifestIdList);
+
 		List<Map<String, Object>> listMap = new ArrayList<>();
 		list.forEach(collectManifestEO -> { // 参数收集清单
 
@@ -225,7 +228,14 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 					Map<String, Object> configMap = new HashMap<>();
 
 					String paramsConfigId = paramsConfigEO.getId();
-					List<ParamsReportConfigDataEO> paramsConfigDataEOList = this.paramsReportConfigDataEOService.queryListByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
+					List<ParamsReportConfigDataEO> paramsConfigDataEOList = paramsReportConfigDataEOList.stream().filter(prcdEO -> {
+						boolean flag = false;
+						if (StringUtils.equals(prcdEO.getParamsConfigId(),paramsConfigId) && StringUtils.equals(prcdEO.getParamsCollectManifestId(),paramsCollectManifestId)) {
+							flag = true;
+						}
+						return flag;
+					}).distinct().collect(Collectors.toList());
+//					List<ParamsReportConfigDataEO> paramsConfigDataEOList = this.paramsReportConfigDataEOService.queryListByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
 					if(CollectionUtils.isNotEmpty(paramsConfigDataEOList)){
 						// 匿名比较器排序
 						Collections.sort(paramsConfigDataEOList, new Comparator<ParamsReportConfigDataEO>() {

From 0875d1d7f610909a6a8cec634415e4e20cfc6603 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 13 Oct 2023 15:15:12 +0800
Subject: [PATCH 282/288] =?UTF-8?q?=E5=BE=85=E5=8A=9E-=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/ProcessInfoEOMapper.xml        | 42 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
index a3c3f2092..317cdd972 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
@@ -168,7 +168,26 @@
                    case
                    when
                    year_name_id is null
-                   THEN plb.project_name_id
+                   THEN
+                        concat(
+                        plb.power,
+                        '-',
+                        plb.producer,
+                        '-',
+                        (
+                        SELECT
+                        CASE
+                        WHEN
+                        GROUP_CONCAT( item_text SEPARATOR ',' ) IS NULL THEN
+                        '' ELSE GROUP_CONCAT( item_text SEPARATOR ',' )
+                        END AS item_text
+                        FROM
+                        sys_dict_item
+                        WHERE
+                        FIND_IN_SET( item_value, plb.target_market ) > 0
+                        AND dict_id = ( SELECT id FROM sys_dict WHERE dict_code = 'region' )
+                        )
+                        )
                    when year_name_id is not null
                    THEN
                     concat(
@@ -243,7 +262,26 @@
                    case
                    when
                    year_name_id is null
-                   THEN plb.project_name_id
+                   THEN
+                        concat(
+                        plb.power,
+                        '-',
+                        plb.producer,
+                        '-',
+                        (
+                        SELECT
+                        CASE
+                        WHEN
+                        GROUP_CONCAT( item_text SEPARATOR ',' ) IS NULL THEN
+                        '' ELSE GROUP_CONCAT( item_text SEPARATOR ',' )
+                        END AS item_text
+                        FROM
+                        sys_dict_item
+                        WHERE
+                        FIND_IN_SET( item_value, plb.target_market ) > 0
+                        AND dict_id = ( SELECT id FROM sys_dict WHERE dict_code = 'region' )
+                        )
+                        )
                    when year_name_id is not null
                    THEN
                     concat(

From f90e2430749b63e0a1dccc0ff5d5344dfcd27f4b Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 13 Oct 2023 15:35:34 +0800
Subject: [PATCH 283/288] =?UTF-8?q?=E5=BE=85=E5=8A=9E-=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B5=81=E7=A8=8B-=E5=8A=9E=E7=90=86?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/project/mapper/xml/ProjectLibraryBaseMapper.xml     | 2 ++
 .../project/service/impl/ProjectLibraryBaseServiceImpl.java     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
index 82cecb02a..82c3eb811 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
@@ -52,6 +52,8 @@
             plb.sort,
             plb.flag,
             plb.brand,
+            plb.power,
+            plb.producer,
             sdi.item_text brandText,
             sdi.en_name brandTextEn
         from project_library_base as plb
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index ef5926884..f268989f2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -1061,7 +1061,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 						+ "-" + projectLibraryBase.getYearName()
 						+ "-" + targetMarket + "-" + projectVersion);
 			}else{
-				projectLibraryBase.setProjectName(projectLibraryBase.getProjectNameId());
+				projectLibraryBase.setProjectName(projectLibraryBase.getPower()+"-"+projectLibraryBase.getProducer()+"-"+targetMarket);
 			}
 		}
 		return records;

From 478e91d159240d6c23f7d1e660fcc7b04b413f09 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 13 Oct 2023 17:15:41 +0800
Subject: [PATCH 284/288] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E5=92=8C=E8=AE=A4=E8=AF=81=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95-=E5=8F=91=E8=B5=B7=E4=BB=BB=E5=8A=A1=E6=97=B6?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformProjectCertificationInventoryEOServiceImpl.java  | 2 +-
 .../service/impl/PlatformProjectLibraryBaseServiceImpl.java  | 5 +++++
 .../modules/project/mapper/xml/ProjectLibraryBaseMapper.xml  | 1 -
 .../project/service/impl/ProjectLibraryBaseServiceImpl.java  | 5 +++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
index 3c6a98c03..e01abb68b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
@@ -3288,7 +3288,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 						templateVariableMap.put("projectNameEn",PRN_EN);
 						templateVariableMap.put("standName",standName);
 						templateVariableMap.put("itemName",itemName);
-						templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName());
+						templateVariableMap.put("Initiator",projectLibraryBase.getRegulationOwnerIdName());
 						templateVariableMap.put("endTime",DateUtils.formatDate(taskConfirmEndTime));
 						templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
 						templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
index 5fe52592d..2f0adfbce 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
@@ -2468,6 +2468,11 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 							+ "-" + projectLibraryBase.getYearName()
 							+ "-" + targetMarketCn
 							+ "-" + projectVersion);
+				}else{
+					//projectLibraryBase.getYearName()为空的时候代表为平台件数据
+					projectLibraryBase.setProjectNameEn(projectLibraryBase.getPower()+"-"+projectLibraryBase.getProducer()+"-"+targetMarketEn);
+
+					projectLibraryBase.setProjectNameCn(projectLibraryBase.getPower()+"-"+projectLibraryBase.getProducer()+"-"+targetMarketCn);
 				}
 
 				if(StringUtils.isNotEmpty(projectLibraryBase.getStudioEngineer())){
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
index 82c3eb811..5419e9765 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
@@ -290,7 +290,6 @@
     <select id="queryById" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
         <include refid="select_item"/>
         <where>
-            plb.platform is null
             <if test="id != null and id != '' ">
                 and plb.id=#{id}
             </if>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index f268989f2..cc0f6253d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -2778,6 +2778,11 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 							+ "-" + projectLibraryBase.getYearName()
 							+ "-" + targetMarketCn
 							+ "-" + projectVersion);
+				}else{
+					//projectLibraryBase.getYearName()为空时代表该数据为平台件数据
+					projectLibraryBase.setProjectNameEn(projectLibraryBase.getPower()+"-"+projectLibraryBase.getProducer()+"-"+targetMarketEn);
+
+					projectLibraryBase.setProjectNameCn(projectLibraryBase.getPower()+"-"+projectLibraryBase.getProducer()+"-"+targetMarketCn);
 				}
 
 				if(StringUtils.isNotEmpty(projectLibraryBase.getStudioEngineer())){

From 86080fc5f7a31dfbe9ef452e4a23dd3c18dae7e0 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 13 Oct 2023 17:23:43 +0800
Subject: [PATCH 285/288] =?UTF-8?q?=E5=BE=85=E5=8A=9E-=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessInfoEOServiceImpl.java        | 43 +++++++++++++++----
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
index 9992978c4..01d5e42db 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.Result;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.exception.JeroBootException;
@@ -17,13 +18,28 @@ import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluation
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
 import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService;
 import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationFlowDetailEOService;
-import com.jero.modules.project.entity.*;
-import com.jero.modules.project.enums.*;
-import com.jero.modules.project.service.*;
+import com.jero.modules.project.entity.ProjectLawsInventoryEO;
+import com.jero.modules.project.entity.ProjectLibraryBase;
+import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO;
+import com.jero.modules.project.entity.ProjectTaskInventoryEO;
+import com.jero.modules.project.entity.ProjectTaskInventoryFeedbackEO;
+import com.jero.modules.project.enums.CertificationFlowNodeEnum;
+import com.jero.modules.project.enums.DesignComplianceStatusEnum;
+import com.jero.modules.project.enums.InventoryAffirmNodeEnum;
+import com.jero.modules.project.enums.InventoryAffirmStatusEnum;
+import com.jero.modules.project.enums.OperatorTypeEnum;
+import com.jero.modules.project.enums.ProjectInventoryFieldEnum;
+import com.jero.modules.project.enums.RequestSourceEnum;
+import com.jero.modules.project.enums.ReviewResultEnum;
+import com.jero.modules.project.enums.TaskStatusEnum;
+import com.jero.modules.project.service.IProjectLawsInventoryEOService;
+import com.jero.modules.project.service.IProjectLibraryBaseService;
+import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService;
+import com.jero.modules.project.service.IProjectTaskInventoryEOService;
+import com.jero.modules.project.service.IProjectTaskInventoryFeedbackEOService;
 import com.jero.modules.system.entity.SysCategory;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.entity.SysUser;
-import com.jero.modules.system.enums.DicCodeEnum;
 import com.jero.modules.system.service.ISysDictService;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
@@ -48,17 +64,23 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.text.Collator;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
 /**
  * @Description: 流程信息表
  * @Author: jero-boot
@@ -565,6 +587,9 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 
 			List<String> userIdList = new ArrayList<>();
 			datas.forEach(data -> {
+				if(StringUtils.isBlank(data.getProjectNameId())){
+					data.setProjectNameId(data.getProjectName());
+				}
 				String standardInfo = data.getStandardInfo();
 				if(StringUtils.isNotBlank(standardInfo)){
 					String standardInfoTemp = standardInfo.replaceAll("、", " ");

From 30a9311110a957e760851066e9b9aea236cf92be Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 13 Oct 2023 17:43:03 +0800
Subject: [PATCH 286/288] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=BA=93=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=AF=A6=E6=83=85-=E8=AE=A4=E8=AF=81=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AE=A1=E7=90=86-=E8=AE=A4=E8=AF=81=E8=BF=9B?=
 =?UTF-8?q?=E5=BA=A6-=E7=82=B9=E5=87=BB=E6=9F=A5=E7=9C=8B=E9=A2=86?=
 =?UTF-8?q?=E5=9F=9F=EF=BC=88=E8=BF=87=E6=BB=A4=E6=8E=89=E4=B8=8D=E6=B6=89?=
 =?UTF-8?q?=E5=8F=8A=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/service/impl/ProjectLibraryBaseServiceImpl.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index cc0f6253d..fccc89134 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -38,6 +38,7 @@ import com.jero.modules.project.enums.CertificationInventoryFlowStatusEnum;
 import com.jero.modules.project.enums.CertificationProgressEnum;
 import com.jero.modules.project.enums.ComplianceFlowStatusEnum;
 import com.jero.modules.project.enums.DesignComplianceStatusEnum;
+import com.jero.modules.project.enums.FlowStateEnum;
 import com.jero.modules.project.enums.HSStatisticalNodesEnum;
 import com.jero.modules.project.enums.OperatorTypeEnum;
 import com.jero.modules.project.enums.PermissionDescriptionEnum;
@@ -2325,6 +2326,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		Map<String,Object> pciEoMap = new HashMap<>();
 		QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
 		pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId);
+		pciQueryWrap.lambda().ne(ProjectCertificationInventoryEO::getFlowStatus, FlowStateEnum.UNINVOLVED.getValue());
 		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.projectCertificationInventoryEOService.list(pciQueryWrap);
 		String pciDutyTerritoryStr = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getDutyTerritory).collect(Collectors.joining(","));
 		if (StringUtils.isNotEmpty(pciDutyTerritoryStr)) {

From ed169630260b996a0e549270fe1776441120fb32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Sun, 15 Oct 2023 16:14:07 +0800
Subject: [PATCH 287/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=A4=9A=E5=80=BC=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOServiceImpl.java   | 27 ++++++++++++++-----
 ...msCollectManifestHistoryEOServiceImpl.java |  2 +-
 .../impl/ParamsManifestEOServiceImpl.java     |  2 ++
 .../mapper/xml/ParamsReportDetailEOMapper.xml |  1 +
 .../impl/ParamsReportDetailEOServiceImpl.java | 19 +++++++------
 5 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 768997041..fa85b61e3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -836,7 +836,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                         });
                         for (ParamsConfigDataEO paramsConfigDataEO : paramsConfigDatas) {
                             List<ParamsConfigDataVO> paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
-                            paramsConfigDataVO.put(paramsConfigDataEO.getId(), paramsConfigDataVOList);
+                            paramsConfigDataVO.put(paramsConfigDataEO.getOrderNum() + "+" + paramsConfigDataEO.getId(), paramsConfigDataVOList);
                         }
                     }else{
                         ParamsConfigDataEO paramsConfigDataEO = this.getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据
@@ -1631,14 +1631,22 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                 // 拼接历史记录信息
                 for (Map.Entry<String, Object> configDataMap : paramsConfigDataVOMap.entrySet()) {
                     List<Map<String, Object>> paramsConfigDataVOList = (List<Map<String, Object>>) configDataMap.getValue();
-
+                    int orderNum = 0;
+                    //顺序号不存在ID中，查询的时候会拼接
+                    String paramsConfigDataId = configDataMap.getKey();
+                    int plusIndex = paramsConfigDataId.indexOf("+");
+                    if (plusIndex != -1) {
+                        orderNum = Integer.parseInt(paramsConfigDataId.substring(0, plusIndex));
+                        paramsConfigDataId = paramsConfigDataId.substring(plusIndex + 1);
+                    }
                     if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) {
 
                         ParamsConfigDataEO paramsConfigDataEO = new ParamsConfigDataEO();
                         if (CollectionUtils.isNotEmpty(oldConfigDataEOList)) {
+                            String finalParamsConfigDataId = paramsConfigDataId;
                             List<ParamsConfigDataEO> oldConfigDataEOs = oldConfigDataEOList.stream().filter(configData -> {
                                 boolean flag = false;
-                                if (StringUtils.equals(configDataMap.getKey(), configData.getId())) {
+                                if (StringUtils.equals(finalParamsConfigDataId, configData.getId())) {
                                     flag = true;
                                 }
                                 return flag;
@@ -1648,8 +1656,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                                 paramsConfigDataEO.setId(oldConfigDataEOs.get(0).getId());
                             }
                         }
-                        paramsConfigDataEO.setId(configDataMap.getKey());
-
+                        paramsConfigDataEO.setId(paramsConfigDataId);
+                        paramsConfigDataEO.setOrderNum(orderNum);
                         paramsConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId);
                         paramsConfigDataEO.setParamsConfigId(paramsConfigEOId);
 
@@ -1799,7 +1807,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                     Integer orderNum = (Integer) paramsConfigDataVOList.get(0).get("orderNum");
                     if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) {
                         ParamsConfigDataEO paramsConfigDataEO = new ParamsConfigDataEO();
-                        paramsConfigDataEO.setId(configDataMap.getKey());
+                        //顺序号不存在ID中，查询的时候会拼接
+                        String paramsConfigDataId = configDataMap.getKey();
+                        int plusIndex = paramsConfigDataId.indexOf("+");
+                        if (plusIndex != -1) {
+                            orderNum = Integer.parseInt(paramsConfigDataId.substring(0, plusIndex));
+                            paramsConfigDataId = paramsConfigDataId.substring(plusIndex + 1);
+                        }
+                        paramsConfigDataEO.setId(paramsConfigDataId);
 
                         for (Map<String, Object> paramsConfigDataVO : paramsConfigDataVOList) {
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
index b54d7325b..804fdabdf 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
@@ -177,7 +177,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
 						});
 						for (ParamsConfigDataHistoryEO paramsConfigDataEO : configDataEOList) {
 							List<ParamsConfigDataVO> paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
-							paramsConfigDataVO.put(paramsConfigDataEO.getId(), paramsConfigDataVOList);
+							paramsConfigDataVO.put(paramsConfigDataEO.getOrderNum()+"+"+paramsConfigDataEO.getId(), paramsConfigDataVOList);
 						}
 					}else{
 						ParamsConfigDataHistoryEO paramsConfigDataEO = this.getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
index 0cbc8deb9..818117a0d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
@@ -723,6 +723,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
                     updateParamsConfigDataEO.setTextData((String) reportConfigDataEOList.get(0).get("text_data"));
                     updateParamsConfigDataEO.setPullData((String) reportConfigDataEOList.get(0).get("pull_data"));
                     updateParamsConfigDataEO.setFileConnectId((String) reportConfigDataEOList.get(0).get("file_connect_id"));
+                    updateParamsConfigDataEO.setOrderNum((Integer) reportConfigDataEOList.get(0).get("order_num"));
                     updateConfigDataEOList.add(updateParamsConfigDataEO);
                 } else if (CollectionUtil.isNotEmpty(reportConfigDataEOList) && CollectionUtil.isEmpty(configDataEOList)) {
                     ParamsConfigDataEO addParamsConfigDataEO = new ParamsConfigDataEO();
@@ -730,6 +731,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
                     addParamsConfigDataEO.setTextData((String) reportConfigDataEOList.get(0).get("text_data"));
                     addParamsConfigDataEO.setPullData((String) reportConfigDataEOList.get(0).get("pull_data"));
                     addParamsConfigDataEO.setFileConnectId((String) reportConfigDataEOList.get(0).get("file_connect_id"));
+                    addParamsConfigDataEO.setOrderNum((Integer) reportConfigDataEOList.get(0).get("order_num"));
                     addParamsConfigDataEO.setParamsConfigId(configId);
                     addParamsConfigDataEO.setParamsCollectManifestId(updateCollectManifestEO.getId());
                     updateConfigDataEOList.add(addParamsConfigDataEO);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
index ca1b9f50a..b37ab7794 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
@@ -204,6 +204,7 @@
                  left join params_report_config_data prcd on prd.id = prcd.params_collect_manifest_id
         where prd.params_manifest_id = #{paramsReportId}
         and prcd.params_config_id = #{paramsReportConfigId}
+        order by prcd.order_num ASC
     </select>
 
 </mapper>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
index 2786b024c..3e0003063 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
@@ -234,7 +234,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 							flag = true;
 						}
 						return flag;
-					}).distinct().collect(Collectors.toList());
+					}).collect(Collectors.toList());
 //					List<ParamsReportConfigDataEO> paramsConfigDataEOList = this.paramsReportConfigDataEOService.queryListByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
 					if(CollectionUtils.isNotEmpty(paramsConfigDataEOList)){
 						// 匿名比较器排序
@@ -249,7 +249,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 						});
 						for (ParamsReportConfigDataEO paramsConfigDataEO : paramsConfigDataEOList) {
 							List<ParamsConfigDataVO> paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
-							paramsConfigDataVO.put(paramsConfigDataEO.getId(),paramsConfigDataVOList);
+							paramsConfigDataVO.put(paramsConfigDataEO.getOrderNum()+"+"+paramsConfigDataEO.getId(),paramsConfigDataVOList);
 						}
 					}
 
@@ -1876,14 +1876,18 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 				Map<String, Object> paramsConfigDataVOMap = (Map<String, Object>)  paramsReportConfigDataMap.get("paramsConfigData");
 
 				for (Map.Entry<String, Object> paramsConfigDataMap : paramsConfigDataVOMap.entrySet()) {
+					//顺序号不存在ID中，查询的时候会拼接
 					String configDataId = paramsConfigDataMap.getKey();
+
 					List<Map<String, Object>> configDataVOList = (List<Map<String, Object>>) paramsConfigDataMap.getValue();
 
-
-
 					if (CollectionUtil.isNotEmpty(configDataVOList)) {
-						Integer orderNum = (Integer) configDataVOList.get(0).get("orderNum");
-
+						int orderNum = (Integer) configDataVOList.get(0).get("orderNum");
+						int plusIndex = configDataId.indexOf("+");
+						if (plusIndex != -1) {
+							configDataId = configDataId.substring(plusIndex + 1);
+							orderNum = Integer.parseInt(configDataId.substring(0, plusIndex));
+						}
 						ParamsReportConfigDataEO paramsReportConfigDataEO = new ParamsReportConfigDataEO();
 						paramsReportConfigDataEO.setOrderNum(orderNum);
 						for (Map<String, Object> paramsConfigDataVO : configDataVOList) {
@@ -2053,7 +2057,6 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 						paramsReportConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId);
 						paramsReportConfigDataEO.setParamsConfigId(paramsReportConfigEOId);
 						paramsReportConfigDataEO.setId(configDataId);
-
 						newConfigDataEOList.add(paramsReportConfigDataEO);
 					}
 //
@@ -2067,7 +2070,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 				prcdQueryWrap.lambda().eq(ParamsReportConfigDataEO::getParamsCollectManifestId,paramsCollectManifestId);
 				List<ParamsReportConfigDataEO> prcdEoList = this.paramsReportConfigDataEOService.list(prcdQueryWrap);
 				if(CollectionUtils.isNotEmpty(prcdEoList)){
-					List<String> paramsConfigDataIdList = paramsConfigDataVOMap.entrySet().stream().map(e -> e.getKey()).distinct().collect(Collectors.toList());
+					List<String> paramsConfigDataIdList = paramsConfigDataVOMap.entrySet().stream().map(e -> e.getKey().split("\\+")[0]).distinct().collect(Collectors.toList());
 
 					List<String> newAddPcdDataIdList = paramsConfigDataVOMap.entrySet().stream().map(e -> e.getKey()).filter(e -> {
 						boolean flag = false;

From c42e65c22cdb2099a42f4bfcf0837137fa887508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Sun, 15 Oct 2023 18:24:54 +0800
Subject: [PATCH 288/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=A4=9A=E5=80=BC=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsManifestEOController.java           | 16 ------
 .../service/IParamsManifestEOService.java     |  3 -
 .../impl/ParamsManifestEOServiceImpl.java     | 57 -------------------
 3 files changed, 76 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
index f9a6525c8..14c8158b0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
@@ -382,20 +382,4 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
         return super.importExcel(request, response, ParamsManifestEO.class);
     }
 
-
-
-	/**
-	 * 将上报库数据同步至收集清单(仅限变更状态)
-	 *
-	 * @param id
-	 * @return
-	 */
-	@ApiOperation(value="参数清单-将上报库数据同步至收集清单(仅限变更状态)", notes="参数清单-将上报库数据同步至收集清单(仅限变更状态)")
-	@GetMapping(value = "/syncChangeDataFromReport")
-	public Result<?> syncChangeDataFromReport(@RequestParam(name="paramsManifestId",required=true) String paramsManifestId,
-									 @RequestParam(name="reportManifestId",required=true) String reportManifestId) {
-		paramsManifestEOService.syncChangeDataFromReport(paramsManifestId, reportManifestId);
-		return Result.OK("操作成功！");
-	}
-
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java
index 3fadb4d47..175fc4866 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java
@@ -119,7 +119,4 @@ public interface IParamsManifestEOService extends IService<ParamsManifestEO> {
 	 * @param json
 	 */
     void replacementUser(JSONObject json);
-
-
-	void syncChangeDataFromReport(String paramsManifestId, String reportManifestId);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
index 818117a0d..75cf6800b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
@@ -760,63 +760,6 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
         return updateById(updateManifestEO);
     }
 
-    /**
-     * 将上报库数据同步至收集清单(仅限变更状态)
-     */
-    public void syncChangeDataFromReport(String paramsManifestId, String reportManifestId) {
-        ParamsManifestEO paramsManifestEO = getById(paramsManifestId);
-
-        List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOMapper.queryByParamManifestId(paramsManifestId);
-
-        // 查询配置信息
-        List<ParamsConfigEO> pcList = paramsConfigEOService.queryList(paramsManifestId);
-        List<String> configIdList = pcList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList());
-        Map<String, String> ocNameMap = pcList.stream().collect(Collectors.toMap(ParamsConfigEO::getId, ParamsConfigEO::getConfigName));
-        List<ParamsConfigDataEO> paramsConfigDataEOList = paramsConfigDataEOService.queryListByConfigIdList(configIdList);
-        List<ParamsConfigDataEO> updateList = new ArrayList<>();
-
-        // 查询上报库的项目所有参数项的配置数据
-        ParamsReportEO paramsReportEO = paramsReportEOService.getById(reportManifestId);
-        List<Map<String, Object>> paramsReportConfigDataList = paramsReportDetailEOService.listInfoForChange(paramsReportEO.getId());
-
-        for (ParamsCollectManifestEO pcm : paramsCollectManifestEOList) {
-            if (CollectManifestStateEnum.CHANGE.getValue().equals(pcm.getState()) && !"11".equals(pcm.getControlType())) {
-                List<ParamsConfigDataEO> pcdList = paramsConfigDataEOList.stream().filter(e -> e.getParamsCollectManifestId().equals(pcm.getId())).collect(Collectors.toList());
-                if (CollectionUtils.isNotEmpty(pcdList)) {
-                    for (ParamsConfigDataEO pcd : pcdList) {
-                        boolean flag = false;
-                        List<Map<String, Object>> prcdList = paramsReportConfigDataList.stream().filter(o ->
-                                o.get("nio_number").equals(pcm.getNioNumber())
-                                        && o.get("config_name").equals(ocNameMap.get(pcd.getParamsConfigId()))
-                        ).collect(Collectors.toList());
-                        if (CollectionUtils.isNotEmpty(prcdList) && prcdList.size() == 1) {//多值情况忽略
-                            Map<String, Object> prcdMap = prcdList.get(0);
-                            if (ObjectUtil.isNotEmpty(prcdMap.get("text_data")) && !StringUtils.equals(pcd.getTextData(), String.valueOf(prcdMap.get("text_data")))) {
-                                flag = true;
-                                pcd.setTextData(String.valueOf(prcdMap.get("text_data")));
-                            }
-                            if (ObjectUtil.isNotEmpty(prcdMap.get("pull_data")) && !StringUtils.equals(pcd.getPullData(), String.valueOf(prcdMap.get("pull_data")))) {
-                                flag = true;
-                                pcd.setPullData(String.valueOf(prcdMap.get("pull_data")));
-                            }
-                            if (ObjectUtil.isNotEmpty(prcdMap.get("file_connect_id")) && !StringUtils.equals(pcd.getFileConnectId(), String.valueOf(prcdMap.get("file_connect_id")))) {
-                                flag = true;
-                                pcd.setFileConnectId(String.valueOf(prcdMap.get("file_connect_id")));
-                            }
-                            if(flag){
-                                updateList.add(pcd);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        if(CollectionUtils.isNotEmpty(updateList)){
-            paramsConfigDataEOService.updateBatchById(updateList);
-        }
-    }
-
-
     /**
      * 从历史版本进行扩展变更
      */