diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java index 73751c3d..9c9cd837 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java @@ -377,9 +377,9 @@ public class CustomerServiceImpl extends ServiceImpl().FAIL("导入数据失败,员工" + manager.getManager() + "不存在"); - } + }*/ } this.saveCustomerPersonal(customerPersonalTOI); } @@ -398,9 +398,9 @@ public class CustomerServiceImpl extends ServiceImpl().FAIL("导入数据失败,员工" + manager.getManager() + "不存在"); - } + }*/ } this.insertCompany(companyCustomerRequest); // this.saveCustomerCompany(customerCompanyTOI); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsExcelRefuseResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsExcelRefuseResponse.java index b393322c..dcd8976e 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsExcelRefuseResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsExcelRefuseResponse.java @@ -2,6 +2,7 @@ package com.daqing.financial.guarantee.model.response; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.metadata.BaseRowModel; +import com.daqing.framework.utils.excel.ProcessIdConverter; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,59 +19,59 @@ import java.util.Date; */ @Data @ToString -public class DgStatisticsExcelRefuseResponse extends BaseRowModel implements Serializable { +public class DgStatisticsExcelRefuseResponse extends BaseRowModel implements Serializable { @ApiModelProperty("业务编号") - @ExcelProperty(value = "业务编号",index = 0) + @ExcelProperty(value = "业务编号", index = 0) private String businessCode; @ApiModelProperty("客户姓名") - @ExcelProperty(value = "客户姓名",index = 1) + @ExcelProperty(value = "客户姓名", index = 1) private String name; @ApiModelProperty("客户联系方式") - @ExcelProperty(value = "联系电话",index = 2) + @ExcelProperty(value = "联系电话", index = 2) private String phone; @ApiModelProperty("业务类型") - @ExcelProperty(value = "产品类型",index = 3) + @ExcelProperty(value = "产品类型", index = 3) private String businessType; @ApiModelProperty("申请额度") - @ExcelProperty(value = "金额",index = 4) + @ExcelProperty(value = "金额", index = 4) private Double applyAmount; @ApiModelProperty("申请期限") - @ExcelProperty(value = "期数",index = 5) + @ExcelProperty(value = "期数", index = 5) private String applyTime; @ApiModelProperty("申请日期") - @ExcelProperty(value = "申请日期",index = 6) + @ExcelProperty(value = "申请日期", index = 6) @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date createTime; @ApiModelProperty("拒绝人") - @ExcelProperty(value = "当前审批人",index = 7) + @ExcelProperty(value = "当前审批人", index = 7) private String refuseName; @ApiModelProperty("拒绝节点id") - @ExcelProperty(value = "任务节点",index = 8) + @ExcelProperty(value = "任务节点", index = 8, converter = ProcessIdConverter.class) private Integer processId; @ApiModelProperty("拒绝时间") - @ExcelProperty(value = "拒绝时间",index = 9) + @ExcelProperty(value = "拒绝时间", index = 9) @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date refuseTime; @ApiModelProperty("拒绝原因") - @ExcelProperty(value = "拒绝原因",index = 10) + @ExcelProperty(value = "拒绝原因", index = 10) private String refuseOpinion; @ApiModelProperty("提单人姓名") - @ExcelProperty(value = "提单人",index = 11) + @ExcelProperty(value = "提单人", index = 11) private String employeeName; @ApiModelProperty("部门") - @ExcelProperty(value = "所属部门",index = 12) + @ExcelProperty(value = "所属部门", index = 12) private String department; } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsExcelResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsExcelResponse.java index e3852870..52aecfe2 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsExcelResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsExcelResponse.java @@ -2,6 +2,7 @@ package com.daqing.financial.guarantee.model.response; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.metadata.BaseRowModel; +import com.daqing.framework.utils.excel.ProcessIdConverter; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -21,49 +22,49 @@ import java.util.Date; public class DgStatisticsExcelResponse extends BaseRowModel implements Serializable { @ApiModelProperty("业务编号") - @ExcelProperty(value = "业务编号",index = 0) + @ExcelProperty(value = "业务编号", index = 0) private String businessCode; @ApiModelProperty("客户姓名") - @ExcelProperty(value = "客户姓名",index = 1) + @ExcelProperty(value = "客户姓名", index = 1) private String name; @ApiModelProperty("客户联系方式") - @ExcelProperty(value = "联系电话",index = 2) + @ExcelProperty(value = "联系电话", index = 2) private String phone; @ApiModelProperty("业务类型") - @ExcelProperty(value = "产品类型",index = 3) + @ExcelProperty(value = "产品类型", index = 3) private String businessType; @ApiModelProperty("申请额度") - @ExcelProperty(value = "金额",index = 4) + @ExcelProperty(value = "金额", index = 4) private Double applyAmount; @ApiModelProperty("申请期限") - @ExcelProperty(value = "期数",index = 5) + @ExcelProperty(value = "期数", index = 5) private String applyTime; @ApiModelProperty("申请日期") - @ExcelProperty(value = "申请日期",index = 6) + @ExcelProperty(value = "申请日期", index = 6) @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date createTime; @ApiModelProperty("完成任务节点id") - @ExcelProperty(value = "完成任务节点id",index = 7) + @ExcelProperty(value = "完成任务节点id", index = 7, converter = ProcessIdConverter.class) private Integer processId; @ApiModelProperty("最新操作时间") - @ExcelProperty(value = "任务分配时间",index = 8) + @ExcelProperty(value = "任务分配时间", index = 8) @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date operationTime; @ApiModelProperty("提单人姓名") - @ExcelProperty(value = "提单人",index = 9) + @ExcelProperty(value = "提单人", index = 9) private String employeeName; @ApiModelProperty("部门") - @ExcelProperty(value = "所属部门",index = 10) + @ExcelProperty(value = "所属部门", index = 10) private String department; } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java index 68caccf1..dd3e2ab7 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java @@ -14,8 +14,10 @@ import com.daqing.financial.guarantee.service.IDgEfficiencyService; import com.daqing.financial.guarantee.util.DateUtils; import com.daqing.framework.domain.guarantee.DgApplyAmountInfo; import com.daqing.framework.domain.guarantee.DgAuditProcess; +import com.daqing.framework.domain.guarantee.GuaranteeCode; import com.daqing.framework.domain.guarantee.po.DgWorkConferencePO; import com.daqing.framework.domain.guarantee.po.StatusPO; +import com.daqing.framework.exception.ExceptionCast; import com.daqing.framework.model.response.PromptSuccess; import com.daqing.framework.util.RedisUtil; import com.google.common.collect.Maps; @@ -24,6 +26,7 @@ import org.springframework.stereotype.Service; import com.daqing.framework.domain.guarantee.po.DgTeamEfficiencyPO; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; @@ -118,6 +121,17 @@ public class DgEfficiencyServiceImpl extends ServiceImpl teamEfficiencyList = this.getBaseMapper().queryList(dgEfficiencyTeamRequest); List> list = new ArrayList<>(); @@ -276,7 +290,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl positionVO = applyAmountListMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId()); List records = positionVO.getRecords(); - if (records!=null && records.size()!=0){ + if (records != null && records.size() != 0) { records.forEach(businessApplicationListResponse -> { StatusPO statusPO = new StatusPO(); Integer businessId = businessApplicationListResponse.getBusinessId(); @@ -298,7 +312,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl positionVO = guaranteeAssignUserMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId(), null); List records = positionVO.getRecords(); - if (records!=null && records.size()!=0) { + if (records != null && records.size() != 0) { records.forEach(guaranteeListResponse -> { StatusPO statusPO = new StatusPO(); Integer businessId = guaranteeListResponse.getBusinessId(); @@ -320,7 +334,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl positionVO = assetsInvestigationMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId(), null); List records = positionVO.getRecords(); - if (records!=null && records.size()!=0) { + if (records != null && records.size() != 0) { records.forEach(assetsInvestigationListResponse -> { StatusPO statusPO = new StatusPO(); Integer businessId = assetsInvestigationListResponse.getBusinessId(); @@ -342,7 +356,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl positionVO = messageInvestigationMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId(), null); List records = positionVO.getRecords(); - if (records!=null && records.size()!=0) { + if (records != null && records.size() != 0) { records.forEach(messageInvestigationListResponse -> { StatusPO statusPO = new StatusPO(); Integer businessId = messageInvestigationListResponse.getBusinessId(); @@ -360,12 +374,12 @@ public class DgEfficiencyServiceImpl extends ServiceImpl list = complianceInvestigationMapper.list(new Page(1, size), dgComplianceInvestigationRequest, roleList, currentUser); List records = list.getRecords(); - if (records!=null && records.size()!=0) { + if (records != null && records.size() != 0) { records.forEach(dgComplianceInvestigationResponse -> { StatusPO statusPO = new StatusPO(); Integer businessId = dgComplianceInvestigationResponse.getBusinessId(); @@ -386,7 +400,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl list = workConferenceConsiderMapper.list(new Page(1, size), "", roleList, currentUser); List records = list.getRecords(); - if (records!=null && records.size()!=0) { + if (records != null && records.size() != 0) { records.forEach(dgWorkConferencePO -> { StatusPO statusPO = new StatusPO(); Integer businessId = dgWorkConferencePO.getBusinessId(); @@ -404,10 +418,10 @@ public class DgEfficiencyServiceImpl extends ServiceImpl list = loanCommitteeConsiderMapper.list(new Page(1, size), "", roleList, currentUser); List records = list.getRecords(); - if (records!=null && records.size()!=0) { + if (records != null && records.size() != 0) { records.forEach(dgLoanCommitteeConsiderResponse -> { StatusPO statusPO = new StatusPO(); Integer businessId = dgLoanCommitteeConsiderResponse.getBusinessId(); @@ -425,11 +439,11 @@ public class DgEfficiencyServiceImpl extends ServiceImpl iPage = guaranteeLetterAssignUserMapper.pageByCondition(new Page(1, size), currentUser, roleIdList, null, null); List records = iPage.getRecords(); - if (records!=null && records.size()!=0) { + if (records != null && records.size() != 0) { records.forEach(guaranteeLetterListResponse -> { StatusPO statusPO = new StatusPO(); String name = guaranteeLetterListResponse.getName(); @@ -447,11 +461,11 @@ public class DgEfficiencyServiceImpl extends ServiceImpl iPage = paymentConfirmationConsiderMapper.pageByCondition(new Page(1, size), roleIdList, currentUser, null, null); List records = iPage.getRecords(); - if (records!=null && records.size()!=0) { + if (records != null && records.size() != 0) { records.forEach(paymentConfirmationListResponse -> { StatusPO statusPO = new StatusPO(); String name = paymentConfirmationListResponse.getName(); @@ -473,7 +487,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl iPage = loanNoticeMapper.pageByCondition(new Page(1, size), roleIdList, currentUser, null, null); List records = iPage.getRecords(); - if (records!=null && records.size()!=0) { + if (records != null && records.size() != 0) { records.forEach(loanNoticeListResponse -> { StatusPO statusPO = new StatusPO(); String name = loanNoticeListResponse.getName(); @@ -495,10 +509,10 @@ public class DgEfficiencyServiceImpl extends ServiceImpl auditProcessList = dgAuditProcessMapper.selectList(wrapper); long countTime = 0L; - if (auditProcessList.size()>1){ + if (auditProcessList.size() > 1) { //遍历业务流程数据,统计该用户的耗时 for (int i = 1; i <= auditProcessList.size() - 1; i++) { //从第二条数据开始,获取该数据 @@ -557,11 +571,11 @@ public class DgEfficiencyServiceImpl extends ServiceImpl { + + @Override + public Class supportJavaTypeKey() { + return Integer.class; + } + + @Override + public CellDataTypeEnum supportExcelTypeKey() { + return CellDataTypeEnum.STRING; + } + + /** + * 这里读的时候会调用 + * + * @param cellData + * NotNull + * @param contentProperty + * Nullable + * @param globalConfiguration + * NotNull + * @return + */ + @Override + public Integer convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, + GlobalConfiguration globalConfiguration) { + return 0; + } + + /** + * 这里是写的时候会调用 + * + * @param value + * NotNull + * @param contentProperty + * Nullable + * @param globalConfiguration + * NotNull + * @return + */ + @Override + public CellData convertToExcelData(Integer value, ExcelContentProperty contentProperty, + GlobalConfiguration globalConfiguration) { + + switch (value){ + case 1: + return new CellData("业务申请"); + case 2: + return new CellData("担保部调查"); + case 3: + return new CellData("资产部调查"); + case 4: + return new CellData("信息部调查"); + case 5: + return new CellData("合规调查"); + case 6: + return new CellData("工作会"); + case 7: + return new CellData("贷审会"); + case 8: + return new CellData("担保函"); + case 9: + return new CellData("回款确认"); + case 10: + return new CellData("放款通知"); + default: + return new CellData(""); + } + + } + +}