add：上传方案报告增加是否加盖公章选项

controllers/Task.go

@@ -1023,9 +1023,12 @@ func (c *TaskController) Up() {
 	T_record := c.GetString("T_record")
 
 	T_doc1 := c.GetString("T_doc1")
-	T_pdf1 := c.GetString("T_pdf1")
+	T_pdf1 := c.GetString("T_pdf1") // 方案
+	T_pdf1_stamp, _ := c.GetBool("T_pdf1_stamp") // 方案加盖公章
 	T_doc2 := c.GetString("T_doc2")
-	T_pdf2 := c.GetString("T_pdf2")
+	T_pdf2 := c.GetString("T_pdf2") // 证书
+	T_pdf2_stamp, _ := c.GetBool("T_pdf2_stamp") // 报告加盖公章
+
 	T_doc3 := c.GetString("T_doc3")
 	T_pdf3 := c.GetString("T_pdf3")
 	T_pdf4 := c.GetString("T_pdf4") // 验证标识
@@ -1166,7 +1169,7 @@ func (c *TaskController) Up() {
 		clos = append(clos, "T_pdf1")
 		//r.T_pdf1_watermark = GetWatermarkPdf(r,T_pdf1,"T_pdf1")
 		//clos = append(clos, "T_pdf1_watermark")
-		go GetWatermarkPdf(r, T_pdf1, "T_pdf1")
+		go GetWatermarkPdf(r, T_pdf1, T_pdf1_stamp, "T_pdf1")
 		r.T_scheme_state = 5
 		clos = append(clos, "T_scheme_state")
 		// 添加已提交状态验证方案记录
@@ -1212,7 +1215,7 @@ func (c *TaskController) Up() {
 		clos = append(clos, "T_pdf2")
 		//r.T_pdf2_watermark = GetWatermarkPdf(T_pdf2,"T_pdf1")
 		//clos = append(clos, "T_pdf2_watermark")
-		go GetWatermarkPdf(r, T_pdf2, "T_pdf2")
+		go GetWatermarkPdf(r, T_pdf2, T_pdf2_stamp, "T_pdf2")
 
 		r.T_reporting_state = 5
 		clos = append(clos, "T_reporting_state")
@@ -2651,7 +2654,7 @@ func GetSignaturePdf_command(task Task.Task, pdfURL string, flag string) (pdf st
 	return
 }
 
-func GetWatermarkPdf(task Task.Task, pdfURL string, flag string) (pdf string) {
+func GetWatermarkPdf(task Task.Task, pdfURL string, stamp bool, flag string) (pdf string) {
 	if len(pdfURL) == 0 {
 		return
 	}
@@ -2660,10 +2663,14 @@ func GetWatermarkPdf(task Task.Task, pdfURL string, flag string) (pdf string) {
 	var signaturePdf, watermarkPdf string
 	var err error
 	if flag != "T_pdf5" {
-		signaturePdf, err = lib.GetSignaturePdf(pdfURL)
-		if err != nil {
-			logs.Error("获取加报告章pdf失败:", err)
-			return
+		if stamp {
+			signaturePdf, err = lib.GetSignaturePdf(pdfURL)
+			if err != nil {
+				logs.Error("获取加报告章pdf失败:", err)
+				return
+			}
+		} else {
+			signaturePdf = pdfURL
 		}
 	}
 
@@ -3341,10 +3348,12 @@ func (c *TaskController) TaskData_Stat() {
 func (c *TaskController) SyncPDFWatermark() {
 	List, _ := Task.Read_Task_List_For_Watermark("pdf1")
 	for _, task := range List {
+		GetWatermarkPdf_command(task, task.T_pdf1, "T_pdf1")
 		GetSignaturePdf_command(task, task.T_pdf1, "T_pdf1")
 	}
 	List2, _ := Task.Read_Task_List_For_Watermark("pdf2")
 	for _, task := range List2 {
+		GetWatermarkPdf_command(task, task.T_pdf2, "T_pdf2")
 		GetSignaturePdf_command(task, task.T_pdf2, "T_pdf2")
 	}
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}

models/Task/Task.go

@@ -1315,12 +1315,12 @@ func Read_Task_List_For_Watermark(pdfType string) ([]Task, int) {
 	cond := orm.NewCondition()
 	if pdfType == "pdf1" {
 
-		cond = cond.And("T_State", 1).And("T_pdf1__icontains", ".pdf")
+		cond = cond.And("T_State", 1).And("T_pdf1__icontains", ".pdf").And("t_pdf1_signature__isnull", true)
 	}
 
 	if pdfType == "pdf2" {
 
-		cond = cond.And("T_State", 1).And("T_pdf2__icontains", ".pdf")
+		cond = cond.And("T_State", 1).And("T_pdf2__icontains", ".pdf").And("t_pdf2_signature__isnull", true)
 	}
 
 	qs.SetCond((*orm2.Condition)(cond)).OrderBy("-Id").All(&r)