feature:更新pdmaner配置

doc/订单全流程管理平台.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.1",
   "createdTime": "2022-12-6 07:35:33",
-  "updatedTime": "2023-1-9 17:45:35",
+  "updatedTime": "2023-1-11 10:44:37",
   "dbConns": [],
   "profile": {
     "default": {
@@ -5006,7 +5006,24 @@
           "id": "D8FD5645-CA6F-416A-95C3-B1105B561000"
         },
         {
-          "defKey": "signatory",
+          "defKey": "signatory_id",
+          "defName": "公司签约人ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "828878A8-8FA2-4D63-9B5B-B8B9E81BCE10"
+        },
+        {
+          "defKey": "signatory_name",
           "defName": "公司签约人",
           "comment": "",
           "type": "",
@@ -5020,7 +5037,41 @@
           "refDict": "",
           "extProps": {},
           "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
-          "id": "828878A8-8FA2-4D63-9B5B-B8B9E81BCE10"
+          "id": "D693E3DC-7F6F-4F87-98BF-9A636749A32C"
+        },
+        {
+          "defKey": "cust_signatory_id",
+          "defName": "客户签约人ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "E6ADDCB1-33EB-4A32-BEB4-D8D65116DC1E"
+        },
+        {
+          "defKey": "cust_signatory_name",
+          "defName": "客户签约人",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+          "id": "2C3BC908-62FB-4784-91D1-0B721C514EFC"
         },
         {
           "defKey": "distributor_id",

opms_parent/app/dao/contract/internal/ctr_contract.go

@@ -44,6 +44,8 @@ type ctrContractColumns struct {
 	InchargeName      string // 负责人
 	SignatoryId       string // 公司签约人ID
 	SignatoryName     string // 公司签约人
+	CustSignatoryId   string // 客户签约人ID
+	CustSignatoryName string // 客户签约人
 	DistributorId     string // 经销商ID
 	DistributorName   string // 经销商
 	Remark            string // 备注
@@ -81,6 +83,8 @@ var (
 			InchargeName:      "incharge_name",
 			SignatoryId:       "signatory_id",
 			SignatoryName:     "signatory_name",
+			CustSignatoryId:   "cust_signatory_id",
+			CustSignatoryName: "cust_signatory_name",
 			DistributorId:     "distributor_id",
 			DistributorName:   "distributor_name",
 			Remark:            "remark",
@@ -120,6 +124,8 @@ func NewCtrContractDao(tenant string) CtrContractDao {
 			InchargeName:      "incharge_name",
 			SignatoryId:       "signatory_id",
 			SignatoryName:     "signatory_name",
+			CustSignatoryId:   "cust_signatory_id",
+			CustSignatoryName: "cust_signatory_name",
 			DistributorId:     "distributor_id",
 			DistributorName:   "distributor_name",
 			Remark:            "remark",

opms_parent/app/model/contract/ctr_contract.go

@@ -19,6 +19,7 @@ type CtrContractGetRsp struct {
 	Product []*CtrContractProduct `json:"product"` // 产品
 }
 
+// swagger:model CtrContractListReq
 type CtrContractListReq struct {
 	request.PageReq
 	SearchText   string `json:"searchText"`   // 合同编号,合同名称,客户名称,项目名称
@@ -72,6 +73,8 @@ type CtrContractAddReq struct {
 	InchargeName      string          `json:"inchargeName"`      // 负责人
 	SignatoryId       int             `json:"signatoryId"`       // 公司签约人ID
 	SignatoryName     string          `json:"signatoryName"`     // 公司签约人
+	CustSignatoryId   int             `json:"custSignatoryId"`   // 客户签约人ID
+	CustSignatoryName string          `json:"custSignatoryName"` // 客户签约人
 	DistributorId     int             `json:"distributorId"`     // 经销商ID
 	DistributorName   string          `json:"distributorName"`   // 经销商
 	Remark            string          `json:"remark"`            // 备注
@@ -79,8 +82,8 @@ type CtrContractAddReq struct {
 }
 
 type CtrContractUpdateReq struct {
-	Id           int    `json:"id" v:"required#请输入Id"`
-	ContractCode string `json:"contractCode"` // 合同编号
+	Id int `json:"id" v:"required#请输入Id"`
+	// ContractCode string `json:"contractCode"` // 合同编号
 	ContractName string `json:"contractName"` // 合同名称
 	// CustId            int         `json:"custId"`            // 关联客户
 	// CustName          string      `json:"custName"`          // 客户名称
@@ -97,6 +100,8 @@ type CtrContractUpdateReq struct {
 	InchargeName      string           `json:"inchargeName"`      // 负责人
 	SignatoryId       int              `json:"signatoryId"`       // 公司签约人ID
 	SignatoryName     string           `json:"signatoryName"`     // 公司签约人
+	CustSignatoryId   int              `json:"custSignatoryId"`   // 客户签约人ID
+	CustSignatoryName string           `json:"custSignatoryName"` // 客户签约人
 	DistributorId     int              `json:"distributorId"`     // 经销商ID
 	DistributorName   string           `json:"distributorName"`   // 经销商
 	Remark            *string          `json:"remark"`

opms_parent/app/model/contract/internal/ctr_contract.go

@@ -28,6 +28,8 @@ type CtrContract struct {
 	InchargeName      string      `orm:"incharge_name"       json:"inchargeName"`      // 负责人
 	SignatoryId       int         `orm:"signatory_id"        json:"signatoryId"`       // 公司签约人ID
 	SignatoryName     string      `orm:"signatory_name"      json:"signatoryName"`     // 公司签约人
+	CustSignatoryId   int         `orm:"cust_signatory_id"   json:"custSignatoryId"`   // 客户签约人ID
+	CustSignatoryName string      `orm:"cust_signatory_name" json:"custSignatoryName"` // 客户签约人
 	DistributorId     int         `orm:"distributor_id"      json:"distributorId"`     // 经销商ID
 	DistributorName   string      `orm:"distributor_name"    json:"distributorName"`   // 经销商
 	Remark            string      `orm:"remark"              json:"remark"`            // 备注

opms_parent/app/service/contract/ctr_contract.go

@@ -5,6 +5,7 @@ import (
 	"database/sql"
 	"encoding/json"
 	"fmt"
+	"time"
 
 	basedao "dashoo.cn/micro/app/dao/base"
 	dao "dashoo.cn/micro/app/dao/contract"
@@ -305,6 +306,10 @@ func (s CtrContractService) Add(ctx context.Context, req *model.CtrContractAddRe
 		return 0, myerrors.NewMsgError(nil, validErr.Current().Error())
 	}
 
+	if req.ContractCode == "" {
+		req.ContractCode = time.Now().Format("20060102150405")
+	}
+
 	c, err := s.Dao.Where("contract_code = ?", req.ContractCode).One()
 	if err != nil {
 		return 0, err
@@ -349,6 +354,8 @@ func (s CtrContractService) Add(ctx context.Context, req *model.CtrContractAddRe
 		InchargeName:      req.InchargeName,
 		SignatoryId:       req.SignatoryId,
 		SignatoryName:     req.SignatoryName,
+		CustSignatoryId:   req.CustSignatoryId,
+		CustSignatoryName: req.CustSignatoryName,
 		DistributorId:     req.DistributorId,
 		DistributorName:   req.DistributorName,
 		Remark:            req.Remark,
@@ -395,15 +402,15 @@ func (s CtrContractService) Update(ctx context.Context, req *model.CtrContractUp
 		return myerrors.NewMsgError(nil, fmt.Sprintf("合同不存在: %d", req.Id))
 	}
 
-	if req.ContractCode != "" {
-		exist, err := s.Dao.Where("contract_code = ?", req.ContractCode).One()
-		if err != nil {
-			return err
-		}
-		if exist != nil && exist.Id != req.Id {
-			return myerrors.NewMsgError(nil, fmt.Sprintf("合同编号:%s 已存在", req.ContractCode))
-		}
-	}
+	// if req.ContractCode != "" {
+	// 	exist, err := s.Dao.Where("contract_code = ?", req.ContractCode).One()
+	// 	if err != nil {
+	// 		return err
+	// 	}
+	// 	if exist != nil && exist.Id != req.Id {
+	// 		return myerrors.NewMsgError(nil, fmt.Sprintf("合同编号:%s 已存在", req.ContractCode))
+	// 	}
+	// }
 	if req.ContractName != "" {
 		exist, err := s.Dao.Where("contract_name = ?", req.ContractName).One()
 		if err != nil {
@@ -426,9 +433,9 @@ func (s CtrContractService) Update(ctx context.Context, req *model.CtrContractUp
 	}
 
 	toupdate := map[string]interface{}{}
-	if req.ContractCode != "" {
-		toupdate["contract_code"] = req.ContractCode
-	}
+	// if req.ContractCode != "" {
+	// 	toupdate["contract_code"] = req.ContractCode
+	// }
 	if req.ContractName != "" {
 		toupdate["contract_name"] = req.ContractName
 	}
@@ -471,6 +478,12 @@ func (s CtrContractService) Update(ctx context.Context, req *model.CtrContractUp
 	if req.SignatoryName != "" {
 		toupdate["signatory_name"] = req.SignatoryName
 	}
+	if req.CustSignatoryId != 0 {
+		toupdate["cust_signatory_id"] = req.CustSignatoryId
+	}
+	if req.CustSignatoryName != "" {
+		toupdate["cust_signatory_name"] = req.CustSignatoryName
+	}
 	if req.DistributorId != 0 {
 		toupdate["distributor_id"] = req.DistributorId
 	}

opms_parent/schema/contract.sql

@@ -17,6 +17,8 @@ CREATE TABLE `ctr_contract` (
     `incharge_name` varchar(90) COMMENT '负责人',
     `signatory_id` int(11) DEFAULT NULL COMMENT '公司签约人ID',
     `signatory_name` varchar(90) DEFAULT NULL COMMENT '公司签约人',
+    `cust_signatory_id` int(11) DEFAULT NULL COMMENT '客户签约人ID',
+    `cust_signatory_name` varchar(90) DEFAULT NULL COMMENT '客户签约人',
     `distributor_id` int(11) DEFAULT NULL COMMENT '经销商ID',
     `distributor_name` varchar(90) DEFAULT NULL COMMENT '经销商',
     `remark` text DEFAULT NULL COMMENT '备注',

opms_parent/swaggerui/swagger.yml

@@ -874,6 +874,12 @@ components:
         signatoryName:
           type: string
           description: 公司签约人
+        custSignatoryId:
+          type: integer
+          description: 客户签约人ID
+        custSignatoryName:
+          type: string
+          description: 客户签约人
         distributorId:
           type: integer
           description: 经销商ID
@@ -915,9 +921,9 @@ components:
         id:
           type: integer
           description: Id
-        contractCode:
-          type: string
-          description: 合同编号
+        # contractCode:
+        #   type: string
+        #   description: 合同编号
         contractName:
           type: string
           description: 合同名称
@@ -966,6 +972,12 @@ components:
         signatoryName:
           type: string
           description: 公司签约人
+        custSignatoryId:
+          type: integer
+          description: 客户签约人ID
+        custSignatoryName:
+          type: string
+          description: 客户签约人
         distributorId:
           type: integer
           description: 经销商ID
@@ -1541,6 +1553,8 @@ components:
         inchargeName: "管理员"
         signatoryId: 1
         signatoryName: "管理员"
+        custSignatoryId: 1
+        custSignatoryName: "客户联系人1"
         distributorId: 1
         distributorName: "管理员"
         remark: "备注"
@@ -1555,7 +1569,7 @@ components:
     CtrContractUpdate:
       value:
         id: 2
-        contractCode: "2"
+        # contractCode: "2"
         contractName: "2"
         nboId: 2
         contractType: "2"
@@ -1563,6 +1577,8 @@ components:
         contractEndTime: "2020-01-01 02:02:02"
         signatoryId: 1
         signatoryName: "管理员"
+        custSignatoryId: 2
+        custSignatoryName: "客户联系人2"
         distributorId: 1
         distributorName: "管理员"
         remark: "备注2"