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

# Conflicts:
#	zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractApprovalReqVO.java
#	zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractDemoteSaveReqVO.java
#	zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractViewDemoteRespVO.java

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

@@ -28,5 +28,5 @@ public interface BaseApi {
 
     @GetMapping(PREFIX + "/getElementNoPage")
     @Operation(summary = "金属元素数据不分页查询")
-    CommonResult<List<ElementDTO>> getElementNoPage(ElementDTO respVO);
+    CommonResult<List<ElementDTO>> getElementNoPage();
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/api/BaseApiImpl.java

@@ -54,8 +54,8 @@ public class BaseApiImpl implements BaseApi {
         return materialOtherService.getMaterialOtherNoPage(respVO);
     }
 
-    public CommonResult<List<ElementDTO>> getElementNoPage(ElementDTO respVO) {
-        List<ElementDO> list = elementService.getElementNoPage(respVO);
+    public CommonResult<List<ElementDTO>> getElementNoPage() {
+        List<ElementDO> list = elementService.getElementNoPage();
         return success(BeanUtils.toBean(list, ElementDTO.class));
     }
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ElementMapper.java

@@ -31,13 +31,8 @@ public interface ElementMapper extends BaseMapperX<ElementDO> {
 
     String selectMaxCode();
 
-    default List<ElementDO> getElementNoPage(ElementDTO dto) {
+    default List<ElementDO> getElementNoPage() {
         return selectList(new LambdaQueryWrapperX<ElementDO>()
-                .eqIfPresent(ElementDO::getAbbreviation, dto.getAbbreviation())
-                .likeIfPresent(ElementDO::getName, dto.getName())
-                .eqIfPresent(ElementDO::getDecimalValue, dto.getDecimalValue())
-                .eqIfPresent(ElementDO::getCoding, dto.getCoding())
-                .eqIfPresent(ElementDO::getGradeUnit, dto.getGradeUnit())
                 .orderByDesc(ElementDO::getId));
     }
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementService.java

@@ -64,5 +64,5 @@ public interface ElementService {
 
     void enableElementList(List<ElementRespVO> saveReqVOS);
 
-    List<ElementDO> getElementNoPage(ElementDTO respVO);
+    List<ElementDO> getElementNoPage();
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementServiceImpl.java

@@ -109,8 +109,8 @@ public class ElementServiceImpl implements ElementService {
     }
 
     @Override
-    public List<ElementDO> getElementNoPage(ElementDTO respVO) {
-        return elementMapper.getElementNoPage(respVO);
+    public List<ElementDO> getElementNoPage() {
+        return elementMapper.getElementNoPage();
     }
 
 }

zt-module-contract-order/zt-module-contract-order-api/pom.xml

@@ -41,6 +41,12 @@
             <artifactId>spring-cloud-starter-openfeign</artifactId>
             <optional>true</optional>
         </dependency>
+
+        <dependency>
+            <groupId>com.zt.plat</groupId>
+            <artifactId>zt-module-base-server</artifactId>
+            <version>${revision}</version>
+        </dependency>
     </dependencies>
 
 </project>

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/ContractApi.java

@@ -4,9 +4,11 @@ package com.zt.plat.module.contractorder.api;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.module.contractorder.api.dto.PurchaseOrderWithDetailsDTO;
 import com.zt.plat.module.contractorder.api.dto.contract.ContractRespDTO;
+import com.zt.plat.module.contractorder.api.vo.contract.ContractSaveReqVO;
 import com.zt.plat.module.contractorder.enums.ApiConstants;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -31,4 +33,8 @@ public interface ContractApi {
     @PostMapping(PREFIX + "/order-by-order-no")
     @Operation(summary = "更新订单状态", description = "通过订单编号获取订单信息")
     CommonResult<List<PurchaseOrderWithDetailsDTO>> getOrderByOrderNo(@RequestBody List<String> orderNoS);
+
+    @PostMapping(PREFIX + "/create")
+    @Operation(summary = "创建合同")
+    CommonResult<Boolean> create(@Valid @RequestBody ContractSaveReqVO reqVO);
 }

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/PurchaseOrderWithDetailsDTO.java

@@ -1,6 +1,5 @@
 package com.zt.plat.module.contractorder.api.dto;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ApprovalReqVO.java

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/CoefficientRespVO.java

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+package com.zt.plat.module.contractorder.api.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;