企业端企业信息详情/企业端企业信息修改

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/TzBaseEnterpriseInfoDto.java

 package com.yeejoin.amos.boot.module.tzs.api.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.RegUnitIcDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.RegUnitInfoDto;
@@ -16,6 +17,7 @@ import java.util.List;
  * @date 2022-07-26
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class TzBaseEnterpriseInfoDto extends BaseDto {
 
 	private static final long serialVersionUID = 1L;
@@ -252,7 +254,7 @@ public class TzBaseEnterpriseInfoDto extends BaseDto {
 	private String technicalPerson;
 
 	@ApiModelProperty(value = "涉及设备类型")
-	private String equipCategory;
+	private List equipCategory;
 
 	@ApiModelProperty(value = "企业营业执照")
 	private List unitBusinessLicense;

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/TzBaseEnterpriseInfo.java

@@ -9,7 +9,6 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.util.Date;
-import java.util.List;
 
 
 /**
@@ -163,16 +162,16 @@ public class TzBaseEnterpriseInfo extends BaseEntity {
     private String equipCategory;
 
     @ApiModelProperty(value = "企业营业执照")
-    private List unitBusinessLicense;
+    private String unitBusinessLicense;
 
     @ApiModelProperty(value = "企业许可证书")
-    private List unitExequatur;
+    private String unitExequatur;
 
     @ApiModelProperty(value = "安全管理人2身份证照片")
-    private List safetyTwoPhoto;
+    private String safetyTwoPhoto;
 
     @ApiModelProperty(value = "安全管理人1身份证照片")
-    private List safetyOnePhoto;
+    private String safetyOnePhoto;
 
     @ApiModelProperty(value = "质量保证工程师电话")
     private String sqaPhone;

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/ITzBaseEnterpriseInfoService.java

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 企业数据信息 服务类
@@ -28,11 +29,13 @@ public interface ITzBaseEnterpriseInfoService extends IService<TzBaseEnterpriseI
 	IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto);
 
 	TzBaseEnterpriseInfoDto detail(Long id);
-	IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, Long id);
+	IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, String companyName);
 
 	List<EquEnterDto> getInfoByUseUnit(String useUnit);
 
 	TzBaseEnterpriseInfoDto selectByUseUnit(String useUnit);
 
 	String syncEnterpriseInfo();
+
+	TzBaseEnterpriseInfoDto companyInfoUpdate(Map<String, Object> map);
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/RegUnitInfoDto.java

 package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
 
 import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.BaseUnitLicenceDto;
 import io.swagger.annotations.ApiModel;
@@ -20,6 +21,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value="RegUnitInfoDto", description="单位注册信息表")
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class RegUnitInfoDto  extends BaseDto {
 
    private static final long serialVersionUID = 1L;

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/TzBaseEnterpriseInfoController.java

 package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.tzs.api.dto.EquEnterDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam;
@@ -11,10 +15,12 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.tzs.api.service.ITzBaseEnterpriseInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -23,6 +29,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 企业数据信息
@@ -38,6 +45,9 @@ public class TzBaseEnterpriseInfoController {
 	@Autowired
 	ITzBaseEnterpriseInfoService iTzBaseEnterpriseInfoService;
 
+	@Autowired
+	RedisUtils redisUtils;
+
 	/**
 	 * 新增企业数据信息
 	 * 
@@ -163,15 +173,25 @@ public class TzBaseEnterpriseInfoController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@RequestMapping(value = "/info", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "根据id查询企业详情", notes = "根据id查询企业详情")
-	public ResponseModel<IPage<TzBaseEnterpriseInfoDto>> pageInfo(PageParam pageParam,
-															  Long id) {
-		return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.page(pageParam, id));
+	public ResponseModel<IPage<TzBaseEnterpriseInfoDto>> pageInfo(PageParam pageParam,Long id) {
+		ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+		if(ObjectUtils.isEmpty(reginParams)){
+			return null;
+		}
+		return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.page(pageParam, reginParams.getCompany().getCompanyName()));
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/companyInfoUpdate", method = RequestMethod.POST)
+	@ApiOperation(httpMethod = "POST", value = "修改企业信息", notes = "修改企业信息")
+	public ResponseModel<TzBaseEnterpriseInfoDto> companyInfoUpdate(@RequestBody Map<String,Object> map) {
+		return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.companyInfoUpdate(map));
 	}
 
 	/**
 	 * 根据企业名称查询企业详情
 	 *
-	 * @param id
+	 * @param
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -83,6 +83,9 @@ public class TzBaseEnterpriseInfoServiceImpl
 
 	@Autowired
 	private AccessFeignService accessFeignService;
+
+    @Autowired
+    private ITzBaseEnterpriseInfoService tzBaseEnterpriseInfoService;
 	@Autowired
 	DataDictionaryServiceImpl iDataDictionaryService;
 
@@ -110,6 +113,11 @@ public class TzBaseEnterpriseInfoServiceImpl
 		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = this.getById(id);
 		if (tzBaseEnterpriseInfo != null) {
 			BeanUtils.copyProperties(tzBaseEnterpriseInfo, tzBaseEnterpriseInfoDto);
+			tzBaseEnterpriseInfoDto.setSafetyTwoPhoto(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getSafetyTwoPhoto()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getSafetyTwoPhoto()));
+			tzBaseEnterpriseInfoDto.setSafetyOnePhoto(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getSafetyOnePhoto()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getSafetyOnePhoto()));
+			tzBaseEnterpriseInfoDto.setUnitBusinessLicense(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getUnitBusinessLicense()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getUnitBusinessLicense()));
+			tzBaseEnterpriseInfoDto.setUnitExequatur(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getUnitExequatur()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getUnitExequatur()));
+			tzBaseEnterpriseInfoDto.setEquipCategory(ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getEquipCategory()) ? new ArrayList() : JSON.parseArray(tzBaseEnterpriseInfo.getEquipCategory()));
 		}
 		// 许可信息
 		List<BaseUnitLicence> unitLicences = baseUnitLicenceService.list(new LambdaQueryWrapper<BaseUnitLicence>()
@@ -145,8 +153,9 @@ public class TzBaseEnterpriseInfoServiceImpl
 	}
 
 	@Override
-	public IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, Long id) {
-		TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = detail(id);
+	public IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, String companyName) {
+		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_unit", companyName));
+		TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = detail(tzBaseEnterpriseInfo.getSequenceNbr());
 		RegUnitIcDto regUnitIcDto = new RegUnitIcDto();
 		Map<String, Object> resultMap = accessFeignService.getData(tzBaseEnterpriseInfoDto.getUseCode()).getResult();
 		if(!ValidationUtil.isEmpty(resultMap)){
@@ -189,14 +198,6 @@ public class TzBaseEnterpriseInfoServiceImpl
 		ArrayList<TzBaseEnterpriseInfoDto> result = new ArrayList<>();
 		result.add(tzBaseEnterpriseInfoDto);
 		Page<TzBaseEnterpriseInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
-		List safetyTwoPhone = ObjectUtils.isEmpty(tzBaseEnterpriseInfoDto.getSafetyTwoPhoto()) ? new ArrayList() : tzBaseEnterpriseInfoDto.getSafetyTwoPhoto();
-		tzBaseEnterpriseInfoDto.setSafetyTwoPhoto(safetyTwoPhone);
-		List safetyOnePhoto = ObjectUtils.isEmpty(tzBaseEnterpriseInfoDto.getSafetyOnePhoto()) ? new ArrayList() : tzBaseEnterpriseInfoDto.getSafetyOnePhoto();
-		tzBaseEnterpriseInfoDto.setSafetyOnePhoto(safetyOnePhoto);
-		List unitBusinessLicense = ObjectUtils.isEmpty(tzBaseEnterpriseInfoDto.getUnitBusinessLicense()) ? new ArrayList() : tzBaseEnterpriseInfoDto.getUnitBusinessLicense();
-		tzBaseEnterpriseInfoDto.setUnitBusinessLicense(unitBusinessLicense);
-		List unitExequatur = ObjectUtils.isEmpty(tzBaseEnterpriseInfoDto.getUnitExequatur()) ? new ArrayList() : tzBaseEnterpriseInfoDto.getUnitExequatur();
-		tzBaseEnterpriseInfoDto.setUnitExequatur(unitExequatur);
 		return page.setRecords(result);
 	}
 
@@ -373,6 +374,49 @@ 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()));
+
+        tzBaseEnterpriseInfo.setEquipCategory(JSON.toJSONString(map.get("equipCategory")));
+		Map<String, String> map1 = (Map<String, String>) map.get("longitudeLatitude");
+        tzBaseEnterpriseInfo.setAddress(map1.get("address"));
+        tzBaseEnterpriseInfo.setLongitude(ObjectUtils.isEmpty(map1.get("longitude")) ? map1.get("longitude") : null);
+        tzBaseEnterpriseInfo.setLatitude(ObjectUtils.isEmpty(map1.get("latitude")) ? map1.get("latitude") : null);
+        tzBaseEnterpriseInfo.setUseContact(map.get("useContact").toString());
+        tzBaseEnterpriseInfo.setContactPhone(map.get("contactPhone").toString());
+        tzBaseEnterpriseInfo.setUnitBusinessLicense(JSON.toJSONString(map.get("unitBusinessLicense")));
+        tzBaseEnterpriseInfo.setUnitExequatur(JSON.toJSONString(map.get("unitExequatur")));
+
+        tzBaseEnterpriseInfo.setSafetyOne(map.get("safetyOne").toString());
+        tzBaseEnterpriseInfo.setSafetyOneId(map.get("safetyOneId").toString());
+        tzBaseEnterpriseInfo.setSafetyOnePhone(map.get("safetyOnePhone").toString());
+        tzBaseEnterpriseInfo.setSafetyOnePhoto(JSON.toJSONString(map.get("safetyOnePhoto")));
+        tzBaseEnterpriseInfo.setSafetyTwo(map.get("safetyTwo").toString());
+        tzBaseEnterpriseInfo.setSafetyTwoId(map.get("safetyTwoId").toString());
+        tzBaseEnterpriseInfo.setSafetyTwoPhone(map.get("safetyTwoPhone").toString());
+        tzBaseEnterpriseInfo.setSafetyTwoPhoto(JSON.toJSONString(map.get("safetyTwoPhoto")));
+
+        tzBaseEnterpriseInfo.setMaintenPerson(map.get("maintenPerson").toString());
+        tzBaseEnterpriseInfo.setMaintenTelephone(map.get("maintenTelephone").toString());
+        tzBaseEnterpriseInfo.setQualityPerson(map.get("qualityPerson").toString());
+        tzBaseEnterpriseInfo.setQualityTelephone(map.get("qualityTelephone").toString());
+        tzBaseEnterpriseInfo.setSqa(map.get("sqa").toString());
+        tzBaseEnterpriseInfo.setSqaPhone(map.get("sqaPhone").toString());
+        tzBaseEnterpriseInfo.setTechnicalPerson(map.get("technicalPerson").toString());
+
+        boolean b = tzBaseEnterpriseInfoService.updateById(tzBaseEnterpriseInfo);
+        if (b) {
+            TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = new TzBaseEnterpriseInfoDto();
+            BeanUtils.copyProperties(tzBaseEnterpriseInfo, tzBaseEnterpriseInfoDto);
+            return tzBaseEnterpriseInfoDto;
+        } else {
+            return null;
+        }
+
+    }
+
 
 	public void setSpeUseUnitState(int state,SpeUseUnit speUseUnit){
 		speUseUnit.setSyncState(state);