elink-star
/
esua-epdc-cloud
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修复不能评价bug

master
qushutong 2 years ago
parent
5b28c9b86d
commit
a376d6024e
2 changed files with 35 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 64
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  2. 6
      renren-cloud-generator/src/main/resources/application.yml

64
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
View File

@ -1016,16 +1016,16 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(evaluationFormDTO.getDeptId()).getData(); ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(evaluationFormDTO.getDeptId()).getData();
List<String> textList = new ArrayList<>(); List<String> textList = new ArrayList<>();
textList.add(evaluationFormDTO.getEvaluationContent()); textList.add(evaluationFormDTO.getEvaluationContent());
CheckResultDTO contentResult = CheckDataUtils.checkContent(textList); // CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
if (!isConReview && (contentResult != null && !contentResult.getAllPass())) { // if (!isConReview && (contentResult != null && !contentResult.getAllPass())) {
//组装要保存的信息 // //组装要保存的信息
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), // SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(),
evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, CheckDataUtils.decision_one, // evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, CheckDataUtils.decision_one,
ModuleName.ITEM_SATISFACTION.getCode(), textList, null, null, contentResult, // ModuleName.ITEM_SATISFACTION.getCode(), textList, null, null, contentResult,
null, null, mobile, "0", deptDto); // null, null, mobile, "0", deptDto);
contentSecurityFeign.insertViolationsRecord(record); // contentSecurityFeign.insertViolationsRecord(record);
return new Result().error(CheckDataUtils.violations_code, CheckDataUtils.violations_message); // return new Result().error(CheckDataUtils.violations_code, CheckDataUtils.violations_message);
} // }
// 诉求评价 // 诉求评价
ItemEntity itemEntity = new ItemEntity(); ItemEntity itemEntity = new ItemEntity();
@ -1049,30 +1049,30 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
} }
baseDao.updateById(itemEntity); baseDao.updateById(itemEntity);
//内容审核接口异常，保存至待审核信息 // //内容审核接口异常，保存至待审核信息
if (contentResult == null && !isConReview) { // if (contentResult == null && !isConReview) {
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), // SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(),
evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList, // evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList,
null, itemEntity.getId(), null, null, null, mobile, "1", deptDto); // null, itemEntity.getId(), null, null, null, mobile, "1", deptDto);
contentSecurityFeign.insertRecords(record); // contentSecurityFeign.insertRecords(record);
} // }
//判断是否为待审核 //判断是否为待审核
if (contentResult != null) { // if (contentResult != null) {
CheckResultMessageDTO twoTypes; // CheckResultMessageDTO twoTypes;
if (isConReview) { // if (isConReview) {
twoTypes = CheckDataUtils.saveTwoTypes(contentResult, null); // twoTypes = CheckDataUtils.saveTwoTypes(contentResult, null);
} else { // } else {
twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null); // twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null);
} // }
if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) { // if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
//组装要保存的信息 // //组装要保存的信息
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), // SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(),
evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList, // evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList,
null, itemEntity.getId(), null, null, twoTypes, mobile, "0", deptDto); // null, itemEntity.getId(), null, null, twoTypes, mobile, "0", deptDto);
contentSecurityFeign.insertRecords(record); // contentSecurityFeign.insertRecords(record);
} // }
} // }
// 评论满意的直接结案 todo 暂时注 // 评论满意的直接结案 todo 暂时注
// ------- // -------

6
renren-cloud-generator/src/main/resources/application.yml
View File

@ -9,9 +9,9 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
#MySQL配置 #MySQL配置
driverClassName: com.mysql.jdbc.Driver driverClassName: com.mysql.jdbc.Driver
url: jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/sb_esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai url: jdbc:mysql://47.104.92.53:3306/one?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: shibei_test username: root
password: Elink@833066 password: Elink@888
#oracle配置 #oracle配置
# driverClassName: oracle.jdbc.OracleDriver # driverClassName: oracle.jdbc.OracleDriver
# url: jdbc:oracle:thin:@192.168.10.10:1521:helowin # url: jdbc:oracle:thin:@192.168.10.10:1521:helowin

Write Preview
Loading…
Cancel
Save