处理 工作经验预览 展示

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -161,6 +161,9 @@
 		A554A5042B96D04100EA5973 /* YHPreviewWorkExpViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A554A5032B96D04100EA5973 /* YHPreviewWorkExpViewController.swift */; };
 		A554A5062B96D17B00EA5973 /* YHWorkExpInfoPreviewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A554A5052B96D17B00EA5973 /* YHWorkExpInfoPreviewModel.swift */; };
 		A554A5082B96F55900EA5973 /* YHWorkExpDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A554A5072B96F55900EA5973 /* YHWorkExpDataModel.swift */; };
+		A554A50A2B9701F300EA5973 /* YHPreviewInfoWorkExpView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A554A5092B9701F300EA5973 /* YHPreviewInfoWorkExpView.swift */; };
+		A554A50C2B9715EC00EA5973 /* YHPreviewInfoProjectItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A554A50B2B9715EC00EA5973 /* YHPreviewInfoProjectItemView.swift */; };
+		A554A5102B97389300EA5973 /* YHPreviewInfoWorkSummaryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A554A50F2B97389300EA5973 /* YHPreviewInfoWorkSummaryView.swift */; };
 		A5551FFE2B4C26CE00510980 /* YHBaseViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5551FFD2B4C26CE00510980 /* YHBaseViewModel.swift */; };
 		A5573ED22B317BFF00D98EC0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5573ED12B317BFF00D98EC0 /* AppDelegate.swift */; };
 		A5573EDB2B317C0000D98EC0 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A5573EDA2B317C0000D98EC0 /* Assets.xcassets */; };
@@ -470,6 +473,9 @@
 		A554A5032B96D04100EA5973 /* YHPreviewWorkExpViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPreviewWorkExpViewController.swift; sourceTree = "<group>"; };
 		A554A5052B96D17B00EA5973 /* YHWorkExpInfoPreviewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHWorkExpInfoPreviewModel.swift; sourceTree = "<group>"; };
 		A554A5072B96F55900EA5973 /* YHWorkExpDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHWorkExpDataModel.swift; sourceTree = "<group>"; };
+		A554A5092B9701F300EA5973 /* YHPreviewInfoWorkExpView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPreviewInfoWorkExpView.swift; sourceTree = "<group>"; };
+		A554A50B2B9715EC00EA5973 /* YHPreviewInfoProjectItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPreviewInfoProjectItemView.swift; sourceTree = "<group>"; };
+		A554A50F2B97389300EA5973 /* YHPreviewInfoWorkSummaryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPreviewInfoWorkSummaryView.swift; sourceTree = "<group>"; };
 		A5551FFD2B4C26CE00510980 /* YHBaseViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBaseViewModel.swift; sourceTree = "<group>"; };
 		A5573ECE2B317BFF00D98EC0 /* galaxy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = galaxy.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		A5573ED12B317BFF00D98EC0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -1078,6 +1084,9 @@
 				A5191F692B8B1888001069F7 /* YHPreviewInfoCertificateInformationItemsView.swift */,
 				A5167B262B692CF20084C08F /* YHPreviewInfoCertificatePictureItemView.swift */,
 				A5191F6B2B8B1A05001069F7 /* YHPreviewInfoCertificatePictureItemsView.swift */,
+				A554A5092B9701F300EA5973 /* YHPreviewInfoWorkExpView.swift */,
+				A554A50B2B9715EC00EA5973 /* YHPreviewInfoProjectItemView.swift */,
+				A554A50F2B97389300EA5973 /* YHPreviewInfoWorkSummaryView.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -1926,9 +1935,11 @@
 				A5ACE9392B4564F7002C94D2 /* UIDevice+Extension.swift in Sources */,
 				041B52912B5E67F3007EBCEB /* YHFormItemEnterDetailCell.swift in Sources */,
 				04C6936B2B7329E7004C1758 /* YHEducationInfoCell.swift in Sources */,
+				A554A50C2B9715EC00EA5973 /* YHPreviewInfoProjectItemView.swift in Sources */,
 				04E86E092B707ACE00A35F4B /* YHPhoneLoginViewController.swift in Sources */,
 				04E86E342B83268F00A35F4B /* YHWorkExperienceViewController.swift in Sources */,
 				04E86E702B888B0500A35F4B /* YHWorkExperienceProjectModel.swift in Sources */,
+				A554A50A2B9701F300EA5973 /* YHPreviewInfoWorkExpView.swift in Sources */,
 				044CC6292B8741AC0083FF76 /* YHSearchBar.swift in Sources */,
 				A5ACE9422B4564F7002C94D2 /* AppDelegate+Extension.swift in Sources */,
 				A5FD63BF2B6250BC00D1D9DA /* YHInformationPerfectCell.swift in Sources */,
@@ -1946,6 +1957,7 @@
 				A596C3A32B84D9100067BBB8 /* YHOtherSelecteItemView.swift in Sources */,
 				A5ACE9552B4564F7002C94D2 /* YHTabBarViewController.swift in Sources */,
 				04E86E6C2B87374600A35F4B /* YHCompanyModel.swift in Sources */,
+				A554A5102B97389300EA5973 /* YHPreviewInfoWorkSummaryView.swift in Sources */,
 				A5167B332B6A3A2D0084C08F /* YHPreviewBaseViewController.swift in Sources */,
 				A554A5042B96D04100EA5973 /* YHPreviewWorkExpViewController.swift in Sources */,
 				A5C5B3122B57B47D00A7C5D1 /* YHDavidCell0.swift in Sources */,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/C/YHPreviewMainViewController.swift

@@ -255,7 +255,6 @@ extension YHPreviewMainViewController : UITableViewDelegate,UITableViewDataSourc
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         tableView.deselectRow(at: indexPath, animated: true)
-        printLog("点击了 tableView Cell \(indexPath.row)")
     }
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/M/YHPreviewInfoSessionModel.swift

@@ -20,7 +20,8 @@ enum YHPreviewInfoSessionModelType: Int {
 struct YHPreviewInfoSessionModel {
     var cellType : YHPreviewInfoSessionModelType = .countryInfoType
     var cellTitle : String = ""
-    var cellData0 : [YHPreviewQuestionAndAnswerModel]? = nil
-    var cellData1 : [YHPersonInfoCellModel1]? = nil
-    var cellData2 : [YHPersonInfoCellModel2]? = nil
+    var cellData0 : [YHPreviewQuestionAndAnswerModel]?
+    var cellData1 : [YHPersonInfoCellModel1]?
+    var cellData2 : [YHPersonInfoCellModel2]?
+    var cellData4 : [YHWorkExpDataModel]?
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoCell.swift

@@ -42,15 +42,17 @@ extension YHPreviewInfoCell {
         contentView.removeSubviews()
         backgroundColor = .clear
         contentView.backgroundColor = .clear
-        contentView.addSubview(holdView)
         holdView.removeSubviews()
+        contentView.addSubview(holdView)
         
         holdView.snp.makeConstraints { make in
             make.top.equalTo(14)
-            make.left.bottom.equalToSuperview()
+            make.left.equalToSuperview()
+            make.bottom.equalToSuperview().offset(-40)
             make.width.equalTo(contentView.snp.width)
         }
 
+        
         if model?.cellType == .countryInfoType {
             guard let model = model else { return }
             let view = YHPreviewInfoNameAndSubNameItemsView(frame: .zero)
@@ -88,7 +90,14 @@ extension YHPreviewInfoCell {
             }
         }
         else if model?.cellType == .workExp {
-            //工作经验
+            //工作经验 - 独立处理
+            guard let model = model else { return }
+            let view = YHPreviewInfoWorkExpView(frame: .zero)
+            view.dataModel = model
+            holdView.addSubview(view)
+            view.snp.makeConstraints { make in
+                make.edges.equalTo(0)
+            }
         }
         else {
             

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoNameAndSubNameItemsView.swift

@@ -20,6 +20,9 @@ extension YHPreviewInfoNameAndSubNameItemsView {
         guard let model = dataModel else { return }
         
         guard let arrData = model.cellData0,arrData.count > 0 else { return }
+        
+        var lastTagView : UIView?
+        if model.cellTitle.isEmpty == false {
             let sessionView = YHPreviewInfoSingleLineTitleView()
             sessionView.updateTitle(title: model.cellTitle)
             addSubview(sessionView)
@@ -29,20 +32,35 @@ extension YHPreviewInfoNameAndSubNameItemsView {
                 make.left.equalToSuperview().offset(18)
                 make.height.equalTo(YHPreviewInfoSingleLineTitleView.viewH)
             }
+            lastTagView = sessionView
+        }
+        
         
         if arrData.count == 1 {
             let item = arrData[0]
             let cellView = YHPreviewInfoNameAndSubNameItemView()
             cellView.update(title: item.question, subtitle: item.answer)
             addSubview(cellView)
+            
+            if lastTagView == nil {
+                cellView.snp.makeConstraints { make in
+                    make.top.equalToSuperview()
+                    make.right.equalToSuperview().offset(-18)
+                    make.left.equalToSuperview().offset(18)
+                    make.bottom.equalToSuperview().offset(-21)
+                }
+                
+            } else {
                 cellView.snp.makeConstraints { make in
-                make.top.equalTo(sessionView.snp.bottom)
+                    make.top.equalTo(lastTagView!.snp.bottom)
                     make.right.equalToSuperview().offset(-18)
                     make.left.equalToSuperview().offset(18)
                     make.bottom.equalToSuperview().offset(-21)
                 }
+            }
+           
         } else {
-            var tmp : UIView = sessionView
+            var tmp : UIView? = lastTagView
             for(index,item) in arrData.enumerated() {
                 let cellView = YHPreviewInfoNameAndSubNameItemView()
                 cellView.update(title: item.question, subtitle: item.answer)
@@ -50,22 +68,35 @@ extension YHPreviewInfoNameAndSubNameItemsView {
                 
                 if index == arrData.count - 1 {
                     cellView.snp.makeConstraints { make in
-                        make.top.equalTo(tmp.snp.bottom)
+                        if tmp == nil {
+                            make.top.equalToSuperview()
                             make.right.equalToSuperview().offset(-18)
                             make.left.equalToSuperview().offset(18)
                             make.bottom.equalToSuperview().offset(-21)
+                        } else {
+                            make.top.equalTo(tmp!.snp.bottom)
+                            make.right.equalToSuperview().offset(-18)
+                            make.left.equalToSuperview().offset(18)
+                            make.bottom.equalToSuperview().offset(-21)
+                        }
                     }
                     
                 } else {
                     cellView.snp.makeConstraints { make in
-                        make.top.equalTo(tmp.snp.bottom)
+                        if tmp == nil {
+                            make.top.equalToSuperview()
                             make.right.equalToSuperview().offset(-18)
                             make.left.equalToSuperview().offset(18)
+                            
+                        } else {
+                            make.top.equalTo(tmp!.snp.bottom)
+                            make.right.equalToSuperview().offset(-18)
+                            make.left.equalToSuperview().offset(18)
+                        }
                     }
                 }
                 tmp = cellView
             }
         }
-        
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoProjectItemView.swift

+//
+//  YHPreviewInfoProjectItemView.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/3/5.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHPreviewInfoProjectItemView: UIView {
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    var dataModel : YHWorkExpDataModel? {
+        didSet {
+            updateUI()
+        }
+    }
+}
+
+extension YHPreviewInfoProjectItemView {
+    func updateUI() {
+        guard let model = dataModel else { return }
+        removeSubviews()
+        
+        let sessionView : UILabel = UILabel()
+        sessionView.text = model.title
+        sessionView.font = UIFont.PFSC_R(ofSize: 14)
+        sessionView.textColor = UIColor.labelTextColor2
+        addSubview(sessionView)
+        sessionView.snp.makeConstraints { make in
+            make.top.equalToSuperview()
+            make.right.equalToSuperview().offset(-kMargin)
+            make.left.equalToSuperview().offset(kMargin)
+            make.height.equalTo(20)
+        }
+        sessionView.backgroundColor = .clear
+        
+        let holdView : YHPreviewInfoHoldView = YHPreviewInfoHoldView()
+        holdView.backgroundColor = .contentBkgColor
+        addSubview(holdView)
+        holdView.snp.makeConstraints { make in
+            make.top.equalTo(sessionView.snp.bottom).offset(8)
+            make.right.equalToSuperview().offset(-kMargin)
+            make.left.equalToSuperview().offset(kMargin)
+            make.bottom.equalToSuperview()
+        }
+        
+        var lastTagView : UIView? = nil
+        if model.data.isEmpty == false {
+            let item: YHPreviewInfoSessionModel = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "", cellData0:model.data as? [YHPreviewQuestionAndAnswerModel])
+            let view = YHPreviewInfoQuestionAndAnswerItemsView(frame: .zero)
+            view.dataModel = item
+            holdView.addSubview(view)
+            view.snp.makeConstraints { make in
+                make.top.equalToSuperview()
+                make.left.right.equalToSuperview()
+                make.bottom.equalToSuperview()
+            }
+            lastTagView = view
+        }
+        
+        let tagView : UIView = UIView()
+        tagView.backgroundColor = .failColor //for test hjl
+        holdView.addSubview(tagView)
+        if lastTagView == nil {
+            tagView.snp.makeConstraints { make in
+                make.top.equalTo(6)
+                make.left.right.equalToSuperview()
+                make.height.equalTo(1)
+                
+                make.bottom.equalToSuperview()
+            }
+        } else {
+            tagView.snp.makeConstraints { make in
+                make.top.equalTo(lastTagView!.snp.bottom).offset(6)
+                make.left.right.equalToSuperview()
+                make.height.equalTo(1)
+                
+                make.bottom.equalToSuperview()
+            }
+        }
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoQuestionAndAnswerItemsView.swift

@@ -19,8 +19,13 @@ class YHPreviewInfoQuestionAndAnswerItemsView: UIView {
 extension YHPreviewInfoQuestionAndAnswerItemsView {
     func updateUI() {
         guard let model = dataModel else { return }
-        
         guard let arrData = model.cellData0,arrData.count > 0 else { return }
+        removeSubviews()
+        
+        var lastTagView : UIView? = nil
+        if model.cellTitle.isEmpty {
+            
+        } else {
             let sessionView = YHPreviewInfoSingleLineTitleView()
             sessionView.updateTitle(title: model.cellTitle)
             addSubview(sessionView)
@@ -30,39 +35,73 @@ extension YHPreviewInfoQuestionAndAnswerItemsView {
                 make.left.equalToSuperview().offset(18)
                 make.height.equalTo(YHPreviewInfoSingleLineTitleView.viewH)
             }
+            lastTagView = sessionView
+        }
+        
         
         if arrData.count == 1 {
             let item = arrData[0]
             let cellView = YHPreviewInfoQuestionAndAnswerItemView()
             cellView.dataModel = item
             addSubview(cellView)
+            if lastTagView == nil {
                 cellView.snp.makeConstraints { make in
-                make.top.equalTo(sessionView.snp.bottom)
+                    make.top.equalToSuperview()
                     make.right.equalToSuperview().offset(-18)
                     make.left.equalToSuperview().offset(18)
                     make.bottom.equalToSuperview().offset(-21)
                 }
+                
             } else {
-            var tmp : UIView = sessionView
+                cellView.snp.makeConstraints { make in
+                    make.top.equalTo(lastTagView!.snp.bottom)
+                    make.right.equalToSuperview().offset(-18)
+                    make.left.equalToSuperview().offset(18)
+                    make.bottom.equalToSuperview().offset(-21)
+                }
+            }
+        } else {
+            var tmp : UIView? = lastTagView
             for(index,item) in arrData.enumerated() {
                 let cellView = YHPreviewInfoQuestionAndAnswerItemView()
                 cellView.dataModel = item
                 addSubview(cellView)
                 
                 if index == arrData.count - 1 {
+                    
+                    if tmp == nil {
+                        cellView.snp.makeConstraints { make in
+                            make.top.equalToSuperview()
+                            make.right.equalToSuperview().offset(-18)
+                            make.left.equalToSuperview().offset(18)
+                            make.bottom.equalToSuperview().offset(-21)
+                        }
+                    } else {
                         cellView.snp.makeConstraints { make in
-                        make.top.equalTo(tmp.snp.bottom)
+                            make.top.equalTo(tmp!.snp.bottom)
                             make.right.equalToSuperview().offset(-18)
                             make.left.equalToSuperview().offset(18)
                             make.bottom.equalToSuperview().offset(-21)
                         }
+                    }
                     
                 } else {
+                    
+                    if tmp == nil {
                         cellView.snp.makeConstraints { make in
-                        make.top.equalTo(tmp.snp.bottom)
+                            make.top.equalToSuperview()
                             make.right.equalToSuperview().offset(-18)
                             make.left.equalToSuperview().offset(18)
                         }
+                        
+                    } else {
+                        cellView.snp.makeConstraints { make in
+                            make.top.equalTo(tmp!.snp.bottom)
+                            make.right.equalToSuperview().offset(-18)
+                            make.left.equalToSuperview().offset(18)
+                        }
+                    }
+                    
                 }
                 tmp = cellView
             }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoWorkExpView.swift

+//
+//  YHPreviewInfoWorkExpView.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/3/5.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHPreviewInfoWorkExpView: UIView {
+    var dataModel : YHPreviewInfoSessionModel? {
+        didSet {
+            updateUI()
+        }
+    }
+}
+
+private extension  YHPreviewInfoWorkExpView {
+    func updateUI() {
+        guard let model = dataModel,let mmodel = model.cellData4,mmodel.isEmpty == false else { return }
+        if model.cellType == .workExp {
+            removeSubviews()
+            //1.title
+            let sessionView = YHPreviewInfoSingleLineTitleView()
+            sessionView.updateTitle(title: model.cellTitle)
+            addSubview(sessionView)
+            sessionView.snp.makeConstraints { make in
+                make.top.equalToSuperview()
+                make.right.equalToSuperview().offset(-18)
+                make.left.equalToSuperview().offset(18)
+                make.height.equalTo(YHPreviewInfoSingleLineTitleView.viewH)
+            }
+            
+            var lastTagView : UIView = sessionView
+            for(index,items) in mmodel.enumerated() {
+                if index == 0 {
+                    let item: YHPreviewInfoSessionModel = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "", cellData0:items.data as? [YHPreviewQuestionAndAnswerModel])
+                    let view = YHPreviewInfoNameAndSubNameItemsView(frame: .zero)
+                    view.dataModel = item
+                    addSubview(view)
+                    view.snp.makeConstraints { make in
+                        make.top.equalTo(lastTagView.snp.bottom)
+                        make.left.right.equalToSuperview()
+                    }
+                    lastTagView = view
+                } else if index == 1 {
+                    let item: YHPreviewInfoSessionModel = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "", cellData0:items.data as? [YHPreviewQuestionAndAnswerModel])
+                    let view = YHPreviewInfoQuestionAndAnswerItemsView(frame: .zero)
+                    view.dataModel = item
+                    addSubview(view)
+                    view.snp.makeConstraints { make in
+                        make.top.equalTo(lastTagView.snp.bottom)
+                        make.left.right.equalToSuperview()
+                    }
+                    lastTagView = view
+                } else if index == 2 {
+                    //项目经验
+                    let arrrr = items.data as? [YHWorkExpDataModel] ?? []
+                    for (iiidex,item) in arrrr.enumerated() {
+                        let view : YHPreviewInfoProjectItemView = YHPreviewInfoProjectItemView(frame: .zero)
+                        view.dataModel = item
+                        addSubview(view)
+                        if iiidex == 0 {
+                            view.snp.makeConstraints { make in
+                                make.top.equalTo(lastTagView.snp.bottom)
+                                make.left.right.equalToSuperview()
+                            }
+                        } else {
+                            view.snp.makeConstraints { make in
+                                make.top.equalTo(lastTagView.snp.bottom).offset(18)
+                                make.left.right.equalToSuperview()
+                            }
+                        }
+                        
+                        lastTagView = view
+                    }
+                } else if index == 3 {
+                    //简历/工作总结
+                    let arrrr = items.data as? [YHWorkExpDataModel] ?? []
+                    if arrrr.isEmpty == false {
+                        let view : YHPreviewInfoWorkSummaryView = YHPreviewInfoWorkSummaryView(frame: .zero)
+                        view.dataModel = arrrr[0]
+                        addSubview(view)
+                        view.snp.makeConstraints { make in
+                            make.top.equalTo(lastTagView.snp.bottom).offset(18)
+                            make.left.equalToSuperview().offset(kMargin)
+                            make.right.equalToSuperview().offset(-kMargin)
+                        }
+                        lastTagView = view
+                    }
+                    
+                } else {
+                    printLog("error: 不应该出现")
+                }
+            }
+            
+            let tagView : UIView = UIView()
+            tagView.backgroundColor = .clear
+            addSubview(tagView)
+            tagView.snp.makeConstraints { make in
+                make.top.equalTo(lastTagView.snp.bottom).offset(6)
+                make.left.right.equalToSuperview()
+                make.height.equalTo(0.5)
+                make.bottom.equalToSuperview()
+            }
+        } else {
+            printLog("当前 view 不支持 .workExp的类型")
+        }
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoWorkSummaryView.swift

+//
+//  YHPreviewInfoWorkSummaryView.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/3/5.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+class YHPreviewInfoWorkSummaryView: UIView {
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    var dataModel : YHWorkExpDataModel? {
+        didSet {
+            updateUI()
+        }
+    }
+}
+
+extension YHPreviewInfoWorkSummaryView {
+    func updateUI() {
+        guard let model = dataModel else { return }
+        removeSubviews()
+        
+        
+        if model.data.isEmpty == false {
+            let sessionView : UILabel = UILabel()
+            sessionView.text = model.title
+            sessionView.font = UIFont.PFSC_R(ofSize: 14)
+            sessionView.textColor = UIColor.labelTextColor2
+            addSubview(sessionView)
+            sessionView.snp.makeConstraints { make in
+                make.top.equalToSuperview()
+                make.right.equalToSuperview().offset(-kMargin)
+                make.left.equalToSuperview().offset(kMargin)
+                make.height.equalTo(20)
+            }
+            
+            var lastTagView : UIView = sessionView
+            
+            let arr = model.data as? [WorkExpFilePreviewModel] ?? []
+            for(_,item) in arr.enumerated() {
+                
+                let label : UILabel = UILabel()
+                label.text = model.title
+                label.textColor = .brandMainColor
+                label.font = UIFont.PFSC_R(ofSize: 14)
+                label.numberOfLines = 0
+                label.text = item.fileName
+                addSubview(label)
+                label.snp.makeConstraints { make in
+                    make.top.equalTo(lastTagView.snp.bottom).offset(8)
+                    make.right.equalToSuperview().offset(-kMargin)
+                    make.left.equalToSuperview().offset(kMargin)
+                    make.height.greaterThanOrEqualTo(20) // >=20
+                }
+                addSubview(label)
+                lastTagView = label
+            }
+            
+            let tagView : UIView = UIView()
+            addSubview(tagView)
+            tagView.snp.makeConstraints { make in
+                make.top.equalTo(lastTagView.snp.bottom).offset(18)
+                make.right.equalToSuperview().offset(-kMargin)
+                make.left.equalToSuperview().offset(kMargin)
+                make.height.equalTo(0.5)
+                
+                make.bottom.equalToSuperview()
+            }
+        }
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/VM/YHPreviewViewModel.swift

@@ -218,6 +218,7 @@ private extension YHPreviewViewModel {
         guard let model0 = workExpInfoPreviewModel else { return}
         arrDataForWorkExpInfo.removeAll()
         if let list = model0.list,list.isEmpty == false {
+            
             for(index,model) in list.enumerated() {
                 var arr1 : [YHPreviewQuestionAndAnswerModel] = []
                 do {
@@ -259,7 +260,6 @@ private extension YHPreviewViewModel {
                 }
                 let dataModel2 = YHWorkExpDataModel(title: "", data: arr2)
                 
-                
                 var arr3 : [Any] = []
                 do {
                     //3.项目介绍
@@ -269,24 +269,33 @@ private extension YHPreviewViewModel {
                             let title  = item.project_start_time + "-" + item.project_end_time
                             let tmp2 = YHPreviewQuestionAndAnswerModel(question: "项目时间", answer:title)
                             let tmp3 = YHPreviewQuestionAndAnswerModel(question: "项目业绩/亮点", answer:item.project_highlights)
-                            var arrT : [YHPreviewQuestionAndAnswerModel] = [tmp1,tmp2,tmp3]
+                            let arrT : [YHPreviewQuestionAndAnswerModel] = [tmp1,tmp2,tmp3]
                             
-                            let dataModelTemp = YHWorkExpDataModel(title: "", data: arrT)
+                            let dataModelTemp = YHWorkExpDataModel(title: "项目介绍" + String(index + 1), data: arrT)
                             arr3.append(dataModelTemp)
-                            
                         }
                     }
                 }
+                let dataModel3 = YHWorkExpDataModel(title: "", data: arr3)
                 
+                var arr4 : [Any] = []
                 do {
                     //4.简历/工作总结：
                     if let items = model.file,items.isEmpty == false {
                         var arrT : [Any] = []
-                        for(index,item) in items.enumerated() {
+                        for(_,item) in items.enumerated() {
                             arrT.append(item)
                         }
+                        let dataModelTemp = YHWorkExpDataModel(title: "简历/工作总结：", data: arrT)
+                        arr4.append(dataModelTemp)
                     }
                 }
+                
+                let dataModel4 = YHWorkExpDataModel(title: "", data: arr4)
+                
+                
+                let mmmm = YHPreviewInfoSessionModel(cellType: .workExp, cellTitle: "主申请人工作经历" + String(index + 1), cellData4: [dataModel1,dataModel2,dataModel3,dataModel4])
+                arrDataForWorkExpInfo.append(mmmm)
             }
         }
     }