Commit 31c4865f authored by 韩桐桐's avatar 韩桐桐

fix(jg):【需求3053】:将所有的维保备案名称改为维保合同备案

parent 6ff49b83
......@@ -20,7 +20,7 @@ public enum BusinessTypeEnum {
JG_ADVICE_REMOVAL("105", "移装告知"),
JG_MAINTENANCE_RECORD("106", "维保备案"),
JG_MAINTENANCE_RECORD("106", "维保合同备案"),
JG_USAGE_REGISTRATION("107", "使用登记"),
......
......@@ -16,7 +16,7 @@ public enum SafetyProblemTypeEnum {
JYCQ("2", "检验超期", "设备检验超期", "safetyProblemTracing/jy/cq", "outOfInspectionRecords"),
JYBJ("21", "检验报检", "设备报检", "safetyProblemTracing/jy/bj", null),
WBCQ("1", "维保超期", "设备维保超期", "safetyProblemTracing/wb/cq", "outOfMaintenanceRecords"),
WBBA("11", "维保备案", "设备维保备案", "safetyProblemTracing/wb/ba", null),
WBBA("11", "维保合同备案", "设备维保合同备案", "safetyProblemTracing/wb/ba", null),
ZZCQ("3", "资质超期", "企业资质超期", "safetyProblemTracing/zz/cq", null);
private final String code;
......
......@@ -1144,7 +1144,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
// 维保备案
Map<String, Object> maintenanceDetail = jgUseRegistrationMapper.getMaintenanceDetail(record);
if (!ObjectUtils.isEmpty(maintenanceDetail)) {
business = business + ",维保备案";
business = business + ",维保合同备案";
objMap.putAll(maintenanceDetail);
objMap.put("maintenanceContract", JSON.parse(Optional.ofNullable(maintenanceDetail.get("maintenanceContract")).orElse("").toString()));
objMap.put("maintOtherAccessories", JSON.parse(Optional.ofNullable(maintenanceDetail.get("maintOtherAccessories")).orElse("").toString()));
......
......@@ -218,7 +218,7 @@ public class ReportAnalysisServiceImpl implements IReportAnalysisService {
// 已去重行数据为集合,填充每种流程状态下单据的数量及将code->name
return countVoSet.stream().map(c -> {
JgBizCountBaseVo vo = new JgBizCountBaseVo();
vo.setBizGroup("维保备案");
vo.setBizGroup("维保合同备案");
return buildJgBizCountBaseVo(countDataBOList, c, vo, mainLaunchesStatusList, false);
}).collect(Collectors.toList());
}
......
......@@ -62,7 +62,7 @@
],
"WBBA": [
{
"name": "维保备案",
"name": "维保合同备案",
"code": "WB_BA",
"image": "upload/tzs/common/image/维保备案.png"
}
......
......@@ -92,19 +92,19 @@
{
"type": "106",
"pageType": "draft",
"name": "维保备案",
"name": "维保合同备案",
"url": "/mixuap?appId=1742358052905971713&id=1737347718667333633&roleIds={roleIds}&userId={userId}&pageType=edit"
},
{
"type": "106",
"pageType": "edit",
"name": "维保备案",
"name": "维保合同备案",
"url": "/mixuap?appId=1742358052905971713&id=1735612073380966402&roleIds={roleIds}&userId={userId}&pageType=edit"
},
{
"type": "106",
"pageType": "look",
"name": "维保备案",
"name": "维保合同备案",
"url": "/mixuap?appId=1742358052905971713&id=1735612073380966402&roleIds={roleIds}&userId={userId}&pageType=look"
},
{
......
......@@ -20,7 +20,7 @@ public enum BusinessTypeEnum {
JG_ADVICE_REMOVAL("105", "移装告知"),
JG_MAINTENANCE_RECORD("106", "维保备案"),
JG_MAINTENANCE_RECORD("106", "维保合同备案"),
JG_USAGE_REGISTRATION("107", "使用登记"),
......
......@@ -2748,7 +2748,7 @@ public class JGDPStatisticsServiceImpl {
// 维保备案
Map<String, Object> maintenanceDetail = useRegistrationMapper.getMaintenanceDetail(record);
if (!ObjectUtils.isEmpty(maintenanceDetail)) {
business = business + ",维保备案";
business = business + ",维保合同备案";
objMap.putAll(maintenanceDetail);
objMap.put("maintenanceContract", JSON.parse(Optional.ofNullable(maintenanceDetail.get("maintenanceContract")).orElse("").toString()));
objMap.put("maintOtherAccessories", JSON.parse(Optional.ofNullable(maintenanceDetail.get("maintOtherAccessories")).orElse("").toString()));
......
......@@ -19,7 +19,7 @@ public enum ApplicationFormTypeEnum {
* 申请单枚举
*/
AZGZ("AZGZ", "GZ_AZ"),//安装告知
WBBA("WBBA", "WB_BA"),//维保备案
WBBA("WBBA", "WB_BA"),//维保合同备案
SYDJ("SYDJ", "DJ_SY"),//使用登记
SBYJ("SBYJ", "SB_YJ"),//设备移交
GZGZ("GZGZ", "GZ_GZ"),//改造告知
......
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