fix: 签订日期非必填

controller/contract/register.go

@@ -186,10 +186,14 @@ func (rg *RegisterController) Add(c *gin.Context) {
 		resp.FailMsg("合同结束日期格式有误", "合同结束日期格式有误, Err: "+e.Error(), c)
 		return
 	}
-	signDate, e := time.ParseInLocation(utils.FormatDate, req.SignDate, time.Local)
-	if e != nil {
-		resp.FailMsg("合同签订日期格式有误", "合同签订日期格式有误, Err: "+e.Error(), c)
-		return
+	signDate, _ := time.ParseInLocation(utils.FormatDate, "0000-00-00", time.Local)
+	if req.SignDate != "" {
+		signDateTime, e := time.ParseInLocation(utils.FormatDate, req.SignDate, time.Local)
+		if e != nil {
+			resp.FailMsg("合同签订日期格式有误", "合同签订日期格式有误, Err: "+e.Error(), c)
+			return
+		}
+		signDate = signDateTime
 	}
 
 	// 是否存在相同合同编号的登记
@@ -300,10 +304,14 @@ func (rg *RegisterController) Edit(c *gin.Context) {
 		resp.FailMsg("合同结束日期格式有误", "合同结束日期格式有误, Err: "+e.Error(), c)
 		return
 	}
-	signDate, e := time.ParseInLocation(utils.FormatDate, req.SignDate, time.Local)
-	if e != nil {
-		resp.FailMsg("合同签订日期格式有误", "合同签订日期格式有误, Err: "+e.Error(), c)
-		return
+	signDate, _ := time.ParseInLocation(utils.FormatDate, "0000-00-00", time.Local)
+	if req.SignDate != "" {
+		signDateTime, e := time.ParseInLocation(utils.FormatDate, req.SignDate, time.Local)
+		if e != nil {
+			resp.FailMsg("合同签订日期格式有误", "合同签订日期格式有误, Err: "+e.Error(), c)
+			return
+		}
+		signDate = signDateTime
 	}
 
 	ob := new(fms.ContractRegister)
@@ -1322,7 +1330,6 @@ func (rg *RegisterController) InvoiceExport(c *gin.Context) {
 	http.ServeContent(c.Writer, c.Request, fileName, time.Now(), content)
 }
 
-
 // Import
 // @Title 合同登记-导入
 // @Description 合同登记-导入
@@ -1361,13 +1368,49 @@ func (rg *RegisterController) Import(c *gin.Context) {
 	//	return
 	//}
 	//
-	//// TODO：获取所有已登记，根据合同编号去重
+	//// 获取所有已登记，根据合同编号去重
+	//contractCodeArr := make([]string, 0)
+	//registerOB := new(fms.ContractRegister)
+	//registerCond := ``
+	//registerPars := make([]interface{}, 0)
+	//registerList, e := registerOB.List(registerCond, registerPars)
+	//if e != nil {
+	//	resp.FailData("获取合同登记列表失败", "Err:"+e.Error(), c)
+	//	return
+	//}
+	//for i := range registerList {
+	//	contractCodeArr = append(contractCodeArr, registerList[i].ContractCode)
+	//}
 	//
-	//// TODO:获取所有销售名称
+	//// 获取所有销售名称Map
+	//sellerNameIdMap := make(map[string]int)
+	//sellerCond := ``
+	//sellerPars := make([]interface{}, 0)
+	//sellerList, e := crm.GetCompanySellerByRoleCodes(sellerCond, sellerPars)
+	//if e != nil {
+	//	resp.FailData("获取销售列表失败", "Err:"+e.Error(), c)
+	//	return
+	//}
+	//for i := range sellerList {
+	//	sellerNameIdMap[sellerList[i].RealName] = sellerList[i].AdminId
+	//}
 	//
-	//// TODO:获取所有套餐
+	//// 获取品种权限Map
+	//chartPermissionNameIdMap := make(map[string]int)
+	//cpCond := `product_id = ?`
+	//cpPars := make([]interface{}, 0)
+	//cpPars = append(cpPars, crm.CompanyProductFicc)
+	//cp := new(crm.ChartPermission)
+	//permissionList, e := cp.List(cpCond, cpPars)
+	//if e != nil {
+	//	resp.FailData("获取权限列表失败", "Err:"+e.Error(), c)
+	//	return
+	//}
+	//for i := range permissionList {
+	//	chartPermissionNameIdMap[permissionList[i].PermissionName] = permissionList[i].ChartPermissionId
+	//}
 	//
-	//// TODO:获取chartPermissionMap
+	//// TODO:获取所有套餐
 	//
 	//titleMap := make(map[int]string)
 	//for _, sheet := range xlFile.Sheets {
@@ -1428,13 +1471,14 @@ func (rg *RegisterController) Import(c *gin.Context) {
 	//				}
 	//			}
 	//
+	//			// TODO:新增登记
+	//
+	//			// TODO:新增套餐
+	//
+	//			// TODO:新增开票/到款信息
 	//		}
 	//	}
 	//}
 
-	// TODO:新增登记
-
-	// TODO:新增套餐
-
-	// TODO:新增开票/到款信息
-}
+	resp.Ok("操作成功", c)
+}