diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java index e7292a1e..e59f7e8e 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java +++ b/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 ids,HttpServletResponse response) { - Boolean result = applyAmountInfoService.excelExport(response); + Boolean result = applyAmountInfoService.excelExport(ids,response); return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsInvestigationController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsInvestigationController.java index 09ecd508..fd943a55 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsInvestigationController.java +++ b/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().SUCCESS(data); } + /** + * 导出 + */ + @GetMapping("/excelExport") + @ApiOperation(value = "导出资产部调查内容") + public ResponseResult excelExport(@RequestParam("ids") List ids, HttpServletResponse response) { + + Boolean result = dgAssetsInvestigationService.excelExport(ids,response); + + return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); + } + /** * 指派资产部调查员 * @param diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsMoneyController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsMoneyController.java new file mode 100644 index 00000000..705626ea --- /dev/null +++ b/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; + +/** + *

+ * 前端控制器 + *

+ * + * @author Qyq + * @since 2020-11-26 + */ +@RestController +@RequestMapping("/dg-assets-money") +public class DgAssetsMoneyController { + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java index 6f61df4a..9d43b3c0 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java +++ b/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().SUCCESS(data); } + /** + * 导出 + */ + @GetMapping("/excelExport") + @ApiOperation(value = "导出担保部调查内容") + public ResponseResult excelExport(@RequestParam("ids") List ids, HttpServletResponse response) { + + Boolean result = dgGuaranteeAssignUserService.excelExport(ids,response); + + return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); + } + /** * 指派A,B角 * @param diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgMessageInvestigationController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgMessageInvestigationController.java index d063441f..091b5dad 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgMessageInvestigationController.java +++ b/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().SUCCESS(data); } + /** + * 导出 + */ + @GetMapping("/excelExport") + @ApiOperation(value = "导出信息部调查内容") + public ResponseResult excelExport(@RequestParam("ids") List ids, HttpServletResponse response) { + + Boolean result = dgMessageInvestigationService.excelExport(ids,response); + + return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); + } + /** * 指派信息部调查员 * @param diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountInfoMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountInfoMapper.java index ea5fcb3f..d2eeba10 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountInfoMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountInfoMapper.java @@ -27,4 +27,6 @@ public interface DgApplyAmountInfoMapper extends BaseMapper { List excelList(); DgApplyAmountInfoResponse selectApplyAmountInfoById(Integer id); + + List selectListByIds(List ids); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgAssetsInvestigationMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgAssetsInvestigationMapper.java index 70691771..1610a61b 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgAssetsInvestigationMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgAssetsInvestigationMapper.java @@ -24,4 +24,6 @@ public interface DgAssetsInvestigationMapper extends BaseMapper pageByCondition(Page page, String customerNumberOrName, List roleIdlist, String userId, Integer status); DgAssetsInvestigationResponse selectInfoById(Integer id); + + List selectListByIds(List ids); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgAssetsMoneyMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgAssetsMoneyMapper.java new file mode 100644 index 00000000..9fc28a64 --- /dev/null +++ b/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; + +/** + *

+ * Mapper 接口 + *

+ * + * @author Qyq + * @since 2020-11-26 + */ +@Mapper +public interface DgAssetsMoneyMapper extends BaseMapper { + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeAssignUserMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeAssignUserMapper.java index 15cd7987..aa0430d4 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeAssignUserMapper.java +++ b/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 { IPage pageByCondition(Page page,@Param("customerNumberOrName") String customerNumberOrName,@Param("roleIdlist") List roleIdlist,@Param("userId") String userId,@Param("status") Integer status); + + List selectListByIds(List ids); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgMessageInvestigationMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgMessageInvestigationMapper.java index 12ac7761..d7a5ab19 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgMessageInvestigationMapper.java +++ b/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 { IPage pageByCondition(Page page, String customerNumberOrName, List roleIdlist, String userId, Integer status); + + List selectListByIds(List ids); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/InvestigateAssetsRequest.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/InvestigateAssetsRequest.java index 73f8fee6..b8db2286 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/InvestigateAssetsRequest.java +++ b/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; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AssetsInvestigationListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AssetsInvestigationListResponse.java index 138a8657..e4e3f181 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AssetsInvestigationListResponse.java +++ b/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; } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/BusinessApplicationListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/BusinessApplicationListResponse.java index 50717950..3d030d65 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/BusinessApplicationListResponse.java +++ b/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; /** diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgAssetsInvestigationResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgAssetsInvestigationResponse.java index 87ed4950..661a2ab4 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgAssetsInvestigationResponse.java +++ b/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 assessmentList; + + @ApiModelProperty(value = "评估价值对象") + private DgAssetsMoney dgAssetsMoney; } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeListResponse.java index f3631054..a1d4ff0b 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeListResponse.java +++ b/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; } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/MessageInvestigationListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/MessageInvestigationListResponse.java index 09fc2b01..e5ad0a94 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/MessageInvestigationListResponse.java +++ b/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; } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountInfoService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountInfoService.java index da7fbfe0..1195e4a0 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountInfoService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountInfoService.java @@ -29,7 +29,7 @@ public interface IDgApplyAmountInfoService extends IService { int revokeBusinessApplication(Integer id); - Boolean excelExport(HttpServletResponse response); + Boolean excelExport(List ids,HttpServletResponse response); int approvalBusinessApplication(Integer id, Integer status, String remark, Integer companyId); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgAssetsInvestigationService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgAssetsInvestigationService.java index 44690fd9..657fe5b4 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgAssetsInvestigationService.java +++ b/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 ids, HttpServletResponse response); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgAssetsMoneyService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgAssetsMoneyService.java new file mode 100644 index 00000000..f8c371ac --- /dev/null +++ b/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; + +/** + *

+ * 服务类 + *

+ * + * @author Qyq + * @since 2020-11-26 + */ +public interface IDgAssetsMoneyService extends IService { + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgGuaranteeAssignUserService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgGuaranteeAssignUserService.java index e3fb55be..c2e51508 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgGuaranteeAssignUserService.java +++ b/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 ids, HttpServletResponse response); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgMessageInvestigationService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgMessageInvestigationService.java index 5d90cc7b..57b4507d 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgMessageInvestigationService.java +++ b/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 ids, HttpServletResponse response); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java index ca269397..a89f2bc6 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java @@ -368,29 +368,33 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl ids, HttpServletResponse response) { + //根据ids查询业务申请列表信息 + ListapplyList = this.baseMapper.selectListByIds(ids); + System.out.println("applyList==========================="+applyList); + Listlist2= new ArrayList<>(); + List list = this.getBaseMapper().excelList(); + for (BusinessApplicationListResponse res:applyList) { + //list2.add(res.getPresenterId()); + + //根据userId获取用户名以及部门名称 + ResponseResult 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 employeeMessage = hrmsFeignService.getAccountAndDeptNameById(Long.valueOf(userId)); + //ResponseResult employeeMessage = hrmsFeignService.getAccountAndDeptNameById(5l); try { - List 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) { diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java index 8891eb19..5054fa34 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java +++ b/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 roleIdlist, String userId, Integer status) { //分页参数 @@ -128,6 +137,10 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl() + .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 ids, HttpServletResponse response) { + //根据ids查询业务申请列表信息 + ListassetsList = 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; + } + } } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsMoneyServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsMoneyServiceImpl.java new file mode 100644 index 00000000..7177141b --- /dev/null +++ b/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; + +/** + *

+ * 服务实现类 + *

+ * + * @author Qyq + * @since 2020-11-26 + */ +@Service +public class DgAssetsMoneyServiceImpl extends ServiceImpl implements IDgAssetsMoneyService { + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java index 4d16bc89..74b3ee65 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java +++ b/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 ids, HttpServletResponse response) { + //根据ids查询业务申请列表信息 + ListguaranteeList = 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; + } + } + } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java index 9db10182..2f421742 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java +++ b/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 ids, HttpServletResponse response) { + //根据ids查询业务申请列表信息 + ListmessageList = 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; + } + } } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/MyBatisPlusCodeGenerator.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/MyBatisPlusCodeGenerator.java index 1663e228..c071c1d4 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/MyBatisPlusCodeGenerator.java +++ b/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); } diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountInfoMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountInfoMapper.xml index b2859f56..994bd1ab 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountInfoMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountInfoMapper.xml @@ -45,4 +45,18 @@ select * from dg_apply_amount_info where id=#{id} + + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAssetsInvestigationMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAssetsInvestigationMapper.xml index 018f301e..a8296509 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAssetsInvestigationMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAssetsInvestigationMapper.xml @@ -60,4 +60,18 @@ select * from dg_assets_investigation where id=#{id} + + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAssetsMoneyMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAssetsMoneyMapper.xml new file mode 100644 index 00000000..7b466136 --- /dev/null +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAssetsMoneyMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml index 75285917..2e4cb9b2 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml @@ -44,4 +44,18 @@ + + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgMessageInvestigationMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgMessageInvestigationMapper.xml index e46c786f..4f462dae 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgMessageInvestigationMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgMessageInvestigationMapper.xml @@ -43,4 +43,18 @@ + + diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgAssetsMoney.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgAssetsMoney.java new file mode 100644 index 00000000..6126170d --- /dev/null +++ b/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; + +/** + *

+ * + *

+ * + * @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; +} diff --git a/dq-govern-gateway/src/main/resources/jwt.properties b/dq-govern-gateway/src/main/resources/jwt.properties index 5cc28ed2..2d0b37e2 100644 --- a/dq-govern-gateway/src/main/resources/jwt.properties +++ b/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 +