报销详情、人员报销详情数据导出功能开发

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAccountant/controller/AccountantReimbursementBusinessController.java

@@ -5,17 +5,23 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.jeeplus.aop.demo.annotation.DemoMode;
 import com.jeeplus.aop.logging.annotation.ApiLog;
+import com.jeeplus.core.excel.ExcelOptions;
+import com.jeeplus.core.excel.utils.EasyPoiUtil;
 import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.test.reimbursementAccountant.domain.dto.AccountantReimbursementBusinessDTO;
 import com.jeeplus.test.reimbursementAccountant.domain.dto.AccountantReimbursementBusinessReturnDTO;
 import com.jeeplus.test.reimbursementAccountant.domain.dto.AccountantReimbursementDTO;
 import com.jeeplus.test.reimbursementAccountant.domain.dto.AccountantReimbursementUserDTO;
 import com.jeeplus.test.reimbursementAccountant.service.AccountantReimbursementBusinessService;
+import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementBusinessDTO;
+import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementBusinessReturnDTO;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
 /**
@@ -122,13 +128,48 @@ public class AccountantReimbursementBusinessController {
     @ApiLog("查询业务报销信息列表")
     @PreAuthorize("hasAuthority('accountant:reimbursementBusiness:view')")
     @GetMapping("findListByBusinessCodeId")
-    public ResponseEntity findListByBusinessCodeId(String id) {
-        if(StringUtils.isBlank(id)){
+    public ResponseEntity findListByBusinessCodeId(AccountantReimbursementBusinessDTO reimbursementBusiness) {
+        if(StringUtils.isBlank(reimbursementBusiness.getBusinessCodeId())){
             return ResponseEntity.badRequest ().body ("请先选择业务信息");
         }
-        AccountantReimbursementBusinessDTO reimbursementBusiness = new AccountantReimbursementBusinessDTO();
-        reimbursementBusiness.setBusinessCodeId(id);
         AccountantReimbursementBusinessReturnDTO info = service.findListByBusinessCodeId(reimbursementBusiness);
         return ResponseEntity.ok(info);
     }
+
+
+    /**
+     * 导出中审众环人员信息数据
+     * @param reimbursementBusiness
+     * @param response
+     * @throws Exception
+     */
+    @ApiLog("人员报销详情导出")
+    @GetMapping("exportBusinessExcel")
+    @ApiOperation(value = "人员报销详情导出Excel")
+    public void exportBusinessExcel(AccountantReimbursementBusinessDTO reimbursementBusiness, ExcelOptions options, HttpServletResponse response) {
+        String fileName = options.getFilename ( );
+
+        AccountantReimbursementBusinessReturnDTO info = service.findListByBusinessCodeId(reimbursementBusiness);
+        for (AccountantReimbursementBusinessDTO businessInfo : info.getList()) {
+            if(StringUtils.isNotBlank(businessInfo.getReimbursementAddress())){
+                switch (businessInfo.getReimbursementAddress()){
+                    case "1":
+                        businessInfo.setReimbursementAddress("总所报销");
+                        break;
+                    case "0":
+                        businessInfo.setReimbursementAddress("分所报销");
+                        break;
+                    default:
+                        businessInfo.setReimbursementAddress("——");
+                        break;
+
+                }
+            }else{
+                businessInfo.setReimbursementAddress("——");
+            }
+            businessInfo.setBusinessCode(info.getBusinessCode());
+        }
+
+        EasyPoiUtil.exportExcel ( info.getList(), info.getYear() + "年【" + info.getBusinessCode() + "】" + "批次报销详情",  options.getSheetName ( ), AccountantReimbursementBusinessDTO.class, fileName, response );
+    }
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAccountant/controller/AccountantReimbursementUserController.java

@@ -12,10 +12,14 @@ import com.jeeplus.core.excel.utils.EasyPoiUtil;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.DictUtils;
 import com.jeeplus.sys.utils.StringUtils;
+import com.jeeplus.test.reimbursementAccountant.domain.dto.AccountantReimbursementBusinessDTO;
 import com.jeeplus.test.reimbursementAccountant.domain.dto.AccountantReimbursementBusinessReturnDTO;
 import com.jeeplus.test.reimbursementAccountant.domain.dto.AccountantReimbursementUserDTO;
 import com.jeeplus.test.reimbursementAccountant.service.AccountantReimbursementUserService;
 import com.jeeplus.test.reimbursementAssess.domain.dto.AssessReimbursementUserDTO;
+import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementBusinessDTO;
+import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementBusinessReturnDTO;
+import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementUserDTO;
 import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementUserImportDTO;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -278,4 +282,40 @@ public class AccountantReimbursementUserController {
         }
         EasyPoiUtil.exportExcel ( result, "兴光会计人员信息数据",  options.getSheetName ( ), AccountantReimbursementUserDTO.class, fileName, response );
     }
+
+
+    /**
+     * 导出中审众环人员信息数据
+     * @param reimbursementBusinessReturnDTO
+     * @param response
+     * @throws Exception
+     */
+    @ApiLog("人员报销详情导出")
+    @GetMapping("exportUserBusinessExcel")
+    @ApiOperation(value = "人员报销详情导出Excel")
+    public void exportUserBusinessExcel(AccountantReimbursementBusinessReturnDTO reimbursementBusinessReturnDTO, ExcelOptions options, HttpServletResponse response) {
+        String fileName = options.getFilename ( );
+
+
+        //根据id查询人员填报的报销信息
+        AccountantReimbursementUserDTO reimbursementUserDTO = service.queryById(reimbursementBusinessReturnDTO.getUserId());
+
+        AccountantReimbursementBusinessReturnDTO info = service.findListByUserId(reimbursementUserDTO,reimbursementBusinessReturnDTO);
+        for (AccountantReimbursementBusinessDTO businessInfo : info.getList()) {
+            switch (businessInfo.getReimbursementAddress()){
+                case "1":
+                    businessInfo.setReimbursementAddress("总所报销");
+                    break;
+                case "0":
+                    businessInfo.setReimbursementAddress("分所报销");
+                    break;
+                default:
+                    businessInfo.setReimbursementAddress("——");
+                    break;
+
+            }
+        }
+
+        EasyPoiUtil.exportExcel ( info.getList(), "人员报销详情",  options.getSheetName ( ), AccountantReimbursementBusinessDTO.class, fileName, response );
+    }
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAccountant/domain/dto/AccountantReimbursementBusinessDTO.java

@@ -1,5 +1,6 @@
 package com.jeeplus.test.reimbursementAccountant.domain.dto;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jeeplus.core.domain.BaseEntity;
 import lombok.Data;
@@ -19,24 +20,37 @@ public class AccountantReimbursementBusinessDTO extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
+    @Excel(name = "报销人",width = 10)
+    private String userName;  //报销人
+    @Excel(name = "报销人部门",width = 12)
+    private String userOfficeName;  //报销人员所属部门
+    @Excel(name = "报销批次",width = 10)
     private String businessCode;  //报销批次
-    private String reimbursementBatch;  //业务编号
-    private String businessCodeId;  //业务编号Id
+    private String businessCodeId;  //报销批次Id
     private String userId;  //报销人id
-    private String userName;  //报销人
+    @Excel(name = "报销年份",width = 10)
     private String year;    //报销年份
     private String reimbursementQuota;  //年报销额度
     private String reimbursementQuotaDay;  //日报销额度
-    private String reimbursementDay;  //报销天数
     private String surplusReimbursementDay;  //剩余报销天数
+    @Excel(name = "报销类型",width = 10)
     private String reimbursementType;  //报销类型（1：正常报销；2：补差）
+    @Excel(name = "实发类型",width = 12)
     private String reimbursementFsalary;  //实发类型（1：报销不实发；2：报销并实发）
+    @Excel(name = "报销天数",width = 10, type = 10)
+    private String reimbursementDay;  //报销天数
+    @Excel(name = "报销额度",width = 10, type = 10)
     private String reimbursementAmount;  //报销额度
+    @Excel(name = "报销时间",width = 20,exportFormat  = "yyyy-MM-dd HH:mm:ss")
+    private Date createDate;
     private String remainReimbursementAmount;  //剩余报销额度
+    @Excel(name = "备注",width = 20)
     private String remarks; //备注
+    @Excel(name = "报销部门",width = 10)
     private String officeType; //部门类型（1:中审众环；2：兴光会计；3：兴光项目；4：兴光评估）
-    private String userOfficeName; //报销人员所属部门
+    @Excel(name = "报销来源",width = 10)
     private String reimbursementAddress;  //地区类型（0：正常报销；1：武汉）
+
     /**
      * 报销开始日期
      */

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAccountant/domain/dto/AccountantReimbursementBusinessReturnDTO.java

@@ -31,6 +31,8 @@ public class AccountantReimbursementBusinessReturnDTO {
     private String reimbursementAddress;  //地区类型（0：正常报销；1：武汉）
 
     private String userId;  //报销人员id
+    private String userName;  //报销人员姓名
+    private String businessCode; //报销批次
     private String year; //报销年份
     private String officeType; //部门类型（1:中审众环；2：兴光会计；3：兴光项目；4：兴光评估）
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAccountant/mapper/xml/AccountantReimbursementBusinessMapper.xml

@@ -266,6 +266,28 @@
         <where>
             a.del_flag = 0
             and a.business_code_id = #{businessCodeId}
+
+            <if test="reimbursementAddress != null and reimbursementAddress != ''">
+                and a.reimbursement_address = #{reimbursementAddress}
+            </if>
+            <if test="reimbursementFsalary != null and reimbursementFsalary != ''">
+                and a.reimbursement_fsalary = #{reimbursementFsalary}
+            </if>
+            <if test="beginReimbursementQuota != null and beginReimbursementQuota != ''">
+                and a.reimbursement_amount >= #{beginReimbursementQuota}
+            </if>
+            <if test="endReimbursementQuota != null and endReimbursementQuota != ''">
+                and a.reimbursement_amount &lt;= #{endReimbursementQuota}
+            </if>
+            <if test="beginDate != null">
+                and a.create_date >= #{beginDate}
+            </if>
+            <if test="endDate != null">
+                and a.create_date &lt;= #{endDate}
+            </if>
+            <if test="userId != null and userId != ''">
+                and a.user_id = #{userId}
+            </if>
         </where>
         order by a.update_date desc,a.year desc, a.user_id asc
     </select>
@@ -276,6 +298,7 @@
         <include refid="reimbursementBusinessColumns"/>
         ,zri.business_code as "businessCode"
         ,zri.reimbursement_batch as "reimbursementBatch"
+        ,(SELECT NAME FROM sys_office WHERE id = ( (case when (SELECT substring_index( substring_index( parent_ids, ',', 3 ), ',', - 1 ) FROM sys_office WHERE id = su.office_id ) = '' then (select id FROM sys_office WHERE id = su.office_id )  else (SELECT substring_index( substring_index( parent_ids, ',', 3 ), ',', - 1 ) FROM sys_office WHERE id = su.office_id ) end) )) AS 'userOfficeName'
         FROM zs_reimbursement_business_info a
         <include refid="reimbursementUserJoinColumns"/>
         left join (select <include refid="reimbursementColumns"/> from zs_reimbursement_info

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAccountant/service/impl/AccountantReimbursementBusinessServiceImpl.java

@@ -15,6 +15,7 @@ import com.jeeplus.test.reimbursementAccountant.mapper.AccountantReimbursementBu
 import com.jeeplus.test.reimbursementAccountant.mapper.AccountantReimbursementSysMapper;
 import com.jeeplus.test.reimbursementAccountant.mapper.AccountantReimbursementUserMapper;
 import com.jeeplus.test.reimbursementAccountant.service.AccountantReimbursementBusinessService;
+import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -281,10 +282,14 @@ public class AccountantReimbursementBusinessServiceImpl implements AccountantRei
 
     @Override
     public AccountantReimbursementBusinessReturnDTO findListByBusinessCodeId(AccountantReimbursementBusinessDTO reimbursementBusiness) {
+        //查询报销批次信息
+        AccountantReimbursementDTO reimbursementDTO = reimbursementSysMapper.queryBusinessById(reimbursementBusiness.getBusinessCodeId());
+
         List<AccountantReimbursementBusinessDTO> list = mapper.findListByBusinessCodeId(reimbursementBusiness);
         for (AccountantReimbursementBusinessDTO info : list) {
             info.setReimbursementType(DictUtils.getDictLabel(info.getReimbursementType(), "reimbursement_type", null));
             info.setReimbursementFsalary(DictUtils.getDictLabel(info.getReimbursementFsalary(), "reimbursement_fsalary", null));
+            info.setOfficeType(DictUtils.getDictLabel(info.getOfficeType(), "reimbursement_office_type", null));
         }
         AccountantReimbursementBusinessReturnDTO reimbursementBusinessReturnDTO = new AccountantReimbursementBusinessReturnDTO();
         //获取业务报销信息
@@ -296,6 +301,8 @@ public class AccountantReimbursementBusinessServiceImpl implements AccountantRei
         reimbursementBusinessReturnDTO.setAlreadyReimbursementAmount(business.getAllAlreadyReimbursementQuota());
         //总报销额度
         reimbursementBusinessReturnDTO.setReimbursementQuota(business.getCanReimbursementAmount());
+        reimbursementBusinessReturnDTO.setYear(reimbursementDTO.getYear());
+        reimbursementBusinessReturnDTO.setBusinessCode(reimbursementDTO.getBusinessCode());
         return reimbursementBusinessReturnDTO;
     }
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAccountant/service/impl/AccountantReimbursementUserServiceImpl.java

@@ -205,6 +205,8 @@ public class AccountantReimbursementUserServiceImpl implements AccountantReimbur
         //获取人员年度报销详情
         AccountantReimbursementUserDTO reimbursementUserInfo = mapper.queryByUserIdAndYear(reimbursementUserDTO);
         reimbursementBusinessReturnDTO.setList(showList);
+        reimbursementBusinessReturnDTO.setUserName(reimbursementUserInfo.getUserName());
+        reimbursementBusinessReturnDTO.setYear(reimbursementUserInfo.getYear());
         reimbursementBusinessReturnDTO.setReimbursementQuota(reimbursementUserInfo.getReimbursementQuota());
 
         //已报销额度

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAssess/controller/AssessReimbursementBusinessController.java

@@ -5,17 +5,24 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.jeeplus.aop.demo.annotation.DemoMode;
 import com.jeeplus.aop.logging.annotation.ApiLog;
+import com.jeeplus.core.excel.ExcelOptions;
+import com.jeeplus.core.excel.utils.EasyPoiUtil;
 import com.jeeplus.sys.utils.StringUtils;
+import com.jeeplus.test.reimbursementAccountant.domain.dto.AccountantReimbursementBusinessDTO;
 import com.jeeplus.test.reimbursementAssess.domain.dto.AssessReimbursementBusinessDTO;
 import com.jeeplus.test.reimbursementAssess.domain.dto.AssessReimbursementBusinessReturnDTO;
 import com.jeeplus.test.reimbursementAssess.domain.dto.AssessReimbursementDTO;
 import com.jeeplus.test.reimbursementAssess.domain.dto.AssessReimbursementUserDTO;
 import com.jeeplus.test.reimbursementAssess.service.AssessReimbursementBusinessService;
+import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementBusinessDTO;
+import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementBusinessReturnDTO;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
 /**
@@ -122,13 +129,47 @@ public class AssessReimbursementBusinessController {
     @ApiLog("查询业务报销信息列表")
     @PreAuthorize("hasAuthority('assess:reimbursementBusiness:view')")
     @GetMapping("findListByBusinessCodeId")
-    public ResponseEntity findListByBusinessCodeId(String id) {
-        if(StringUtils.isBlank(id)){
+    public ResponseEntity findListByBusinessCodeId(AssessReimbursementBusinessDTO reimbursementBusiness) {
+        if(StringUtils.isBlank(reimbursementBusiness.getBusinessCodeId())){
             return ResponseEntity.badRequest ().body ("请先选择业务信息");
         }
-        AssessReimbursementBusinessDTO reimbursementBusiness = new AssessReimbursementBusinessDTO();
-        reimbursementBusiness.setBusinessCodeId(id);
         AssessReimbursementBusinessReturnDTO info = service.findListByBusinessCodeId(reimbursementBusiness);
         return ResponseEntity.ok(info);
     }
+
+
+    /**
+     * 导出中审众环人员信息数据
+     * @param reimbursementBusiness
+     * @param response
+     * @throws Exception
+     */
+    @ApiLog("人员报销详情导出")
+    @GetMapping("exportBusinessExcel")
+    @ApiOperation(value = "人员报销详情导出Excel")
+    public void exportBusinessExcel(AssessReimbursementBusinessDTO reimbursementBusiness, ExcelOptions options, HttpServletResponse response) {
+        String fileName = options.getFilename ( );
+        AssessReimbursementBusinessReturnDTO info = service.findListByBusinessCodeId(reimbursementBusiness);
+        for (AssessReimbursementBusinessDTO businessInfo : info.getList()) {
+            if(StringUtils.isNotBlank(businessInfo.getReimbursementAddress())){
+                switch (businessInfo.getReimbursementAddress()){
+                    case "1":
+                        businessInfo.setReimbursementAddress("总所报销");
+                        break;
+                    case "0":
+                        businessInfo.setReimbursementAddress("分所报销");
+                        break;
+                    default:
+                        businessInfo.setReimbursementAddress("——");
+                        break;
+
+                }
+            }else{
+                businessInfo.setReimbursementAddress("——");
+            }
+            businessInfo.setBusinessCode(info.getBusinessCode());
+        }
+
+        EasyPoiUtil.exportExcel ( info.getList(), info.getYear() + "年【" + info.getBusinessCode() + "】" + "批次报销详情",  options.getSheetName ( ), AssessReimbursementBusinessDTO.class, fileName, response );
+    }
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAssess/controller/AssessReimbursementUserController.java

@@ -12,9 +12,12 @@ import com.jeeplus.core.excel.utils.EasyPoiUtil;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.DictUtils;
 import com.jeeplus.sys.utils.StringUtils;
+import com.jeeplus.test.reimbursementAssess.domain.dto.AssessReimbursementBusinessDTO;
 import com.jeeplus.test.reimbursementAssess.domain.dto.AssessReimbursementBusinessReturnDTO;
 import com.jeeplus.test.reimbursementAssess.domain.dto.AssessReimbursementUserDTO;
 import com.jeeplus.test.reimbursementAssess.service.AssessReimbursementUserService;
+import com.jeeplus.test.reimbursementProject.domain.dto.ProjectReimbursementBusinessDTO;
+import com.jeeplus.test.reimbursementProject.domain.dto.ProjectReimbursementBusinessReturnDTO;
 import com.jeeplus.test.reimbursementProject.domain.dto.ProjectReimbursementUserDTO;
 import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementUserImportDTO;
 import io.swagger.annotations.ApiOperation;
@@ -278,4 +281,40 @@ public class AssessReimbursementUserController {
         }
         EasyPoiUtil.exportExcel ( result, "兴光评估人员信息数据",  options.getSheetName ( ), AssessReimbursementUserDTO.class, fileName, response );
     }
+
+
+    /**
+     * 导出中审众环人员信息数据
+     * @param reimbursementBusinessReturnDTO
+     * @param response
+     * @throws Exception
+     */
+    @ApiLog("人员报销详情导出")
+    @GetMapping("exportUserBusinessExcel")
+    @ApiOperation(value = "人员报销详情导出Excel")
+    public void exportUserBusinessExcel(AssessReimbursementBusinessReturnDTO reimbursementBusinessReturnDTO, ExcelOptions options, HttpServletResponse response) {
+        String fileName = options.getFilename ( );
+
+
+        //根据id查询人员填报的报销信息
+        AssessReimbursementUserDTO reimbursementUserDTO = service.queryById(reimbursementBusinessReturnDTO.getUserId());
+
+        AssessReimbursementBusinessReturnDTO info = service.findListByUserId(reimbursementUserDTO,reimbursementBusinessReturnDTO);
+        for (AssessReimbursementBusinessDTO businessInfo : info.getList()) {
+            switch (businessInfo.getReimbursementAddress()){
+                case "1":
+                    businessInfo.setReimbursementAddress("总所报销");
+                    break;
+                case "0":
+                    businessInfo.setReimbursementAddress("分所报销");
+                    break;
+                default:
+                    businessInfo.setReimbursementAddress("——");
+                    break;
+
+            }
+        }
+
+        EasyPoiUtil.exportExcel ( info.getList(), "人员报销详情",  options.getSheetName ( ), AssessReimbursementBusinessDTO.class, fileName, response );
+    }
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAssess/domain/dto/AssessReimbursementBusinessDTO.java

@@ -1,5 +1,6 @@
 package com.jeeplus.test.reimbursementAssess.domain.dto;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jeeplus.core.domain.BaseEntity;
 import lombok.Data;
@@ -19,23 +20,37 @@ public class AssessReimbursementBusinessDTO extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-    private String businessCode;  //业务编号
-    private String businessCodeId;  //业务编号Id
-    private String userId;  //报销人id
+    @Excel(name = "报销人",width = 10)
     private String userName;  //报销人
+    @Excel(name = "报销人部门",width = 12)
+    private String userOfficeName;  //报销人员所属部门
+    @Excel(name = "报销批次",width = 10)
+    private String businessCode;  //报销批次
+    private String businessCodeId;  //报销批次Id
+    private String userId;  //报销人id
+    @Excel(name = "报销年份",width = 10)
     private String year;    //报销年份
     private String reimbursementQuota;  //年报销额度
     private String reimbursementQuotaDay;  //日报销额度
-    private String reimbursementDay;  //报销天数
     private String surplusReimbursementDay;  //剩余报销天数
+    @Excel(name = "报销类型",width = 10)
     private String reimbursementType;  //报销类型（1：正常报销；2：补差）
+    @Excel(name = "实发类型",width = 12)
     private String reimbursementFsalary;  //实发类型（1：报销不实发；2：报销并实发）
+    @Excel(name = "报销天数",width = 10, type = 10)
+    private String reimbursementDay;  //报销天数
+    @Excel(name = "报销额度",width = 10, type = 10)
     private String reimbursementAmount;  //报销额度
+    @Excel(name = "报销时间",width = 20,exportFormat  = "yyyy-MM-dd HH:mm:ss")
+    private Date createDate;
     private String remainReimbursementAmount;  //剩余报销额度
+    @Excel(name = "备注",width = 20)
     private String remarks; //备注
+    @Excel(name = "报销部门",width = 10)
     private String officeType; //部门类型（1:中审众环；2：兴光会计；3：兴光项目；4：兴光评估）
-    private String userOfficeName; //报销人员所属部门
+    @Excel(name = "报销来源",width = 10)
     private String reimbursementAddress;  //地区类型（0：正常报销；1：武汉）
+
     /**
      * 报销开始日期
      */

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAssess/domain/dto/AssessReimbursementBusinessReturnDTO.java

@@ -33,6 +33,8 @@ public class AssessReimbursementBusinessReturnDTO {
     private String reimbursementAddress;  //地区类型（0：正常报销；1：武汉）
 
     private String userId;  //报销人员id
+    private String userName;  //报销人员姓名
+    private String businessCode; //报销批次
     private String year; //报销年份
     private String officeType; //部门类型（1:中审众环；2：兴光会计；3：兴光项目；4：兴光评估）
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAssess/mapper/xml/AssessReimbursementBusinessMapper.xml

@@ -266,6 +266,28 @@
         <where>
             a.del_flag = 0
             and a.business_code_id = #{businessCodeId}
+
+            <if test="reimbursementAddress != null and reimbursementAddress != ''">
+                and a.reimbursement_address = #{reimbursementAddress}
+            </if>
+            <if test="reimbursementFsalary != null and reimbursementFsalary != ''">
+                and a.reimbursement_fsalary = #{reimbursementFsalary}
+            </if>
+            <if test="beginReimbursementQuota != null and beginReimbursementQuota != ''">
+                and a.reimbursement_amount >= #{beginReimbursementQuota}
+            </if>
+            <if test="endReimbursementQuota != null and endReimbursementQuota != ''">
+                and a.reimbursement_amount &lt;= #{endReimbursementQuota}
+            </if>
+            <if test="beginDate != null">
+                and a.create_date >= #{beginDate}
+            </if>
+            <if test="endDate != null">
+                and a.create_date &lt;= #{endDate}
+            </if>
+            <if test="userId != null and userId != ''">
+                and a.user_id = #{userId}
+            </if>
         </where>
         order by a.update_date desc,a.year desc, a.user_id asc
     </select>
@@ -275,6 +297,7 @@
         SELECT
         <include refid="reimbursementBusinessColumns"/>
         ,zri.business_code as "businessCode"
+        ,(SELECT NAME FROM sys_office WHERE id = ( (case when (SELECT substring_index( substring_index( parent_ids, ',', 3 ), ',', - 1 ) FROM sys_office WHERE id = su.office_id ) = '' then (select id FROM sys_office WHERE id = su.office_id )  else (SELECT substring_index( substring_index( parent_ids, ',', 3 ), ',', - 1 ) FROM sys_office WHERE id = su.office_id ) end) )) AS 'userOfficeName'
         FROM zs_reimbursement_business_info a
         <include refid="reimbursementUserJoinColumns"/>
         left join (select <include refid="reimbursementColumns"/> from zs_reimbursement_info

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAssess/service/impl/AssessReimbursementBusinessServiceImpl.java

@@ -15,6 +15,7 @@ import com.jeeplus.test.reimbursementAssess.mapper.AssessReimbursementBusinessMa
 import com.jeeplus.test.reimbursementAssess.mapper.AssessReimbursementSysMapper;
 import com.jeeplus.test.reimbursementAssess.mapper.AssessReimbursementUserMapper;
 import com.jeeplus.test.reimbursementAssess.service.AssessReimbursementBusinessService;
+import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -281,10 +282,14 @@ public class AssessReimbursementBusinessServiceImpl implements AssessReimburseme
 
     @Override
     public AssessReimbursementBusinessReturnDTO findListByBusinessCodeId(AssessReimbursementBusinessDTO reimbursementBusiness) {
+        //查询报销批次信息
+        AssessReimbursementDTO reimbursementDTO = reimbursementSysMapper.queryBusinessById(reimbursementBusiness.getBusinessCodeId());
+
         List<AssessReimbursementBusinessDTO> list = mapper.findListByBusinessCodeId(reimbursementBusiness);
         for (AssessReimbursementBusinessDTO info : list) {
             info.setReimbursementType(DictUtils.getDictLabel(info.getReimbursementType(), "reimbursement_type", null));
             info.setReimbursementFsalary(DictUtils.getDictLabel(info.getReimbursementFsalary(), "reimbursement_fsalary", null));
+            info.setOfficeType(DictUtils.getDictLabel(info.getOfficeType(), "reimbursement_office_type", null));
         }
         AssessReimbursementBusinessReturnDTO reimbursementBusinessReturnDTO = new AssessReimbursementBusinessReturnDTO();
         //获取业务报销信息
@@ -296,6 +301,8 @@ public class AssessReimbursementBusinessServiceImpl implements AssessReimburseme
         reimbursementBusinessReturnDTO.setAlreadyReimbursementAmount(business.getAllAlreadyReimbursementQuota());
         //总报销额度
         reimbursementBusinessReturnDTO.setReimbursementQuota(business.getCanReimbursementAmount());
+        reimbursementBusinessReturnDTO.setYear(reimbursementDTO.getYear());
+        reimbursementBusinessReturnDTO.setBusinessCode(reimbursementDTO.getBusinessCode());
         return reimbursementBusinessReturnDTO;
     }
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAssess/service/impl/AssessReimbursementUserServiceImpl.java

@@ -204,6 +204,8 @@ public class AssessReimbursementUserServiceImpl implements AssessReimbursementUs
         //获取人员年度报销详情
         AssessReimbursementUserDTO reimbursementUserInfo = mapper.queryByUserIdAndYear(reimbursementUserDTO);
         reimbursementBusinessReturnDTO.setList(showList);
+        reimbursementBusinessReturnDTO.setUserName(reimbursementUserInfo.getUserName());
+        reimbursementBusinessReturnDTO.setYear(reimbursementUserInfo.getYear());
         reimbursementBusinessReturnDTO.setReimbursementQuota(reimbursementUserInfo.getReimbursementQuota());
 
         //已报销额度

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementProject/controller/ProjectReimbursementBusinessController.java

@@ -5,17 +5,24 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.jeeplus.aop.demo.annotation.DemoMode;
 import com.jeeplus.aop.logging.annotation.ApiLog;
+import com.jeeplus.core.excel.ExcelOptions;
+import com.jeeplus.core.excel.utils.EasyPoiUtil;
 import com.jeeplus.sys.utils.StringUtils;
+import com.jeeplus.test.reimbursementAccountant.domain.dto.AccountantReimbursementBusinessDTO;
 import com.jeeplus.test.reimbursementProject.domain.dto.ProjectReimbursementBusinessDTO;
 import com.jeeplus.test.reimbursementProject.domain.dto.ProjectReimbursementBusinessReturnDTO;
 import com.jeeplus.test.reimbursementProject.domain.dto.ProjectReimbursementDTO;
 import com.jeeplus.test.reimbursementProject.domain.dto.ProjectReimbursementUserDTO;
 import com.jeeplus.test.reimbursementProject.service.ProjectReimbursementBusinessService;
+import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementBusinessDTO;
+import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementBusinessReturnDTO;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
 /**
@@ -122,13 +129,48 @@ public class ProjectReimbursementBusinessController {
     @ApiLog("查询业务报销信息列表")
     @PreAuthorize("hasAuthority('project:reimbursementBusiness:view')")
     @GetMapping("findListByBusinessCodeId")
-    public ResponseEntity findListByBusinessCodeId(String id) {
-        if(StringUtils.isBlank(id)){
+    public ResponseEntity findListByBusinessCodeId(ProjectReimbursementBusinessDTO reimbursementBusiness) {
+        if(StringUtils.isBlank(reimbursementBusiness.getBusinessCodeId())){
             return ResponseEntity.badRequest ().body ("请先选择业务信息");
         }
-        ProjectReimbursementBusinessDTO reimbursementBusiness = new ProjectReimbursementBusinessDTO();
-        reimbursementBusiness.setBusinessCodeId(id);
         ProjectReimbursementBusinessReturnDTO info = service.findListByBusinessCodeId(reimbursementBusiness);
         return ResponseEntity.ok(info);
     }
+
+
+    /**
+     * 导出中审众环人员信息数据
+     * @param reimbursementBusiness
+     * @param response
+     * @throws Exception
+     */
+    @ApiLog("人员报销详情导出")
+    @GetMapping("exportBusinessExcel")
+    @ApiOperation(value = "人员报销详情导出Excel")
+    public void exportBusinessExcel(ProjectReimbursementBusinessDTO reimbursementBusiness, ExcelOptions options, HttpServletResponse response) {
+        String fileName = options.getFilename ( );
+
+        ProjectReimbursementBusinessReturnDTO info = service.findListByBusinessCodeId(reimbursementBusiness);
+        for (ProjectReimbursementBusinessDTO businessInfo : info.getList()) {
+            if(StringUtils.isNotBlank(businessInfo.getReimbursementAddress())){
+                switch (businessInfo.getReimbursementAddress()){
+                    case "1":
+                        businessInfo.setReimbursementAddress("总所报销");
+                        break;
+                    case "0":
+                        businessInfo.setReimbursementAddress("分所报销");
+                        break;
+                    default:
+                        businessInfo.setReimbursementAddress("——");
+                        break;
+
+                }
+            }else{
+                businessInfo.setReimbursementAddress("——");
+            }
+            businessInfo.setBusinessCode(info.getBusinessCode());
+        }
+
+        EasyPoiUtil.exportExcel ( info.getList(), info.getYear() + "年【" + info.getBusinessCode() + "】" + "批次报销详情",  options.getSheetName ( ), ProjectReimbursementBusinessDTO.class, fileName, response );
+    }
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementProject/controller/ProjectReimbursementUserController.java

@@ -12,9 +12,12 @@ import com.jeeplus.core.excel.utils.EasyPoiUtil;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.DictUtils;
 import com.jeeplus.sys.utils.StringUtils;
+import com.jeeplus.test.reimbursementProject.domain.dto.ProjectReimbursementBusinessDTO;
 import com.jeeplus.test.reimbursementProject.domain.dto.ProjectReimbursementBusinessReturnDTO;
 import com.jeeplus.test.reimbursementProject.domain.dto.ProjectReimbursementUserDTO;
 import com.jeeplus.test.reimbursementProject.service.ProjectReimbursementUserService;
+import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementBusinessDTO;
+import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementBusinessReturnDTO;
 import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementUserDTO;
 import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementUserImportDTO;
 import io.swagger.annotations.ApiOperation;
@@ -278,4 +281,40 @@ public class ProjectReimbursementUserController {
         }
         EasyPoiUtil.exportExcel ( result, "兴光项目人员信息数据",  options.getSheetName ( ), ProjectReimbursementUserDTO.class, fileName, response );
     }
+
+
+    /**
+     * 导出中审众环人员信息数据
+     * @param reimbursementBusinessReturnDTO
+     * @param response
+     * @throws Exception
+     */
+    @ApiLog("人员报销详情导出")
+    @GetMapping("exportUserBusinessExcel")
+    @ApiOperation(value = "人员报销详情导出Excel")
+    public void exportUserBusinessExcel(ProjectReimbursementBusinessReturnDTO reimbursementBusinessReturnDTO, ExcelOptions options, HttpServletResponse response) {
+        String fileName = options.getFilename ( );
+
+
+        //根据id查询人员填报的报销信息
+        ProjectReimbursementUserDTO reimbursementUserDTO = service.queryById(reimbursementBusinessReturnDTO.getUserId());
+
+        ProjectReimbursementBusinessReturnDTO info = service.findListByUserId(reimbursementUserDTO,reimbursementBusinessReturnDTO);
+        for (ProjectReimbursementBusinessDTO businessInfo : info.getList()) {
+            switch (businessInfo.getReimbursementAddress()){
+                case "1":
+                    businessInfo.setReimbursementAddress("总所报销");
+                    break;
+                case "0":
+                    businessInfo.setReimbursementAddress("分所报销");
+                    break;
+                default:
+                    businessInfo.setReimbursementAddress("——");
+                    break;
+
+            }
+        }
+
+        EasyPoiUtil.exportExcel ( info.getList(), "人员报销详情",  options.getSheetName ( ), ProjectReimbursementBusinessDTO.class, fileName, response );
+    }
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementProject/domain/dto/ProjectReimbursementBusinessDTO.java

@@ -1,5 +1,6 @@
 package com.jeeplus.test.reimbursementProject.domain.dto;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jeeplus.core.domain.BaseEntity;
 import lombok.Data;
@@ -19,23 +20,37 @@ public class ProjectReimbursementBusinessDTO extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-    private String businessCode;  //业务编号
-    private String businessCodeId;  //业务编号Id
-    private String userId;  //报销人id
+    @Excel(name = "报销人",width = 10)
     private String userName;  //报销人
+    @Excel(name = "报销人部门",width = 12)
+    private String userOfficeName;  //报销人员所属部门
+    @Excel(name = "报销批次",width = 10)
+    private String businessCode;  //报销批次
+    private String businessCodeId;  //报销批次Id
+    private String userId;  //报销人id
+    @Excel(name = "报销年份",width = 10)
     private String year;    //报销年份
     private String reimbursementQuota;  //年报销额度
     private String reimbursementQuotaDay;  //日报销额度
-    private String reimbursementDay;  //报销天数
     private String surplusReimbursementDay;  //剩余报销天数
+    @Excel(name = "报销类型",width = 10)
     private String reimbursementType;  //报销类型（1：正常报销；2：补差）
+    @Excel(name = "实发类型",width = 12)
     private String reimbursementFsalary;  //实发类型（1：报销不实发；2：报销并实发）
+    @Excel(name = "报销天数",width = 10, type = 10)
+    private String reimbursementDay;  //报销天数
+    @Excel(name = "报销额度",width = 10, type = 10)
     private String reimbursementAmount;  //报销额度
+    @Excel(name = "报销时间",width = 20,exportFormat  = "yyyy-MM-dd HH:mm:ss")
+    private Date createDate;
     private String remainReimbursementAmount;  //剩余报销额度
+    @Excel(name = "备注",width = 20)
     private String remarks; //备注
+    @Excel(name = "报销部门",width = 10)
     private String officeType; //部门类型（1:中审众环；2：兴光会计；3：兴光项目；4：兴光评估）
-    private String userOfficeName; //报销人员所属部门
+    @Excel(name = "报销来源",width = 10)
     private String reimbursementAddress;  //地区类型（0：正常报销；1：武汉）
+
     /**
      * 报销开始日期
      */

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementProject/domain/dto/ProjectReimbursementBusinessReturnDTO.java

@@ -32,6 +32,8 @@ public class ProjectReimbursementBusinessReturnDTO {
     private String reimbursementAddress;  //地区类型（0：正常报销；1：武汉）
 
     private String userId;  //报销人员id
+    private String userName;  //报销人员姓名
+    private String businessCode; //报销批次
     private String year; //报销年份
     private String officeType; //部门类型（1:中审众环；2：兴光会计；3：兴光项目；4：兴光评估）
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementProject/mapper/xml/ProjectReimbursementBusinessMapper.xml

@@ -266,6 +266,28 @@
         <where>
             a.del_flag = 0
             and a.business_code_id = #{businessCodeId}
+
+            <if test="reimbursementAddress != null and reimbursementAddress != ''">
+                and a.reimbursement_address = #{reimbursementAddress}
+            </if>
+            <if test="reimbursementFsalary != null and reimbursementFsalary != ''">
+                and a.reimbursement_fsalary = #{reimbursementFsalary}
+            </if>
+            <if test="beginReimbursementQuota != null and beginReimbursementQuota != ''">
+                and a.reimbursement_amount >= #{beginReimbursementQuota}
+            </if>
+            <if test="endReimbursementQuota != null and endReimbursementQuota != ''">
+                and a.reimbursement_amount &lt;= #{endReimbursementQuota}
+            </if>
+            <if test="beginDate != null">
+                and a.create_date >= #{beginDate}
+            </if>
+            <if test="endDate != null">
+                and a.create_date &lt;= #{endDate}
+            </if>
+            <if test="userId != null and userId != ''">
+                and a.user_id = #{userId}
+            </if>
         </where>
         order by a.update_date desc,a.year desc, a.user_id asc
     </select>
@@ -275,6 +297,7 @@
         SELECT
         <include refid="reimbursementBusinessColumns"/>
         ,zri.business_code as "businessCode"
+        ,(SELECT NAME FROM sys_office WHERE id = ( (case when (SELECT substring_index( substring_index( parent_ids, ',', 3 ), ',', - 1 ) FROM sys_office WHERE id = su.office_id ) = '' then (select id FROM sys_office WHERE id = su.office_id )  else (SELECT substring_index( substring_index( parent_ids, ',', 3 ), ',', - 1 ) FROM sys_office WHERE id = su.office_id ) end) )) AS 'userOfficeName'
         FROM zs_reimbursement_business_info a
         <include refid="reimbursementUserJoinColumns"/>
         left join (select <include refid="reimbursementColumns"/> from zs_reimbursement_info

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementProject/service/impl/ProjectReimbursementBusinessServiceImpl.java

@@ -15,6 +15,7 @@ import com.jeeplus.test.reimbursementProject.mapper.ProjectReimbursementBusiness
 import com.jeeplus.test.reimbursementProject.mapper.ProjectReimbursementSysMapper;
 import com.jeeplus.test.reimbursementProject.mapper.ProjectReimbursementUserMapper;
 import com.jeeplus.test.reimbursementProject.service.ProjectReimbursementBusinessService;
+import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -281,10 +282,14 @@ public class ProjectReimbursementBusinessServiceImpl implements ProjectReimburse
 
     @Override
     public ProjectReimbursementBusinessReturnDTO findListByBusinessCodeId(ProjectReimbursementBusinessDTO reimbursementBusiness) {
+        //查询报销批次信息
+        ProjectReimbursementDTO reimbursementDTO = reimbursementSysMapper.queryBusinessById(reimbursementBusiness.getBusinessCodeId());
+
         List<ProjectReimbursementBusinessDTO> list = mapper.findListByBusinessCodeId(reimbursementBusiness);
         for (ProjectReimbursementBusinessDTO info : list) {
             info.setReimbursementType(DictUtils.getDictLabel(info.getReimbursementType(), "reimbursement_type", null));
             info.setReimbursementFsalary(DictUtils.getDictLabel(info.getReimbursementFsalary(), "reimbursement_fsalary", null));
+            info.setOfficeType(DictUtils.getDictLabel(info.getOfficeType(), "reimbursement_office_type", null));
         }
         ProjectReimbursementBusinessReturnDTO reimbursementBusinessReturnDTO = new ProjectReimbursementBusinessReturnDTO();
         //获取业务报销信息
@@ -296,6 +301,8 @@ public class ProjectReimbursementBusinessServiceImpl implements ProjectReimburse
         reimbursementBusinessReturnDTO.setAlreadyReimbursementAmount(business.getAllAlreadyReimbursementQuota());
         //总报销额度
         reimbursementBusinessReturnDTO.setReimbursementQuota(business.getCanReimbursementAmount());
+        reimbursementBusinessReturnDTO.setYear(reimbursementDTO.getYear());
+        reimbursementBusinessReturnDTO.setBusinessCode(reimbursementDTO.getBusinessCode());
         return reimbursementBusinessReturnDTO;
     }
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementProject/service/impl/ProjectReimbursementUserServiceImpl.java

@@ -203,6 +203,8 @@ public class ProjectReimbursementUserServiceImpl implements ProjectReimbursement
         //获取人员年度报销详情
         ProjectReimbursementUserDTO reimbursementUserInfo = mapper.queryByUserIdAndYear(reimbursementUserDTO);
         reimbursementBusinessReturnDTO.setList(showList);
+        reimbursementBusinessReturnDTO.setUserName(reimbursementUserInfo.getUserName());
+        reimbursementBusinessReturnDTO.setYear(reimbursementUserInfo.getYear());
         reimbursementBusinessReturnDTO.setReimbursementQuota(reimbursementUserInfo.getReimbursementQuota());
 
         //已报销额度

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/controller/ReimbursementBusinessController.java

@@ -5,17 +5,21 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.jeeplus.aop.demo.annotation.DemoMode;
 import com.jeeplus.aop.logging.annotation.ApiLog;
+import com.jeeplus.core.excel.ExcelOptions;
+import com.jeeplus.core.excel.utils.EasyPoiUtil;
 import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementBusinessDTO;
 import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementBusinessReturnDTO;
 import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementDTO;
 import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementUserDTO;
 import com.jeeplus.test.reimbursementsys.service.ReimbursementBusinessService;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
 /**
@@ -122,14 +126,50 @@ public class ReimbursementBusinessController {
     @ApiLog("查询业务报销信息列表")
     @PreAuthorize("hasAuthority('reimbursementBusiness:view')")
     @GetMapping("findListByBusinessCodeId")
-    public ResponseEntity findListByBusinessCodeId(String id) {
-        if(StringUtils.isBlank(id)){
+    public ResponseEntity findListByBusinessCodeId(ReimbursementBusinessDTO reimbursementBusiness) {
+        if(StringUtils.isBlank(reimbursementBusiness.getBusinessCodeId())){
             return ResponseEntity.badRequest ().body ("请先选择业务信息");
         }
-        ReimbursementBusinessDTO reimbursementBusiness = new ReimbursementBusinessDTO();
         reimbursementBusiness.setReimbursementAddress("0");
-        reimbursementBusiness.setBusinessCodeId(id);
         ReimbursementBusinessReturnDTO info = service.findListByBusinessCodeId(reimbursementBusiness);
         return ResponseEntity.ok(info);
     }
+
+
+    /**
+     * 导出中审众环人员信息数据
+     * @param reimbursementBusiness
+     * @param response
+     * @throws Exception
+     */
+    @ApiLog("人员报销详情导出")
+    @GetMapping("exportBusinessExcel")
+    @ApiOperation(value = "人员报销详情导出Excel")
+    public void exportBusinessExcel(ReimbursementBusinessDTO reimbursementBusiness, ExcelOptions options, HttpServletResponse response) {
+        String fileName = options.getFilename ( );
+
+        reimbursementBusiness.setReimbursementAddress("0");
+        ReimbursementBusinessReturnDTO info = service.findListByBusinessCodeId(reimbursementBusiness);
+        for (ReimbursementBusinessDTO businessInfo : info.getList()) {
+            if(StringUtils.isNotBlank(businessInfo.getReimbursementAddress())){
+                switch (businessInfo.getReimbursementAddress()){
+                    case "1":
+                        businessInfo.setReimbursementAddress("总所报销");
+                        break;
+                    case "0":
+                        businessInfo.setReimbursementAddress("分所报销");
+                        break;
+                    default:
+                        businessInfo.setReimbursementAddress("——");
+                        break;
+
+                }
+            }else{
+                businessInfo.setReimbursementAddress("——");
+            }
+            businessInfo.setBusinessCode(info.getBusinessCode());
+        }
+
+        EasyPoiUtil.exportExcel ( info.getList(), info.getYear() + "年【" + info.getBusinessCode() + "】" + "批次报销详情",  options.getSheetName ( ), ReimbursementBusinessDTO.class, fileName, response );
+    }
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/controller/ReimbursementUserController.java

@@ -13,10 +13,7 @@ import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.DictUtils;
 import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.test.reimbursementProject.domain.dto.ProjectReimbursementDTO;
-import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementAddressDTO;
-import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementBusinessReturnDTO;
-import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementUserDTO;
-import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementUserImportDTO;
+import com.jeeplus.test.reimbursementsys.domain.dto.*;
 import com.jeeplus.test.reimbursementsys.service.ReimbursementUserService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -283,4 +280,39 @@ public class ReimbursementUserController {
     }
 
 
+    /**
+     * 导出中审众环人员信息数据
+     * @param reimbursementBusinessReturnDTO
+     * @param response
+     * @throws Exception
+     */
+    @ApiLog("人员报销详情导出")
+    @GetMapping("exportUserBusinessExcel")
+    @ApiOperation(value = "人员报销详情导出Excel")
+    public void exportUserBusinessExcel(ReimbursementBusinessReturnDTO reimbursementBusinessReturnDTO, ExcelOptions options, HttpServletResponse response) {
+        String fileName = options.getFilename ( );
+
+
+        //根据id查询人员填报的报销信息
+        ReimbursementUserDTO reimbursementUserDTO = service.queryById(reimbursementBusinessReturnDTO.getUserId());
+
+        ReimbursementBusinessReturnDTO info = service.findListByUserId(reimbursementUserDTO,reimbursementBusinessReturnDTO);
+        for (ReimbursementBusinessDTO businessInfo : info.getList()) {
+            switch (businessInfo.getReimbursementAddress()){
+                case "1":
+                    businessInfo.setReimbursementAddress("总所报销");
+                    break;
+                case "0":
+                    businessInfo.setReimbursementAddress("分所报销");
+                    break;
+                default:
+                    businessInfo.setReimbursementAddress("——");
+                    break;
+
+            }
+        }
+
+        EasyPoiUtil.exportExcel ( info.getList(), "人员报销详情",  options.getSheetName ( ), ReimbursementBusinessDTO.class, fileName, response );
+    }
+
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/controller/WuHanReimbursementBusinessController.java

@@ -5,14 +5,18 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.jeeplus.aop.demo.annotation.DemoMode;
 import com.jeeplus.aop.logging.annotation.ApiLog;
+import com.jeeplus.core.excel.ExcelOptions;
+import com.jeeplus.core.excel.utils.EasyPoiUtil;
 import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.test.reimbursementsys.domain.dto.*;
 import com.jeeplus.test.reimbursementsys.service.WuHanReimbursementBusinessService;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
 /**
@@ -117,15 +121,52 @@ public class WuHanReimbursementBusinessController {
      * @return
      */
     @ApiLog("查询业务报销信息列表")
-    @PreAuthorize("hasAuthority('wuHanReimbursementBusiness:view')")
+    @PreAuthorize("hasAuthority('reimbursementBusiness:view')")
     @GetMapping("findListByBusinessCodeId")
-    public ResponseEntity findListByBusinessCodeId(String id) {
-        if(StringUtils.isBlank(id)){
+    public ResponseEntity findListByBusinessCodeId(ReimbursementBusinessDTO reimbursementBusiness) {
+        if(StringUtils.isBlank(reimbursementBusiness.getBusinessCodeId())){
             return ResponseEntity.badRequest ().body ("请先选择业务信息");
         }
-        ReimbursementBusinessDTO reimbursementBusiness = new ReimbursementBusinessDTO();
-        reimbursementBusiness.setBusinessCodeId(id);
+        reimbursementBusiness.setReimbursementAddress("1");
         ReimbursementBusinessReturnDTO info = service.findListByBusinessCodeId(reimbursementBusiness);
         return ResponseEntity.ok(info);
     }
+
+
+    /**
+     * 导出中审众环人员信息数据
+     * @param reimbursementBusiness
+     * @param response
+     * @throws Exception
+     */
+    @ApiLog("人员报销详情导出")
+    @GetMapping("exportBusinessExcel")
+    @ApiOperation(value = "人员报销详情导出Excel")
+    public void exportBusinessExcel(ReimbursementBusinessDTO reimbursementBusiness, ExcelOptions options, HttpServletResponse response) {
+        String fileName = options.getFilename ( );
+
+        reimbursementBusiness.setReimbursementAddress("1");
+        ReimbursementBusinessReturnDTO info = service.findListByBusinessCodeId(reimbursementBusiness);
+        for (ReimbursementBusinessDTO businessInfo : info.getList()) {
+            if(StringUtils.isNotBlank(businessInfo.getReimbursementAddress())){
+                switch (businessInfo.getReimbursementAddress()){
+                    case "1":
+                        businessInfo.setReimbursementAddress("总所报销");
+                        break;
+                    case "0":
+                        businessInfo.setReimbursementAddress("分所报销");
+                        break;
+                    default:
+                        businessInfo.setReimbursementAddress("——");
+                        break;
+
+                }
+            }else{
+                businessInfo.setReimbursementAddress("——");
+            }
+            businessInfo.setBusinessCode(info.getBusinessCode());
+        }
+
+        EasyPoiUtil.exportExcel ( info.getList(), info.getYear() + "年【" + info.getBusinessCode() + "】" + "批次报销详情",  options.getSheetName ( ), ReimbursementBusinessDTO.class, fileName, response );
+    }
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/domain/dto/ReimbursementBusinessDTO.java

@@ -1,5 +1,6 @@
 package com.jeeplus.test.reimbursementsys.domain.dto;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jeeplus.core.domain.BaseEntity;
 import lombok.Data;
@@ -19,23 +20,36 @@ public class ReimbursementBusinessDTO extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-    private String businessCode;  //业务编号
-    private String businessCodeId;  //业务编号Id
-    private String userId;  //报销人id
+    @Excel(name = "报销人",width = 10)
     private String userName;  //报销人
+    @Excel(name = "报销人部门",width = 12)
+    private String userOfficeName;  //报销人员所属部门
+    @Excel(name = "报销批次",width = 10)
+    private String businessCode;  //报销批次
+    private String businessCodeId;  //报销批次Id
+    private String userId;  //报销人id
+    @Excel(name = "报销年份",width = 10)
     private String year;    //报销年份
     private String reimbursementQuota;  //年报销额度
     private String reimbursementQuotaDay;  //日报销额度
-    private String reimbursementDay;  //报销天数
     private String surplusReimbursementDay;  //剩余报销天数
+    @Excel(name = "报销类型",width = 10)
     private String reimbursementType;  //报销类型（1：正常报销；2：补差）
+    @Excel(name = "实发类型",width = 12)
     private String reimbursementFsalary;  //实发类型（1：报销不实发；2：报销并实发）
+    @Excel(name = "报销天数",width = 10, type = 10)
+    private String reimbursementDay;  //报销天数
+    @Excel(name = "报销额度",width = 10, type = 10)
     private String reimbursementAmount;  //报销额度
+    @Excel(name = "报销时间",width = 20,exportFormat  = "yyyy-MM-dd HH:mm:ss")
+    private Date createDate;
     private String remainReimbursementAmount;  //剩余报销额度
+    @Excel(name = "备注",width = 20)
     private String remarks; //备注
-    private String reimbursementAddress;  //地区类型（0：正常报销；1：武汉）
+    @Excel(name = "报销部门",width = 10)
     private String officeType; //部门类型（1:中审众环；2：兴光会计；3：兴光项目；4：兴光评估）
-    private String userOfficeName; //报销人员所属部门
+    @Excel(name = "报销来源",width = 10)
+    private String reimbursementAddress;  //地区类型（0：正常报销；1：武汉）
 
 
     /**

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/domain/dto/ReimbursementBusinessReturnDTO.java

@@ -32,6 +32,7 @@ public class ReimbursementBusinessReturnDTO{
     private String reimbursementAddress; //报销来源
     private String reimbursementFsalary; //实发类型
     private String year; //报销年份
+    private String businessCode; //报销批次
     private String officeType; //部门类型（1:中审众环；2：兴光会计；3：兴光项目；4：兴光评估）
 
     /**

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/mapper/xml/ReimbursementBusinessMapper.xml

@@ -278,6 +278,28 @@
             a.del_flag = 0
             and a.business_code_id = #{businessCodeId}
             and a.reimbursement_address = #{reimbursementAddress}
+
+            <if test="reimbursementAddress != null and reimbursementAddress != ''">
+                and a.reimbursement_address = #{reimbursementAddress}
+            </if>
+            <if test="reimbursementFsalary != null and reimbursementFsalary != ''">
+                and a.reimbursement_fsalary = #{reimbursementFsalary}
+            </if>
+            <if test="beginReimbursementQuota != null and beginReimbursementQuota != ''">
+                and a.reimbursement_amount >= #{beginReimbursementQuota}
+            </if>
+            <if test="endReimbursementQuota != null and endReimbursementQuota != ''">
+                and a.reimbursement_amount &lt;= #{endReimbursementQuota}
+            </if>
+            <if test="beginDate != null">
+                and a.create_date >= #{beginDate}
+            </if>
+            <if test="endDate != null">
+                and a.create_date &lt;= #{endDate}
+            </if>
+            <if test="userId != null and userId != ''">
+                and a.user_id = #{userId}
+            </if>
         </where>
         order by a.update_date desc,a.year desc, a.user_id asc
     </select>
@@ -287,6 +309,7 @@
         SELECT
         <include refid="reimbursementBusinessColumns"/>
         ,ifnull(zri.business_code,(select business_code from zs_wuhan_reimbursement_info where id = a.business_code_id)) as "businessCode"
+        ,(SELECT NAME FROM sys_office WHERE id = ( (case when (SELECT substring_index( substring_index( parent_ids, ',', 3 ), ',', - 1 ) FROM sys_office WHERE id = su.office_id ) = '' then (select id FROM sys_office WHERE id = su.office_id )  else (SELECT substring_index( substring_index( parent_ids, ',', 3 ), ',', - 1 ) FROM sys_office WHERE id = su.office_id ) end) )) AS 'userOfficeName'
         FROM zs_reimbursement_business_info a
         <include refid="reimbursementUserJoinColumns"/>
         left join (select <include refid="reimbursementColumns"/> from zs_reimbursement_info

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/mapper/xml/WuHanReimbursementBusinessMapper.xml

@@ -68,7 +68,8 @@
         a.reimbursement_type AS "reimbursementType",
         a.reimbursement_fsalary AS "reimbursementFsalary",
         a.reimbursement_address AS "reimbursementAddress",
-        a.reimbursement_amount as "reimbursementAmount"
+        a.reimbursement_amount as "reimbursementAmount",
+        a.office_type as "officeType"
     </sql>
 
     <sql id="reimbursementUserJoinColumns">
@@ -276,6 +277,27 @@
             a.del_flag = 0
             and a.business_code_id = #{businessCodeId}
             and a.reimbursement_address = #{reimbursementAddress}
+            <if test="reimbursementAddress != null and reimbursementAddress != ''">
+                and a.reimbursement_address = #{reimbursementAddress}
+            </if>
+            <if test="reimbursementFsalary != null and reimbursementFsalary != ''">
+                and a.reimbursement_fsalary = #{reimbursementFsalary}
+            </if>
+            <if test="beginReimbursementQuota != null and beginReimbursementQuota != ''">
+                and a.reimbursement_amount >= #{beginReimbursementQuota}
+            </if>
+            <if test="endReimbursementQuota != null and endReimbursementQuota != ''">
+                and a.reimbursement_amount &lt;= #{endReimbursementQuota}
+            </if>
+            <if test="beginDate != null">
+                and a.create_date >= #{beginDate}
+            </if>
+            <if test="endDate != null">
+                and a.create_date &lt;= #{endDate}
+            </if>
+            <if test="userId != null and userId != ''">
+                and a.user_id = #{userId}
+            </if>
         </where>
         order by a.update_date desc,a.year desc, a.user_id asc
     </select>
@@ -285,6 +307,7 @@
         SELECT
         <include refid="reimbursementBusinessColumns"/>
         ,zri.business_code as "businessCode"
+        ,(SELECT NAME FROM sys_office WHERE id = ( (case when (SELECT substring_index( substring_index( parent_ids, ',', 3 ), ',', - 1 ) FROM sys_office WHERE id = su.office_id ) = '' then (select id FROM sys_office WHERE id = su.office_id )  else (SELECT substring_index( substring_index( parent_ids, ',', 3 ), ',', - 1 ) FROM sys_office WHERE id = su.office_id ) end) )) AS 'userOfficeName'
         FROM zs_reimbursement_business_info a
         <include refid="reimbursementUserJoinColumns"/>
         left join (select <include refid="reimbursementColumns"/> from zs_reimbursement_info

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/service/impl/ReimbursementBusinessServiceImpl.java

@@ -456,11 +456,15 @@ public class ReimbursementBusinessServiceImpl implements ReimbursementBusinessSe
 
     @Override
     public ReimbursementBusinessReturnDTO findListByBusinessCodeId(ReimbursementBusinessDTO reimbursementBusiness) {
+        //查询报销批次信息
+        ReimbursementDTO reimbursementDTO = reimbursementSysMapper.queryBusinessById(reimbursementBusiness.getBusinessCodeId());
+
         reimbursementBusiness.setReimbursementAddress("0");
         List<ReimbursementBusinessDTO> list = mapper.findListByBusinessCodeId(reimbursementBusiness);
         for (ReimbursementBusinessDTO info : list) {
             info.setReimbursementType(DictUtils.getDictLabel(info.getReimbursementType(), "reimbursement_type", null));
             info.setReimbursementFsalary(DictUtils.getDictLabel(info.getReimbursementFsalary(), "reimbursement_fsalary", null));
+            info.setOfficeType(DictUtils.getDictLabel(info.getOfficeType(), "reimbursement_office_type", null));
         }
         ReimbursementBusinessReturnDTO reimbursementBusinessReturnDTO = new ReimbursementBusinessReturnDTO();
         //获取业务报销信息
@@ -472,6 +476,8 @@ public class ReimbursementBusinessServiceImpl implements ReimbursementBusinessSe
         reimbursementBusinessReturnDTO.setAlreadyReimbursementAmount(business.getAllAlreadyReimbursementQuota());
         //总报销额度
         reimbursementBusinessReturnDTO.setReimbursementQuota(business.getCanReimbursementAmount());
+        reimbursementBusinessReturnDTO.setYear(reimbursementDTO.getYear());
+        reimbursementBusinessReturnDTO.setBusinessCode(reimbursementDTO.getBusinessCode());
         return reimbursementBusinessReturnDTO;
     }
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/service/impl/WuHanReimbursementBusinessServiceImpl.java

@@ -422,11 +422,15 @@ public class WuHanReimbursementBusinessServiceImpl implements WuHanReimbursement
 
     @Override
     public ReimbursementBusinessReturnDTO findListByBusinessCodeId(ReimbursementBusinessDTO reimbursementBusiness) {
+        //查询报销批次信息
+        WuHanReimbursementDTO reimbursementDTO = wuHanReimbursementSysMapper.queryBusinessById(reimbursementBusiness.getBusinessCodeId());
+
         reimbursementBusiness.setReimbursementAddress("1");
         List<ReimbursementBusinessDTO> list = mapper.findListByBusinessCodeId(reimbursementBusiness);
         for (ReimbursementBusinessDTO info : list) {
             info.setReimbursementType(DictUtils.getDictLabel(info.getReimbursementType(), "reimbursement_type", null));
             info.setReimbursementFsalary(DictUtils.getDictLabel(info.getReimbursementFsalary(), "reimbursement_fsalary", null));
+            info.setOfficeType(DictUtils.getDictLabel(info.getOfficeType(), "reimbursement_office_type", null));
         }
         ReimbursementBusinessReturnDTO reimbursementBusinessReturnDTO = new ReimbursementBusinessReturnDTO();
         //获取业务报销信息
@@ -438,6 +442,8 @@ public class WuHanReimbursementBusinessServiceImpl implements WuHanReimbursement
         reimbursementBusinessReturnDTO.setAlreadyReimbursementAmount(business.getAllAlreadyReimbursementQuota());
         //总报销额度
         reimbursementBusinessReturnDTO.setReimbursementQuota(business.getCanReimbursementAmount());
+        reimbursementBusinessReturnDTO.setYear(reimbursementDTO.getYear());
+        reimbursementBusinessReturnDTO.setBusinessCode(reimbursementDTO.getBusinessCode());
         return reimbursementBusinessReturnDTO;
     }