【pc端-bug修改】【修改导出文件标题,增加修改方法check】

魏凯 2020-07-27

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java

@@ -44,14 +44,18 @@ public class EvaluateOfficerExcel {
     @Excel(name = "单位职务")
     private String position;
 
+    @Excel(name = "创建时间")
+    private String createTime;
+
     @Excel(name = "排序")
     private Integer sort;
 
-    @Excel(name = "点赞次数")
-    private Integer likesCount;
 
-    @Excel(name = "被踩次数")
-    private Integer opposeCount;
+//    @Excel(name = "点赞次数")
+//    private Integer likesCount;
+//
+//    @Excel(name = "被踩次数")
+//    private Integer opposeCount;
 
    /* @Excel(name = "乐观锁")
     private Integer revision;
@@ -72,4 +76,4 @@ public class EvaluateOfficerExcel {
     private Date updatedTime;*/
 
 
-}
+}

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/impl/ActPhraseServiceImpl.java

@@ -128,6 +128,12 @@ public class ActPhraseServiceImpl extends BaseServiceImpl<ActPhraseDao, ActPhras
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(ActPhraseDTO dto) {
+        String categoryCode = dto.getCode();
+        if (StringUtils.isNotBlank(categoryCode)) {
+            if (getCodeCount(dto) > 0) {
+                throw new RenException("您输入的编码已存在");
+            }
+        }
         ActPhraseEntity entity = ConvertUtils.sourceToTarget(dto, ActPhraseEntity.class);
         updateById(entity);