feature:项目代码打开注释

opms_parent/app/service/proj/business.go

@@ -183,12 +183,12 @@ func (p *businessService) Create(req *model.AddProjBusinessReq) (err error) {
 	businessData.NboType = StatusC
 	businessData.ApproStatus = ApprovalNotSubmit
 	businessData.EstTransPrice = totalPrice
-	//businessData.CustProvinceId = customer.CustProvinceId
-	//businessData.CustProvince = customer.CustProvince
-	//businessData.CustCityId = customer.CustCityId
-	//businessData.CustCity = customer.CustCity
-	//businessData.CustRegionId = customer.CustRegionId
-	//businessData.CustRegion = customer.CustRegion
+	businessData.CustProvinceId = customer.CustProvinceId
+	businessData.CustProvince = customer.CustProvince
+	businessData.CustCityId = customer.CustCityId
+	businessData.CustCity = customer.CustCity
+	businessData.CustRegionId = customer.CustRegionId
+	businessData.CustRegion = customer.CustRegion
 	businessData.DeptId = p.GetCxtUserDeptId()
 	service.SetCreatedInfo(businessData, p.GetCxtUserId(), p.GetCxtUserName())
 	// 事务
@@ -378,14 +378,14 @@ func (p *businessService) BusinessTransfer(req *model.BusinessTransferReq) error
 					Value: utils.String(business.CustName),
 				},
 				{
-					Id:   utils.String("TextField_QDU06LXYKK00"),
-					Name: utils.String("所在省"),
-					//Value: utils.String(business.CustProvince),
+					Id:    utils.String("TextField_QDU06LXYKK00"),
+					Name:  utils.String("所在省"),
+					Value: utils.String(business.CustProvince),
 				},
 				{
-					Id:   utils.String("TextField_MVSOO6EG6YO0"),
-					Name: utils.String("所在市"),
-					//Value: utils.String(business.CustCity),
+					Id:    utils.String("TextField_MVSOO6EG6YO0"),
+					Name:  utils.String("所在市"),
+					Value: utils.String(business.CustCity),
 				},
 				{
 					Id:    utils.String("TextField_1E1WOYGKRTDS0"),
@@ -448,7 +448,7 @@ func (p *businessService) BusinessTransferNotify(flow *workflowModel.PlatWorkflo
 	}
 
 	// 项目修改
-	_, err = p.Dao.WherePri(business.Id).Data(data).Update()
+	_, err = p.Dao.WherePri(business.Id).FieldsEx(service.UpdateFieldEx...).Data(data).Update()
 	if err != nil {
 		return err
 	}
@@ -624,19 +624,20 @@ func (p *businessService) BusinessUpgradeNotify(flow *workflowModel.PlatWorkflow
 	}
 	if msg.ProcessType == "finish" && msg.Result == "agree" {
 		// 从项目动态内获取变更信息
-		transferDynamics := new(model.ProjBusinessDynamics)
+		dynamics := new(model.ProjBusinessDynamics)
 		dynamicsDao := projDao.NewProjBusinessDynamicsDao(p.Tenant).Where(projDao.ProjBusinessDynamics.C.BusId, business.Id)
-		err = dynamicsDao.Where(projDao.ProjBusinessDynamics.C.OpnType, OpnUpgrade).OrderDesc("created_time").Scan(transferDynamics)
+		err = dynamicsDao.Where(projDao.ProjBusinessDynamics.C.OpnType, OpnUpgrade).OrderDesc("created_time").Scan(dynamics)
 		if err != nil {
 			return err
 		}
 		updateData := new(model.BusinessUpgradeReq)
-		data = gconv.Map(gconv.Struct(transferDynamics.OpnContent, updateData))
+		gconv.Struct(dynamics.OpnContent, updateData)
+		data = gconv.Map(updateData)
 		data[p.Dao.C.ApproStatus] = ApprovalOK
 	}
 
 	// 项目修改
-	_, err = p.Dao.WherePri(business.Id).Data(data).Update()
+	_, err = p.Dao.WherePri(business.Id).FieldsEx(service.UpdateFieldEx...).Data(data).Update()
 	if err != nil {
 		return err
 	}
@@ -721,14 +722,14 @@ func (p *businessService) BusinessDowngrade(req *model.BusinessDowngradeReq) err
 					Value: utils.String(business.CustName),
 				},
 				{
-					Id:   utils.String("TextField_GL7MQUB723K0"),
-					Name: utils.String("所在省"),
-					//Value: utils.String(business.CustProvince),
+					Id:    utils.String("TextField_GL7MQUB723K0"),
+					Name:  utils.String("所在省"),
+					Value: utils.String(business.CustProvince),
 				},
 				{
-					Id:   utils.String("TextField_CFA88QQQUUO0"),
-					Name: utils.String("所在市"),
-					//Value: utils.String(business.CustCity),
+					Id:    utils.String("TextField_CFA88QQQUUO0"),
+					Name:  utils.String("所在市"),
+					Value: utils.String(business.CustCity),
 				},
 				{
 					Id:    utils.String("DDSelectField_VSA3U380ZK00"),
@@ -777,19 +778,20 @@ func (p *businessService) BusinessDowngradeNotify(flow *workflowModel.PlatWorkfl
 	}
 	if msg.ProcessType == "finish" && msg.Result == "agree" {
 		// 从项目动态内获取变更信息
-		transferDynamics := new(model.ProjBusinessDynamics)
+		dynamics := new(model.ProjBusinessDynamics)
 		dynamicsDao := projDao.NewProjBusinessDynamicsDao(p.Tenant).Where(projDao.ProjBusinessDynamics.C.BusId, business.Id)
-		err = dynamicsDao.Where(projDao.ProjBusinessDynamics.C.OpnType, OpnDowngrade).OrderDesc("created_time").Scan(transferDynamics)
+		err = dynamicsDao.Where(projDao.ProjBusinessDynamics.C.OpnType, OpnDowngrade).OrderDesc("created_time").Scan(dynamics)
 		if err != nil {
 			return err
 		}
 		updateData := new(model.BusinessDowngradeReq)
-		data = gconv.Map(gconv.Struct(transferDynamics.OpnContent, updateData))
+		gconv.Struct(dynamics.OpnContent, updateData)
+		data = gconv.Map(updateData)
 		data[p.Dao.C.ApproStatus] = ApprovalOK
 	}
 
 	// 项目修改
-	_, err = p.Dao.WherePri(business.Id).Data(data).Update()
+	_, err = p.Dao.WherePri(business.Id).FieldsEx(service.UpdateFieldEx...).Data(data).Update()
 	if err != nil {
 		return err
 	}
@@ -1000,7 +1002,7 @@ func (p *businessService) ConvertToReserveNotify(flow *workflowModel.PlatWorkflo
 	}
 
 	// 项目修改
-	_, err = p.Dao.WherePri(business.Id).Data(data).Update()
+	_, err = p.Dao.WherePri(business.Id).FieldsEx(service.UpdateFieldEx...).Data(data).Update()
 	if err != nil {
 		return err
 	}