|
|
@@ -228,7 +228,6 @@ func (this *ActivitiService) GetMyTasksWithTime(processKey string, userId string
|
|
|
return myTasksRetWithTimes
|
|
|
}
|
|
|
|
|
|
-
|
|
|
func (this *ActivitiService) GetMyFinishedTasksWithTime(processKey string, userId string) []ActiMyTasksRetWithTimeVM {
|
|
|
var ActiMyTasks ActiMyTasksVM
|
|
|
ActiMyTasks.ProcessKey = processKey
|
|
|
@@ -261,7 +260,7 @@ func (this *ActivitiService) GetMyAllTypePagingTasksWithTime(userId string, Page
|
|
|
fmt.Println(err, "生成json字符串错误")
|
|
|
}
|
|
|
params := string(jsonParam)
|
|
|
- fmt.Println(params)
|
|
|
+ //fmt.Println(params)
|
|
|
//token = Authorization(this.Username, this.Password)
|
|
|
retVal := this.Post("/my-all-type-paging-tasks-with-time", params, "")
|
|
|
|
|
|
@@ -585,9 +584,9 @@ func (this *ActivitiService) FillWordTemplate(datas map[string]interface{}, temp
|
|
|
func (this *ActivitiService) FillExcel(datas map[string]interface{}, ContractClass string, templateUrl string, fileName string) string {
|
|
|
var wordTempVM excelTemplateVM
|
|
|
wordTempVM.ContractClass = ContractClass
|
|
|
- wordTempVM.Datas = datas
|
|
|
- wordTempVM.TemplateUrl = templateUrl
|
|
|
- wordTempVM.FileName = fileName
|
|
|
+ wordTempVM.Datas = datas
|
|
|
+ wordTempVM.TemplateUrl = templateUrl
|
|
|
+ wordTempVM.FileName = fileName
|
|
|
jsonParam, err := json.Marshal(wordTempVM)
|
|
|
if err != nil {
|
|
|
fmt.Println(err, "生成json字符串错误")
|
|
|
@@ -632,9 +631,9 @@ func (this *ActivitiService) FillExcel(datas map[string]interface{}, ContractCla
|
|
|
}
|
|
|
func (this *ActivitiService) ContrastExcel(datas map[string]interface{}, templateUrl string, fileName string) string {
|
|
|
var wordTempVM excelContrastVM
|
|
|
- wordTempVM.Datas = datas
|
|
|
- wordTempVM.TemplateUrl = templateUrl
|
|
|
- wordTempVM.FileName = fileName
|
|
|
+ wordTempVM.Datas = datas
|
|
|
+ wordTempVM.TemplateUrl = templateUrl
|
|
|
+ wordTempVM.FileName = fileName
|
|
|
jsonParam, err := json.Marshal(wordTempVM)
|
|
|
if err != nil {
|
|
|
fmt.Println(err, "生成json字符串错误")
|
|
|
@@ -682,9 +681,8 @@ func (this *ActivitiService) ContrastExcel(datas map[string]interface{}, templat
|
|
|
return retDocUrl
|
|
|
}
|
|
|
|
|
|
-
|
|
|
// 带水印
|
|
|
-func (this *ActivitiService) FillWordWatermarkTemplate(datas map[string]interface{}, templateUrl string, fileName,watermark string) string {
|
|
|
+func (this *ActivitiService) FillWordWatermarkTemplate(datas map[string]interface{}, templateUrl string, fileName, watermark string) string {
|
|
|
var wordTempVM WordTemplateWatermarkVM
|
|
|
wordTempVM.Datas = datas
|
|
|
wordTempVM.TemplateUrl = templateUrl
|