Commit 278f00b1 authored by 刘林's avatar 刘林

fix(jg):车用气瓶打证和单位办理打证修复

parent 234f2e1e
...@@ -506,9 +506,10 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr ...@@ -506,9 +506,10 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
exportParamsMap.put("equCategory", manage.getEquCategory()); exportParamsMap.put("equCategory", manage.getEquCategory());
exportParamsMap.put("equDefine", manage.getEquDefine()); exportParamsMap.put("equDefine", manage.getEquDefine());
exportParamsMap.put("equCode", deviceList.get(0).get("EQU_CODE")); exportParamsMap.put("equCode", deviceList.get(0).get("EQU_CODE"));
exportParamsMap.put("manageType", manage.getManageType());
if (BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName().equals(manage.getRegType())){ if (BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName().equals(manage.getRegType())){
exportParamsMap.put("fullAddress", manage.getUseUnitAddress()); exportParamsMap.put("fullAddress", manage.getUseUnitAddress());
exportParamsMap.put("manageType", manage.getManageType()); exportParamsMap.put("manageType", "");
exportParamsMap.put("equDefineCode", "23T0"); exportParamsMap.put("equDefineCode", "23T0");
}else{ }else{
exportParamsMap.put("fullAddress", manage.getEquUseAddress()); exportParamsMap.put("fullAddress", manage.getEquUseAddress());
......
...@@ -1572,7 +1572,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform ...@@ -1572,7 +1572,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
jgUseRegistrationManage.setCreateUserId(jgVehicleInformation.getCreateUserId()); jgUseRegistrationManage.setCreateUserId(jgVehicleInformation.getCreateUserId());
jgUseRegistrationManage.setCreateDate(jgVehicleInformation.getRecDate()); jgUseRegistrationManage.setCreateDate(jgVehicleInformation.getRecDate());
jgUseRegistrationManage.setEquUseAddress(""); jgUseRegistrationManage.setEquUseAddress("");
//jgUseRegistrationManage.setManageType("unit"); jgUseRegistrationManage.setManageType("unit");
jgUseRegistrationManage.setUseUnitAddress(!ValidationUtil.isEmpty(enterpriseInfo) ? (String) enterpriseInfo.get("address") : ""); jgUseRegistrationManage.setUseUnitAddress(!ValidationUtil.isEmpty(enterpriseInfo) ? (String) enterpriseInfo.get("address") : "");
jgUseRegistrationManage.setUseRegistrationCode(jgVehicleInformation.getUseRegistrationCode()); jgUseRegistrationManage.setUseRegistrationCode(jgVehicleInformation.getUseRegistrationCode());
jgUseRegistrationManage.setUseUnitCreditCode(jgVehicleInformation.getUseUnitCreditCode()); jgUseRegistrationManage.setUseUnitCreditCode(jgVehicleInformation.getUseUnitCreditCode());
......
...@@ -847,13 +847,13 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc ...@@ -847,13 +847,13 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
break; break;
case "repairUnit": case "repairUnit":
maintenanceUnit = iMaintenanceUnitService.getById(dispatchTask.getResponseOrgId()); maintenanceUnit = iMaintenanceUnitService.getById(dispatchTask.getResponseOrgId());
dispatchPaper.setRepairOrgId(maintenanceUnit.getSequenceNbr()); dispatchPaper.setRepairOrgId(String.valueOf(maintenanceUnit.getSequenceNbr()));
dispatchPaper.setRepairOrgTaskId(dispatchTask.getSequenceNbr()); dispatchPaper.setRepairOrgTaskId(dispatchTask.getSequenceNbr());
break; break;
case "levelOneUnit": case "levelOneUnit":
maintenanceUnit = iMaintenanceUnitService.getById(dispatchTask.getResponseOrgId()); maintenanceUnit = iMaintenanceUnitService.getById(dispatchTask.getResponseOrgId());
String socialCreditCode = maintenanceUnit.getSocialCreditCode(); String socialCreditCode = maintenanceUnit.getSocialCreditCode();
dispatchPaper.setRepairOrgId(maintenanceUnit.getSequenceNbr()); dispatchPaper.setRepairOrgId(String.valueOf(maintenanceUnit.getSequenceNbr()));
dispatchPaper.setRepairOrgTaskId(dispatchTask.getSequenceNbr()); dispatchPaper.setRepairOrgTaskId(dispatchTask.getSequenceNbr());
// 修改动态字段 // 修改动态字段
dynamicFormAlert.stream().forEach(alertFormValue -> { dynamicFormAlert.stream().forEach(alertFormValue -> {
...@@ -875,7 +875,7 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc ...@@ -875,7 +875,7 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
break; break;
case "levelTwoUnit": case "levelTwoUnit":
RescueStation rescueStation = iRescueStationService.getById(dispatchTask.getResponseOrgId()); RescueStation rescueStation = iRescueStationService.getById(dispatchTask.getResponseOrgId());
dispatchPaper.setRepairOrgId(rescueStation.getSequenceNbr()); dispatchPaper.setRepairOrgId(String.valueOf(rescueStation.getSequenceNbr()));
dispatchPaper.setRepairOrgTaskId(dispatchTask.getSequenceNbr()); dispatchPaper.setRepairOrgTaskId(dispatchTask.getSequenceNbr());
// 修改动态字段 // 修改动态字段
dynamicFormAlert.stream().forEach(alertFormValue -> { dynamicFormAlert.stream().forEach(alertFormValue -> {
......
...@@ -140,7 +140,7 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu ...@@ -140,7 +140,7 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
if (dispatchPaper.getRepairOrgId() != null) { // 已经派遣过调派 if (dispatchPaper.getRepairOrgId() != null) { // 已经派遣过调派
throw new BadRequest("已经派遣过其他力量调派"); throw new BadRequest("已经派遣过其他力量调派");
} else { } else {
dispatchPaper.setRepairOrgId(-1l); dispatchPaper.setRepairOrgId(String.valueOf(-1L));
dispatchPaper.setRepairOrgCreditCode("119"); dispatchPaper.setRepairOrgCreditCode("119");
dispatchPaper.setRepairOrgTaskId(dispatchTask.getSequenceNbr()); dispatchPaper.setRepairOrgTaskId(dispatchTask.getSequenceNbr());
// 修改动态字段 // 修改动态字段
......
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