信息发布

eladmin-system/src/main/java/me/zhengjie/modules/dm/information/domain/DmInformation.java

@@ -58,10 +58,11 @@ public class DmInformation extends BaseEntity implements Serializable {
     private String status;
 
     @ApiModelProperty(value = "审批人")
-    @OneToOne(fetch = FetchType.LAZY,cascade = {CascadeType.REFRESH})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "approval_user",referencedColumnName = "id")
-    private DmUser approvalUser;
+    @Column(name = "approval_user")
+//    @OneToOne
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "approval_user",referencedColumnName = "id")
+    private String approvalUser;
 
     @Column(name = "task_id")
     @ApiModelProperty(value = "任务ID act_ru_task")
@@ -72,10 +73,11 @@ public class DmInformation extends BaseEntity implements Serializable {
     private String procInstId;
 
     @ApiModelProperty(value = "发起人")
-    @OneToOne(fetch = FetchType.LAZY,cascade = {CascadeType.REFRESH})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "request_user",referencedColumnName = "id")
-    private DmUser requestUser;
+//    @OneToOne
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "request_user",referencedColumnName = "id")
+    @Column(name = "request_user")
+    private String requestUser;
 
     @Column(name = "release_time")
     @ApiModelProperty(value = "发布时间")
@@ -87,6 +89,7 @@ public class DmInformation extends BaseEntity implements Serializable {
 
     @Column(name = "title")
     @ApiModelProperty(value = "发布标题")
+    @NotBlank
     private String title;
 
     @Column(name = "approval_remark")

eladmin-system/src/main/java/me/zhengjie/modules/dm/information/service/dto/DmInformationDto.java

@@ -44,7 +44,7 @@ public class DmInformationDto extends BaseDTO implements Serializable {
     private String status;
 
     /** 审批人 */
-    private DmUser approvalUser;
+    private String approvalUser;
 
     /** 任务ID act_ru_task */
     private String taskId;
@@ -53,7 +53,7 @@ public class DmInformationDto extends BaseDTO implements Serializable {
     private String procInstId;
 
     /** 发起人 */
-    private DmUser requestUser;
+    private String requestUser;
 
     /** 创建者 */
     private String createBy;

eladmin-system/src/main/java/me/zhengjie/modules/dm/information/service/dto/DmInformationQueryCriteria.java

@@ -41,4 +41,8 @@ public class DmInformationQueryCriteria{
     /**  标题模糊查询 */
     @Query(type = Query.Type.INNER_LIKE)
     private String title;
+
+    @Query
+    private String isValid;
+
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/information/service/impl/DmInformationServiceImpl.java

@@ -19,6 +19,7 @@ import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.modules.dm.activiti.event.ActivitiEvent;
 import me.zhengjie.modules.dm.activiti.status.OperationStatus;
 import me.zhengjie.modules.dm.information.domain.DmInformation;
+import me.zhengjie.utils.*;
 import me.zhengjie.modules.dm.informationApproval.domain.DmInformationApproval;
 import me.zhengjie.modules.dm.informationApproval.service.DmInformationApprovalService;
 import me.zhengjie.modules.dm.user.domain.DmUser;
@@ -42,6 +43,10 @@ import cn.hutool.core.util.IdUtil;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
+import java.sql.Timestamp;
+import java.util.List;
+import java.util.Map;
+
 import java.awt.*;
 import java.sql.Timestamp;
 import java.util.*;
@@ -111,6 +116,9 @@ public class DmInformationServiceImpl implements DmInformationService {
     @Transactional(rollbackFor = Exception.class)
     public void update(DmInformation resources,String ... statusList) {
         DmInformation dmInformation = dmInformationRepository.findById(resources.getId()).orElseGet(DmInformation::new);
+       if (StringUtils.isNotBlank(dmInformation.getStatus())){
+           dmInformation.setReleaseTime(new Timestamp(System.currentTimeMillis()));
+       }
         ValidationUtil.isNull( dmInformation.getId(),"DmInformation","id",resources.getId());
         dmInformation.copy(resources);
         String status = statusList.length>0?statusList[0]:dmInformation.getStatus();