From ee1c024fd67218cf03286034b470a6244eb5b6da Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Tue, 29 Aug 2023 17:43:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=90=86=E6=9C=88=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enterprise/EntLifterAlarmController.java | 1 + .../EntLifterCurrentDataController.java | 1 + .../EntLifterWorkCycleController.java | 1 + .../EntTowerCraneCurrentDataController.java | 1 + .../EntTowerCraneWorkCycleController.java | 1 + .../GovAcceptInspectRecordController.java | 7 +- .../project/LifterAlarmController.java | 1 + .../project/LifterCurrentDataController.java | 1 + .../project/LifterWorkCycleController.java | 1 + .../project/MonthlyReportController.java | 186 +++++++++++ .../TowerCraneCurrentDataController.java | 1 + .../TowerCraneWorkCycleController.java | 1 + .../modules/quality/entity/MonthlyReport.java | 298 ++++++++++++++++++ .../quality/mapper/MonthlyReportMapper.java | 16 + .../mapper/xml/MonthlyReportMapper.xml | 5 + .../service/IMonthlyReportService.java | 14 + .../impl/MonthlyReportServiceImpl.java | 19 ++ .../modules/safety/entity/LiftingDevice.java | 6 + .../safety/entity/LiftingDeviceExamine.java | 4 +- .../impl/LiftingDeviceServiceImpl.java | 10 +- .../modules/wisdom/entity/LifterAlarm.java | 6 + .../wisdom/entity/LifterCurrentData.java | 6 + .../wisdom/entity/LifterWorkCycle.java | 6 + .../wisdom/entity/TowerCraneWorkCycle.java | 2 +- .../service/impl/LifterAlarmServiceImpl.java | 1 + .../impl/LifterCurrentDataServiceImpl.java | 1 + .../impl/LifterWorkCycleServiceImpl.java | 7 +- 27 files changed, 591 insertions(+), 13 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/MonthlyReportController.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/quality/entity/MonthlyReport.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/quality/mapper/MonthlyReportMapper.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/MonthlyReportMapper.xml create mode 100644 src/main/java/com/zhgd/xmgl/modules/quality/service/IMonthlyReportService.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/quality/service/impl/MonthlyReportServiceImpl.java diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterAlarmController.java index e181a5b..3652ce5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterAlarmController.java @@ -69,6 +69,7 @@ public class EntLifterAlarmController { if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.PROJECT_SN))) { queryWrapper.lambda().eq(LifterAlarm::getEngineeringSn, StrUtil.EMPTY); } + queryWrapper.lambda().orderByDesc(LifterAlarm::getCreateTime); IPage pageList = lifterAlarmService.page(page, queryWrapper); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterCurrentDataController.java index 7b5a2a9..2ead4b5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterCurrentDataController.java @@ -76,6 +76,7 @@ public class EntLifterCurrentDataController { if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.PROJECT_SN))) { queryWrapper.lambda().eq(LifterCurrentData::getEngineeringSn, StrUtil.EMPTY); } + queryWrapper.lambda().orderByDesc(LifterCurrentData::getCreateTime); IPage pageList = lifterCurrentDataService.page(page, queryWrapper); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterWorkCycleController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterWorkCycleController.java index 7e9cb8e..e4d5687 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterWorkCycleController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterWorkCycleController.java @@ -67,6 +67,7 @@ public class EntLifterWorkCycleController { if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.PROJECT_SN))) { queryWrapper.lambda().eq(LifterWorkCycle::getEngineeringSn, StrUtil.EMPTY); } + queryWrapper.lambda().orderByDesc(LifterWorkCycle::getCreateTime); IPage pageList = lifterWorkCycleService.page(page, queryWrapper); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneCurrentDataController.java index 7098617..b38bdeb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneCurrentDataController.java @@ -76,6 +76,7 @@ public class EntTowerCraneCurrentDataController { if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.PROJECT_SN))) { queryWrapper.lambda().eq(TowerCraneCurrentData::getEngineeringSn, StrUtil.EMPTY); } + queryWrapper.lambda().orderByDesc(TowerCraneCurrentData::getCreateTime); Page page = PageUtil.getPage(map); IPage pageList = towerCraneCurrentDataService.page(page, queryWrapper); return Result.success(pageList); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneWorkCycleController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneWorkCycleController.java index 53f26a9..830aa07 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneWorkCycleController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneWorkCycleController.java @@ -67,6 +67,7 @@ public class EntTowerCraneWorkCycleController { if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.PROJECT_SN))) { queryWrapper.lambda().eq(TowerCraneWorkCycle::getEngineeringSn, StrUtil.EMPTY); } + queryWrapper.lambda().orderByDesc(TowerCraneWorkCycle::getCreateTime); Page page = PageUtil.getPage(map); IPage pageList = towerCraneWorkCycleService.page(page, queryWrapper); return Result.success(pageList); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAcceptInspectRecordController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAcceptInspectRecordController.java index 812e56b..cb5b508 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAcceptInspectRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAcceptInspectRecordController.java @@ -150,7 +150,10 @@ public class GovAcceptInspectRecordController { acceptInspectRecord.setDeadline(null); acceptInspectRecord.setInspectUser(null); } - acceptInspectRecord.setState(1); + if (acceptInspectRecordEntity.getState() == 0) { + acceptInspectRecord.setState(1); + acceptInspectRecord.setCreateTime(new Date()); + } boolean ok = acceptInspectRecordService.updateById(acceptInspectRecord); if (ok) { result.success("修改成功!"); @@ -222,7 +225,7 @@ public class GovAcceptInspectRecordController { if (acceptInspectRecordEntity == null) { result.error500("未找到对应实体"); } else { - boolean ok = acceptInspectRecordService.examine(acceptInspectRecordEntity); + boolean ok = acceptInspectRecordService.examine(acceptInspectRecord); if (ok) { result.success("审批成功!"); } else { diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterAlarmController.java index fb25460..9cf14c2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterAlarmController.java @@ -69,6 +69,7 @@ public class LifterAlarmController { if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.PROJECT_SN))) { queryWrapper.lambda().eq(LifterAlarm::getEngineeringSn, StrUtil.EMPTY); } + queryWrapper.lambda().orderByDesc(LifterAlarm::getCreateTime); IPage pageList = lifterAlarmService.page(page, queryWrapper); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterCurrentDataController.java index 8c33467..5af792a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterCurrentDataController.java @@ -76,6 +76,7 @@ public class LifterCurrentDataController { if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.PROJECT_SN))) { queryWrapper.lambda().eq(LifterCurrentData::getEngineeringSn, StrUtil.EMPTY); } + queryWrapper.lambda().orderByDesc(LifterCurrentData::getCreateTime); IPage pageList = lifterCurrentDataService.page(page, queryWrapper); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterWorkCycleController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterWorkCycleController.java index 06de4f8..8fbce33 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterWorkCycleController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterWorkCycleController.java @@ -67,6 +67,7 @@ public class LifterWorkCycleController { if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.PROJECT_SN))) { queryWrapper.lambda().eq(LifterWorkCycle::getEngineeringSn, StrUtil.EMPTY); } + queryWrapper.lambda().orderByDesc(LifterWorkCycle::getCreateTime); IPage pageList = lifterWorkCycleService.page(page, queryWrapper); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/MonthlyReportController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/MonthlyReportController.java new file mode 100644 index 0000000..4836611 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/MonthlyReportController.java @@ -0,0 +1,186 @@ +package com.zhgd.xmgl.modules.basicdata.controller.project; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.annotation.OperLog; +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.jeecg.common.util.PageUtil; +import com.zhgd.xmgl.modules.quality.entity.MonthlyReport; +import com.zhgd.xmgl.modules.quality.service.IMonthlyReportService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.MapUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + + +/** + * @Title: Controller + * @Description: 监理月报 + * @author： pengj + * @date： 2023-08-29 + * @version： V1.0 + */ +@RestController +@RequestMapping("/project/monthlyReport") +@Slf4j +@Api(tags = "监理月报管理") +public class MonthlyReportController { + @Autowired + private IMonthlyReportService monthlyReportService; + + /** + * 分页列表查询 + * + * @return + */ + @OperLog(operModul = "监理月报管理", operType = "分页查询", operDesc = "分页列表查询监理月报信息") + @ApiOperation(value = " 分页列表查询监理月报信息", notes = "分页列表查询监理月报信息", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "current", value = "页数", paramType = "body", required = true, defaultValue = "1", dataType = "Integer"), + @ApiImplicitParam(name = "size", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer") + }) + @PostMapping(value = "/page") + public Result> queryPageList(@ApiIgnore @RequestBody Map map) { + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(MonthlyReport.class, map); + Page page = PageUtil.getPage(map); + IPage pageList = monthlyReportService.page(page, queryWrapper); + return Result.success(pageList); + } + + /** + * 列表查询 + * + * @param monthlyReport + * @return + */ + @OperLog(operModul = "监理月报管理", operType = "列表查询", operDesc = "列表查询监理月报信息") + @ApiOperation(value = " 列表查询监理月报信息", notes = "列表查询监理月报信息", httpMethod = "POST") + @PostMapping(value = "/list") + public Result> queryList(@RequestBody MonthlyReport monthlyReport) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(monthlyReport); + List list = monthlyReportService.list(queryWrapper); + return Result.success(list); + } + + + /** + * 添加 + * + * @param monthlyReport + * @return + */ + @OperLog(operModul = "监理月报管理", operType = "新增", operDesc = "添加监理月报信息") + @ApiOperation(value = " 添加监理月报信息", notes = "添加监理月报信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody MonthlyReport monthlyReport) { + monthlyReportService.save(monthlyReport); + return Result.success("添加成功！"); + } + + /** + * 编辑 + * + * @param monthlyReport + * @return + */ + @OperLog(operModul = "监理月报管理", operType = "修改", operDesc = "编辑监理月报信息") + @ApiOperation(value = "编辑监理月报信息", notes = "编辑监理月报信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody MonthlyReport monthlyReport) { + Result result = new Result(); + MonthlyReport monthlyReportEntity = monthlyReportService.getById(monthlyReport.getId()); + if (monthlyReportEntity == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = monthlyReportService.updateById(monthlyReport); + if (ok) { + result.success("修改成功!"); + } else { + result.success("操作失败!"); + } + } + + return result; + } + + /** + * 通过id删除 + * + * @return + */ + @OperLog(operModul = "监理月报管理", operType = "删除", operDesc = "删除监理月报信息") + @ApiOperation(value = "删除监理月报信息", notes = "删除监理月报信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "监理月报ID", paramType = "body", required = true, dataType = "Integer") + @PostMapping(value = "/delete") + public Result delete(@ApiIgnore @RequestBody MonthlyReport monthlyReport) { + Result result = new Result(); + MonthlyReport monthlyReportEntity = monthlyReportService.getById(monthlyReport.getId()); + if (monthlyReportEntity == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = monthlyReportService.removeById(monthlyReport.getId()); + if (ok) { + result.success("删除成功!"); + } else { + result.success("操作失败!"); + } + } + return result; + } + + /** + * 批量删除 + * + * @return + */ + @OperLog(operModul = "监理月报管理", operType = "批量删除", operDesc = "批量删除监理月报信息") + @ApiOperation(value = "批量删除监理月报信息", notes = "批量删除监理月报信息", httpMethod = "POST") + @ApiImplicitParam(name = "ids", value = "监理月报ID字符串", paramType = "body", required = true, dataType = "String") + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@ApiIgnore @RequestBody Map map) { + Result result = new Result(); + String ids = MapUtils.getString(map, "ids"); + if (ids == null || "".equals(ids.trim())) { + result.error500("参数不识别！"); + } else { + this.monthlyReportService.removeByIds(Arrays.asList(ids.split(","))); + result.success("删除成功!"); + } + return result; + } + + /** + * 通过id查询 + * + * @return + */ + @OperLog(operModul = "监理月报管理", operType = "查询", operDesc = "通过id查询监理月报信息") + @ApiOperation(value = "通过id查询监理月报信息", notes = "通过id查询监理月报信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "监理月报ID", paramType = "body", required = true, dataType = "Integer") + @PostMapping(value = "/queryById") + public Result queryById(@ApiIgnore @RequestBody MonthlyReport monthlyReportVo) { + Result result = new Result(); + MonthlyReport monthlyReport = monthlyReportService.getById(monthlyReportVo.getId()); + if (monthlyReport == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(monthlyReport); + result.setSuccess(true); + } + return result; + } +} diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TowerCraneCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TowerCraneCurrentDataController.java index 573e992..e5948a3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TowerCraneCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TowerCraneCurrentDataController.java @@ -76,6 +76,7 @@ public class TowerCraneCurrentDataController { if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.PROJECT_SN))) { queryWrapper.lambda().eq(TowerCraneCurrentData::getEngineeringSn, StrUtil.EMPTY); } + queryWrapper.lambda().orderByDesc(TowerCraneCurrentData::getCreateTime); Page page = PageUtil.getPage(map); IPage pageList = towerCraneCurrentDataService.page(page, queryWrapper); return Result.success(pageList); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TowerCraneWorkCycleController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TowerCraneWorkCycleController.java index 6a35a5a..6503cb6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TowerCraneWorkCycleController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TowerCraneWorkCycleController.java @@ -66,6 +66,7 @@ public class TowerCraneWorkCycleController { if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.PROJECT_SN))) { queryWrapper.lambda().eq(TowerCraneWorkCycle::getEngineeringSn, StrUtil.EMPTY); } + queryWrapper.lambda().orderByDesc(TowerCraneWorkCycle::getCreateTime); Page page = PageUtil.getPage(map); IPage pageList = towerCraneWorkCycleService.page(page, queryWrapper); return Result.success(pageList); diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/entity/MonthlyReport.java b/src/main/java/com/zhgd/xmgl/modules/quality/entity/MonthlyReport.java new file mode 100644 index 0000000..48233d1 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/quality/entity/MonthlyReport.java @@ -0,0 +1,298 @@ +package com.zhgd.xmgl.modules.quality.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: 监理月报 + * @author： pengj + * @date： 2023-08-29 + * @version： V1.0 + */ +@Data +@TableName("monthly_report") +@ApiModel(value = "MonthlyReport实体类", description = "MonthlyReport") +public class MonthlyReport implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 监理月报 + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "监理月报") + private Long id; + /** + * 总监工程师名称 + */ + @Excel(name = "总监工程师名称", width = 15) + @ApiModelProperty(value = "总监工程师名称") + private String chiefInspectorName; + /** + * 完成时间 + */ + @Excel(name = "完成时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "完成时间") + private Date completeTime; + /** + * 年份 + */ + @Excel(name = "年份", width = 15) + @ApiModelProperty(value = "年份") + private Integer year; + /** + * 月份 + */ + @Excel(name = "月份", width = 15) + @ApiModelProperty(value = "月份") + private Integer month; + /** + * 期数 + */ + @Excel(name = "期数", width = 15) + @ApiModelProperty(value = "期数") + private Integer stage; + /** + * 编制人员 + */ + @Excel(name = "编制人员", width = 15) + @ApiModelProperty(value = "编制人员") + private Object organizationPersons; + /** + * 土建专业监理人员 + */ + @Excel(name = "土建专业监理人员", width = 15) + @ApiModelProperty(value = "土建专业监理人员") + private Object civilEngineeringPersons; + /** + * 水暖专业监理人员 + */ + @Excel(name = "水暖专业监理人员", width = 15) + @ApiModelProperty(value = "水暖专业监理人员") + private Object plumbingPersons; + /** + * 电气专业监理人员 + */ + @Excel(name = "电气专业监理人员", width = 15) + @ApiModelProperty(value = "电气专业监理人员") + private Object electricalPersons; + /** + * 签认意见 + */ + @Excel(name = "签认意见", width = 15) + @ApiModelProperty(value = "签认意见") + private Object signOpinion; + /** + * 监理单位名称 + */ + @Excel(name = "监理单位名称", width = 15) + @ApiModelProperty(value = "监理单位名称") + private Object designCompanyName; + /** + * 建设单位名称 + */ + @Excel(name = "建设单位名称", width = 15) + @ApiModelProperty(value = "建设单位名称") + private Object buildCompanyName; + /** + * 施工单位名称 + */ + @Excel(name = "施工单位名称", width = 15) + @ApiModelProperty(value = "施工单位名称") + private Object constructionCompanyName; + /** + * 实际完成 + */ + @Excel(name = "实际完成", width = 15) + @ApiModelProperty(value = "实际完成") + private Object actualCompletion; + /** + * 原因分析 + */ + @Excel(name = "原因分析", width = 15) + @ApiModelProperty(value = "原因分析") + private Object reasonAnalysis; + /** + * 专题报告例会纪要 + */ + @Excel(name = "专题报告例会纪要", width = 15) + @ApiModelProperty(value = "专题报告例会纪要") + private Object meetingSummary; + /** + * 内容简要 + */ + @Excel(name = "内容简要", width = 15) + @ApiModelProperty(value = "内容简要") + private Object meetingContentBriefly; + /** + * 工程质量签证 + */ + @Excel(name = "工程质量签证", width = 15) + @ApiModelProperty(value = "工程质量签证") + private Object engineeringQualityVisa; + /** + * 工程质量内容简要 + */ + @Excel(name = "工程质量内容简要", width = 15) + @ApiModelProperty(value = "工程质量内容简要") + private Object engineeringContentBriefly; + /** + * 向施工单位发送的通知、指示、指令 + */ + @Excel(name = "向施工单位发送的通知、指示、指令", width = 15) + @ApiModelProperty(value = "向施工单位发送的通知、指示、指令") + private Object instructions; + /** + * 指令内容简要 + */ + @Excel(name = "指令内容简要", width = 15) + @ApiModelProperty(value = "指令内容简要") + private Object instructionsContentBriefly; + /** + * 施工单位提出的各种报告 + */ + @Excel(name = "施工单位提出的各种报告", width = 15) + @ApiModelProperty(value = "施工单位提出的各种报告") + private Object presentation; + /** + * 报告内容简要 + */ + @Excel(name = "报告内容简要", width = 15) + @ApiModelProperty(value = "报告内容简要") + private Object presentationContentBriefly; + /** + * 工程付款签证 + */ + @Excel(name = "工程付款签证", width = 15) + @ApiModelProperty(value = "工程付款签证") + private Object projectPaymentVisa; + /** + * 工程付款内容简要 + */ + @Excel(name = "工程付款内容简要", width = 15) + @ApiModelProperty(value = "工程付款内容简要") + private Object projectPaymentContentBriefly; + /** + * 本月完成情况 + */ + @Excel(name = "本月完成情况", width = 15) + @ApiModelProperty(value = "本月完成情况") + private Object thisMonthCompletion; + /** + * 下月计划完成 + */ + @Excel(name = "下月计划完成", width = 15) + @ApiModelProperty(value = "下月计划完成") + private Object nextMonthPlan; + /** + * 工程质量 + */ + @Excel(name = "工程质量", width = 15) + @ApiModelProperty(value = "工程质量") + private Object constructionQuality; + /** + * 安全、环保、文明生产 + */ + @Excel(name = "安全、环保、文明生产", width = 15) + @ApiModelProperty(value = "安全、环保、文明生产") + private Object civilizationContent; + /** + * 费用支付 + */ + @Excel(name = "费用支付", width = 15) + @ApiModelProperty(value = "费用支付") + private Object costContent; + /** + * 合同管理 + */ + @Excel(name = "合同管理", width = 15) + @ApiModelProperty(value = "合同管理") + private Object contractManagement; + /** + * 存在的问题 + */ + @Excel(name = "存在的问题", width = 15) + @ApiModelProperty(value = "存在的问题") + private Object existingProblems; + /** + * 总监工作小结 + */ + @Excel(name = "总监工作小结", width = 15) + @ApiModelProperty(value = "总监工作小结") + private Object workSummary; + /** + * 下月工作计划 + */ + @Excel(name = "下月工作计划", width = 15) + @ApiModelProperty(value = "下月工作计划") + private Object nextMonthWorkPlan; + /** + * 本月大事记录 + */ + @Excel(name = "本月大事记录", width = 15) + @ApiModelProperty(value = "本月大事记录") + private Object thisMonthEventsRecord; + /** + * 图片路径（多个用英文逗号隔开） + */ + @Excel(name = "图片路径（多个用英文逗号隔开）", width = 15) + @ApiModelProperty(value = "图片路径（多个用英文逗号隔开）") + private Object imageFiles; + /** + * 附件 + */ + @Excel(name = "附件", width = 15) + @ApiModelProperty(value = "附件") + private String annexFile; + /** + * 创建时间 + */ + @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间") + private Date createTime; + /** + * 创建人 + */ + @Excel(name = "创建人", width = 15) + @ApiModelProperty(value = "创建人") + private String createBy; + /** + * 最后操作时间 + */ + @Excel(name = "最后操作时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "最后操作时间") + private Date updateTime; + /** + * 最后操作人 + */ + @Excel(name = "最后操作人", width = 15) + @ApiModelProperty(value = "最后操作人") + private String updateBy; + /** + * 工程sn + */ + @Excel(name = "工程sn", width = 15) + @ApiModelProperty(value = "工程sn") + private String engineeringSn; + /** + * 项目sn + */ + @Excel(name = "项目sn", width = 15) + @ApiModelProperty(value = "项目sn") + private String projectSn; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/MonthlyReportMapper.java b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/MonthlyReportMapper.java new file mode 100644 index 0000000..9990fa8 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/MonthlyReportMapper.java @@ -0,0 +1,16 @@ +package com.zhgd.xmgl.modules.quality.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhgd.xmgl.modules.quality.entity.MonthlyReport; +import org.apache.ibatis.annotations.Mapper; + +/** + * @Description: 监理月报 + * @author： pengj + * @date： 2023-08-29 + * @version： V1.0 + */ +@Mapper +public interface MonthlyReportMapper extends BaseMapper { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/MonthlyReportMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/MonthlyReportMapper.xml new file mode 100644 index 0000000..bf8ff83 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/MonthlyReportMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/IMonthlyReportService.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/IMonthlyReportService.java new file mode 100644 index 0000000..ca4313e --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/IMonthlyReportService.java @@ -0,0 +1,14 @@ +package com.zhgd.xmgl.modules.quality.service; + +import com.zhgd.xmgl.modules.quality.entity.MonthlyReport; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 监理月报 + * @author： pengj + * @date： 2023-08-29 + * @version： V1.0 + */ +public interface IMonthlyReportService extends IService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/MonthlyReportServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/MonthlyReportServiceImpl.java new file mode 100644 index 0000000..2e9ee52 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/MonthlyReportServiceImpl.java @@ -0,0 +1,19 @@ +package com.zhgd.xmgl.modules.quality.service.impl; + +import com.zhgd.xmgl.modules.quality.entity.MonthlyReport; +import com.zhgd.xmgl.modules.quality.mapper.MonthlyReportMapper; +import com.zhgd.xmgl.modules.quality.service.IMonthlyReportService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 监理月报 + * @author： pengj + * @date： 2023-08-29 + * @version： V1.0 + */ +@Service +public class MonthlyReportServiceImpl extends ServiceImpl implements IMonthlyReportService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDevice.java b/src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDevice.java index ac42a4c..60e3a2e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDevice.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDevice.java @@ -55,6 +55,12 @@ public class LiftingDevice implements Serializable { @Excel(name = "产权单位", width = 15) @ApiModelProperty(value = "产权单位") private String enterpriseName; + /** + * 黑匣子信息 + */ + @Excel(name = "黑匣子信息", width = 15) + @ApiModelProperty(value = "黑匣子信息") + private String blackBox; /** * 是否新设备（1是，2不是） */ diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDeviceExamine.java b/src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDeviceExamine.java index d215cae..7f33680 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDeviceExamine.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDeviceExamine.java @@ -68,10 +68,10 @@ public class LiftingDeviceExamine implements Serializable { @ApiModelProperty(value = "审批状态(0:审核中;1:审批通过;2:审批驳回)") private Integer state; /** - * 审批类型(1:产权备案;2:设备延期;3:遗失补证;4:设备报废;5:设备注销;) + * 审批类型(1:产权备案;2:设备延期;3:遗失补证;4:设备报废;5:设备注销;6:设备安装;7:设备拆卸) */ @Excel(name = "审批类型(1:产权备案;2:设备延期;3:遗失补证;4:设备报废;5:设备注销;)", width = 15) - @ApiModelProperty(value = "审批类型(1:产权备案;2:设备延期;3:遗失补证;4:设备报废;5:设备注销;)") + @ApiModelProperty(value = "审批类型(1:产权备案;2:设备延期;3:遗失补证;4:设备报废;5:设备注销;6:设备安装;7:设备拆卸)") private Integer type; /** * 审核结果描述 diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceServiceImpl.java index ed99471..b271f37 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceServiceImpl.java @@ -71,8 +71,10 @@ public class LiftingDeviceServiceImpl extends ServiceImpl wrapper = Wrappers.lambdaUpdate(); @@ -83,7 +85,9 @@ public class LiftingDeviceServiceImpl extends ServiceImpl