Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-point-server:
     container_name: epmet-point-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.27
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.28
     ports:
       - "8112:8112"
     network_mode: host # 使用现有网络

epmet-module/epmet-point/epmet-point-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.27</version>
+    <version>0.0.28</version>
     <parent>
         <artifactId>epmet-point</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java

@@ -216,6 +216,7 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul
 					continue;
 				}
 				PointRuleEntity entity = ConvertUtils.sourceToTarget(defaultRule, PointRuleEntity.class);
+				entity.setId("");
 				entity.setCustomerId(customerDTO.getId());
 				insertList.add(entity);
 			}

epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-voice-server:
     container_name: gov-voice-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.63
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.64
     ports:
       - "8105:8105"
     network_mode: host # 使用现有网络

epmet-module/gov-voice/gov-voice-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.63</version>
+    <version>0.3.64</version>
     <parent>
         <artifactId>gov-voice</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/DraftServiceImpl.java

@@ -187,7 +187,11 @@ public class DraftServiceImpl extends BaseServiceImpl<DraftDao, DraftEntity> imp
             if (formDTO.isShowCover()){
                 DraftCoverEntity coverEntity = draftCoverDao.selectByDraftId(formDTO.getDraftId(), null);
                 if (coverEntity != null){
-                    CoverImgDTO coverImgDTO = ConvertUtils.sourceToTarget(coverEntity, CoverImgDTO.class);
+                    CoverImgDTO coverImgDTO = new CoverImgDTO();
+                    coverImgDTO.setCoverId(coverEntity.getId());
+                    coverImgDTO.setUrl(coverEntity.getImgUrl());
+                    coverImgDTO.setAuditStatus(coverEntity.getAuditStatus());
+                    coverImgDTO.setAuditReason(coverEntity.getAuditReason());
                     draftDetailResultDTO.setCoverInfo(coverImgDTO);
                 }else{
                     draftDetailResultDTO.setCoverInfo(new CoverImgDTO());

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftCoverDao.xml

@@ -6,6 +6,7 @@
     <!-- 通过草稿Id获取草稿封面且创建时间是为最新的 -->
     <select id="selectByDraftId" resultType="com.epmet.entity.DraftCoverEntity">
         SELECT
+        cover.ID,
         cover.CUSTOMER_ID,
         cover.IMG_URL,
         cover.AUDIT_STATUS,