Merge remote-tracking branch 'origin/master'

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java

@@ -239,9 +239,9 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA
      */
     @GetMapping("/excelExport")
     @ApiOperation(value = "导出业务申请内容")
-    public ResponseResult excelExport(HttpServletResponse response) {
+    public ResponseResult excelExport(@RequestParam("ids") List<String> ids,HttpServletResponse response) {
 
-        Boolean result = applyAmountInfoService.excelExport(response);
+        Boolean result = applyAmountInfoService.excelExport(ids,response);
 
         return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL();
     }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsInvestigationController.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
 
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
 
@@ -62,6 +63,18 @@ public class DgAssetsInvestigationController {
         return new ResponseResult<PageUtils>().SUCCESS(data);
     }
 
+    /**
+     * 导出
+     */
+    @GetMapping("/excelExport")
+    @ApiOperation(value = "导出资产部调查内容")
+    public ResponseResult excelExport(@RequestParam("ids") List<String> ids, HttpServletResponse response) {
+
+        Boolean result = dgAssetsInvestigationService.excelExport(ids,response);
+
+        return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL();
+    }
+
     /**
      * 指派资产部调查员
      * @param

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsMoneyController.java

@@ -0,0 +1,21 @@
+package com.daqing.financial.guarantee.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Qyq
+ * @since 2020-11-26
+ */
+@RestController
+@RequestMapping("/dg-assets-money")
+public class DgAssetsMoneyController {
+
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java

@@ -22,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -89,6 +90,18 @@ public class DgGuaranteeAssignUserController {
         return new ResponseResult<PageUtils>().SUCCESS(data);
     }
 
+    /**
+     * 导出
+     */
+    @GetMapping("/excelExport")
+    @ApiOperation(value = "导出担保部调查内容")
+    public ResponseResult excelExport(@RequestParam("ids") List<String> ids, HttpServletResponse response) {
+
+        Boolean result = dgGuaranteeAssignUserService.excelExport(ids,response);
+
+        return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL();
+    }
+
     /**
      * 指派A,B角
      * @param

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgMessageInvestigationController.java

@@ -14,6 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
 
@@ -63,6 +64,18 @@ public class DgMessageInvestigationController {
         return new ResponseResult<PageUtils>().SUCCESS(data);
     }
 
+    /**
+     * 导出
+     */
+    @GetMapping("/excelExport")
+    @ApiOperation(value = "导出信息部调查内容")
+    public ResponseResult excelExport(@RequestParam("ids") List<String> ids, HttpServletResponse response) {
+
+        Boolean result = dgMessageInvestigationService.excelExport(ids,response);
+
+        return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL();
+    }
+
     /**
      * 指派信息部调查员
      * @param

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountInfoMapper.java

@@ -27,4 +27,6 @@ public interface DgApplyAmountInfoMapper extends BaseMapper<DgApplyAmountInfo> {
     List<BusinessApplicationListResponse> excelList();
 
     DgApplyAmountInfoResponse selectApplyAmountInfoById(Integer id);
+
+    List<BusinessApplicationListResponse> selectListByIds(List<String> ids);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgAssetsInvestigationMapper.java

@@ -24,4 +24,6 @@ public interface DgAssetsInvestigationMapper extends BaseMapper<DgAssetsInvestig
     IPage<AssetsInvestigationListResponse> pageByCondition(Page page, String customerNumberOrName, List<String> roleIdlist, String userId, Integer status);
 
     DgAssetsInvestigationResponse selectInfoById(Integer id);
+
+    List<AssetsInvestigationListResponse> selectListByIds(List<String> ids);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgAssetsMoneyMapper.java

@@ -0,0 +1,19 @@
+package com.daqing.financial.guarantee.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.daqing.framework.domain.guarantee.DgAssetsMoney;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Qyq
+ * @since 2020-11-26
+ */
+@Mapper
+public interface DgAssetsMoneyMapper extends BaseMapper<DgAssetsMoney> {
+
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeAssignUserMapper.java

@@ -22,4 +22,6 @@ import java.util.List;
 public interface DgGuaranteeAssignUserMapper extends BaseMapper<DgGuaranteeAssignUser> {
 
     IPage<GuaranteeListResponse> pageByCondition(Page page,@Param("customerNumberOrName") String customerNumberOrName,@Param("roleIdlist") List<String> roleIdlist,@Param("userId") String userId,@Param("status") Integer status);
+
+    List<GuaranteeListResponse> selectListByIds(List<String> ids);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgMessageInvestigationMapper.java

@@ -21,4 +21,6 @@ import java.util.List;
 public interface DgMessageInvestigationMapper extends BaseMapper<DgMessageInvestigation> {
 
     IPage<MessageInvestigationListResponse> pageByCondition(Page page, String customerNumberOrName, List<String> roleIdlist, String userId, Integer status);
+
+    List<MessageInvestigationListResponse> selectListByIds(List<String> ids);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/InvestigateAssetsRequest.java

@@ -40,6 +40,17 @@ public class InvestigateAssetsRequest {
     @ApiModelProperty(value = "评估价值")
     private String[] assetsAmount;
 
+    @ApiModelProperty(value = "房产价值")
+    private BigDecimal houseMoney;
+    @ApiModelProperty(value = "车辆价值")
+    private BigDecimal carMoney;
+    @ApiModelProperty(value = "设备价值")
+    private BigDecimal equipmentMoney;
+    @ApiModelProperty(value = "其他价值")
+    private BigDecimal otherMoney;
+
+
+
     @ApiModelProperty(value = "合计")
     private BigDecimal amountSum;
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AssetsInvestigationListResponse.java

@@ -1,9 +1,13 @@
 package com.daqing.financial.guarantee.model.response;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.metadata.BaseRowModel;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.daqing.framework.utils.excel.ApprovalStatusConverter;
+import com.daqing.framework.utils.excel.BusinessStatusConverter;
+import com.daqing.framework.utils.excel.OperatingStatusConverter;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -20,17 +24,20 @@ public class AssetsInvestigationListResponse extends BaseRowModel implements Ser
     /**
      * 主键id
      */
+    @ExcelIgnore
     @ApiModelProperty(value = "id")
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
     /**
      * 业务id
      */
+    @ExcelIgnore
     @ApiModelProperty(value = "业务id")
     private Integer businessId;
     /**
      * 企业id
      */
+    @ExcelIgnore
     @ApiModelProperty(value = "企业id")
     private Integer companyId;
 
@@ -84,24 +91,15 @@ public class AssetsInvestigationListResponse extends BaseRowModel implements Ser
     @ApiModelProperty(value = "联系电话")
     private String phone;
 
-    /**
-     * 审批状态
-     */
-    @ExcelProperty(value = "审批状态",index = 7)
-    @ApiModelProperty(value = "审批状态")
+    @ApiModelProperty("审核状态")
+    @ExcelProperty(value = "审核状态",index = 7,converter = ApprovalStatusConverter.class)
     private Integer status;
 
-    /**
-     * 业务状态
-     */
-    @ExcelProperty(value = "业务状态",index = 8)
-    @ApiModelProperty(value = "业务状态")
+    @ApiModelProperty("业务状态")
+    @ExcelProperty(value = "业务状态",index = 8,converter = BusinessStatusConverter.class)
     private Integer businessStatus;
 
-    /**
-     * 操作状态
-     */
-    @ExcelProperty(value = "操作状态",index = 9)
-    @ApiModelProperty(value = "操作状态")
+    @ApiModelProperty("操作状态")
+    @ExcelProperty(value = "操作状态",index = 9,converter = OperatingStatusConverter.class)
     private Integer operatingStatus;
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/BusinessApplicationListResponse.java

@@ -1,5 +1,6 @@
 package com.daqing.financial.guarantee.model.response;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.metadata.BaseRowModel;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -25,20 +26,24 @@ public class BusinessApplicationListResponse extends BaseRowModel implements Ser
      */
     @ApiModelProperty(value = "id")
     @TableId(value = "id", type = IdType.AUTO)
+    @ExcelIgnore
     private Integer id;
 
     /**
      * 企业id
      */
+    @ExcelIgnore
     @ApiModelProperty(value = "企业id")
     private Integer companyId;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "业务id")
     private Integer businessId;
 
     /**
      * 提单人id
      */
+    @ExcelIgnore
     @ApiModelProperty(value = "提单人id")
     private Integer presenterId;
 
@@ -91,15 +96,15 @@ public class BusinessApplicationListResponse extends BaseRowModel implements Ser
     private Date createTime;
 
     @ApiModelProperty("审核状态")
-    @ExcelProperty(value = "审核状态",index = 7)
+    @ExcelProperty(value = "审核状态",index = 7,converter = ApprovalStatusConverter.class)
     private Integer status;
 
     @ApiModelProperty("业务状态")
-    @ExcelProperty(value = "业务状态",index = 8)
+    @ExcelProperty(value = "业务状态",index = 8,converter = BusinessStatusConverter.class)
     private Integer businessStatus;
 
     @ApiModelProperty("操作状态")
-    @ExcelProperty(value = "操作状态",index = 9)
+    @ExcelProperty(value = "操作状态",index = 9,converter = OperatingStatusConverter.class)
     private Integer operatingStatus;
 
     /**

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgAssetsInvestigationResponse.java

@@ -2,6 +2,7 @@ package com.daqing.financial.guarantee.model.response;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.daqing.framework.domain.guarantee.DgAssetsAssessmentAssetsLog;
+import com.daqing.framework.domain.guarantee.DgAssetsMoney;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -165,4 +166,7 @@ public class DgAssetsInvestigationResponse implements Serializable {
 
     @ApiModelProperty(value = "评估价值列表")
     private List<DgAssetsAssessmentAssetsLog> assessmentList;
+
+    @ApiModelProperty(value = "评估价值对象")
+    private DgAssetsMoney dgAssetsMoney;
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeListResponse.java

@@ -1,9 +1,13 @@
 package com.daqing.financial.guarantee.model.response;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.metadata.BaseRowModel;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.daqing.framework.utils.excel.ApprovalStatusConverter;
+import com.daqing.framework.utils.excel.BusinessStatusConverter;
+import com.daqing.framework.utils.excel.OperatingStatusConverter;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -20,17 +24,20 @@ public class GuaranteeListResponse extends BaseRowModel implements Serializable
     /**
      * 主键id
      */
+    @ExcelIgnore
     @ApiModelProperty(value = "id")
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
     /**
      * 业务id
      */
+    @ExcelIgnore
     @ApiModelProperty(value = "业务id")
     private Integer businessId;
     /**
      * 企业id
      */
+    @ExcelIgnore
     @ApiModelProperty(value = "企业id")
     private Integer companyId;
 
@@ -84,24 +91,15 @@ public class GuaranteeListResponse extends BaseRowModel implements Serializable
     @ApiModelProperty(value = "联系电话")
     private String phone;
 
-    /**
-     * 审批状态
-     */
-    @ExcelProperty(value = "审批状态",index = 7)
-    @ApiModelProperty(value = "审批状态")
+    @ApiModelProperty("审核状态")
+    @ExcelProperty(value = "审核状态",index = 7,converter = ApprovalStatusConverter.class)
     private Integer status;
 
-    /**
-     * 业务状态
-     */
-    @ExcelProperty(value = "业务状态",index = 8)
-    @ApiModelProperty(value = "业务状态")
+    @ApiModelProperty("业务状态")
+    @ExcelProperty(value = "业务状态",index = 8,converter = BusinessStatusConverter.class)
     private Integer businessStatus;
 
-    /**
-     * 操作状态
-     */
-    @ExcelProperty(value = "操作状态",index = 9)
-    @ApiModelProperty(value = "操作状态")
+    @ApiModelProperty("操作状态")
+    @ExcelProperty(value = "操作状态",index = 9,converter = OperatingStatusConverter.class)
     private Integer operatingStatus;
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/MessageInvestigationListResponse.java

@@ -1,9 +1,13 @@
 package com.daqing.financial.guarantee.model.response;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.metadata.BaseRowModel;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.daqing.framework.utils.excel.ApprovalStatusConverter;
+import com.daqing.framework.utils.excel.BusinessStatusConverter;
+import com.daqing.framework.utils.excel.OperatingStatusConverter;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -20,17 +24,20 @@ public class MessageInvestigationListResponse extends BaseRowModel implements Se
     /**
      * 主键id
      */
+    @ExcelIgnore
     @ApiModelProperty(value = "id")
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
     /**
      * 业务id
      */
+    @ExcelIgnore
     @ApiModelProperty(value = "业务id")
     private Integer businessId;
     /**
      * 企业id
      */
+    @ExcelIgnore
     @ApiModelProperty(value = "企业id")
     private Integer companyId;
 
@@ -84,24 +91,15 @@ public class MessageInvestigationListResponse extends BaseRowModel implements Se
     @ApiModelProperty(value = "联系电话")
     private String phone;
 
-    /**
-     * 审批状态
-     */
-    @ExcelProperty(value = "审批状态",index = 7)
-    @ApiModelProperty(value = "审批状态")
+    @ApiModelProperty("审核状态")
+    @ExcelProperty(value = "审核状态",index = 7,converter = ApprovalStatusConverter.class)
     private Integer status;
 
-    /**
-     * 业务状态
-     */
-    @ExcelProperty(value = "业务状态",index = 8)
-    @ApiModelProperty(value = "业务状态")
+    @ApiModelProperty("业务状态")
+    @ExcelProperty(value = "业务状态",index = 8,converter = BusinessStatusConverter.class)
     private Integer businessStatus;
 
-    /**
-     * 操作状态
-     */
-    @ExcelProperty(value = "操作状态",index = 9)
-    @ApiModelProperty(value = "操作状态")
+    @ApiModelProperty("操作状态")
+    @ExcelProperty(value = "操作状态",index = 9,converter = OperatingStatusConverter.class)
     private Integer operatingStatus;
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountInfoService.java

@@ -29,7 +29,7 @@ public interface IDgApplyAmountInfoService extends IService<DgApplyAmountInfo> {
 
     int revokeBusinessApplication(Integer id);
 
-    Boolean excelExport(HttpServletResponse response);
+    Boolean excelExport(List<String> ids,HttpServletResponse response);
 
     int approvalBusinessApplication(Integer id, Integer status, String remark, Integer companyId);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgAssetsInvestigationService.java

@@ -9,6 +9,7 @@ import com.daqing.financial.guarantee.model.response.AssetsDetailResponse;
 import com.daqing.framework.domain.guarantee.DgAssetsInvestigation;
 import com.daqing.framework.utils.PageUtils;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -30,4 +31,6 @@ public interface IDgAssetsInvestigationService extends IService<DgAssetsInvestig
     int investigateGuarantee(InvestigateAssetsRequest investigateAssetsRequest);
 
     int approvalAssets(ApprovalAssetsRequest approvalAssetsRequest);
+
+    Boolean excelExport(List<String> ids, HttpServletResponse response);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgAssetsMoneyService.java

@@ -0,0 +1,17 @@
+package com.daqing.financial.guarantee.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.daqing.framework.domain.guarantee.DgAssetsMoney;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Qyq
+ * @since 2020-11-26
+ */
+public interface IDgAssetsMoneyService extends IService<DgAssetsMoney> {
+
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgGuaranteeAssignUserService.java

@@ -7,6 +7,7 @@ import com.daqing.financial.guarantee.model.response.GuaranteeDetailResponse;
 import com.daqing.framework.domain.guarantee.DgGuaranteeAssignUser;
 import com.daqing.framework.utils.PageUtils;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -26,4 +27,6 @@ public interface IDgGuaranteeAssignUserService extends IService<DgGuaranteeAssig
     int investigateGuarantee(InvestigateGuaranteeRequest investigateGuaranteeRequest);
 
     int approvalGuarantee(ApprovalGuaranteeRequest approvalGuaranteeRequest);
+
+    Boolean excelExport(List<String> ids, HttpServletResponse response);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgMessageInvestigationService.java

@@ -9,6 +9,7 @@ import com.daqing.financial.guarantee.model.response.MessageDetailResponse;
 import com.daqing.framework.domain.guarantee.DgMessageInvestigation;
 import com.daqing.framework.utils.PageUtils;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -30,4 +31,6 @@ public interface IDgMessageInvestigationService extends IService<DgMessageInvest
     int investigateMessage(InvestigateMessageRequest investigateMessageRequest);
 
     int approvalMessage(ApprovalMessageRequest approvalMessageRequest);
+
+    Boolean excelExport(List<String> ids, HttpServletResponse response);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java

@@ -368,29 +368,33 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
 
     @Transactional
     @Override
-    public Boolean excelExport(HttpServletResponse response) {
-        //获取当前登录用户id
-        String userId = null;
-        try{
-            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-            String token = request.getHeader("token");
-            userId = RedisUtil.get("dq:token:"+token);
-            System.out.println(userId);
-        } catch (Exception e) {
-            e.printStackTrace();
+    public Boolean excelExport(List<String> ids, HttpServletResponse response) {
+        //根据ids查询业务申请列表信息
+        List<BusinessApplicationListResponse>applyList = this.baseMapper.selectListByIds(ids);
+        System.out.println("applyList==========================="+applyList);
+        List<Integer>list2= new ArrayList<>();
+        List<BusinessApplicationListResponse> list = this.getBaseMapper().excelList();
+        for (BusinessApplicationListResponse res:applyList) {
+            //list2.add(res.getPresenterId());
+
+            //根据userId获取用户名以及部门名称
+            ResponseResult<EmployeeMessageResponse> employeeMessage = hrmsFeignService.getAccountAndDeptNameById(res.getPresenterId().longValue());
+
+            //for (BusinessApplicationListResponse businessList:list) {
+                if(employeeMessage.getData()!= null){
+                    if(res.getPresenterId().equals(employeeMessage.getData().getId())){//如果userId相同情况下，就往对象里面赋值
+                        res.setAccount(employeeMessage.getData().getAccount());
+                        res.setDeptName(employeeMessage.getData().getDeptName());
+                    }
+                }
+            //}
         }
         //根据userId获取用户名以及部门名称
-        ResponseResult<EmployeeMessageResponse> employeeMessage = hrmsFeignService.getAccountAndDeptNameById(Long.valueOf(userId));
+        //ResponseResult<EmployeeMessageResponse> employeeMessage = hrmsFeignService.getAccountAndDeptNameById(5l);
 
         try {
-            List<BusinessApplicationListResponse> list = this.getBaseMapper().excelList();
-            for (BusinessApplicationListResponse businessList:list) {
-                if(businessList.getPresenterId().equals(employeeMessage.getData().getId())){//如果userId相同情况下，就往对象里面赋值
-                    businessList.setAccount(employeeMessage.getData().getAccount());
-                    businessList.setDeptName(employeeMessage.getData().getDeptName());
-                }
-            }
-            ExcelUtil.writeExcelWithSheets(response, list, "业务贷款一览表", "businessApplication", new BusinessApplicationListResponse())
+
+            ExcelUtil.writeExcelWithSheets(response, applyList, "业务贷款一览表", "businessApplication", new BusinessApplicationListResponse())
                     .finish();
             return true;
         } catch (Exception e) {

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java

@@ -10,6 +10,7 @@ import com.daqing.financial.guarantee.feign.HrmsFeignService;
 import com.daqing.financial.guarantee.mapper.DgApplyAmountInfoMapper;
 import com.daqing.financial.guarantee.mapper.DgAssetsAssessmentAssetsLogMapper;
 import com.daqing.financial.guarantee.mapper.DgAssetsInvestigationMapper;
+import com.daqing.financial.guarantee.mapper.DgAssetsMoneyMapper;
 import com.daqing.financial.guarantee.model.request.ApprovalAssetsRequest;
 import com.daqing.financial.guarantee.model.request.AssetsRequest;
 import com.daqing.financial.guarantee.model.request.InvestigateAssetsRequest;
@@ -17,17 +18,22 @@ import com.daqing.financial.guarantee.model.response.*;
 import com.daqing.financial.guarantee.service.IDgAssetsInvestigationService;
 import com.daqing.financial.guarantee.util.ArraysUtil;
 import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest;
+import com.daqing.framework.domain.crms.response.CrmsCode;
 import com.daqing.framework.domain.guarantee.DgApplyAmountInfo;
 import com.daqing.framework.domain.guarantee.DgAssetsAssessmentAssetsLog;
 import com.daqing.framework.domain.guarantee.DgAssetsInvestigation;
+import com.daqing.framework.domain.guarantee.DgAssetsMoney;
+import com.daqing.framework.exception.ExceptionCast;
 import com.daqing.framework.model.StatusCode;
 import com.daqing.framework.model.response.PromptSuccess;
 import com.daqing.framework.model.response.ResponseResult;
 import com.daqing.framework.utils.PageUtils;
+import com.daqing.framework.utils.excel.ExcelUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
@@ -62,6 +68,9 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
     @Resource
     private DgAssetsAssessmentAssetsLogMapper dgAssetsAssessmentAssetsLogMapper;
 
+    @Resource
+    private DgAssetsMoneyMapper dgAssetsMoneyMapper;
+
     @Override
     public PageUtils queryPage(Integer page, Integer size, String customerNumberOrName, List<String> roleIdlist, String userId, Integer status) {
         //分页参数
@@ -128,6 +137,10 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
 
         assetsResponse.setAssessmentList(assessmentlist);*/
 
+        DgAssetsMoney dgAssetsMoney = dgAssetsMoneyMapper.selectOne(new QueryWrapper<DgAssetsMoney>()
+                .eq("business_id",assetsResponse.getBusinessId()));
+        assetsResponse.setDgAssetsMoney(dgAssetsMoney);
+
         String files=assetsResponse.getFile();
         if(files != null){
             if(files.length()>0){
@@ -201,6 +214,13 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
 
         //根据业务id批量新增数据到评估价值列表
         //dgAssetsAssessmentAssetsLogMapper.insertAssetsList(investigateAssetsRequest.getAssessmentList());
+        DgAssetsMoney money = new DgAssetsMoney();
+        money.setBusinessId(dgAssetsInvestigation.getBusinessId());
+        money.setHouseMoney(investigateAssetsRequest.getHouseMoney());
+        money.setCarMoney(investigateAssetsRequest.getCarMoney());
+        money.setEquipmentMoney(investigateAssetsRequest.getEquipmentMoney());
+        money.setOtherMoney(investigateAssetsRequest.getOtherMoney());
+        dgAssetsMoneyMapper.insert(money);
 
         //判断资产部调查员是否调查通过，如果通过，修改资产部经理操作状态为待处理
         if(investigateAssetsRequest.getStatus()==1){//状态为审核中
@@ -251,4 +271,19 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
 
         return 1;
     }
+
+    @Override
+    public Boolean excelExport(List<String> ids, HttpServletResponse response) {
+        //根据ids查询业务申请列表信息
+        List<AssetsInvestigationListResponse>assetsList = this.baseMapper.selectListByIds(ids);
+        System.out.println("applyList==========================="+assetsList);
+        try {
+            ExcelUtil.writeExcelWithSheets(response, assetsList, "资产调查一览表", "assetsInvestigation", new AssetsInvestigationListResponse())
+                    .finish();
+            return true;
+        } catch (Exception e) {
+            ExceptionCast.cast(CrmsCode.CUSTOMER_EXPORT_EXSIT);
+            return false;
+        }
+    }
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsMoneyServiceImpl.java

@@ -0,0 +1,20 @@
+package com.daqing.financial.guarantee.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.daqing.financial.guarantee.mapper.DgAssetsMoneyMapper;
+import com.daqing.financial.guarantee.service.IDgAssetsMoneyService;
+import com.daqing.framework.domain.guarantee.DgAssetsMoney;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Qyq
+ * @since 2020-11-26
+ */
+@Service
+public class DgAssetsMoneyServiceImpl extends ServiceImpl<DgAssetsMoneyMapper, DgAssetsMoney> implements IDgAssetsMoneyService {
+
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java

@@ -15,14 +15,18 @@ import com.daqing.financial.guarantee.service.IDgGuaranteeAssignUserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.daqing.financial.guarantee.util.ArraysUtil;
 import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest;
+import com.daqing.framework.domain.crms.response.CrmsCode;
 import com.daqing.framework.domain.guarantee.DgApplyAmountInfo;
 import com.daqing.framework.domain.guarantee.DgEnclosureInfo;
 import com.daqing.framework.domain.guarantee.DgGuaranteeAssignUser;
+import com.daqing.framework.domain.guarantee.response.EmployeeMessageResponse;
+import com.daqing.framework.exception.ExceptionCast;
 import com.daqing.framework.model.StatusCode;
 import com.daqing.framework.model.response.PromptSuccess;
 import com.daqing.framework.model.response.ResponseResult;
 import com.daqing.framework.util.RedisUtil;
 import com.daqing.framework.utils.PageUtils;
+import com.daqing.framework.utils.excel.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,6 +35,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 
 /**
@@ -244,5 +249,20 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
         return 1;
     }
 
+    @Override
+    public Boolean excelExport(List<String> ids, HttpServletResponse response) {
+        //根据ids查询业务申请列表信息
+        List<GuaranteeListResponse>guaranteeList = this.baseMapper.selectListByIds(ids);
+        System.out.println("applyList==========================="+guaranteeList);
+        try {
+            ExcelUtil.writeExcelWithSheets(response, guaranteeList, "担保调查一览表", "businessApplication", new GuaranteeListResponse())
+                    .finish();
+            return true;
+        } catch (Exception e) {
+            ExceptionCast.cast(CrmsCode.CUSTOMER_EXPORT_EXSIT);
+            return false;
+        }
+    }
+
 
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java

@@ -17,15 +17,19 @@ import com.daqing.financial.guarantee.service.IDgMessageInvestigationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.daqing.financial.guarantee.util.ArraysUtil;
 import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest;
+import com.daqing.framework.domain.crms.response.CrmsCode;
 import com.daqing.framework.domain.guarantee.*;
+import com.daqing.framework.exception.ExceptionCast;
 import com.daqing.framework.model.StatusCode;
 import com.daqing.framework.model.response.PromptSuccess;
 import com.daqing.framework.model.response.ResponseResult;
 import com.daqing.framework.utils.PageUtils;
+import com.daqing.framework.utils.excel.ExcelUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
@@ -252,4 +256,19 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
 
         return 1;
     }
+
+    @Override
+    public Boolean excelExport(List<String> ids, HttpServletResponse response) {
+        //根据ids查询业务申请列表信息
+        List<MessageInvestigationListResponse>messageList = this.baseMapper.selectListByIds(ids);
+        System.out.println("applyList==========================="+messageList);
+        try {
+            ExcelUtil.writeExcelWithSheets(response, messageList, "信息调查一览表", "messageInvestigation", new MessageInvestigationListResponse())
+                    .finish();
+            return true;
+        } catch (Exception e) {
+            ExceptionCast.cast(CrmsCode.CUSTOMER_EXPORT_EXSIT);
+            return false;
+        }
+    }
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/MyBatisPlusCodeGenerator.java

@@ -25,7 +25,7 @@ public class MyBatisPlusCodeGenerator {
     public static final String PACKAGE_NAME = "com.daqing.financial.guarantee";
 
     public static void main(String[] args) {
-        String[] tables = new String[] {"dg_business_process_status"};//表名数组
+        String[] tables = new String[] {"dg_assets_money"};//表名数组
         String[] tablePrefixs = new String[] {""};//去掉前缀
         executeCode(PACKAGE_NAME,tables,tablePrefixs);
     }

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountInfoMapper.xml

@@ -45,4 +45,18 @@
         select * from dg_apply_amount_info where id=#{id}
     </select>
 
+    <select id="selectListByIds" resultType="com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse">
+        select au.id,ai.company_id,au.business_id,ai.presenter_id,ai.business_code,ai.business_type,ai.apply_amount,ai.apply_time,au.create_time,
+        au.status,au.operating_status,cc.name,cc.phone,ps.business_status
+        from dg_apply_amount_list au
+        left join dg_apply_amount_info ai on au.business_id = ai.id
+        left join crms_company_customer ccl on ai.company_id = ccl.id
+        left join crms_customer cc on cc.id = ccl.customer_id
+        left JOIN dg_business_process_status ps ON ps.business_id = au.business_id
+        where au.id in
+        <foreach collection="list" close=")" open="(" item="id" separator=",">
+            #{id}
+        </foreach>
+    </select>
+
 </mapper>

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAssetsInvestigationMapper.xml

@@ -60,4 +60,18 @@
         select * from dg_assets_investigation where id=#{id}
     </select>
 
+    <select id="selectListByIds" resultType="com.daqing.financial.guarantee.model.response.AssetsInvestigationListResponse">
+        select au.id,au.company_id,au.business_id,ai.business_code,ai.business_type,ai.apply_amount,ai.apply_time,au.create_time,
+        au.status,au.operating_status,cc.name,cc.phone,ps.business_status
+        from dg_assets_investigation au
+        left join dg_apply_amount_info ai on au.business_id = ai.id
+        left join crms_company_customer ccl on ai.company_id = ccl.id
+        left join crms_customer cc on cc.id = ccl.customer_id
+        left JOIN dg_business_process_status ps ON ps.business_id = au.business_id
+        where au.id in
+        <foreach collection="list" close=")" open="(" item="id" separator=",">
+            #{id}
+        </foreach>
+    </select>
+
 </mapper>

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAssetsMoneyMapper.xml

@@ -0,0 +1,15 @@
+<?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.daqing.financial.guarantee.mapper.DgAssetsMoneyMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.daqing.framework.domain.guarantee.DgAssetsMoney">
+        <id column="id" property="id" />
+        <result column="business_id" property="businessId" />
+        <result column="house_money" property="houseMoney" />
+        <result column="car_money" property="carMoney" />
+        <result column="equipment_money" property="equipmentMoney" />
+        <result column="other_money" property="otherMoney" />
+    </resultMap>
+
+</mapper>

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml

@@ -44,4 +44,18 @@
         </where>
     </select>
 
+    <select id="selectListByIds" resultType="com.daqing.financial.guarantee.model.response.GuaranteeListResponse">
+        select au.id,au.company_id,au.business_id,ai.business_code,ai.business_type,ai.apply_amount,ai.apply_time,au.create_time,
+        au.status,au.operating_status,cc.name,cc.phone,ps.business_status
+        from dg_guarantee_assign_user au
+        left join dg_apply_amount_info ai on au.business_id = ai.id
+        left join crms_company_customer ccl on ai.company_id = ccl.id
+        left join crms_customer cc on cc.id = ccl.customer_id
+        left JOIN dg_business_process_status ps ON ps.business_id = au.business_id
+        where au.id in
+        <foreach collection="list" close=")" open="(" item="id" separator=",">
+            #{id}
+        </foreach>
+    </select>
+
 </mapper>

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgMessageInvestigationMapper.xml

@@ -43,4 +43,18 @@
         </where>
     </select>
 
+    <select id="selectListByIds" resultType="com.daqing.financial.guarantee.model.response.MessageInvestigationListResponse">
+        select au.id,au.company_id,au.business_id,ai.business_code,ai.business_type,ai.apply_amount,ai.apply_time,au.create_time,
+        au.status,au.operating_status,cc.name,cc.phone,ps.business_status
+        from dg_message_investigation au
+        left join dg_apply_amount_info ai on au.business_id = ai.id
+        left join crms_company_customer ccl on ai.company_id = ccl.id
+        left join crms_customer cc on cc.id = ccl.customer_id
+        left JOIN dg_business_process_status ps ON ps.business_id = au.business_id
+        where au.id in
+        <foreach collection="list" close=")" open="(" item="id" separator=",">
+            #{id}
+        </foreach>
+    </select>
+
 </mapper>

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgAssetsMoney.java

@@ -0,0 +1,55 @@
+package com.daqing.framework.domain.guarantee;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Qyq
+ * @since 2020-11-26
+ */
+@Data
+@TableName("dg_assets_money")
+public class DgAssetsMoney implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 业务id
+     */
+    private Integer businessId;
+
+    /**
+     * 房产金额
+     */
+    private BigDecimal houseMoney;
+
+    /**
+     * 车辆金额
+     */
+    private BigDecimal carMoney;
+
+    /**
+     * 设备金额
+     */
+    private BigDecimal equipmentMoney;
+
+    /**
+     * 其他金额
+     */
+    private BigDecimal otherMoney;
+}

dq-govern-gateway/src/main/resources/jwt.properties

@@ -12,6 +12,11 @@ jwt.ignoreUrlList=/apiHrmsAuth/hrms/auth/userlogin/getBackPwd,\
   /apiHrmsAuth/hrms/auth/userlogin/bindPhoneAndOpenId,\
   /apiHrmsAuth/hrms/auth/userlogin/sendCode,\
   /apiHrmsAuth/hrms/auth/userlogin/isPhoneExist,\
-  /api-guarantee/dg-apply-amount-info/applyAmountListExport
+  /api-guarantee/dg-apply-amount-info/applyAmountListExport,\
+  /api-guarantee/dg-apply-amount-info/excelExport,\
+  /api-guarantee/dg-message-investigation/excelExport,\
+  /api-guarantee/dg-assets-investigation/excelExport,\
+  /api-guarantee/dg-guarantee-assign-user/excelExport
+