Merge branch 'fix_needs_seal_2022_0418' of hongze/hongze_mobile_admin into master

controllers/seal.go

@@ -5,6 +5,7 @@ import (
 	"github.com/rdlucklib/rdluck_tools/paging"
 	sealReq "hongze/hongze_mobile_admin/models/request/seal"
 	sealResp "hongze/hongze_mobile_admin/models/response/seal"
+	"hongze/hongze_mobile_admin/models/tables/company"
 	"hongze/hongze_mobile_admin/models/tables/seal"
 	contractService "hongze/hongze_mobile_admin/services/contract"
 	sealService "hongze/hongze_mobile_admin/services/seal"
@@ -433,3 +434,44 @@ func (c *SealCommon) CompanyList() {
 
 	c.OkDetailed(companyNameList, "获取成功")
 }
+
+// CompanyNameList
+// @Title 根据客户名称关键词获取系统中的客户名称列表
+// @Description 获取客户名称列表
+// @Param   Keyword  query  string  true  "客户名称关键词"
+// @Param   PageSize  query  int  true  "每页数据量"
+// @Param   CurrentIndex  query int  true  "页码"
+// @Success 200 {object} []company.CompanyNameList
+// @router /company_name_list [get]
+func (c *SealCommon) CompanyNameList() {
+	keyword := c.GetString("Keyword")
+	pageSize, _ := c.GetInt("PageSize")
+	currentIndex, _ := c.GetInt("CurrentIndex")
+
+	if keyword == "" {
+		c.FailWithMessage("关键词不能为空", "关键词不能为空")
+		return
+	}
+
+	var startSize int
+	if pageSize <= 0 {
+		pageSize = utils.PageSize20
+	}
+	if currentIndex <= 0 {
+		currentIndex = 1
+	}
+	startSize = paging.StartIndex(currentIndex, pageSize)
+
+	keyword = "%" + keyword + "%"
+	condition := " AND company_name LIKE ? "
+	pars := make([]interface{}, 0)
+	pars = append(pars, keyword)
+
+	list, err := company.GetCompanyNameList(condition, pars, startSize, pageSize)
+	if err != nil {
+		c.FailWithMessage("获取客户名称列表失败！", "获取客户名称列表失败,ERR:"+err.Error())
+		return
+	}
+
+	c.OkDetailed(list, "获取成功")
+}

models/tables/company/company.go

@@ -830,3 +830,19 @@ func ModifyCompanyDepartmentId(sellerId, departmentId int) (err error) {
 	_, err = o.Raw(sql, departmentId, sellerId).Exec()
 	return
 }
+
+type CompanyNameList struct {
+	CompanyId	int		`description:"客户ID"`
+	CompanyName	string	`description:"客户名称"`
+	CreditCode	string	`description:"社会统一信用码"`
+}
+
+// GetCompanyNameList 获取客户名称列表
+func GetCompanyNameList(condition string, pars []interface{}, startSize, pageSize int) (list []*CompanyNameList, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT company_id,company_name,credit_code FROM company WHERE 1=1 `
+	sql += condition
+	sql += ` LIMIT ?,? `
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
+	return
+}

routers/commentsRouter_controllers.go

@@ -511,6 +511,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealCommon"],
+        beego.ControllerComments{
+            Method: "CompanyNameList",
+            Router: "/company_name_list",
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealCommon"],
         beego.ControllerComments{
             Method: "Detail",

swagger/swagger.json

@@ -1682,6 +1682,51 @@
                 }
             }
         },
+        "/seal/company_name_list": {
+            "get": {
+                "tags": [
+                    "seal"
+                ],
+                "description": "获取客户名称列表",
+                "operationId": "SealCommon.根据客户名称关键词获取系统中的客户名称列表",
+                "parameters": [
+                    {
+                        "in": "query",
+                        "name": "Keyword",
+                        "description": "客户名称关键词",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "query",
+                        "name": "PageSize",
+                        "description": "每页数据量",
+                        "required": true,
+                        "type": "integer",
+                        "format": "int64"
+                    },
+                    {
+                        "in": "query",
+                        "name": "CurrentIndex",
+                        "description": "页码",
+                        "required": true,
+                        "type": "integer",
+                        "format": "int64"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/company.CompanyNameList"
+                            }
+                        }
+                    }
+                }
+            }
+        },
         "/seal/detail": {
             "get": {
                 "tags": [
@@ -2090,16 +2135,16 @@
         }
     },
     "definitions": {
-        "1635.\u003cnil\u003e.0xc00077c780": {
-            "title": "0xc00077c780",
+        "1635.\u003cnil\u003e.0xc0007acbe8": {
+            "title": "0xc0007acbe8",
             "type": "object"
         },
-        "645.\u003cnil\u003e.0xc00077c3d8": {
-            "title": "0xc00077c3d8",
+        "645.\u003cnil\u003e.0xc0007ac840": {
+            "title": "0xc0007ac840",
             "type": "object"
         },
-        "722.\u003cnil\u003e.0xc00077cab0": {
-            "title": "0xc00077cab0",
+        "722.\u003cnil\u003e.0xc0007acf18": {
+            "title": "0xc0007acf18",
             "type": "object"
         },
         "admin.LoginReq": {
@@ -2213,7 +2258,7 @@
                     "description": "审批流",
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/645.\u003cnil\u003e.0xc00077c3d8"
+                        "$ref": "#/definitions/645.\u003cnil\u003e.0xc0007ac840"
                     }
                 },
                 "PermissionList": {
@@ -2385,6 +2430,25 @@
             "title": "CompanyApprovalMessageReadReq",
             "type": "object"
         },
+        "company.CompanyNameList": {
+            "title": "CompanyNameList",
+            "type": "object",
+            "properties": {
+                "CompanyId": {
+                    "description": "客户ID",
+                    "type": "integer",
+                    "format": "int64"
+                },
+                "CompanyName": {
+                    "description": "客户名称",
+                    "type": "string"
+                },
+                "CreditCode": {
+                    "description": "社会统一信用码",
+                    "type": "string"
+                }
+            }
+        },
         "company_approval.CompanyApprovalList": {
             "title": "CompanyApprovalList",
             "type": "object",
@@ -3101,7 +3165,7 @@
                     "description": "审批流",
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/1635.\u003cnil\u003e.0xc00077c780"
+                        "$ref": "#/definitions/1635.\u003cnil\u003e.0xc0007acbe8"
                     }
                 },
                 "OpButton": {
@@ -4471,7 +4535,7 @@
                     "description": "审批流",
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/722.\u003cnil\u003e.0xc00077cab0"
+                        "$ref": "#/definitions/722.\u003cnil\u003e.0xc0007acf18"
                     }
                 },
                 "OpButton": {

swagger/swagger.yml

@@ -1118,6 +1118,37 @@ paths:
             type: array
             items:
               type: string
+  /seal/company_name_list:
+    get:
+      tags:
+      - seal
+      description: 获取客户名称列表
+      operationId: SealCommon.根据客户名称关键词获取系统中的客户名称列表
+      parameters:
+      - in: query
+        name: Keyword
+        description: 客户名称关键词
+        required: true
+        type: string
+      - in: query
+        name: PageSize
+        description: 每页数据量
+        required: true
+        type: integer
+        format: int64
+      - in: query
+        name: CurrentIndex
+        description: 页码
+        required: true
+        type: integer
+        format: int64
+      responses:
+        "200":
+          description: ""
+          schema:
+            type: array
+            items:
+              $ref: '#/definitions/company.CompanyNameList'
   /seal/detail:
     get:
       tags:
@@ -1385,14 +1416,14 @@ paths:
           schema:
             $ref: '#/definitions/wechat.WxLoginResp'
 definitions:
-  645.<nil>.0xc00077c3d8:
-    title: "0xc00077c3d8"
+  645.<nil>.0xc0007ac840:
+    title: "0xc0007ac840"
     type: object
-  722.<nil>.0xc00077cab0:
-    title: "0xc00077cab0"
+  722.<nil>.0xc0007acf18:
+    title: "0xc0007acf18"
     type: object
-  1635.<nil>.0xc00077c780:
-    title: "0xc00077c780"
+  1635.<nil>.0xc0007acbe8:
+    title: "0xc0007acbe8"
     type: object
   admin.LoginReq:
     title: LoginReq
@@ -1479,7 +1510,7 @@ definitions:
         description: 审批流
         type: array
         items:
-          $ref: '#/definitions/645.<nil>.0xc00077c3d8'
+          $ref: '#/definitions/645.<nil>.0xc0007ac840'
       PermissionList:
         description: 权益权限列表
         type: array
@@ -1604,6 +1635,20 @@ definitions:
   company.CompanyApprovalMessageReadReq:
     title: CompanyApprovalMessageReadReq
     type: object
+  company.CompanyNameList:
+    title: CompanyNameList
+    type: object
+    properties:
+      CompanyId:
+        description: 客户ID
+        type: integer
+        format: int64
+      CompanyName:
+        description: 客户名称
+        type: string
+      CreditCode:
+        description: 社会统一信用码
+        type: string
   company_approval.CompanyApprovalList:
     title: CompanyApprovalList
     type: object
@@ -2147,7 +2192,7 @@ definitions:
         description: 审批流
         type: array
         items:
-          $ref: '#/definitions/1635.<nil>.0xc00077c780'
+          $ref: '#/definitions/1635.<nil>.0xc0007acbe8'
       OpButton:
         $ref: '#/definitions/contract.OpButton'
         description: 操作权限
@@ -3179,7 +3224,7 @@ definitions:
         description: 审批流
         type: array
         items:
-          $ref: '#/definitions/722.<nil>.0xc00077cab0'
+          $ref: '#/definitions/722.<nil>.0xc0007acf18'
       OpButton:
         $ref: '#/definitions/seal.OpButton'
         description: 操作权限