wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

Browse Source
This commit is contained in:
wulin 2020-12-09 16:55:35 +08:00
commit f7a89b666f
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java
View File

@ -9,6 +9,7 @@ package com.lz.modules.performance.dao;
*/ */
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.lz.modules.performance.dto.TaskProcessRecordDto;
import com.lz.modules.performance.entity.TaskProcessRecord; import com.lz.modules.performance.entity.TaskProcessRecord;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@ -33,7 +34,7 @@ public interface TaskProcessRecordMapper extends BaseMapper<TaskProcessRecord> {
int deleteTaskProcessRecordById(@Param("id") Long id); int deleteTaskProcessRecordById(@Param("id") Long id);
List<TaskProcessRecord> selectTaskProcessRecordsByTaskId(@Param("page") IPage page, @Param("taskId") Long taskId); List<TaskProcessRecordDto> selectTaskProcessRecordsByTaskId(@Param("page") IPage page, @Param("taskId") Long taskId);
int deleteTaskProcessRecordsByTaskId(@Param("taskId") Long taskId); int deleteTaskProcessRecordsByTaskId(@Param("taskId") Long taskId);

2
src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java
View File

@ -1,6 +1,7 @@
package com.lz.modules.performance.dto; package com.lz.modules.performance.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
@ -10,6 +11,7 @@ import java.util.Date;
* @Desc: * @Desc:
* @Date: 2020/12/9 14:41 * @Date: 2020/12/9 14:41
*/ */
@Data
public class TaskProcessRecordDto { public class TaskProcessRecordDto {
//创建时间 //创建时间
@ApiModelProperty(value = "创建时间", name = "gmtCreate") @ApiModelProperty(value = "创建时间", name = "gmtCreate")

4
src/main/resources/mapper/performance/TaskProcessRecordMapper.xml
View File

@ -94,8 +94,8 @@
</update> </update>
<select id="selectTaskProcessRecordsByTaskId" resultType="com.lz.modules.performance.entity.TaskProcessRecord"> <select id="selectTaskProcessRecordsByTaskId" resultType="com.lz.modules.performance.dto.TaskProcessRecordDto">
select * from lz_task_process_record where task_id=#{taskId} and is_delete = 0 order by gmt_create desc select gmt_create,remark,label,type from lz_task_process_record where task_id=#{taskId} and is_delete = 0 order by gmt_create desc
</select> </select>
<update id="deleteTaskProcessRecordsByTaskId" parameterType="java.lang.Long"> <update id="deleteTaskProcessRecordsByTaskId" parameterType="java.lang.Long">