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

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectEntity.java

@@ -17,6 +17,7 @@
 
 package com.epmet.dataaggre.entity.epmettduck;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -51,6 +52,7 @@ public class PrUserProjectEntity extends BaseEpmetEntity {
     /**
      * 项目code
      */
+    @TableField("`key`")
 	private String key;
 
     /**
@@ -71,6 +73,7 @@ public class PrUserProjectEntity extends BaseEpmetEntity {
     /**
      * 项目描述
      */
+    @TableField("`describe`")
 	private String describe;
 
     /**

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java

@@ -498,7 +498,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
      */
     @Override
     public PrUserProjectEntity headerInfo(TDuckHeaderInfoFormDTO formDTO) {
-        PrUserProjectEntity prUserProjectEntity = baseDao.selectHeaderInfoByKey(formDTO.getProjectKey());
+        PrUserProjectEntity prUserProjectEntity = baseDao.selectOne(new QueryWrapper<PrUserProjectEntity>().lambda().eq(PrUserProjectEntity::getKey, formDTO.getProjectKey()));
         return prUserProjectEntity;
     }