Merge branch 'contract_quotation' of hongze/hongze_mobile_admin into master

models/custom/contract/contract_service.go

@@ -14,6 +14,7 @@ type ContractService struct {
 	ServiceTemplateId int       `description:"合同服务模板id"`
 	Title             string    `description:"套餐名称"`
 	Value             string    `description:"套餐的值"`
+	TableValue        string    `description:"表格数据，用于word生成时的json数据"`
 	HasDetail         string    `description:"是否有详情，枚举值：是、否；默认：否"`
 	CreateTime        time.Time `description:"合同添加时间"`
 }
@@ -26,6 +27,7 @@ type ContractServiceAndDetail struct {
 	ServiceTemplateId int    `description:"合同服务模板id"`
 	Title             string `description:"套餐标题"`
 	Value             string `description:"套餐的值"`
+	TableValue        string `description:"表格数据，用于word生成时的json数据"`
 	HasDetail         string `description:"是否有详情，枚举值：是、否；默认：否"`
 	ChartPermissionId int    `description:"权限id"`
 	DetailList        []*contract_service_detail.ContractServiceDetail

services/flow/flow.go

@@ -17,6 +17,8 @@ func GetApprovalFlow(flowId int) (approvalFlow *approval_flow.ApprovalFlowItem,
 		err = errors.New("查询审批流程失败：Err:" + err.Error())
 		return
 	}
+
+	flowNodeList := make([]*approval_flow_node.ApprovalFlowNodeList, 0)
 	approvalFlowNodeList, err := approval_flow_node.GetListByFlowId(approvalFlow.FlowId, approvalFlow.CurrVersion)
 	if err != nil {
 		err = errors.New("查询审批节点失败：Err:" + err.Error())
@@ -37,9 +39,11 @@ func GetApprovalFlow(flowId int) (approvalFlow *approval_flow.ApprovalFlowItem,
 			}
 			approvalFlowNode.UserList = append(approvalFlowNode.UserList, userInfo)
 		}
+		if len(approvalFlowNode.UserList) > 0 {
+			flowNodeList = append(flowNodeList, approvalFlowNode)
+		}
 	}
-	approvalFlow.NodeList = approvalFlowNodeList
-
+	approvalFlow.NodeList = flowNodeList
 	return
 }
 

services/word.go

@@ -730,15 +730,8 @@ func GetHtmlByContractDetail(contractDetail *contract.ContractDetail, htmlType s
 				//赋值table表格数据
 				tableDataList.List = tableRowList
 			} else {
-				//获取预设的表格数据
-				contractServiceTemplate, tmpErr := contract_service_template.GetContractServiceTemplateById(item.ServiceTemplateId)
-				if tmpErr != nil {
-					err = tmpErr
-					return
-				}
-
 				//赋值table表格数据
-				jsonStr := contractServiceTemplate.TableValue
+				jsonStr := item.TableValue
 				tmpEerr := json.Unmarshal([]byte(jsonStr), &tableDataList)
 				if tmpEerr != nil {
 					err = tmpEerr
@@ -1213,15 +1206,8 @@ func GenerateWordV2(contractDetail *contract.ContractDetail, wordPath string) (e
 					//赋值table表格数据
 					tableDataList.List = tableRowList
 				} else {
-					//获取预设的表格数据
-					contractServiceTemplate, tmpErr := contract_service_template.GetContractServiceTemplateById(item.ServiceTemplateId)
-					if tmpErr != nil {
-						err = tmpErr
-						return
-					}
-
 					//赋值table表格数据
-					jsonStr := contractServiceTemplate.TableValue
+					jsonStr := item.TableValue
 					err = json.Unmarshal([]byte(jsonStr), &tableDataList)
 					if err != nil {
 						return
@@ -1410,15 +1396,8 @@ func GenerateWordV2(contractDetail *contract.ContractDetail, wordPath string) (e
 						//赋值table表格数据
 						tableDataList.List = tableRowList
 					} else {
-						//获取预设的表格数据
-						contractServiceTemplate, tmpErr := contract_service_template.GetContractServiceTemplateById(item.ServiceTemplateId)
-						if tmpErr != nil {
-							err = tmpErr
-							return
-						}
-
 						//赋值table表格数据
-						jsonStr := contractServiceTemplate.TableValue
+						jsonStr := item.TableValue
 						err = json.Unmarshal([]byte(jsonStr), &tableDataList)
 						if err != nil {
 							return