Commit fb42d245 authored by 韩桐桐's avatar 韩桐桐

fix(统计):设备基本信息中的登记日期

parent 973a3054
......@@ -2651,6 +2651,19 @@ public class JGDPStatisticsServiceImpl {
// 账号类型(用于车用气瓶流程页面-》监管审核-》打开设备详情 时隐藏保存按钮)
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
objMap.put("accountType", reginParams.getCompany().getCompanyType());
// 登记日期
if(!ValidationUtil.isEmpty(registerInfo.getUseOrgCode())){
Optional<JgUseRegistrationManage> firstRecord = jgUseRegistrationManageMapper.selectList(new QueryWrapper<JgUseRegistrationManage>().lambda()
.eq(JgUseRegistrationManage::getUseRegistrationCode, registerInfo.getUseOrgCode())
.orderByDesc(JgUseRegistrationManage::getRecDate)).stream().findFirst();
firstRecord.ifPresent(jgUseRegistrationManage -> {
Date auditPassDate = jgUseRegistrationManage.getAuditPassDate();
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
String formattedDate = dateFormat.format(auditPassDate);
objMap.put("REGISTRATION_DATE", formattedDate);
});
}
return objMap;
}
......
......@@ -152,7 +152,7 @@
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "REGISTRATION_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" }
],
......
......@@ -156,7 +156,7 @@
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "REGISTRATION_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" }
],
......@@ -167,7 +167,7 @@
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "REGISTRATION_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
],
"keyParams_2300_false": [
......@@ -177,7 +177,7 @@
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "REGISTRATION_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECTION_DATE", "label": "下次检验日期" },
{ "key": "CAR_NUMBER", "label": "车牌号" },
{ "key": "IDENTIFICATION_CODE", "label": "车辆VIN码" },
......
......@@ -152,7 +152,7 @@
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "REGISTRATION_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
{ "key": "ME_UNIT_NAME", "label": "维保单位名称" },
{ "key": "INFORM_END", "label": "维保备案有效期" },
......
......@@ -148,7 +148,7 @@
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "REGISTRATION_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" }
],
......
......@@ -144,7 +144,7 @@
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "REGISTRATION_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" }
],
......
......@@ -138,7 +138,7 @@
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "REGISTRATION_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" }
],
......
......@@ -144,7 +144,7 @@
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "REGISTRATION_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" }
],
......@@ -155,7 +155,7 @@
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "REGISTRATION_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
],
"infoRecords": {
......
......@@ -144,7 +144,7 @@
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "REGISTRATION_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" }
],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment