信息发布

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

@@ -19,20 +19,23 @@ import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import io.swagger.annotations.ApiModelProperty;
 import cn.hutool.core.bean.copier.CopyOptions;
-import me.zhengjie.base.BaseEntity;
-import me.zhengjie.modules.dm.user.domain.DmUser;
-
 import javax.persistence.*;
+import javax.persistence.CascadeType;
 import javax.validation.constraints.*;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+import me.zhengjie.base.BaseEntity;
+import me.zhengjie.modules.dm.user.domain.DmUser;
+import org.hibernate.annotations.*;
 import java.sql.Timestamp;
 import java.io.Serializable;
-import java.util.List;
 
 /**
 * @website https://el-admin.vip
 * @description /
 * @author xwx
-* @date 2021-04-22
+* @date 2022-06-06
 **/
 @Entity
 @Data
@@ -44,7 +47,8 @@ public class DmInformation extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "主键")
     private Long id;
 
-    @Column(name = "content")
+    @Column(name = "content",nullable = false)
+    @NotBlank
     @ApiModelProperty(value = "发布内容(需发布的信息内容)")
     private String content;
 
@@ -52,19 +56,12 @@ public class DmInformation extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "(00-待审核  01-审批通过(已发布） 02-审核未通过)")
     private String status;
 
-    @Column(name = "approval_remark")
-    @ApiModelProperty(value = "审批备注")
-    private String approvalRemark;
-
     @ApiModelProperty(value = "审批人")
-    @OneToOne
-    @JoinColumn(name = "approval_user")
+    @OneToOne(fetch = FetchType.LAZY,cascade = {CascadeType.REFRESH})
+    @NotFound(action = NotFoundAction.IGNORE)
+    @JoinColumn(name = "approval_user",referencedColumnName = "id")
     private DmUser approvalUser;
 
-    @Column(name = "is_has_approval")
-    @ApiModelProperty(value = "是否添加审批人")
-    private Boolean isHasApproval ;
-
     @Column(name = "task_id")
     @ApiModelProperty(value = "任务ID act_ru_task")
     private String taskId;
@@ -73,9 +70,10 @@ public class DmInformation extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "任务实例id act_ru_execution")
     private String procInstId;
 
-    @OneToOne
-    @JoinColumn(name = "request_user")
     @ApiModelProperty(value = "发起人")
+    @OneToOne(fetch = FetchType.LAZY,cascade = {CascadeType.REFRESH})
+    @NotFound(action = NotFoundAction.IGNORE)
+    @JoinColumn(name = "request_user",referencedColumnName = "id")
     private DmUser requestUser;
 
     @Column(name = "release_time")
@@ -86,8 +84,21 @@ public class DmInformation extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "审批时间")
     private Timestamp approvalTime;
 
-    @Transient
-    private List<DmUser> approvalUserList;
+    @Column(name = "title")
+    @ApiModelProperty(value = "发布标题")
+    private String title;
+
+    @Column(name = "approval_remark")
+    @ApiModelProperty(value = "审批备注")
+    private String approvalRemark;
+
+    @Column(name = "is_has_approval")
+    @ApiModelProperty(value = "是否设置审批人 1-true 0-false")
+    private String isHasApproval;
+
+    @Column(name = "is_valid")
+    @ApiModelProperty(value = "是否有效")
+    private String isValid;
 
     public void copy(DmInformation source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));

eladmin-system/src/main/java/me/zhengjie/modules/dm/information/repository/DmInformationRepository.java

@@ -16,42 +16,13 @@
 package me.zhengjie.modules.dm.information.repository;
 
 import me.zhengjie.modules.dm.information.domain.DmInformation;
-import me.zhengjie.modules.dm.information.service.dto.DmInformationDto;
-import me.zhengjie.modules.dm.information.service.dto.DmInformationQueryCriteria;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-
-import java.util.List;
-import java.util.Map;
 
 /**
 * @website https://el-admin.vip
 * @author xwx
-* @date 2021-04-22
+* @date 2022-06-06
 **/
 public interface DmInformationRepository extends JpaRepository<DmInformation, Long>, JpaSpecificationExecutor<DmInformation> {
-
-    @Modifying
-    @Query(value = "update dm_information set task_id =:#{#resources.taskId} ,proc_inst_id =:#{#resources.procInstId} where id =:#{#resources.id} ",nativeQuery = true )
-    void updateTask(@Param(value = "resources") DmInformation resources);
-
-    @Query(value = "select GROUP_CONCAT(DISTINCT(approval_user)) as userIds from dm_information_approval where is_new = '1' and info_id = ?1 ",nativeQuery = true )
-    Map<String,Object> selectInfoApproveUserNames(Long id);
-
-    @Modifying
-    @Query(value = "update dm_information set status = '00' ,approval_user = null,approval_remark=null where id = ?1 ",nativeQuery = true )
-    void reset(Long id);
-
-    @Query(value = "select status from dm_information where id = ?1",nativeQuery = true)
-    String findSubmitBeforeStatus(Long id);
-
-    @Query(value = "select a.*  from  dm_information a left join dm_information_approval b on a.id= b.info_id where b.is_new = 1 and  b.approval_user = ?1 and a.status = '00' group by a.id",
-            countQuery = "select count(*) from (select a.* from dm_information a left join dm_information_approval b on a.id= b.info_id where b.is_new = 1 and  b.approval_user = ?1 and a.status = '00' group by a.id)",
-            nativeQuery = true)
-    Page<DmInformation> findAllDSP(String approval_user, Pageable pageable);
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/information/rest/DmInformationController.java

@@ -33,11 +33,11 @@ import javax.servlet.http.HttpServletResponse;
 /**
 * @website https://el-admin.vip
 * @author xwx
-* @date 2021-04-22
+* @date 2022-06-06
 **/
 @RestController
 @RequiredArgsConstructor
-@Api(tags = "dmInformation管理")
+@Api(tags = "发布信息内容管理管理")
 @RequestMapping("/api/dmInformation")
 public class DmInformationController {
 
@@ -52,72 +52,36 @@ public class DmInformationController {
     }
 
     @GetMapping
-    @Log("查询dmInformation")
-    @ApiOperation("查询dmInformation")
+    @Log("查询发布信息内容管理")
+    @ApiOperation("查询发布信息内容管理")
     @PreAuthorize("@el.check('dmInformation:list')")
     public ResponseEntity<Object> query(DmInformationQueryCriteria criteria, Pageable pageable){
         return new ResponseEntity<>(dmInformationService.queryAll(criteria,pageable),HttpStatus.OK);
     }
 
-    @GetMapping(value = "approvalList")
-    @Log("查询dmInformation")
-    @ApiOperation("查询dmInformation")
-    @PreAuthorize("@el.check('dmInformation:list')")
-    public ResponseEntity<Object> approvalList(DmInformationQueryCriteria criteria, Pageable pageable){
-        return new ResponseEntity<>(dmInformationService.findAllDSP(pageable),HttpStatus.OK);
-    }
-
     @PostMapping
-    @Log("新增dmInformation")
-    @ApiOperation("新增dmInformation")
+    @Log("新增发布信息内容管理")
+    @ApiOperation("新增发布信息内容管理")
     @PreAuthorize("@el.check('dmInformation:add')")
     public ResponseEntity<Object> create(@Validated @RequestBody DmInformation resources){
         return new ResponseEntity<>(dmInformationService.create(resources),HttpStatus.CREATED);
     }
 
-    @PostMapping(value = "/addApprovalUser")
-    @Log("新增审批人")
-    @ApiOperation("新增审批人")
+    @PutMapping
+    @Log("修改发布信息内容管理")
+    @ApiOperation("修改发布信息内容管理")
     @PreAuthorize("@el.check('dmInformation:edit')")
-    public ResponseEntity<Object> addApprovalUser(@Validated @RequestBody DmInformation resources){
-        dmInformationService.addApprovalUser(resources);
+    public ResponseEntity<Object> update(@Validated @RequestBody DmInformation resources){
+        dmInformationService.update(resources);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
-    @Log("删除dmInformation")
-    @ApiOperation("删除dmInformation")
+    @Log("删除发布信息内容管理")
+    @ApiOperation("删除发布信息内容管理")
     @PreAuthorize("@el.check('dmInformation:del')")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
         dmInformationService.deleteAll(ids);
         return new ResponseEntity<>(HttpStatus.OK);
     }
-
-    @PutMapping
-    @Log("修改dmInformation")
-    @ApiOperation("修改dmInformation")
-    @PreAuthorize("@el.check('dmInformation:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody DmInformation resources){
-        dmInformationService.update(resources);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @PostMapping(value = "/approval")
-    @Log("审批")
-    @ApiOperation("审批")
-    public ResponseEntity<Object> Approval(@RequestBody DmInformation resources){
-        dmInformationService.approval(resources);
-        return new ResponseEntity<>("审批完成",HttpStatus.OK);
-
-
-    }
-
-    @Log("撤回dmInformation")
-    @ApiOperation("撤回dmInformation")
-    @PreAuthorize("@el.check('dmInformation:edit')")
-    @PostMapping(value = "ch")
-    public ResponseEntity<Object> ch(@RequestBody Long ids) {
-        dmInformationService.ch(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
 }

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

@@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletResponse;
 * @website https://el-admin.vip
 * @description 服务接口
 * @author xwx
-* @date 2021-04-22
+* @date 2022-06-06
 **/
 public interface DmInformationService {
 
@@ -65,7 +65,7 @@ public interface DmInformationService {
     * 编辑
     * @param resources /
     */
-    void update(DmInformation resources,String ... statusList);
+    void update(DmInformation resources);
 
     /**
     * 多选删除
@@ -80,34 +80,4 @@ public interface DmInformationService {
     * @throws IOException /
     */
     void download(List<DmInformationDto> all, HttpServletResponse response) throws IOException;
-
-     DmInformation toEntity(DmInformationDto dto);
-
-    void updateTask(DmInformation resources);
-
-    /**
-     * todo 添加审批人
-     * @param resources
-     */
-    void addApprovalUser(DmInformation resources);
-
-    /**
-     * todo 审批
-     * @param resources
-     */
-    void approval(DmInformation resources);
-
-    /**
-     * todo 撤回
-     * @param id
-     */
-    void ch(Long id);
-
-    /**
-     * 查询数据分页
-     * @param pageable 分页参数
-     * @return Map<String,Object>
-     */
-    Map<String,Object> findAllDSP(Pageable pageable);
-
 }

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

@@ -20,17 +20,17 @@ import java.sql.Timestamp;
 import java.io.Serializable;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.serializer.ToStringSerializer;
+import me.zhengjie.base.BaseDTO;
 import me.zhengjie.modules.dm.user.domain.DmUser;
-import me.zhengjie.modules.dm.user.service.dto.DmUserDto;
 
 /**
 * @website https://el-admin.vip
 * @description /
 * @author xwx
-* @date 2021-04-22
+* @date 2022-06-06
 **/
 @Data
-public class DmInformationDto implements Serializable {
+public class DmInformationDto extends BaseDTO implements Serializable {
 
     /** 主键 */
     /** 防止精度丢失 */
@@ -43,14 +43,8 @@ public class DmInformationDto implements Serializable {
     /** (00-待审核  01-审批通过(已发布） 02-审核未通过) */
     private String status;
 
-    /** 审批备注 */
-    private String approvalRemark;
-
     /** 审批人 */
-    private DmUserDto approvalUser;
-
-    /** 是否添加审批人 */
-    private Boolean isHasApproval ;
+    private DmUser approvalUser;
 
     /** 任务ID act_ru_task */
     private String taskId;
@@ -59,7 +53,7 @@ public class DmInformationDto implements Serializable {
     private String procInstId;
 
     /** 发起人 */
-    private DmUserDto requestUser;
+    private DmUser requestUser;
 
     /** 创建者 */
     private String createBy;
@@ -78,4 +72,16 @@ public class DmInformationDto implements Serializable {
 
     /** 审批时间 */
     private Timestamp approvalTime;
+
+    /** 发布标题 */
+    private String title;
+
+    /** 审批备注 */
+    private String approvalRemark;
+
+    /** 是否设置审批人 1-true 0-false */
+    private String isHasApproval;
+
+    /** 是否有效 */
+    private String isValid;
 }

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

@@ -23,7 +23,7 @@ import me.zhengjie.annotation.Query;
 /**
 * @website https://el-admin.vip
 * @author xwx
-* @date 2021-04-22
+* @date 2022-06-06
 **/
 @Data
 public class DmInformationQueryCriteria{
@@ -38,4 +38,7 @@ public class DmInformationQueryCriteria{
     /** BETWEEN */
     @Query(type = Query.Type.BETWEEN)
     private List<Timestamp> releaseTime;
+    /**  标题模糊查询 */
+    @Query(type = Query.Type.INNER_LIKE)
+    private String title;
 }

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

@@ -15,46 +15,35 @@
 */
 package me.zhengjie.modules.dm.information.service.impl;
 
-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.modules.dm.informationApproval.domain.DmInformationApproval;
-import me.zhengjie.modules.dm.informationApproval.service.DmInformationApprovalService;
-import me.zhengjie.modules.dm.user.domain.DmUser;
-import me.zhengjie.modules.dm.user.service.mapstruct.DmUserMapper;
-import me.zhengjie.modules.dm.user.util.DmUserUtils;
-import me.zhengjie.modules.system.service.UserService;
-import me.zhengjie.modules.system.service.dto.UserDto;
-import me.zhengjie.utils.*;
+import me.zhengjie.utils.ValidationUtil;
+import me.zhengjie.utils.FileUtil;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.modules.dm.information.repository.DmInformationRepository;
 import me.zhengjie.modules.dm.information.service.DmInformationService;
 import me.zhengjie.modules.dm.information.service.dto.DmInformationDto;
 import me.zhengjie.modules.dm.information.service.dto.DmInformationQueryCriteria;
 import me.zhengjie.modules.dm.information.service.mapstruct.DmInformationMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.IdUtil;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-
-import java.awt.*;
-import java.sql.Timestamp;
-import java.util.*;
-import java.io.IOException;
+import me.zhengjie.utils.PageUtil;
+import me.zhengjie.utils.QueryHelp;
 import java.util.List;
-import javax.annotation.Resource;
+import java.util.Map;
+import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
 
 /**
 * @website https://el-admin.vip
 * @description 服务实现
 * @author xwx
-* @date 2021-04-22
+* @date 2022-06-06
 **/
 @Service
 @RequiredArgsConstructor
@@ -62,16 +51,6 @@ public class DmInformationServiceImpl implements DmInformationService {
 
     private final DmInformationRepository dmInformationRepository;
     private final DmInformationMapper dmInformationMapper;
-    @Autowired
-    private DmInformationApprovalService approvalService;
-    @Resource
-    private ApplicationContext applicationContext;
-
-    /** 用户信息 */
-    @Autowired
-    private UserService userService;
-    @Autowired
-    private final DmUserMapper dmUserMapper;
 
     @Override
     public Map<String,Object> queryAll(DmInformationQueryCriteria criteria, Pageable pageable){
@@ -96,113 +75,19 @@ public class DmInformationServiceImpl implements DmInformationService {
     @Transactional(rollbackFor = Exception.class)
     public DmInformationDto create(DmInformation resources) {
         Snowflake snowflake = IdUtil.createSnowflake(1, 1);
-        resources.setId(snowflake.nextId());
-        resources.setRequestUser(dmUserMapper.toEntity(DmUserUtils.getCurrDmUser()));
-        resources.setStatus("00");
-        resources.setIsHasApproval(false);
-        DmInformationDto dto = dmInformationMapper.toDto(dmInformationRepository.save(resources));
-        dto.setRequestUser(DmUserUtils.getCurrDmUser());
-        ActivitiEvent event = new ActivitiEvent(this,resources,OperationStatus.SUBMIT);
-        applicationContext.publishEvent(event);
-        return dto;
+        resources.setId(snowflake.nextId()); 
+        return dmInformationMapper.toDto(dmInformationRepository.save(resources));
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void update(DmInformation resources,String ... statusList) {
+    public void update(DmInformation resources) {
         DmInformation dmInformation = dmInformationRepository.findById(resources.getId()).orElseGet(DmInformation::new);
         ValidationUtil.isNull( dmInformation.getId(),"DmInformation","id",resources.getId());
         dmInformation.copy(resources);
-         String status = statusList.length>0?statusList[0]:dmInformation.getStatus();
-         //判断是否驳回后修改
-         Boolean isApprovalUpdate = "02".equals(status);
-        //触发审批流程
-        if(isApprovalUpdate){
-            //初始化所有信息
-            reset(dmInformation.getId());
-            ActivitiEvent event = new ActivitiEvent(this,resources,OperationStatus.SUBMIT_APPROVAL_USER);
-            applicationContext.publishEvent(event);
-        }
-        if("02".equals(status) || "03".equals(status)){
-            dmInformation.setStatus("00");//将状态改为待审批
-            dmInformationRepository.save(dmInformation);
-        }
-
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void addApprovalUser(DmInformation resources){
-        DmInformation dmInformation = dmInformationRepository.findById(resources.getId()).orElseGet(DmInformation::new);
-        ValidationUtil.isNull( dmInformation.getId(),"DmInformation","id",resources.getId());
-
-        dmInformation.setIsHasApproval(true);
-        List<DmUser> appUsers = resources.getApprovalUserList();
-
-        if(appUsers !=null && appUsers.size()>0){
-            for(DmUser dmUser : appUsers){
-                DmInformationApproval approval = new DmInformationApproval();
-                approval.setInformation(resources);
-                approval.setApprovalUser(dmUser);
-                approval.setStatus("00");
-                approval.setIsNew(true);
-                approvalService.create(approval);
-            }
-        }
         dmInformationRepository.save(dmInformation);
-
-        //触发审批流程
-        ActivitiEvent event = new ActivitiEvent(this,dmInformation,OperationStatus.SUBMIT_APPROVAL_USER);
-        applicationContext.publishEvent(event);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void approval(DmInformation resources) {
-        DmInformation information = dmInformationRepository.findById(resources.getId()).orElseGet(DmInformation::new);
-        ValidationUtil.isNull( information.getId(),"DmInformation","id",resources.getId());
-        information.copy(resources);
-
-        //判断用户是否具备审批权限
-        //1、判断是否具有审批用户
-        UserDto user= userService.findById(SecurityUtils.getCurrentUserId());
-        Boolean isApproval =true;
-        List<DmInformationApproval> approvalList = approvalService.findInfoByReqAndUser(information.getId(),user.getDmUser().getId()+"");
-        DmInformationApproval approval = approvalList==null || approvalList.size()<=0 || approvalList.get(0).getId() == null?null:approvalList.get(0);
-        isApproval=!(approval==null);
-        if(!isApproval){
-            throw new BadRequestException("无审批权限");
-        }
-        String status = information.getStatus();
-        if(!"01".equals(status) && !"02".equals(status)){
-            throw new BadRequestException("审批状态错误");
-        }
-
-        DmInformation information1 = approval.getInformation();
-        System.out.println("information1.getStatus() ==> "+information1.getStatus());
-        if(information1 == null || information1.getId() == null ||  !"00".equals(approval.getStatus())){
-            throw new BadRequestException("当前状态不可审批");
-        }
-        DmUser dmUser = dmUserMapper.toEntity(user.getDmUser());
-        String inistatus = approval.getStatus();
-
-        //修改信息
-        information.setApprovalUser(dmUser);
-        information.setApprovalTime(new Timestamp(System.currentTimeMillis()));
-        this.update(information,inistatus);
-        //保存审批信息
-        approval.setApprovalUser(dmUser);
-        approval.setStatus(information.getStatus());
-        approval.setApprovalRemark(information.getApprovalRemark());
-        approvalService.update(approval);
-
-        //触发审批流程
-        information.setTaskId(approval.getTaskId());
-        ActivitiEvent event = new ActivitiEvent(this,information,OperationStatus.APPROVE);
-        applicationContext.publishEvent(event);
     }
 
-
     @Override
     public void deleteAll(Long[] ids) {
         for (Long id : ids) {
@@ -227,61 +112,12 @@ public class DmInformationServiceImpl implements DmInformationService {
             map.put("更新时间", dmInformation.getUpdateTime());
             map.put("发布时间", dmInformation.getReleaseTime());
             map.put("审批时间", dmInformation.getApprovalTime());
+            map.put("发布标题", dmInformation.getTitle());
+            map.put("审批备注", dmInformation.getApprovalRemark());
+            map.put("是否设置审批人 1-true 0-false", dmInformation.getIsHasApproval());
+            map.put("是否有效", dmInformation.getIsValid());
             list.add(map);
         }
         FileUtil.downloadExcel(list, response);
     }
-
-    @Override
-    public void ch(Long id){
-        DmInformation information = dmInformationRepository.findById(id).orElseGet(DmInformation::new);
-        ValidationUtil.isNull( information.getId(),"DmInformation","id",id);
-        if("00".equals(information.getStatus())){
-            information.setStatus("03");
-            this.update(information,"00");
-        }else {
-            throw new BadRequestException("当前状态不可撤回");
-        }
-    }
-
-    @Override
-    public Map<String, Object> findAllDSP(Pageable pageable) {
-        Page<DmInformation> page = dmInformationRepository.findAllDSP(DmUserUtils.getCurrDmUser().getId()+"",pageable);
-        return PageUtil.toPage(page.map(dmInformationMapper::toDto));
-    }
-
-    @Override
-    public DmInformation toEntity(DmInformationDto dto) {
-        if ( dto == null ) {
-            return null;
-        }
-
-        DmInformation dmInformation = new DmInformation();
-
-        dmInformation.setCreateBy( dto.getCreateBy() );
-        dmInformation.setCreateTime( dto.getCreateTime() );
-        dmInformation.setUpdateTime( dto.getUpdateTime() );
-        dmInformation.setId( dto.getId() );
-        dmInformation.setContent( dto.getContent() );
-        dmInformation.setStatus( dto.getStatus() );
-        dmInformation.setTaskId( dto.getTaskId() );
-        dmInformation.setProcInstId( dto.getProcInstId() );
-        dmInformation.setReleaseTime( dto.getReleaseTime() );
-        dmInformation.setApprovalTime( dto.getApprovalTime() );
-
-        return dmInformation;
-    }
-
-    @Override
-    public void updateTask(DmInformation resources) {
-        dmInformationRepository.updateTask(resources);
-    }
-
-
-    public void reset (Long id){
-        //修改审批状态为待审批
-        approvalService.reset(id);
-        //修改申请为待审批状态
-        dmInformationRepository.reset(id);
-    }
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/information/service/mapstruct/DmInformationMapper.java

@@ -24,7 +24,7 @@ import org.mapstruct.ReportingPolicy;
 /**
 * @website https://el-admin.vip
 * @author xwx
-* @date 2021-04-22
+* @date 2022-06-06
 **/
 @Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
 public interface DmInformationMapper extends BaseMapper<DmInformationDto, DmInformation> {