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

itc-pcitc-dependencies/itc-pcitc-dependencies-service/target/classes/META-INF/spring.factories

@@ -1,5 +0,0 @@
-# src/main/resources/META-INF/spring.factories
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-com.pictc.config.PcitcAutoConfig,\
-com.pictc.config.JdbcConfig,\
-com.pictc.config.PEventListenerConfig

itc-pcitc-dependencies/itc-pcitc-dependencies-service/target/classes/auto-scan.txt

@@ -1 +0,0 @@
-component=com.pictc

itc-pcitc-dependencies/itc-pcitc-dependencies-service/target/classes/t-banner.txt

@@ -1,9 +0,0 @@
-
- ███████    ██████  ██ ██████████   ██████ 			
-░██░░░░██  ██░░░░██░██░░░░░██░░░   ██░░░░██			
-░██   ░██ ██    ░░ ░██    ░██     ██    ░░ 			服务名称：${serverName}
-░███████ ░██       ░██    ░██    ░██       			启动环境：${profiles}
-░██░░░░  ░██       ░██    ░██    ░██       			启动耗时：${time}s
-░██      ░░██    ██░██    ░██    ░░██    ██			访问地址：${url}
-░██       ░░██████ ░██    ░██     ░░██████ 
-░░         ░░░░░░  ░░     ░░       ░░░░░░  

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

@@ -71,5 +71,5 @@ public class UpdateLngContractSalesPngPointDto implements Serializable {
     @ApiModelProperty("租户id")
     private Long tenantId;
     
-    private Boolean hasDel;
+    private Boolean hasDel = false;
 }

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

@@ -39,14 +39,16 @@ public class LngContractSalesPngPointVo {
     */
     @ApiModelProperty("计量交割点编码(通常为下载点，客户托运时为上载点)")
     private String pointDelyCode;
-    
+    private String pointDelyName;
+
     
     /**
     * 交气点编码(送达点，例如先到达计量交割点，仍要再送到交气点)
     */
     @ApiModelProperty("交气点编码(送达点，例如先到达计量交割点，仍要再送到交气点)")
     private String pointTransCode;
-    
+    private String pointTransName;
+
     
     /**
     * 自主托运(Y-是，N-否)

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

@@ -1,5 +1,7 @@
 package com.xjrsoft.module.contract.vo;
 
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
 import com.xjrsoft.module.sales.vo.LngApproVo;
 import com.xjrsoft.module.system.vo.LngFileUploadVo;
 import io.swagger.annotations.ApiModelProperty;
@@ -34,7 +36,10 @@ public class LngContractVo {
     * 合同主体ID(天然气公司/惠贸)
     */
     @ApiModelProperty("合同主体ID(天然气公司/惠贸)")
+    @Trans(type = TransType.DEPT, transToFieldName = "comName")
     private Long comId;
+
+    private String comName;
     
     
     /**
@@ -146,14 +151,18 @@ public class LngContractVo {
     * 我方联系人
     */
     @ApiModelProperty("我方联系人")
+    @Trans(type = TransType.USER, transToFieldName = "empName")
     private Long empId;
-    
+    private String empName;
+
     
     /**
     * 业务部门ID
     */
     @ApiModelProperty("业务部门ID")
+    @Trans(type = TransType.DEPT, transToFieldName = "bDeptName")
     private Long bDeptId;
+    private String bDeptName;
     
     
     /**

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractSalesController.java

@@ -80,7 +80,7 @@ public class ContractSalesController {
                 return content.getObj();
             }
         });
-        return R.ok(res.getId());
+        return R.ok(res);
     }
 
     private void execAfter(String table, Long id, String sign) {

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractMapper.java

@@ -7,9 +7,13 @@ import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.contract.dto.LngContractPageDto;
 import com.xjrsoft.module.contract.entity.LngContract;
 import com.xjrsoft.module.contract.vo.LngContractPageVo;
+import com.xjrsoft.module.contract.vo.LngContractSalesPngPointVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+
 /**
 * @title: mapper
 * @Author 管理员
@@ -36,5 +40,12 @@ public interface LngContractMapper extends MPJBaseMapper<LngContract>, BaseMappe
             "       ${ew.customSqlSegment}" +
             " GROUP BY k.id, k.k_no, k.k_name, cu.cu_sname, k.date_from, k.date_to,com.name, dd_a.name" +
             " ORDER BY k.date_from DESC, k.k_no DESC")
-    IPage<LngContractPageVo> queryPage(IPage<LngContractPageDto> page, QueryWrapper<LngContract> queryWrapper);
+    IPage<LngContractPageVo> queryPage(IPage<LngContractPageDto> page, @Param("ew") QueryWrapper<LngContract> queryWrapper);
+
+    @Select("SELECT t1.*, t2.full_name AS pointDelyName, t3.full_name AS pointTransName" +
+            "  FROM lng_contract_sales_png_point t1" +
+            "  LEFT JOIN lng_b_station_png t2 on t1.point_dely_code = t2.code" +
+            "  LEFT JOIN lng_b_station_png t3 on t1.point_trans_code = t3.code" +
+            " WHERE t1.k_id = #{kid}")
+    List<LngContractSalesPngPointVo> queryLngContractSalesPngPointList(@Param("kid") Long kid);
 }

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractSalesServiceImpl.java

@@ -73,12 +73,10 @@ public class ContractSalesServiceImpl extends MPJBaseServiceImpl<LngContractMapp
             vo.setLngContractSalesPngList(BeanUtil.copyToList(lngContractSalesPngList,
                     LngContractSalesPngVo.class));
         }
-        List<LngContractSalesPngPoint> lngContractSalesPngPointList = lngContractSalesPngPointMapper.selectList(
+        List<LngContractSalesPngPointVo> lngContractSalesPngPointVoList = this.baseMapper.
-                new LambdaQueryWrapper<LngContractSalesPngPoint>()
+                queryLngContractSalesPngPointList(lngContract.getId());
-                        .eq(LngContractSalesPngPoint::getKId, lngContract.getId()));
+        if (CollectionUtils.isNotEmpty(lngContractSalesPngPointVoList)) {
-        if (CollectionUtils.isNotEmpty(lngContractSalesPngPointList)) {
+            vo.setLngContractSalesPngPointList(lngContractSalesPngPointVoList);
-            vo.setLngContractSalesPngPointList(BeanUtil.copyToList(lngContractSalesPngPointList,
-                    LngContractSalesPngPointVo.class));
         }
         List<LngContractSalesPngQty> lngContractSalesPngQtyList = lngContractSalesPngQtyMapper.selectList(
                 new LambdaQueryWrapper<LngContractSalesPngQty>()

itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap-local.yml

@@ -2,11 +2,11 @@ spring:
   cloud:
     nacos: #nacos监控
       config:
-        server-addr: 10.10.2.101:8848 # nacos 配置中心地址
+        server-addr: 127.0.0.1:8848 # nacos 配置中心地址
         namespace: ITC-MS
         group: DNE
         username: nacos
-        password: Lng@123
+        password: nacos
         extension-configs:
           - data-id: global-local.yml
             refresh: true

itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap.yml

@@ -7,11 +7,11 @@ spring:
   main:
     allow-bean-definition-overriding: true
   profiles: 
-    active: dev
+    active: local
   cloud:
     nacos: #nacos监控
       config:
-        server-addr: 10.0.252.1:8848 # nacos 配置中心地址
+        server-addr: 10.10.2.101:8848 # nacos 配置中心地址
         namespace: ITC-MS
         group: DNE
         username: nacos