正在显示
1 个修改的文件
包含
39 行增加
和
1 行删除
| @@ -142,7 +142,7 @@ func TemplateAdd(uid, companyId int64, request *protocol.TemplateAddRequest) (rs | @@ -142,7 +142,7 @@ func TemplateAdd(uid, companyId int64, request *protocol.TemplateAddRequest) (rs | ||
| 142 | return | 142 | return |
| 143 | } | 143 | } |
| 144 | 144 | ||
| 145 | -//SetSelfCheckData 机会模板设置-自查内容设置 | 145 | +//addSelfCheckData 机会模板设置-自查内容设置 |
| 146 | func addSelfCheckData(templateId int64, data []protocol.TemplateSelfCheck, om orm2.Ormer) error { | 146 | func addSelfCheckData(templateId int64, data []protocol.TemplateSelfCheck, om orm2.Ormer) error { |
| 147 | var ( | 147 | var ( |
| 148 | addSelfCheck []models.AuditCheck | 148 | addSelfCheck []models.AuditCheck |
| @@ -189,10 +189,12 @@ func addSelfCheckData(templateId int64, data []protocol.TemplateSelfCheck, om or | @@ -189,10 +189,12 @@ func addSelfCheckData(templateId int64, data []protocol.TemplateSelfCheck, om or | ||
| 189 | return err | 189 | return err |
| 190 | } | 190 | } |
| 191 | 191 | ||
| 192 | +//editSelfCheckData 机会模板设置-自查内容设置 | ||
| 192 | func editSelfCheckData(templateId int64, data []protocol.TemplateSelfCheck, om orm2.Ormer) error { | 193 | func editSelfCheckData(templateId int64, data []protocol.TemplateSelfCheck, om orm2.Ormer) error { |
| 193 | var ( | 194 | var ( |
| 194 | err error | 195 | err error |
| 195 | ) | 196 | ) |
| 197 | + /**简单做法**/ | ||
| 196 | err = models.DeleteAuditCheckByTempelate(templateId, om) | 198 | err = models.DeleteAuditCheckByTempelate(templateId, om) |
| 197 | if err != nil { | 199 | if err != nil { |
| 198 | log.Error("软删除audit_check数据失败,err;%s", err) | 200 | log.Error("软删除audit_check数据失败,err;%s", err) |
| @@ -206,6 +208,40 @@ func editSelfCheckData(templateId int64, data []protocol.TemplateSelfCheck, om o | @@ -206,6 +208,40 @@ func editSelfCheckData(templateId int64, data []protocol.TemplateSelfCheck, om o | ||
| 206 | return nil | 208 | return nil |
| 207 | } | 209 | } |
| 208 | 210 | ||
| 211 | +func getSelfCheckData(templateId int64) []protocol.TemplateSelfCheck { | ||
| 212 | + var ( | ||
| 213 | + data []protocol.TemplateSelfCheck | ||
| 214 | + selfCheckData []models.AuditCheck | ||
| 215 | + err error | ||
| 216 | + ) | ||
| 217 | + selfCheckData, err = models.GetAuditCheckByTemplate(templateId) | ||
| 218 | + if err != nil { | ||
| 219 | + log.Error("获取audit_check数据失败, err:%s", err) | ||
| 220 | + return data | ||
| 221 | + } | ||
| 222 | + for i := range selfCheckData { | ||
| 223 | + checkdata := protocol.TemplateSelfCheck{ | ||
| 224 | + Id: selfCheckData[i].Id, | ||
| 225 | + Pid: selfCheckData[i].Pid, | ||
| 226 | + Title: selfCheckData[i].Title, | ||
| 227 | + } | ||
| 228 | + childdatas := []protocol.TemplateSelfCheck{} | ||
| 229 | + for ii := range selfCheckData { | ||
| 230 | + if selfCheckData[ii].Pid == selfCheckData[i].Id { | ||
| 231 | + child := protocol.TemplateSelfCheck{ | ||
| 232 | + Id: selfCheckData[ii].Id, | ||
| 233 | + Pid: selfCheckData[ii].Pid, | ||
| 234 | + Title: selfCheckData[ii].Title, | ||
| 235 | + } | ||
| 236 | + childdatas = append(childdatas, child) | ||
| 237 | + } | ||
| 238 | + } | ||
| 239 | + checkdata.Child = childdatas | ||
| 240 | + data = append(data, checkdata) | ||
| 241 | + } | ||
| 242 | + return data | ||
| 243 | +} | ||
| 244 | + | ||
| 209 | func jsonAssertMarsh(v interface{}) string { | 245 | func jsonAssertMarsh(v interface{}) string { |
| 210 | if data, e := json.Marshal(v); e != nil { | 246 | if data, e := json.Marshal(v); e != nil { |
| 211 | log.Error(fmt.Sprintf("%v %v", e.Error(), v)) | 247 | log.Error(fmt.Sprintf("%v %v", e.Error(), v)) |
| @@ -583,6 +619,8 @@ func TemplateGet(uid, companyId int64, request *protocol.TemplateGetRequest) (rs | @@ -583,6 +619,8 @@ func TemplateGet(uid, companyId int64, request *protocol.TemplateGetRequest) (rs | ||
| 583 | rsp.AuditFlowConfig.ProcessConfig = append(rsp.AuditFlowConfig.ProcessConfig, configItem) | 619 | rsp.AuditFlowConfig.ProcessConfig = append(rsp.AuditFlowConfig.ProcessConfig, configItem) |
| 584 | } | 620 | } |
| 585 | } | 621 | } |
| 622 | + selfCheckData := getSelfCheckData(template.Id) | ||
| 623 | + rsp.SelfCheck = selfCheckData | ||
| 586 | return | 624 | return |
| 587 | } | 625 | } |
| 588 | 626 |
-
请 注册 或 登录 后发表评论