admin/wisdomisitezw_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

监理月报

Browse Source
This commit is contained in:
pengjie 2023-08-29 17:43:33 +08:00
parent 07ffa451e6
commit ee1c024fd6
27 changed files with 591 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterAlarmController.java
View File

@ -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<LifterAlarm> pageList = lifterAlarmService.page(page, queryWrapper);
return Result.success(pageList);
}

1
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterCurrentDataController.java
View File

@ -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<LifterCurrentData> pageList = lifterCurrentDataService.page(page, queryWrapper);
return Result.success(pageList);
}

1
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterWorkCycleController.java
View File

@ -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<LifterWorkCycle> pageList = lifterWorkCycleService.page(page, queryWrapper);
return Result.success(pageList);
}

1
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneCurrentDataController.java
View File

@ -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<TowerCraneCurrentData> page = PageUtil.getPage(map);
IPage<TowerCraneCurrentData> pageList = towerCraneCurrentDataService.page(page, queryWrapper);
return Result.success(pageList);

1
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneWorkCycleController.java
View File

@ -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<TowerCraneWorkCycle> page = PageUtil.getPage(map);
IPage<TowerCraneWorkCycle> pageList = towerCraneWorkCycleService.page(page, queryWrapper);
return Result.success(pageList);

7
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAcceptInspectRecordController.java
View File

@ -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 {

1
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterAlarmController.java
View File

@ -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<LifterAlarm> pageList = lifterAlarmService.page(page, queryWrapper);
return Result.success(pageList);
}

1
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterCurrentDataController.java
View File

@ -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<LifterCurrentData> pageList = lifterCurrentDataService.page(page, queryWrapper);
return Result.success(pageList);
}

1
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterWorkCycleController.java
View File

@ -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<LifterWorkCycle> pageList = lifterWorkCycleService.page(page, queryWrapper);
return Result.success(pageList);
}

186
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/MonthlyReportController.java Normal file
View File

@ -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<IPage<MonthlyReport>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {
QueryWrapper<MonthlyReport> queryWrapper = QueryGenerator.initPageQueryWrapper(MonthlyReport.class, map);
Page<MonthlyReport> page = PageUtil.getPage(map);
IPage<MonthlyReport> 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<List<MonthlyReport>> queryList(@RequestBody MonthlyReport monthlyReport) {
QueryWrapper<MonthlyReport> queryWrapper = QueryGenerator.initQueryWrapper(monthlyReport);
List<MonthlyReport> 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<Object> 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<MonthlyReport> edit(@RequestBody MonthlyReport monthlyReport) {
Result<MonthlyReport> result = new Result<MonthlyReport>();
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<MonthlyReport> delete(@ApiIgnore @RequestBody MonthlyReport monthlyReport) {
Result<MonthlyReport> result = new Result<MonthlyReport>();
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<MonthlyReport> deleteBatch(@ApiIgnore @RequestBody Map<String, Object> map) {
Result<MonthlyReport> result = new Result<MonthlyReport>();
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<MonthlyReport> queryById(@ApiIgnore @RequestBody MonthlyReport monthlyReportVo) {
Result<MonthlyReport> result = new Result<MonthlyReport>();
MonthlyReport monthlyReport = monthlyReportService.getById(monthlyReportVo.getId());
if (monthlyReport == null) {
result.error500("未找到对应实体");
} else {
result.setResult(monthlyReport);
result.setSuccess(true);
}
return result;
}
}

1
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TowerCraneCurrentDataController.java
View File

@ -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<TowerCraneCurrentData> page = PageUtil.getPage(map);
IPage<TowerCraneCurrentData> pageList = towerCraneCurrentDataService.page(page, queryWrapper);
return Result.success(pageList);

1
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TowerCraneWorkCycleController.java
View File

@ -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<TowerCraneWorkCycle> page = PageUtil.getPage(map);
IPage<TowerCraneWorkCycle> pageList = towerCraneWorkCycleService.page(page, queryWrapper);
return Result.success(pageList);

298
src/main/java/com/zhgd/xmgl/modules/quality/entity/MonthlyReport.java Normal file
View File

@ -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;
}

16
src/main/java/com/zhgd/xmgl/modules/quality/mapper/MonthlyReportMapper.java Normal file
View File

@ -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<MonthlyReport> {
}

5
src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/MonthlyReportMapper.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.quality.mapper.MonthlyReportMapper">
</mapper>

14
src/main/java/com/zhgd/xmgl/modules/quality/service/IMonthlyReportService.java Normal file
View File

@ -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<MonthlyReport> {
}

19
src/main/java/com/zhgd/xmgl/modules/quality/service/impl/MonthlyReportServiceImpl.java Normal file
View File

@ -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<MonthlyReportMapper, MonthlyReport> implements IMonthlyReportService {
}

6
src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDevice.java
View File

@ -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不是）
*/

4
src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDeviceExamine.java
View File

@ -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;
/**
* 审核结果描述

10
src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceServiceImpl.java
View File

@ -71,8 +71,10 @@ public class LiftingDeviceServiceImpl extends ServiceImpl<LiftingDeviceMapper, L
wrapper.eq(LiftingDeviceUse::getDeviceId, liftingDeviceExamineVo.getDeviceId());
wrapper.eq(LiftingDeviceUse::getExamineState, 0);
liftingDeviceUseService.update(wrapper);
liftingDevice.setEquipmentType(getEquipmentType(liftingDeviceExamineVo.getType()));
liftingDevice.setEquipmentUse(liftingDeviceExamineVo.getType() == 6 ? 1 : 0);
if (liftingDeviceExamineVo.getState() == 1) {
liftingDevice.setEquipmentType(getEquipmentType(liftingDeviceExamineVo.getType()));
liftingDevice.setEquipmentUse(liftingDeviceExamineVo.getType() == 6 ? 1 : 0);
}
} else {
// 其他审批
LambdaUpdateWrapper<LiftingDeviceExamine> wrapper = Wrappers.<LiftingDeviceExamine>lambdaUpdate();
@ -83,7 +85,9 @@ public class LiftingDeviceServiceImpl extends ServiceImpl<LiftingDeviceMapper, L
wrapper.eq(LiftingDeviceExamine::getDeviceId, liftingDeviceExamineVo.getDeviceId());
wrapper.eq(LiftingDeviceExamine::getState, 0);
liftingDeviceExamineService.update(wrapper);
liftingDevice.setEquipmentType(getEquipmentType(liftingDeviceExamineVo.getType()));
if (liftingDeviceExamineVo.getState() == 1) {
liftingDevice.setEquipmentType(getEquipmentType(liftingDeviceExamineVo.getType()));
}
}
return this.updateById(liftingDevice);
}

6
src/main/java/com/zhgd/xmgl/modules/wisdom/entity/LifterAlarm.java
View File

@ -49,6 +49,12 @@ public class LifterAlarm implements Serializable {
@Excel(name = "设备名称", width = 15)
@ApiModelProperty(value = "设备名称")
private String devName;
/**
* 设备编号
*/
@Excel(name = "设备编号", width = 15)
@ApiModelProperty(value = "设备编号")
private String devNumber;
/**
* 开始时间
*/

6
src/main/java/com/zhgd/xmgl/modules/wisdom/entity/LifterCurrentData.java
View File

@ -41,6 +41,12 @@ public class LifterCurrentData implements Serializable {
@Excel(name = "设备名称", width = 15)
@ApiModelProperty(value = "设备名称")
private String devName;
/**
* 设备编号
*/
@Excel(name = "设备编号", width = 15)
@ApiModelProperty(value = "设备编号")
private String devNumber;
/**
* 准载,单位kg
*/

6
src/main/java/com/zhgd/xmgl/modules/wisdom/entity/LifterWorkCycle.java
View File

@ -41,6 +41,12 @@ public class LifterWorkCycle implements Serializable {
@Excel(name = "设备名称", width = 15)
@ApiModelProperty(value = "设备名称")
private String devName;
/**
* 设备编号
*/
@Excel(name = "设备编号", width = 15)
@ApiModelProperty(value = "设备编号")
private String devNumber;
/**
* 开始时间
*/

2
src/main/java/com/zhgd/xmgl/modules/wisdom/entity/TowerCraneWorkCycle.java
View File

@ -87,7 +87,7 @@ public class TowerCraneWorkCycle implements Serializable {
* 工作循环最大角度
*/
@Excel(name = "工作循环最大角度", width = 15)
@ApiModelProperty(value = "工作循环最大角度")
@ApiModelProperty(value = "工作循环最大角度")
private String maxAngle;
/**
* 工作循环最小角度

1
src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterAlarmServiceImpl.java
View File

@ -39,6 +39,7 @@ public class LifterAlarmServiceImpl extends ServiceImpl<LifterAlarmMapper, Lifte
lifterAlarm.setDevName(lifter.getDevName());
lifterAlarm.setProjectSn(lifter.getProjectSn());
lifterAlarm.setEngineeringSn(lifter.getEngineeringSn());
lifterAlarm.setDevNumber(lifter.getDevNumber());
return this.save(lifterAlarm);
}

1
src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterCurrentDataServiceImpl.java
View File

@ -35,6 +35,7 @@ public class LifterCurrentDataServiceImpl extends ServiceImpl<LifterCurrentDataM
public boolean saveInfo(LifterCurrentData lifterCurrentData) {
Lifter lifter = lifterService.getById(lifterCurrentData.getDevId());
lifterCurrentData.setDevName(lifter.getDevName());
lifterCurrentData.setDevNumber(lifter.getDevNumber());
lifterCurrentData.setProjectSn(lifter.getProjectSn());
lifterCurrentData.setEngineeringSn(lifter.getEngineeringSn());
lifterCurrentData.setCreateTime(new Date());

7
src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterWorkCycleServiceImpl.java
View File

@ -1,18 +1,14 @@
package com.zhgd.xmgl.modules.wisdom.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.xmgl.modules.wisdom.entity.Lifter;
import com.zhgd.xmgl.modules.wisdom.entity.LifterWorkCycle;
import com.zhgd.xmgl.modules.wisdom.entity.TowerCrane;
import com.zhgd.xmgl.modules.wisdom.entity.TowerCraneWorkCycle;
import com.zhgd.xmgl.modules.wisdom.mapper.LifterWorkCycleMapper;
import com.zhgd.xmgl.modules.wisdom.service.ILifterService;
import com.zhgd.xmgl.modules.wisdom.service.ILifterWorkCycleService;
import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 升降机工作循环数据
* @author： pengj
@ -29,6 +25,7 @@ public class LifterWorkCycleServiceImpl extends ServiceImpl<LifterWorkCycleMappe
public boolean saveInfo(LifterWorkCycle lifterWorkCycle) {
Lifter lifter = lifterService.getById(lifterWorkCycle.getDevId());
lifterWorkCycle.setDevName(lifter.getDevName());
lifterWorkCycle.setDevNumber(lifter.getDevNumber());
lifterWorkCycle.setProjectSn(lifter.getProjectSn());
lifterWorkCycle.setEngineeringSn(lifter.getEngineeringSn());
return this.save(lifterWorkCycle);