Skip to content

A
amos-boot-biz
Commit e21c4fc0 authored by tianyiming's avatar tianyiming
Browse files
Options

企业信息维护变更相关修改

parent 41ddde3f
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 34 deletions
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/BaseUnitLicenceDto.java
View file @ e21c4fc0
......@@ -94,4 +94,7 @@ public class BaseUnitLicenceDto extends BaseDto {
@ApiModelProperty(value = "发证机关code")
private String approvedOrganCode;
@ApiModelProperty(value = "是否同步自许可（1是 0否）")
private String isNotSync;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/BaseUnitLicence.java
View file @ e21c4fc0
......@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
/**
......@@ -163,4 +164,10 @@ public class BaseUnitLicence extends BaseEntity {
*/
private String approvedOrganCode;
/**
* 是否同步自许可（1是 0否）
*/
@TableField("is_not_sync")
private String isNotSync;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/RegUnitIcDto.java
View file @ e21c4fc0
......@@ -8,6 +8,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import java.util.List;
/**
* 注册单位工商信息表
......@@ -57,6 +58,10 @@ public class RegUnitIcDto extends BaseDto {
private String city;
private String district;
private String registerAddress;
private List registerAddressList;
//是否从工商查询到数据（1是 0否）
private String isNotAccess;
}
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java
View file @ e21c4fc0
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
......@@ -92,8 +93,8 @@ public class TzBaseEnterpriseInfoServiceImpl
@Autowired
private AccessFeignService accessFeignService;
@Autowired
private ITzBaseEnterpriseInfoService tzBaseEnterpriseInfoService;
@Autowired
private ITzBaseEnterpriseInfoService tzBaseEnterpriseInfoService;
@Autowired
DataDictionaryServiceImpl iDataDictionaryService;
......@@ -230,6 +231,11 @@ public class TzBaseEnterpriseInfoServiceImpl
}
regUnitIcDto.setUnitName(String.valueOf(resultMap.get("unitName")));
regUnitIcDto.setRegisteredOrgan(String.valueOf(resultMap.get("registration_authority")));
for (DataDictionary djjg : iDataDictionaryService.getByType("DJJG")) {
if(djjg.getName().equals(resultMap.get("registration_authority"))){
regUnitIcDto.setRegisteredOrganCode(djjg.getSequenceNbr().toString());
}
}
regUnitIcDto.setBusinessState(String.valueOf(resultMap.get("operating_status")));
regUnitIcDto.setProvince("陕西省");
regUnitIcDto.setCity(city);
......@@ -240,6 +246,15 @@ public class TzBaseEnterpriseInfoServiceImpl
regUnitIcDto.setLegalPerson(String.valueOf(resultMap.get("legalPeople")));
regUnitIcDto.setIndustryName(industryName);
regUnitIcDto.setRegisterAddress("陕西省/" + city + "/" + district);
ArrayList<Object> objects = new ArrayList<>();
objects.add("陕西省");
objects.add(city);
objects.add(district);
regUnitIcDto.setRegisterAddressList(objects);
regUnitIcDto.setIsNotAccess("1");
} else {
regUnitIcDto = tzBaseEnterpriseInfoDto.getRegUnitIcDto();
regUnitIcDto.setIsNotAccess("0");
}
tzBaseEnterpriseInfoDto.setRegUnitIcDto(regUnitIcDto);
tzBaseEnterpriseInfoDto.setApprovalTime(regUnitIcDto.getApprovedDate());
......@@ -432,40 +447,54 @@ public class TzBaseEnterpriseInfoServiceImpl
return "ok";
}
@Override
public TzBaseEnterpriseInfoDto companyInfoUpdate(Map<String, Object> map) {
TzBaseEnterpriseInfo tzBaseEnterpriseInfo = new TzBaseEnterpriseInfo();
tzBaseEnterpriseInfo.setSequenceNbr(Long.valueOf(map.get("sequenceNbr").toString()));
@Override
public TzBaseEnterpriseInfoDto companyInfoUpdate(Map<String, Object> map) {
TzBaseEnterpriseInfo tzBaseEnterpriseInfo = new TzBaseEnterpriseInfo();
tzBaseEnterpriseInfo.setSequenceNbr(Long.valueOf(map.get("sequenceNbr").toString()));
tzBaseEnterpriseInfo.setEquipCategory(JSON.toJSONString(map.get("equipCategory")));
tzBaseEnterpriseInfo.setEquipCategory(JSON.toJSONString(map.get("equipCategory")));
Map<String, String> map1 = (Map<String, String>) map.get("longitudeLatitude");
tzBaseEnterpriseInfo.setAddress(ObjectUtils.isEmpty(map1.get("address")) ? null : map1.get("address"));
tzBaseEnterpriseInfo.setLongitude(ObjectUtils.isEmpty(map1.get("longitude")) ? null : String.valueOf(map1.get("longitude")));
tzBaseEnterpriseInfo.setLatitude(ObjectUtils.isEmpty(map1.get("latitude")) ? null : String.valueOf(map1.get("latitude")));
tzBaseEnterpriseInfo.setUseContact(ObjectUtils.isEmpty(map.get("useContact")) ? null : String.valueOf(map.get("useContact")));
tzBaseEnterpriseInfo.setContactPhone(ObjectUtils.isEmpty(map.get("contactPhone")) ? null : String.valueOf(map.get("contactPhone")));
tzBaseEnterpriseInfo.setUnitBusinessLicense(ObjectUtils.isEmpty(map.get("unitBusinessLicense")) ? null : JSON.toJSONString(map.get("unitBusinessLicense")));
tzBaseEnterpriseInfo.setUnitExequatur(ObjectUtils.isEmpty(map.get("unitExequatur")) ? null : JSON.toJSONString(map.get("unitExequatur")));
tzBaseEnterpriseInfo.setIndustrySupervisor(ObjectUtils.isEmpty(map.get("industrySupervisor")) ? null : String.valueOf(map.get("industrySupervisor")));
tzBaseEnterpriseInfo.setSafetyOne(ObjectUtils.isEmpty(map.get("safetyOne")) ? null : String.valueOf(map.get("safetyOne")));
tzBaseEnterpriseInfo.setSafetyOneId(ObjectUtils.isEmpty(map.get("safetyOneId")) ? null : String.valueOf(map.get("safetyOneId")));
tzBaseEnterpriseInfo.setSafetyOnePhone(ObjectUtils.isEmpty(map.get("safetyOnePhone")) ? null : String.valueOf(map.get("safetyOnePhone")));
tzBaseEnterpriseInfo.setSafetyOnePhoto(ObjectUtils.isEmpty(map.get("safetyOnePhoto")) ? null : JSON.toJSONString(map.get("safetyOnePhoto")));
tzBaseEnterpriseInfo.setSafetyTwo(ObjectUtils.isEmpty(map.get("safetyTwo")) ? null : String.valueOf(map.get("safetyTwo")));
tzBaseEnterpriseInfo.setSafetyTwoId(ObjectUtils.isEmpty(map.get("safetyTwoId")) ? null : String.valueOf(map.get("safetyTwoId")));
tzBaseEnterpriseInfo.setSafetyTwoPhone(ObjectUtils.isEmpty(map.get("safetyTwoPhone")) ? null : String.valueOf(map.get("safetyTwoPhone")));
tzBaseEnterpriseInfo.setSafetyTwoPhoto(ObjectUtils.isEmpty(map.get("safetyTwoPhoto")) ? null : JSON.toJSONString(map.get("safetyTwoPhoto")));
tzBaseEnterpriseInfo.setMaintenPerson(ObjectUtils.isEmpty(map.get("maintenPerson")) ? null : String.valueOf(map.get("maintenPerson")));
tzBaseEnterpriseInfo.setMaintenTelephone(ObjectUtils.isEmpty(map.get("maintenTelephone")) ? null : String.valueOf(map.get("maintenTelephone")));
tzBaseEnterpriseInfo.setQualityPerson(ObjectUtils.isEmpty(map.get("qualityPerson")) ? null : String.valueOf(map.get("qualityPerson")));
tzBaseEnterpriseInfo.setQualityTelephone(ObjectUtils.isEmpty(map.get("qualityTelephone")) ? null : String.valueOf(map.get("qualityTelephone")));
tzBaseEnterpriseInfo.setSqa(ObjectUtils.isEmpty(map.get("sqa")) ? null : String.valueOf(map.get("sqa")));
tzBaseEnterpriseInfo.setSqaPhone(ObjectUtils.isEmpty(map.get("sqaPhone")) ? null : String.valueOf(map.get("sqaPhone")));
tzBaseEnterpriseInfo.setTechnicalPerson(ObjectUtils.isEmpty(map.get("technicalPerson")) ? null : String.valueOf(map.get("technicalPerson")));
boolean b = tzBaseEnterpriseInfoService.updateById(tzBaseEnterpriseInfo);
tzBaseEnterpriseInfo.setAddress(ObjectUtils.isEmpty(map1.get("address")) ? null : map1.get("address"));
tzBaseEnterpriseInfo.setLongitude(ObjectUtils.isEmpty(map1.get("longitude")) ? null : String.valueOf(map1.get("longitude")));
tzBaseEnterpriseInfo.setLatitude(ObjectUtils.isEmpty(map1.get("latitude")) ? null : String.valueOf(map1.get("latitude")));
tzBaseEnterpriseInfo.setUseContact(ObjectUtils.isEmpty(map.get("useContact")) ? null : String.valueOf(map.get("useContact")));
tzBaseEnterpriseInfo.setContactPhone(ObjectUtils.isEmpty(map.get("contactPhone")) ? null : String.valueOf(map.get("contactPhone")));
tzBaseEnterpriseInfo.setUnitBusinessLicense(ObjectUtils.isEmpty(map.get("unitBusinessLicense")) ? null : JSON.toJSONString(map.get("unitBusinessLicense")));
tzBaseEnterpriseInfo.setIndustrySupervisor(ObjectUtils.isEmpty(map.get("industrySupervisor")) ? null : String.valueOf(map.get("industrySupervisor")));
tzBaseEnterpriseInfo.setSuperviseOrgCode(ObjectUtils.isEmpty(map.get("superviseOrgCode")) ? null : String.valueOf(map.get("superviseOrgCode")));
tzBaseEnterpriseInfo.setSuperviseOrgName(ObjectUtils.isEmpty(map.get("superviseOrgName")) ? null : String.valueOf(map.get("superviseOrgName")));
//修改工商信息
RegUnitIc regUnitIc = new RegUnitIc();
List<String> addressList = (List<String>) map.get("registerAddressList");
tzBaseEnterpriseInfo.setProvince(addressList.get(0));
tzBaseEnterpriseInfo.setCity(addressList.get(1));
tzBaseEnterpriseInfo.setDistrict(addressList.get(3));
tzBaseEnterpriseInfo.setCommunity(ObjectUtils.isEmpty(map.get("community")) ? null : String.valueOf(map.get("community")));
tzBaseEnterpriseInfo.setStreet(ObjectUtils.isEmpty(map.get("stree")) ? null : String.valueOf(map.get("stree")));
tzBaseEnterpriseInfo.setLegalPerson(ObjectUtils.isEmpty(map.get("legalPerson")) ? null : String.valueOf(map.get("legalPerson")));
regUnitIc.setIndustryName(ObjectUtils.isEmpty(map.get("industryName")) ? null : String.valueOf(map.get("industryName")));
regUnitIc.setRegisteredOrgan(ObjectUtils.isEmpty(map.get("registeredOrgan")) ? null : String.valueOf(map.get("registeredOrgan")));
Date approvedDate = new Date();
try {
approvedDate = DateUtils.dateParse(String.valueOf(map.get("approvedDate")), "yyyy-MM-dd");
} catch (ParseException e) {
throw new RuntimeException(e);
}
regUnitIc.setBusinessState(ObjectUtils.isEmpty(map.get("businessState")) ? null : String.valueOf(map.get("businessState")));
regUnitIc.setApprovedDate(ObjectUtils.isEmpty(map.get("approvedDate")) ? null : approvedDate);
RegUnitIcDto regUnitIcDto = JSON.parseObject(JSON.toJSONString(map.get("regUnitIcDto")), new TypeReference<RegUnitIcDto>() {
});
// regUnitIcService.update(regUnitIc, new QueryWrapper<RegUnitIc>().eq("unit_code", regUnitIcDto.getUnitCode()));
//修改许可信息
List<BaseUnitLicence> licences = (List<BaseUnitLicence>) map.get("unitLicences");
// baseUnitLicenceService.saveOrUpdateBatch(licences);
// boolean b = tzBaseEnterpriseInfoService.updateById(tzBaseEnterpriseInfo);
boolean b = true;
if (b) {
TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = new TzBaseEnterpriseInfoDto();
BeanUtils.copyProperties(tzBaseEnterpriseInfo, tzBaseEnterpriseInfoDto);
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderFillingRecordServiceImpl.java
View file @ e21c4fc0
......@@ -330,6 +330,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
builder.query(boolMust);
builder.from((pageNum - 1) * pageSize);
builder.size(pageSize);
builder.trackTotalHits(true);
request.source(builder);
List<ESCylinderFillingRecordDto> list = new LinkedList<>();
long totle = 0;
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderInfoServiceImpl.java
View file @ e21c4fc0
......@@ -875,6 +875,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
builder.query(boolMust);
builder.from((pageNum - 1) * pageSize);
builder.size(pageSize);
builder.trackTotalHits(true);
request.source(builder);
List<ESCylinderInfoDto> list = new LinkedList<>();
long totle = 0;
......
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