liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改字段类型

Browse Source
This commit is contained in:
fuqingji
2022-04-02 17:16:53 +08:00
parent af5555eb84
commit 653bc3c6ce
7 changed files with 11 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/chinaunicom/mall/ebtp/project/config/FeignLocalDateTimeDecoder.java
View File

@ -1,18 +0,0 @@
package com.chinaunicom.mall.ebtp.project.config;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration
public class FeignLocalDateTimeDecoder {
@Bean(name = "mapperObject")
public ObjectMapper getObjectMapper() {
return new ObjectMapper().registerModule(new ParameterNamesModule()).registerModule(new Jdk8Module())
.registerModule(new JavaTimeModule());
}
}

3
src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpMallOpenApi.java
View File

@ -9,7 +9,6 @@ import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import java.time.LocalDateTime;
import java.util.Map;
/**
@ -30,7 +29,7 @@ public interface EbtpMallOpenApi {
*/
@ApiOperation("根据标段ID查询开标时间")
@PostMapping("/v1/bizbidopenroom/selectOpenTimeByBsIds")
public BaseResponse<Map<String, LocalDateTime>> updateOpenTime(@ApiParam(value = "开标室对象", required = false)
public BaseResponse<Map<String, String>> updateOpenTime(@ApiParam(value = "开标室对象", required = false)
@RequestBody BizBidOroomInitVo invo);

3
src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpMallOpenClientFallback.java
View File

@ -9,7 +9,6 @@ import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import java.time.LocalDateTime;
import java.util.Map;
@ -35,7 +34,7 @@ public class EbtpMallOpenClientFallback implements FallbackFactory<EbtpMallOpenA
* @return
*/
@Override
public BaseResponse<Map<String, LocalDateTime>> updateOpenTime(BizBidOroomInitVo invo) {
public BaseResponse<Map<String, String>> updateOpenTime(BizBidOroomInitVo invo) {
return null;
}
};

2
src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java
View File

@ -1066,7 +1066,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
List<ProjectSectionVO> sectionVOList = new ArrayList<>();
//20220402 新增：查询开标时间或者评审时间
Map<String, LocalDateTime> timeMap = projectSectionService.getOpenTime(sectionList.stream().map(ProjectSection::getId).collect(Collectors.toList()));
Map<String, String> timeMap = projectSectionService.getOpenTime(sectionList.stream().map(ProjectSection::getId).collect(Collectors.toList()));
//拼装标段总条数
for (String key: conversionMap.keySet()) {

10
src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java
View File

@ -1,21 +1,16 @@
package com.chinaunicom.mall.ebtp.project.projectsection.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest;
import com.chinaunicom.mall.ebtp.common.config.CustomLocalDateTimeTypeHandler;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
/**
@ -126,8 +121,5 @@ public class ProjectSectionVO extends ProjectSection implements Serializable {
* 开标时间或者评审室开启时间，用于项目列表展示
*/
@ApiModelProperty(value = "开标时间或者评审室开启时间，用于项目列表展示")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(typeHandler = CustomLocalDateTimeTypeHandler.class)
private LocalDateTime sectionOpenTime;
private String sectionOpenTime;
}

3
src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/IProjectSectionService.java
View File

@ -7,7 +7,6 @@ import com.chinaunicom.mall.ebtp.project.feign.entity.SectionFlowVO;
import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSection;
import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSectionVO;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@ -245,5 +244,5 @@ public interface IProjectSectionService extends IBaseService<ProjectSection>{
* @param sectionIds 项目标段ID,可以是不同项目的包
* @return 返回结果
*/
Map<String, LocalDateTime> getOpenTime(List<String> sectionIds);
Map<String, String> getOpenTime(List<String> sectionIds);
}

12
src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.chinaunicom.mall.ebtp.project.projectsection.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.LocalDateTimeUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@ -38,7 +39,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@ -528,7 +528,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl<ProjectSectionMap
ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_NOT_FIND.customValid(null == record);
//20220402 新增：查询开标时间或者评审时间
Map<String, LocalDateTime> timeMap = this.getOpenTime(sectionIds);
Map<String, String> timeMap = this.getOpenTime(sectionIds);
for (ProjectSection section:sectionList) {
ProjectSectionVO vo = BeanUtil.toBean(section,ProjectSectionVO.class);
@ -666,13 +666,13 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl<ProjectSectionMap
* @return 返回结果
*/
@Override
public Map<String, LocalDateTime> getOpenTime(List<String> sectionIds) {
public Map<String, String> getOpenTime(List<String> sectionIds) {
return Optional.ofNullable(sectionIds)
.map(ids -> {
//查询评标服务
BaseResponse<Map<String, LocalDateTime>> opening = ebtpMallOpenApi.updateOpenTime(new BizBidOroomInitVo().setSectionIds(ids));
BaseResponse<Map<String, String>> opening = ebtpMallOpenApi.updateOpenTime(new BizBidOroomInitVo().setSectionIds(ids));
ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName("评审时间查询失败", !opening.isSuccess());
Map<String, LocalDateTime> map = opening.getData();
Map<String, String> map = opening.getData();
if (ids.size() != map.size()) {
//查询流程服务
BaseResponse<List<BizAssessRoom>> process = ebtpMallProcessApi.selectListByIds(ids);
@ -680,7 +680,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl<ProjectSectionMap
process.getData().forEach(room -> {
//如果无评标时间，记录评审时间
if (!map.containsKey(room.getSectionId())) {
map.put(room.getSectionId(), room.getOpenTime());
map.put(room.getSectionId(), LocalDateTimeUtil.formatNormal(room.getOpenTime()));
}
});
}