企业端企业信息详情 核准时间修改

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

@@ -217,6 +217,13 @@ public class TzBaseEnterpriseInfoDto extends BaseDto {
 	 * 核准时间
 	 */
 	private Date approvalTime;
+
+	/**
+	 * 核准时间(企业端基础信息使用)
+	 */
+	@ApiModelProperty(value = "核准时间")
+	private String approval;
+
 	@ApiModelProperty(value = "经营状态")
 	/**
 	 * 经营状态

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

@@ -158,25 +158,27 @@ public class TzBaseEnterpriseInfoServiceImpl
 		TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = detail(tzBaseEnterpriseInfo.getSequenceNbr());
 		RegUnitIcDto regUnitIcDto = new RegUnitIcDto();
 		Map<String, Object> resultMap = accessFeignService.getData(tzBaseEnterpriseInfoDto.getUseCode()).getResult();
-		if(!ValidationUtil.isEmpty(resultMap)){
+		if (!ValidationUtil.isEmpty(resultMap)) {
 			String area = String.valueOf(resultMap.get("area"));
-			String city = area.substring(0,area.indexOf("市")+1);
+			String city = area.substring(0, area.indexOf("市") + 1);
 			String district = area.substring(city.length());
-			if(district.equals("高新区")){
+			if (district.equals("高新区")) {
 				district = "雁塔区";
 			}
 			String industryName = "";
-			DataDictionary dataDictionary = iDataDictionaryService.getByCode(String.valueOf(resultMap.get("industryCode")),"HYXLDM");
-			if(!ValidationUtil.isEmpty(dataDictionary)) {
+			DataDictionary dataDictionary = iDataDictionaryService.getByCode(String.valueOf(resultMap.get("industryCode")), "HYXLDM");
+			if (!ValidationUtil.isEmpty(dataDictionary)) {
 				industryName = dataDictionary.getName();
 			}
 			String approveDate = String.valueOf(resultMap.get("approval_time"));
-			approveDate = approveDate.contains("年")?approveDate.replace("年","-"):approveDate;
-			approveDate = approveDate.contains("月")?approveDate.replace("月","-"):approveDate;
-			approveDate = approveDate.contains("日")?approveDate.replace("日","-"):approveDate;
+			approveDate = approveDate.contains("年") ? approveDate.replace("年", "-") : approveDate;
+			approveDate = approveDate.contains("月") ? approveDate.replace("月", "-") : approveDate;
+			approveDate = approveDate.contains("日") ? approveDate.replace("日", "-") : approveDate;
 			regUnitIcDto.setUnitCode(String.valueOf(resultMap.get("creditCode")));
+			String approve = approveDate.substring(0, 10) + "核准";
+			tzBaseEnterpriseInfoDto.setApproval(approve);
 			try {
-				regUnitIcDto.setApprovedDate(DateUtils.dateParse(approveDate,"yyyy-MM-dd"));
+				regUnitIcDto.setApprovedDate(DateUtils.dateParse(approveDate, "yyyy-MM-dd"));
 			} catch (ParseException e) {
 				e.printStackTrace();
 			}