Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/protocol/controller/PtlAgreementController.java

@@ -111,6 +111,23 @@ public class PtlAgreementController extends BaseController {
         return HttpResult.ok("批量修改协议成功");
     }
 
+    @PostMapping("/batchAuditType")
+    @ApiOperation("批量修改协议是否启用状态")
+    public HttpResult<Object> batchAuditType(@RequestBody PltAgreementBatchVo pltAgreementBatchVo) {
+        List<PtlAgreement> ptlAgreements = new ArrayList<>();
+        for (String agreementId : pltAgreementBatchVo.getAgreementIds()) {
+            PtlAgreement ptlAgreement = new PtlAgreement();
+            ptlAgreement.setId(agreementId);
+            ptlAgreement.setAuditType(pltAgreementBatchVo.getAuditType());
+            ptlAgreements.add(ptlAgreement);
+        }
+        boolean b = ptlAgreementService.updateBatchById(ptlAgreements);
+        AssertionUtils.isSucceed(b, "批量修改协议失败");
+        return HttpResult.ok("批量修改协议成功");
+    }
+
+
+
     @GetMapping("/{agreementId}")
     @ApiOperation("通过协议id查询所有信息")
     public HttpResult<PtlAgreementQueryVo> getByAgreementId(@PathVariable String agreementId) {

src/main/java/com/ydtech/modules/protocol/entity/vo/PltAgreementBatchVo.java

@@ -13,4 +13,7 @@ public class PltAgreementBatchVo {
         @ApiModelProperty("启用/禁用")
         private String validStatus;
 
+        @ApiModelProperty("审核方式")
+        private Integer auditType;
+
 }

src/main/java/com/ydtech/modules/protocol/entity/vo/PtlAgreementPageVo.java

@@ -71,4 +71,7 @@ public class PtlAgreementPageVo extends PageRequest {
     @ApiModelProperty("外部订单")
     private Integer IsExternal;
 
+    @ApiModelProperty("审核方式")
+    private Integer auditType;
+
 }

src/main/java/com/ydtech/modules/protocol/service/impl/PtlAgreementServiceImpl.java

@@ -448,7 +448,10 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
                         ptlAgreementPageVo.getAgreementEndDate())
                 // 外部订单
                 .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getIsExternal()), PtlAgreement::getIsExternal,
-                        ptlAgreementPageVo.getIsExternal());
+                        ptlAgreementPageVo.getIsExternal())
+                // 审核方式
+                .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getAuditType()), PtlAgreement::getAuditType,
+                        ptlAgreementPageVo.getAuditType());
         // 录入时间
         if (!ObjectUtils.isEmpty(ptlAgreementPageVo.getStartDate()) && !ObjectUtils.isEmpty(ptlAgreementPageVo.getEndDate())) {
             LocalDateTime startDateTime = ptlAgreementPageVo.getStartDate().atTime(LocalTime.MIN);