Merge branch 'dev' of http://gitlab.fjmaimaimai.com/mmm-go/oppmg into dev

唐旭辉
controllers/base.go
controllers/bulletin.go
deploy/k8s/dev/install.sh
deploy/k8s/dev/oppmg.yaml
models/bulletin_question_answer.go
protocol/bulletin.go
routers/router.go
services/bulletin/bulletin.go
utils/exceltool/index.go
--- a/controllers/base.go
查看文件 @4300f3d
+++ b/controllers/base.go
查看文件 @4300f3d
@@ -5,9 +5,11 @@ import (
 	"fmt"
 	"oppmg/common/log"
 	"oppmg/protocol"
+	"oppmg/utils/exceltool"
 	"strconv"
 	"github.com/astaxie/beego"
+	"github.com/astaxie/beego/context"
 	"github.com/astaxie/beego/validation"
 )
@@ -85,3 +87,16 @@ func (this *BaseController) Valid(obj interface{}) (result bool, msg *protocol.R
 	return
 }
+
+func (this *BaseController) ResponseExcelByFile(ctx *context.Context, excelMaker *exceltool.ExcelMaker) error {
+	ctx.Output.Header("Content-Disposition", "attachment; filename="+excelMaker.FileName)
+	ctx.Output.Header("Content-Description", "File Transfer")
+	ctx.Output.Header("Content-Type", "application/octet-stream")
+	ctx.Output.Header("Content-Transfer-Encoding", "binary")
+	ctx.Output.Header("Expires", "0")
+	ctx.Output.Header("Cache-Control", "must-revalidate")
+	ctx.Output.Header("Pragma", "public")
+	//跳过保存文件，直接写入ctx.ResponseWriter
+	excelMaker.Xlsx.Write(ctx.ResponseWriter)
+	return nil
+}
--- a/controllers/bulletin.go
查看文件 @4300f3d
+++ b/controllers/bulletin.go
查看文件 @4300f3d
@@ -175,3 +175,39 @@ func (this *BulletinController) BulletinFeedbacks() {
 	rsp, err := bulletin.BulletinFeedbacks(companyId, request)
 	msg = protocol.NewPageDataResponse(rsp, err)
 }
+
+//ExportFeedBacks
+//@router /exportFeedBacks [post]
+func (this *BulletinController) ExportFeedBacks() {
+	var msg *protocol.ResponseMessage
+	defer func() {
+		this.ResposeJson(msg)
+	}()
+	var request *protocol.ExportFeedBacksRequest
+	if err := json.Unmarshal(this.Ctx.Input.RequestBody, &request); err != nil {
+		log.Error("json 解析失败", err)
+		msg = protocol.BadRequestParam("1")
+		return
+	}
+	if b, m := this.Valid(request); !b {
+		msg = m
+		return
+	}
+	companyId := this.GetCompanyId()
+	if companyId <= 0 {
+		msg = protocol.BadRequestParam("1")
+		return
+	}
+	excel, err := bulletin.ExportFeedBacks(companyId, request)
+	if err != nil {
+		log.Error(err.Error())
+		msg = protocol.BadRequestParam("1")
+		return
+	}
+	if err = this.ResponseExcelByFile(this.Ctx, excel); err != nil {
+		log.Error(err.Error())
+		msg = protocol.BadRequestParam("1")
+		return
+	}
+	msg = protocol.NewReturnResponse(nil, err)
+}
--- a/deploy/k8s/dev/install.sh
查看文件 @4300f3d
+++ b/deploy/k8s/dev/install.sh
查看文件 @4300f3d
 #!/bin/bash
 export PATH=/root/local/bin:$PATH
-kubectl -n mmm-suplus-dev get pods | grep -q oppmg
+kubectl -n mmm-suplus-dev get pods | grep -q mmm-oppmg
 if [ "$?" == "1" ];then
 	kubectl create -f /tmp/dev/mmm-go-oppmg/oppmg.yaml --record
-	kubectl -n mmm-suplus-dev get svc | grep -q oppmg
+	kubectl -n mmm-suplus-dev get svc | grep -q mmm-oppmg
 	if [ "$?" == "0" ];then
-		echo "oppmg service install success!"
+		echo "mmm-oppmg service install success!"
 	else
-		echo "oppmg service install fail!"
+		echo "mmm-oppmg service install fail!"
 	fi
-	kubectl -n mmm-suplus-dev get pods | grep -q oppmg
+	kubectl -n mmm-suplus-dev get pods | grep -q mmm-oppmg
 	if [ "$?" == "0" ];then
-		echo "oppmg deployment install success!"
+		echo "mmm-oppmg deployment install success!"
 	else
-		echo "oppmg deployment install fail!"
+		echo "mmm-oppmg deployment install fail!"
 	fi
 else
 	kubectl delete -f /tmp/dev/mmm-go-oppmg/oppmg.yaml
-	kubectl -n mmm-suplus-dev get svc | grep -q oppmg
+	kubectl -n mmm-suplus-dev get svc | grep -q mmm-oppmg
 	while [ "$?" == "0" ]
 	do
-	kubectl -n mmm-suplus-dev get svc | grep -q oppmg
+	kubectl -n mmm-suplus-dev get svc | grep -q mmm-oppmg
 	done
-	kubectl -n mmm-suplus-dev get pods | grep -q oppmg
+	kubectl -n mmm-suplus-dev get pods | grep -q mmm-oppmg
 	while [ "$?" == "0" ]
 	do
-	kubectl -n mmm-suplus-dev get pods | grep -q oppmg
+	kubectl -n mmm-suplus-dev get pods | grep -q mmm-oppmg
 	done
 	kubectl create -f /tmp/dev/mmm-go-oppmg/oppmg.yaml --record
-	kubectl -n mmm-suplus-dev get svc | grep -q oppmg
+	kubectl -n mmm-suplus-dev get svc | grep -q mmm-oppmg
 	if [ "$?" == "0" ];then
-		echo "oppmg service update success!"
+		echo "mmm-oppmg service update success!"
 	else
-		echo "oppmg service update fail!"
+		echo "mmm-oppmg service update fail!"
 	fi
-	kubectl -n mmm-suplus-dev get pods | grep -q oppmg
+	kubectl -n mmm-suplus-dev get pods | grep -q mmm-oppmg
 	if [ "$?" == "0" ];then
-		echo "oppmg deployment update success!"
+		echo "mmm-oppmg deployment update success!"
 	else
-		echo "oppmg deployment update fail!"
+		echo "mmm-oppmg deployment update fail!"
 	fi
 fi
--- a/deploy/k8s/dev/oppmg.yaml
查看文件 @4300f3d
+++ b/deploy/k8s/dev/oppmg.yaml
查看文件 @4300f3d
 apiVersion: v1
 kind: Service
 metadata:
-  name: oppmg
+  name: mmm-oppmg
   namespace: mmm-suplus-dev
   labels:
-    k8s-app: oppmg
+    k8s-app: mmm-oppmg
 spec:
   ports:
     - name: "http"
       port: 80
       targetPort: 8080
   selector:
-    k8s-app: oppmg
+    k8s-app: mmm-oppmg
 ---
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: oppmg
+  name: mmm-oppmg
   namespace: mmm-suplus-dev
   labels:
-    k8s-app: oppmg
+    k8s-app: mmm-oppmg
 spec:
   replicas: 1
   template:
     metadata:
       labels:
-        k8s-app: oppmg
+        k8s-app: mmm-oppmg
     spec:
       affinity:
         nodeAffinity:
@@ -43,8 +43,8 @@ spec:
                       - cn-hangzhou.i-bp1euf5u1ph9kbhtndhb
                       - cn-hangzhou.i-bp1hyp5oips9cdwxxgxy
       containers:
-        - name: oppmg
-          image: 192.168.0.243:5000/mmm/oppmg:dev
+        - name: mmm-oppmg
+          image: 192.168.0.243:5000/mmm/mmm-oppmg:dev
           imagePullPolicy: Always
           volumeMounts:
             - mountPath: /opt/logs
--- a/models/bulletin_question_answer.go
查看文件 @4300f3d
+++ b/models/bulletin_question_answer.go
查看文件 @4300f3d
@@ -86,17 +86,16 @@ select answer,update_at,uid from bulletin_question_answer  where bulletin_id =? 
 	sqlCount += where
 	sql += where
-	sql += ` limit ?,?`
-	if v != nil {
 	if err = utils.ExecuteQueryOne(&total, sqlCount, id); err != nil {
 		return
 	}
+	if page > 0 {
+		sql += fmt.Sprintf(` limit %v,%v`, (page-1)*pageSize, pageSize)
 	}
-	if page == 0 {
-		page = 1
-	}
-	if err = utils.ExecuteQueryAll(v, sql, id, (page-1)*pageSize, pageSize); err != nil {
+	if v != nil {
+		if err = utils.ExecuteQueryAll(v, sql, id); err != nil {
 			return
 		}
+	}
 	return
 }
--- a/protocol/bulletin.go
查看文件 @4300f3d
+++ b/protocol/bulletin.go
查看文件 @4300f3d
@@ -128,3 +128,10 @@ type Answer struct {
 	VoteResults []int  `json:"voteResults"`
 	EditContent string `json:"editContent"`
 }
+
+/*ExportFeedBacks */
+type ExportFeedBacksRequest struct {
+	Id int `json:"id"` //公告编号
+}
+type ExportFeedBacksResponse struct {
+}
--- a/routers/router.go
查看文件 @4300f3d
+++ b/routers/router.go
查看文件 @4300f3d
@@ -56,6 +56,7 @@ func init() {
 			beego.NSRouter("/update", &controllers.BulletinController{}, "post:UpdateBulletin"),
 			beego.NSRouter("/operate", &controllers.BulletinController{}, "post:OperateBulletin"),
 			beego.NSRouter("/feedbacks", &controllers.BulletinController{}, "post:BulletinFeedbacks"),
+			beego.NSRouter("/exportFeedBacks", &controllers.BulletinController{}, "post:ExportFeedBacks"),
 		),
 		beego.NSNamespace("/common",
 			beego.NSRouter("/department", &controllers.CommonController{}, "post:SelectorDepartment"),
--- a/services/bulletin/bulletin.go
查看文件 @4300f3d
+++ b/services/bulletin/bulletin.go
查看文件 @4300f3d
@@ -9,6 +9,7 @@ import (
 	"oppmg/protocol"
 	"oppmg/services/agg"
 	"oppmg/utils"
+	"oppmg/utils/exceltool"
 	"strconv"
 	"strings"
 	"time"
@@ -452,3 +453,37 @@ func BulletinFeedbacks(companyId int64, request *protocol.BulletinFeedbacksReque
 	}
 	return
 }
+
+//导出反馈详情
+func ExportFeedBacks(companyId int64, request *protocol.ExportFeedBacksRequest) (excel *exceltool.ExcelMaker, err error) {
+	var (
+		feedbackRsp *protocol.BulletinFeedbacksResponse
+		sourceData  []map[string]string
+	)
+	if feedbackRsp, err = BulletinFeedbacks(companyId, &protocol.BulletinFeedbacksRequest{Id: request.Id}); err != nil {
+		//if err == orm2.ErrNoRows {
+		//	err = nil
+		//}
+		//无数据
+		return
+	}
+	excel = exceltool.NewExcelMaker()
+	headTitle := [][]string{
+		[]string{"time", "时间"},
+		[]string{"name", "姓名"},
+		[]string{"content", "选项"},
+	}
+	for i := range feedbackRsp.List {
+		item := feedbackRsp.List[i]
+		row := make(map[string]string)
+		row["time"] = time.Unix(item.Time, 0).Format("2006-01-02 15:04:05")
+		row["name"] = item.Name
+		row["content"] = item.Content
+		sourceData = append(sourceData, row)
+	}
+	if err = excel.MakeListExcel(sourceData, headTitle); err != nil {
+		log.Error(err.Error())
+		return
+	}
+	return
+}
--- a/utils/exceltool/index.go
查看文件 @4300f3d
+++ b/utils/exceltool/index.go
查看文件 @4300f3d
@@ -39,10 +39,11 @@ func (e *ExcelMaker) MakeListExcel(sourData []map[string]string, xlsxHeader [][]
 		}
 		headEn = append(headEn, xlsxHeader[key][0])
 		headCn = append(headCn, xlsxHeader[key][1])
-		alpha, err := excelize.ColumnNumberToName(key)
-		if err != nil {
-			return err
-		}
+		//alpha, err := excelize.ColumnNumberToName(key)
+		//if err != nil {
+		//	return err
+		//}
+		alpha := ToAlphaString(key)
 		alphaSlice = append(alphaSlice, alpha)
 	}
@@ -119,3 +120,16 @@ func GetRandomString(lenght int) string {
 	}
 	return string(result)
 }
+
+func ToAlphaString(value int) string {
+	if value < 0 {
+		return ""
+	}
+	var ans string
+	i := value + 1
+	for i > 0 {
+		ans = string((i-1)%26+65) + ans
+		i = (i - 1) / 26
+	}
+	return ans
+}