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/mdm/client/ILngStationClient.java

@@ -0,0 +1,24 @@
+package com.xjrsoft.module.mdm.client;
+
+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;
+
+/**
+ * @author: ksy
+ * @since: 2025/11/5
+ */
+@FeignClient(value = GlobalConstant.CLIENT_PCITC_MDM_NAME, path = GlobalConstant.CLIENT_API_PRE + GlobalConstant.MDM_MODULE_PREFIX + "/tran/lngStation")
+public interface ILngStationClient {
+	
+	@GetMapping("/getAllTranData")
+	Map<String,String> getAllTranData();
+	
+	@GetMapping("/getTranById")
+	String getTranById(@RequestParam("id")String id);
+	
+}

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

@@ -0,0 +1,62 @@
+package com.xjrsoft.module.mdm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+
+import com.pictc.annotations.datalog.LogField;
+import com.pictc.annotations.datalog.LogTable;
+
+
+
+
+/**
+* @title: 测试流程1
+* @Author 管理员
+* @Date: 2025-11-26
+* @Version 1.0
+*/
+@Data
+@LogTable(source="testflow_001",name="测试流程1")
+public class AddTestflow001Dto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 客户
+    */
+    @ApiModelProperty("客户")
+    @LogField(name="客户",index=0)
+    private String customer;
+    /**
+    * 客户编码
+    */
+    @ApiModelProperty("客户编码")
+    @LogField(name="客户编码",index=0)
+    private String customerCode;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    @LogField(name="名称",index=0)
+    private String name;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    @LogField(name="备注",index=0)
+    private String note;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @LogField(name="",index=0)
+    private Long tenantId;
+
+}

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

@@ -0,0 +1,56 @@
+package com.xjrsoft.module.mdm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+
+import com.pictc.annotations.datalog.LogField;
+import com.pictc.annotations.datalog.LogTable;
+
+
+
+
+/**
+* @title: 测试流程3
+* @Author 管理员
+* @Date: 2025-11-26
+* @Version 1.0
+*/
+@Data
+@LogTable(source="testflow_003",name="测试流程3")
+public class AddTestflow003Dto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    @LogField(name="名称",index=0)
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    @LogField(name="编码",index=0)
+    private String code;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    @LogField(name="备注",index=0)
+    private String note;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @LogField(name="",index=0)
+    private Long tenantId;
+
+}

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

@@ -0,0 +1,45 @@
+package com.xjrsoft.module.mdm.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+
+/**
+* @title: 分页查询入参
+* @Author 管理员
+* @Date: 2025-11-26
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class Testflow001PageDto extends PageInput {
+
+    /**
+    * 客户
+    */
+    @ApiModelProperty("客户")
+    private String customer;
+    /**
+    * 客户编码
+    */
+    @ApiModelProperty("客户编码")
+    private String customerCode;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String note;
+
+}

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

@@ -0,0 +1,40 @@
+package com.xjrsoft.module.mdm.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+
+/**
+* @title: 分页查询入参
+* @Author 管理员
+* @Date: 2025-11-26
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class Testflow003PageDto extends PageInput {
+
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String note;
+
+}

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

@@ -43,21 +43,21 @@ public class UpdateLngBPortDto implements Serializable {
     /**
     * 助记码(自动生成，4位，0001……)
     */
-    @LogField(name="助记码(自动生成，4位，0001……)",index=1)
+    @LogField(name="助记码",index=1)
     @ApiModelProperty("助记码(自动生成，4位，0001……)")
     private String code;
     
     /**
     * 名称(名称和简称都不能重复)
     */
-    @LogField(name="名称(名称和简称都不能重复)",index=2)
+    @LogField(name="名称",index=2)
     @ApiModelProperty("名称(名称和简称都不能重复)")
     private String fullName;
     
     /**
     * 简称(名称和简称都不能重复)
     */
-    @LogField(name="简称(名称和简称都不能重复)",index=3)
+    @LogField(name="简称",index=3)
     @ApiModelProperty("简称(名称和简称都不能重复)")
     private String shortName;
     
@@ -127,7 +127,7 @@ public class UpdateLngBPortDto implements Serializable {
     /**
     * 有效标志(Y-有效，N-无效)
     */
-    @LogField(name="有效标志(Y-有效，N-无效)",index=13)
+    @LogField(name="有效标志",index=13)
     @ApiModelProperty("有效标志(Y-有效，N-无效)")
     private String valid;
     
@@ -141,7 +141,7 @@ public class UpdateLngBPortDto implements Serializable {
     /**
     * 租户id
     */
-    @LogField(name="租户id",index=15)
+    @LogField(name="租户",index=15)
     @ApiModelProperty("租户id")
     private Long tenantId;
     

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

@@ -0,0 +1,79 @@
+package com.xjrsoft.module.mdm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+
+import com.pictc.annotations.datalog.LogTable;
+import com.pictc.annotations.datalog.LogField;
+import com.pictc.annotations.datalog.LogJoin;
+import com.pictc.annotations.datalog.LogJoinColumn;
+import com.pictc.annotations.datalog.JoinCaseType;
+import com.pictc.annotations.datalog.JoinType;
+import com.pictc.annotations.datalog.ValueDirectionType;
+
+
+
+
+/**
+* @title: 测试流程1
+* @Author 管理员
+* @Date: 2025-11-26
+* @Version 1.0
+*/
+@Data
+@LogTable(source="testflow_001",name="测试流程1")
+public class UpdateTestflow001Dto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @LogField(name="",index=0)
+    @ApiModelProperty("")
+    private Long id;
+    
+    /**
+    * 客户
+    */
+    @LogField(name="客户",index=1)
+    @ApiModelProperty("客户")
+    private String customer;
+    
+    /**
+    * 客户编码
+    */
+    @LogField(name="客户编码",index=2)
+    @ApiModelProperty("客户编码")
+    private String customerCode;
+    
+    /**
+    * 名称
+    */
+    @LogField(name="名称",index=3)
+    @ApiModelProperty("名称")
+    private String name;
+    
+    /**
+    * 备注
+    */
+    @LogField(name="备注",index=4)
+    @ApiModelProperty("备注")
+    private String note;
+    
+    /**
+    * 
+    */
+    @LogField(name="",index=5)
+    @ApiModelProperty("")
+    private Long tenantId;
+    
+
+}

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

@@ -0,0 +1,72 @@
+package com.xjrsoft.module.mdm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+
+import com.pictc.annotations.datalog.LogTable;
+import com.pictc.annotations.datalog.LogField;
+import com.pictc.annotations.datalog.LogJoin;
+import com.pictc.annotations.datalog.LogJoinColumn;
+import com.pictc.annotations.datalog.JoinCaseType;
+import com.pictc.annotations.datalog.JoinType;
+import com.pictc.annotations.datalog.ValueDirectionType;
+
+
+
+
+/**
+* @title: 测试流程3
+* @Author 管理员
+* @Date: 2025-11-26
+* @Version 1.0
+*/
+@Data
+@LogTable(source="testflow_003",name="测试流程3")
+public class UpdateTestflow003Dto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @LogField(name="",index=0)
+    @ApiModelProperty("")
+    private Long id;
+    
+    /**
+    * 名称
+    */
+    @LogField(name="名称",index=1)
+    @ApiModelProperty("名称")
+    private String name;
+    
+    /**
+    * 编码
+    */
+    @LogField(name="编码",index=2)
+    @ApiModelProperty("编码")
+    private String code;
+    
+    /**
+    * 备注
+    */
+    @LogField(name="备注",index=3)
+    @ApiModelProperty("备注")
+    private String note;
+    
+    /**
+    * 
+    */
+    @LogField(name="",index=4)
+    @ApiModelProperty("")
+    private Long tenantId;
+    
+
+}

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

@@ -44,6 +44,7 @@ public class LngBPngLinePageVo {
     * 自有接收站(惠州/阳江)
     */
     @ApiModelProperty("自有接收站(惠州/阳江)")
+    @Trans(type = TransType.LNG_STATION)
     private String staCodeLng;
     /**
     * 显示顺序

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

@@ -0,0 +1,48 @@
+package com.xjrsoft.module.mdm.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+/**
+* @title: 分页列表出参
+* @Author 管理员
+* @Date: 2025-11-26
+* @Version 1.0
+*/
+@Data
+public class Testflow001PageVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String id;
+    /**
+    * 客户
+    */
+    @ApiModelProperty("客户")
+    private String customer;
+    /**
+    * 客户编码
+    */
+    @ApiModelProperty("客户编码")
+    private String customerCode;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String note;
+
+}

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

@@ -0,0 +1,100 @@
+package com.xjrsoft.module.mdm.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+* @title: 表单出参
+* @Author 管理员
+* @Date: 2025-11-26
+* @Version 1.0
+*/
+@Data
+public class Testflow001Vo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+    
+    
+    /**
+    * 客户
+    */
+    @ApiModelProperty("客户")
+    private String customer;
+    
+    
+    /**
+    * 客户编码
+    */
+    @ApiModelProperty("客户编码")
+    private String customerCode;
+    
+    
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    
+    
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String note;
+    
+    
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long createUserId;
+    
+    
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private LocalDateTime createDate;
+    
+    
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long modifyUserId;
+    
+    
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private LocalDateTime modifyDate;
+    
+    
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Integer enabledMark;
+    
+    
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long tenantId;
+    
+    
+
+
+
+}

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

@@ -0,0 +1,43 @@
+package com.xjrsoft.module.mdm.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+/**
+* @title: 分页列表出参
+* @Author 管理员
+* @Date: 2025-11-26
+* @Version 1.0
+*/
+@Data
+public class Testflow003PageVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String id;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String note;
+
+}

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

@@ -0,0 +1,93 @@
+package com.xjrsoft.module.mdm.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+* @title: 表单出参
+* @Author 管理员
+* @Date: 2025-11-26
+* @Version 1.0
+*/
+@Data
+public class Testflow003Vo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+    
+    
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    
+    
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    
+    
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String note;
+    
+    
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long createUserId;
+    
+    
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private LocalDateTime createDate;
+    
+    
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long modifyUserId;
+    
+    
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private LocalDateTime modifyDate;
+    
+    
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Integer enabledMark;
+    
+    
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long tenantId;
+    
+    
+
+
+
+}

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerDto.java

@@ -226,4 +226,10 @@ public class AddLngCustomerDto implements Serializable {
     */
     @ApiModelProperty("lngCustomerContact子表")
     private List<AddLngCustomerContactDto> lngCustomerContactList;
+    
+    /**
+     * lngFileUpload
+     */
+     @ApiModelProperty("lngFileUpload子表")
+     private List<AddLngFileUploadDto> lngFileUploadList;
 }

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngFileUploadDto.java

@@ -0,0 +1,90 @@
+package com.xjrsoft.module.sales.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+
+import com.pictc.annotations.datalog.LogField;
+import com.pictc.annotations.datalog.LogTable;
+
+
+
+
+/**
+* @title: 客户
+* @Author 管理员
+* @Date: 2025-11-21
+* @Version 1.0
+*/
+@Data
+@LogTable(source="lng_file_upload",name="客户")
+public class AddLngFileUploadDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @LogField(name="",index=0)
+    private String tableName;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @LogField(name="",index=0)
+    private Long tableId;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @LogField(name="",index=0)
+    private String columnName;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @LogField(name="",index=0)
+    private String fileOrg;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @LogField(name="",index=0)
+    private String filePath;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @LogField(name="",index=0)
+    private Long fileSize;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @LogField(name="",index=0)
+    private String docDesc;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @LogField(name="",index=0)
+    private Short sort;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @LogField(name="",index=0)
+    private Long tenantId;
+    
+    @LogField(name="",index=10)
+    @ApiModelProperty("")
+    private Long xjrFileId;
+
+}

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerAttrPowerDto.java

@@ -28,7 +28,7 @@ import com.pictc.annotations.datalog.ValueDirectionType;
 * @Version 1.0
 */
 @Data
-@LogTable(source="lng_customer_attr_power",name="客户")
+@LogTable(source="lng_customer_attr_power",name="客户业务信息")
 public class UpdateLngCustomerAttrPowerDto implements Serializable {
 
     private static final long serialVersionUID = 1L;

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerBankDto.java

@@ -28,7 +28,7 @@ import com.pictc.annotations.datalog.ValueDirectionType;
 * @Version 1.0
 */
 @Data
-@LogTable(source="lng_customer_bank",name="客户")
+@LogTable(source="lng_customer_bank",name="客户银行信息")
 public class UpdateLngCustomerBankDto implements Serializable {
 
     private static final long serialVersionUID = 1L;

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerContactDto.java

@@ -28,7 +28,7 @@ import com.pictc.annotations.datalog.ValueDirectionType;
 * @Version 1.0
 */
 @Data
-@LogTable(source="lng_customer_contact",name="客户")
+@LogTable(source="lng_customer_contact",name="客户联系人信息")
 public class UpdateLngCustomerContactDto implements Serializable {
 
     private static final long serialVersionUID = 1L;

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDocDto.java

@@ -28,7 +28,7 @@ import com.pictc.annotations.datalog.ValueDirectionType;
 * @Version 1.0
 */
 @Data
-@LogTable(source="lng_customer_doc",name="客户")
+@LogTable(source="lng_customer_doc",name="客户证书信息")
 public class UpdateLngCustomerDocDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -96,5 +96,14 @@ public class UpdateLngCustomerDocDto implements Serializable {
     @ApiModelProperty("租户id")
     private Long tenantId;
     
-
+    /**
+     * lngFileUpload
+     */
+     @ApiModelProperty("lngFileUpload子表")
+     @LogJoin(name = "lngFileUpload子表",
+     columns = {
+     	@LogJoinColumn(field = "tableId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT)
+     }, 
+     caseType = JoinCaseType.FULL, target = UpdateLngFileUploadDto.class, type = JoinType.MANY)
+     private List<UpdateLngFileUploadDto> fileList;
 }

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDto.java

@@ -252,7 +252,7 @@ public class UpdateLngCustomerDto implements Serializable {
     * lngCustomerAttrPower
     */
     @ApiModelProperty("lngCustomerAttrPower子表")
-    @LogJoin(name = "lngCustomerAttrPower子表",
+    @LogJoin(name = "客户业务信息",
     columns = {
     	@LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.RIGHT)
     }, 
@@ -262,7 +262,7 @@ public class UpdateLngCustomerDto implements Serializable {
     * lngCustomerBank
     */
     @ApiModelProperty("lngCustomerBank子表")
-    @LogJoin(name = "lngCustomerBank子表",
+    @LogJoin(name = "客户银行信息",
     columns = {
     	@LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.RIGHT)
     }, 
@@ -272,7 +272,7 @@ public class UpdateLngCustomerDto implements Serializable {
     * lngCustomerDoc
     */
     @ApiModelProperty("lngCustomerDoc子表")
-    @LogJoin(name = "lngCustomerDoc子表",
+    @LogJoin(name = "客户证书信息",
     columns = {
     	@LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.RIGHT)
     }, 
@@ -282,10 +282,20 @@ public class UpdateLngCustomerDto implements Serializable {
     * lngCustomerContact
     */
     @ApiModelProperty("lngCustomerContact子表")
-    @LogJoin(name = "lngCustomerContact子表",
-    columns = {
+    @LogJoin(name = "客户联系人信息",columns = {
     	@LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.RIGHT)
     }, 
     caseType = JoinCaseType.FULL, target = UpdateLngCustomerContactDto.class, type = JoinType.MANY)
     private List<UpdateLngCustomerContactDto> lngCustomerContactList;
+    
+    /**
+     * lngFileUpload
+     */
+     @ApiModelProperty("lngFileUpload子表")
+     @LogJoin(name = "lngFileUpload子表",
+     columns = {
+     	@LogJoinColumn(field = "tableId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT)
+     }, 
+     caseType = JoinCaseType.FULL, target = UpdateLngFileUploadDto.class, type = JoinType.MANY)
+     private List<UpdateLngFileUploadDto> lngFileUploadList;
 }

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngFileUploadDto.java

@@ -0,0 +1,109 @@
+package com.xjrsoft.module.sales.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+
+import com.pictc.annotations.datalog.LogTable;
+import com.pictc.annotations.datalog.LogField;
+import com.pictc.annotations.datalog.LogJoin;
+import com.pictc.annotations.datalog.LogJoinColumn;
+import com.pictc.annotations.datalog.JoinCaseType;
+import com.pictc.annotations.datalog.JoinType;
+import com.pictc.annotations.datalog.ValueDirectionType;
+
+
+
+
+/**
+* @title: 客户
+* @Author 管理员
+* @Date: 2025-11-21
+* @Version 1.0
+*/
+@Data
+@LogTable(source="lng_file_upload",name="客户")
+public class UpdateLngFileUploadDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @LogField(name="",index=0)
+    @ApiModelProperty("")
+    private Long id;
+    
+    /**
+    * 
+    */
+    @LogField(name="",index=1)
+    @ApiModelProperty("")
+    private String tableName;
+    
+    /**
+    * 
+    */
+    @LogField(name="",index=2)
+    @ApiModelProperty("")
+    private Long tableId;
+    
+    /**
+    * 
+    */
+    @LogField(name="",index=3)
+    @ApiModelProperty("")
+    private String columnName;
+    
+    /**
+    * 
+    */
+    @LogField(name="",index=4)
+    @ApiModelProperty("")
+    private String fileOrg;
+    
+    /**
+    * 
+    */
+    @LogField(name="",index=5)
+    @ApiModelProperty("")
+    private String filePath;
+    
+    /**
+    * 
+    */
+    @LogField(name="",index=6)
+    @ApiModelProperty("")
+    private Long fileSize;
+    
+    /**
+    * 
+    */
+    @LogField(name="",index=7)
+    @ApiModelProperty("")
+    private String docDesc;
+    
+    /**
+    * 
+    */
+    @LogField(name="",index=8)
+    @ApiModelProperty("")
+    private Short sort;
+    
+    /**
+    * 
+    */
+    @LogField(name="",index=9)
+    @ApiModelProperty("")
+    private Long tenantId;
+    
+    @LogField(name="",index=10)
+    @ApiModelProperty("")
+    private Long xjrFileId;
+}

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerDocVo.java

@@ -122,7 +122,11 @@ public class LngCustomerDocVo {
     private Long ruleUserId;
     
     
-
+    /**
+     * lngFileUpload
+     */
+     @ApiModelProperty("lngFileUpload子表")
+     private List<LngFileUploadVo> fileList;
 
 
 }

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerPageVo.java

@@ -1,5 +1,8 @@
 package com.xjrsoft.module.sales.vo;
 
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -41,26 +44,34 @@ public class LngCustomerPageVo {
     * 企业性质(国有企业/非国有企业)
     */
     @ApiModelProperty("企业性质(国有企业/非国有企业)")
+    @Trans(type = TransType.DIC, id = "1990667133987635201")
     private String natureCode;
     /**
     * 客户分类(一类/二类)
     */
     @ApiModelProperty("客户分类(一类/二类)")
+    @Trans(type = TransType.DIC, id = "1990668094164484097")
     private String classCode;
     /**
     * 客户类别(电厂/工业用户/城燃/贸易商)
     */
     @ApiModelProperty("客户类别(电厂/工业用户/城燃/贸易商)")
+    @Trans(type = TransType.DIC, id = "1990668471983194113")
     private String typeCode;
     /**
     * 有效标志（不在黑名单）(Y-有效，N-无效)
     */
     @ApiModelProperty("有效标志（不在黑名单）(Y-有效，N-无效)")
+    @Trans(type = TransType.DIC, id = "1978057078528327681")
     private String valid;
     /**
     * 状态(未提交/审批中/已审批/已驳回)
     */
     @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)")
+    @Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName")
     private String approCode;
+    
+    @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)")
+    private String approName;
 
 }

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerVo.java

@@ -297,5 +297,11 @@ public class LngCustomerVo {
     */
     @ApiModelProperty("lngCustomerContact子表")
     private List<LngCustomerContactVo> lngCustomerContactList;
+    
+    /**
+     * lngFileUpload
+     */
+     @ApiModelProperty("lngFileUpload子表")
+     private List<LngFileUploadVo> lngFileUploadList;
 
 }

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngFileUploadVo.java

@@ -0,0 +1,143 @@
+package com.xjrsoft.module.sales.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.pictc.annotations.datalog.LogField;
+
+/**
+* @title: 表单出参
+* @Author 管理员
+* @Date: 2025-11-21
+* @Version 1.0
+*/
+@Data
+public class LngFileUploadVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+    
+    
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String tableName;
+    
+    
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long tableId;
+    
+    
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String columnName;
+    
+    
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String fileOrg;
+    
+    
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String filePath;
+    
+    
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long fileSize;
+    
+    
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String docDesc;
+    
+    
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Short sort;
+    
+    
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long createUserId;
+    
+    
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private LocalDateTime createDate;
+    
+    
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long modifyUserId;
+    
+    
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private LocalDateTime modifyDate;
+    
+    
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long tenantId;
+    
+    
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long deptId;
+    
+    
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long ruleUserId;
+    
+    
+    @ApiModelProperty("")
+    private String presignedUrl;
+
+    
+    @LogField(name="",index=10)
+    @ApiModelProperty("")
+    private Long xjrFileId;
+
+}