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

Merge branch 'dev' into 'master'

Browse Source 
再次推送以及异常处理bug修改

See merge request eshop/biz_service_ebtp_project!2
This commit is contained in:
代兴成
2021-03-10 18:40:03 +08:00
parent a96da7c284 10cabd3bb4
commit 59e940362f
5 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java
View File

@ -137,7 +137,7 @@ public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl<ProjectEnt
* @return 返回结果 * @return 返回结果
*/ */
@GlobalTransactional @GlobalTransactional
private boolean putOffInquiry(InquiryNoticeVO inquiryNoticeVO){ public boolean putOffInquiry(InquiryNoticeVO inquiryNoticeVO){
boolean result = false; boolean result = false;
ProjectSection section = sectionService.selectByPlanId(inquiryNoticeVO.getInquiryId()); ProjectSection section = sectionService.selectByPlanId(inquiryNoticeVO.getInquiryId());
ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_NOT_FIND.customValid(null == section); ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_NOT_FIND.customValid(null == section);
@ -195,7 +195,7 @@ public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl<ProjectEnt
} }
@GlobalTransactional @GlobalTransactional
private void initProcess(ProjectEntrustVO projectEntrustVO){ public void initProcess(ProjectEntrustVO projectEntrustVO){
//初始化流程 //初始化流程
ProjectRecordVO recordVO = new ProjectRecordVO(); ProjectRecordVO recordVO = new ProjectRecordVO();

3
src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java
View File

@ -315,6 +315,8 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
//初始化委托单信息 //初始化委托单信息
ProjectEntrustVO projectEntrustVO = assembleProjectEntrust(purpImplementSendVO); ProjectEntrustVO projectEntrustVO = assembleProjectEntrust(purpImplementSendVO);
if(isUpdate){ if(isUpdate){
projectEntrustVO.setId(projectEntrust.getId());
projectEntrustVO.setStatus(projectEntrust.getStatus());
result = updateProject(projectEntrustVO); result = updateProject(projectEntrustVO);
}else{ }else{
result = saveProject(projectEntrustVO); result = saveProject(projectEntrustVO);
@ -360,6 +362,7 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
PurpBaseInfoVO purpBaseInfoVO = purpImplementSendVO.getPurpBaseInfoVoList().get(0); PurpBaseInfoVO purpBaseInfoVO = purpImplementSendVO.getPurpBaseInfoVoList().get(0);
ProjectEntrustVO result = new ProjectEntrustVO(); ProjectEntrustVO result = new ProjectEntrustVO();
//编号 //编号
result.setId(PropertyUtils.getSnowflakeId()); result.setId(PropertyUtils.getSnowflakeId());
//状态 //状态

10
src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/controller/ProjectExceptionController.java
View File

@ -46,17 +46,13 @@ public class ProjectExceptionController{
/** /**
* 修改数据 * 修改数据
* * @param projectExceptionVO 异常信息
* @param projectException 异常信息
*
* @return * @return
*/ */
@ApiOperation("修改数据") @ApiOperation("修改数据")
@PutMapping("") @PutMapping("")
public BaseResponse<Boolean> update(@ApiParam(value = "对象数据", required = true) @RequestBody ProjectException projectException){ public BaseResponse<Boolean> update(@ApiParam(value = "对象数据", required = true) @RequestBody ProjectExceptionVO projectExceptionVO){
return BaseResponse.success(projectExceptionService.update(projectExceptionVO));
return BaseResponse.success(projectExceptionService.updateById(projectException));
} }
/** /**

2
src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/dao/mapper/ProjectSectionExceptionMapper.xml
View File

@ -26,7 +26,7 @@
</update> </update>
<!-- 根据项目ID物理删除信息 --> <!-- 根据项目ID物理删除信息 -->
<delete id="deleteByProjectId" parameterType="java.lang.String"> <delete id="deleteByExceptionId" parameterType="java.lang.String">
delete from biz_project_section_exception where exception_id = #{exceptionId} delete from biz_project_section_exception where exception_id = #{exceptionId}
</delete> </delete>
</mapper> </mapper>

2
src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java
View File

@ -271,7 +271,7 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl<ProjectExceptio
* @param sectionList 项目标段 * @param sectionList 项目标段
*/ */
@GlobalTransactional @GlobalTransactional
private void launchAgainProject(ProjectException projectException,List<ProjectSection> sectionList) { public void launchAgainProject(ProjectException projectException,List<ProjectSection> sectionList) {
//查询项目信息 //查询项目信息
ProjectRecord projectRecord = projectRecordService.getById(projectException.getProjectId()); ProjectRecord projectRecord = projectRecordService.getById(projectException.getProjectId());