Commit e8d7a42970fbebdbfe50ecc1a69934edc3fdd399
1 parent
43e968b9
Exists in
dev
update
Showing
6 changed files
with
62 additions
and
1 deletions
Show diff stats
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java
| @@ -304,6 +304,11 @@ public class McVisitController extends BaseController { | @@ -304,6 +304,11 @@ public class McVisitController extends BaseController { | ||
| 304 | @GetMapping("/chargedList") | 304 | @GetMapping("/chargedList") |
| 305 | public TableDataInfo chargedList(McVisitVo mcVisitVo) { | 305 | public TableDataInfo chargedList(McVisitVo mcVisitVo) { |
| 306 | startPage(); | 306 | startPage(); |
| 307 | + List<String> ignitionStatusCodeList = new ArrayList<String>(); | ||
| 308 | + ignitionStatusCodeList.add("MAINTENANCE_YES"); | ||
| 309 | + ignitionStatusCodeList.add("MAINTENANCE_NO"); | ||
| 310 | + mcVisitVo.setIgnitionStatusCodeList(ignitionStatusCodeList); | ||
| 311 | + | ||
| 307 | List<String> ticketTypeList = new ArrayList<String>(); | 312 | List<String> ticketTypeList = new ArrayList<String>(); |
| 308 | ticketTypeList.add("2"); | 313 | ticketTypeList.add("2"); |
| 309 | ticketTypeList.add("3"); | 314 | ticketTypeList.add("3"); |
| @@ -326,6 +331,7 @@ public class McVisitController extends BaseController { | @@ -326,6 +331,7 @@ public class McVisitController extends BaseController { | ||
| 326 | List<String> ticketTypeList = new ArrayList<String>(); | 331 | List<String> ticketTypeList = new ArrayList<String>(); |
| 327 | ticketTypeList.add("1"); | 332 | ticketTypeList.add("1"); |
| 328 | ticketTypeList.add("3"); | 333 | ticketTypeList.add("3"); |
| 334 | + | ||
| 329 | mcVisitVo.setTicketTypeList(ticketTypeList); | 335 | mcVisitVo.setTicketTypeList(ticketTypeList); |
| 330 | mcVisitVo.setDefFlag("0"); | 336 | mcVisitVo.setDefFlag("0"); |
| 331 | // mcVisitVo.setStatusCode("APPROVED"); | 337 | // mcVisitVo.setStatusCode("APPROVED"); |
| @@ -396,6 +402,12 @@ public class McVisitController extends BaseController { | @@ -396,6 +402,12 @@ public class McVisitController extends BaseController { | ||
| 396 | @RequirePermission("schsf:mcVisit:chargedListExport") | 402 | @RequirePermission("schsf:mcVisit:chargedListExport") |
| 397 | @PostMapping("/chargedListExport") | 403 | @PostMapping("/chargedListExport") |
| 398 | public void chargedListExport(@RequestBody McVisitVo mcVisitVo, HttpServletResponse response) throws IOException { | 404 | public void chargedListExport(@RequestBody McVisitVo mcVisitVo, HttpServletResponse response) throws IOException { |
| 405 | + | ||
| 406 | + List<String> ignitionStatusCodeList = new ArrayList<String>(); | ||
| 407 | + ignitionStatusCodeList.add("MAINTENANCE_YES"); | ||
| 408 | + ignitionStatusCodeList.add("MAINTENANCE_NO"); | ||
| 409 | + mcVisitVo.setIgnitionStatusCodeList(ignitionStatusCodeList); | ||
| 410 | + | ||
| 399 | List<String> ticketTypeList = new ArrayList<String>(); | 411 | List<String> ticketTypeList = new ArrayList<String>(); |
| 400 | ticketTypeList.add("2"); | 412 | ticketTypeList.add("2"); |
| 401 | ticketTypeList.add("3"); | 413 | ticketTypeList.add("3"); |
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McBasicMoneyVo.java
| @@ -2,6 +2,9 @@ package com.chinagas.modules.schsf.domain.vo; | @@ -2,6 +2,9 @@ package com.chinagas.modules.schsf.domain.vo; | ||
| 2 | 2 | ||
| 3 | import com.chinagas.modules.schsf.domain.McBasicMoney; | 3 | import com.chinagas.modules.schsf.domain.McBasicMoney; |
| 4 | 4 | ||
| 5 | +import java.util.ArrayList; | ||
| 6 | +import java.util.List; | ||
| 7 | + | ||
| 5 | public class McBasicMoneyVo extends McBasicMoney { | 8 | public class McBasicMoneyVo extends McBasicMoney { |
| 6 | /** 开始财年 */ | 9 | /** 开始财年 */ |
| 7 | private Long startFiscalYear; | 10 | private Long startFiscalYear; |
| @@ -9,6 +12,11 @@ public class McBasicMoneyVo extends McBasicMoney { | @@ -9,6 +12,11 @@ public class McBasicMoneyVo extends McBasicMoney { | ||
| 9 | /** 结束财年 */ | 12 | /** 结束财年 */ |
| 10 | private Long finishFiscalYear; | 13 | private Long finishFiscalYear; |
| 11 | 14 | ||
| 15 | + /** | ||
| 16 | + * ids | ||
| 17 | + */ | ||
| 18 | + private List<String> idList = new ArrayList<String>(); | ||
| 19 | + | ||
| 12 | public Long getStartFiscalYear() { | 20 | public Long getStartFiscalYear() { |
| 13 | return startFiscalYear; | 21 | return startFiscalYear; |
| 14 | } | 22 | } |
| @@ -24,4 +32,13 @@ public class McBasicMoneyVo extends McBasicMoney { | @@ -24,4 +32,13 @@ public class McBasicMoneyVo extends McBasicMoney { | ||
| 24 | public void setFinishFiscalYear(Long finishFiscalYear) { | 32 | public void setFinishFiscalYear(Long finishFiscalYear) { |
| 25 | this.finishFiscalYear = finishFiscalYear; | 33 | this.finishFiscalYear = finishFiscalYear; |
| 26 | } | 34 | } |
| 35 | + | ||
| 36 | + public List<String> getIdList() { | ||
| 37 | + return idList; | ||
| 38 | + } | ||
| 39 | + | ||
| 40 | + public void setIdList(List<String> idList) { | ||
| 41 | + this.idList = idList; | ||
| 42 | + } | ||
| 27 | } | 43 | } |
| 44 | + |
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McVisitVo.java
| @@ -77,6 +77,11 @@ public class McVisitVo extends McVisit { | @@ -77,6 +77,11 @@ public class McVisitVo extends McVisit { | ||
| 77 | private String finishIgnTime; | 77 | private String finishIgnTime; |
| 78 | 78 | ||
| 79 | 79 | ||
| 80 | + private List<String> ignitionStatusCodeList = new ArrayList<String>(); | ||
| 81 | + | ||
| 82 | + | ||
| 83 | + | ||
| 84 | + | ||
| 80 | public Long getStartFiscalYear() { | 85 | public Long getStartFiscalYear() { |
| 81 | return startFiscalYear; | 86 | return startFiscalYear; |
| 82 | } | 87 | } |
| @@ -181,6 +186,14 @@ public class McVisitVo extends McVisit { | @@ -181,6 +186,14 @@ public class McVisitVo extends McVisit { | ||
| 181 | this.finishIgnTime = finishIgnTime; | 186 | this.finishIgnTime = finishIgnTime; |
| 182 | } | 187 | } |
| 183 | 188 | ||
| 189 | + public List<String> getIgnitionStatusCodeList() { | ||
| 190 | + return ignitionStatusCodeList; | ||
| 191 | + } | ||
| 192 | + | ||
| 193 | + public void setIgnitionStatusCodeList(List<String> ignitionStatusCodeList) { | ||
| 194 | + this.ignitionStatusCodeList = ignitionStatusCodeList; | ||
| 195 | + } | ||
| 196 | + | ||
| 184 | @Override | 197 | @Override |
| 185 | public String toString() { | 198 | public String toString() { |
| 186 | return "McVisitVo{" + | 199 | return "McVisitVo{" + |
| @@ -197,6 +210,7 @@ public class McVisitVo extends McVisit { | @@ -197,6 +210,7 @@ public class McVisitVo extends McVisit { | ||
| 197 | ", idList=" + idList + | 210 | ", idList=" + idList + |
| 198 | ", startIgnTime='" + startIgnTime + '\'' + | 211 | ", startIgnTime='" + startIgnTime + '\'' + |
| 199 | ", finishIgnTime='" + finishIgnTime + '\'' + | 212 | ", finishIgnTime='" + finishIgnTime + '\'' + |
| 213 | + ", ignitionStatusCodeList=" + ignitionStatusCodeList + | ||
| 200 | '}'; | 214 | '}'; |
| 201 | } | 215 | } |
| 202 | } | 216 | } |
zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicCmtyMapper.xml
| @@ -503,6 +503,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | @@ -503,6 +503,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||
| 503 | <if test="defFlag != null and defFlag != ''"> and m.def_flag = #{defFlag}</if> | 503 | <if test="defFlag != null and defFlag != ''"> and m.def_flag = #{defFlag}</if> |
| 504 | <if test="startFiscalYear != null and startFiscalYear != ''"> and m.fiscal_year >= #{startFiscalYear}</if> | 504 | <if test="startFiscalYear != null and startFiscalYear != ''"> and m.fiscal_year >= #{startFiscalYear}</if> |
| 505 | <if test="finishFiscalYear != null and finishFiscalYear != ''"> and m.fiscal_year <= #{finishFiscalYear}</if> | 505 | <if test="finishFiscalYear != null and finishFiscalYear != ''"> and m.fiscal_year <= #{finishFiscalYear}</if> |
| 506 | + <if test="idList != null and idList.size() > 0"> | ||
| 507 | + and m.id in | ||
| 508 | + <foreach collection="idList" item="item" index="index" separator="," open=" (" close=")"> | ||
| 509 | + #{item} | ||
| 510 | + </foreach> | ||
| 511 | + </if> | ||
| 506 | ${params.dataScope} | 512 | ${params.dataScope} |
| 507 | ) d | 513 | ) d |
| 508 | ORDER BY d.update_time desc | 514 | ORDER BY d.update_time desc |
zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicMoneyMapper.xml
| @@ -387,6 +387,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | @@ -387,6 +387,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||
| 387 | <if test="defFlag != null and defFlag != ''"> and t.def_flag = #{defFlag}</if> | 387 | <if test="defFlag != null and defFlag != ''"> and t.def_flag = #{defFlag}</if> |
| 388 | <if test="startFiscalYear != null and startFiscalYear != ''"> and t.fiscal_year >= #{startFiscalYear}</if> | 388 | <if test="startFiscalYear != null and startFiscalYear != ''"> and t.fiscal_year >= #{startFiscalYear}</if> |
| 389 | <if test="finishFiscalYear != null and finishFiscalYear != ''"> and t.fiscal_year <= #{finishFiscalYear}</if> | 389 | <if test="finishFiscalYear != null and finishFiscalYear != ''"> and t.fiscal_year <= #{finishFiscalYear}</if> |
| 390 | + <if test="idList != null and idList.size() > 0"> | ||
| 391 | + and t.id in | ||
| 392 | + <foreach collection="idList" item="item" index="index" separator="," open=" (" close=")"> | ||
| 393 | + #{item} | ||
| 394 | + </foreach> | ||
| 395 | + </if> | ||
| 390 | <!-- 数据范围过滤 --> | 396 | <!-- 数据范围过滤 --> |
| 391 | ${params.dataScope} | 397 | ${params.dataScope} |
| 392 | ) d | 398 | ) d |
zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml
| @@ -599,7 +599,7 @@ | @@ -599,7 +599,7 @@ | ||
| 599 | left join mc_ignition i on t.id= i.visit_id | 599 | left join mc_ignition i on t.id= i.visit_id |
| 600 | left join sys_user u on u.user_id = t.create_by | 600 | left join sys_user u on u.user_id = t.create_by |
| 601 | left join sys_dept d on d.dept_id = t.company_code | 601 | left join sys_dept d on d.dept_id = t.company_code |
| 602 | - where 1=1 | 602 | + where 1=1 and t.status_code !='CANCEL' |
| 603 | <if test="ticketNumber != null and ticketNumber != ''"> and t.ticket_number like concat('%', #{ticketNumber}, '%')</if> | 603 | <if test="ticketNumber != null and ticketNumber != ''"> and t.ticket_number like concat('%', #{ticketNumber}, '%')</if> |
| 604 | <if test="fiscalYear != null "> and t.fiscal_year = #{fiscalYear}</if> | 604 | <if test="fiscalYear != null "> and t.fiscal_year = #{fiscalYear}</if> |
| 605 | <if test="regionName != null and regionName != ''"> and t.region_name like concat('%', #{regionName}, '%')</if> | 605 | <if test="regionName != null and regionName != ''"> and t.region_name like concat('%', #{regionName}, '%')</if> |
| @@ -712,6 +712,12 @@ | @@ -712,6 +712,12 @@ | ||
| 712 | <if test="finishIgnTime != null and finishIgnTime != '' "> | 712 | <if test="finishIgnTime != null and finishIgnTime != '' "> |
| 713 | AND i.ign_time <= #{startIgnTime} | 713 | AND i.ign_time <= #{startIgnTime} |
| 714 | </if> | 714 | </if> |
| 715 | + <if test="ignitionStatusCodeList != null and ignitionStatusCodeList.size() > 0"> | ||
| 716 | + and i.status_code in | ||
| 717 | + <foreach collection="ignitionStatusCodeList" item="item" index="index" separator="," open=" (" close=")"> | ||
| 718 | + #{item} | ||
| 719 | + </foreach> | ||
| 720 | + </if> | ||
| 715 | <!-- 数据范围过滤 --> | 721 | <!-- 数据范围过滤 --> |
| 716 | ${params.dataScope} | 722 | ${params.dataScope} |
| 717 | order by update_time desc | 723 | order by update_time desc |