Commit 1ca7f3d5 authored by zhangyingbin's avatar zhangyingbin

特种设备基本信息接口修改(除技术参数外)

parent 5dede41f
...@@ -35,7 +35,7 @@ public class ConstructionInfoService extends AppBaseService<ConstructionInfoMode ...@@ -35,7 +35,7 @@ public class ConstructionInfoService extends AppBaseService<ConstructionInfoMode
throw new BadRequest("施工信息为空."); throw new BadRequest("施工信息为空.");
} }
for (ConstructionInfo models : model) { for (ConstructionInfo models : model) {
checkModel(models); // checkModel(models);
models.setRecDate(new Date()); models.setRecDate(new Date());
models.setAppId(getAppId()); models.setAppId(getAppId());
} }
......
...@@ -48,45 +48,45 @@ public class DesignInfoService extends AppBaseService<DesignInfoModel, DesignInf ...@@ -48,45 +48,45 @@ public class DesignInfoService extends AppBaseService<DesignInfoModel, DesignInf
for (DesignInfoModel designInfoModel : model) { for (DesignInfoModel designInfoModel : model) {
checkModel(designInfoModel); // checkModel(designInfoModel);
designInfoModel.setRecDate(new Date()); designInfoModel.setRecDate(new Date());
designInfoModel.setAppId(getAppId()); designInfoModel.setAppId(getAppId());
DesignInfoModel designInfo = this.createWithModel(designInfoModel); DesignInfoModel designInfo = this.createWithModel(designInfoModel);
designFileList = JSONObject.parseArray(JSONObject.toJSONString(designInfoModel.getDesignFile()), JgFile.class); // designFileList = JSONObject.parseArray(JSONObject.toJSONString(designInfoModel.getDesignFile()), JgFile.class);
designCodeList = JSONObject.parseArray(JSONObject.toJSONString(designInfoModel.getDesignCode()), JgFile.class); // designCodeList = JSONObject.parseArray(JSONObject.toJSONString(designInfoModel.getDesignCode()), JgFile.class);
//
for (JgFile files : designFileList) { // for (JgFile files : designFileList) {
JgFile file = new JgFile(); // JgFile file = new JgFile();
file.setSequenceCode(designInfoModel.getSequenceCode()); // file.setSequenceCode(designInfoModel.getSequenceCode());
file.setAppId(getAppId()); // file.setAppId(getAppId());
file.setObjectType(JgFileObjectEnum.DESIGN_INFO.getObject()); // file.setObjectType(JgFileObjectEnum.DESIGN_INFO.getObject());
file.setAttributeType(JgFileAttributeEnum.DESIGN_FILE.getAttribute()); // file.setAttributeType(JgFileAttributeEnum.DESIGN_FILE.getAttribute());
file.setSyncDate(designInfoModel.getSyncDate()); // file.setSyncDate(designInfoModel.getSyncDate());
file.setFileUrl(files.getFileUrl()); // file.setFileUrl(files.getFileUrl());
file.setFileName(files.getFileName()); // file.setFileName(files.getFileName());
file.setRecDate(new Date()); // file.setRecDate(new Date());
file.setSquNbr(designInfo.getSequenceNbr()); // file.setSquNbr(designInfo.getSequenceNbr());
fileList.add(file); // fileList.add(file);
} // }
//
for (JgFile files : designCodeList) { // for (JgFile files : designCodeList) {
JgFile file = new JgFile(); // JgFile file = new JgFile();
file.setSequenceCode(designInfoModel.getSequenceCode()); // file.setSequenceCode(designInfoModel.getSequenceCode());
file.setAppId(getAppId()); // file.setAppId(getAppId());
file.setObjectType(JgFileObjectEnum.DESIGN_INFO.getObject()); // file.setObjectType(JgFileObjectEnum.DESIGN_INFO.getObject());
file.setAttributeType(JgFileAttributeEnum.DESIGN_CODE.getAttribute()); // file.setAttributeType(JgFileAttributeEnum.DESIGN_CODE.getAttribute());
file.setSyncDate(designInfoModel.getSyncDate()); // file.setSyncDate(designInfoModel.getSyncDate());
file.setFileUrl(files.getFileUrl()); // file.setFileUrl(files.getFileUrl());
file.setFileName(files.getFileName()); // file.setFileName(files.getFileName());
file.setRecDate(new Date()); // file.setRecDate(new Date());
file.setSquNbr(designInfo.getSequenceNbr()); // file.setSquNbr(designInfo.getSequenceNbr());
fileList.add(file); // fileList.add(file);
} // }
} }
fileService.saveBatch(fileList); // fileService.saveBatch(fileList);
return "OK"; return "OK";
} }
......
...@@ -44,34 +44,34 @@ public class MaintenanceInfoService extends AppBaseService<MaintenanceInfoModel, ...@@ -44,34 +44,34 @@ public class MaintenanceInfoService extends AppBaseService<MaintenanceInfoModel,
} }
List<MaintenanceInfo> mainList = new ArrayList<>(); List<MaintenanceInfo> mainList = new ArrayList<>();
List<JgFile> fileList = new ArrayList<>(); // List<JgFile> fileList = new ArrayList<>();
List<JgFile> repairInformList; // List<JgFile> repairInformList;
for (MaintenanceInfoModel models : model) { for (MaintenanceInfoModel models : model) {
MaintenanceInfo maintenanceInfo = new MaintenanceInfo(); MaintenanceInfo maintenanceInfo = new MaintenanceInfo();
checkModel(models); // checkModel(models);
models.setRecDate(new Date()); models.setRecDate(new Date());
models.setAppId(getAppId()); models.setAppId(getAppId());
repairInformList = JSONObject.parseArray(JSONObject.toJSONString(models.getRepairInform()), JgFile.class); // repairInformList = JSONObject.parseArray(JSONObject.toJSONString(models.getRepairInform()), JgFile.class);
//
for (JgFile files : repairInformList) { // for (JgFile files : repairInformList) {
JgFile file = new JgFile(); // JgFile file = new JgFile();
file.setSequenceCode(models.getSequenceCode()); // file.setSequenceCode(models.getSequenceCode());
file.setAppId(getAppId()); // file.setAppId(getAppId());
file.setObjectType(JgFileObjectEnum.MAINTENANCE_INFO.getObject()); // file.setObjectType(JgFileObjectEnum.MAINTENANCE_INFO.getObject());
file.setAttributeType(JgFileAttributeEnum.REPAIR_INFORM.getAttribute()); // file.setAttributeType(JgFileAttributeEnum.REPAIR_INFORM.getAttribute());
file.setSyncDate(models.getSyncDate()); // file.setSyncDate(models.getSyncDate());
file.setFileUrl(files.getFileUrl()); // file.setFileUrl(files.getFileUrl());
file.setFileName(files.getFileName()); // file.setFileName(files.getFileName());
file.setRecDate(new Date()); // file.setRecDate(new Date());
fileList.add(file); // fileList.add(file);
} // }
BeanUtils.copyProperties(models,maintenanceInfo); BeanUtils.copyProperties(models,maintenanceInfo);
mainList.add(maintenanceInfo); mainList.add(maintenanceInfo);
} }
this.saveBatch(mainList); this.saveBatch(mainList);
fileService.saveBatch(fileList); // fileService.saveBatch(fileList);
return "OK"; return "OK";
} }
......
...@@ -35,7 +35,7 @@ public class OtherInfoService extends AppBaseService<OtherInfoModel, OtherInfo, ...@@ -35,7 +35,7 @@ public class OtherInfoService extends AppBaseService<OtherInfoModel, OtherInfo,
} }
for (OtherInfo models : model) { for (OtherInfo models : model) {
checkModel(models); // checkModel(models);
models.setRecDate(new Date()); models.setRecDate(new Date());
models.setAppId(getAppId()); models.setAppId(getAppId());
} }
......
...@@ -42,91 +42,91 @@ public class ProduceInfoService extends AppBaseService<ProduceInfoModel, Produce ...@@ -42,91 +42,91 @@ public class ProduceInfoService extends AppBaseService<ProduceInfoModel, Produce
throw new BadRequest("制造信息为空."); throw new BadRequest("制造信息为空.");
} }
List<JgFile> fileList = new ArrayList<>(); // List<JgFile> fileList = new ArrayList<>();
List<JgFile> produceStandardList,productCertificateList,iumInstructionsList,supervisionCertList,ceCertList; // List<JgFile> produceStandardList,productCertificateList,iumInstructionsList,supervisionCertList,ceCertList;
for (ProduceInfoModel models : model) { for (ProduceInfoModel models : model) {
checkModel(models); // checkModel(models);
models.setRecDate(new Date()); models.setRecDate(new Date());
models.setAppId(getAppId()); models.setAppId(getAppId());
ProduceInfoModel produceInfoModel = this.createWithModel(models); ProduceInfoModel produceInfoModel = this.createWithModel(models);
produceStandardList = JSONObject.parseArray(JSONObject.toJSONString(models.getProduceStandard()), JgFile.class); // produceStandardList = JSONObject.parseArray(JSONObject.toJSONString(models.getProduceStandard()), JgFile.class);
productCertificateList = JSONObject.parseArray(JSONObject.toJSONString(models.getProductCertificate()), JgFile.class); // productCertificateList = JSONObject.parseArray(JSONObject.toJSONString(models.getProductCertificate()), JgFile.class);
iumInstructionsList = JSONObject.parseArray(JSONObject.toJSONString(models.getIumInstructions()), JgFile.class); // iumInstructionsList = JSONObject.parseArray(JSONObject.toJSONString(models.getIumInstructions()), JgFile.class);
supervisionCertList = JSONObject.parseArray(JSONObject.toJSONString(models.getSupervisionCert()), JgFile.class); // supervisionCertList = JSONObject.parseArray(JSONObject.toJSONString(models.getSupervisionCert()), JgFile.class);
ceCertList = JSONObject.parseArray(JSONObject.toJSONString(models.getCeCert()), JgFile.class); // ceCertList = JSONObject.parseArray(JSONObject.toJSONString(models.getCeCert()), JgFile.class);
//
for (JgFile files : produceStandardList) { // for (JgFile files : produceStandardList) {
JgFile file = new JgFile(); // JgFile file = new JgFile();
file.setSequenceCode(models.getSequenceCode()); // file.setSequenceCode(models.getSequenceCode());
file.setAppId(getAppId()); // file.setAppId(getAppId());
file.setObjectType(JgFileObjectEnum.PRODUCE_INFO.getObject()); // file.setObjectType(JgFileObjectEnum.PRODUCE_INFO.getObject());
file.setAttributeType(JgFileAttributeEnum.PRODUCE_STANDARD.getAttribute()); // file.setAttributeType(JgFileAttributeEnum.PRODUCE_STANDARD.getAttribute());
file.setSyncDate(models.getSyncDate()); // file.setSyncDate(models.getSyncDate());
file.setFileUrl(files.getFileUrl()); // file.setFileUrl(files.getFileUrl());
file.setFileName(files.getFileName()); // file.setFileName(files.getFileName());
file.setRecDate(new Date()); // file.setRecDate(new Date());
file.setSquNbr(produceInfoModel.getSequenceNbr()); // file.setSquNbr(produceInfoModel.getSequenceNbr());
fileList.add(file); // fileList.add(file);
} // }
//
for (JgFile files : productCertificateList) { // for (JgFile files : productCertificateList) {
JgFile file = new JgFile(); // JgFile file = new JgFile();
file.setSequenceCode(models.getSequenceCode()); // file.setSequenceCode(models.getSequenceCode());
file.setAppId(getAppId()); // file.setAppId(getAppId());
file.setObjectType(JgFileObjectEnum.PRODUCE_INFO.getObject()); // file.setObjectType(JgFileObjectEnum.PRODUCE_INFO.getObject());
file.setAttributeType(JgFileAttributeEnum.PRODUCT_CERTIFICATE.getAttribute()); // file.setAttributeType(JgFileAttributeEnum.PRODUCT_CERTIFICATE.getAttribute());
file.setSyncDate(models.getSyncDate()); // file.setSyncDate(models.getSyncDate());
file.setFileUrl(files.getFileUrl()); // file.setFileUrl(files.getFileUrl());
file.setFileName(files.getFileName()); // file.setFileName(files.getFileName());
file.setRecDate(new Date()); // file.setRecDate(new Date());
file.setSquNbr(produceInfoModel.getSequenceNbr()); // file.setSquNbr(produceInfoModel.getSequenceNbr());
fileList.add(file); // fileList.add(file);
} // }
for (JgFile files : iumInstructionsList) { // for (JgFile files : iumInstructionsList) {
JgFile file = new JgFile(); // JgFile file = new JgFile();
file.setSequenceCode(models.getSequenceCode()); // file.setSequenceCode(models.getSequenceCode());
file.setAppId(getAppId()); // file.setAppId(getAppId());
file.setObjectType(JgFileObjectEnum.PRODUCE_INFO.getObject()); // file.setObjectType(JgFileObjectEnum.PRODUCE_INFO.getObject());
file.setAttributeType(JgFileAttributeEnum.IUM_INSTRUCTIONS.getAttribute()); // file.setAttributeType(JgFileAttributeEnum.IUM_INSTRUCTIONS.getAttribute());
file.setSyncDate(models.getSyncDate()); // file.setSyncDate(models.getSyncDate());
file.setFileUrl(files.getFileUrl()); // file.setFileUrl(files.getFileUrl());
file.setFileName(files.getFileName()); // file.setFileName(files.getFileName());
file.setRecDate(new Date()); // file.setRecDate(new Date());
file.setSquNbr(produceInfoModel.getSequenceNbr()); // file.setSquNbr(produceInfoModel.getSequenceNbr());
fileList.add(file); // fileList.add(file);
} // }
//
for (JgFile files : supervisionCertList) { // for (JgFile files : supervisionCertList) {
JgFile file = new JgFile(); // JgFile file = new JgFile();
file.setSequenceCode(models.getSequenceCode()); // file.setSequenceCode(models.getSequenceCode());
file.setAppId(getAppId()); // file.setAppId(getAppId());
file.setObjectType(JgFileObjectEnum.PRODUCE_INFO.getObject()); // file.setObjectType(JgFileObjectEnum.PRODUCE_INFO.getObject());
file.setAttributeType(JgFileAttributeEnum.SUPERVISION_CERT.getAttribute()); // file.setAttributeType(JgFileAttributeEnum.SUPERVISION_CERT.getAttribute());
file.setSyncDate(models.getSyncDate()); // file.setSyncDate(models.getSyncDate());
file.setFileUrl(files.getFileUrl()); // file.setFileUrl(files.getFileUrl());
file.setFileName(files.getFileName()); // file.setFileName(files.getFileName());
file.setRecDate(new Date()); // file.setRecDate(new Date());
file.setSquNbr(produceInfoModel.getSequenceNbr()); // file.setSquNbr(produceInfoModel.getSequenceNbr());
fileList.add(file); // fileList.add(file);
} // }
//
for (JgFile files : ceCertList) { // for (JgFile files : ceCertList) {
JgFile file = new JgFile(); // JgFile file = new JgFile();
file.setSequenceCode(models.getSequenceCode()); // file.setSequenceCode(models.getSequenceCode());
file.setAppId(getAppId()); // file.setAppId(getAppId());
file.setObjectType(JgFileObjectEnum.PRODUCE_INFO.getObject()); // file.setObjectType(JgFileObjectEnum.PRODUCE_INFO.getObject());
file.setAttributeType(JgFileAttributeEnum.CE_CERT.getAttribute()); // file.setAttributeType(JgFileAttributeEnum.CE_CERT.getAttribute());
file.setSyncDate(models.getSyncDate()); // file.setSyncDate(models.getSyncDate());
file.setFileUrl(files.getFileUrl()); // file.setFileUrl(files.getFileUrl());
file.setFileName(files.getFileName()); // file.setFileName(files.getFileName());
file.setRecDate(new Date()); // file.setRecDate(new Date());
file.setSquNbr(produceInfoModel.getSequenceNbr()); // file.setSquNbr(produceInfoModel.getSequenceNbr());
fileList.add(file); // fileList.add(file);
} // }
} }
fileService.saveBatch(fileList); // fileService.saveBatch(fileList);
return "OK"; return "OK";
} }
......
...@@ -43,33 +43,33 @@ public class RegistrationInfoService extends AppBaseService<RegistrationInfoMode ...@@ -43,33 +43,33 @@ public class RegistrationInfoService extends AppBaseService<RegistrationInfoMode
throw new BadRequest("注册登记信息为空."); throw new BadRequest("注册登记信息为空.");
} }
List<JgFile> fileList = new ArrayList<>(); // List<JgFile> fileList = new ArrayList<>();
List<JgFile> useRegistCertificateList; // List<JgFile> useRegistCertificateList;
for (RegistrationInfoModel models : model) { for (RegistrationInfoModel models : model) {
checkModel(models); // checkModel(models);
models.setRecDate(new Date()); models.setRecDate(new Date());
models.setAppId(getAppId()); models.setAppId(getAppId());
RegistrationInfoModel registrationInfoModel = this.createWithModel(models); RegistrationInfoModel registrationInfoModel = this.createWithModel(models);
useRegistCertificateList = JSONObject.parseArray(JSONObject.toJSONString(models.getUseRegistCertificate()), JgFile.class); // useRegistCertificateList = JSONObject.parseArray(JSONObject.toJSONString(models.getUseRegistCertificate()), JgFile.class);
//
for (JgFile files : useRegistCertificateList) { // for (JgFile files : useRegistCertificateList) {
JgFile file = new JgFile(); // JgFile file = new JgFile();
file.setSequenceCode(models.getSequenceCode()); // file.setSequenceCode(models.getSequenceCode());
file.setAppId(getAppId()); // file.setAppId(getAppId());
file.setObjectType(JgFileObjectEnum.REGISTRATION_INFO.getObject()); // file.setObjectType(JgFileObjectEnum.REGISTRATION_INFO.getObject());
file.setAttributeType(JgFileAttributeEnum.USE_REGIST_CERTIFICATE.getAttribute()); // file.setAttributeType(JgFileAttributeEnum.USE_REGIST_CERTIFICATE.getAttribute());
file.setSyncDate(models.getSyncDate()); // file.setSyncDate(models.getSyncDate());
file.setFileUrl(files.getFileUrl()); // file.setFileUrl(files.getFileUrl());
file.setFileName(files.getFileName()); // file.setFileName(files.getFileName());
file.setRecDate(new Date()); // file.setRecDate(new Date());
file.setSquNbr(registrationInfoModel.getSequenceNbr()); // file.setSquNbr(registrationInfoModel.getSequenceNbr());
fileList.add(file); // fileList.add(file);
} // }
} }
fileService.saveBatch(fileList); // fileService.saveBatch(fileList);
return "OK"; return "OK";
} }
......
...@@ -35,7 +35,7 @@ public class StaffBaseInfoService extends AppBaseService<StaffBaseInfoModel, Sta ...@@ -35,7 +35,7 @@ public class StaffBaseInfoService extends AppBaseService<StaffBaseInfoModel, Sta
} }
for (StaffBaseInfo models : model) { for (StaffBaseInfo models : model) {
checkModel(models); // checkModel(models);
models.setRecDate(new Date()); models.setRecDate(new Date());
models.setAppId(getAppId()); models.setAppId(getAppId());
} }
......
...@@ -44,33 +44,33 @@ public class StaffQualifInfoService extends AppBaseService<StaffQualifInfoModel, ...@@ -44,33 +44,33 @@ public class StaffQualifInfoService extends AppBaseService<StaffQualifInfoModel,
throw new BadRequest("人员资质信息为空."); throw new BadRequest("人员资质信息为空.");
} }
List<JgFile> fileList = new ArrayList<>(); // List<JgFile> fileList = new ArrayList<>();
List<JgFile> qualificationCertList; // List<JgFile> qualificationCertList;
for (StaffQualifInfoModel models : model) { for (StaffQualifInfoModel models : model) {
checkModel(models); // checkModel(models);
models.setRecDate(new Date()); models.setRecDate(new Date());
models.setAppId(getAppId()); models.setAppId(getAppId());
StaffQualifInfoModel staffQualifInfoModel = this.createWithModel(models); StaffQualifInfoModel staffQualifInfoModel = this.createWithModel(models);
qualificationCertList = JSONObject.parseArray(JSONObject.toJSONString(models.getQualificationCert()), JgFile.class); // qualificationCertList = JSONObject.parseArray(JSONObject.toJSONString(models.getQualificationCert()), JgFile.class);
//
for (JgFile files : qualificationCertList) { // for (JgFile files : qualificationCertList) {
JgFile file = new JgFile(); // JgFile file = new JgFile();
file.setSequenceCode(models.getOperatorId()); // file.setSequenceCode(models.getOperatorId());
file.setAppId(getAppId()); // file.setAppId(getAppId());
file.setObjectType(JgFileObjectEnum.STAFF_QUALIF_INFO.getObject()); // file.setObjectType(JgFileObjectEnum.STAFF_QUALIF_INFO.getObject());
file.setAttributeType(JgFileAttributeEnum.QUALIFICATION_CERT.getAttribute()); // file.setAttributeType(JgFileAttributeEnum.QUALIFICATION_CERT.getAttribute());
file.setSyncDate(models.getSyncDate()); // file.setSyncDate(models.getSyncDate());
file.setFileUrl(files.getFileUrl()); // file.setFileUrl(files.getFileUrl());
file.setFileName(files.getFileName()); // file.setFileName(files.getFileName());
file.setRecDate(new Date()); // file.setRecDate(new Date());
file.setSquNbr(staffQualifInfoModel.getSequenceNbr()); // file.setSquNbr(staffQualifInfoModel.getSequenceNbr());
fileList.add(file); // fileList.add(file);
} // }
} }
fileService.saveBatch(fileList); // fileService.saveBatch(fileList);
return "OK"; return "OK";
} }
......
...@@ -34,7 +34,7 @@ public class SuperviseInfoService extends AppBaseService<SuperviseInfoModel, Sup ...@@ -34,7 +34,7 @@ public class SuperviseInfoService extends AppBaseService<SuperviseInfoModel, Sup
throw new BadRequest("监督管理信息为空."); throw new BadRequest("监督管理信息为空.");
} }
for (SuperviseInfo models : model) { for (SuperviseInfo models : model) {
checkModel(models); // checkModel(models);
models.setRecDate(new Date()); models.setRecDate(new Date());
models.setAppId(getAppId()); models.setAppId(getAppId());
} }
......
...@@ -35,7 +35,7 @@ public class UseInfoService extends AppBaseService<UseInfoModel, UseInfo, UseInf ...@@ -35,7 +35,7 @@ public class UseInfoService extends AppBaseService<UseInfoModel, UseInfo, UseInf
} }
for (UseInfo models : model) { for (UseInfo models : model) {
checkModel(models); // checkModel(models);
models.setRecDate(new Date()); models.setRecDate(new Date());
models.setAppId(getAppId()); models.setAppId(getAppId());
} }
......
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