更新项目档案

src/main/java/org/jeecg/common/dto/archives/ProBusinessOtherAddReqDTO.java

@@ -14,6 +14,7 @@ import java.util.Date;
 @ApiModel("项目档案--计划信息新增请求参数")
 @Data
 public class ProBusinessOtherAddReqDTO {
+    private String id;
     @ApiModelProperty( "当前节点id")
     private String key;
     @ApiModelProperty( "父节点id")

src/main/java/org/jeecg/modules/archives/entity/ProjectManageArchivesAndBusiness.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.dto.archives.ProArchivesAndBusinessAddReqDTO;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -95,6 +96,10 @@ public class ProjectManageArchivesAndBusiness implements Serializable {
     }
 
     public ProjectManageArchivesAndBusiness(ProArchivesAndBusinessAddReqDTO mile, String proArchivesId, String pkOrg) {
+        if(StringUtils.isNotBlank(mile.getId())){
+            this.id = mile.getId();
+        }
+
         this.proArchivesId = proArchivesId;
         this.planType = mile.getPlanType();
         this.planId = mile.getPlanId();
@@ -122,4 +127,10 @@ public class ProjectManageArchivesAndBusiness implements Serializable {
         this.delFlag = "0";
         this.pkOrg = pkOrg;
     }
+
+    public ProjectManageArchivesAndBusiness(String id, String delFlag){
+        this.id = id;
+        this.delFlag = delFlag;
+    }
+
 }

src/main/java/org/jeecg/modules/archives/entity/ProjectManageBusinessOther.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 import io.swagger.models.auth.In;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.dto.archives.ProBusinessOtherAddReqDTO;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -83,6 +84,7 @@ public class ProjectManageBusinessOther implements Serializable {
 	  * @desc 添加用
 	  */
 	 public ProjectManageBusinessOther(ProBusinessOtherAddReqDTO plan, String proArchivesId, Integer planType, String pkOrg) {
+	     this.id = plan.getId();
 		 this.proArchivesId = proArchivesId;
 		 this.planType = planType;
 		 this.keyId = plan.getKey();
@@ -113,4 +115,12 @@ public class ProjectManageBusinessOther implements Serializable {
 	 public ProjectManageBusinessOther(String proArchivesId){
 		 this.proArchivesId = proArchivesId;
 	 }
+
+	 /**
+	  * @desc 编辑删除
+	  */
+	 public ProjectManageBusinessOther(String id, String delFlag) {
+	 	this.id = id;
+	 	this.delFlag = delFlag;
+	 }
  }

src/main/java/org/jeecg/modules/archives/mapper/ProjectManageArchivesAndBusinessMapper.java

@@ -19,4 +19,9 @@ public interface ProjectManageArchivesAndBusinessMapper extends BaseMapper<Proje
      * @desc 批量删除(逻辑删除)
      */
     void deleteBatch(@Param("businessList") List<ProjectManageArchivesAndBusiness> businessList);
+
+    /**
+     * @desc 编辑删除
+     */
+    void updateDataById(@Param("business") ProjectManageArchivesAndBusiness projectManageArchivesAndBusiness, @Param("pid") String pid);
 }

src/main/java/org/jeecg/modules/archives/mapper/ProjectManageBusinessOtherMapper.java

@@ -18,4 +18,8 @@ public interface ProjectManageBusinessOtherMapper extends BaseMapper<ProjectMana
      * @desc 批量删除(逻辑删除)
      */
     void deleteBatch(@Param("others") List<ProjectManageBusinessOther> businessOtherList);
+    /**
+     * @desc 编辑删除
+     */
+    void updateDataById(@Param("other") ProjectManageBusinessOther other, @Param("pid") String id);
 }

src/main/java/org/jeecg/modules/archives/mapper/xml/ProjectManageArchivesAndBusinessMapper.xml

@@ -10,4 +10,10 @@
           </foreach>
 
       </update>
+      <update id="updateDataById">
+           UPDATE project_manage_archives_and_business
+           SET del_flag = '1',
+                id = #{business.id}
+            WHERE id = #{pid}
+      </update>
 </mapper>

src/main/java/org/jeecg/modules/archives/mapper/xml/ProjectManageBusinessOtherMapper.xml

@@ -9,4 +9,11 @@
             #{other.id}
         </foreach>
     </update>
+
+    <update id="updateDataById">
+           UPDATE project_manage_business_other
+           SET del_flag = '1',
+                id = #{other.id}
+            WHERE id = #{pid}
+      </update>
 </mapper>

src/main/java/org/jeecg/modules/archives/service/ProjectManageArchivesAndBusinessService.java

@@ -16,4 +16,6 @@ public interface ProjectManageArchivesAndBusinessService extends IService<Projec
      * @desc 批量删除(逻辑删除)
      */
     void deleteBatch(List<ProjectManageArchivesAndBusiness> businessList);
+
+    void updateDataById(ProjectManageArchivesAndBusiness projectManageArchivesAndBusiness, String pid);
 }

src/main/java/org/jeecg/modules/archives/service/ProjectManageBusinessOtherService.java

@@ -23,4 +23,9 @@ public interface ProjectManageBusinessOtherService extends IService<ProjectManag
      * @desc 获取列表数据
      */
     List<ProjectManageBusinessOther> getAll(ProjectManageBusinessOther other);
+
+    /**
+     * @desc 编辑删除
+     */
+    void updateDataById(ProjectManageBusinessOther other, String id);
 }

src/main/java/org/jeecg/modules/archives/service/impl/ProjectManageArchivesAndBusinessServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.archives.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.jeecg.modules.archives.entity.ProjectManageArchivesAndBusiness;
 import org.jeecg.modules.archives.mapper.ProjectManageArchivesAndBusinessMapper;
 import org.jeecg.modules.archives.service.ProjectManageArchivesAndBusinessService;
@@ -29,4 +30,12 @@ public class ProjectManageArchivesAndBusinessServiceImpl extends ServiceImpl<Pro
     public void deleteBatch(List<ProjectManageArchivesAndBusiness> businessList) {
         projectManageArchivesAndBusinessMapper.deleteBatch(businessList);
     }
+
+    /**
+     * @desc 编辑删除
+     */
+    @Override
+    public void updateDataById(ProjectManageArchivesAndBusiness projectManageArchivesAndBusiness, String pid) {
+        projectManageArchivesAndBusinessMapper.updateDataById(projectManageArchivesAndBusiness, pid);
+    }
 }

src/main/java/org/jeecg/modules/archives/service/impl/ProjectManageArchivesServiceImpl.java

@@ -240,9 +240,8 @@ public class ProjectManageArchivesServiceImpl extends ServiceImpl<ProjectManageA
             for(ProjectManageArchivesAndBusiness business : businessList){
                 QueryWrapper<ProjectManageArchivesAndBusiness> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("id", business.getId());
-                business.setId(UUID.randomUUID().toString());
-                business.setDelFlag("1");
-                projectManageArchivesAndBusinessService.update(business, queryWrapper);
+
+                projectManageArchivesAndBusinessService.updateDataById(new ProjectManageArchivesAndBusiness(getIdData(), "1"), business.getId());
             }
             //(作废)
 //            projectManageArchivesAndBusinessService.deleteBatch(businessList);
@@ -256,9 +255,7 @@ public class ProjectManageArchivesServiceImpl extends ServiceImpl<ProjectManageA
             for(ProjectManageBusinessOther other : businessOtherList) {
                 QueryWrapper<ProjectManageBusinessOther> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("id", other.getId());
-                other.setId(UUID.randomUUID().toString());
-                other.setDelFlag("1");
-                projectManageBusinessOtherService.update(other, queryWrapper);
+                projectManageBusinessOtherService.updateDataById(new ProjectManageBusinessOther(getIdData(), "1"), other.getId());
             }
 
             //(作废)
@@ -266,7 +263,18 @@ public class ProjectManageArchivesServiceImpl extends ServiceImpl<ProjectManageA
         }
     }
 
-    /**
+
+
+     /**
+      * @desc 获取uuid
+      */
+     private String getIdData() {
+         String uuid = UUID.randomUUID().toString();
+         String[] idArr = uuid.split("-");
+         return String.join("", idArr);
+     }
+
+     /**
      * @desc 添加项目档案--商务,实施,开发,服务的数据
      */
     private void saveArchivesAndBusiness(ProArchivesAddReqDTO reqDTO) {
@@ -289,7 +297,7 @@ public class ProjectManageArchivesServiceImpl extends ServiceImpl<ProjectManageA
         //保存收款计划
         List<ProArchivesAndBusinessAddReqDTO> coPlanList = bsInfo.getCoPlanList();
         if(!CollectionUtils.isEmpty(coPlanList)){
-            saveMileData( coPlanList,  reqDTO);
+            saveMileData(coPlanList, reqDTO);
         }
         //保存收款情况
         List<ProArchivesAndBusinessAddReqDTO> coSituationList = bsInfo.getCoSituationList();

src/main/java/org/jeecg/modules/archives/service/impl/projectManageBusinessOtherServiceImpl.java

@@ -46,4 +46,12 @@ public class projectManageBusinessOtherServiceImpl extends ServiceImpl<ProjectMa
         lambdaQueryWrapper.orderByAsc(ProjectManageBusinessOther::getSort);
         return list(lambdaQueryWrapper);
     }
+
+    /**
+     * @desc 编辑删除
+     */
+    @Override
+    public void updateDataById(ProjectManageBusinessOther other, String id) {
+        projectManageBusinessOtherMapper.updateDataById(other, id);
+    }
 }

src/main/java/org/jeecg/modules/payment/service/impl/ManagerPaymentAndReceiptSlipServiceImpl.java

@@ -189,8 +189,8 @@ public class ManagerPaymentAndReceiptSlipServiceImpl extends ServiceImpl<Manager
 
         managePaymentAndReceiptContentService.update(new ManagePaymentAndReceiptContent("1"), queryWrapper);
 
-        //删除回写金额
-        deleteReWriterProArchvicePrice(contents);
+        //删除回写金额（暂不使用）
+//        deleteReWriterProArchvicePrice(contents);
     }
 
 
@@ -254,8 +254,8 @@ public class ManagerPaymentAndReceiptSlipServiceImpl extends ServiceImpl<Manager
             content.setSort(sort++);
             list.add(content);
 
-            //回写项目档案里程碑信息表的金额
-            reWriterProArchvicePrice(reqDTO, businessMap);
+            //回写项目档案里程碑信息表的金额 (暂不使用)
+//            reWriterProArchvicePrice(reqDTO, businessMap);
 
         }
         managePaymentAndReceiptContentService.saveBatch(list);