diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java index 9b1519f0..ef4d5780 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java @@ -54,6 +54,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import javax.annotation.Resource; +import javax.validation.Valid; /** * @Description: 邮寄票据 @@ -97,7 +98,7 @@ public class PayMailBillController extends JeroController queryPageList( PayMailBillSearch payMailBillSearch, + public Result queryPageList(PayMailBillSearch payMailBillSearch, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize ) { @@ -297,6 +298,20 @@ public class PayMailBillController extends JeroController print(@RequestParam(name="id") String id) { + PayMailBill payMailBill = payMailBillService.print(id); + HashMap hashMap = new HashMap<>(); + hashMap.put("payMailBill",payMailBill); + return Result.OK(hashMap); + } + /** * 邮寄票据-导出 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillSearch.java index 4afab08e..fff44d78 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillSearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillSearch.java @@ -7,6 +7,7 @@ import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; /** * @author zql @@ -15,15 +16,12 @@ import javax.validation.constraints.NotNull; @Data public class PayMailBillSearch { - @ApiModelProperty(value = "来款单位") private java.lang.String chargeCompanyName; - @ApiModelProperty(value = "项目负责人") private java.lang.String principalId; - @ApiModelProperty(value = "项目名称") private java.lang.String projectName; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java index 1ee4bb54..def08c69 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java @@ -68,4 +68,7 @@ public interface PayMailBillMapper extends BaseMapper { IPage pageLists(Page page,@Param("payMailBillSearch") PayMailBillSearch payMailBillSearch); + + PayMailBill print(@Param("id")String id); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml index 93750787..412e00f5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml @@ -64,12 +64,35 @@ contact_mobile as contactMobile, post_status as postStatus, send_method as sendMethod , + pmbp.project_id as projectId, create_time, mailer, post_no as postNo, send_date as sendDate, pmb.remark - from pay_mail_bill pmb + from pay_mail_bill pmb left join pay_mail_bill_project pmbp on(pmb.id=pmbp.bill_id) group by pmb.id + ${ew.customSqlSegment} + ORDER BY post_status ASC,create_time DESC + + +