Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactPageVo.java

@@ -96,7 +96,7 @@ public class LngContractFactPageVo extends BaseModel {
     * 币种编码
     */
     @ApiModelProperty("币种编码")
-    @Trans(type = TransType.API, id = "93d735dcb7364a0f8102188ec4d77ac7", transToFieldName = "curName")
+    @Trans(type = TransType.CURRENCY, transToFieldName = "curName")
     private String curCode;
     private String curName;
     /**

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactVo.java

@@ -109,7 +109,9 @@ public class LngContractFactVo {
     * 币种编码
     */
     @ApiModelProperty("币种编码")
+    @Trans(type = TransType.CURRENCY, transToFieldName = "curName")
     private String curCode;
+    private String curName;
     
     
     /**

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurVo.java

@@ -132,8 +132,9 @@ public class LngContractPurVo extends com.xjrsoft.common.model.base.BaseModel{
     * 币种
     */
     @ApiModelProperty("币种")
+    @Trans(type = TransType.CURRENCY, transToFieldName = "curName")
     private String curCode;
-    
+    private String curName;
     
     /**
     * 合同金额

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractVo.java

@@ -137,8 +137,9 @@ public class LngContractVo {
     * 币种
     */
     @ApiModelProperty("币种")
+    @Trans(type = TransType.CURRENCY, transToFieldName = "curName")
     private String curCode;
-    
+    private String curName;
     
     /**
     * 合同金额

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngDemandDto.java

@@ -49,7 +49,7 @@ public class UpdateLngPngDemandDto implements Serializable {
     */
     @LogField(name="版本号",index=2)
     @ApiModelProperty("版本号(初始为1，变更时+1)")
-    private Byte verNo;
+    private Byte verNo = 1;
     
     /**
     * 最新版本标识(Y-是，N-否；版本1主键相同的记录中只有一个Y；版本变更时将版本1主键相同的其他记录置为N)

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/client/ICurrencyClient.java

@@ -0,0 +1,27 @@
+package com.xjrsoft.module.mdm.client;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.xjrsoft.common.constant.GlobalConstant;
+import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto;
+
+/**
+ * @author: ksy
+ * @since: 2025/11/5
+ */
+@FeignClient(value = GlobalConstant.CLIENT_PCITC_MDM_NAME, path = GlobalConstant.CLIENT_API_PRE + GlobalConstant.MDM_MODULE_PREFIX + "/tran/currency")
+public interface ICurrencyClient {
+	
+	@GetMapping("/getAllTranData")
+	Map<String,String> getAllTranData();
+	
+	@GetMapping("/getTranById")
+	String getTranById(@RequestParam("id")String id);
+
+	
+}