Merge branch 'refs/heads/dev' into test

base-server/pom.xml

@@ -40,7 +40,11 @@
             <artifactId>zt-module-erp-server</artifactId>
             <version>${revision}</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.zt.plat</groupId>
+            <artifactId>zt-module-unit-management-server</artifactId>
+            <version>${revision}</version>
+        </dependency>
         <!-- Web 相关 -->
         <dependency>
             <groupId>com.zt.plat</groupId>

pom.xml

@@ -12,6 +12,7 @@
         <module>zt-module-contract-order</module>
         <module>zt-module-erp</module>
         <module>base-server</module>
+        <module>zt-module-unit-management</module>
     </modules>
 
     <name>${project.artifactId}</name>

zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/enums/ErrorCodeConstants.java

@@ -19,6 +19,7 @@ public interface ErrorCodeConstants {
     ErrorCode COMPANY_RELATIVITY_NOT_EXISTS = new ErrorCode(1_001_000_001, "示例不存在");
     ErrorCode WAREHOUSE_NOT_EXISTS = new ErrorCode(1_001_000_001, "示例不存在");
     ErrorCode FACTORY_NOT_EXISTS = new ErrorCode(1_001_000_001, "示例不存在");
+    ErrorCode TAX_NOT_EXISTS = new ErrorCode(1_001_000_001, "示例不存在");
 
 
     ErrorCode BUSINESS_RULE_NOT_EXISTS = new ErrorCode(1_027_100_001, "规则模型不存在");

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/TaxPageReqVO.java

@@ -0,0 +1,45 @@
+package com.zt.plat.module.base.controller.admin.base.vo;
+
+import com.zt.plat.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 税码信息分页 Request VO")
+@Data
+public class TaxPageReqVO extends PageParam {
+
+    @Schema(description = "类型(字典: SPLY_BSN_TP)", example = "2")
+    private String type;
+
+    @Schema(description = "类别")
+    private String category;
+
+    @Schema(description = "税码")
+    private String taxCoding;
+
+    @Schema(description = "税码描述")
+    private String remark;
+
+    @Schema(description = "税率")
+    private BigDecimal tax;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "是否启用")
+    private String isEnable;
+
+    @Schema(description = "公司编码")
+    private String customerNumber;
+
+    @Schema(description = "公司名称", example = "王五")
+    private String customerName;
+
+}

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/TaxRespVO.java

@@ -0,0 +1,56 @@
+package com.zt.plat.module.base.controller.admin.base.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 税码信息 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class TaxRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "26656")
+    @ExcelProperty("主键")
+    private Long id;
+
+    @Schema(description = "类型(字典: SPLY_BSN_TP)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty("类型(字典: SPLY_BSN_TP)")
+    private String type;
+
+    @Schema(description = "类别", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("类别")
+    private String category;
+
+    @Schema(description = "税码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("税码")
+    private String taxCoding;
+
+    @Schema(description = "税码描述")
+    @ExcelProperty("税码描述")
+    private String remark;
+
+    @Schema(description = "税率")
+    @ExcelProperty("税率")
+    private BigDecimal tax;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "是否启用")
+    @ExcelProperty("是否启用")
+    private String isEnable;
+
+    @Schema(description = "公司编码")
+    @ExcelProperty("公司编码")
+    private String customerNumber;
+
+    @Schema(description = "公司名称", example = "王五")
+    @ExcelProperty("公司名称")
+    private String customerName;
+
+}

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/TaxSaveReqVO.java

@@ -0,0 +1,43 @@
+package com.zt.plat.module.base.controller.admin.base.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Schema(description = "管理后台 - 税码信息新增/修改 Request VO")
+@Data
+public class TaxSaveReqVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "26656")
+    private Long id;
+
+    @Schema(description = "类型(字典: SPLY_BSN_TP)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotEmpty(message = "类型(字典: SPLY_BSN_TP)不能为空")
+    private String type;
+
+    @Schema(description = "类别", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "类别不能为空")
+    private String category;
+
+    @Schema(description = "税码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "税码不能为空")
+    private String taxCoding;
+
+    @Schema(description = "税码描述")
+    private String remark;
+
+    @Schema(description = "税率")
+    private BigDecimal tax;
+
+    @Schema(description = "是否启用")
+    private String isEnable;
+
+    @Schema(description = "公司编码")
+    private String customerNumber;
+
+    @Schema(description = "公司名称", example = "王五")
+    private String customerName;
+
+}

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

@@ -39,4 +39,19 @@ public class OnlyOfficeCallbackController {
         response.put("error", 0);
         return new ResponseEntity<>(response, HttpStatus.OK);
     }
+
+    /**
+     * 处理OnlyOffice文档编辑服务发送的回调
+     */
+    @PostMapping("/contract /callback/{id}")
+    @PermitAll
+    @TenantIgnore
+    public ResponseEntity<Map<String, Integer>> handleContractCallback(@RequestBody OnlyOfficeCallback callback, @PathVariable String id,@RequestParam("fileName") String fileName) {
+        // 处理回调逻辑
+        callbackService.processContractCallback(callback,id,fileName);
+        // 返回必须的响应，否则OnlyOffice会显示错误
+        Map<String, Integer> response = new HashMap<>();
+        response.put("error", 0);
+        return new ResponseEntity<>(response, HttpStatus.OK);
+    }
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/onlyoffice/service/OnlyOfficeCallbackService.java

@@ -9,4 +9,11 @@ public interface OnlyOfficeCallbackService {
      * @param callback 回调数据
      */
     void processCallback(OnlyOfficeCallback callback,String id,String fileName);
+
+
+    /**
+     * 处理OnlyOffice回调
+     * @param callback 回调数据
+     */
+    void processContractCallback(OnlyOfficeCallback callback,String id,String fileName);
 }