diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/controller/SelectController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/controller/SelectController.java index 09d4287b..2e6ef5f5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/controller/SelectController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/controller/SelectController.java @@ -42,6 +42,12 @@ public class SelectController { return service.getMaTypeData(dto); } + @ApiOperation(value = "分部工程下拉选") + @PostMapping("getBranchProject") + public AjaxResult getBranchProject(){ + return service.getBranchProject(); + } + @ApiOperation(value = "标准配置下拉选") @PostMapping("getConfigList") public AjaxResult getConfigList(@RequestBody BmUnit bmUnit) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java index 7ae511ed..0ffe9da5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java @@ -172,4 +172,10 @@ public interface SelectMapper { * @return */ List getConfigList(BmUnit bmUnit); + + /** + * 获取分部工程下拉选 + * @return + */ + List getBranchProject(); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/SelectService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/SelectService.java index d6a1aa7f..6c903114 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/SelectService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/SelectService.java @@ -206,4 +206,10 @@ public interface SelectService { * @return */ AjaxResult getConfigList(BmUnit bmUnit); + + /** + * 分部工程下拉选 + * @return + */ + AjaxResult getBranchProject(); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java index c59ca988..512af818 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java @@ -114,6 +114,18 @@ public class SelectServiceImpl implements SelectService { return AjaxResult.success(groupList); } + @Override + public AjaxResult getBranchProject() { + List list = new ArrayList<>(); + try { + list = mapper.getBranchProject(); + return AjaxResult.success(list); + } catch (Exception e) { + log.error("机具类型-查询失败", e); + return AjaxResult.success(new ArrayList<>()); + } + } + // @Override // public AjaxResult getDictByPidCbx(SelectDto dto) { // List list = new ArrayList<>(); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/controller/UseMaintenanceWarningController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/controller/UseMaintenanceWarningController.java new file mode 100644 index 00000000..05729936 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/controller/UseMaintenanceWarningController.java @@ -0,0 +1,59 @@ +package com.bonus.material.warningAnalysis.controller; + +import com.bonus.common.core.utils.poi.ExcelUtil; +import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.page.TableDataInfo; +import com.bonus.common.log.annotation.SysLog; +import com.bonus.common.log.enums.OperaType; +import com.bonus.material.common.annotation.PreventRepeatSubmit; +import com.bonus.material.warningAnalysis.domain.UseMaintenanceWarningBean; +import com.bonus.material.warningAnalysis.service.UseMaintenanceWarningService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** +* @description 工程在用检修预警 +* @author hay +* @date 2025/3/6 15:32 +*/ +@Api(tags = "工程在用检修预警接口") +@RestController +@RequestMapping("/useMaintenanceWarning") +public class UseMaintenanceWarningController extends BaseController +{ + @Autowired + private UseMaintenanceWarningService service; + + /** + * 查询工程在用检修预警 + */ + @ApiOperation(value = "查询检修预警列表") + @GetMapping("/list") + public TableDataInfo list(UseMaintenanceWarningBean bean) + { + startPage(); + List list = service.getList(bean); + return getDataTable(list); + } + + /** + * 导出 + */ + @ApiOperation(value = "导出检修预警列表") + @PreventRepeatSubmit + @SysLog(title = "检修预警", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出检修预警列表") + @PostMapping("/export") + public void export(HttpServletResponse response, UseMaintenanceWarningBean bean) + { + List list = service.getList(bean); + ExcelUtil util = new ExcelUtil(UseMaintenanceWarningBean.class); + util.exportExcel(response, list, "检修预警数据"); + } + + +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/domain/UseMaintenanceWarningBean.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/domain/UseMaintenanceWarningBean.java new file mode 100644 index 00000000..d65fa951 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/domain/UseMaintenanceWarningBean.java @@ -0,0 +1,100 @@ +package com.bonus.material.warningAnalysis.domain; + +import com.bonus.common.core.annotation.Excel; +import com.bonus.common.core.web.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; +import java.util.Date; + +/** + * 协议管理对象 bm_agreement_info + * + * @author xsheng + * @date 2024-09-26 + */ + + +@Data +@ToString +public class UseMaintenanceWarningBean extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 下次检验日期 + */ + @ApiModelProperty(value = "下次检验日期") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "下次检验日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date nextCheckTime; + + /** + * 类型名称 + */ + @ApiModelProperty(value = "机具类型") + @Excel(name = "机具类型") + private String typeName; + + /** + * 规格型号 + */ + @ApiModelProperty(value = "规格型号") + @Excel(name = "规格型号") + private String typeModelName; + + @ApiModelProperty(value = "设备编码") + @Excel(name = "设备编码") + private String maCode; + + /** + * 往来单位 + */ + @ApiModelProperty(value = "单位名称") + @Excel(name = "单位名称") + private String unitName; + + /** + * 工程标段名称 + */ + @ApiModelProperty(value = "工程名称") + @Excel(name = "工程名称") + private String projectName; + + /** + * 协议ID + */ + private Long agreementId; + + @ApiModelProperty(value = "协议号") + @Excel(name = "协议号") + private String agreementCode; + + /** + * 往来单位id + */ + @ApiModelProperty(value = "往来单位ID") + private Long unitId; + + /** + * 工程标段ID + */ + @ApiModelProperty(value = "工程标段ID") + private Long projectId; + + /** + * 超期天数 + */ + @ApiModelProperty(value = "超期时长(天)") + @Excel(name = "超期时长(天)") + private Long overDays; + + @ApiModelProperty(value = "开始时间") + private String startTime; + + @ApiModelProperty(value = "结束时间") + private String endTime; + + @ApiModelProperty(value = "关键字") + private String keyWord; +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/mapper/UseMaintenanceWarningMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/mapper/UseMaintenanceWarningMapper.java new file mode 100644 index 00000000..df365a57 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/mapper/UseMaintenanceWarningMapper.java @@ -0,0 +1,22 @@ +package com.bonus.material.warningAnalysis.mapper; + +import com.bonus.material.warningAnalysis.domain.UseMaintenanceWarningBean; + +import java.util.List; + +/** + * @description 工程在用检修预警 + * @author hay + * @date 2025/3/6 15:32 + */ +public interface UseMaintenanceWarningMapper +{ + + /** + * 查询 + * @param bean + * @return + */ + public List getList(UseMaintenanceWarningBean bean); + +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/service/UseMaintenanceWarningService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/service/UseMaintenanceWarningService.java new file mode 100644 index 00000000..ef5a549f --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/service/UseMaintenanceWarningService.java @@ -0,0 +1,22 @@ +package com.bonus.material.warningAnalysis.service; + +import com.bonus.material.warningAnalysis.domain.UseMaintenanceWarningBean; + +import java.util.List; + +/** + * @description 工程在用检修预警 + * @author hay + * @date 2025/3/6 15:32 + */ +public interface UseMaintenanceWarningService +{ + + /** + * 查询工程在用检修预警列表 + * @param bean + * @return + */ + public List getList(UseMaintenanceWarningBean bean); + +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/service/impl/UseMaintenanceWarningServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/service/impl/UseMaintenanceWarningServiceImpl.java new file mode 100644 index 00000000..c5f31e46 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/service/impl/UseMaintenanceWarningServiceImpl.java @@ -0,0 +1,40 @@ +package com.bonus.material.warningAnalysis.service.impl; + +import com.bonus.material.warningAnalysis.domain.UseMaintenanceWarningBean; +import com.bonus.material.warningAnalysis.mapper.UseMaintenanceWarningMapper; +import com.bonus.material.warningAnalysis.service.UseMaintenanceWarningService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.*; + +/** + * @description 工程在用检修预警 + * @author hay + * @date 2025/3/6 15:32 + */ +@Service +public class UseMaintenanceWarningServiceImpl implements UseMaintenanceWarningService +{ + + @Resource + private UseMaintenanceWarningMapper mapper; + + + /** + * 查询列表 + * @param bean + * @return + */ + @Override + public List getList(UseMaintenanceWarningBean bean) { + try { + List list = mapper.getList(bean); + return list; + } catch (Exception e) { + e.printStackTrace(); + return new ArrayList<>(); + } + } + +} diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml index 18784dd1..a35d3b37 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml @@ -397,4 +397,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM bm_standard_config WHERE del_flag = 0 + diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/warningAnalysis/UseMaintenanceWarningMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/warningAnalysis/UseMaintenanceWarningMapper.xml new file mode 100644 index 00000000..b5dc763a --- /dev/null +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/warningAnalysis/UseMaintenanceWarningMapper.xml @@ -0,0 +1,48 @@ + + + + + + + \ No newline at end of file