|
|
@@ -272,7 +272,7 @@
|
|
272
|
272
|
and cf.SFBA = #{sfba,jdbcType=DECIMAL}
|
|
273
|
273
|
</if>
|
|
274
|
274
|
<if test='jssj !=null'>
|
|
275
|
|
- and to_char(cf.jssj,'yyyy-MM-dd')=#{cxsj}
|
|
|
275
|
+ and DATE_FORMAT(cf.jssj,'%Y-%m-%d')=#{cxsj}
|
|
276
|
276
|
</if>
|
|
277
|
277
|
<if test='tyshxydm !=null'>
|
|
278
|
278
|
and cf.tyshxydm=#{tyshxydm}
|
|
|
@@ -344,7 +344,7 @@
|
|
344
|
344
|
and cf.SFBA = #{sfba,jdbcType=DECIMAL}
|
|
345
|
345
|
</if>
|
|
346
|
346
|
<if test='jssj !=null'>
|
|
347
|
|
- and to_char(cf.jssj,'yyyy-MM-dd')=#{cxsj}
|
|
|
347
|
+ and DATE_FORMAT(cf.jssj,'%Y-%m-%d')=#{cxsj}
|
|
348
|
348
|
</if>
|
|
349
|
349
|
<if test='tyshxydm !=null'>
|
|
350
|
350
|
and cf.tyshxydm=#{tyshxydm}
|
|
|
@@ -410,7 +410,7 @@
|
|
410
|
410
|
and cf.SFBA = #{sfba,jdbcType=DECIMAL}
|
|
411
|
411
|
</if>
|
|
412
|
412
|
<if test='jssj !=null'>
|
|
413
|
|
- and to_char(cf.jssj,'yyyy-MM-dd')=#{cxsj}
|
|
|
413
|
+ and DATE_FORMAT(cf.jssj,'%Y-%m-%d')=#{cxsj}
|
|
414
|
414
|
</if>
|
|
415
|
415
|
<if test='tyshxydm !=null'>
|
|
416
|
416
|
and cf.tyshxydm=#{tyshxydm}
|
|
|
@@ -510,7 +510,7 @@
|
|
510
|
510
|
|
|
511
|
511
|
<if test='jssj !=null'>
|
|
512
|
512
|
|
|
513
|
|
- and to_char(cf.jssj,'yyyy-MM-dd')=#{cxsj}
|
|
|
513
|
+ and DATE_FORMAT(cf.jssj,'%Y-%m-%d')=#{cxsj}
|
|
514
|
514
|
|
|
515
|
515
|
</if>
|
|
516
|
516
|
|
|
|
@@ -653,8 +653,8 @@
|
|
653
|
653
|
</if>
|
|
654
|
654
|
|
|
655
|
655
|
<if test='jssj != null'>
|
|
656
|
|
- and to_char(cf.jssj
|
|
657
|
|
- , 'yyyy-MM-dd')=#{cxsj}
|
|
|
656
|
+ and DATE_FORMAT(cf.jssj
|
|
|
657
|
+ , '%Y-%m-%d')=#{cxsj}
|
|
658
|
658
|
</if>
|
|
659
|
659
|
|
|
660
|
660
|
<if test='tyshxydm != null'>
|
|
|
@@ -2117,10 +2117,10 @@
|
|
2117
|
2117
|
and cf.sjcr < #{sjcrEnd}
|
|
2118
|
2118
|
</if>
|
|
2119
|
2119
|
<if test="startJssj != null">
|
|
2120
|
|
- and to_char(cf.jssj,'yyyy-MM-dd HH:mm:ss') > #{startJssj}
|
|
|
2120
|
+ and DATE_FORMAT(cf.jssj,'%Y-%m-%d %H:%i:%s') > #{startJssj}
|
|
2121
|
2121
|
</if>
|
|
2122
|
2122
|
<if test="endJssj != null">
|
|
2123
|
|
- and to_char(cf.jssj,'yyyy-MM-dd HH:mm:ss') < #{endJssj}
|
|
|
2123
|
+ and DATE_FORMAT(cf.jssj,'%Y-%m-%d %H:%i:%s') < #{endJssj}
|
|
2124
|
2124
|
</if>
|
|
2125
|
2125
|
|
|
2126
|
2126
|
<if test="ajxh != null and ajxh != ''" >
|
|
|
@@ -2138,7 +2138,7 @@
|
|
2138
|
2138
|
|
|
2139
|
2139
|
<if test='jssj !=null'>
|
|
2140
|
2140
|
|
|
2141
|
|
- and to_char(cf.jssj,'yyyy-MM-dd')=#{cxsj}
|
|
|
2141
|
+ and DATE_FORMAT(cf.jssj,'%Y-%m-%d')=#{cxsj}
|
|
2142
|
2142
|
|
|
2143
|
2143
|
</if>
|
|
2144
|
2144
|
|
|
|
@@ -2349,8 +2349,8 @@
|
|
2349
|
2349
|
cf.sjcr,
|
|
2350
|
2350
|
cf.dczlrj,
|
|
2351
|
2351
|
e2.dict_name as cfyt,
|
|
2352
|
|
- (nvl(t1.cl_cr, 0) + nvl(t2.xz_cr, 0)) clzcr,
|
|
2353
|
|
- nvl(t2.xz_cr, 0) clkcr,
|
|
|
2352
|
+ (IFNULL(t1.cl_cr, 0) + IFNULL(t2.xz_cr, 0)) AS clzcr,
|
|
|
2353
|
+ IFNULL(t2.xz_cr, 0) AS clkcr,
|
|
2354
|
2354
|
status
|
|
2355
|
2355
|
from (
|
|
2356
|
2356
|
select distinct gfcfmc,
|