fff

src/main/java/com/njyunzhi/invoice/controller/TaInvoiceDetailController.java

     @RequestMapping(value="/admin/taInvoiceDetail",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taInvoiceDetailList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                     @ApiParam("报销ID") @RequestParam(value ="invoiceId",defaultValue = "") String invoiceId) throws Exception{
 
 		    IPage<TaInvoiceDetail> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaInvoiceDetail> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
-
+            queryWrapper.eq("invoice_id",invoiceId);
             IPage<TaInvoiceDetail> result = iTaInvoiceDetailService.page(pg, queryWrapper);
             return ResponseBean.success(result);
     }
      */
     @RequestMapping(value="/admin/taInvoiceDetail/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taInvoiceDetailDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+    public ResponseBean taInvoiceDetailDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         if(iTaInvoiceDetailService.removeById(id)){
             return ResponseBean.success("success");
         }else {
      */
     @RequestMapping(value="/admin/taInvoiceDetail/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taInvoiceDetailUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+    public ResponseBean taInvoiceDetailUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaInvoiceDetail taInvoiceDetail) throws Exception{
 
         if (iTaInvoiceDetailService.updateById(taInvoiceDetail)){
      */
     @RequestMapping(value="/admin/taInvoiceDetail/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taInvoiceDetailGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+    public ResponseBean taInvoiceDetailGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         return ResponseBean.success(iTaInvoiceDetailService.getById(id));
     }
 }

src/main/java/com/njyunzhi/invoice/controller/TaInvoiceFillController.java

 import com.njyunzhi.invoice.entity.TaInvoiceFill;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
     * 报销主表 前端控制器
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taInvoiceFillList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-
 		    IPage<TaInvoiceFill> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaInvoiceFill> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
-
             IPage<TaInvoiceFill> result = iTaInvoiceFillService.page(pg, queryWrapper);
             return ResponseBean.success(result);
     }
      */
     @RequestMapping(value="/admin/taInvoiceFill/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taInvoiceFillDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+    public ResponseBean taInvoiceFillDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         if(iTaInvoiceFillService.removeById(id)){
             return ResponseBean.success("success");
         }else {
      */
     @RequestMapping(value="/admin/taInvoiceFill/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taInvoiceFillGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+    public ResponseBean taInvoiceFillGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         return ResponseBean.success(iTaInvoiceFillService.getById(id));
     }
 }

src/main/java/com/njyunzhi/invoice/controller/TaInvoiceItemTplController.java

     @RequestMapping(value="/admin/taInvoiceItemTpl",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taInvoiceItemTplList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                     @ApiParam("报销ID") @RequestParam(value ="invoiceId",defaultValue = "") String invoiceId) throws Exception{
 
 		    IPage<TaInvoiceItemTpl> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaInvoiceItemTpl> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
-
+            queryWrapper.eq("invoice_id",invoiceId);
             IPage<TaInvoiceItemTpl> result = iTaInvoiceItemTplService.page(pg, queryWrapper);
             return ResponseBean.success(result);
     }

src/main/java/com/njyunzhi/invoice/controller/TaInvoicePersonController.java

 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njyunzhi.invoice.common.BaseController;
 import com.njyunzhi.invoice.common.ResponseBean;
+import com.njyunzhi.invoice.mapper.TaInvoicePersonMapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.njyunzhi.invoice.entity.TaInvoicePerson;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
     * 报销人员 前端控制器
     @RequestMapping(value="/admin/taInvoicePerson",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taInvoicePersonList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-
-		    IPage<TaInvoicePerson> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaInvoicePerson> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaInvoicePerson> result = iTaInvoicePersonService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                     @ApiParam("报销ID") @RequestParam(value ="invoiceId",defaultValue = "") String invoiceId) throws Exception{
+        IPage<TaInvoicePerson> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaInvoicePerson> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("invoice_id", invoiceId);
+        queryWrapper.orderByDesc("create_date");
+        IPage<TaInvoicePerson> result = iTaInvoicePersonService.page(pg,queryWrapper);
+        return ResponseBean.success(result);
     }
 
     /**
      */
     @RequestMapping(value="/admin/taInvoicePerson/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taInvoicePersonDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+    public ResponseBean taInvoicePersonDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         if(iTaInvoicePersonService.removeById(id)){
             return ResponseBean.success("success");
         }else {
      */
     @RequestMapping(value="/admin/taInvoicePerson/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taInvoicePersonUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+    public ResponseBean taInvoicePersonUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaInvoicePerson taInvoicePerson) throws Exception{
 
         if (iTaInvoicePersonService.updateById(taInvoicePerson)){
      */
     @RequestMapping(value="/admin/taInvoicePerson/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taInvoicePersonGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+    public ResponseBean taInvoicePersonGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         return ResponseBean.success(iTaInvoicePersonService.getById(id));
     }
 }

src/main/java/com/njyunzhi/invoice/entity/TaInvoiceFill.java

     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "报销ID")
-    @TableId(value = "invoice_id", type = IdType.INPUT)
+    @TableId(value = "invoice_id", type = IdType.ASSIGN_UUID)
     private String invoiceId;
 
     @ApiModelProperty(value = "名称")

src/main/java/com/njyunzhi/invoice/entity/TaInvoiceItemTpl.java

     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "项目ID")
-    @TableId(value = "invoice_item_tpl_id", type = IdType.INPUT)
+    @TableId(value = "invoice_item_tpl_id", type = IdType.AUTO)
     private Integer invoiceItemTplId;
 
     @ApiModelProperty(value = "报销ID")
     @ApiModelProperty(value = "创建日期")
     private LocalDateTime createDate;
 
+    @ApiModelProperty(value = "报销ID")
+    private String invoice_id;
 
 }

src/main/java/com/njyunzhi/invoice/entity/TaInvoicePerson.java

 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "人员ID")
-    @TableId(value = "invoice_person_id", type = IdType.INPUT)
+    @TableId(value = "invoice_person_id", type = IdType.ASSIGN_UUID)
     private String invoicePersonId;
 
     @ApiModelProperty(value = "映射人员ID")
     private String orgId;
 
     @ApiModelProperty(value = "名称")
+    @TableField("`name`")
     private String name;
 
     @ApiModelProperty(value = "人员手机号")
     @ApiModelProperty(value = "创建日期")
     private LocalDateTime createDate;
 
+    @ApiModelProperty(value = "报销ID")
+    private String invoiceId;
 
+    @ApiModelProperty(value = "单位名称")
+    private String orgName;
 }

src/main/resources/mapper/SysBankMapper.xml

 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njyunzhi.invoice.mapper.SysBankMapper">
 
-    <select id="getBankList" resultType="com.njyunzhi.invoice.entity.SysBank">
-        SELECT * FROM sys_bank WHERE LIMIT #{pageNum},#{pageSize}
-    </select>
-    <delete id="deleteBankId">
-        DELETE * FROM sys_bank WHERE id=#{id}
-    </delete>
-    <update id="updBankId">
-        UPDATE sys_bank SET
-        <if test="name!=null">name=#{name},</if>
-        <if test="card_no!=null">card_no=#{card_no},</if>
-        <if test="status!=null">status=#{status},</if>
-        <if test="create_date!=null">create_date=#{create_date},</if>
-        WHERE id=#{id}
-    </update>
 </mapper>

src/main/resources/mapper/TaInvoiceFillMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njyunzhi.invoice.mapper.TaInvoiceFillMapper">
-
 </mapper>