Commit fad2ad8f authored by suhuiguang's avatar suhuiguang

1.使用登记使用标志开发初稿

parent ddcd4cb8
......@@ -36,6 +36,7 @@ import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
......@@ -62,6 +63,7 @@ import java.util.concurrent.TimeUnit;
* @date 2023-12-12
*/
@Service
@Slf4j
public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationDto, JgUseRegistration, JgUseRegistrationMapper> implements IJgUseRegistrationService {
private static final String DEFINITION_KEY = "useRegistration";
......@@ -101,6 +103,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
private IdxBizJgFactoryInfoServiceImpl idxBizJgFactoryInfoService;
@Autowired
private IdxBizJgMaintenanceRecordInfoServiceImpl idxBizJgMaintenanceRecordInfoService;
@Autowired
private RedissonClient redissonClient;
public Page<Map<String, Object>> getList(JgUseRegistrationDto dto, Page<Map<String, Object>> page, List<String> roleIds) {
......@@ -965,12 +970,60 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
if ("0".equals(printType)) {
// 调用生成使用登记证
commonService.generateCertificateReport(exportParamsMap, response);
} else {
} else if("1".equals(printType)) {
// 套打
commonService.generatePdfPrint(exportParamsMap, response);
} else if("2".equals(printType)){
// 使用标志普通打印
commonService.useFlagGenerate(this.buildUseFlagParamDto(registerInfo, factoryInfo, exportParamsMap), response);
} else if("3".equals(printType)){
// 使用标志套打
log.info("套打待开发");
}
}
private UseFlagParamDto buildUseFlagParamDto(IdxBizJgRegisterInfo registerInfo, IdxBizJgFactoryInfo factoryInfo, Map<String, Object> exportParamsMap) {
UseFlagParamDto useFlagParamDto = new UseFlagParamDto();
useFlagParamDto.setEquList(exportParamsMap.get("equList").toString());
useFlagParamDto.setEquListCode(registerInfo.getEquList());
useFlagParamDto.setEquipCode(registerInfo.getEquCode());
useFlagParamDto.setEquipCategory(exportParamsMap.get("equCategory").toString());
useFlagParamDto.setEquipDefine(exportParamsMap.get("equDefine") == null ? "" : exportParamsMap.get("equDefine").toString());
useFlagParamDto.setUseUnitName(exportParamsMap.get("useUnitName").toString());
useFlagParamDto.setUseInnerCode(exportParamsMap.get("useInnerCode").toString());
useFlagParamDto.setReceiveOrgName(exportParamsMap.get("receiveOrgName").toString());
useFlagParamDto.setUseRegistrationCode(exportParamsMap.get("useRegistrationCode").toString());
useFlagParamDto.setFactoryNumber(factoryInfo.getFactoryNum());
useFlagParamDto.setCarNumber(registerInfo.getCarNumber());
useFlagParamDto.setApplyNo(exportParamsMap.get("applyNo").toString());
// 检验信息字段设置
setInspectFidld(registerInfo, useFlagParamDto);
// 电梯维保信息字段设置
setMainInfoField(registerInfo, useFlagParamDto);
// 车用气瓶专用字段 暂无数据源 需车用气瓶功能开发完成后进行
useFlagParamDto.setCylinderNumOrVolume("");
useFlagParamDto.setFillingMedium("");
return useFlagParamDto;
}
private void setInspectFidld(IdxBizJgRegisterInfo registerInfo, UseFlagParamDto useFlagParamDto) {
Map<String, Object> inspectDetail = this.baseMapper.getInspectDetail(registerInfo.getRecord());
useFlagParamDto.setInspectionUnitName(inspectDetail.get("inspectOrgName") == null ? "" : inspectDetail.get("inspectOrgName").toString());
useFlagParamDto.setNextInspectionDate(inspectDetail.get("nextInspectDate") == null ? null : (Date)inspectDetail.get("nextInspectDate"));
}
private void setMainInfoField(IdxBizJgRegisterInfo registerInfo, UseFlagParamDto useFlagParamDto) {
IdxBizJgMaintenanceRecordInfo idxBizJgMaintenanceRecordInfo = idxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(registerInfo.getRecord());
useFlagParamDto.setEmergencyTel(this.buildEmergencyTel(idxBizJgMaintenanceRecordInfo));
useFlagParamDto.setMaintenanceUnitName(idxBizJgMaintenanceRecordInfo.getMeUnitName());
}
private String buildEmergencyTel(IdxBizJgMaintenanceRecordInfo idxBizJgMaintenanceRecordInfo) {
return idxBizJgMaintenanceRecordInfo.getMeMasterPhone() + "/" + idxBizJgMaintenanceRecordInfo.getMeMaster1Phone();
}
/**
* 生成监管码、96333码
*/
......
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