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 { ...@@ -94,4 +94,7 @@ public class BaseUnitLicenceDto extends BaseDto {
@ApiModelProperty(value = "发证机关code") @ApiModelProperty(value = "发证机关code")
private String approvedOrganCode; 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; ...@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
/** /**
...@@ -163,4 +164,10 @@ public class BaseUnitLicence extends BaseEntity { ...@@ -163,4 +164,10 @@ public class BaseUnitLicence extends BaseEntity {
*/ */
private String approvedOrganCode; 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; ...@@ -8,6 +8,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* 注册单位工商信息表 * 注册单位工商信息表
...@@ -57,6 +58,10 @@ public class RegUnitIcDto extends BaseDto { ...@@ -57,6 +58,10 @@ public class RegUnitIcDto extends BaseDto {
private String city; private String city;
private String district; private String district;
private String registerAddress; 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; ...@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; 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.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
...@@ -92,8 +93,8 @@ public class TzBaseEnterpriseInfoServiceImpl ...@@ -92,8 +93,8 @@ public class TzBaseEnterpriseInfoServiceImpl
@Autowired @Autowired
private AccessFeignService accessFeignService; private AccessFeignService accessFeignService;
@Autowired @Autowired
private ITzBaseEnterpriseInfoService tzBaseEnterpriseInfoService; private ITzBaseEnterpriseInfoService tzBaseEnterpriseInfoService;
@Autowired @Autowired
DataDictionaryServiceImpl iDataDictionaryService; DataDictionaryServiceImpl iDataDictionaryService;
...@@ -230,6 +231,11 @@ public class TzBaseEnterpriseInfoServiceImpl ...@@ -230,6 +231,11 @@ public class TzBaseEnterpriseInfoServiceImpl
} }
regUnitIcDto.setUnitName(String.valueOf(resultMap.get("unitName"))); regUnitIcDto.setUnitName(String.valueOf(resultMap.get("unitName")));
regUnitIcDto.setRegisteredOrgan(String.valueOf(resultMap.get("registration_authority"))); 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.setBusinessState(String.valueOf(resultMap.get("operating_status")));
regUnitIcDto.setProvince("陕西省"); regUnitIcDto.setProvince("陕西省");
regUnitIcDto.setCity(city); regUnitIcDto.setCity(city);
...@@ -240,6 +246,15 @@ public class TzBaseEnterpriseInfoServiceImpl ...@@ -240,6 +246,15 @@ public class TzBaseEnterpriseInfoServiceImpl
regUnitIcDto.setLegalPerson(String.valueOf(resultMap.get("legalPeople"))); regUnitIcDto.setLegalPerson(String.valueOf(resultMap.get("legalPeople")));
regUnitIcDto.setIndustryName(industryName); regUnitIcDto.setIndustryName(industryName);
regUnitIcDto.setRegisterAddress("陕西省/" + city + "/" + district); 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.setRegUnitIcDto(regUnitIcDto);
tzBaseEnterpriseInfoDto.setApprovalTime(regUnitIcDto.getApprovedDate()); tzBaseEnterpriseInfoDto.setApprovalTime(regUnitIcDto.getApprovedDate());
...@@ -432,40 +447,54 @@ public class TzBaseEnterpriseInfoServiceImpl ...@@ -432,40 +447,54 @@ public class TzBaseEnterpriseInfoServiceImpl
return "ok"; return "ok";
} }
@Override @Override
public TzBaseEnterpriseInfoDto companyInfoUpdate(Map<String, Object> map) { public TzBaseEnterpriseInfoDto companyInfoUpdate(Map<String, Object> map) {
TzBaseEnterpriseInfo tzBaseEnterpriseInfo = new TzBaseEnterpriseInfo(); TzBaseEnterpriseInfo tzBaseEnterpriseInfo = new TzBaseEnterpriseInfo();
tzBaseEnterpriseInfo.setSequenceNbr(Long.valueOf(map.get("sequenceNbr").toString())); 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"); Map<String, String> map1 = (Map<String, String>) map.get("longitudeLatitude");
tzBaseEnterpriseInfo.setAddress(ObjectUtils.isEmpty(map1.get("address")) ? null : map1.get("address")); 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.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.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.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.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.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.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")));
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"))); RegUnitIc regUnitIc = new RegUnitIc();
tzBaseEnterpriseInfo.setSafetyOnePhoto(ObjectUtils.isEmpty(map.get("safetyOnePhoto")) ? null : JSON.toJSONString(map.get("safetyOnePhoto"))); List<String> addressList = (List<String>) map.get("registerAddressList");
tzBaseEnterpriseInfo.setSafetyTwo(ObjectUtils.isEmpty(map.get("safetyTwo")) ? null : String.valueOf(map.get("safetyTwo"))); tzBaseEnterpriseInfo.setProvince(addressList.get(0));
tzBaseEnterpriseInfo.setSafetyTwoId(ObjectUtils.isEmpty(map.get("safetyTwoId")) ? null : String.valueOf(map.get("safetyTwoId"))); tzBaseEnterpriseInfo.setCity(addressList.get(1));
tzBaseEnterpriseInfo.setSafetyTwoPhone(ObjectUtils.isEmpty(map.get("safetyTwoPhone")) ? null : String.valueOf(map.get("safetyTwoPhone"))); tzBaseEnterpriseInfo.setDistrict(addressList.get(3));
tzBaseEnterpriseInfo.setSafetyTwoPhoto(ObjectUtils.isEmpty(map.get("safetyTwoPhoto")) ? null : JSON.toJSONString(map.get("safetyTwoPhoto"))); 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.setMaintenPerson(ObjectUtils.isEmpty(map.get("maintenPerson")) ? null : String.valueOf(map.get("maintenPerson"))); tzBaseEnterpriseInfo.setLegalPerson(ObjectUtils.isEmpty(map.get("legalPerson")) ? null : String.valueOf(map.get("legalPerson")));
tzBaseEnterpriseInfo.setMaintenTelephone(ObjectUtils.isEmpty(map.get("maintenTelephone")) ? null : String.valueOf(map.get("maintenTelephone"))); regUnitIc.setIndustryName(ObjectUtils.isEmpty(map.get("industryName")) ? null : String.valueOf(map.get("industryName")));
tzBaseEnterpriseInfo.setQualityPerson(ObjectUtils.isEmpty(map.get("qualityPerson")) ? null : String.valueOf(map.get("qualityPerson"))); regUnitIc.setRegisteredOrgan(ObjectUtils.isEmpty(map.get("registeredOrgan")) ? null : String.valueOf(map.get("registeredOrgan")));
tzBaseEnterpriseInfo.setQualityTelephone(ObjectUtils.isEmpty(map.get("qualityTelephone")) ? null : String.valueOf(map.get("qualityTelephone"))); Date approvedDate = new Date();
tzBaseEnterpriseInfo.setSqa(ObjectUtils.isEmpty(map.get("sqa")) ? null : String.valueOf(map.get("sqa"))); try {
tzBaseEnterpriseInfo.setSqaPhone(ObjectUtils.isEmpty(map.get("sqaPhone")) ? null : String.valueOf(map.get("sqaPhone"))); approvedDate = DateUtils.dateParse(String.valueOf(map.get("approvedDate")), "yyyy-MM-dd");
tzBaseEnterpriseInfo.setTechnicalPerson(ObjectUtils.isEmpty(map.get("technicalPerson")) ? null : String.valueOf(map.get("technicalPerson"))); } catch (ParseException e) {
throw new RuntimeException(e);
boolean b = tzBaseEnterpriseInfoService.updateById(tzBaseEnterpriseInfo); }
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) { if (b) {
TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = new TzBaseEnterpriseInfoDto(); TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = new TzBaseEnterpriseInfoDto();
BeanUtils.copyProperties(tzBaseEnterpriseInfo, 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 ...@@ -330,6 +330,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
builder.query(boolMust); builder.query(boolMust);
builder.from((pageNum - 1) * pageSize); builder.from((pageNum - 1) * pageSize);
builder.size(pageSize); builder.size(pageSize);
builder.trackTotalHits(true);
request.source(builder); request.source(builder);
List<ESCylinderFillingRecordDto> list = new LinkedList<>(); List<ESCylinderFillingRecordDto> list = new LinkedList<>();
long totle = 0; 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 ...@@ -875,6 +875,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
builder.query(boolMust); builder.query(boolMust);
builder.from((pageNum - 1) * pageSize); builder.from((pageNum - 1) * pageSize);
builder.size(pageSize); builder.size(pageSize);
builder.trackTotalHits(true);
request.source(builder); request.source(builder);
List<ESCylinderInfoDto> list = new LinkedList<>(); List<ESCylinderInfoDto> list = new LinkedList<>();
long totle = 0; 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