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:
dxc
2021-05-20 08:23:09 +08:00
parent c19767b965
commit 88431bde7e
8 changed files with 79 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,7 +235,6 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
}
@Override
@Transactional(rollbackFor = Exception.class)
@GlobalTransactional
public boolean submitProject(String id){

12
src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/controller/ProjectSectionController.java
View File

@ -392,5 +392,17 @@ public class ProjectSectionController{
return BaseResponse.success(projectSectionService.getMaxBusinessModule(projectId));
}
/**
* 提供报表查询标段接口（西延专用）
* @param sectionIds 标段ID集合
* @return 返回结果
*/
@ApiOperation("提供报表查询标段接口（西延专用）")
@PostMapping("/selectListByChart")
public BaseResponse<List<ProjectSectionVO>> selectListByChart(@ApiParam(value = "主键id集合", required = true) @RequestBody List<String> sectionIds){
return BaseResponse.success(projectSectionService.selectListByChart(sectionIds));
}
}

7
src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/ProjectSectionMapper.java
View File

@ -66,4 +66,11 @@ public interface ProjectSectionMapper extends IBaseMapper<ProjectSection> {
* @return 返回结果
*/
List<ProjectSectionVO> selectArchiveById(@Param(value = "section") ProjectSectionVO projectSection);
/**
* 查询统计标段信息直接回显字典值
* @param sectionIds 标段ID集合
* @return 返回结果
*/
List<ProjectSectionVO> selectListByChart(@Param(value = "sectionIds") List<String> sectionIds);
}

22
src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml
View File

@ -31,7 +31,6 @@
<result column="eval_method_dict" jdbcType="VARCHAR" property="evalMethodDict"/>
<result column="procurement_type_dict" jdbcType="VARCHAR" property="procurementTypeDict"/>
<result column="miit_section_id" jdbcType="VARCHAR" property="miitSectionId"/>
<result column="bid_evaluation_method" jdbcType="DECIMAL" property="bidEvaluationMethod"/>
<result column="monetary_unit" jdbcType="VARCHAR" property="monetaryUnit"/>
<result column="remarks" jdbcType="VARCHAR" property="remarks"/>
<result column="parent_section_id" jdbcType="VARCHAR" property="parentSectionId"/>
@ -76,7 +75,6 @@
<result column="eval_method_dict" jdbcType="VARCHAR" property="evalMethodDict"/>
<result column="procurement_type_dict" jdbcType="VARCHAR" property="procurementTypeDict"/>
<result column="miit_section_id" jdbcType="VARCHAR" property="miitSectionId"/>
<result column="bid_evaluation_method" jdbcType="DECIMAL" property="bidEvaluationMethod"/>
<result column="monetary_unit" jdbcType="VARCHAR" property="monetaryUnit"/>
<result column="remarks" jdbcType="VARCHAR" property="remarks"/>
<result column="parent_section_id" jdbcType="VARCHAR" property="parentSectionId"/>
@ -192,4 +190,24 @@
</where>
</select>
<select id="selectListByChart"
resultType="com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSectionVO">
select t.*,
p.project_name,
p.bid_method_dict,
p.tenderee_org_name,
d.provinces_remark as province
from biz_project_section t
left join biz_project_record p on t.project_id = p.id
left join dict_provinces_code d on d.provinces_number = p.province
<where>
<if test="null != sectionIds and sectionIds.size() > 0 " >
and t.id in
<foreach item="item" index="index" collection="sectionIds" open="(" separator="," close=" )">
#{item}
</foreach>
</if>
</where>
</select>
</mapper>

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

@ -104,4 +104,16 @@ public class ProjectSectionVO extends ProjectSection implements Serializable {
@ApiModelProperty(value = "当前环节数")
private Integer currentLink;
@ApiModelProperty(value = "所属机构")
private String tendereeOrgName;
@ApiModelProperty(value = "所属省份名称")
private String province;
@ApiModelProperty(value = "当前环节字典回显")
private String businessModuleValue;
@ApiModelProperty(value = "采购方式字典回显")
private String bidMethodDictValue;
}

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

@ -201,4 +201,11 @@ public interface IProjectSectionService extends IBaseService<ProjectSection>{
* @return 返回业务流程
*/
Integer getMaxBusinessModule(String projectId);
/**
* 提供报表查询标段接口（西延专用）
* @param sectionIds 标段ID集合
* @return 返回结果
*/
List<ProjectSectionVO> selectListByChart(List<String> sectionIds);
}

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

@ -14,6 +14,8 @@ import com.chinaunicom.mall.ebtp.common.exception.common.CommonExceptionEnum;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.mall.ebtp.project.common.ProjectCommonUtil;
import com.chinaunicom.mall.ebtp.project.common.ProjectExceptionEnum;
import com.chinaunicom.mall.ebtp.project.dict.entity.DictProject;
import com.chinaunicom.mall.ebtp.project.dict.service.IDictProjectService;
import com.chinaunicom.mall.ebtp.project.dictchooseprocess.entity.DictChooseProcess;
import com.chinaunicom.mall.ebtp.project.dictchooseprocess.service.IDictChooseProcessService;
import com.chinaunicom.mall.ebtp.project.feign.EbtpArchiveApi;
@ -81,6 +83,9 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl<ProjectSectionMap
@Resource
private EbtpTenderApi tenderApi;
@Resource
private IDictProjectService dictProjectService;
/**
* 默认轮次
*/
@ -554,6 +559,21 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl<ProjectSectionMap
return maxBusinessModule;
}
@Override
public List<ProjectSectionVO> selectListByChart(List<String> sectionIds) {
List<DictProject> dictProjectList = dictProjectService.list();
Map<String,DictProject> dictMap = dictProjectList.stream().collect(Collectors.toMap(key -> key.getParentType()+"_"+key.getCode(),dict -> dict));
List<ProjectSectionVO> sectionVOList = projectSectionMapper.selectListByChart(sectionIds);
sectionVOList.forEach(n -> {
n.setBusinessModuleValue(dictMap.get("business_module="+n.getBidMethodDict()+"_"+n.getBusinessModule()).getDicName());
n.setBidMethodDictValue(dictMap.get("procurement_mode=entrust"+"_"+n.getBidMethodDict()).getDicName());
});
return sectionVOList;
}
/**
* 拼装标段模块修改流程实体并插入数据
* @param sectionId 标段ID

2
src/main/resources/application-local.yml
View File

@ -112,7 +112,7 @@ mybatis-plus:
map-underscore-to-camel-case: true
auto-mapping-behavior: full
# 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
mapper-locations: classpath*:com/chinaunicom/mall/ebtp/**/mapper/*Mapper.xml
global-config:
# 逻辑删除配置