diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java index 692efab..e1d502a 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java @@ -319,7 +319,7 @@ public class McVisitController extends BaseController { * @return */ @PostMapping("/visitListExport") - public void visitListExport(McVisitVo mcVisitVo, HttpServletResponse response) throws IOException { + public void visitListExport(@RequestBody McVisitVo mcVisitVo, HttpServletResponse response) throws IOException { List ticketTypeList = new ArrayList(); ticketTypeList.add("1"); ticketTypeList.add("3"); @@ -391,7 +391,7 @@ public class McVisitController extends BaseController { * @return */ @PostMapping("/chargedListExport") - public void chargedListExport(McVisitVo mcVisitVo, HttpServletResponse response) throws IOException { + public void chargedListExport(@RequestBody McVisitVo mcVisitVo, HttpServletResponse response) throws IOException { List ticketTypeList = new ArrayList(); ticketTypeList.add("2"); ticketTypeList.add("3"); diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McVisitVo.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McVisitVo.java index 4ef1791..b3a75c8 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McVisitVo.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McVisitVo.java @@ -61,6 +61,22 @@ public class McVisitVo extends McVisit { private String ignCnfStatusCode; + /** + * ids + */ + private List idList = new ArrayList(); + + /** + * 点火时间-开始时间 + */ + private String startIgnTime; + + /** + * 点火时间-结束时间 + */ + private String finishIgnTime; + + public Long getStartFiscalYear() { return startFiscalYear; } @@ -141,6 +157,30 @@ public class McVisitVo extends McVisit { this.ignCnfStatusCode = ignCnfStatusCode; } + public List getIdList() { + return idList; + } + + public void setIdList(List idList) { + this.idList = idList; + } + + public String getStartIgnTime() { + return startIgnTime; + } + + public void setStartIgnTime(String startIgnTime) { + this.startIgnTime = startIgnTime; + } + + public String getFinishIgnTime() { + return finishIgnTime; + } + + public void setFinishIgnTime(String finishIgnTime) { + this.finishIgnTime = finishIgnTime; + } + @Override public String toString() { return "McVisitVo{" + @@ -154,6 +194,9 @@ public class McVisitVo extends McVisit { ", startUpdateTime='" + startUpdateTime + '\'' + ", finishUpdateTime='" + finishUpdateTime + '\'' + ", ignCnfStatusCode='" + ignCnfStatusCode + '\'' + + ", idList=" + idList + + ", startIgnTime='" + startIgnTime + '\'' + + ", finishIgnTime='" + finishIgnTime + '\'' + '}'; } } diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml index 3d9400e..2ccd1be 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml +++ b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml @@ -674,7 +674,7 @@ - + t.ticket_type = #{item} @@ -682,6 +682,12 @@ and t.entry_time >= #{startEntryTime} and t.entry_time <= #{finishEntryTime} and i.ign_cnf_status_code = #{ignCnfStatusCode} + + t.id in + + #{item} + + ${params.dataScope} order by t.update_time desc -- libgit2 0.21.2