Commit 43e968b91c964cf85b3df21ddc92eb8282ede7f2
1 parent
3d6fbeb5
Exists in
dev
update
Showing
2 changed files
with
5 additions
and
9 deletions
Show diff stats
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java
... | ... | @@ -415,10 +415,6 @@ public class McVisitController extends BaseController { |
415 | 415 | }else if (datum.getChargeType().equals("4")){ |
416 | 416 | chargeType="分期"; |
417 | 417 | } |
418 | - | |
419 | - | |
420 | - | |
421 | - | |
422 | 418 | ChargedListDto chargedListDto = new ChargedListDto( |
423 | 419 | datum.getEntryTime(), |
424 | 420 | datum.getBillingPersonName(), | ... | ... |
zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml
... | ... | @@ -679,12 +679,12 @@ |
679 | 679 | t.ticket_type = #{item} |
680 | 680 | </foreach> |
681 | 681 | </if> |
682 | - <if test="startEntryTime != null "> and t.entry_time >= #{startEntryTime} </if> | |
683 | - <if test="finishEntryTime != null "> and t.entry_time <= #{finishEntryTime} </if> | |
682 | + <if test="startEntryTime != null and startEntryTime != '' "> and t.entry_time >= #{startEntryTime} </if> | |
683 | + <if test="finishEntryTime != null and finishEntryTime != '' "> and t.entry_time <= #{finishEntryTime} </if> | |
684 | 684 | <if test="ignCnfStatusCode != null and ignCnfStatusCode != ''"> and i.ign_cnf_status_code = #{ignCnfStatusCode}</if> |
685 | 685 | <if test="idList != null and idList.size() > 0"> |
686 | - t.id in | |
687 | - <foreach collection="idList" item="item" index="index" separator="," open=" and (" close=")"> | |
686 | + and t.id in | |
687 | + <foreach collection="idList" item="item" index="index" separator="," open=" (" close=")"> | |
688 | 688 | #{item} |
689 | 689 | </foreach> |
690 | 690 | </if> |
... | ... | @@ -714,6 +714,6 @@ |
714 | 714 | </if> |
715 | 715 | <!-- 数据范围过滤 --> |
716 | 716 | ${params.dataScope} |
717 | - order by t.update_time desc | |
717 | + order by update_time desc | |
718 | 718 | </select> |
719 | 719 | </mapper> | ... | ... |