From 1cc0ca71e30ef32c4d6340f8fc50004711e10413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Sat, 18 Jul 2020 10:54:50 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E3=80=91-=E8=B4=A6=E5=8F=B7=E7=B1=BB=E5=88=AB=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86-lipf-20200718?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/CheckRecordsDao.xml         | 6 +++---
 .../src/main/resources/mapper/ViolationsRecordsDao.xml    | 8 ++++----
 .../modules/activity/service/impl/ActInfoServiceImpl.java | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml
index 6c1efbcb5..e8fbf82bd 100644
--- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml
+++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml
@@ -29,8 +29,8 @@
           SELECT  ecr.id,
 				ecr.name,
                 ecr.mobile,
-				IF(ecr.CATEGORY=1,'居民','工作') category,
-                IF(ecr.SYSTEM=0,'正常','异常') system,
+				IF(ecr.CATEGORY='1','工作人员','居民') category,
+                IF(ecr.SYSTEM= '0','正常','异常') system,
 				mo.DESCRIPTION as module,
 				ecr.CONTENT,
                 ecr.RATE,
@@ -93,7 +93,7 @@
     <select id="getDetails" resultMap="CheckRecords_detail">
         SELECT  ecr.id,
 				ecr.name,
-				IF(ecr.CATEGORY=1,'居民','工作') category,
+				IF(ecr.CATEGORY='1','工作人员','居民') category,
 				mo.DESCRIPTION as module,
 				ecr.CONTENT,
                 ecr.RATE,
diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/ViolationsRecordsDao.xml b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/ViolationsRecordsDao.xml
index da105ff0e..32acac003 100644
--- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/ViolationsRecordsDao.xml
+++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/ViolationsRecordsDao.xml
@@ -28,12 +28,12 @@
         SELECT  evr.id,
 				evr.name,
                 evr.mobile,
-				IF(evr.CATEGORY=1,'居民','工作') category,
+				IF(evr.CATEGORY='1','工作人员','居民') category,
 				mo.DESCRIPTION as module,
 				evr.CONTENT,
                 evr.RATE,
 				la.DESCRIPTION as label,
-				IF(evr.DECISION=1,'系统判定','人工审核') decision,
+				IF(evr.DECISION='1','系统判定','人工审核') decision,
 				date_format(evr.CREATED_TIME,'%Y-%m-%d %H:%m') as CREATED_TIME,
 				date_format(evr.AUDIT_TIME,'%Y-%m-%d %H:%m') as AUDIT_TIME
 	FROM `epdc_violations_records` evr
@@ -89,12 +89,12 @@
     <select id="getDetails" resultMap="violations_detail">
         SELECT  evr.id,
                 evr.name,
-                IF(evr.CATEGORY=1,'居民','工作') category,
+                IF(evr.CATEGORY='1','工作人员','居民') category,
                 mo.DESCRIPTION as module,
                 evr.CONTENT,
                 evr.RATE,
                 la.DESCRIPTION as label,
-                IF(evr.DECISION=1,'系统判定','人工审核') decision,
+                IF(evr.DECISION='1','系统判定','人工审核') decision,
                 date_format(evr.CREATED_TIME,'%Y-%m-%d %H:%m') as CREATED_TIME,
                 date_format(evr.AUDIT_TIME,'%Y-%m-%d %H:%m') as AUDIT_TIME,
                 img.URL
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
index 5a34e5d83..fb7b2657d 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
@@ -186,7 +186,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
                 if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
                     //组装要保存的信息
                     SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(userId,
-                            userName, CheckDataUtils.cate_two, null,ModuleName.HELP_ACTIVITY.getCode(), textList,
+                            userName, CheckDataUtils.cate_one, null,ModuleName.HELP_ACTIVITY.getCode(), textList,
                             imgList, entity.getId(),null,null, twoTypes,dto.getTel(),"0");
                     contentSecurityFeign.insertRecords(record);
                 }