diff --git a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectFineRecordController.java b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectFineRecordController.java index 5dea8fa31..a51d78d9d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectFineRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectFineRecordController.java @@ -45,17 +45,17 @@ public class ProjectFineRecordController { * 分页列表查询 * @return */ - @ApiOperation(value = "分页列表查询项目罚款记录", notes = "分页列表查询项目罚款记录", httpMethod = "POST") - @ApiImplicitParams({ - @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), - @ApiImplicitParam(name = "fineType", value = "类型,1奖励,2扣款,3罚款", paramType = "body", required = false, dataType = "String"), - @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "body", required = true, dataType = "Integer"), - @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"), - }) - @PostMapping(value = "/list") - public Result> queryPageList(@RequestBody Map map) { - return Result.success(projectFineRecordService.selectProjectFineRecordPageList(map)); - } + @ApiOperation(value = "分页列表查询项目罚款记录", notes = "分页列表查询项目罚款记录", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "fineType", value = "类型,1奖励,2扣款,3罚款", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "body", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"), + }) + @PostMapping(value = "/list") + public Result> queryPageList(@RequestBody Map map) { + return Result.success(projectFineRecordService.selectProjectFineRecordPageList(map)); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectFineRecord.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectFineRecord.java index 80f9e71cf..ee3206818 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectFineRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectFineRecord.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.project.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -90,9 +91,11 @@ public class ProjectFineRecord implements Serializable { private java.lang.String remarks; @ApiModelProperty(value = "'安全环保部门签名'") - private java.lang.String securityEnvironmentalDepartment; + private java.lang.String securityEnvironmentalDepartmentSign; @ApiModelProperty(value = "'承包商项目经理签名'") private java.lang.String cbsProjectManagerSign; - + @TableField(exist = false) + @ApiModelProperty(value = "企业名称") + private String enterpriseName; } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectFineRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectFineRecordMapper.java index b343efb8f..aaf1a4347 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectFineRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectFineRecordMapper.java @@ -19,5 +19,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface ProjectFineRecordMapper extends BaseMapper { - List selectProjectFineRecordPageList(Page page, @Param("param")Map map); + List selectProjectFineRecordPageList(Page page, @Param("param") Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectFineRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectFineRecordMapper.xml index 893124e49..909587344 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectFineRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectFineRecordMapper.xml @@ -2,15 +2,13 @@ - SELECT a.*,b.enterprise_name from project_fine_record a LEFT JOIN enterprise_info b ON a.enterprise_id=b.id WHERE a.project_sn=#{param.projectSn} - + and a.fine_type=#{param.fineType} ORDER BY a.create_time - - - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/IProjectFineRecordService.java b/src/main/java/com/zhgd/xmgl/modules/project/service/IProjectFineRecordService.java index 1a385586a..cb040643d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/service/IProjectFineRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/service/IProjectFineRecordService.java @@ -15,5 +15,5 @@ import java.util.Map; */ public interface IProjectFineRecordService extends IService { - IPage selectProjectFineRecordPageList(Map map); + IPage selectProjectFineRecordPageList(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectFineRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectFineRecordServiceImpl.java index 9fa3278ae..515a3305e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectFineRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectFineRecordServiceImpl.java @@ -28,11 +28,11 @@ public class ProjectFineRecordServiceImpl extends ServiceImpl selectProjectFineRecordPageList(Map map) { + public IPage selectProjectFineRecordPageList(Map map) { int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString()); int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString()); - Page page = new Page<>(pageNo, pageSize); - List list=projectFineRecordMapper.selectProjectFineRecordPageList(page, map); + Page page = new Page<>(pageNo, pageSize); + List list = projectFineRecordMapper.selectProjectFineRecordPageList(page, map); return page.setRecords(list); } }