Merge branch 'develop' into release_temp

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java

@@ -186,6 +186,7 @@ public class IcNeighborHoodController {
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"小区信息不存在");
             }
             String neighborhoodName = icNeighborHoodDTO.getNeighborHoodName();
+            //url组成:数字社区地址?小区id&用户id
             //String url = "https://demo.tduckapp.com/s/7314b64b3a26455ab793fb8c640856b6?id="+id;
             String url = EnvEnum.getCurrentEnv().getUrl().replace("api/",StrConstant.EPMETY_STR)
                     .concat("epmet-oper-gov/#/")

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoAttrEntity.java

@@ -1,9 +1,12 @@
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.ibatis.type.JdbcType;
 
 import java.util.Date;
 
@@ -28,6 +31,7 @@ public class MemoAttrEntity extends BaseEpmetEntity {
     /**
      * 提醒时间
      */
+	@TableField(value="REMIND_TIME",updateStrategy = FieldStrategy.IGNORED,jdbcType = JdbcType.TIMESTAMP)
 	private Date remindTime;
 
     /**

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoConcernEntity.java

@@ -1,9 +1,12 @@
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.ibatis.type.JdbcType;
 
 import java.util.Date;
 
@@ -53,11 +56,13 @@ public class MemoConcernEntity extends BaseEpmetEntity {
     /**
      * 预计关怀时间
      */
+	@TableField(value="REMIND_TIME",updateStrategy = FieldStrategy.IGNORED,jdbcType = JdbcType.TIMESTAMP)
 	private Date scheduledTime;
 
     /**
      * 实际执行时间(预留字段)
      */
+	@TableField(value="REMIND_TIME",updateStrategy = FieldStrategy.IGNORED,jdbcType = JdbcType.TIMESTAMP)
 	private Date actualTime;
 
     /**

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoDifficultyEntity.java

@@ -1,9 +1,12 @@
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.ibatis.type.JdbcType;
 
 import java.util.Date;
 
@@ -43,6 +46,7 @@ public class MemoDifficultyEntity extends BaseEpmetEntity {
     /**
      * 预计处理时间
      */
+	@TableField(value="REMIND_TIME",updateStrategy = FieldStrategy.IGNORED,jdbcType = JdbcType.TIMESTAMP)
 	private Date scheduledTime;
 
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoDifficultyServiceImpl.java

@@ -126,19 +126,21 @@ public class MemoDifficultyServiceImpl extends BaseServiceImpl<MemoDifficultyDao
             memoAttachmentService.insertBatch(list);
         }
         //3.判断更新提醒记录表提醒时间
-        if (null != dto.getRemindTime()) {
         MemoAttrDTO memoAttr = new MemoAttrDTO();
         memoAttr.setId(dto.getId());
         memoAttr.setRemindTime(dto.getRemindTime());
         memoAttrService.update(memoAttr);
     }
-    }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(String[] ids) {
-        // 逻辑删除（@TableLogic 注解）
         baseDao.deleteBatchIds(Arrays.asList(ids));
+        memoAttrService.delete(ids);
+        for (String id : ids) {
+            //物理删除附件
+            memoAttachmentService.deleteByMemoId(id);
+        }
     }
 
     @Override