feats

pom.xml

@@ -62,7 +62,7 @@
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>easyexcel</artifactId>
-			<version>2.0.4</version>
+			<version>3.1.1</version>
 		</dependency>
 		<!--excel end-->
 

src/main/java/com/njyunzhi/invoice/common/Constants.java

@@ -4,4 +4,7 @@ public class Constants {
     public final static int STATUS_DELETE = -1;
     public final static int STATUS_READY = 0;
     public final static int STATUS_NORMAL = 1;
+
+
+    public final static int INVOICE_FINISHED = 2;
 }

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

@@ -4,7 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njyunzhi.invoice.common.BaseController;
+import com.njyunzhi.invoice.common.Constants;
+import com.njyunzhi.invoice.common.DateUtils;
 import com.njyunzhi.invoice.common.ResponseBean;
+import com.njyunzhi.invoice.entity.TaInvoiceFill;
+import com.njyunzhi.invoice.entity.TaPerson;
+import com.njyunzhi.invoice.service.ITaInvoiceFillService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -39,6 +44,9 @@ public class TaInvoiceDetailController extends BaseController {
     @Autowired
     public ITaInvoiceDetailService iTaInvoiceDetailService;
 
+    @Autowired
+    public ITaInvoiceFillService iTaInvoiceFillService;
+
 
     /**
      * 分页查询列表
@@ -46,31 +54,28 @@ public class TaInvoiceDetailController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/admin/taInvoiceDetail",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/invoice/{invoiceId}/detail",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{
-
-		    IPage<TaInvoiceDetail> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaInvoiceDetail> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                     @ApiParam("班级ID") @PathVariable(value ="invoiceId") String invoiceId) throws Exception{
 
-            IPage<TaInvoiceDetail> result = iTaInvoiceDetailService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<TaInvoiceDetail> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaInvoiceDetail> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.eq("invoice_id",invoiceId);
+        queryWrapper.orderByDesc("create_date");
+        IPage<TaInvoiceDetail> result = iTaInvoiceDetailService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
-    /**
-     * 保存对象
-     * @param taInvoiceDetail 实体对象
-     * @return
-     */
-    @RequestMapping(value="/admin/taInvoiceDetail",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taInvoiceDetailAdd(@ApiParam("保存内容") @RequestBody TaInvoiceDetail taInvoiceDetail) throws Exception{
+    @RequestMapping(value="/admin/invoice/{invoiceId}/detail",method= RequestMethod.POST)
+    @ApiOperation(value="一键生成", notes = "一键生成", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean taInvoiceDetailAdd(@ApiParam("班级ID") @PathVariable(value ="invoiceId") String invoiceId) throws Exception{
 
-        if (iTaInvoiceDetailService.save(taInvoiceDetail)){
-            return ResponseBean.success(taInvoiceDetail);
-        }else {
+        if (iTaInvoiceDetailService.createBatch(invoiceId)){
+            return ResponseBean.success("ok");
+        } else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
@@ -79,9 +84,9 @@ public class TaInvoiceDetailController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/admin/taInvoiceDetail/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/invoice/detail/{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 {
@@ -95,11 +100,14 @@ public class TaInvoiceDetailController extends BaseController {
      * @param taInvoiceDetail 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/taInvoiceDetail/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/invoice/{invoiceId}/detail/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taInvoiceDetailUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaInvoiceDetail taInvoiceDetail) throws Exception{
+    public ResponseBean taInvoiceDetailUpdate(@ApiParam("班级ID") @PathVariable(value ="invoiceId") String invoiceId,
+                                              @ApiParam("对象ID") @PathVariable String id,
+                                              @ApiParam("更新内容") @RequestBody TaInvoiceDetail taInvoiceDetail) throws Exception{
 
+        taInvoiceDetail.setDetailId(id);
+        taInvoiceDetail.setInvoiceId(invoiceId);
         if (iTaInvoiceDetailService.updateById(taInvoiceDetail)){
             return ResponseBean.success(iTaInvoiceDetailService.getById(id));
         }else {
@@ -107,13 +115,66 @@ public class TaInvoiceDetailController extends BaseController {
         }
     }
 
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @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{
-        return ResponseBean.success(iTaInvoiceDetailService.getById(id));
+    @RequestMapping(value="/h5/invoice/{invoiceId}/detail/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value="H5确认报销单", notes = "H5确认报销单", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean invoiceConfirm(@ApiParam("班级ID") @PathVariable(value ="invoiceId") String invoiceId,
+                                       @ApiParam("对象ID") @PathVariable String id,
+                                       @ApiParam("更新内容") @RequestBody TaInvoiceDetail taInvoiceDetail) throws Exception{
+
+        TaPerson taPerson = currentPerson();
+
+        taInvoiceDetail.setDetailId(id);
+        taInvoiceDetail.setPersonId(taPerson.getPersonId());
+        taInvoiceDetail.setInvoiceId(invoiceId);
+        if (iTaInvoiceDetailService.updateById(taInvoiceDetail)){
+            return ResponseBean.success(iTaInvoiceDetailService.getById(id));
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    private boolean getIsFinished(TaInvoiceFill taInvoiceFill) {
+        return Constants.INVOICE_FINISHED == taInvoiceFill.getStatus() ||
+                DateUtils.now().isAfter(taInvoiceFill.getEndDate());
+    }
+
+
+    @RequestMapping(value="/h5/invoice/{invoiceId}",method= RequestMethod.GET)
+    @ApiOperation(value="获取报销单", notes = "获取报销单", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getInvoice(@ApiParam("班级ID") @PathVariable(value ="invoiceId") String invoiceId) throws Exception{
+
+        TaInvoiceFill taInvoiceFill = iTaInvoiceFillService.getById(invoiceId);
+        if (null == taInvoiceFill || taInvoiceFill.getStatus() != Constants.STATUS_NORMAL) {
+            return ResponseBean.error("报销单不存在");
+        }
+
+        TaPerson taPerson = currentPerson();
+        TaInvoiceDetail taInvoiceDetail = iTaInvoiceDetailService.getByPerson(invoiceId, taPerson.getPersonId());
+        if (null == taInvoiceDetail) {
+            return ResponseBean.error("找不到报销数据或者您不在此次名单中");
+        }
+
+        taInvoiceDetail.setIsFinished(getIsFinished(taInvoiceFill));
+        return ResponseBean.success(taInvoiceDetail);
+    }
+
+    @RequestMapping(value="/h5/invoice/{invoiceId}/detail/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="获取报销单详情", notes = "获取报销单详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getDetail(@ApiParam("班级ID") @PathVariable(value ="invoiceId") String invoiceId,
+                                       @ApiParam("对象ID") @PathVariable String id) throws Exception{
+
+        TaInvoiceFill taInvoiceFill = iTaInvoiceFillService.getById(invoiceId);
+        if (null == taInvoiceFill || taInvoiceFill.getStatus() != Constants.STATUS_NORMAL) {
+            return ResponseBean.error("报销单不存在");
+        }
+
+        TaPerson taPerson = currentPerson();
+        TaInvoiceDetail taInvoiceDetail = iTaInvoiceDetailService.getById(id);
+        if (null == taInvoiceDetail || taInvoiceDetail.getStatus() == Constants.STATUS_DELETE || !taPerson.getPersonId().equals(taInvoiceDetail.getPersonId())) {
+            return ResponseBean.error("找不到报销数据详情");
+        }
+
+        taInvoiceDetail.setIsFinished(getIsFinished(taInvoiceFill));
+        return ResponseBean.success(taInvoiceDetail);
     }
 }

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

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njyunzhi.invoice.common.BaseController;
+import com.njyunzhi.invoice.common.Constants;
 import com.njyunzhi.invoice.common.ResponseBean;
+import com.njyunzhi.invoice.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -20,6 +22,8 @@ import com.njyunzhi.invoice.service.ITaInvoiceFillService;
 import com.njyunzhi.invoice.entity.TaInvoiceFill;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
     * 报销主表 前端控制器
@@ -46,17 +50,25 @@ public class TaInvoiceFillController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/admin/taInvoiceFill",method= RequestMethod.GET)
+    @RequestMapping(value="/{client}/invoice",method= RequestMethod.GET)
     @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{
+    public ResponseBean taInvoiceFillList(@ApiParam("客户端") @PathVariable String client,
+                                          @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                          @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                          @ApiParam("班级名称") @RequestParam(value ="name", required = false) String name) throws Exception{
+        IPage<TaInvoiceFill> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaInvoiceFill> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.like(!StringUtils.isEmpty(name), "name", "%" + name + "%");
+        queryWrapper.orderByDesc("create_date");
 
-		    IPage<TaInvoiceFill> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaInvoiceFill> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        // H5 端只能查看自己的报销单
+        if ("h5".equals(client)) {
+            queryWrapper.eq("person_id", currentPerson().getPersonId());
+        }
 
-            IPage<TaInvoiceFill> result = iTaInvoiceFillService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<TaInvoiceFill> result = iTaInvoiceFillService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
     /**
@@ -64,10 +76,14 @@ public class TaInvoiceFillController extends BaseController {
      * @param taInvoiceFill 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/taInvoiceFill",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/invoice",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taInvoiceFillAdd(@ApiParam("保存内容") @RequestBody TaInvoiceFill taInvoiceFill) throws Exception{
 
+        if (null == taInvoiceFill.getStatus()) {
+            taInvoiceFill.setStatus(Constants.STATUS_READY);
+        }
+
         if (iTaInvoiceFillService.save(taInvoiceFill)){
             return ResponseBean.success(taInvoiceFill);
         }else {
@@ -79,10 +95,10 @@ public class TaInvoiceFillController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/admin/taInvoiceFill/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/invoice/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taInvoiceFillDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaInvoiceFillService.removeById(id)){
+    public ResponseBean taInvoiceFillDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        if(iTaInvoiceFillService.removeLogicById(id)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -95,11 +111,12 @@ public class TaInvoiceFillController extends BaseController {
      * @param taInvoiceFill 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/taInvoiceFill/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/invoice/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taInvoiceFillUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+    public ResponseBean taInvoiceFillUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaInvoiceFill taInvoiceFill) throws Exception{
 
+        taInvoiceFill.setInvoiceId(id);
         if (iTaInvoiceFillService.updateById(taInvoiceFill)){
             return ResponseBean.success(iTaInvoiceFillService.getById(id));
         }else {
@@ -111,9 +128,9 @@ public class TaInvoiceFillController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/admin/taInvoiceFill/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/invoice/{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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njyunzhi.invoice.common.BaseController;
 import com.njyunzhi.invoice.common.ResponseBean;
+import com.njyunzhi.invoice.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -46,17 +47,18 @@ public class TaInvoiceItemTplController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/admin/taInvoiceItemTpl",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/invoice/{invoiceId}/item",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") @PathVariable(value ="invoiceId") String invoiceId) throws Exception{
 
-		    IPage<TaInvoiceItemTpl> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaInvoiceItemTpl> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaInvoiceItemTpl> result = iTaInvoiceItemTplService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        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);
     }
 
     /**
@@ -64,10 +66,12 @@ public class TaInvoiceItemTplController extends BaseController {
      * @param taInvoiceItemTpl 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/taInvoiceItemTpl",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/invoice/{invoiceId}/item",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taInvoiceItemTplAdd(@ApiParam("保存内容") @RequestBody TaInvoiceItemTpl taInvoiceItemTpl) throws Exception{
+    public ResponseBean taInvoiceItemTplAdd(@ApiParam("报销ID") @PathVariable(value ="invoiceId") String invoiceId,
+                                            @ApiParam("保存内容") @RequestBody TaInvoiceItemTpl taInvoiceItemTpl) throws Exception{
 
+        taInvoiceItemTpl.setInvoiceId(invoiceId);
         if (iTaInvoiceItemTplService.save(taInvoiceItemTpl)){
             return ResponseBean.success(taInvoiceItemTpl);
         }else {
@@ -79,7 +83,7 @@ public class TaInvoiceItemTplController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/admin/taInvoiceItemTpl/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/invoice/{invoiceId}/item/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
     public ResponseBean taInvoiceItemTplDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
         if(iTaInvoiceItemTplService.removeById(id)){
@@ -95,11 +99,13 @@ public class TaInvoiceItemTplController extends BaseController {
      * @param taInvoiceItemTpl 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/taInvoiceItemTpl/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/invoice/{invoiceId}/item/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taInvoiceItemTplUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaInvoiceItemTpl taInvoiceItemTpl) throws Exception{
+    public ResponseBean taInvoiceItemTplUpdate(@ApiParam("报销ID") @PathVariable(value ="invoiceId") String invoiceId,
+                                               @ApiParam("对象ID") @PathVariable Integer id,
+                                               @ApiParam("更新内容") @RequestBody TaInvoiceItemTpl taInvoiceItemTpl) throws Exception{
 
+        taInvoiceItemTpl.setInvoiceId(invoiceId);
         if (iTaInvoiceItemTplService.updateById(taInvoiceItemTpl)){
             return ResponseBean.success(iTaInvoiceItemTplService.getById(id));
         }else {
@@ -107,13 +113,4 @@ public class TaInvoiceItemTplController extends BaseController {
         }
     }
 
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/admin/taInvoiceItemTpl/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taInvoiceItemTplGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaInvoiceItemTplService.getById(id));
-    }
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njyunzhi.invoice.common.BaseController;
+import com.njyunzhi.invoice.common.Constants;
 import com.njyunzhi.invoice.common.ResponseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -46,74 +47,19 @@ public class TaInvoiceOrgController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taInvoiceOrg",method= RequestMethod.GET)
+    @RequestMapping(value="/{client}/invoice/{invoiceId}/org",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taInvoiceOrgList(@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") @PathVariable(value ="invoiceId") String invoiceId) throws Exception{
 
-		    IPage<TaInvoiceOrg> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaInvoiceOrg> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        IPage<TaInvoiceOrg> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaInvoiceOrg> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.eq("invoice_id", invoiceId);
+        queryWrapper.orderByDesc("create_date");
 
-            IPage<TaInvoiceOrg> result = iTaInvoiceOrgService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
-    }
-
-    /**
-     * 保存对象
-     * @param taInvoiceOrg 实体对象
-     * @return
-     */
-    @RequestMapping(value="/taInvoiceOrg",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taInvoiceOrgAdd(@ApiParam("保存内容") @RequestBody TaInvoiceOrg taInvoiceOrg) throws Exception{
-
-        if (iTaInvoiceOrgService.save(taInvoiceOrg)){
-            return ResponseBean.success(taInvoiceOrg);
-        }else {
-            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taInvoiceOrg/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taInvoiceOrgDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaInvoiceOrgService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param taInvoiceOrg 实体对象
-     * @return
-     */
-    @RequestMapping(value="/taInvoiceOrg/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taInvoiceOrgUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaInvoiceOrg taInvoiceOrg) throws Exception{
-
-        if (iTaInvoiceOrgService.updateById(taInvoiceOrg)){
-            return ResponseBean.success(iTaInvoiceOrgService.getById(id));
-        }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taInvoiceOrg/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taInvoiceOrgGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaInvoiceOrgService.getById(id));
+        IPage<TaInvoiceOrg> result = iTaInvoiceOrgService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 }

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

@@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njyunzhi.invoice.common.BaseController;
+import com.njyunzhi.invoice.common.Constants;
 import com.njyunzhi.invoice.common.ResponseBean;
+import com.njyunzhi.invoice.common.StringUtils;
+import com.njyunzhi.invoice.entity.TaInvoiceOrg;
 import com.njyunzhi.invoice.service.ITaInvoiceOrgService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,6 +23,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import com.njyunzhi.invoice.service.ITaInvoicePersonService;
 import com.njyunzhi.invoice.entity.TaInvoicePerson;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
 
 /**
  * <p>
@@ -50,16 +56,19 @@ public class TaInvoicePersonController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/admin/invoice/person",method= RequestMethod.GET)
+    @RequestMapping(value="/{client}/invoice/{invoiceId}/person",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{
-
+                                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            @ApiParam("班级ID") @PathVariable(value ="invoiceId") String invoiceId,
+                                            @ApiParam("所属单位") @RequestParam(value ="invoiceOrgId") String invoiceOrgId) throws Exception {
         IPage<TaInvoicePerson> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaInvoicePerson> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.eq("invoice_id", invoiceId);
+        queryWrapper.eq(!StringUtils.isEmpty(invoiceOrgId), "invoice_org_id", invoiceOrgId);
         queryWrapper.orderByDesc("create_date");
-
-        IPage<TaInvoicePerson> result = iTaInvoicePersonService.page(pg, queryWrapper);
+        IPage<TaInvoicePerson> result = iTaInvoicePersonService.page(pg,queryWrapper);
         return ResponseBean.success(result);
     }
 
@@ -68,58 +77,45 @@ public class TaInvoicePersonController extends BaseController {
      * @param taInvoicePerson 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/invoice/person",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/invoice/{invoiceId}/person",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taInvoicePersonAdd(@ApiParam("保存内容") @RequestBody TaInvoicePerson taInvoicePerson) throws Exception {
-
-        iTaInvoiceOrgService.getExistBy("", taInvoicePerson.getName())
+    public ResponseBean taInvoicePersonAdd(@ApiParam("班级ID") @PathVariable(value ="invoiceId") String invoiceId,
+                                           @ApiParam("保存内容") @RequestBody TaInvoicePerson taInvoicePerson) throws Exception {
+        if (StringUtils.isEmpty(taInvoicePerson.getOrgName())) {
+            return ResponseBean.error("未找到单位信息");
+        }
 
-        if (iTaInvoicePersonService.save(taInvoicePerson)){
+        taInvoicePerson.setInvoiceId(invoiceId);
+        if (iTaInvoicePersonService.createNew(taInvoicePerson)){
             return ResponseBean.success(taInvoicePerson);
         } else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
+    /**
+     * 批量导入
+     * @return
+     */
+    @RequestMapping(value="/admin/invoice/{invoiceId}/person/import",method= RequestMethod.POST)
+    @ApiOperation(value="批量导入", notes = "批量导入", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean upload(@ApiParam("班级ID") @PathVariable(value = "invoiceId") String invoiceId,
+                               @ApiParam("保存内容") @RequestParam(value = "file") MultipartFile file) throws Exception {
+        iTaInvoicePersonService.batchUpload(invoiceId, file);
+        return ResponseBean.success("ok");
+    }
 
     /**
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/admin/invoice/person/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/invoice/{invoiceId}/person/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taInvoicePersonDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaInvoicePersonService.removeById(id)){
+    public ResponseBean taInvoicePersonDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        if(iTaInvoicePersonService.removeLogicById(id)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param taInvoicePerson 实体对象
-     * @return
-     */
-    @RequestMapping(value="/admin/invoice/person/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taInvoicePersonUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaInvoicePerson taInvoicePerson) throws Exception{
-
-        if (iTaInvoicePersonService.updateById(taInvoicePerson)){
-            return ResponseBean.success(iTaInvoicePersonService.getById(id));
-        }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/admin/invoice/person/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taInvoicePersonGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaInvoicePersonService.getById(id));
-    }
 }

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

@@ -2,6 +2,8 @@ package com.njyunzhi.invoice.entity;
 
 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;
@@ -90,5 +92,7 @@ public class TaInvoiceDetail implements Serializable {
     @ApiModelProperty(value = "创建日期")
     private LocalDateTime createDate;
 
-
+    @ApiModelProperty("是否结束")
+    @TableField(exist = false)
+    private Boolean isFinished;
 }

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

@@ -27,7 +27,7 @@ public class TaInvoiceFill implements Serializable {
     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

@@ -27,7 +27,7 @@ public class TaInvoiceItemTpl implements Serializable {
     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")
@@ -44,6 +44,4 @@ public class TaInvoiceItemTpl implements Serializable {
 
     @ApiModelProperty(value = "创建日期")
     private LocalDateTime createDate;
-
-
 }

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

@@ -27,7 +27,7 @@ public class TaInvoiceOrg implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "单位ID")
-    @TableId(value = "invoice_org_id", type = IdType.INPUT)
+    @TableId(value = "invoice_org_id", type = IdType.ASSIGN_UUID)
     private String invoiceOrgId;
 
     @ApiModelProperty(value = "映射ID")

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

@@ -1,7 +1,11 @@
 package com.njyunzhi.invoice.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 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;
@@ -20,7 +24,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
+@ExcelIgnoreUnannotated
 @ApiModel(value="TaInvoicePerson对象", description="报销人员")
 public class TaInvoicePerson implements Serializable {
 
@@ -39,7 +43,9 @@ public class TaInvoicePerson implements Serializable {
     @ApiModelProperty(value = "所属单位")
     private String orgId;
 
+    @ExcelProperty(index = 1)
     @ApiModelProperty(value = "名称")
+    @TableField("`name`")
     private String name;
 
     @ApiModelProperty(value = "人员手机号")
@@ -51,5 +57,10 @@ public class TaInvoicePerson implements Serializable {
     @ApiModelProperty(value = "创建日期")
     private LocalDateTime createDate;
 
+    @ApiModelProperty(value = "报销ID")
+    private String invoiceId;
 
+    @ExcelProperty(index = 0)
+    @ApiModelProperty(value = "单位名称")
+    private String orgName;
 }

src/main/java/com/njyunzhi/invoice/mapper/TaInvoiceDetailMapper.java

@@ -3,6 +3,7 @@ package com.njyunzhi.invoice.mapper;
 import com.njyunzhi.invoice.entity.TaInvoiceDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +16,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaInvoiceDetailMapper extends BaseMapper<TaInvoiceDetail> {
 
+    int createBatch(@Param("invoiceId") String invoiceId);
+
+    TaInvoiceDetail getByPerson(@Param("invoiceId") String invoiceId,@Param("personId") String personId);
 }

src/main/java/com/njyunzhi/invoice/mapper/TaInvoiceOrgMapper.java

@@ -3,6 +3,7 @@ package com.njyunzhi.invoice.mapper;
 import com.njyunzhi.invoice.entity.TaInvoiceOrg;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +16,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaInvoiceOrgMapper extends BaseMapper<TaInvoiceOrg> {
 
+    TaInvoiceOrg getByInvoiceAndOrgName(@Param("invoiceId") String invoiceId, @Param("orgName") String orgName);
 }

src/main/java/com/njyunzhi/invoice/mapper/TaInvoicePersonMapper.java

@@ -3,6 +3,9 @@ package com.njyunzhi.invoice.mapper;
 import com.njyunzhi.invoice.entity.TaInvoicePerson;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaInvoicePersonMapper extends BaseMapper<TaInvoicePerson> {
 
+    List<TaInvoicePerson> getByName(@Param("invoiceId") String invoiceId, @Param("invoiceOrgId") String invoiceOrgId, @Param("name") String name);
 }

src/main/java/com/njyunzhi/invoice/service/ITaInvoiceDetailService.java

@@ -13,4 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaInvoiceDetailService extends IService<TaInvoiceDetail> {
 
+    boolean createBatch(String invoiceId) throws Exception;
+
+    TaInvoiceDetail getByPerson(String invoiceId, String personId);
 }

src/main/java/com/njyunzhi/invoice/service/ITaInvoiceFillService.java

@@ -1,7 +1,6 @@
 package com.njyunzhi.invoice.service;
 
 import com.njyunzhi.invoice.entity.TaInvoiceFill;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
@@ -11,6 +10,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-07-04
  */
-public interface ITaInvoiceFillService extends IService<TaInvoiceFill> {
+public interface ITaInvoiceFillService extends IBaseService<TaInvoiceFill> {
 
 }

src/main/java/com/njyunzhi/invoice/service/ITaInvoiceOrgService.java

@@ -1,6 +1,7 @@
 package com.njyunzhi.invoice.service;
 
 import com.njyunzhi.invoice.entity.TaInvoiceOrg;
+import com.njyunzhi.invoice.entity.TaInvoicePerson;
 
 /**
  * <p>
@@ -12,4 +13,7 @@ import com.njyunzhi.invoice.entity.TaInvoiceOrg;
  */
 public interface ITaInvoiceOrgService extends IBaseService<TaInvoiceOrg> {
 
+    TaInvoiceOrg getByOrgName(String invoiceId, String orgName);
+
+    TaInvoiceOrg createByPerson(TaInvoicePerson taInvoicePerson);
 }

src/main/java/com/njyunzhi/invoice/service/ITaInvoicePersonService.java

@@ -1,6 +1,9 @@
 package com.njyunzhi.invoice.service;
 
 import com.njyunzhi.invoice.entity.TaInvoicePerson;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,4 +15,9 @@ import com.njyunzhi.invoice.entity.TaInvoicePerson;
  */
 public interface ITaInvoicePersonService extends IBaseService<TaInvoicePerson> {
 
+    List<TaInvoicePerson> getByName(String invoiceId, String invoiceOrgId, String name);
+
+    boolean createNew(TaInvoicePerson taInvoicePerson) throws Exception;
+
+    void batchUpload(String invoiceId, MultipartFile file) throws Exception;
 }

src/main/java/com/njyunzhi/invoice/service/impl/TaInvoiceDetailServiceImpl.java

@@ -6,6 +6,8 @@ import com.njyunzhi.invoice.service.ITaInvoiceDetailService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+
 /**
  * <p>
  * 报销明细 服务实现类
@@ -17,4 +19,18 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaInvoiceDetailServiceImpl extends ServiceImpl<TaInvoiceDetailMapper, TaInvoiceDetail> implements ITaInvoiceDetailService {
 
+    @Override
+    public boolean createBatch(String invoiceId) throws Exception {
+        // 先删除原有数据
+        removeByMap(new HashMap<String, Object>(){{
+            put("invoice_id", invoiceId);
+        }});
+
+        return baseMapper.createBatch(invoiceId) > 0;
+    }
+
+    @Override
+    public TaInvoiceDetail getByPerson(String invoiceId, String personId) {
+        return baseMapper.getByPerson(invoiceId, personId);
+    }
 }

src/main/java/com/njyunzhi/invoice/service/impl/TaInvoiceFillServiceImpl.java

@@ -3,7 +3,6 @@ package com.njyunzhi.invoice.service.impl;
 import com.njyunzhi.invoice.entity.TaInvoiceFill;
 import com.njyunzhi.invoice.mapper.TaInvoiceFillMapper;
 import com.njyunzhi.invoice.service.ITaInvoiceFillService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -15,6 +14,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-07-04
  */
 @Service
-public class TaInvoiceFillServiceImpl extends ServiceImpl<TaInvoiceFillMapper, TaInvoiceFill> implements ITaInvoiceFillService {
+public class TaInvoiceFillServiceImpl extends BaseServiceImpl<TaInvoiceFillMapper, TaInvoiceFill> implements ITaInvoiceFillService {
 
 }

src/main/java/com/njyunzhi/invoice/service/impl/TaInvoiceOrgServiceImpl.java

@@ -1,6 +1,9 @@
 package com.njyunzhi.invoice.service.impl;
 
+import com.njyunzhi.invoice.common.Constants;
+import com.njyunzhi.invoice.common.DateUtils;
 import com.njyunzhi.invoice.entity.TaInvoiceOrg;
+import com.njyunzhi.invoice.entity.TaInvoicePerson;
 import com.njyunzhi.invoice.mapper.TaInvoiceOrgMapper;
 import com.njyunzhi.invoice.service.ITaInvoiceOrgService;
 import org.springframework.stereotype.Service;
@@ -16,4 +19,19 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaInvoiceOrgServiceImpl extends BaseServiceImpl<TaInvoiceOrgMapper, TaInvoiceOrg> implements ITaInvoiceOrgService {
 
+    @Override
+    public TaInvoiceOrg getByOrgName(String invoiceId, String orgName) {
+        return baseMapper.getByInvoiceAndOrgName(invoiceId, orgName);
+    }
+
+    @Override
+    public TaInvoiceOrg createByPerson(TaInvoicePerson taInvoicePerson) {
+        TaInvoiceOrg taInvoiceOrg = new TaInvoiceOrg();
+        taInvoiceOrg.setName(taInvoicePerson.getOrgName());
+        taInvoiceOrg.setStatus(Constants.STATUS_NORMAL);
+        taInvoiceOrg.setCreateDate(DateUtils.now());
+
+        save(taInvoiceOrg);
+        return taInvoiceOrg;
+    }
 }

src/main/java/com/njyunzhi/invoice/service/impl/TaInvoicePersonServiceImpl.java

@@ -1,9 +1,21 @@
 package com.njyunzhi.invoice.service.impl;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.read.listener.PageReadListener;
+import com.alibaba.excel.support.ExcelTypeEnum;
+import com.njyunzhi.invoice.common.Constants;
+import com.njyunzhi.invoice.common.DateUtils;
+import com.njyunzhi.invoice.entity.TaInvoiceOrg;
 import com.njyunzhi.invoice.entity.TaInvoicePerson;
+import com.njyunzhi.invoice.mapper.TaInvoiceOrgMapper;
 import com.njyunzhi.invoice.mapper.TaInvoicePersonMapper;
 import com.njyunzhi.invoice.service.ITaInvoicePersonService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -16,4 +28,63 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaInvoicePersonServiceImpl extends BaseServiceImpl<TaInvoicePersonMapper, TaInvoicePerson> implements ITaInvoicePersonService {
 
+    @Autowired
+    TaInvoiceOrgMapper taInvoiceOrgMapper;
+
+    @Override
+    public List<TaInvoicePerson> getByName(String invoiceId, String invoiceOrgId, String name) {
+        return baseMapper.getByName(invoiceId, invoiceOrgId, name);
+    }
+
+    @Override
+    public boolean createNew(TaInvoicePerson taInvoicePerson) throws Exception {
+        TaInvoiceOrg taInvoiceOrg = taInvoiceOrgMapper.getByInvoiceAndOrgName(taInvoicePerson.getInvoiceId(), taInvoicePerson.getOrgName());
+        if (null == taInvoiceOrg) {
+            taInvoiceOrg = createByPerson(taInvoicePerson);
+        }
+        taInvoicePerson.setInvoiceOrgId(taInvoiceOrg.getInvoiceOrgId());
+
+        List<TaInvoicePerson> list = getByName(taInvoicePerson.getInvoiceId(), taInvoicePerson.getInvoiceOrgId(), taInvoicePerson.getName());
+        if (null != list && list.size() > 0) {
+            throw new Exception("人员名称重复");
+        }
+
+        taInvoicePerson.setStatus(Constants.STATUS_NORMAL);
+        taInvoicePerson.setCreateDate(DateUtils.now());
+
+        return save(taInvoicePerson);
+    }
+
+    @Override
+    public void batchUpload(String invoiceId, MultipartFile file) throws Exception {
+        LocalDateTime now = DateUtils.now();
+        EasyExcel.read(file.getInputStream(), TaInvoicePerson.class, new PageReadListener<TaInvoicePerson>(list -> {
+            for(TaInvoicePerson person : list) {
+                TaInvoiceOrg taInvoiceOrg = taInvoiceOrgMapper.getByInvoiceAndOrgName(invoiceId, person.getOrgName());
+                if (null == taInvoiceOrg) {
+                    taInvoiceOrg = createByPerson(person);
+                }
+                person.setInvoiceOrgId(taInvoiceOrg.getInvoiceOrgId());
+
+                List<TaInvoicePerson> exists = getByName(invoiceId, person.getInvoiceOrgId(), person.getName());
+                if (null != exists && exists.size() > 0) {
+                    continue;
+                }
+
+                person.setStatus(Constants.STATUS_NORMAL);
+                person.setCreateDate(now);
+                baseMapper.insert(person);
+            }
+        })).excelType(ExcelTypeEnum.XLSX).sheet().headRowNumber(1).doRead();
+    }
+
+    private TaInvoiceOrg createByPerson(TaInvoicePerson taInvoicePerson) {
+        TaInvoiceOrg taInvoiceOrg = new TaInvoiceOrg();
+        taInvoiceOrg.setName(taInvoicePerson.getOrgName());
+        taInvoiceOrg.setStatus(Constants.STATUS_NORMAL);
+        taInvoiceOrg.setCreateDate(DateUtils.now());
+
+        taInvoiceOrgMapper.insert(taInvoiceOrg);
+        return taInvoiceOrg;
+    }
 }

src/main/resources/mapper/SysBankMapper.xml

@@ -2,18 +2,4 @@
 <!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/TaInvoiceDetailMapper.xml

@@ -2,4 +2,68 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njyunzhi.invoice.mapper.TaInvoiceDetailMapper">
 
+    <insert id="createBatch">
+
+        INSERT INTO ta_invoice_detail (
+            `detail_id`,
+            `invoice_id`,
+            `invoice_person_id`,
+            `person_id`,
+            `person_name`,
+            `invoice_org_id`,
+            `org_id`,
+            `org_name`,
+            `tax_no`,
+            `address`,
+            `phone`,
+            `bank_id`,
+            `bank_name`,
+            `card_no`,
+            `invoice_item_tpl_id`,
+            `item_name`,
+            `charge`,
+            `merge_remark`,
+            `stay_remark`,
+            `status`,
+            `create_date`
+        ) SELECT
+              UUID_SHORT( ),
+              t.invoice_id,
+              t.invoice_person_id,
+              NULL,
+              t.`name`,
+              t.invoice_org_id,
+              NULL,
+              t.org_name,
+              NULL,
+              NULL,
+              NULL,
+              NULL,
+              NULL,
+              NULL,
+              s.invoice_item_tpl_id,
+              s.`name`,
+              s.charge,
+              NULL,
+              NULL,
+              1,
+              now( )
+        FROM
+            ta_invoice_person t
+                INNER JOIN ta_invoice_item_tpl s ON t.invoice_id = s.invoice_id
+        WHERE
+            t.invoice_id = #{invoiceId}
+          AND t.`status` &gt; -1
+          AND s.`status` &gt; -1
+    </insert>
+    <select id="getByPerson" resultType="com.njyunzhi.invoice.entity.TaInvoiceDetail">
+        SELECT
+            *
+        FROM
+            ta_invoice_detail t
+        WHERE
+            t.invoice_id = #{invoiceId}
+          AND t.person_id = #{personId}
+          AND t.`status` &gt; -1
+    </select>
 </mapper>

src/main/resources/mapper/TaInvoiceFillMapper.xml

@@ -1,5 +1,4 @@
 <?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>

src/main/resources/mapper/TaInvoiceOrgMapper.xml

@@ -2,4 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njyunzhi.invoice.mapper.TaInvoiceOrgMapper">
 
+    <select id="getByInvoiceAndOrgName" resultType="com.njyunzhi.invoice.entity.TaInvoiceOrg">
+        SELECT
+            *
+        FROM
+            ta_invoice_person t
+        WHERE
+            t.`status` &gt; -1
+          AND t.invoice_id = #{invoiceId}
+          AND t.org_name = #{orgName}
+    </select>
 </mapper>

src/main/resources/mapper/TaInvoicePersonMapper.xml

@@ -2,4 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njyunzhi.invoice.mapper.TaInvoicePersonMapper">
 
+    <select id="getByName" resultType="com.njyunzhi.invoice.entity.TaInvoicePerson">
+        SELECT
+            *
+        FROM
+            ta_invoice_person t
+        WHERE
+            t.invoice_id = #{invoiceId}
+          AND t.invoice_org_id = #{invoiceOrgId}
+          AND t.`name` = #{name}
+          AND t.`status` &gt; -1
+    </select>
 </mapper>