From e8f231ed0c7c40cda0d890b9025fa6c121248d7c Mon Sep 17 00:00:00 2001
From: dxc <jl-daixc@chinaunicom.cn>
Date: Wed, 10 Mar 2021 14:47:26 +0800
Subject: [PATCH 1/3] =?UTF-8?q?seata=E6=A0=87=E7=AD=BE=E5=8C=85=E8=A3=B9?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=BF=85=E9=A1=BB=E6=8A=8Apublic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectEntrustInquiryServiceImpl.java        | 4 ++--
 .../service/impl/ProjectExceptionServiceImpl.java             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java
index f3756a8..696e0e6 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java
@@ -137,7 +137,7 @@ public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl<ProjectEnt
      * @return 返回结果
      */
     @GlobalTransactional
-    private boolean putOffInquiry(InquiryNoticeVO inquiryNoticeVO){
+    public boolean putOffInquiry(InquiryNoticeVO inquiryNoticeVO){
         boolean result = false;
         ProjectSection section = sectionService.selectByPlanId(inquiryNoticeVO.getInquiryId());
         ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_NOT_FIND.customValid(null == section);
@@ -195,7 +195,7 @@ public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl<ProjectEnt
     }
 
     @GlobalTransactional
-    private void initProcess(ProjectEntrustVO projectEntrustVO){
+    public void initProcess(ProjectEntrustVO projectEntrustVO){
 
         //初始化流程
         ProjectRecordVO recordVO = new ProjectRecordVO();
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java
index dea39b6..1a6a52d 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java
@@ -271,7 +271,7 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl<ProjectExceptio
      * @param sectionList 项目标段
      */
     @GlobalTransactional
-    private void launchAgainProject(ProjectException projectException,List<ProjectSection> sectionList) {
+    public void launchAgainProject(ProjectException projectException,List<ProjectSection> sectionList) {
 
         //查询项目信息
         ProjectRecord projectRecord = projectRecordService.getById(projectException.getProjectId());

From 784c26f1bb36b5bd9df4527a4e04ee3b02efdc43 Mon Sep 17 00:00:00 2001
From: dxc <jl-daixc@chinaunicom.cn>
Date: Wed, 10 Mar 2021 15:05:25 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=A7=94=E6=89=98?=
 =?UTF-8?q?=E5=86=8D=E6=AC=A1=E6=8E=A5=E6=94=B6=E6=95=B0=E6=8D=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectentrust/service/impl/ProjectEntrustServiceImpl.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java
index 6ca8ca2..d7d9791 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java
@@ -315,6 +315,7 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
                 //初始化委托单信息
                 ProjectEntrustVO projectEntrustVO = assembleProjectEntrust(purpImplementSendVO);
                 if(isUpdate){
+                    projectEntrustVO.setId(projectEntrust.getId());
                     result = updateProject(projectEntrustVO);
                 }else{
                     result = saveProject(projectEntrustVO);
@@ -360,6 +361,7 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
         PurpBaseInfoVO purpBaseInfoVO = purpImplementSendVO.getPurpBaseInfoVoList().get(0);
 
         ProjectEntrustVO result = new  ProjectEntrustVO();
+
         //编号
         result.setId(PropertyUtils.getSnowflakeId());
         //状态

From 10cabd3bb4b40d3cc9169ca90db905a7f2b10a1b Mon Sep 17 00:00:00 2001
From: dxc <jl-daixc@chinaunicom.cn>
Date: Wed, 10 Mar 2021 18:37:36 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=A7=94=E6=89=98?=
 =?UTF-8?q?=E5=86=8D=E6=AC=A1=E6=8E=A5=E6=94=B6=E6=95=B0=E6=8D=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9bug=E5=92=8C=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectEntrustServiceImpl.java        |  1 +
 .../controller/ProjectExceptionController.java         | 10 +++-------
 .../dao/mapper/ProjectSectionExceptionMapper.xml       |  2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java
index d7d9791..7c0e357 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java
@@ -316,6 +316,7 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
                 ProjectEntrustVO projectEntrustVO = assembleProjectEntrust(purpImplementSendVO);
                 if(isUpdate){
                     projectEntrustVO.setId(projectEntrust.getId());
+                    projectEntrustVO.setStatus(projectEntrust.getStatus());
                     result = updateProject(projectEntrustVO);
                 }else{
                     result = saveProject(projectEntrustVO);
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/controller/ProjectExceptionController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/controller/ProjectExceptionController.java
index 443ea41..4ce444a 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/controller/ProjectExceptionController.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/controller/ProjectExceptionController.java
@@ -46,17 +46,13 @@ public class ProjectExceptionController{
 	
 	/**
 	 * 修改数据
-	 * 
-	 * @param projectException 异常信息
-	 *            
+	 * @param projectExceptionVO 异常信息
 	 * @return
 	 */
 	@ApiOperation("修改数据")
 	@PutMapping("")
-	public BaseResponse<Boolean> update(@ApiParam(value = "对象数据", required = true) @RequestBody ProjectException projectException){
-
-
-		return BaseResponse.success(projectExceptionService.updateById(projectException));
+	public BaseResponse<Boolean> update(@ApiParam(value = "对象数据", required = true) @RequestBody ProjectExceptionVO projectExceptionVO){
+		return BaseResponse.success(projectExceptionService.update(projectExceptionVO));
 	}
 	
 	/**
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/dao/mapper/ProjectSectionExceptionMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/dao/mapper/ProjectSectionExceptionMapper.xml
index 795e747..2a63ee7 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/dao/mapper/ProjectSectionExceptionMapper.xml
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/dao/mapper/ProjectSectionExceptionMapper.xml
@@ -26,7 +26,7 @@
     </update>
 
     <!-- 根据项目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>
 </mapper>
\ No newline at end of file