票据邮寄添加项目id

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<PayMailBill, IPayMailB
 	@RequiresPermissions("billMail:search")
 	@ApiOperation(value="邮寄票据-分页列表查询", notes="邮寄票据-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<?> 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<PayMailBill, IPayMailB
 	 	return Result.OK();
 	 }
 
+	/**
+	 *  票据邮寄打印
+	 *
+	 */
+	@ApiOperation(value="票据邮寄打印", notes="票据邮寄打印")
+	@Transactional
+	@PostMapping(value = "/print")
+	public Result<?> print(@RequestParam(name="id") String id)  {
+		PayMailBill payMailBill = payMailBillService.print(id);
+		HashMap<String, PayMailBill> hashMap = new HashMap<>();
+		hashMap.put("payMailBill",payMailBill);
+		return Result.OK(hashMap);
+	}
+
 
     /**
     * 邮寄票据-导出

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;
 

jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java

@@ -68,4 +68,7 @@ public interface PayMailBillMapper extends BaseMapper<PayMailBill> {
 
 
     IPage<PayMailBill> pageLists(Page<PayMailBill> page,@Param("payMailBillSearch") PayMailBillSearch payMailBillSearch);
+
+    PayMailBill print(@Param("id")String id);
+
 }

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
+
+    </select>
+    <select id="print" resultType="com.jero.mail.entity.PayMailBill">
+       SELECT pmb.id,
+       project_name as projectName,
+       bill_no AS billNo,
+       pmb.invoice_amount as invoiceAmount,
+       principal_name as principalName,
+       charge_company_name as chargeCompanyName,
+        contact_name as contactName,
+        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 left join pay_mail_bill_project pmbp on(pmb.id=pmbp.bill_id) where pmb.id=#{id} group by pmb.id
  ${ew.customSqlSegment}
  ORDER BY post_status ASC,create_time DESC
 

jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java

@@ -86,4 +86,6 @@ public interface IPayMailBillService extends IService<PayMailBill> {
     List<PayMailBill> pageListTwo(PayMailBillSearch payMailBillSearch);
 
     IPage<PayMailBill> pageLists(Page<PayMailBill> page, PayMailBillSearch payMailBillSearch);
+
+    PayMailBill print(String id);
 }

jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java

@@ -289,6 +289,11 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
         return payMailBillMapper.pageLists(page,payMailBillSearch);
     }
 
+    @Override
+    public PayMailBill print(String id) {
+        return payMailBillMapper.print(id);
+    }
+
 
     //校验不同项目是否属于同一个公司，开票金额是否大于当前未开票金额，企业名称是否审核
     private String checkCompanyProject(List<PayMailBillProject> bmpList) {