diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/column/DictProvincesCodeField.java b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/column/DictProvincesCodeField.java new file mode 100644 index 0000000..705eeae --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/column/DictProvincesCodeField.java @@ -0,0 +1,41 @@ +package com.chinaunicom.mall.ebtp.project.dict.column; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * 字段常量 DictProvincesCode + * + * @auto.generated + */ +public class DictProvincesCodeField { + + + /** + * 编号 + */ + public static final String ID = "id"; + + /** + * 省份编码 + */ + public static final String PROVINCES_NUMBER = "provinces_number"; + + /** + * 省份名称 + */ + public static final String PROVINCES_NAME = "provinces_name"; + + /** + * 省份名称缩写 + */ + public static final String PROVINCES_CODE = "provinces_code"; + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/controller/DictProvincesCodeController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/controller/DictProvincesCodeController.java new file mode 100644 index 0000000..36e4a30 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/controller/DictProvincesCodeController.java @@ -0,0 +1,93 @@ +package com.chinaunicom.mall.ebtp.project.dict.controller; + + +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.project.dict.entity.DictProvincesCode; +import com.chinaunicom.mall.ebtp.project.dict.service.IDictProvincesCodeService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.List; + +/** + * 省份对应缩写字典表 + * @author daixc + * @date 2021/ + */ +@RestController +@Api(tags = "省份对应缩写字典表") +@RequestMapping("/v1/dictprovincescode") +public class DictProvincesCodeController{ + + @Resource + private IDictProvincesCodeService idictProvincesCodeService; + + /** + * 插入新数据 + * @param dictProvincesCode 省分代码实体 + * @return 返回结果 + */ + @ApiOperation("插入新数据") + @PostMapping("") + public BaseResponse insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid DictProvincesCode dictProvincesCode){ + + boolean save = idictProvincesCodeService.save(dictProvincesCode); + + return BaseResponse.success(save); + } + + /** + * 修改数据 + * @param dictProvincesCode 省分代码实体 + * @return 返回结果 + */ + @ApiOperation("修改数据") + @PutMapping("") + public BaseResponse update(@ApiParam(value = "对象数据", required = true) @RequestBody DictProvincesCode dictProvincesCode){ + + return BaseResponse.success(idictProvincesCodeService.updateById(dictProvincesCode)); + } + + /** + * 查询数据 + * @param id 主键id + * @return 返回结果 + */ + @ApiOperation("查询数据") + @GetMapping("/{id}") + public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable Integer id){ + + DictProvincesCode dictProvincesCode = idictProvincesCodeService.getById(id); + + return BaseResponse.success(dictProvincesCode); + } + + /** + * 根据省分编码查询数据 + * @param provincesNumber 省分编码 + * @return 返回结果 + */ + @ApiOperation("根据省分编码查询数据") + @GetMapping("getByProvincesNumber/{provincesNumber}") + public BaseResponse getByProvincesNumber(@ApiParam(value = "主键id", required = true) @PathVariable String provincesNumber){ + + DictProvincesCode dictProvincesCode = idictProvincesCodeService.getByProvincesNumber(provincesNumber); + + return BaseResponse.success(dictProvincesCode); + } + + /** + * 查询所有数据 + * @return 返回结果 + */ + @ApiOperation("查询所有数据") + @GetMapping("queryAll") + public BaseResponse> queryAll(){ + return BaseResponse.success(idictProvincesCodeService.list()); + } + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/DictProvincesCodeMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/DictProvincesCodeMapper.java new file mode 100644 index 0000000..dc67dc4 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/DictProvincesCodeMapper.java @@ -0,0 +1,10 @@ +package com.chinaunicom.mall.ebtp.project.dict.dao; + + +import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper; +import com.chinaunicom.mall.ebtp.project.dict.entity.DictProvincesCode; + +public interface DictProvincesCodeMapper extends IBaseMapper { + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/mapper/DictProvincesCodeMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/mapper/DictProvincesCodeMapper.xml new file mode 100644 index 0000000..baeb6fa --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/mapper/DictProvincesCodeMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + update dict_provinces_code + set + delete_flag="deleted" + where ID=#{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/entity/DictProvincesCode.java b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/entity/DictProvincesCode.java new file mode 100644 index 0000000..4548afd --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/entity/DictProvincesCode.java @@ -0,0 +1,50 @@ +package com.chinaunicom.mall.ebtp.project.dict.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * 实体类 DictProvincesCode + * + * @auto.generated + */ +@Data +@Accessors(chain = true) +@ApiModel +@TableName(value = "dict_provinces_code", autoResultMap = true) +public class DictProvincesCode extends BaseEntity implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 编号 + */ + @ApiModelProperty(value = "编号") + private Integer id; + + /** + * 省份编码 + */ + @ApiModelProperty(value = "省份编码") + private String provincesNumber; + + /** + * 省份名称 + */ + @ApiModelProperty(value = "省份名称") + private String provincesName; + + /** + * 省份名称缩写 + */ + @ApiModelProperty(value = "省份名称缩写") + private String provincesCode; + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/IDictProvincesCodeService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/IDictProvincesCodeService.java new file mode 100644 index 0000000..42e078a --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/IDictProvincesCodeService.java @@ -0,0 +1,20 @@ +package com.chinaunicom.mall.ebtp.project.dict.service; + + +import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; +import com.chinaunicom.mall.ebtp.project.dict.entity.DictProvincesCode; + +/** + * 对数据表 dict_provinces_code 操作的 service + * @author Auto create + * + */ +public interface IDictProvincesCodeService extends IBaseService{ + + /** + * 根据省分编号获取省分信息 + * @param provincesNumber 省分编码 + * @return 返回结果 + */ + DictProvincesCode getByProvincesNumber(String provincesNumber); +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/impl/DictProvincesCodeServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/impl/DictProvincesCodeServiceImpl.java new file mode 100644 index 0000000..c71879a --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/impl/DictProvincesCodeServiceImpl.java @@ -0,0 +1,29 @@ +package com.chinaunicom.mall.ebtp.project.dict.service.impl; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.chinaunicom.mall.ebtp.project.dict.column.DictProvincesCodeField; +import com.chinaunicom.mall.ebtp.project.dict.dao.DictProvincesCodeMapper; +import com.chinaunicom.mall.ebtp.project.dict.entity.DictProvincesCode; +import com.chinaunicom.mall.ebtp.project.dict.service.IDictProvincesCodeService; +import org.springframework.stereotype.Service; +import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; + +import java.util.List; + +/** + * 对数据表 dict_provinces_code 操作的 serviceImpl + * @author Auto create + * + */ +@Service +public class DictProvincesCodeServiceImpl extends BaseServiceImpl implements IDictProvincesCodeService { + + + @Override + public DictProvincesCode getByProvincesNumber(String provincesNumber) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(DictProvincesCodeField.PROVINCES_NUMBER,provincesNumber); + return this.getOne(queryWrapper); + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/controller/ProjectReEvaluationController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/controller/ProjectReEvaluationController.java index 968ed7f..57f40c4 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/controller/ProjectReEvaluationController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/controller/ProjectReEvaluationController.java @@ -169,4 +169,18 @@ public class ProjectReEvaluationController { return BaseResponse.success(projectReEvaluationService.getListByassessRoomId(vo)); } + + /** + * 根据评审室ID查询集合信息 + * @param ids 主键ID + * @param wfSectionNo 流程类别编码 + * @return 返回结果 + */ + @ApiOperation("根据主键查询信息") + @PostMapping("/getById") + public BaseResponse getById(@ApiParam(value = "主键ID", required = true) @RequestParam("ids") String ids, + @ApiParam(value = "流程类别编码", required = true) @RequestParam("wfSectionNo") String wfSectionNo ) { + + return BaseResponse.success(projectReEvaluationService.getById(ids,wfSectionNo)); + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/IProjectReEvaluationService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/IProjectReEvaluationService.java index 43549c5..a81d427 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/IProjectReEvaluationService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/IProjectReEvaluationService.java @@ -82,4 +82,12 @@ public interface IProjectReEvaluationService extends IBaseService getListByassessRoomId(ProjectReEvaluationVO vo); + + /** + * + * @param ids + * @param wfSectionNo + * @return + */ + ProjectReEvaluationVO getById(String ids, String wfSectionNo); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java index 34b6602..0e1e389 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java @@ -315,6 +315,11 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl businessFileIdList = resultList.stream().map(ProjectReEvaluationVO::getUploadFileId).collect(Collectors.toList()); - Optional result = attachmentClient.findByBusinessId(businessFileIdList); + if(businessFileIdList.size() > 0){ + Optional result = attachmentClient.findByBusinessId(businessFileIdList); - for (ProjectReEvaluationVO vo : resultList) { - List ossFileList = null; - if (result.isPresent()) { - ossFileList = result.get().get(String.valueOf(vo.getUploadFileId())); + for (ProjectReEvaluationVO vo : resultList) { + List ossFileList = null; + if (result.isPresent()) { + ossFileList = result.get().get(String.valueOf(vo.getUploadFileId())); + } + vo.setAttachmentList(ossFileList); } - vo.setAttachmentList(ossFileList); } } return resultList; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 43e5fee..32e8912 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -159,8 +159,8 @@ mconfig: service-name-resps: biz-service-ebtp-resps #标段应答文件 service-name-rsms: biz-service-ebtp-rsms #评审微服务 service-name-tender: biz-service-ebtp-tender #标段投标微服务 - wfSectionNo: '001' - wfSectionName: 采购方案审批 + wfSectionNo: '080' + wfSectionName: 标段重新评审审批单 # 用户暴露给 prometheus 的健康数据 management: diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 6e5793b..777532d 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -157,8 +157,8 @@ mconfig: service-name-resps : biz-service-ebtp-resps-dev #标段应答文件 service-name-rsms : biz-service-ebtp-rsms-dev #评审微服务 service-name-tender : biz-service-ebtp-tender-dev #标段投标微服务 - wfSectionNo: '001' - wfSectionName: 采购方案审批 + wfSectionNo: '080' + wfSectionName: 标段重新评审审批单 # 用户暴露给 prometheus 的健康数据 management: