作者 tangxvhui

导出 修改

@@ -42,9 +42,9 @@ type AuditFormValueList struct { @@ -42,9 +42,9 @@ type AuditFormValueList struct {
42 42
43 //输入框类型 43 //输入框类型
44 const ( 44 const (
45 - InputTypeText string = "text" //单行文本宽  
46 - InputTypeRadio string = "radio" //单选框  
47 - InputTypeImageVedio string = "image/video" // 图片或视频输入 45 + InputTypeText string = "text" //单行文本宽
  46 + InputTypeRadio string = "radio" //单选框
  47 + InputTypeImageVedio string = "files" // 图片或视频输入
48 ) 48 )
49 49
50 //输入框输入的数据类型 50 //输入框输入的数据类型
@@ -31,8 +31,6 @@ func GetAuditListForExcel(param protocol.RequestAuditList, companyid int64, user @@ -31,8 +31,6 @@ func GetAuditListForExcel(param protocol.RequestAuditList, companyid int64, user
31 return nil, nil 31 return nil, nil
32 } 32 }
33 33
34 - //https://web-open.fjmaimaimai.com/#/ 生产  
35 - // mmm-web-open-test.fjmaimaimai.com/  
36 // SELECT a.id,a.department_id,a.audit_template_id,a.chance_type_id 34 // SELECT a.id,a.department_id,a.audit_template_id,a.chance_type_id
37 // ,a.publish_status,a.create_at,a.review_status,a.status 35 // ,a.publish_status,a.create_at,a.review_status,a.status
38 // ,a.discovery_score,a.comment_total ,a.code,d.nick_name,d.id as user_id 36 // ,a.discovery_score,a.comment_total ,a.code,d.nick_name,d.id as user_id
@@ -115,10 +113,25 @@ func GetAuditListForExcel(param protocol.RequestAuditList, companyid int64, user @@ -115,10 +113,25 @@ func GetAuditListForExcel(param protocol.RequestAuditList, companyid int64, user
115 err := json.Unmarshal([]byte(soureContentJson), &soureContentData) 113 err := json.Unmarshal([]byte(soureContentJson), &soureContentData)
116 if err == nil { 114 if err == nil {
117 for ii := range soureContentData { 115 for ii := range soureContentData {
118 - valueString := strings.TrimSpace(soureContentData[ii].CurrentValue)  
119 - if len(valueString) == 0 { 116 + if soureContentData[ii].InputType == models.InputTypeImageVedio {
120 continue 117 continue
121 } 118 }
  119 + var valueString string
  120 + if soureContentData[ii].InputType == models.InputTypeText {
  121 + valueString = strings.TrimSpace(soureContentData[ii].CurrentValue)
  122 + if len(valueString) == 0 {
  123 + continue
  124 + }
  125 + }
  126 + if soureContentData[ii].InputType == models.InputTypeRadio {
  127 + if len(soureContentData[ii].Data) == 0 {
  128 + continue
  129 + }
  130 + valueString = strings.TrimSpace(soureContentData[ii].Data[0].Value)
  131 + if len(valueString) == 0 {
  132 + continue
  133 + }
  134 + }
122 soureContentText.WriteString(soureContentData[ii].Label + ":" + valueString + ",") 135 soureContentText.WriteString(soureContentData[ii].Label + ":" + valueString + ",")
123 } 136 }
124 } 137 }
@@ -126,9 +139,9 @@ func GetAuditListForExcel(param protocol.RequestAuditList, companyid int64, user @@ -126,9 +139,9 @@ func GetAuditListForExcel(param protocol.RequestAuditList, companyid int64, user
126 signString := signature.SignaString(fmt.Sprint(soureData[i]["id"])) 139 signString := signature.SignaString(fmt.Sprint(soureData[i]["id"]))
127 var frontHost string 140 var frontHost string
128 if "prod" == myconfig.MConfig.ConfigName { 141 if "prod" == myconfig.MConfig.ConfigName {
129 - frontHost = "https://web-open.fjmaimaimai.com/#/ability/opportunity/export-detail" 142 + frontHost = "https://web-open.fjmaimaimai.com/#/ability/opportunity/export-detail" //web前端生产环境地址
130 } else { 143 } else {
131 - frontHost = "http://mmm-web-open-test.fjmaimaimai.com/#/ability/opportunity/export-detail" 144 + frontHost = "http://mmm-web-open-test.fjmaimaimai.com/#/ability/opportunity/export-detail" //web前端测试环境
132 } 145 }
133 soureData[i]["media"] = fmt.Sprintf("%s?chance_id=%v&check_sum=%s", frontHost, soureData[i]["id"], signString) 146 soureData[i]["media"] = fmt.Sprintf("%s?chance_id=%v&check_sum=%s", frontHost, soureData[i]["id"], signString)
134 147