wks пре 2 година
родитељ
комит
7d5eac7ace

+ 1 - 5
src/main/java/com/ydtech/modules/protocol/controller/PtlAgreementDispositionController.java

@@ -30,12 +30,8 @@ public class PtlAgreementDispositionController {
     @PostMapping("/disposition")
     @ApiOperation("配置协议信息")
     public HttpResult<PageResult<PtlAgreement>> disposition(@RequestBody PltAgreementDeptDispositionVo pltAgreementDeptDispositionVo) {
-        ptlAgreementDeptService.disposition(pltAgreementDeptDispositionVo);
+        ptlAgreementDeptService.disposition(pltAgreementDeptDispositionVo.getAgreementId(), pltAgreementDeptDispositionVo.getDept());
         return HttpResult.ok();
     }
 
-
-
-
-
 }

+ 3 - 3
src/main/java/com/ydtech/modules/protocol/entity/vo/PltAgreementDeptDispositionVo.java

@@ -17,9 +17,9 @@ import java.util.List;
 public class PltAgreementDeptDispositionVo {
 
     @ApiModelProperty("机构id")
-    private String deptId;
+    private String agreementId;
 
-    @ApiModelProperty("协议id")
-    private List<String> agreementId;
+    @ApiModelProperty("机构")
+    private List<String> dept;
 
 }

+ 9 - 2
src/main/java/com/ydtech/modules/protocol/service/PtlAgreementDeptService.java

@@ -3,6 +3,7 @@ package com.ydtech.modules.protocol.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.protocol.entity.po.PtlAgreementDept;
 import com.ydtech.modules.protocol.entity.vo.PltAgreementDeptDispositionVo;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -44,8 +45,14 @@ public interface PtlAgreementDeptService extends IService<PtlAgreementDept> {
 
     /**
      * 团队批量配置协议信息
-     * @param pltAgreementDeptDispositionVo 配置信息
+     *
+     * @param agreementId 协议id
+     * @param dept        部门
      */
-    void disposition(PltAgreementDeptDispositionVo pltAgreementDeptDispositionVo);
+    @Transactional
+    default void disposition(String agreementId, List<String> dept) {
+        deleteByAgreementId(agreementId);
+        saveBatchDept(agreementId, dept);
+    }
 
 }

+ 6 - 7
src/main/java/com/ydtech/modules/protocol/service/impl/PtlAgreementDeptServiceImpl.java

@@ -7,10 +7,12 @@ import com.ydtech.modules.protocol.dao.PtlAgreementDeptMapper;
 import com.ydtech.modules.protocol.entity.po.PtlAgreementDept;
 import com.ydtech.modules.protocol.entity.vo.PltAgreementDeptDispositionVo;
 import com.ydtech.modules.protocol.service.PtlAgreementDeptService;
+import com.ydtech.modules.protocol.utils.AssertionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author wenks
@@ -25,7 +27,8 @@ public class PtlAgreementDeptServiceImpl extends ServiceImpl<PtlAgreementDeptMap
     @Transactional
     public void saveBatchDept(String agreementId, List<String> dept) {
         List<PtlAgreementDept> ptlAgreementDeptList = PtlAgreementDept.toPtlAgreementDeptList(agreementId, dept);
-        saveBatch(ptlAgreementDeptList);
+        boolean b = saveBatch(ptlAgreementDeptList);
+        AssertionUtils.isSucceed(b, "协议机构添加失败");
     }
 
     @Override
@@ -35,7 +38,8 @@ public class PtlAgreementDeptServiceImpl extends ServiceImpl<PtlAgreementDeptMap
 
     @Override
     public void deleteByAgreementId(String agreementId) {
-        remove(byAgreementId(agreementId));
+        boolean remove = remove(byAgreementId(agreementId));
+        AssertionUtils.isSucceed(remove, "协议机构删除失败");
     }
 
     @Override
@@ -52,11 +56,6 @@ public class PtlAgreementDeptServiceImpl extends ServiceImpl<PtlAgreementDeptMap
         return lambdaQueryWrapper;
     }
 
-    @Override
-    public void disposition(PltAgreementDeptDispositionVo pltAgreementDeptDispositionVo) {
-        String deptId = pltAgreementDeptDispositionVo.getDeptId();
-        PtlAgreementDept ptlAgreementDept = new PtlAgreementDept();
-    }
 }