Selaa lähdekoodia

Merge branch 'master' of http://git.shengws.com/csx/gdyb

csx 1 vuosi sitten
vanhempi
commit
4696484564
2 muutettua tiedostoa jossa 12 lisäystä ja 11 poistoa
  1. 10 9
      controllers/sg/his_api_controller.go
  2. 2 2
      main.go

+ 10 - 9
controllers/sg/his_api_controller.go Näytä tiedosto

@@ -13149,15 +13149,16 @@ func (c *HisApiController) Post3202() {
13149 13149
 		bp.StmtEnddate = end_time
13150 13150
 		bps = append(bps, bp)
13151 13151
 
13152
-		bp.MedfeeSumamt = medfee_sumamt_two
13153
-		bp.AcctPay = acct_pay_two
13154
-		bp.FundPaySumamt = fund_pay_sumamt_two
13155
-		bp.Insutype = "310"
13156
-		bp.StmtBegndate = start_time
13157
-		bp.StmtEnddate = end_time
13158
-		bp.ClrType = clr_type
13159
-		bp.SetlOptins = clr_org
13160
-		bps = append(bps, bp)
13152
+		var bp2 models.BusinessParams
13153
+		bp2.MedfeeSumamt = medfee_sumamt_two
13154
+		bp2.AcctPay = acct_pay_two
13155
+		bp2.FundPaySumamt = fund_pay_sumamt_two
13156
+		bp2.Insutype = "310"
13157
+		bp2.StmtBegndate = start_time
13158
+		bp2.StmtEnddate = end_time
13159
+		bp2.ClrType = clr_type
13160
+		bp2.SetlOptins = clr_org
13161
+		bps = append(bps, bp2)
13161 13162
 
13162 13163
 		data := make(map[string]interface{})
13163 13164
 		data["bps"] = bps

+ 2 - 2
main.go Näytä tiedosto

@@ -4,7 +4,7 @@ import (
4 4
 	//"github.com/qiniu/api.v7/auth/qbox"
5 5
 	//"github.com/qiniu/api.v7/storage"
6 6
 
7
-	//"gdyb/service"
7
+	"gdyb/service"
8 8
 
9 9
 	//"gdyb/models"
10 10
 	_ "gdyb/routers"
@@ -21,7 +21,7 @@ import (
21 21
 )
22 22
 
23 23
 func init() {
24
-	//service.ConnectDB()
24
+	service.ConnectDB()
25 25
 	//org_id, _ := beego.AppConfig.Int64("org_id")
26 26
 	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
27 27
 	////CreateLog(miConfig)