Commit 767c6561 authored by suhuiguang's avatar suhuiguang

feat(重要提醒):业务新增提醒开发联调

1.车用气瓶详情、使用登记详情、装置详情接口增加数据质量等级
parent fc4f91de
...@@ -48,6 +48,7 @@ import com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler.CbDataDictTypeHandle ...@@ -48,6 +48,7 @@ import com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler.CbDataDictTypeHandle
import com.yeejoin.amos.boot.module.jg.biz.feign.PrivilegeFeginService; import com.yeejoin.amos.boot.module.jg.biz.feign.PrivilegeFeginService;
import com.yeejoin.amos.boot.module.jg.biz.feign.TaskV2FeignService; import com.yeejoin.amos.boot.module.jg.biz.feign.TaskV2FeignService;
import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient; import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
import com.yeejoin.amos.boot.module.jg.biz.reminder.service.RemindServiceImpl;
import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService; import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService; import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
import com.yeejoin.amos.boot.module.jg.biz.utils.FileExporter; import com.yeejoin.amos.boot.module.jg.biz.utils.FileExporter;
...@@ -284,6 +285,9 @@ public class CommonServiceImpl implements ICommonService { ...@@ -284,6 +285,9 @@ public class CommonServiceImpl implements ICommonService {
private String qrcodePrefix; private String qrcodePrefix;
@Autowired @Autowired
private RemindServiceImpl remindServiceImpl;
@Autowired
private CbDataDictTypeHandler dataDictTypeHandler; private CbDataDictTypeHandler dataDictTypeHandler;
public static final String DATA_QUALITY_SCORE = "DATA_QUALITY_SCORE"; public static final String DATA_QUALITY_SCORE = "DATA_QUALITY_SCORE";
...@@ -3102,7 +3106,10 @@ public class CommonServiceImpl implements ICommonService { ...@@ -3102,7 +3106,10 @@ public class CommonServiceImpl implements ICommonService {
*/ */
public String castDataQualityScore2Name(String dataQualityScore, Boolean isIntoManagement){ public String castDataQualityScore2Name(String dataQualityScore, Boolean isIntoManagement){
String name = dataDictTypeHandler.handle(DATA_QUALITY_SCORE, dataQualityScore); String name = dataDictTypeHandler.handle(DATA_QUALITY_SCORE, dataQualityScore);
return name == null ? (isIntoManagement == null || !isIntoManagement) ? "II" : "III" : name; return name == null ? (isIntoManagement == null || !isIntoManagement) ? "Ⅱ" : "Ⅲ" : name;
} }
public void setDataQualityScore2Json(Map<String, Object> result, String bizId, BusinessTypeEnum businessTypeEnum) {
result.put("dataQualityScore", remindServiceImpl.getReminderLevel(bizId, businessTypeEnum.name()));
}
} }
\ No newline at end of file
...@@ -2342,6 +2342,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2342,6 +2342,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
new FillingUseRegisterResult(sequenceNbr, jsonObject, applicationContext).getData(); new FillingUseRegisterResult(sequenceNbr, jsonObject, applicationContext).getData();
// 结果增强,填充当前人是否有编辑按钮权限 // 结果增强,填充当前人是否有编辑按钮权限
new FillingEditPermForCurrentUser(jsonObject, Optional.ofNullable(selectedOrgInfo).map(ReginParams::getCompany).orElse(null), BusinessTypeEnum.JG_USAGE_REGISTRATION).getData(); new FillingEditPermForCurrentUser(jsonObject, Optional.ofNullable(selectedOrgInfo).map(ReginParams::getCompany).orElse(null), BusinessTypeEnum.JG_USAGE_REGISTRATION).getData();
commonServiceImpl.setDataQualityScore2Json(jsonObject, sequenceNbr + "", BusinessTypeEnum.JG_USAGE_REGISTRATION);
return jsonObject; return jsonObject;
} }
// 基本信息 + 制造信息 // 基本信息 + 制造信息
......
...@@ -607,6 +607,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform ...@@ -607,6 +607,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
BeanUtil.copyProperties(vehicleInformationVo, re); BeanUtil.copyProperties(vehicleInformationVo, re);
// todo 本来FillingEditPermForCurrentUser已赋值但是此业务也使用的key companyType故新赋值key // todo 本来FillingEditPermForCurrentUser已赋值但是此业务也使用的key companyType故新赋值key
re.put("companyType2", CommonServiceImpl.getCompanyType(companyBo)); re.put("companyType2", CommonServiceImpl.getCompanyType(companyBo));
// 赋值数据质量等级
commonService.setDataQualityScore2Json(re, sequenceNbr + "", BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION);
return re; return re;
} }
......
...@@ -46,7 +46,8 @@ ...@@ -46,7 +46,8 @@
PROVINCE_NAME, PROVINCE_NAME,
DATA_SOURCE, DATA_SOURCE,
USE_UNIT_NAME, USE_UNIT_NAME,
USE_DATE USE_DATE,
DATA_QUALITY_SCORE
FROM FROM
IDX_BIZ_JG_PROJECT_CONTRAPTION ibjpc IDX_BIZ_JG_PROJECT_CONTRAPTION ibjpc
WHERE WHERE
......
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