From be5d46c1854e44d36bb021f9d58e0d438e46e9f5 Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang>
Date: Mon, 6 Jun 2022 16:09:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E3=80=90=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E9=A1=B9=E7=9B=AE=E3=80=91=E6=9C=8D=E5=8A=A1=E4=BA=BA?=
 =?UTF-8?q?=E6=95=B0=E4=BB=8Efeedback=E4=B8=AD=E7=A7=BB=E5=8A=A8=E5=88=B0?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=AE=B0=E5=BD=95=E8=A1=A8=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-module/epmet-heart/epmet-heart-server/pom.xml       | 8 ++++++++
 .../java/com/epmet/entity/IcServiceFeedbackEntity.java    | 2 +-
 .../main/java/com/epmet/entity/IcServiceRecordEntity.java | 5 +++++
 .../epmet/service/impl/IcServiceRecordServiceImpl.java    | 4 +++-
 .../migration/V0.0.19__service_move_people_to_record.sql  | 2 ++
 .../src/main/resources/mapper/IcServiceFeedbackDao.xml    | 2 +-
 .../src/main/resources/mapper/IcServiceRecordDao.xml      | 5 +++--
 7 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.19__service_move_people_to_record.sql

diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
index bc2955d8b7..af7bb32c5d 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
@@ -132,6 +132,14 @@
                     </nonFilteredFileExtensions>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
         </plugins>
         <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
         <resources>
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcServiceFeedbackEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcServiceFeedbackEntity.java
index 608d2ab7a3..df89735b5b 100755
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcServiceFeedbackEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcServiceFeedbackEntity.java
@@ -53,7 +53,7 @@ public class IcServiceFeedbackEntity extends BaseEpmetEntity {
     /**
      * 服务人数
      */
-	private Integer servicePeopleNumber;
+	//private Integer servicePeopleNumber;
 
     /**
      * 满意度。满意度 - 不满意:bad、基本满意:good、非常满意:perfect
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcServiceRecordEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcServiceRecordEntity.java
index 1a452f575b..4156c60604 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcServiceRecordEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcServiceRecordEntity.java
@@ -81,4 +81,9 @@ public class IcServiceRecordEntity extends BaseEpmetEntity {
      */
 	private String remark;
 
+	/**
+	 * 服务人数
+	 */
+	private Integer servicePeopleNumber;
+
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordServiceImpl.java
index 13eaff0445..49d54329a2 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordServiceImpl.java
@@ -194,6 +194,7 @@ public class IcServiceRecordServiceImpl extends BaseServiceImpl<IcServiceRecordD
         } else {
             // 写了反馈，按照反馈的来
             serviceRecord.setServiceStatus(feedbackDto.getServiceStatus());
+            serviceRecord.setServicePeopleNumber(feedbackDto.getServicePeopleNumber());
         }
         serviceRecord.setRemark(input.getRemark());
 
@@ -278,6 +279,7 @@ public class IcServiceRecordServiceImpl extends BaseServiceImpl<IcServiceRecordD
         IcServiceRecordEntity serviceRecord = serviceRecordDao.selectById(serviceRecordId);
         if ("in_service".equals(serviceRecord.getServiceStatus())) {
             serviceRecord.setServiceStatus("completed");
+            serviceRecord.setServicePeopleNumber(feedbackDto.getServicePeopleNumber());
             serviceRecordDao.updateById(serviceRecord);
         }
 
@@ -288,7 +290,7 @@ public class IcServiceRecordServiceImpl extends BaseServiceImpl<IcServiceRecordD
         feedbackEntity.setServiceOrgId(serviceOrgId);
         feedbackEntity.setServiceGoal(feedbackDto.getServiceGoal());
         feedbackEntity.setServiceEffect(feedbackDto.getServiceEffect());
-        feedbackEntity.setServicePeopleNumber(feedbackDto.getServicePeopleNumber());
+        //feedbackEntity.setServicePeopleNumber(feedbackDto.getServicePeopleNumber());
         feedbackEntity.setSatisfaction(feedbackDto.getSatisfaction());
         feedbackEntity.setLongitude(feedbackDto.getLongitude());
         feedbackEntity.setLatitude(feedbackDto.getLatitude());
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.19__service_move_people_to_record.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.19__service_move_people_to_record.sql
new file mode 100644
index 0000000000..703651cf09
--- /dev/null
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.19__service_move_people_to_record.sql
@@ -0,0 +1,2 @@
+alter table ic_service_record
+    add SERVICE_PEOPLE_NUMBER int(10) comment '服务人数' after SERVICE_STATUS;
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceFeedbackDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceFeedbackDao.xml
index 87d7d02c12..a5e58824c9 100755
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceFeedbackDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceFeedbackDao.xml
@@ -10,7 +10,7 @@
         <result property="serviceOrgId" column="SERVICE_ORG_ID"/>
         <result property="serviceGoal" column="SERVICE_GOAL"/>
         <result property="serviceEffect" column="SERVICE_EFFECT"/>
-        <result property="servicePeopleNumber" column="SERVICE_PEOPLE_NUMBER"/>
+        <!--<result property="servicePeopleNumber" column="SERVICE_PEOPLE_NUMBER"/>-->
         <result property="satisfaction" column="SATISFACTION"/>
         <result property="longitude" column="LONGITUDE"/>
         <result property="latitude" column="LATITUDE"/>
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordDao.xml
index 69838a2b91..ad5df068ef 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordDao.xml
@@ -22,6 +22,7 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
         <result property="delFlag" column="DEL_FLAG"/>
+        <result property="servicePeopleNumber" column="SERVICE_PEOPLE_NUMBER"/>
     </resultMap>
     <select id="listServiceRecords" resultType="com.epmet.dto.result.ServiceProjectRecordResultDTO">
         select record.ID as serviceRecordId,
@@ -33,12 +34,12 @@
                record.SERVICE_TIME_START,
                record.SERVICE_TIME_END,
                record.SERVICE_STATUS,
-               feedback.SERVICE_PEOPLE_NUMBER
+               record.SERVICE_PEOPLE_NUMBER
         from ic_service_record record
                  left join ic_service_feedback feedback on (record.ID = feedback.SERVICE_RECORD_ID)
         <where>
             record.DEL_FLAG = '0'
-            and feedback.DEL_FLAG = '0'
+            and (feedback.DEL_FLAG is null or feedback.DEL_FLAG = '0')
             <if test="serviceCategoryKey != null and serviceCategoryKey != ''">
                 and record.SERVICE_CATEGORY_KEY = #{serviceCategoryKey}
             </if>