Skip to content

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

企业管理相关问题修改

parent f0eabeac
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 28 deletions
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/TzBaseEnterpriseInfo.java
View file @ a2235aa8
...@@ -180,5 +180,5 @@ public class TzBaseEnterpriseInfo extends BaseEntity { ...@@ -180,5 +180,5 @@ public class TzBaseEnterpriseInfo extends BaseEntity {
private String qrCode; private String qrCode;
@ApiModelProperty(value = "行业主管部门") @ApiModelProperty(value = "行业主管部门")
private String industrySupervisor; private Long industrySupervisor;
} }
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 @ a2235aa8
...@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; ...@@ -7,7 +7,6 @@ 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;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.util.PageObjectUtil;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary; import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl; import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils; import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
...@@ -439,31 +438,31 @@ public class TzBaseEnterpriseInfoServiceImpl ...@@ -439,31 +438,31 @@ public class TzBaseEnterpriseInfoServiceImpl
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(map1.get("address")); tzBaseEnterpriseInfo.setAddress(ObjectUtils.isEmpty(map1.get("address")) ? null : map1.get("address"));
tzBaseEnterpriseInfo.setLongitude(ObjectUtils.isEmpty(map1.get("longitude")) ? map1.get("longitude") : null); tzBaseEnterpriseInfo.setLongitude(ObjectUtils.isEmpty(map1.get("longitude")) ? null : String.valueOf(map1.get("longitude")));
tzBaseEnterpriseInfo.setLatitude(ObjectUtils.isEmpty(map1.get("latitude")) ? map1.get("latitude") : null); tzBaseEnterpriseInfo.setLatitude(ObjectUtils.isEmpty(map1.get("latitude")) ? null : String.valueOf(map1.get("latitude")));
tzBaseEnterpriseInfo.setUseContact(String.valueOf(map.get("useContact"))); tzBaseEnterpriseInfo.setUseContact(ObjectUtils.isEmpty(map.get("useContact")) ? null : String.valueOf(map.get("useContact")));
tzBaseEnterpriseInfo.setContactPhone(String.valueOf(map.get("contactPhone"))); tzBaseEnterpriseInfo.setContactPhone(ObjectUtils.isEmpty(map.get("contactPhone")) ? null : String.valueOf(map.get("contactPhone")));
tzBaseEnterpriseInfo.setUnitBusinessLicense(JSON.toJSONString(map.get("unitBusinessLicense"))); tzBaseEnterpriseInfo.setUnitBusinessLicense(ObjectUtils.isEmpty(map.get("unitBusinessLicense")) ? null : JSON.toJSONString(map.get("unitBusinessLicense")));
tzBaseEnterpriseInfo.setUnitExequatur(JSON.toJSONString(map.get("unitExequatur"))); tzBaseEnterpriseInfo.setUnitExequatur(ObjectUtils.isEmpty(map.get("unitExequatur")) ? null : JSON.toJSONString(map.get("unitExequatur")));
tzBaseEnterpriseInfo.setIndustrySupervisor(JSON.toJSONString(map.get("industrySupervisor"))); tzBaseEnterpriseInfo.setIndustrySupervisor(ObjectUtils.isEmpty(map.get("industrySupervisor")) ? null : Long.valueOf(map.get("industrySupervisor").toString()));
tzBaseEnterpriseInfo.setSafetyOne(String.valueOf(map.get("safetyOne"))); tzBaseEnterpriseInfo.setSafetyOne(ObjectUtils.isEmpty(map.get("safetyOne")) ? null : String.valueOf(map.get("safetyOne")));
tzBaseEnterpriseInfo.setSafetyOneId(String.valueOf(map.get("safetyOneId"))); tzBaseEnterpriseInfo.setSafetyOneId(ObjectUtils.isEmpty(map.get("safetyOneId")) ? null : String.valueOf(map.get("safetyOneId")));
tzBaseEnterpriseInfo.setSafetyOnePhone(String.valueOf(map.get("safetyOnePhone"))); tzBaseEnterpriseInfo.setSafetyOnePhone(ObjectUtils.isEmpty(map.get("safetyOnePhone")) ? null : String.valueOf(map.get("safetyOnePhone")));
tzBaseEnterpriseInfo.setSafetyOnePhoto(JSON.toJSONString(map.get("safetyOnePhoto"))); tzBaseEnterpriseInfo.setSafetyOnePhoto(ObjectUtils.isEmpty(map.get("safetyOnePhoto")) ? null : JSON.toJSONString(map.get("safetyOnePhoto")));
tzBaseEnterpriseInfo.setSafetyTwo(String.valueOf(map.get("safetyTwo"))); tzBaseEnterpriseInfo.setSafetyTwo(ObjectUtils.isEmpty(map.get("safetyTwo")) ? null : String.valueOf(map.get("safetyTwo")));
tzBaseEnterpriseInfo.setSafetyTwoId(String.valueOf(map.get("safetyTwoId"))); tzBaseEnterpriseInfo.setSafetyTwoId(ObjectUtils.isEmpty(map.get("safetyTwoId")) ? null : String.valueOf(map.get("safetyTwoId")));
tzBaseEnterpriseInfo.setSafetyTwoPhone(String.valueOf(map.get("safetyTwoPhone"))); tzBaseEnterpriseInfo.setSafetyTwoPhone(ObjectUtils.isEmpty(map.get("safetyTwoPhone")) ? null : String.valueOf(map.get("safetyTwoPhone")));
tzBaseEnterpriseInfo.setSafetyTwoPhoto(JSON.toJSONString(map.get("safetyTwoPhoto"))); tzBaseEnterpriseInfo.setSafetyTwoPhoto(ObjectUtils.isEmpty(map.get("safetyTwoPhoto")) ? null : JSON.toJSONString(map.get("safetyTwoPhoto")));
tzBaseEnterpriseInfo.setMaintenPerson(String.valueOf(map.get("maintenPerson"))); tzBaseEnterpriseInfo.setMaintenPerson(ObjectUtils.isEmpty(map.get("maintenPerson")) ? null : String.valueOf(map.get("maintenPerson")));
tzBaseEnterpriseInfo.setMaintenTelephone(String.valueOf(map.get("maintenTelephone"))); tzBaseEnterpriseInfo.setMaintenTelephone(ObjectUtils.isEmpty(map.get("maintenTelephone")) ? null : String.valueOf(map.get("maintenTelephone")));
tzBaseEnterpriseInfo.setQualityPerson(String.valueOf(map.get("qualityPerson"))); tzBaseEnterpriseInfo.setQualityPerson(ObjectUtils.isEmpty(map.get("qualityPerson")) ? null : String.valueOf(map.get("qualityPerson")));
tzBaseEnterpriseInfo.setQualityTelephone(String.valueOf(map.get("qualityTelephone"))); tzBaseEnterpriseInfo.setQualityTelephone(ObjectUtils.isEmpty(map.get("qualityTelephone")) ? null : String.valueOf(map.get("qualityTelephone")));
tzBaseEnterpriseInfo.setSqa(String.valueOf(map.get("sqa"))); tzBaseEnterpriseInfo.setSqa(ObjectUtils.isEmpty(map.get("sqa")) ? null : String.valueOf(map.get("sqa")));
tzBaseEnterpriseInfo.setSqaPhone(String.valueOf(map.get("sqaPhone"))); tzBaseEnterpriseInfo.setSqaPhone(ObjectUtils.isEmpty(map.get("sqaPhone")) ? null : String.valueOf(map.get("sqaPhone")));
tzBaseEnterpriseInfo.setTechnicalPerson(String.valueOf(map.get("technicalPerson"))); tzBaseEnterpriseInfo.setTechnicalPerson(ObjectUtils.isEmpty(map.get("technicalPerson")) ? null : String.valueOf(map.get("technicalPerson")));
boolean b = tzBaseEnterpriseInfoService.updateById(tzBaseEnterpriseInfo); boolean b = tzBaseEnterpriseInfoService.updateById(tzBaseEnterpriseInfo);
if (b) { if (b) {
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/RegUnitInfoServiceImpl.java
View file @ a2235aa8
...@@ -269,8 +269,10 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI ...@@ -269,8 +269,10 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
baseEnterpriseInfo.setUnitType(StringUtils.join(regUnitInfo.getUnitTypeList(), "#")); baseEnterpriseInfo.setUnitType(StringUtils.join(regUnitInfo.getUnitTypeList(), "#"));
baseEnterpriseInfo.setUseCode(regUnitInfo.getUnitCode()); baseEnterpriseInfo.setUseCode(regUnitInfo.getUnitCode());
TzBaseEnterpriseInfo useCodeResult = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_code", regUnitInfo.getUnitCode())); TzBaseEnterpriseInfo useCodeResult = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_code", regUnitInfo.getUnitCode()));
if(!ObjectUtils.isEmpty(useCodeResult) && ObjectUtils.isEmpty(useCodeResult.getQrCode())){ if (ObjectUtils.isEmpty(useCodeResult)) {
baseEnterpriseInfo.setQrCode(createQRCode(regUnitInfo.getUnitCode())); baseEnterpriseInfo.setQrCode(createQRCode(regUnitInfo.getUnitCode()));
} else {
baseEnterpriseInfo.setQrCode(ObjectUtils.isEmpty(useCodeResult.getQrCode()) ? createQRCode(regUnitInfo.getUnitCode()) : useCodeResult.getQrCode());
} }
baseEnterpriseInfo.setUseUnit(regUnitInfo.getName()); baseEnterpriseInfo.setUseUnit(regUnitInfo.getName());
baseEnterpriseInfo.setProvince(regUnitInfo.getProvince()); baseEnterpriseInfo.setProvince(regUnitInfo.getProvince());
......
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