Browse Source

【内容安全】-账号类别区分-lipf-20200718

feature/dangjian
李鹏飞 5 years ago
parent
commit
1cc0ca71e3
  1. 6
      esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml
  2. 8
      esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/ViolationsRecordsDao.xml
  3. 2
      esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java

6
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,

8
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

2
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);
}

Loading…
Cancel
Save