admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

项目罚款记录修改

Browse Source
This commit is contained in:
guoshengxiong 2024-05-29 16:14:06 +08:00
parent 4c6fa89e44
commit 753321e26e
6 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectFineRecordController.java
View File

@ -53,7 +53,7 @@ public class ProjectFineRecordController {
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"), @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"),
}) })
@PostMapping(value = "/list") @PostMapping(value = "/list")
public Result<IPage<EntityMap>> queryPageList(@RequestBody Map<String,Object> map) { public Result<IPage<ProjectFineRecord>> queryPageList(@RequestBody Map<String, Object> map) {
return Result.success(projectFineRecordService.selectProjectFineRecordPageList(map)); return Result.success(projectFineRecordService.selectProjectFineRecordPageList(map));
} }

7
src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectFineRecord.java
View File

@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.project.entity;
import java.io.Serializable; import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@ -90,9 +91,11 @@ public class ProjectFineRecord implements Serializable {
private java.lang.String remarks; private java.lang.String remarks;
@ApiModelProperty(value = "'安全环保部门签名'") @ApiModelProperty(value = "'安全环保部门签名'")
private java.lang.String securityEnvironmentalDepartment; private java.lang.String securityEnvironmentalDepartmentSign;
@ApiModelProperty(value = "'承包商项目经理签名'") @ApiModelProperty(value = "'承包商项目经理签名'")
private java.lang.String cbsProjectManagerSign; private java.lang.String cbsProjectManagerSign;
@TableField(exist = false)
@ApiModelProperty(value = "企业名称")
private String enterpriseName;
} }

2
src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectFineRecordMapper.java
View File

@ -19,5 +19,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@Mapper @Mapper
public interface ProjectFineRecordMapper extends BaseMapper<ProjectFineRecord> { public interface ProjectFineRecordMapper extends BaseMapper<ProjectFineRecord> {
List<EntityMap> selectProjectFineRecordPageList(Page<EntityMap> page, @Param("param")Map<String, Object> map); List<ProjectFineRecord> selectProjectFineRecordPageList(Page<ProjectFineRecord> page, @Param("param") Map<String, Object> map);
} }

4
src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectFineRecordMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.project.mapper.ProjectFineRecordMapper"> <mapper namespace="com.zhgd.xmgl.modules.project.mapper.ProjectFineRecordMapper">
<select id="selectProjectFineRecordPageList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap"> <select id="selectProjectFineRecordPageList" resultType="com.zhgd.xmgl.modules.project.entity.ProjectFineRecord">
SELECT a.*,b.enterprise_name SELECT a.*,b.enterprise_name
from project_fine_record a LEFT JOIN enterprise_info b ON a.enterprise_id=b.id from project_fine_record a LEFT JOIN enterprise_info b ON a.enterprise_id=b.id
WHERE a.project_sn=#{param.projectSn} WHERE a.project_sn=#{param.projectSn}
@ -10,7 +10,5 @@
and a.fine_type=#{param.fineType} and a.fine_type=#{param.fineType}
</if> </if>
ORDER BY a.create_time ORDER BY a.create_time
</select> </select>
</mapper> </mapper>

2
src/main/java/com/zhgd/xmgl/modules/project/service/IProjectFineRecordService.java
View File

@ -15,5 +15,5 @@ import java.util.Map;
*/ */
public interface IProjectFineRecordService extends IService<ProjectFineRecord> { public interface IProjectFineRecordService extends IService<ProjectFineRecord> {
IPage<EntityMap> selectProjectFineRecordPageList(Map<String, Object> map); IPage<ProjectFineRecord> selectProjectFineRecordPageList(Map<String, Object> map);
} }

6
src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectFineRecordServiceImpl.java
View File

@ -28,11 +28,11 @@ public class ProjectFineRecordServiceImpl extends ServiceImpl<ProjectFineRecordM
private ProjectFineRecordMapper projectFineRecordMapper; private ProjectFineRecordMapper projectFineRecordMapper;
@Override @Override
public IPage<EntityMap> selectProjectFineRecordPageList(Map<String, Object> map) { public IPage<ProjectFineRecord> selectProjectFineRecordPageList(Map<String, Object> map) {
int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString()); int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString());
int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString()); int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString());
Page<EntityMap> page = new Page<>(pageNo, pageSize); Page<ProjectFineRecord> page = new Page<>(pageNo, pageSize);
List<EntityMap> list=projectFineRecordMapper.selectProjectFineRecordPageList(page, map); List<ProjectFineRecord> list = projectFineRecordMapper.selectProjectFineRecordPageList(page, map);
return page.setRecords(list); return page.setRecords(list);
} }
} }