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

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TemplateInstanceController.java

@@ -147,7 +147,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     //模版实例发布
     @PostMapping("/publish-batch")
     @Operation(summary = "模版实例发布")
-    @PreAuthorize("@ss.hasPermission('base:template-instance:publish')")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:update')")
     public CommonResult<Boolean> publishTemplateInstance(@Valid @RequestBody List<PublishTemplateInstanceReqVO> publishReqVOS) {
         templateInstanceService.publishTemplateInstance(publishReqVOS);
         return success(true);
@@ -172,7 +172,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     //停用和启用接口
     @PostMapping("/disable-enable")
     @Operation(summary = "实例停用和启用接口", description = "实例停用和启用接口")
-    @PreAuthorize("@ss.hasPermission('base:template-instance:disable-enable')")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:update')")
     public CommonResult<Boolean> setDisableOrEnable(@Valid @RequestBody DisableEnableReqVO reqVO) {
         templateInstanceService.setDisableOrEnable(reqVO);
         return success(true);
@@ -181,6 +181,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     //根据id获取实例版本号
     @GetMapping("/get-version")
     @Operation(summary = "根据id获取实例版本号")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:query')")
     public CommonResult<Map<String, Object>> getVersion(@Valid @NotEmpty(message = "模版实例id不能为空") @RequestParam("id") String id) {
         return success(templateInstanceService.getVersion(id));
     }
@@ -188,7 +189,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     //创建版本
     @PostMapping("/create-version")
     @Operation(summary = "创建版本")
-    @PreAuthorize("@ss.hasPermission('base:template-instance:create-version')")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:create')")
     public CommonResult<TemplateInstanceRespVO> createVersion(@Valid @NotEmpty(message = "模版实例id不能为空") String id) {
         return success(templateInstanceService.createVersion(id));
     }
@@ -196,6 +197,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     //通过模版编码查看历史版本
     @GetMapping("/list-by-template-cdg")
     @Operation(summary = "通过模版编码(cdg)查看历史版本", description = "通过模版编码查看历史版本,已按照发布时间和创建时间降序排序")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:query')")
     public CommonResult<List<TemplateInstanceRespVO>> listByTemplateCode(@RequestParam("cdg") @Valid @NotEmpty(message = "模版编号不能为空") String templateCode) {
         return success(templateInstanceService.listByCdg(templateCode));
     }
@@ -203,6 +205,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     //通过实例id获取字段和条款详情
     @GetMapping("/field-and-clause-detail")
     @Operation(summary = "通过实例id获取字段和条款详情")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:query')")
     public CommonResult<FieldAndClauseRespVO> getFieldAndClauseDetail(@Valid @NotEmpty(message = "模版实例id不能为空") @RequestParam("id") String id) {
         return success(templateInstanceService.getFieldAndClauseDetail(id));
     }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplItmController.java

@@ -37,6 +37,7 @@ public class TmplItmController {
 
     @PostMapping("/create")
     @Operation(summary = "创建模板条款")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-ltm:create')")
     public CommonResult<TmplItmRespVO> createTmplItm(@Valid @RequestBody TmplItmSaveReqVO createReqVO) {
         TmplItmRespVO tmplItm = tmplItmService.createTmplItm(createReqVO);
         return success(tmplItm);
@@ -44,6 +45,7 @@ public class TmplItmController {
 
     @PutMapping("/update")
     @Operation(summary = "更新模板条款")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-ltm:update')")
     public CommonResult<Boolean> updateTmplItm(@Valid @RequestBody TmplItmSaveReqVO updateReqVO) {
         tmplItmService.updateTmplItm(updateReqVO);
         return success(true);
@@ -51,17 +53,20 @@ public class TmplItmController {
 
     @DeleteMapping("/delete")
     @Operation(summary = "删除模板条款", description = "")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-ltm:delete')")
     public CommonResult<Boolean> deleteTmplItm(@RequestBody BatchDeleteReqVO req) {
         return success(tmplItmService.deleteTmplItm(req.getIds()));
     }
 
     @GetMapping("/id")
     @Operation(summary = "根据id获得模板条款")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-ltm:query')")
     public CommonResult<TmplItmRespVO> getTmplItm(@RequestBody String id) {
         return success(BeanUtils.toBean(tmplItmService.getById(id), TmplItmRespVO.class));
     }
 
     @GetMapping("/list")
+    @Operation(summary = "获得模板条款")
     public CommonResult<List<TmplItmRespVO>> listTmplItm(Map<String, Object> params) {
         // 创建查询条件构造器
         QueryWrapper<TmplItmDO> queryWrapper = new QueryWrapper<>();
@@ -86,6 +91,7 @@ public class TmplItmController {
 
     @GetMapping("/page")
     @Operation(summary = "分页获得模板条款")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-ltm:query')")
     public CommonResult<PageResult<TmplItmRespVO>> pageTmplItm(@Validated TmpItmPageReqVO pageReqVO) {
         PageResult<TmplItmDO> pageResult = tmplItmService.pageTmplItm(pageReqVO);
         return success(BeanUtils.toBean(pageResult, TmplItmRespVO.class));

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplTpController.java

@@ -124,6 +124,7 @@ public class TmplTpController extends AbstractFileUploadController implements Bu
     //获取分类树
     @GetMapping("/tree")
     @Operation(summary = "获得分类树--上级")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-tp:query')")
     public CommonResult<List<TmplTpTreeVO>> getTree(@RequestParam(value = "num",required = false) String num,@RequestParam(value = "name",required = false) String name) {
         List<TmplTpTreeVO> tree = tmplTpService.buildTree(num,name);
         return success(tree);

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplTpFldController.java

@@ -34,7 +34,7 @@ public class TmplTpFldController {
     private final TmplTpFldService tmplTpFldService;
     @PostMapping("/create")
     @Operation(summary = "创建模板字段")
-//    @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:create')")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:create')")
     public CommonResult<TmplFldRespVO> createTmplFld(@Valid @RequestBody TmplTpFldSaveReqVO tmplTpFldSaveReqVO) {
         return success(tmplTpFldService.createTmplFld(tmplTpFldSaveReqVO));
     }
@@ -55,14 +55,14 @@ public class TmplTpFldController {
     }
     @GetMapping("/page")
     @Operation(summary = "获得模板字段列表")
-    @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:list')")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:query')")
     public CommonResult<PageResult<TmplFldRespVO>> getTmplTpList( @Valid TmplFldPageReqVO pageReqVO) {
         PageResult<TmplTpFldDO> pageResult = tmplTpFldService.tmplTpFldPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, TmplFldRespVO.class));
     }
     @GetMapping("/class-fld")
     @Operation(summary = "获得类固定模板字段列表", description = "clazz为VO类类名")
-    @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:list')")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:query')")
     public CommonResult<List<Map<String, Object>>> getTmplTpListByClass(String clazz) {
         return success(tmplTpFldService.getTmplTpListByClass(clazz));
     }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PrchOrdDtlController.java

@@ -46,14 +46,14 @@ public class PrchOrdDtlController implements BusinessControllerMarker {
 
     @PostMapping("/create")
     @Operation(summary = "创建采购订单明细")
-    @PreAuthorize("@ss.hasPermission('bse:prch-ord-dtl:create')")
+    @PreAuthorize("@ss.hasPermission('base:prch-ord-dtl:create')")
     public CommonResult<PrchOrdDtlRespVO> createPrchOrdDtl(@Valid @RequestBody PrchOrdDtlSaveReqVO createReqVO) {
         return success(prchOrdDtlService.createPrchOrdDtl(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新采购订单明细")
-    @PreAuthorize("@ss.hasPermission('bse:prch-ord-dtl:update')")
+    @PreAuthorize("@ss.hasPermission('base:prch-ord-dtl:update')")
     public CommonResult<Boolean> updatePrchOrdDtl(@Valid @RequestBody PrchOrdDtlSaveReqVO updateReqVO) {
         prchOrdDtlService.updatePrchOrdDtl(updateReqVO);
         return success(true);
@@ -62,7 +62,7 @@ public class PrchOrdDtlController implements BusinessControllerMarker {
     @DeleteMapping("/delete")
     @Operation(summary = "删除采购订单明细")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('bse:prch-ord-dtl:delete')")
+    @PreAuthorize("@ss.hasPermission('base:prch-ord-dtl:delete')")
     public CommonResult<Boolean> deletePrchOrdDtl(@RequestParam("id") Long id) {
         prchOrdDtlService.deletePrchOrdDtl(id);
         return success(true);
@@ -71,7 +71,7 @@ public class PrchOrdDtlController implements BusinessControllerMarker {
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除采购订单明细")
-                @PreAuthorize("@ss.hasPermission('bse:prch-ord-dtl:delete')")
+                @PreAuthorize("@ss.hasPermission('base:prch-ord-dtl:delete')")
     public CommonResult<Boolean> deletePrchOrdDtlList(@RequestBody BatchDeleteReqVO req) {
         prchOrdDtlService.deletePrchOrdDtlListByIds(req.getIds());
         return success(true);
@@ -80,7 +80,7 @@ public class PrchOrdDtlController implements BusinessControllerMarker {
     @GetMapping("/get")
     @Operation(summary = "获得采购订单明细")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('bse:prch-ord-dtl:query')")
+    @PreAuthorize("@ss.hasPermission('base:prch-ord-dtl:query')")
     public CommonResult<PrchOrdDtlRespVO> getPrchOrdDtl(@RequestParam("id") Long id) {
         PrchOrdDtlDO prchOrdDtl = prchOrdDtlService.getPrchOrdDtl(id);
         return success(BeanUtils.toBean(prchOrdDtl, PrchOrdDtlRespVO.class));
@@ -88,7 +88,7 @@ public class PrchOrdDtlController implements BusinessControllerMarker {
 
     @GetMapping("/page")
     @Operation(summary = "获得采购订单明细分页")
-    @PreAuthorize("@ss.hasPermission('bse:prch-ord-dtl:query')")
+    @PreAuthorize("@ss.hasPermission('base:prch-ord-dtl:query')")
     public CommonResult<PageResult<PrchOrdDtlRespVO>> getPrchOrdDtlPage(@Valid PrchOrdDtlPageReqVO pageReqVO) {
         PageResult<PrchOrdDtlDO> pageResult = prchOrdDtlService.getPrchOrdDtlPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, PrchOrdDtlRespVO.class));
@@ -96,7 +96,7 @@ public class PrchOrdDtlController implements BusinessControllerMarker {
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出采购订单明细 Excel")
-    @PreAuthorize("@ss.hasPermission('bse:prch-ord-dtl:export')")
+    @PreAuthorize("@ss.hasPermission('base:prch-ord-dtl:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportPrchOrdDtlExcel(@Valid PrchOrdDtlPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/SalesOrderController.java

@@ -143,6 +143,7 @@ public class SalesOrderController implements BusinessControllerMarker {
     //推送erp091
     @PostMapping("/push-erp091")
     @Operation(summary = "推送erp091")
+    @PreAuthorize("@ss.hasPermission('base:purchase-order:update')")
     public CommonResult<Boolean> pushErp091(@RequestBody @Validated @NotEmpty(message = "销售订单id不能为空") List<String> ids) {
         ids.forEach(id -> salesOrderService.pushErp091(id));
         return success(true);
@@ -151,13 +152,14 @@ public class SalesOrderController implements BusinessControllerMarker {
     //提交审批
     @PostMapping("/submit-order")
     @Operation(summary = "提交审批")
+    @PreAuthorize("@ss.hasPermission('base:purchase-order:update')")
     public CommonResult<String> submitOrder(@RequestParam("id") String id) {
         return success(salesOrderService.submitOrder(id));
     }
 
     @PostMapping("/submit-order-batch")
     @Operation(summary = "批量提交订单审核")
-    @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')")
+    @PreAuthorize("@ss.hasPermission('base:purchase-order:update')")
     public CommonResult<Boolean> submitOrder(@RequestBody @Validated @NotEmpty(message = "销售订单id不能为空") List<String> ids) {
         System.out.println("ids:" + ids);
         ids.forEach(id -> salesOrderService.submitOrder(id));
@@ -167,6 +169,7 @@ public class SalesOrderController implements BusinessControllerMarker {
     //提交审批
     @PostMapping("/order-pass-reject")
     @Operation(summary = "订单审核")
+    @PreAuthorize("@ss.hasPermission('base:purchase-order:update')")
     public CommonResult<Boolean> orderPassReject(@RequestBody SalesOrderReviewReqVO reqVO) {
         return success(salesOrderService.orderPassReject(reqVO));
     }
@@ -174,6 +177,7 @@ public class SalesOrderController implements BusinessControllerMarker {
     //关联订单
     @PostMapping("/link-order")
     @Operation(summary = "关联订单")
+    @PreAuthorize("@ss.hasPermission('base:purchase-order:update')")
     public CommonResult<Boolean> linkOrder(@RequestBody @Validated LinkOrderReqVO req) {
         return success(salesOrderService.linkOrder(req));
     }
@@ -181,6 +185,7 @@ public class SalesOrderController implements BusinessControllerMarker {
     //根据订单id和方式获取上或下游订单
     @PostMapping("/order-by-order-id-and-type")
     @Operation(summary = "根据订单id和方式获取上或下游订单")
+    @PreAuthorize("@ss.hasPermission('base:purchase-order:query')")
     public CommonResult<List<DownOrUpOrderRespVO>> getOrderByOrderIdAndType(@RequestBody DownOrUpOrderReqVO reqVO) {
         return success(salesOrderService.getOrderByOrderIdAndType(reqVO));
     }
@@ -188,12 +193,14 @@ public class SalesOrderController implements BusinessControllerMarker {
 
     @PostMapping("/bound-order")
     @Operation(summary = "获取已绑定的订单")
+    @PreAuthorize("@ss.hasPermission('base:purchase-order:query')")
     public CommonResult<List<PurchaseOrderRespVO>> boundOrder(@RequestBody DownOrUpOrderReqVO reqVO) {
         return success(salesOrderService.getBindOrderByOrder(reqVO));
     }
 
     @PutMapping("/update-order-status")
     @Operation(summary = "批量修改订单状态", description = "sts取值于字典名称'销售订单状态',字典类型'PRCH_ORD_STS' 可以根据订单号和订单id修改")
+    @PreAuthorize("@ss.hasPermission('base:purchase-order:update')")
     public CommonResult<Boolean> updateOrderStatus(@RequestBody @Validated OrderStsReqVO req) {
         salesOrderService.updateOrderStatusByIdOrOrderNo(req);
         return success(true);

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java

@@ -1191,11 +1191,11 @@ public class ContractServiceImpl implements ContractService {
         if (StringUtils.isNotEmpty(queryReqVO.getContractName())
                 || StringUtils.isNotEmpty(queryReqVO.getContractPaperNumber())) {
             contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber());
-        }
 
-        // 未查询到相关合同
+            // 未查询到相关合同
-        if (CollectionUtils.isEmpty(contractIds)) {
+            if (CollectionUtils.isEmpty(contractIds)) {
-            return new PageResult<>();
+                return new PageResult<>();
+            }
         }
 
         // 分页查询
@@ -1218,11 +1218,11 @@ public class ContractServiceImpl implements ContractService {
         List<Long> contractIds = new ArrayList<>();
         if (StringUtils.isNotEmpty(queryReqVO.getContractName()) || StringUtils.isNotEmpty(queryReqVO.getContractPaperNumber())) {
             contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber());
-        }
 
-        // 未查询到相关合同
+            // 未查询到相关合同
-        if (CollectionUtils.isEmpty(contractIds)) {
+            if (CollectionUtils.isEmpty(contractIds)) {
-            return new PageResult<>();
+                return new PageResult<>();
+            }
         }
 
         // 分页查询
@@ -1245,11 +1245,11 @@ public class ContractServiceImpl implements ContractService {
         List<Long> contractIds = new ArrayList<>();
         if (StringUtils.isNotEmpty(queryReqVO.getContractName()) || StringUtils.isNotEmpty(queryReqVO.getContractPaperNumber())) {
             contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber());
-        }
 
-        // 未查询到相关合同
+            // 未查询到相关合同
-        if (CollectionUtils.isEmpty(contractIds)) {
+            if (CollectionUtils.isEmpty(contractIds)) {
-            return new PageResult<>();
+                return new PageResult<>();
+            }
         }
 
         // 分页查询

zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpBillMainApi.java

@@ -1,5 +1,6 @@
 package com.zt.plat.module.erp.api;
 
+import com.zt.plat.module.erp.api.dto.BillMainSubmitErpReqDTO;
 import com.zt.plat.module.erp.api.dto.ErpBillMainSaveReqDTO;
 import com.zt.plat.module.erp.enums.ApiConstants;
 import io.swagger.v3.oas.annotations.Operation;
@@ -21,4 +22,8 @@ public interface ErpBillMainApi {
     @PostMapping(PREFIX + "/submit-bill-main-reverse")
     @Operation(summary = "冲销")
     String submitBillMainReverseToErp(@Valid @RequestBody ErpBillMainSaveReqDTO reqDTO);
+
+    @PostMapping(PREFIX + "/submit/erp")
+    @Operation(summary = "erp数据提交")
+    String submitErp(@Valid @RequestBody BillMainSubmitErpReqDTO reqDTO);
 }