Commit 330e121b authored by hezhuozhi's avatar hezhuozhi

使用登记、车用气瓶登记历史单据使用登记表生成

parent 03b9f99f
...@@ -4345,6 +4345,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -4345,6 +4345,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
List<JgUseRegistration> useRegistrations = this.list(queryWrapper); List<JgUseRegistration> useRegistrations = this.list(queryWrapper);
if(CollUtil.isNotEmpty(useRegistrations)){ if(CollUtil.isNotEmpty(useRegistrations)){
for (JgUseRegistration useRegistration : useRegistrations) { for (JgUseRegistration useRegistration : useRegistrations) {
try {
Map<String, Object> detail = this.getDetail(null, useRegistration.getSequenceNbr()); Map<String, Object> detail = this.getDetail(null, useRegistration.getSequenceNbr());
String jsonString = JSONObject.toJSONString(detail); String jsonString = JSONObject.toJSONString(detail);
JSONObject jsonObject = JSONObject.parseObject(jsonString); JSONObject jsonObject = JSONObject.parseObject(jsonString);
...@@ -4361,6 +4362,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -4361,6 +4362,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
.eq(JgUseRegistration::getSequenceNbr,useRegistration.getSequenceNbr()); .eq(JgUseRegistration::getSequenceNbr,useRegistration.getSequenceNbr());
this.update(wrapper); this.update(wrapper);
} }
}catch (BadRequest request){
log.error(request.getMessage(),request);
}
} }
} }
} }
......
...@@ -2385,11 +2385,11 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform ...@@ -2385,11 +2385,11 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
List<JgVehicleInformation> vehicleInformations = this.list(queryWrapper); List<JgVehicleInformation> vehicleInformations = this.list(queryWrapper);
if(CollUtil.isNotEmpty(vehicleInformations)){ if(CollUtil.isNotEmpty(vehicleInformations)){
for (JgVehicleInformation vehicleInformation : vehicleInformations) { for (JgVehicleInformation vehicleInformation : vehicleInformations) {
try {
JgVehicleInformationVo jgVehicleInformationVo = this.queryBySequenceNbr(vehicleInformation.getSequenceNbr(), reginParams); JgVehicleInformationVo jgVehicleInformationVo = this.queryBySequenceNbr(vehicleInformation.getSequenceNbr(), reginParams);
String jsonString = JSONObject.toJSONString(jgVehicleInformationVo); String jsonString = JSONObject.toJSONString(jgVehicleInformationVo);
JSONObject jsonObject = JSONObject.parseObject(jsonString); JSONObject jsonObject = JSONObject.parseObject(jsonString);
jsonObject.put("userName",jgVehicleInformationVo.getCreateUserName()); jsonObject.put("userName",jgVehicleInformationVo.getCreateUserName());
try {
Map<String, Object> vehicle = commonService.getRegistrationFormUrl("vehicle", jsonObject); Map<String, Object> vehicle = commonService.getRegistrationFormUrl("vehicle", jsonObject);
if(Objects.nonNull(vehicle)){ if(Objects.nonNull(vehicle)){
LambdaUpdateWrapper<JgVehicleInformation> wrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<JgVehicleInformation> wrapper = new LambdaUpdateWrapper<>();
......
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