Commit 4a94f03f authored by pete谢兆麟's avatar pete谢兆麟

原则批已读未读逻辑

parent 36ae8498
......@@ -217,7 +217,7 @@ private extension YHOfficialApprovalResultVC {
//获取正式批 操作指引 确认状态
func getOfficalGuildCheckStatus() {
princleVM.getOfficialCheckStatus { success, error in
princleVM.getOfficialCheckStatus() { success, error in
if success {
if self.isFromHomeAlertViewFlag {
self.clickRightItemBtn()
......@@ -442,11 +442,12 @@ extension YHOfficialApprovalResultVC: FSPagerViewDataSource, FSPagerViewDelegate
let model = self.dataArr[index]
self.previewFileTool.openXLSXRemoteFile(urlString: model.file_url_transformed, fileName: "")
if !model.localShowFlag {
if model.read_status == 0 {
self.princleVM.getAgreementCheck(model.archivist_id) {[weak self] success, error in
guard let _ = self else { return }
}
DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
model.localShowFlag = true
UserDefaults.standard.setValue("localShowFlag", forKey: String(model.id))
UserDefaults.standard.synchronize()
model.read_status = 1
self.bannerView.reloadData()
}
}
......
......@@ -41,8 +41,6 @@ class YHOfficalLetterModel: SmartCodable {
var updated_at : String = "" //申请记录最后更新的时间
var url : String = ""//文件的URL
var localShowFlag : Bool = false //信件是否点击打开 本地变量
required init() {
}
}
......
......@@ -79,7 +79,7 @@ private extension YHOfficailLetterColledtionCell {
guard let model = dataModel else { return }
nameLable.text = model.applicant
if !model.localShowFlag {
if model.read_status == 0 {
//未读
bkgImageView.image = UIImage(named: "official_approval_result_envelope_not_read")
} else {
......
......@@ -50,13 +50,6 @@ extension YHPrincleViewModel {
var arrList : [YHOfficalLetterModel] = []
for (index,item) in resultModel.list.enumerated() {
//
let oldString = UserDefaults.standard.value(forKey: String(item.id))
if let tempStr = oldString as? String, tempStr.isEmpty == false {
item.localShowFlag = true
} else {
item.localShowFlag = false
}
arrList.append(item)
}
resultModel.list = arrList
......@@ -145,6 +138,27 @@ extension YHPrincleViewModel {
}
}
//获取正式批 操作指引 确认状态
func getAgreementCheck(_ archivistId: Int, callback:((_ success: Bool,_ error:YHErrorModel?)->())?) {
let param = ["archivistId": archivistId]
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Principle.agreementCheck
let _ = YHNetRequest.getRequest(url: strUrl,params: param) { [weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
callback?(true, nil)
} else {
let err = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.isEmpty ? "" : json.msg)
callback?(false, err)
}
} failBlock: { err in
callback?(false, err)
}
}
//获取是否弹窗 原则批、正式批
func getPrincleStatus(callback:((_ success: Bool,_ error:YHErrorModel?)->())?) {
......
......@@ -387,6 +387,8 @@ class YHAllApiName {
static let getAlertStatusApi = "super-app/home/agreement-check"
//正式批操作指引是否确认
static let getOfficialCheckStatusApi = "super-app/common/agreement/check"
static let agreementCheck = "super-app/agreement/check"
// 原则批审批结果
static let getReviewResult = "super-app/order/approval/principle"
// 获取档案号列表
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment