Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/ExpensiveGoodsSupplierManagerImpl.java =================================================================== diff -u -r22265 -r22270 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/ExpensiveGoodsSupplierManagerImpl.java (.../ExpensiveGoodsSupplierManagerImpl.java) (revision 22265) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/ExpensiveGoodsSupplierManagerImpl.java (.../ExpensiveGoodsSupplierManagerImpl.java) (revision 22270) @@ -72,55 +72,55 @@ if(expensiveGoodsSupplier.getId() == 0){ expensiveGoodsSupplier.setId(null); } - if (StringUtils.isNotBlank(registrationsConfigResult)) { + if(StringUtils.isNotBlank(registrationsConfigResult)){ JSONArray jsonArray = JSONArray.fromObject(registrationsConfigResult);//前台传来的证件集 JSONArray registrationsResuit = JSONArray.fromObject(registrationsConfigResult); //用于去掉不是注册证的信息 Date date = null ; //初始化date - for (int i = 0; i < jsonArray.size(); i++) { + for(int i = 0; i < jsonArray.size(); i++){ JSONObject obj = jsonArray.getJSONObject(i); String certificationType = obj.optString("certificationType"); String certification = obj.optString("certification"); String validityTime = obj.optString("validityTime"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); //失效期转换成date类型 - try { + try{ date = sdf.parse(validityTime); - } catch (Exception e) { + }catch(Exception e) { e.printStackTrace(); - } + } //保存营业执照数据 if(certificationType.equals(ExpensiveGoodsSupplier.CERTIFICATE_TYPE_BUSINESSLICENSE)){ - expensiveGoodsSupplier.setBusinessLicense(certification); - expensiveGoodsSupplier.setLicenseValidityTime(date); - expensiveGoodsSupplier.setLicenseType(certificationType); - registrationsResuit.remove(obj); - continue; + expensiveGoodsSupplier.setBusinessLicense(certification); + expensiveGoodsSupplier.setLicenseValidityTime(date); + expensiveGoodsSupplier.setLicenseType(certificationType); + registrationsResuit.remove(obj); + continue; } //保存生产许可证 if(certificationType.equals(ExpensiveGoodsSupplier.CERTIFICATE_TYPE_PRODUCTIONCERTIFICATE)){ - expensiveGoodsSupplier.setProductionCertificate(certification); - expensiveGoodsSupplier.setProductionValidityTime(date); - expensiveGoodsSupplier.setProductionType(certificationType); - registrationsResuit.remove(obj); - continue; + expensiveGoodsSupplier.setProductionCertificate(certification); + expensiveGoodsSupplier.setProductionValidityTime(date); + expensiveGoodsSupplier.setProductionType(certificationType); + registrationsResuit.remove(obj); + continue; } //保存经营许可证 if(certificationType.equals(ExpensiveGoodsSupplier.CERTIFICATE_TYPE_BUSINESSCERTIFICATE)){ - expensiveGoodsSupplier.setBusinessCertificate(certification); - expensiveGoodsSupplier.setBusinessValidityTime(date); - expensiveGoodsSupplier.setBusinessType(certificationType); - registrationsResuit.remove(obj); - continue; + expensiveGoodsSupplier.setBusinessCertificate(certification); + expensiveGoodsSupplier.setBusinessValidityTime(date); + expensiveGoodsSupplier.setBusinessType(certificationType); + registrationsResuit.remove(obj); + continue; } //删除授权证信息,授权证只能在授权界面修改或添加 if(certificationType.equals(ExpensiveGoodsSupplier.CERTIFICATE_TYPE_AUTHORIZATION)){ - registrationsResuit.remove(obj); - continue; + registrationsResuit.remove(obj); + continue; } } if(registrationsResuit.size()>0){ - registrationsConfigResult = registrationsResuit.toString(); //去除掉了除注册证外其他证信息,只保留注册证信息 - expensiveGoodsSupplier.setRegistrationCertificate(registrationCertificationManager.getRegistrationCertificate( + registrationsConfigResult = registrationsResuit.toString(); //去除掉了除注册证外其他证信息,只保留注册证信息 + expensiveGoodsSupplier.setRegistrationCertificate(registrationCertificationManager.getRegistrationCertificate( registrationsConfigResult,expensiveGoodsSupplier)); } }