feats

pom.xml

@@ -15,8 +15,6 @@
 	<description>发票填报</description>
 	<properties>
 		<java.version>1.8</java.version>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -134,14 +132,19 @@
 						<directory>src/main/resources</directory>
 						<filtering>true</filtering>
 						<includes>
-							<include>**/*.xlsx</include>
 							<include>**/*.xml</include>
-							<include>**/*.p12</include>
-							<include>**/*.pem</include>
 							<include>application.yml</include>
 							<include>application-${profileActive}.yml</include>
 						</includes>
 					</resource>
+					<resource>
+						<directory>src/main/resources</directory>
+						<includes>
+							<include>**/*.xlsx</include>
+							<include>**/*.p12</include>
+							<include>**/*.pem</include>
+						</includes>
+					</resource>
 				</resources>
 			</build>
 		</profile>
@@ -192,23 +195,19 @@
 					<resource>
 						<directory>src/main/resources</directory>
 						<filtering>true</filtering>
-						<excludes>
-							<exclude>application.yml</exclude>
-							<exclude>application-*.yml</exclude>
-						</excludes>
+						<includes>
+							<include>**/*.xml</include>
+							<include>application.yml</include>
+							<include>application-${profileActive}.yml</include>
+						</includes>
 					</resource>
 					<resource>
 						<directory>src/main/resources</directory>
-						<filtering>true</filtering>
 						<includes>
 							<include>**/*.xlsx</include>
-							<include>**/*.xml</include>
 							<include>**/*.p12</include>
 							<include>**/*.pem</include>
-							<include>application.yml</include>
-							<include>application-${profileActive}.yml</include>
 						</includes>
-						<targetPath>${project.build.directory}/config</targetPath>
 					</resource>
 				</resources>
 			</build>

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

@@ -0,0 +1,15 @@
+package com.njyunzhi.invoice.common;
+
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+@Component
+public class FileUtil {
+    public InputStream getResourceFile(String path) throws IOException {
+        ClassPathResource classPathResource = new ClassPathResource(path);
+        return classPathResource.getInputStream();
+    }
+}

src/main/java/com/njyunzhi/invoice/common/excel/MergeRowStrategy.java

@@ -0,0 +1,76 @@
+package com.njyunzhi.invoice.common.excel;
+
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.write.merge.AbstractMergeStrategy;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.util.CellRangeAddress;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MergeRowStrategy extends AbstractMergeStrategy {
+
+    // 对比数据源
+    List<Object> dataList;
+
+    // 从第几行开始合并
+    Integer rowStart;
+
+    // 第几列 从 0 开始
+    Integer column;
+
+    // 已经处理到第几行
+    int processedRow;
+
+    public MergeRowStrategy(List<Object> dataList, Integer rowStart, Integer column) {
+        this.dataList = dataList;
+        this.rowStart = null == rowStart || rowStart < 0 ? 0 : rowStart;
+        this.column = null == column || column < 0 ? 0 : column;
+    }
+
+    @Override
+    protected void merge(Sheet sheet, Cell cell, Head head, Integer relativeRowIndex) {
+        CellRangeAddress cellRange = getCellRange(sheet, cell);
+        if (null != cellRange) {
+            sheet.addMergedRegionUnsafe(cellRange);
+        }
+    }
+
+    private CellRangeAddress getCellRange(Sheet sheet, Cell cell) {
+        int rowIndex = cell.getRowIndex();
+        int columnIndex = cell.getColumnIndex();
+
+        // 如果不是需要处理的列, 不处理
+        if (column != columnIndex) return null;
+        // 如果当前行小于起始数据合并行, 不处理
+        if (rowStart > rowIndex) return null;
+        // 如果当前行已经处理过, 不处理
+        if (processedRow >= rowIndex) return null;
+
+        // 从当前行查询数据, 一直查询相同内容行
+        // excel 数据行与 datalist 数据行, index 差值就是 rowStart
+        int dataIndex = rowIndex - rowStart;
+        int sameRow = 0;
+        Object val = dataList.get(dataIndex); // 当前行数据
+        for (int i = dataIndex; i < dataList.size(); i += 1) {
+            if (i + 1 >= dataList.size()) break;
+
+            Object nextVal = dataList.get(i + 1);
+            boolean found = null == val && nextVal == null || (val != null && val.equals(nextVal));
+            if (found) {
+                sameRow ++;
+//                continue;
+            } else {
+                break;
+            }
+        }
+
+        if (sameRow > 0) {
+            processedRow = rowIndex + processedRow;
+            return new CellRangeAddress(rowIndex, processedRow, column, column);
+        }
+
+        return null;
+    }
+}

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

@@ -3,12 +3,8 @@ package com.njyunzhi.invoice.controller;
 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.common.*;
+import com.njyunzhi.invoice.entity.*;
 import com.njyunzhi.invoice.service.ITaInvoiceFillService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -22,9 +18,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.njyunzhi.invoice.service.ITaInvoiceDetailService;
-import com.njyunzhi.invoice.entity.TaInvoiceDetail;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * <p>
     * 报销明细 前端控制器
@@ -54,22 +52,18 @@ public class TaInvoiceDetailController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/admin/invoice/{invoiceId}/detail",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    @RequestMapping(value="/admin/invoice/{invoiceId}/detail-tpl",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,
                                      @ApiParam("班级ID") @PathVariable(value ="invoiceId") String invoiceId) throws Exception{
 
         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);
+        IPage<TaInvoiceDetail> result = iTaInvoiceDetailService.getTplPageBy(pg, invoiceId);
         return ResponseBean.success(result);
     }
 
-    @RequestMapping(value="/admin/invoice/{invoiceId}/detail",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/invoice/{invoiceId}/detail-tpl",method= RequestMethod.POST)
     @ApiOperation(value="一键生成", notes = "一键生成", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taInvoiceDetailAdd(@ApiParam("班级ID") @PathVariable(value ="invoiceId") String invoiceId) throws Exception{
 
@@ -80,55 +74,67 @@ public class TaInvoiceDetailController extends BaseController {
         }
     }
 
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/admin/invoice/detail/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taInvoiceDetailDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
-        if(iTaInvoiceDetailService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+
+    @RequestMapping(value="/admin/invoice/{invoiceId}/detail-tpl/item",method= RequestMethod.POST)
+    @ApiOperation(value="添加或者修改项目", notes = "添加或者修改项目", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean createNew(@ApiParam("班级ID") @PathVariable(value ="invoiceId") String invoiceId,
+                                  @ApiParam("报销项目") @RequestBody TaInvoiceItem taInvoiceItem) throws Exception {
+
+        if (StringUtils.isEmpty(taInvoiceItem.getInvoicePersonId())) {
+            return ResponseBean.error("未设置绑定人员");
         }
-    }
 
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param taInvoiceDetail 实体对象
-     * @return
-     */
-    @RequestMapping(value="/admin/invoice/{invoiceId}/detail/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taInvoiceDetailUpdate(@ApiParam("班级ID") @PathVariable(value ="invoiceId") String invoiceId,
-                                              @ApiParam("对象ID") @PathVariable String id,
-                                              @ApiParam("更新内容") @RequestBody TaInvoiceDetail taInvoiceDetail) throws Exception{
+        if (StringUtils.isEmpty(taInvoiceItem.getName()) || null == taInvoiceItem.getCharge()) {
+            return ResponseBean.error("报销项目名称或者金额不能为空");
+        }
 
-        taInvoiceDetail.setDetailId(id);
-        taInvoiceDetail.setInvoiceId(invoiceId);
-        if (iTaInvoiceDetailService.updateById(taInvoiceDetail)){
-            return ResponseBean.success(iTaInvoiceDetailService.getById(id));
-        }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        taInvoiceItem.setInvoiceId(invoiceId);
+        if (iTaInvoiceDetailService.createOrUpdateItem(taInvoiceItem)){
+            return ResponseBean.success("ok");
+        } else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
-    @RequestMapping(value="/h5/invoice/{invoiceId}/detail/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/invoice/{invoiceId}/detail-tpl/item/{itemId}",method= RequestMethod.POST)
+    @ApiOperation(value="添加或者修改项目", notes = "添加或者修改项目", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean createNew(@ApiParam("班级ID") @PathVariable(value ="invoiceId") String invoiceId,
+                                  @ApiParam("报销项目ITEM") @PathVariable(value ="itemId") Integer itemId) throws Exception {
+        if (iTaInvoiceDetailService.deleteItem(invoiceId, itemId)){
+            return ResponseBean.success("ok");
+        } else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    @RequestMapping(value="/h5/invoice/{invoiceId}/detail",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{
+                                       @ApiParam("更新内容") @RequestBody TaInvoiceDetail taInvoiceDetail) throws Exception {
 
-        TaPerson taPerson = currentPerson();
+        if (StringUtils.isEmpty(taInvoiceDetail.getInvoicePersonId())) {
+            return ResponseBean.error("未选择报销人员");
+        }
+
+        if (null == taInvoiceDetail.getItemList() || taInvoiceDetail.getItemList().size() < 1) {
+            return ResponseBean.error("未找到报销明细");
+        }
 
-        taInvoiceDetail.setDetailId(id);
+        TaInvoiceFill taInvoiceFill = iTaInvoiceFillService.getById(invoiceId);
+        if (null == taInvoiceFill || taInvoiceFill.getStatus() == Constants.STATUS_DELETE) {
+            return ResponseBean.error("报销单不存在");
+        }
+
+        if (getIsFinished(taInvoiceFill)) {
+            return ResponseBean.error("报销单确认已结束");
+        }
+
+        TaPerson taPerson = currentPerson();
         taInvoiceDetail.setPersonId(taPerson.getPersonId());
         taInvoiceDetail.setInvoiceId(invoiceId);
-        if (iTaInvoiceDetailService.updateById(taInvoiceDetail)){
-            return ResponseBean.success(iTaInvoiceDetailService.getById(id));
-        }else {
+        if (iTaInvoiceDetailService.createOrMergeInvoiceDetail(taInvoiceDetail)){
+            return ResponseBean.success(taInvoiceDetail);
+        } else {
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
@@ -138,43 +144,58 @@ public class TaInvoiceDetailController extends BaseController {
                 DateUtils.now().isAfter(taInvoiceFill.getEndDate());
     }
 
+    @RequestMapping(value="/h5/invoice/{invoiceId}/detail",method= RequestMethod.GET)
+    @ApiOperation(value="获取报销单信息", notes = "获取报销单信息", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getDetailByPerson(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                          @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                          @ApiParam("班级ID") @PathVariable(value ="invoiceId") String invoiceId,
+                                          @ApiParam("人员名称") @RequestParam(value ="personName", required = false) String personName) throws Exception{
 
-    @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{
+        IPage<TaInvoiceDetail> page = new Page<>(pageNum, pageSize);
+        return ResponseBean.success(iTaInvoiceDetailService.getPersonPage(page, invoiceId, personName));
+    }
+
+    @RequestMapping(value="/h5/invoice/{invoiceId}/detail/info",method= RequestMethod.GET)
+    @ApiOperation(value="获取报销单信息", notes = "获取报销单信息", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getDetailByPerson(@ApiParam("班级ID") @PathVariable(value ="invoiceId") String invoiceId,
+                                          @ApiParam("人员ID") @RequestParam(value ="personId", required = false) String personId,
+                                          @ApiParam("报销人员ID") @RequestParam(value ="invoicePersonId", required = false) String invoicePersonId) 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("找不到报销数据或者您不在此次名单中");
+        if (StringUtils.isEmpty(personId) && StringUtils.isEmpty(invoicePersonId)) {
+            return ResponseBean.error("人员ID不存在");
         }
 
-        taInvoiceDetail.setIsFinished(getIsFinished(taInvoiceFill));
-        return ResponseBean.success(taInvoiceDetail);
-    }
+        boolean isFinished = getIsFinished(taInvoiceFill);
 
-    @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{
+        TaInvoiceDetail taInvoiceDetailTPl = null;
+        if (!StringUtils.isEmpty(invoicePersonId)) {
+            taInvoiceDetailTPl = iTaInvoiceDetailService.getTplByPerson(invoiceId, invoicePersonId);
+            if (null != taInvoiceDetailTPl) {
+                taInvoiceDetailTPl.setIsFinished(isFinished);
+            }
+        }
 
-        TaInvoiceFill taInvoiceFill = iTaInvoiceFillService.getById(invoiceId);
-        if (null == taInvoiceFill || taInvoiceFill.getStatus() != Constants.STATUS_NORMAL) {
-            return ResponseBean.error("报销单不存在");
+        TaInvoiceDetail taInvoiceDetail = null;
+        if (!StringUtils.isEmpty(personId)) {
+            taInvoiceDetail = iTaInvoiceDetailService.getByPerson(invoiceId, personId);
+            if (null != taInvoiceDetail) {
+                taInvoiceDetail.setIsFinished(isFinished);
+            }
         }
 
-        TaPerson taPerson = currentPerson();
-        TaInvoiceDetail taInvoiceDetail = iTaInvoiceDetailService.getById(id);
-        if (null == taInvoiceDetail || taInvoiceDetail.getStatus() == Constants.STATUS_DELETE || !taPerson.getPersonId().equals(taInvoiceDetail.getPersonId())) {
-            return ResponseBean.error("找不到报销数据详情");
+        if (null == taInvoiceDetail && null == taInvoiceDetailTPl) {
+            return ResponseBean.error("找不到报销数据信息");
         }
 
-        taInvoiceDetail.setIsFinished(getIsFinished(taInvoiceFill));
-        return ResponseBean.success(taInvoiceDetail);
+        Map<String, Object> resp = new HashMap<>();
+        resp.put("detail", taInvoiceDetail);
+        resp.put("tpl", taInvoiceDetailTPl);
+
+        return ResponseBean.success(resp);
     }
 }

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

@@ -1,15 +1,24 @@
 package com.njyunzhi.invoice.controller;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.support.ExcelTypeEnum;
+import com.alibaba.excel.write.merge.AbstractMergeStrategy;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.metadata.fill.FillConfig;
 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.common.*;
+import com.njyunzhi.invoice.common.excel.MergeRowStrategy;
+import com.njyunzhi.invoice.entity.TaInvoiceDetail;
+import com.njyunzhi.invoice.service.ITaInvoiceDetailService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Sheet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +31,11 @@ import com.njyunzhi.invoice.service.ITaInvoiceFillService;
 import com.njyunzhi.invoice.entity.TaInvoiceFill;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.InputStream;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -43,6 +56,11 @@ public class TaInvoiceFillController extends BaseController {
     @Autowired
     public ITaInvoiceFillService iTaInvoiceFillService;
 
+    @Autowired
+    public ITaInvoiceDetailService iTaInvoiceDetailService;
+
+    @Autowired
+    FileUtil fileUtil;
 
     /**
      * 分页查询列表
@@ -71,6 +89,39 @@ public class TaInvoiceFillController extends BaseController {
         return ResponseBean.success(result);
     }
 
+    @RequestMapping(value="/admin/invoice/{id}/export",method= RequestMethod.POST)
+    @ApiOperation(value="导出", notes = "导出", httpMethod = "POST", response = ResponseBean.class)
+    public void export(@ApiParam("班级ID") @PathVariable String id,
+                               HttpServletResponse response) throws Exception {
+        TaInvoiceFill invoiceFill = iTaInvoiceFillService.getById(id);
+        if (null == invoiceFill) {
+            throw new Exception("为找到班级信息");
+        }
+
+        // 获取填报信息
+        List<TaInvoiceDetail> list = iTaInvoiceDetailService.getListByMainId(id);
+
+        String tplPath = "excel/invoice_tpl.xlsx";  // 相对 resource 目录位置
+        InputStream inputStream = fileUtil.getResourceFile(tplPath);
+        String expFile = String.format("%s开票信息表.xlsx", invoiceFill.getName());
+
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename="+expFile);
+//        EasyExcel.write(response.getOutputStream(), TaInvoiceDetail.class)
+//                .withTemplate(inputStream)
+//                .excelType(ExcelTypeEnum.XLSX)
+//                .sheet()
+//                .doFill(list);
+
+        List<Object> mergeDataList = list.stream().map(x -> x.getPersonName()).collect(Collectors.toList());
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), TaInvoiceDetail.class).build();
+        WriteSheet writeSheet = EasyExcel.writerSheet().registerWriteHandler(new MergeRowStrategy(mergeDataList, 2, 0)).build();
+        FillConfig fillConfig = FillConfig.builder().forceNewRow(true).build();
+
+        excelWriter.fill(list, fillConfig, writeSheet);
+    }
+
     /**
      * 保存对象
      * @param taInvoiceFill 实体对象
@@ -133,4 +184,16 @@ public class TaInvoiceFillController extends BaseController {
     public ResponseBean taInvoiceFillGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         return ResponseBean.success(iTaInvoiceFillService.getById(id));
     }
+
+
+    @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("报销单不存在");
+        }
+
+        return ResponseBean.success(taInvoiceFill);
+    }
 }

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

@@ -8,6 +8,7 @@ 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.entity.TaPerson;
 import com.njyunzhi.invoice.service.ITaInvoiceOrgService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -92,6 +93,7 @@ public class TaInvoicePersonController extends BaseController {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
+
     /**
      * 批量导入
      * @return
@@ -111,11 +113,30 @@ public class TaInvoicePersonController extends BaseController {
     @RequestMapping(value="/admin/invoice/{invoiceId}/person/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
     public ResponseBean taInvoicePersonDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
-        if(iTaInvoicePersonService.removeLogicById(id)){
+        if (iTaInvoicePersonService.removeLogicById(id)) {
             return ResponseBean.success("success");
-        }else {
+        } else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
+
+//    /**
+//     * 根据id删除对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/h5/invoice/{invoiceId}/person/{id}/bind", method= RequestMethod.DELETE)
+//    @ApiOperation(value="绑定人员", notes = "绑定人员", httpMethod = "DELETE", response = ResponseBean.class)
+//    public ResponseBean bind(@ApiParam("班级ID") @PathVariable String invoiceId,
+//                             @ApiParam("人员ID") @PathVariable String id) throws Exception {
+//
+//        TaInvoicePerson taInvoicePerson = iTaInvoicePersonService.getByPerson(invoiceId, id);
+//        TaPerson taPerson = currentPerson();
+//
+//        if(iTaInvoicePersonService.bind(taInvoicePerson, taPerson)){
+//            return ResponseBean.success("success");
+//        }else {
+//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
 }

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

@@ -1,11 +1,15 @@
 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 java.util.List;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -22,7 +26,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
+@ExcelIgnoreUnannotated
 @ApiModel(value="TaInvoiceDetail对象", description="报销明细")
 public class TaInvoiceDetail implements Serializable {
 
@@ -41,6 +45,7 @@ public class TaInvoiceDetail implements Serializable {
     @ApiModelProperty(value = "映射人员ID")
     private String personId;
 
+    @ExcelProperty(index = 1)
     @ApiModelProperty(value = "人员名称")
     private String personName;
 
@@ -53,39 +58,49 @@ public class TaInvoiceDetail implements Serializable {
     @ApiModelProperty(value = "所属单位ID")
     private String orgId;
 
+    @ExcelProperty(index = 2)
     @ApiModelProperty(value = "单位名称")
     private String orgName;
 
+    @ExcelProperty(index = 3)
     @ApiModelProperty(value = "税号")
     private String taxNo;
 
+    @ExcelProperty(index = 4)
     @ApiModelProperty(value = "地址")
     private String address;
 
+    @ExcelProperty(index = 5)
     @ApiModelProperty(value = "电话")
     private String phone;
 
     @ApiModelProperty(value = "银行ID")
     private String bankId;
 
+    @ExcelProperty(index = 6)
     @ApiModelProperty(value = "银行名称")
     private String bankName;
 
+    @ExcelProperty(index = 7)
     @ApiModelProperty(value = "开户行账号")
     private String cardNo;
 
     @ApiModelProperty(value = "报销项目ID")
     private Integer invoiceItemTplId;
 
+    @ExcelProperty(index = 8)
     @ApiModelProperty(value = "报销项目")
     private String itemName;
 
+    @ExcelProperty(index = 9)
     @ApiModelProperty(value = "开票金额")
     private String charge;
 
+    @ExcelProperty(index = 10)
     @ApiModelProperty(value = "合开备注")
     private String mergeRemark;
 
+    @ExcelProperty(index = 11)
     @ApiModelProperty(value = "住宿清单")
     private String stayRemark;
 
@@ -98,4 +113,8 @@ public class TaInvoiceDetail implements Serializable {
     @ApiModelProperty("是否结束")
     @TableField(exist = false)
     private Boolean isFinished;
+
+    @ApiModelProperty("报销明细")
+    @TableField(exist = false)
+    private List<TaInvoiceItem> itemList;
 }

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

@@ -0,0 +1,113 @@
+package com.njyunzhi.invoice.entity;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 报销明细模板
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-07-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ExcelIgnoreUnannotated
+@ApiModel(value="TaInvoiceDetailTpl对象", description="报销明细模板")
+public class TaInvoiceDetailTpl implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "明细ID")
+    @TableId(value = "detail_id", type = IdType.INPUT)
+    private String detailId;
+
+    @ApiModelProperty(value = "报销ID")
+    private String invoiceId;
+
+    @ApiModelProperty(value = "人员ID")
+    private String invoicePersonId;
+
+    @ApiModelProperty(value = "映射人员ID")
+    private String personId;
+
+    @ExcelProperty(index = 1)
+    @ApiModelProperty(value = "人员名称")
+    private String personName;
+
+    @ApiModelProperty(value = "开票单位ID")
+    private String invoiceOrgId;
+
+    @ApiModelProperty(value = "开票单位名称")
+    private String invoiceOrgName;
+
+    @ApiModelProperty(value = "所属单位ID")
+    private String orgId;
+
+    @ExcelProperty(index = 2)
+    @ApiModelProperty(value = "单位名称")
+    private String orgName;
+
+    @ExcelProperty(index = 3)
+    @ApiModelProperty(value = "税号")
+    private String taxNo;
+
+    @ExcelProperty(index = 4)
+    @ApiModelProperty(value = "地址")
+    private String address;
+
+    @ExcelProperty(index = 5)
+    @ApiModelProperty(value = "电话")
+    private String phone;
+
+    @ApiModelProperty(value = "银行ID")
+    private String bankId;
+
+    @ExcelProperty(index = 6)
+    @ApiModelProperty(value = "银行名称")
+    private String bankName;
+
+    @ExcelProperty(index = 7)
+    @ApiModelProperty(value = "开户行账号")
+    private String cardNo;
+
+    @ApiModelProperty(value = "报销项目ID")
+    private Integer invoiceItemTplId;
+
+    @ExcelProperty(index = 8)
+    @ApiModelProperty(value = "报销项目")
+    private String itemName;
+
+    @ExcelProperty(index = 9)
+    @ApiModelProperty(value = "开票金额")
+    private String charge;
+
+    @ExcelProperty(index = 10)
+    @ApiModelProperty(value = "合开备注")
+    private String mergeRemark;
+
+    @ExcelProperty(index = 11)
+    @ApiModelProperty(value = "住宿清单")
+    private String stayRemark;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "创建日期")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty("是否结束")
+    @TableField(exist = false)
+    private Boolean isFinished;
+}

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

@@ -0,0 +1,58 @@
+package com.njyunzhi.invoice.entity;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 报销项目
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-07-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaInvoiceItem对象", description="报销项目")
+public class TaInvoiceItem implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "项目ID")
+    @TableId(value = "invoice_item_id", type = IdType.AUTO)
+    private Integer invoiceItemId;
+
+    @ApiModelProperty(value = "报销人员ID")
+    private String invoicePersonId;
+
+    @ApiModelProperty(value = "报销ID")
+    private String invoiceId;
+
+    @ApiModelProperty(value = "项目名称")
+    private String name;
+
+    @ApiModelProperty(value = "开票额")
+    private Integer charge;
+
+    @ApiModelProperty(value = "合开备注")
+    private String mergeRemark;
+
+    @ApiModelProperty(value = "住宿清单")
+    private String stayRemark;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "创建日期")
+    private LocalDateTime createDate;
+}

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

@@ -30,6 +30,9 @@ public class TaInvoiceOrg implements Serializable {
     @TableId(value = "invoice_org_id", type = IdType.ASSIGN_UUID)
     private String invoiceOrgId;
 
+    @ApiModelProperty(value = "班级ID")
+    private String invoiceId;
+
     @ApiModelProperty(value = "映射ID")
     private String orgId;
 

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

@@ -1,10 +1,14 @@
 package com.njyunzhi.invoice.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.njyunzhi.invoice.entity.TaInvoiceDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njyunzhi.invoice.entity.TaInvoiceDetailTpl;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报销明细 Mapper 接口
@@ -18,5 +22,17 @@ public interface TaInvoiceDetailMapper extends BaseMapper<TaInvoiceDetail> {
 
     int createBatch(@Param("invoiceId") String invoiceId);
 
-    TaInvoiceDetail getByPerson(@Param("invoiceId") String invoiceId,@Param("personId") String personId);
+    TaInvoiceDetail getByPerson(@Param("invoiceId") String invoiceId, @Param("personId") String personId);
+
+    List<TaInvoiceDetail> getListByMainId(@Param("invoiceId") String invoiceId);
+
+    int updatePerson(@Param("invoiceId") String invoiceId, @Param("invoicePersonId") String invoicePersonId, @Param("personId") String personId);
+
+    IPage<TaInvoiceDetail> getTplPageBy(IPage<TaInvoiceDetail> pg, @Param("invoiceId") String invoiceId);
+
+    int removeTplById(@Param("id") String id);
+
+    IPage<TaInvoiceDetail> getPersonPage(IPage<TaInvoiceDetail> page, @Param("invoiceId") String invoiceId, @Param("personName") String personName);
+
+    TaInvoiceDetail getTplByPerson(@Param("invoiceId") String invoiceId, @Param("invoicePersonId") String invoicePersonId);
 }

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

@@ -0,0 +1,19 @@
+package com.njyunzhi.invoice.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njyunzhi.invoice.entity.TaInvoiceDetailTpl;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 报销明细模板 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-07-04
+ */
+@Mapper
+public interface TaInvoiceDetailTplMapper extends BaseMapper<TaInvoiceDetailTpl> {
+    TaInvoiceDetailTpl getByPerson(@Param("invoiceId") String invoiceId, @Param("invoicePersonId") String invoicePersonId);
+}

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

@@ -0,0 +1,24 @@
+package com.njyunzhi.invoice.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njyunzhi.invoice.entity.TaInvoiceItem;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 报销项目模板 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-07-04
+ */
+@Mapper
+public interface TaInvoiceItemMapper extends BaseMapper<TaInvoiceItem> {
+
+    int createBatch(@Param("invoiceId") String invoiceId);
+
+    TaInvoiceItem getByPersonAndName(@Param("invoiceId") String invoiceId,
+                                     @Param("invoicePersonId") String invoicePersonId,
+                                     @Param("name") String name);
+}

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

@@ -3,6 +3,7 @@ package com.njyunzhi.invoice.mapper;
 import com.njyunzhi.invoice.entity.TaInvoiceItemTpl;
 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 TaInvoiceItemTplMapper extends BaseMapper<TaInvoiceItemTpl> {
 
+    TaInvoiceItemTpl getByName(@Param("invoiceId") String invoiceId, @Param("name") String name);
 }

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

@@ -1,7 +1,12 @@
 package com.njyunzhi.invoice.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.njyunzhi.invoice.entity.TaInvoiceDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.njyunzhi.invoice.entity.TaInvoiceDetailTpl;
+import com.njyunzhi.invoice.entity.TaInvoiceItem;
+
+import java.util.List;
 
 /**
  * <p>
@@ -16,4 +21,18 @@ public interface ITaInvoiceDetailService extends IService<TaInvoiceDetail> {
     boolean createBatch(String invoiceId) throws Exception;
 
     TaInvoiceDetail getByPerson(String invoiceId, String personId);
+
+    List<TaInvoiceDetail> getListByMainId(String invoiceId);
+
+    IPage<TaInvoiceDetail> getTplPageBy(IPage<TaInvoiceDetail> pg, String invoiceId);
+
+    TaInvoiceDetail getTplByPerson(String invoiceId, String invoicePersonId);
+
+    IPage<TaInvoiceDetail> getPersonPage(IPage<TaInvoiceDetail> page, String invoiceId, String personName);
+
+    boolean createOrMergeInvoiceDetail(TaInvoiceDetail taInvoiceDetail);
+
+    boolean createOrUpdateItem(TaInvoiceItem taInvoiceItem) throws Exception;
+
+    boolean deleteItem(String invoiceId, Integer itemId);
 }

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

@@ -0,0 +1,16 @@
+package com.njyunzhi.invoice.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njyunzhi.invoice.entity.TaInvoiceItem;
+
+/**
+ * <p>
+ * 报销项目模板 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-07-04
+ */
+public interface ITaInvoiceItemService extends IService<TaInvoiceItem> {
+
+}

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

@@ -1,6 +1,7 @@
 package com.njyunzhi.invoice.service;
 
 import com.njyunzhi.invoice.entity.TaInvoicePerson;
+import com.njyunzhi.invoice.entity.TaPerson;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -20,4 +21,8 @@ public interface ITaInvoicePersonService extends IBaseService<TaInvoicePerson> {
     boolean createNew(TaInvoicePerson taInvoicePerson) throws Exception;
 
     void batchUpload(String invoiceId, MultipartFile file) throws Exception;
+
+    TaInvoicePerson getByPerson(String invoiceId, String invoicePerson) throws Exception;
+
+    boolean bind(TaInvoicePerson taInvoicePerson, TaPerson taPerson) throws Exception;
 }

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

@@ -1,12 +1,24 @@
 package com.njyunzhi.invoice.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.njyunzhi.invoice.common.Constants;
+import com.njyunzhi.invoice.common.DateUtils;
 import com.njyunzhi.invoice.entity.TaInvoiceDetail;
+import com.njyunzhi.invoice.entity.TaInvoiceDetailTpl;
+import com.njyunzhi.invoice.entity.TaInvoiceItem;
+import com.njyunzhi.invoice.entity.TaInvoiceItemTpl;
 import com.njyunzhi.invoice.mapper.TaInvoiceDetailMapper;
+import com.njyunzhi.invoice.mapper.TaInvoiceDetailTplMapper;
+import com.njyunzhi.invoice.mapper.TaInvoiceItemMapper;
+import com.njyunzhi.invoice.mapper.TaInvoiceItemTplMapper;
 import com.njyunzhi.invoice.service.ITaInvoiceDetailService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -19,18 +31,98 @@ import java.util.HashMap;
 @Service
 public class TaInvoiceDetailServiceImpl extends ServiceImpl<TaInvoiceDetailMapper, TaInvoiceDetail> implements ITaInvoiceDetailService {
 
+    @Autowired
+    TaInvoiceDetailTplMapper taInvoiceDetailTplMapper;
+
+    @Autowired
+    TaInvoiceItemMapper taInvoiceItemMapper;
+
+    @Autowired
+    TaInvoiceItemTplMapper taInvoiceItemTplMapper;
+
     @Override
     public boolean createBatch(String invoiceId) throws Exception {
         // 先删除原有数据
-        removeByMap(new HashMap<String, Object>(){{
+        Map<String, Object> con = new HashMap<String, Object>(){{
             put("invoice_id", invoiceId);
-        }});
+        }};
+        taInvoiceItemMapper.deleteByMap(con);
 
-        return baseMapper.createBatch(invoiceId) > 0;
+        return taInvoiceItemMapper.createBatch(invoiceId) > 0;
     }
 
     @Override
     public TaInvoiceDetail getByPerson(String invoiceId, String personId) {
         return baseMapper.getByPerson(invoiceId, personId);
     }
+
+    @Override
+    public List<TaInvoiceDetail> getListByMainId(String invoiceId) {
+        return baseMapper.getListByMainId(invoiceId);
+    }
+
+    @Override
+    public IPage<TaInvoiceDetail> getTplPageBy(IPage<TaInvoiceDetail> pg, String invoiceId) {
+        return baseMapper.getTplPageBy(pg, invoiceId);
+    }
+
+    @Override
+    public TaInvoiceDetail getTplByPerson(String invoiceId, String invoicePersonId) {
+        return baseMapper.getTplByPerson(invoiceId, invoicePersonId);
+    }
+
+    @Override
+    public IPage<TaInvoiceDetail> getPersonPage(IPage<TaInvoiceDetail> page, String invoiceId, String personName) {
+        return baseMapper.getPersonPage(page, invoiceId, personName);
+    }
+
+    @Override
+    public boolean createOrMergeInvoiceDetail(TaInvoiceDetail taInvoiceDetail) {
+        // 更新报销项目
+        for (TaInvoiceItem item : taInvoiceDetail.getItemList()) {
+            taInvoiceItemMapper.updateById(item);
+        }
+
+        // 查询原始记录
+        TaInvoiceDetail origin = baseMapper.getByPerson(taInvoiceDetail.getInvoiceId(), taInvoiceDetail.getPersonId());
+
+        // 如果不是新生成, 二次编辑
+        if (null != origin) {
+            origin.setInvoiceOrgId(taInvoiceDetail.getInvoiceOrgId());
+            origin.setInvoiceOrgName(taInvoiceDetail.getInvoiceOrgName());
+            origin.setOrgId(taInvoiceDetail.getOrgId());
+            origin.setOrgName(taInvoiceDetail.getOrgName());
+            origin.setTaxNo(taInvoiceDetail.getTaxNo());
+            origin.setAddress(taInvoiceDetail.getAddress());
+            origin.setPhone(taInvoiceDetail.getPhone());
+            origin.setBankId(taInvoiceDetail.getBankId());
+            origin.setBankName(taInvoiceDetail.getBankName());
+            origin.setCardNo(taInvoiceDetail.getCardNo());
+            origin.setPersonId(taInvoiceDetail.getPersonId());
+
+            return updateById(origin);
+        }
+
+        // 否则就是全新生成
+        return save(taInvoiceDetail);
+    }
+
+    @Override
+    public boolean createOrUpdateItem(TaInvoiceItem taInvoiceItem) throws Exception {
+        TaInvoiceItem origin = taInvoiceItemMapper.getByPersonAndName(taInvoiceItem.getInvoiceId(), taInvoiceItem.getInvoicePersonId(), taInvoiceItem.getName());
+        if (origin != null) {
+            origin.setCharge(taInvoiceItem.getCharge());
+            return taInvoiceItemMapper.updateById(origin) > 0;
+        }
+
+        taInvoiceItem.setStatus(Constants.STATUS_NORMAL);
+        taInvoiceItem.setCreateDate(DateUtils.now());
+
+        return taInvoiceItemMapper.insert(taInvoiceItem) > 0;
+    }
+
+    @Override
+    public boolean deleteItem(String invoiceId, Integer itemId) {
+        return taInvoiceItemMapper.deleteById(itemId) > 0;
+    }
 }

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

@@ -0,0 +1,20 @@
+package com.njyunzhi.invoice.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njyunzhi.invoice.entity.TaInvoiceItem;
+import com.njyunzhi.invoice.mapper.TaInvoiceItemMapper;
+import com.njyunzhi.invoice.service.ITaInvoiceItemService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 报销项目模板 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-07-04
+ */
+@Service
+public class TaInvoiceItemServiceImpl extends ServiceImpl<TaInvoiceItemMapper, TaInvoiceItem> implements ITaInvoiceItemService {
+
+}

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

@@ -5,8 +5,12 @@ 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.common.StringUtils;
+import com.njyunzhi.invoice.entity.TaInvoiceDetail;
 import com.njyunzhi.invoice.entity.TaInvoiceOrg;
 import com.njyunzhi.invoice.entity.TaInvoicePerson;
+import com.njyunzhi.invoice.entity.TaPerson;
+import com.njyunzhi.invoice.mapper.TaInvoiceDetailMapper;
 import com.njyunzhi.invoice.mapper.TaInvoiceOrgMapper;
 import com.njyunzhi.invoice.mapper.TaInvoicePersonMapper;
 import com.njyunzhi.invoice.service.ITaInvoicePersonService;
@@ -31,6 +35,9 @@ public class TaInvoicePersonServiceImpl extends BaseServiceImpl<TaInvoicePersonM
     @Autowired
     TaInvoiceOrgMapper taInvoiceOrgMapper;
 
+    @Autowired
+    TaInvoiceDetailMapper taInvoiceDetailMapper;
+
     @Override
     public List<TaInvoicePerson> getByName(String invoiceId, String invoiceOrgId, String name) {
         return baseMapper.getByName(invoiceId, invoiceOrgId, name);
@@ -60,6 +67,9 @@ public class TaInvoicePersonServiceImpl extends BaseServiceImpl<TaInvoicePersonM
         LocalDateTime now = DateUtils.now();
         EasyExcel.read(file.getInputStream(), TaInvoicePerson.class, new PageReadListener<TaInvoicePerson>(list -> {
             for(TaInvoicePerson person : list) {
+                if (StringUtils.isEmpty(person.getOrgName()) || StringUtils.isEmpty(person.getName())) continue;
+
+                person.setInvoiceId(invoiceId);
                 TaInvoiceOrg taInvoiceOrg = taInvoiceOrgMapper.getByInvoiceAndOrgName(invoiceId, person.getOrgName());
                 if (null == taInvoiceOrg) {
                     taInvoiceOrg = createByPerson(person);
@@ -78,8 +88,39 @@ public class TaInvoicePersonServiceImpl extends BaseServiceImpl<TaInvoicePersonM
         })).excelType(ExcelTypeEnum.XLSX).sheet().headRowNumber(1).doRead();
     }
 
+    @Override
+    public TaInvoicePerson getByPerson(String invoiceId, String invoicePerson) throws Exception {
+        TaInvoicePerson taInvoicePerson = getById(invoicePerson);
+        if (null == taInvoicePerson || !taInvoicePerson.getInvoiceId().equals(invoiceId)) {
+            return null;
+        }
+
+        return taInvoicePerson;
+    }
+
+    @Override
+    public boolean bind(TaInvoicePerson taInvoicePerson, TaPerson taPerson) throws Exception {
+        if (null == taInvoicePerson || null == taPerson) return false;
+
+        boolean bound = taPerson.getPersonId().equals(taInvoicePerson.getPersonId());
+        if (bound) return true;
+
+        if (!StringUtils.isEmpty(taInvoicePerson.getPersonId())) {
+            throw new Exception("选择人员已绑定其他人");
+        }
+
+        taInvoicePerson.setPersonId(taPerson.getPersonId());
+        updateById(taInvoicePerson);
+
+        // 如果已经生成明细, 则同步更新明细信息
+        taInvoiceDetailMapper.updatePerson(taInvoicePerson.getInvoiceId(), taInvoicePerson.getInvoicePersonId(), taPerson.getPersonId());
+
+        return true;
+    }
+
     private TaInvoiceOrg createByPerson(TaInvoicePerson taInvoicePerson) {
         TaInvoiceOrg taInvoiceOrg = new TaInvoiceOrg();
+        taInvoiceOrg.setInvoiceId(taInvoicePerson.getInvoiceId());
         taInvoiceOrg.setName(taInvoicePerson.getOrgName());
         taInvoiceOrg.setStatus(Constants.STATUS_NORMAL);
         taInvoiceOrg.setCreateDate(DateUtils.now());

src/main/resources/mapper/TaInvoiceDetailMapper.xml

@@ -4,7 +4,7 @@
 
     <insert id="createBatch">
 
-        INSERT INTO ta_invoice_detail (
+        INSERT INTO ta_invoice_detail_tpl (
             `detail_id`,
             `invoice_id`,
             `invoice_person_id`,
@@ -43,21 +43,30 @@
               NULL,
               NULL,
               NULL,
-              s.invoice_item_tpl_id,
-              s.`name`,
-              s.charge,
+              NULL,
+              NULL,
+              NULL,
               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>
+    <update id="updatePerson">
+        UPDATE ta_invoice_detail t
+        SET t.person_id = #{personId}
+        WHERE
+            t.invoice_id = #{invoiceId}
+          AND t.invoice_person_id = #{invoicePersonId}
+    </update>
+    <delete id="removeTplById">
+        DELETE FROM ta_invoice_detail_tpl
+        WHERE detail_id = #{id}
+    </delete>
     <select id="getByPerson" resultType="com.njyunzhi.invoice.entity.TaInvoiceDetail">
         SELECT
             *
@@ -68,4 +77,101 @@
           AND t.person_id = #{personId}
           AND t.`status` &gt; -1
     </select>
+    <select id="getListByMainId" resultType="com.njyunzhi.invoice.entity.TaInvoiceDetail">
+        SELECT
+            t.`detail_id`,
+            t.`invoice_id`,
+            t.`invoice_person_id`,
+            t.`person_id`,
+            t.`person_name`,
+            t.`invoice_org_id`,
+            t.`invoice_org_name`,
+            t.`org_id`,
+            t.`org_name`,
+            t.`tax_no`,
+            t.`address`,
+            t.`phone`,
+            t.`bank_id`,
+            t.`bank_name`,
+            t.`card_no`,
+            s.`invoice_item_id`,
+            s.`name` AS item_name,
+            s.`charge`,
+            s.`merge_remark`,
+            s.`stay_remark`,
+            t.`status`,
+            t.`create_date`
+        FROM
+            ta_invoice_detail t
+                INNER JOIN ta_invoice_item s ON t.invoice_id = s.invoice_id
+        WHERE
+            t.invoice_id = #{invoiceId}
+        ORDER BY
+            t.org_name ASC,
+            t.person_name ASC,
+            s.`name` ASC
+    </select>
+    <select id="getTplPageBy" resultType="com.njyunzhi.invoice.entity.TaInvoiceDetail">
+        SELECT
+            t.`invoice_person_id`,
+            t.`person_id`,
+            t.`invoice_org_id`,
+            t.`name` AS `person_name`,
+            t.`phone`,
+            t.`status`,
+            t.`create_date`,
+            t.`invoice_id`,
+            t.`org_name` AS invoice_org_name,
+            s.`invoice_item_id`,
+            s.`name` AS item_name,
+            s.`charge`
+        FROM
+            ta_invoice_person t
+                INNER JOIN ta_invoice_item s ON t.invoice_person_id = s.invoice_person_id
+        WHERE
+            t.invoice_id = #{invoiceId}
+          AND t.`status` &gt; -1
+          AND s.`status` &gt; 1
+        ORDER BY
+            t.org_name ASC,
+            t.`name` ASC,
+            s.`name` ASC
+    </select>
+    <select id="getPersonPage" resultType="com.njyunzhi.invoice.entity.TaInvoiceDetail">
+        SELECT
+            t.*
+        FROM
+            ta_invoice_detail t
+        WHERE
+            t.invoice_id = #{invoiceId}
+          <if test="personName != null and personName != ''">
+              AND t.person_name LIKE CONCAT( '%', #{personName}, '%' )
+          </if>
+        GROUP BY
+            t.person_id
+        ORDER BY
+            t.org_name ASC,
+            t.person_name ASC
+    </select>
+    <select id="getTplByPerson" resultType="com.njyunzhi.invoice.entity.TaInvoiceDetail">
+        SELECT
+            t.`invoice_person_id`,
+            t.`person_id`,
+            t.`invoice_org_id`,
+            t.`name` AS `person_name`,
+            t.`phone`,
+            t.`status`,
+            t.`create_date`,
+            t.`invoice_id`,
+            t.`org_name` AS invoice_org_name
+        FROM
+            ta_invoice_person t
+        WHERE
+            t.invoice_id = #{invoiceId}
+          AND t.`invoice_person_id` = #{invoicePersonId}
+          AND t.`status` &gt; -1
+        ORDER BY
+            t.org_name ASC,
+            t.`name` ASC
+    </select>
 </mapper>

src/main/resources/mapper/TaInvoiceDetailTplMapper.xml

@@ -0,0 +1,14 @@
+<?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.TaInvoiceDetailTplMapper">
+
+    <select id="getByPerson" resultType="com.njyunzhi.invoice.entity.TaInvoiceDetailTpl">
+        SELECT
+            *
+        FROM
+            ta_invoice_detail_tpl t
+        WHERE
+            t.invoice_id = #{invoiceId}
+          AND t.invoice_person_id = #{invoicePersonId}
+    </select>
+</mapper>

src/main/resources/mapper/TaInvoiceItemMapper.xml

@@ -0,0 +1,33 @@
+<?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.TaInvoiceItemMapper">
+
+    <insert id="createBatch">
+        INSERT INTO ta_invoice_item ( `invoice_person_id`, `invoice_id`, `charge`, `name`, `status`, `create_date` )
+        SELECT
+            s.`invoice_person_id`,
+            t.`invoice_id`,
+            t.`charge`,
+            t.`name`,
+            1,
+            now( )
+        FROM
+            ta_invoice_item_tpl t
+            INNER JOIN ta_invoice_person s ON t.invoice_id = s.invoice_id
+        WHERE
+            t.invoice_id = #{invoiceId}
+          AND t.`status` = 1
+          AND s.`status` &gt; -1
+    </insert>
+    <select id="getByPersonAndName" resultType="com.njyunzhi.invoice.entity.TaInvoiceItem">
+        SELECT
+            *
+        FROM
+            ta_invoice_item t
+        WHERE
+            t.invoice_id = #{invoiceId}
+          AND t.`invoice_person_id` = #{invoicePersonId}
+          AND t.`name` = #{name}
+          AND t.`status` = 1
+    </select>
+</mapper>

src/main/resources/mapper/TaInvoiceItemTplMapper.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.TaInvoiceItemTplMapper">
 
+    <select id="getByName" resultType="com.njyunzhi.invoice.entity.TaInvoiceItemTpl">
+        SELECT
+            *
+        FROM
+            ta_invoice_item_tpl t
+        WHERE
+            t.invoice_id = #{invoiceId}
+          AND t.`name` = #{name}
+          AND t.`status` = 1
+    </select>
 </mapper>