增加项目省分字段回显模块
增加重新评审查询接口
This commit is contained in:
dxc
@ -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";
|
||||
|
||||
|
||||
}
|
||||
@ -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<Boolean> 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<Boolean> update(@ApiParam(value = "对象数据", required = true) @RequestBody DictProvincesCode dictProvincesCode){
|
||||
|
||||
return BaseResponse.success(idictProvincesCodeService.updateById(dictProvincesCode));
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询数据
|
||||
* @param id 主键id
|
||||
* @return 返回结果
|
||||
*/
|
||||
@ApiOperation("查询数据")
|
||||
@GetMapping("/{id}")
|
||||
public BaseResponse<DictProvincesCode> 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<DictProvincesCode> getByProvincesNumber(@ApiParam(value = "主键id", required = true) @PathVariable String provincesNumber){
|
||||
|
||||
DictProvincesCode dictProvincesCode = idictProvincesCodeService.getByProvincesNumber(provincesNumber);
|
||||
|
||||
return BaseResponse.success(dictProvincesCode);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询所有数据
|
||||
* @return 返回结果
|
||||
*/
|
||||
@ApiOperation("查询所有数据")
|
||||
@GetMapping("queryAll")
|
||||
public BaseResponse<List<DictProvincesCode>> queryAll(){
|
||||
return BaseResponse.success(idictProvincesCodeService.list());
|
||||
}
|
||||
|
||||
}
|
||||
@ -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<DictProvincesCode> {
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,20 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
|
||||
<mapper namespace="com.chinaunicom.mall.ebtp.project.dict.dao.DictProvincesCodeMapper">
|
||||
<resultMap id="BaseResultMap"
|
||||
type="com.chinaunicom.mall.ebtp.project.dict.entity.DictProvincesCode">
|
||||
<result column="id" jdbcType="INTEGER" property="id"/>
|
||||
<result column="provinces_number" jdbcType="VARCHAR" property="provincesNumber"/>
|
||||
<result column="provinces_name" jdbcType="VARCHAR" property="provincesName"/>
|
||||
<result column="provinces_code" jdbcType="VARCHAR" property="provincesCode"/>
|
||||
</resultMap>
|
||||
|
||||
<!--逻辑删除方法 此方法为代码生成器生成 不允许修改 如有特殊需求 请自行新建SQL语句-->
|
||||
<update id="deleteOff" parameterType="java.lang.Long">
|
||||
update dict_provinces_code
|
||||
set
|
||||
delete_flag="deleted"
|
||||
where ID=#{id,jdbcType=BIGINT}
|
||||
</update>
|
||||
</mapper>
|
||||
@ -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;
|
||||
|
||||
|
||||
}
|
||||
@ -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<DictProvincesCode>{
|
||||
|
||||
/**
|
||||
* 根据省分编号获取省分信息
|
||||
* @param provincesNumber 省分编码
|
||||
* @return 返回结果
|
||||
*/
|
||||
DictProvincesCode getByProvincesNumber(String provincesNumber);
|
||||
}
|
||||
@ -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<DictProvincesCodeMapper, DictProvincesCode> implements IDictProvincesCodeService {
|
||||
|
||||
|
||||
@Override
|
||||
public DictProvincesCode getByProvincesNumber(String provincesNumber) {
|
||||
QueryWrapper<DictProvincesCode> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq(DictProvincesCodeField.PROVINCES_NUMBER,provincesNumber);
|
||||
return this.getOne(queryWrapper);
|
||||
}
|
||||
}
|
||||
@ -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<ProjectReEvaluationVO> 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));
|
||||
}
|
||||
}
|
||||
|
||||
@ -82,4 +82,12 @@ public interface IProjectReEvaluationService extends IBaseService<ProjectReEvalu
|
||||
* @return 返回结果
|
||||
*/
|
||||
List<ProjectReEvaluation> getListByassessRoomId(ProjectReEvaluationVO vo);
|
||||
|
||||
/**
|
||||
*
|
||||
* @param ids
|
||||
* @param wfSectionNo
|
||||
* @return
|
||||
*/
|
||||
ProjectReEvaluationVO getById(String ids, String wfSectionNo);
|
||||
}
|
||||
|
||||
@ -315,6 +315,11 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
|
||||
return this.getList(vo);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ProjectReEvaluationVO getById(String ids, String wfSectionNo) {
|
||||
return BeanUtil.toBean(this.getById(ids),ProjectReEvaluationVO.class);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 初始化标段信息
|
||||
@ -385,14 +390,16 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
|
||||
|
||||
if (null != resultList) {
|
||||
List<String> businessFileIdList = resultList.stream().map(ProjectReEvaluationVO::getUploadFileId).collect(Collectors.toList());
|
||||
Optional<AttachmentDetail> result = attachmentClient.findByBusinessId(businessFileIdList);
|
||||
if(businessFileIdList.size() > 0){
|
||||
Optional<AttachmentDetail> result = attachmentClient.findByBusinessId(businessFileIdList);
|
||||
|
||||
for (ProjectReEvaluationVO vo : resultList) {
|
||||
List<AttachmentEntity> ossFileList = null;
|
||||
if (result.isPresent()) {
|
||||
ossFileList = result.get().get(String.valueOf(vo.getUploadFileId()));
|
||||
for (ProjectReEvaluationVO vo : resultList) {
|
||||
List<AttachmentEntity> ossFileList = null;
|
||||
if (result.isPresent()) {
|
||||
ossFileList = result.get().get(String.valueOf(vo.getUploadFileId()));
|
||||
}
|
||||
vo.setAttachmentList(ossFileList);
|
||||
}
|
||||
vo.setAttachmentList(ossFileList);
|
||||
}
|
||||
}
|
||||
return resultList;
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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:
|
||||
|
||||
Reference in New Issue
Block a user