111

controllers/admin_api_controllers/custom_api_controller.go

@@ -161,7 +161,7 @@ func (this *CustomAPIController) DeleteCustom() {
 func (this *CustomAPIController) ModifyCustom() {
 	id, _ := this.GetInt64("id")
 	module, _ := this.GetInt64("module")
-	custom, _ := service.FindCustomInfoByID(id)
+	custom, _ := service.FindCustomInfoByIDTwo(id)
 	switch module {
 	case 1: //编辑基本信息
 		name := this.GetString("name")
@@ -175,7 +175,6 @@ func (this *CustomAPIController) ModifyCustom() {
 		address := this.GetString("address")
 		client_remark := this.GetString("client_remark")
 		topline_time := this.GetString("topline_time")
-
 		custom.CustomType = customType
 		custom.Salesperson = salesperson
 		custom.SignTime = signTime
@@ -189,7 +188,7 @@ func (this *CustomAPIController) ModifyCustom() {
 		custom.Mtime = time.Now().Unix()
 		custom.ClientRemark = client_remark
 		custom.ToplineTime = topline_time
-		err := service.UpdateCustom(custom)
+		err := service.UpdateCustomTwo(custom)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return
@@ -210,7 +209,7 @@ func (this *CustomAPIController) ModifyCustom() {
 		custom.ImplementRemark = implementRemark
 		custom.ID = id
 		custom.Mtime = time.Now().Unix()
-		err := service.UpdateCustom(custom)
+		err := service.UpdateCustomTwo(custom)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return
@@ -230,7 +229,7 @@ func (this *CustomAPIController) ModifyCustom() {
 		custom.LisContact = lisContact
 		custom.ID = id
 		custom.Mtime = time.Now().Unix()
-		err := service.UpdateCustom(custom)
+		err := service.UpdateCustomTwo(custom)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return
@@ -250,7 +249,7 @@ func (this *CustomAPIController) ModifyCustom() {
 		custom.YbRemark = ybRemark
 		custom.ID = id
 		custom.Mtime = time.Now().Unix()
-		err := service.UpdateCustom(custom)
+		err := service.UpdateCustomTwo(custom)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return
@@ -271,7 +270,7 @@ func (this *CustomAPIController) ModifyCustom() {
 		custom.QcRemark = qcRemark
 		custom.ID = id
 		custom.Mtime = time.Now().Unix()
-		err := service.UpdateCustom(custom)
+		err := service.UpdateCustomTwo(custom)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return
@@ -286,7 +285,7 @@ func (this *CustomAPIController) ModifyCustom() {
 		custom.Remark = remark
 		custom.ID = id
 		custom.Mtime = time.Now().Unix()
-		err := service.UpdateCustom(custom)
+		err := service.UpdateCustomTwo(custom)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return
@@ -337,7 +336,7 @@ func (this *CustomAPIController) ModifyCustom() {
 
 		custom.ID = id
 		custom.Mtime = time.Now().Unix()
-		err := service.UpdateCustom(custom)
+		err := service.UpdateCustomTwo(custom)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return
@@ -618,6 +617,8 @@ func (this *CustomAPIController) CreateContractInfo() {
 	code := this.GetString("code")
 	name := this.GetString("name")
 	sumamt := this.GetString("sumamt")
+	custom_name := this.GetString("custom_name")
+
 	start_time := this.GetString("start_time")
 	end_time := this.GetString("end_time")
 	signing_person := this.GetString("signing_person")
@@ -638,6 +639,7 @@ func (this *CustomAPIController) CreateContractInfo() {
 		SigningPerson: signing_person,
 		WordFileUrl:   wordFileURL,
 		PdfFileUrl:    pdfFileURL,
+		CustomName:    custom_name,
 		Remark:        remark,
 		Ctime:         ctime,
 		Mtime:         mtime,
@@ -897,6 +899,9 @@ func (this *CustomAPIController) EditDemandInfo() {
 	demandStatus, _ := this.GetInt64("demand_status")
 	demandCreator := this.GetString("demand_creator")
 	demandCreateDate := this.GetString("demand_create_date")
+	demandFinishDate := this.GetString("demand_finish_date")
+	demandDetail := this.GetString("demand_detail")
+
 	demandDirector := this.GetString("demand_director")
 	cd, _ := service.FindChargeDemandInfo(id)
 	cd.DemandType = demandType
@@ -904,7 +909,9 @@ func (this *CustomAPIController) EditDemandInfo() {
 	cd.DemandStatus = demandStatus
 	cd.DemandCreator = demandCreator
 	cd.DemandCreateDate = demandCreateDate
+	cd.DemandFinishDate = demandFinishDate
 	cd.DemandDirector = demandDirector
+	cd.DemandDetail = demandDetail
 	cd.Mtime = time.Now().Unix()
 	err := service.SaveChargeDemand(&cd)
 	if err != nil {

models/custom.go

@@ -124,6 +124,67 @@ func (KyyChargeCustom) TableName() string {
 	return "kyy_charge_custom"
 }
 
+type KyyChargeCustomThree struct {
+	ID                            int64  `gorm:"column:id" json:"id" form:"id"`
+	Name                          string `gorm:"column:name" json:"name" form:"name"`
+	XtOrgId                       int64  `gorm:"column:xt_org_id" json:"xt_org_id" form:"xt_org_id"`
+	Status                        int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime                         int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                         int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Creator                       int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier                      int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	CustomType                    int64  `gorm:"column:custom_type" json:"custom_type" form:"custom_type"`
+	Salesperson                   string `gorm:"column:salesperson" json:"salesperson" form:"salesperson"`
+	SignTime                      string `gorm:"column:sign_time" json:"sign_time" form:"sign_time"`
+	ContractPrice                 string `gorm:"column:contract_price" json:"contract_price" form:"contract_price"`
+	SoftwarePrice                 string `gorm:"column:software_price" json:"software_price" form:"software_price"`
+	HardwarePrice                 string `gorm:"column:hardware_price" json:"hardware_price" form:"hardware_price"`
+	YearCostPrice                 string `gorm:"column:year_cost_price" json:"year_cost_price" form:"year_cost_price"`
+	Address                       string `gorm:"column:address" json:"address" form:"address"`
+	IsImplement                   int64  `gorm:"column:is_implement" json:"is_implement" form:"is_implement"`
+	LisStatus                     int64  `gorm:"column:lis_status" json:"lis_status" form:"lis_status"`
+	LisContact                    string `gorm:"column:lis_contact" json:"lis_contact" form:"lis_contact"`
+	LisTime                       string `gorm:"column:lis_time" json:"lis_time" form:"lis_time"`
+	LisRemark                     string `gorm:"column:lis_remark" json:"lis_remark" form:"lis_remark"`
+	QcStatus                      int64  `gorm:"column:qc_status" json:"qc_status" form:"qc_status"`
+	YbStatus                      int64  `gorm:"column:yb_status" json:"yb_status" form:"yb_status"`
+	Remark                        string `gorm:"column:remark" json:"remark" form:"remark"`
+	WeightScaleStatus             int64  `gorm:"column:weight_scale_status" json:"weight_scale_status" form:"weight_scale_status"`
+	WeightScaleBrand              string `gorm:"column:weight_scale_brand" json:"weight_scale_brand" form:"weight_scale_brand"`
+	WeightScaleRemark             string `gorm:"column:weight_scale_remark" json:"weight_scale_remark" form:"weight_scale_remark"`
+	SphygmomanometerStatus        int64  `gorm:"column:sphygmomanometer_status" json:"sphygmomanometer_status" form:"sphygmomanometer_status"`
+	SphygmomanometerBrand         string `gorm:"column:sphygmomanometer_brand" json:"sphygmomanometer_brand" form:"sphygmomanometer_brand"`
+	SphygmomanometerRemark        string `gorm:"column:sphygmomanometer_remark" json:"sphygmomanometer_remark" form:"sphygmomanometer_remark"`
+	ScannerStatus                 int64  `gorm:"column:scanner_status" json:"scanner_status" form:"scanner_status"`
+	ScannerBrand                  string `gorm:"column:scanner_brand" json:"scanner_brand" form:"scanner_brand"`
+	ScannerRemark                 string `gorm:"column:scanner_remark" json:"scanner_remark" form:"scanner_remark"`
+	FacialRecognitionDeviceStatus int64  `gorm:"column:facial_recognition_device_status" json:"facial_recognition_device_status" form:"facial_recognition_device_status"`
+	FacialRecognitionDeviceBrand  string `gorm:"column:facial_recognition_device_brand" json:"facial_recognition_device_brand" form:"facial_recognition_device_brand"`
+	FacialRecognitionDeviceRemark string `gorm:"column:facial_recognition_device_remark" json:"facial_recognition_device_remark" form:"facial_recognition_device_remark"`
+	PrinterStatus                 int64  `gorm:"column:printer_status" json:"printer_status" form:"printer_status"`
+	PrinterBrand                  string `gorm:"column:printer_brand" json:"printer_brand" form:"printer_brand"`
+	PrinterRemark                 string `gorm:"column:printer_remark" json:"printer_remark" form:"printer_remark"`
+	HardwareRemark                string `gorm:"column:hardware_remark" json:"hardware_remark" form:"hardware_remark"`
+	ImplementTime                 string `gorm:"column:implement_time" json:"implement_time" form:"implement_time"`
+	ImplementPerson               string `gorm:"column:implement_person" json:"implement_person" form:"implement_person"`
+	ImplementRemark               string `gorm:"column:implement_remark" json:"implement_remark" form:"implement_remark"`
+	YbTime                        string `gorm:"column:yb_time" json:"yb_time" form:"yb_time"`
+	YbPerson                      string `gorm:"column:yb_person" json:"yb_person" form:"yb_person"`
+	YbRemark                      string `gorm:"column:yb_remark" json:"yb_remark" form:"yb_remark"`
+	QcTime                        string `gorm:"column:qc_time" json:"qc_time" form:"qc_time"`
+	QcPerson                      string `gorm:"column:qc_person" json:"qc_person" form:"qc_person"`
+	QcRemark                      string `gorm:"column:qc_remark" json:"qc_remark" form:"qc_remark"`
+	ClientRemark                  string `gorm:"column:client_remark" json:"client_remark" form:"client_remark"`
+	ToplineTime                   string `gorm:"column:topline_time" json:"topline_time" form:"topline_time"`
+
+	IsCheck     int64  `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	CheckPerson string `gorm:"column:check_person" json:"check_person" form:"check_person"`
+}
+
+func (KyyChargeCustomThree) TableName() string {
+	return "kyy_charge_custom"
+}
+
 type KyyChargePaymentCollection struct {
 	ID                      int64  `gorm:"column:id" json:"id" form:"id"`
 	XtOrgId                 int64  `gorm:"column:xt_org_id" json:"xt_org_id" form:"xt_org_id"`
@@ -191,6 +252,7 @@ type KyyChargeContract struct {
 	Modifier      int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
 	IsCheck       int64  `gorm:"column:is_check" json:"is_check" form:"is_check"`
 	Status        int64  `gorm:"column:status" json:"status" form:"status"`
+	SigningTime   string `gorm:"column:signing_time" json:"signing_time" form:"signing_time"`
 }
 
 func (KyyChargeContract) TableName() string {

service/custom_service.go

@@ -63,10 +63,19 @@ func FindCustomInfoByID(id int64) (admin models.KyyChargeCustom, err error) {
 	return
 }
 
+func FindCustomInfoByIDTwo(id int64) (admin models.KyyChargeCustomThree, err error) {
+	err = ChargeReadDB().Model(&models.KyyChargeCustomThree{}).
+		Where("id = ? AND status = 1", id).First(&admin).Error
+	return
+}
 func UpdateCustom(custom models.KyyChargeCustom) (err error) {
 	err = ChargeWriteDB().Save(&custom).Error
 	return
 }
+func UpdateCustomTwo(custom models.KyyChargeCustomThree) (err error) {
+	err = ChargeWriteDB().Save(&custom).Error
+	return
+}
 
 func CreateChargePaymentCollection(cpc *models.KyyChargePaymentCollection) (err error) {
 	err = ChargeWriteDB().Save(&cpc).Error