diff --git a/ibs/src/main/java/com/ruoyi/ibs/list/domain/CustInfoRetailVo.java b/ibs/src/main/java/com/ruoyi/ibs/list/domain/CustInfoRetailVo.java index c64ec5a..2dddcae 100644 --- a/ibs/src/main/java/com/ruoyi/ibs/list/domain/CustInfoRetailVo.java +++ b/ibs/src/main/java/com/ruoyi/ibs/list/domain/CustInfoRetailVo.java @@ -49,6 +49,17 @@ public class CustInfoRetailVo //催收任务详情--青田 private List> taskDetail; + //重要信息一览贷款信息列表--青田 + private List importantInfoLoan932List; + + public List getImportantInfoLoan932List() { + return importantInfoLoan932List; + } + + public void setImportantInfoLoan932List(List importantInfoLoan932List) { + this.importantInfoLoan932List = importantInfoLoan932List; + } + public List> getTaskDetail() { return taskDetail; } diff --git a/ibs/src/main/java/com/ruoyi/ibs/list/service/impl/CustInfoRetailServiceImpl.java b/ibs/src/main/java/com/ruoyi/ibs/list/service/impl/CustInfoRetailServiceImpl.java index 3e3b0fa..440c2a1 100644 --- a/ibs/src/main/java/com/ruoyi/ibs/list/service/impl/CustInfoRetailServiceImpl.java +++ b/ibs/src/main/java/com/ruoyi/ibs/list/service/impl/CustInfoRetailServiceImpl.java @@ -64,6 +64,8 @@ public class CustInfoRetailServiceImpl implements ICustInfoRetailService { private AnchorMapper anchorMapper; @Autowired private DashboardService dashboardService; + @Autowired + private ImportantInfoLoan932Mapper importantInfoLoan932Mapper; /** * 查询对私客户信息 @@ -147,9 +149,12 @@ public class CustInfoRetailServiceImpl implements ICustInfoRetailService { if (SecurityUtils.getHeadId().equals("932")){ CommonRespVO taskDetail = dashboardService.getTaskDetail(custId); custInfoRetailVo.setTaskDetail(taskDetail.getData()); + List loanInfoList = importantInfoLoan932Mapper.selectByCustId(custId); + custInfoRetailVo.setImportantInfoLoan932List(loanInfoList); } return custInfoRetailVo; } + public List getCmpmUserList(String custId){ String roleName = userRole(); List list = new ArrayList<>(); diff --git a/ibs/src/main/java/com/ruoyi/ibs/task/service/impl/WorkRecordServiceImpl.java b/ibs/src/main/java/com/ruoyi/ibs/task/service/impl/WorkRecordServiceImpl.java index eca27dd..dd37e15 100644 --- a/ibs/src/main/java/com/ruoyi/ibs/task/service/impl/WorkRecordServiceImpl.java +++ b/ibs/src/main/java/com/ruoyi/ibs/task/service/impl/WorkRecordServiceImpl.java @@ -53,8 +53,6 @@ public class WorkRecordServiceImpl implements WorkRecordService { @Resource private RedisCache redisCache; - private final static String alterTypeRedisKey = "work:alter_types_count_"; - /** * 查询我的工作清单 * @@ -201,22 +199,11 @@ public class WorkRecordServiceImpl implements WorkRecordService { /** * 获取预警类型及各类型预警数量 - * 每天首次查询存储到redis里,后面都从redis读取 + * 每次直接查询数据库,不使用缓存 */ @Override public List getAlterTypes() { String headId = SecurityUtils.getHeadId(); - String username = SecurityUtils.getUsername(); - String redisKey = alterTypeRedisKey + username; - - // 先从 redis 获取缓存 - if (redisCache.hasKey(redisKey)) { - List cachedList = redisCache.getCacheObject(redisKey); - if (cachedList != null && !cachedList.isEmpty()) { - log.debug("从 redis 获取预警类型缓存, username: {}", username); - return cachedList; - } - } // 先查询预警类型列表 List alterTypes = workRecordMapper.selectAlterTypesByHeadId(headId); @@ -231,10 +218,6 @@ public class WorkRecordServiceImpl implements WorkRecordService { return warnInfoVO; }).collect(Collectors.toList()); - // 存入 redis,过期时间到当天结束 - redisCache.setCacheObjectToEndDay(redisKey, resultList); - log.debug("预警类型数据已存入 redis, username: {}, 数量: {}", username, resultList.size()); - return resultList; } diff --git a/szzh-h5/src/views/customer/customePersonDetail.vue b/szzh-h5/src/views/customer/customePersonDetail.vue index e806e65..7781a28 100644 --- a/szzh-h5/src/views/customer/customePersonDetail.vue +++ b/szzh-h5/src/views/customer/customePersonDetail.vue @@ -22,36 +22,6 @@ -
-
-
-
-
年龄
-
{{ baseInfo.custAge }}
-
-
-
婚姻状况
-
{{ baseInfo.isMarried }}
-
-
-
年收入
-
{{ baseInfo.custSalary }}
-
-
-
资产情况
-
{{ baseInfo.asset }}
-
-
-
信用状况
-
{{ baseInfo.credit }}
-
-
-
行业名称
-
{{ initIndustryBusiStr(baseInfo.belongBusi) }}
-
-
-
-
+ + + @@ -81,16 +54,8 @@ - - + +
@@ -143,7 +108,8 @@ export default { value: '', showPicker: false, columns: [1, 2, 23, 4, 5], - baseInfo:{}, + baseInfo: {}, + importantInfoList: [], taskDetail: [], industryOptions: [] } @@ -182,11 +148,14 @@ export default { }, orgNum() { const { deptId = '' } = this.userInfo - const str = String(deptId).substring(0,3) + const str = String(deptId).substring(0, 3) return str }, - showcard() { - return this.userInfo.userName.startsWith('932') + showImportantInfo() { + return this.orgNum === '932' + }, + showTaskDetail() { + return this.orgNum === '932' } }, methods: { @@ -197,29 +166,9 @@ export default { let custId = sessionStorage.getItem('custId') getPersonInfo(custId).then(res => { if (res.code == 200) { - this.baseInfo = res.data.custInfoRetail - if (res.data.taskDetail.length > 0) { - const taskDetail = res.data.taskDetail[0] || {} - for (let i in taskDetail) { - if (i !== 'info') { - this.taskDetail.push({ - value: i, - label: taskDetail[i], - isImage: i === '照片存放地址' - }) - } else { - for (let j in taskDetail.info) { - this.taskDetail.push({ - value: j, - label: taskDetail.info[j], - isImage: j === '照片存放地址' - }) - } - } - } - } else { - this.taskDetail = [] - } + this.baseInfo = res.data.custInfoRetail || {} + this.importantInfoList = this.buildImportantInfoList(this.baseInfo, res.data.importantInfoLoan932List || []) + this.taskDetail = this.formatTaskDetail(res.data.taskDetail || []) } }) }, @@ -237,6 +186,7 @@ export default { } } } + return data || '' }, initIndustryTree() { getIndustryTree().then((res) => { @@ -275,6 +225,58 @@ export default { this.init(); }); }, + buildImportantInfoList(baseInfo, loanInfoList) { + const result = [ + { value: '年龄', label: baseInfo.custAge || '' }, + { value: '婚姻状况', label: baseInfo.isMarried || '' }, + { value: '年收入', label: baseInfo.custSalary || '' }, + { value: '资产情况', label: baseInfo.asset || '' }, + { value: '信用状况', label: baseInfo.credit || '' }, + { value: '行业名称', label: this.initIndustryBusiStr(baseInfo.belongBusi) } + ] + loanInfoList.forEach((loanInfo, index) => { + result.push({ value: `贷款信息${index + 1}`, label: '', isSection: true }) + result.push( + { value: '客户号', label: loanInfo.custId || '' }, + { value: '客户内码', label: loanInfo.custIsn || '' }, + { value: '合同号', label: loanInfo.contractNo || '' }, + { value: '合同起始日', label: loanInfo.conStartDt || '' }, + { value: '合同终止日', label: loanInfo.conEndDt || '' }, + { value: '贷款余额', label: loanInfo.loanBal || '' }, + { value: '贷款利率', label: loanInfo.loanRate || '' }, + { value: '担保方式', label: loanInfo.assureWay || '' }, + { value: '贷款用途', label: loanInfo.loanPurpose || '' }, + { value: '归属支行', label: loanInfo.orgCode || '' }, + { value: '数据日期', label: loanInfo.dataDate || '' } + ) + }) + return result + }, + formatTaskDetail(taskSource) { + if (!taskSource.length) { + return [] + } + const taskDetail = taskSource[0] || {} + const result = [] + for (let i in taskDetail) { + if (i !== 'info') { + result.push({ + value: i, + label: taskDetail[i], + isImage: i === '照片存放地址' + }) + } else if (taskDetail.info) { + for (let j in taskDetail.info) { + result.push({ + value: j, + label: taskDetail.info[j], + isImage: j === '照片存放地址' + }) + } + } + } + return result + }, handleClickItem(item) { if (item.title == "个人基本信息") { sessionStorage.setItem('detailType', item.title); @@ -316,31 +318,6 @@ export default { padding-bottom: 60px; } -.wrappernew { - // padding-top: 46px; - font-size: 14px; - background-color: #fff; - - .view_item { - display: flex; - justify-content: space-between; - line-height: 40px; - font-size: 14px; - border-bottom: 1px solid rgba(245, 245, 245, 1); - padding: 0 20px; - } - - .view_item_left { - width: 40%; - color: rgb(22, 13, 13); - } - - .view_item_right { - width: 60%; - color: rgb(22, 13, 13); - } -} - .wrapper_top { background-color: #fff; padding: 15px 20px; diff --git a/szzh-h5/src/views/details/speticalTag.vue b/szzh-h5/src/views/details/speticalTag.vue index 029b83b..07d35ec 100644 --- a/szzh-h5/src/views/details/speticalTag.vue +++ b/szzh-h5/src/views/details/speticalTag.vue @@ -2,10 +2,13 @@
-
+
+
{{ item.value }}
+
{{ item.value }}
{{ item.label }}
+
@@ -81,6 +84,14 @@ export default { padding: 0 20px; } +.section_item { + padding: 12px 20px 8px; + font-size: 13px; + font-weight: 600; + color: #333; + background-color: #f7f8fa; +} + .view_item_left { // width: 40%; color: #7c7c7c;