Merge branch 'master' of 192.168.30.132:MTP2.0/MTP20_IF

models/ermcp.go

@@ -62,12 +62,12 @@ func (r *ErmcpSpotContractModel) buildSql(nQueryType int32) string {
 		"       t.QTY," +
 		"       t.PRICE," +
 		"       t.AMOUNT," +
-		"       to_char(t.DELIVERYSTARTDATE, 'yyyy-mm-dd hh:mi:ss') DELIVERYSTARTDATE," +
-		"       to_char(t.DELIVERYENDDATE,'yyyy-mm-dd hh:mi:ss') DELIVERYENDDATE," +
+		"       to_char(t.DELIVERYSTARTDATE, 'yyyy-mm-dd hh24:mi:ss') DELIVERYSTARTDATE," +
+		"       to_char(t.DELIVERYENDDATE,'yyyy-mm-dd hh24:mi:ss') DELIVERYENDDATE," +
 		"       t.GOODSID," +
 		"       t.PRICEMOVE," +
-		"       to_char(t.STARTDATE, 'yyyy-mm-dd hh:mi:ss') STARTDATE," +
-		"       to_char(t.ENDDATE,'yyyy-mm-dd hh:mi:ss') ENDDATE," +
+		"       to_char(t.STARTDATE, 'yyyy-mm-dd hh24:mi:ss') STARTDATE," +
+		"       to_char(t.ENDDATE,'yyyy-mm-dd hh24:mi:ss') ENDDATE," +
 		"       t.MARGIN," +
 		"       t.remark," +
 		"       t.contractstatus," +
@@ -201,10 +201,10 @@ func (r *ErmcpModel) buildSql(nContractType, nQueryType int32) string {
 		"       t.invoiceamount," +
 		"       (t.pricedamount + t.RECKONADJUSTAMOUNT + t.RECKONOTHERAMOUNT -" +
 		"       t.invoiceamount) as daikaiAmount," +
-		"       to_char(t.startdate, 'yyyy-mm-dd hh:mi:ss') startdate," +
-		"       to_char(t.enddate, 'yyyy-mm-dd hh:mi:ss') enddate," +
-		"       to_char(t.deliverystartdate, 'yyyy-mm-dd hh:mi:ss') deliverystartdate," +
-		"       to_char(t.deliveryenddate, 'yyyy-mm-dd hh:mi:ss') deliveryenddate," +
+		"       to_char(t.startdate, 'yyyy-mm-dd hh24:mi:ss') startdate," +
+		"       to_char(t.enddate, 'yyyy-mm-dd hh24:mi:ss') enddate," +
+		"       to_char(t.deliverystartdate, 'yyyy-mm-dd hh24:mi:ss') deliverystartdate," +
+		"       to_char(t.deliveryenddate, 'yyyy-mm-dd hh24:mi:ss') deliveryenddate," +
 		"       t.convertfactor," +
 		"       t.contractstatus," +
 		"       t.pricetype," +

models/ermcpExposure.go

@@ -136,7 +136,7 @@ func (r *ErmcpExposureDetailModel) buildSql() string {
 		"  union all" +
 		"  select 1, t.hedgeplanid as relateid, t.hedgeplanno as relateNo" +
 		"    from ermcp_hedgeplan t)" +
-		"select to_char(t.createtime, 'yyyy-mm-dd hh:mi:ss') createtime," +
+		"select to_char(t.createtime, 'yyyy-mm-dd hh24:mi:ss') createtime," +
 		"       t.middlegoodsid," +
 		"       t.areauserid," +
 		"       t.logtype," +
@@ -226,7 +226,8 @@ func (r *AreaSpotModel) buildSql() string {
 		"       t.BUYPRICEDQTY," +
 		"       t.SELLPLANQTY," +
 		"       t.SELLPRICEDQTY," +
-		"       t.TOTALSPOTQTY UPDATETIME" +
+		"       t.TOTALSPOTQTY," +
+		"       to_char(t.UPDATETIME,'yyyy-mm-dd hh24:mi:ss') UPDATETIME"+
 		"  from ermcp_areaspot t" +
 		"  left join wrstandard w" +
 		"    on t.wrstandardid = w.wrstandardid" +

models/ermcpOPApply.go

@@ -43,10 +43,10 @@ func (r *ErmcpOPApplyModel) buildSql(opType int32) string {
 		"       to_char(t.RELATEDID) RELATEDID," +
 		"       t.DETAILJSON," +
 		"       to_char(t.APPLYID) APPLYID," +
-		"       to_char(t.APPLYTIME, 'yyyy-mm-dd hh:mi:ss') APPLYTIME," +
+		"       to_char(t.APPLYTIME, 'yyyy-mm-dd hh24:mi:ss') APPLYTIME," +
 		"       t.APPLYSTATUS," +
 		"       to_char(t.auditid) auditid," +
-		"       to_char(t.AUDITTIME, 'yyyy-mm-dd hh:mi:ss') AUDITTIME," +
+		"       to_char(t.AUDITTIME, 'yyyy-mm-dd hh24:mi:ss') AUDITTIME," +
 		"       t.CONTRACTTYPE," +
 		"       s.CONTRACTNO," +
 		"       s.PRICETYPE," +

models/ermcpOPLog.go

@@ -47,7 +47,7 @@ func (r *ErmcpOPLogModel) buildSql() string {
 		"       LOGVALUE," +
 		"       BEFOREVALUE," +
 		"       AFTERVALUE," +
-		"       to_char(UPDATETIME,'yyyy-mm-dd hh:mi:ss') UPDATETIME," +
+		"       to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') UPDATETIME," +
 		"       APPLYID," +
 		"       CONTRACTTYPE" +
 		"  from ermcp_contractoperatelog t" +