Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
834c1a8d 由 张雷
选项

Merge remote-tracking branch 'origin/master' into master

2 个父辈 11d65810 96935328
全部展开
内嵌 并排
正在显示 25 个修改的文件 包含 532 行增加 和 48 行删除
sk-module-biz/src/main/java/com/skua/modules/ajh/controller/AjhRectificationInfoController.java
......@@ -347,7 +347,6 @@ public class AjhRectificationInfoController {
return result;
}
@ApiOperation(value="安全态势总览数据统计:统计教育+题库", notes="安全态势总览数据统计:统计教育+题库")
@RequestMapping(value = "/jyCensus", method = RequestMethod.GET)
public Result<Map<String,Object>> jyCensus(@RequestParam(name="now",required=true) String now) {
......
sk-module-biz/src/main/java/com/skua/modules/ajh/mapper/xml/AjhRectificationInfoMapper.xml
......@@ -53,9 +53,9 @@
<select id="yhCensus" resultType="java.util.Map">
SELECT
sd.depart_name,
ifnull( SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 7 ) = #{nowMonth} THEN 1 ELSE 0 END ),0) as now,
ifnull( SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 4 ) =#{nowYear} THEN 1 ELSE 0 END),0) as nowYear,
ifnull( SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 4 ) =#{lastYear} THEN 1 ELSE 0 END ),0) as last_year
ifnull( SUM( CASE WHEN LEFT ( sr.rec_ord_report_date, 7 ) = #{nowMonth} THEN 1 ELSE 0 END ),0) as now,
ifnull( SUM( CASE WHEN LEFT ( sr.rec_ord_report_date, 4 ) =#{nowYear} THEN 1 ELSE 0 END),0) as nowYear,
ifnull( SUM( CASE WHEN LEFT ( sr.rec_ord_report_date, 4 ) =#{lastYear} THEN 1 ELSE 0 END ),0) as last_year
FROM
sys_factory_info sf
LEFT JOIN sys_depart sd ON sf.depart_id = sd.id
......
sk-module-biz/src/main/java/com/skua/modules/emergency/service/impl/EmergencyRiskEventServiceImpl.java
......@@ -267,7 +267,7 @@ public class EmergencyRiskEventServiceImpl extends ServiceImpl<EmergencyRiskEven
// 风险排查
sql += " left join ( select depart_id ,count(id) 'count' from danger_inspection_record where report_date >= '"+startDate+" 00:00:00' and report_date <='"+endDate+" 23:59:59' group by depart_id ) bb on bb.depart_id = d.id ";
//实际完成数量
sql += " left join ( select depart_id ,count(id) 'count' from danger_inspection_record where status = '2' and end_date >= '"+startDate+" 00:00:00' and end_date <='"+endDate+" 23:59:59' group by depart_id ) eee on eee.depart_id = d.id ";
sql += " left join ( select depart_id ,count(id) 'count' from danger_inspection_record where status = '2' and end_date >= '"+startDate+" 00:00:00' and end_date <='"+endDate+" 23:59:59' group by depart_id ) ee on ee.depart_id = d.id ";
// 异常
sql += " left join ( select t.depart_id , count(1) 'count' from problem_report_plan t where t.report_time >='"+startDate+"' and t.report_time <='"+endDate+"' group by t.depart_id) cc on cc.depart_id = d.id";
......
sk-module-biz/src/main/java/com/skua/modules/emergency/vo/DangerEventOverviewVO.java
......@@ -16,7 +16,7 @@ public class DangerEventOverviewVO {
@ApiModelProperty(value = "厂站名称")
private String departName;
/**隐患处理数*/
@ApiModelProperty(value = "隐患处理数")
@ApiModelProperty(value = "隐患处理中")
private Integer yhNoHandleNum ;
/**隐患已处理数*/
@ApiModelProperty(value = "隐患已处理数")
......
sk-module-biz/src/main/java/com/skua/modules/report/controller/OperationDailyController.java
......@@ -88,11 +88,12 @@ public class OperationDailyController {
dataMap = commonSqlService.queryForMap(sql);
operationDailyVO.setIncreaseDsdh(JSUtils.subtract(operationDailyVO.getDsdh(), dataMap.get("dsdh")));
// 5 污泥脱水公司
dataViewName3a24 = ReportViewUtil.buildView(ReportConstant.view3a24,"WNL", departIds, previousDay,previousDay);
sql = " select GROUP_CONCAT( d.depart_name SEPARATOR ',' ) AS depart_name from "+dataViewName3a24+ " aaa left join sys_depart d on d.id = aaa.depart_id where ifnull(aaa.WNL,0) = 0";
dataMap = commonSqlService.queryForMap(sql);
operationDailyVO.setWnDepartName( ConvertUtils.getString(dataMap.get("depart_name"),"无") );
operationDailyVO.setWnDepartName( ConvertUtils.getString(dataMap.get("depart_name"),"无").replaceAll(",","，") );
// 6 污泥浓度公司
String dataViewName9bff = ReportViewUtil.buildView(ReportConstant.view9bff,"AYHGMLSS,BYHGMLSS,CYHGMLSS,DYHGMLSS,EYHGMLSS,FYHGMLSS", departIds, dateTIme,dateTIme);
......@@ -108,7 +109,7 @@ public class OperationDailyController {
sql += " left join sys_factory_info bbb on bbb.depart_id = aaa.depart_id ) ccc ";
sql += " left join sys_depart d on ccc.depart_id = d.id where ccc.result = 1";
dataMap = commonSqlService.queryForMap(sql);
operationDailyVO.setMlssDepartName( ConvertUtils.getString(dataMap.get("depart_name"),"无") );
operationDailyVO.setMlssDepartName( ConvertUtils.getString(dataMap.get("depart_name"),"无").replaceAll(",","，") );
// 7 进水超标公司
// JSZL,JSCOD,JSAD,JSZD,JSPH
......@@ -127,7 +128,7 @@ public class OperationDailyController {
sql += ") bbb on bbb.depart_id = aaa.depart_id ";
sql += " ) ccc left join sys_depart d on ccc.depart_id = d.id where ccc.result = 1";
dataMap = commonSqlService.queryForMap(sql);
operationDailyVO.setJsDepartName( ConvertUtils.getString(dataMap.get("depart_name"),"无") );
operationDailyVO.setJsDepartName( ConvertUtils.getString(dataMap.get("depart_name"),"无").replaceAll(",","，") );
// 8 出水超标部门
dataViewName2119 = ReportViewUtil.buildView(ReportConstant.view2119,ReportConstant.field_2119_CS, departIds, dateTIme,dateTIme);
sql = " select ifnull(GROUP_CONCAT(d.depart_name),'无') depart_name from ( select aaa.depart_id,";
......@@ -144,15 +145,15 @@ public class OperationDailyController {
sql += " ) bbb on bbb.depart_id = aaa.depart_id ";
sql += " ) ccc left join sys_depart d on ccc.depart_id = d.id where ccc.result = 1";
dataMap = commonSqlService.queryForMap(sql);
operationDailyVO.setCsDepartName( ConvertUtils.getString(dataMap.get("depart_name"),"无") );
operationDailyVO.setCsDepartName( ConvertUtils.getString(dataMap.get("depart_name"),"无").replaceAll(",","，") );
// 9 电耗超标公司
dataViewName2119 = ReportViewUtil.buildView(ReportConstant.view2119,"CSL", departIds, dateTIme,dateTIme);
dataViewName3a24 = ReportViewUtil.buildView(ReportConstant.view3a24,"DLHJ", departIds, dateTIme,dateTIme);
sql ="select GROUP_CONCAT(d.depart_name,',') depart_name from "+dataViewName3a24+ " aaa left join "+dataViewName2119+ " bbb on aaa.depart_id = bbb.depart_id and aaa.time = bbb.time ";
sql ="select GROUP_CONCAT(d.depart_name) depart_name from "+dataViewName3a24+ " aaa left join "+dataViewName2119+ " bbb on aaa.depart_id = bbb.depart_id and aaa.time = bbb.time ";
sql += " left join report_target_config rtc on rtc.depart_id = aaa.depart_id and rtc.target_year = "+DateUtils.getDateYear(dateTIme);
sql += " left join sys_depart d on d.id = aaa.depart_id where (aaa.DLHJ/bbb.CSL ) > ifnull(rtc.target_power,999999999.99)";
dataMap = commonSqlService.queryForMap(sql);
operationDailyVO.setDhDepartName( ConvertUtils.getString(dataMap.get("depart_name"),"无") );
operationDailyVO.setDhDepartName( ConvertUtils.getString(dataMap.get("depart_name"),"无").replaceAll(",","，") );
//10 药剂单耗公司
dataViewName3a24 = ReportViewUtil.buildView(ReportConstant.view3a24,ReportConstant.fieldYj, departIds, dateTIme,dateTIme);
......@@ -184,7 +185,7 @@ public class OperationDailyController {
sql += " left join report_target_config rtc on rtc.depart_id = aa.depart_id and rtc.target_year = '"+ DateUtils.getDateYear(dateTIme)+"'";
sql += " ) ccc left join sys_depart d on d.id = ccc.depart_id where ccc.result =1 ";
dataMap = commonSqlService.queryForMap(sql);
operationDailyVO.setYhDepartName( ConvertUtils.getString(dataMap.get("depart_name"),"无") );
operationDailyVO.setYhDepartName( ConvertUtils.getString(dataMap.get("depart_name"),"无").replaceAll(",","，") );
if("1818215543140909056".equals(departId)){
String dataViewName6643 = ReportViewUtil.buildView(ReportConstant.view6643,"GSL", departIds, dateTIme,dateTIme);
......@@ -200,4 +201,5 @@ public class OperationDailyController {
return operationDailyVO;
}
}
......
sk-module-datafill/src/main/java/com/skua/modules/report/controller/OperationReportController.java
......@@ -37,10 +37,12 @@ public class OperationReportController {
public Result<ProductDataVO> reportDataInfo(
@RequestParam(name="year") Integer year,
@RequestParam(name="season") Integer season,
@RequestParam(name="startDate") String startDate,
@RequestParam(name="endDate") String endDate,
HttpServletRequest req) {
Result<ProductDataVO> result = new Result<ProductDataVO>();
String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
ProductDataVO productDataVO = operationReportService.handeReportMonthData(departIds,year,season);
ProductDataVO productDataVO = operationReportService.handeReportMonthData(departIds,year,season,startDate,endDate);
result.setResult( productDataVO );
return result;
}
......
sk-module-datafill/src/main/java/com/skua/modules/report/service/IOperationReportService.java
......@@ -13,5 +13,5 @@ public interface IOperationReportService {
* @param season
* @return
*/
ProductDataVO handeReportMonthData(String departIds,Integer year, Integer season);
ProductDataVO handeReportMonthData(String departIds,Integer year, Integer season,String startDate,String endDate);
}
......
sk-module-datafill/src/main/java/com/skua/modules/report/service/impl/OperationReportServiceImpl.java
......@@ -44,7 +44,7 @@ public class OperationReportServiceImpl implements IOperationReportService {
* @param season
* @return
*/
public ProductDataVO handeReportMonthData(String departId,Integer year, Integer season){
public ProductDataVO handeReportMonthData(String departId,Integer year, Integer season,String startDate,String endDate){
ProductDataVO productDataVO = new ProductDataVO();//返回结果
int lastYear = year - 1;//去年
productDataVO.setLastYear(lastYear);
......@@ -54,16 +54,23 @@ public class OperationReportServiceImpl implements IOperationReportService {
productDataVO.setSeansonEndDay(seasonTimeVO.getEndTime());//季度最后一天
productDataVO.setStartTime(seasonTimeVO.getStartTime());//季度开始时间
productDataVO.setEndTime( seasonTimeVO.getEndTime());//季度结束时间
if(StringUtils.isNotEmpty(startDate)){
productDataVO.setStartTime(startDate);//开始时间
}
if(StringUtils.isNotEmpty(endDate)){
productDataVO.setEndTime( endDate);//结束时间
}
//水务公司总数
String sql = "select count(1) from sys_depart where depart_type = 1 and id in ("+JSUtils.quoteEach(departId,",")+")";
String deptartCount = getJdbcTemplate().queryForObject(sql,String.class);
productDataVO.setDeptartCount( deptartCount );
long dayNum = DateUtils.differenceDay(seasonTimeVO.getStartTime(),seasonTimeVO.getEndTime());//天数
long dayNum = DateUtils.differenceDay(productDataVO.getStartTime(),productDataVO.getEndTime());//天数
// String departId = BaseContextHandler.getDeparts();
productDataVO.setSequentialProgress("基本满足时序进度");
// ysfsl:月收费水量 ; yyf:月药费 ; ysjsl:月实际水量
String dataViewName4411 = ReportViewUtil.buildView(ReportConstant.view4411,"ysfsl,ysjsl,yyf", departId, seasonTimeVO.getStartTime(),seasonTimeVO.getEndTime());
String dataViewName4411 = ReportViewUtil.buildView(ReportConstant.view4411,"ysfsl,ysjsl,yyf", departId, productDataVO.getStartTime(),productDataVO.getEndTime());
sql = "select round(sum(aaa.ysfsl),2) 'ysfsl' , round(sum(aaa.yyf),2) 'yyf' ,round(sum(aaa.ysjsl),2) 'ysjsl' from "+ dataViewName4411 + " aaa";
String ysfsl = null;//月收费水量 ;
String ysjsl = null;//月实际水量;
......@@ -88,7 +95,7 @@ public class OperationReportServiceImpl implements IOperationReportService {
productDataVO.setSequentialProgress("超额完成时序进度");
}
/****************去年同期数据处理************************/
dataViewName4411 = ReportViewUtil.buildView(ReportConstant.view4411,"ysfsl,ysjsl,yyf", departId, DateUtils.getTbDate(seasonTimeVO.getStartTime()), DateUtils.getTbDate(seasonTimeVO.getEndTime()));
dataViewName4411 = ReportViewUtil.buildView(ReportConstant.view4411,"ysfsl,ysjsl,yyf", departId, DateUtils.getTbDate(productDataVO.getStartTime()), DateUtils.getTbDate(productDataVO.getEndTime()));
sql = "select sum(aaa.ysfsl) 'ysfsl' , sum(aaa.yyf) 'yyf' ,sum(aaa.ysjsl) 'ysjsl' from "+ dataViewName4411 + " aaa";
String ysfslTB = null;//月收费水量 ;
String ysjslTB = null;//月实际水量;
......@@ -100,12 +107,12 @@ public class OperationReportServiceImpl implements IOperationReportService {
String expression = " 100 * ( "+ysfsl+" - "+ysfslTB+")/ "+ysfslTB;
productDataVO.setChargeWaterRatio(JSUtils.executeExpression(expression,"0"));
productDataVO.setAvgYsjslWaterVolume(JSUtils.divide(ysjsl,DateUtils.differenceDay(DateUtils.getTbDate(seasonTimeVO.getStartTime()),DateUtils.getTbDate(seasonTimeVO.getEndTime()))));//实际处理水量-日均值
productDataVO.setAvgYsjslWaterVolume(JSUtils.divide(ysjsl,DateUtils.differenceDay(DateUtils.getTbDate(productDataVO.getStartTime()),DateUtils.getTbDate(productDataVO.getEndTime()))));//实际处理水量-日均值
expression = " 100 * ( "+ysjsl+" - "+ysjslTB+")/ "+ysjslTB;
productDataVO.setYsjslWaterRatio( JSUtils.executeExpression(expression,"0"));//实际处理水量--同比增长
/***************** 实际水量同比下降水务公司原因分析一览表************************/
dataViewName4411 = ReportViewUtil.buildView(ReportConstant.view4411,"ysjsl,tqysjsl,ysjsldyqntqyy", departId, seasonTimeVO.getStartTime(), seasonTimeVO.getEndTime());
dataViewName4411 = ReportViewUtil.buildView(ReportConstant.view4411,"ysjsl,tqysjsl,ysjsldyqntqyy", departId, productDataVO.getStartTime(), productDataVO.getEndTime());
sql = " select aaa.depart_id , d.depart_name departName, round(100*(sum(ifnull(aaa.ysjsl,0)) - sum(ifnull(aaa.tqysjsl,0)) )/ sum(ifnull(aaa.tqysjsl,0)),2) 'ratio', ";
sql += " round( sum(ifnull(aaa.ysjsl,0)),2 ) 'ysjsl' ,round( sum(ifnull(aaa.tqysjsl,0)),2 ) 'tqysjsl' ,GROUP_CONCAT(aaa.ysjsldyqntqyy SEPARATOR '') 'causeAnalysis' from "+ dataViewName4411+" aaa";
sql += " left join sys_depart d on d.id = aaa.depart_id";
......@@ -114,7 +121,7 @@ public class OperationReportServiceImpl implements IOperationReportService {
productDataVO.setWaterDeptartList(waterMonthDataList);
//水电耗高于控制目标--水务公司列表
dataViewName4411 = ReportViewUtil.buildView(ReportConstant.view4411,"ydh,dhcmbzyy", departId, seasonTimeVO.getStartTime(), seasonTimeVO.getEndTime());
dataViewName4411 = ReportViewUtil.buildView(ReportConstant.view4411,"ydh,dhcmbzyy", departId, productDataVO.getStartTime(), productDataVO.getEndTime());
sql = "select * from ( ";
sql += " select d.depart_name 'departName', aaa.depart_id , round(avg(aaa.ydh),2) realConsume , IFNULL(tc.target_power,2) 'targetConsume' ,GROUP_CONCAT(aaa.dhcmbzyy SEPARATOR '') 'causeAnalysis' from "+ dataViewName4411+" aaa";;
sql += " left join report_target_config tc on (tc.depart_id = aaa.depart_id and tc.target_year='2024')";
......@@ -125,7 +132,7 @@ public class OperationReportServiceImpl implements IOperationReportService {
/** ysjsl:月实际水量 ; 月药耗 yyh; 去年同期药耗 qntqyh; 月药费 yyf;药耗高于去年同期原因 yhgyqntqyy;药耗超预期原因 yhcyqyy; 本年实际药耗 bnsjyh; 本年药耗目标 bnyhmb*/
//药剂成本高于控制目标--水务公司列表
dataViewName4411 = ReportViewUtil.buildView(ReportConstant.view4411,"yyh,yhcyqyy", departId, seasonTimeVO.getStartTime(), seasonTimeVO.getEndTime());
dataViewName4411 = ReportViewUtil.buildView(ReportConstant.view4411,"yyh,yhcyqyy", departId, productDataVO.getStartTime(), productDataVO.getEndTime());
sql = "select * from ( ";
sql += " select d.depart_name 'departName', aaa.depart_id , round(avg(aaa.yyh),2) realConsume , IFNULL(tc.target_drug,2) 'targetConsume' ,GROUP_CONCAT(aaa.yhcyqyy SEPARATOR '') 'causeAnalysis' from "+ dataViewName4411+" aaa";;
sql += " left join report_target_config tc on (tc.depart_id = aaa.depart_id and tc.target_year='2024')";
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/controller/EquipmentRepairReportController.java 0 → 100644
package com.skua.modules.equipment.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.skua.core.api.vo.Result;
import com.skua.core.aspect.annotation.AutoLog;
import com.skua.modules.equipment.service.IEquipmentMaintainTaskService;
import com.skua.modules.equipment.service.IEquipmentRepairService;
import com.skua.modules.equipment.vo.EquipmentMaintainTaskForm;
import com.skua.modules.equipment.vo.EquipmentRepairForm;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
/**
* 维修维护报表
*/
@Slf4j
@Api(tags = "设备管理/设备维修/维修维护报表")
@RestController
@RequestMapping("/equipment/equipmentRepairReport")
public class EquipmentRepairReportController {
@Autowired
private IEquipmentRepairService equipmentRepairService;
@Autowired
private IEquipmentMaintainTaskService maintainTaskService;
@AutoLog(value = "维修维护报表-维修工单列表")
@ApiOperation(value = "维修维护报表-维修工单列表", notes = "维修维护报表-维修工单列表")
@GetMapping(value = "/repairList")
public Result<IPage<EquipmentRepairForm>> repairList(EquipmentRepairForm equipmentRepairForm,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req ) throws Exception {
Result<IPage<EquipmentRepairForm>> result = new Result<IPage<EquipmentRepairForm>>();
Page<EquipmentRepairForm> page = new Page<EquipmentRepairForm>(pageNo, pageSize);
IPage<EquipmentRepairForm> pageList = equipmentRepairService.queryRepairFormByPage(page, equipmentRepairForm);
result.setSuccess(true);
result.setResult(pageList);
return result;
}
@AutoLog(value = "维修维护报表-维修工单列表")
@ApiOperation(value = "维修维护报表-维修工单列表", notes = "维修维护报表-维修工单列表")
@GetMapping(value = "/maintainTaskList")
public Result<IPage<EquipmentMaintainTaskForm>> maintainTaskList(EquipmentMaintainTaskForm maintainTaskForm,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req ) throws Exception {
Result<IPage<EquipmentMaintainTaskForm>> result = new Result<IPage<EquipmentMaintainTaskForm>>();
Page<EquipmentMaintainTaskForm> page = new Page<EquipmentMaintainTaskForm>(pageNo, pageSize);
IPage<EquipmentMaintainTaskForm> pageList = maintainTaskService.queryMaintainTaskFormByPage(page, maintainTaskForm);
result.setSuccess(true);
result.setResult(pageList);
return result;
}
}
sk-module-equipment/src/main/java/com/skua/modules/equipment/mapper/EquipmentMaintainTaskMapper.java
......@@ -3,6 +3,8 @@ package com.skua.modules.equipment.mapper;
import java.util.Date;
import java.util.List;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.skua.modules.equipment.vo.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -11,10 +13,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.skua.modules.equipment.dto.EquipmentMaintainTaskDTO;
import com.skua.modules.equipment.entity.EquipmentMaintainTask;
import com.skua.modules.equipment.entity.EquipmentMaintainTaskResult;
import com.skua.modules.equipment.vo.EquipmentMaintainStandardVO;
import com.skua.modules.equipment.vo.EquipmentMaintainTaskCalendarVO;
import com.skua.modules.equipment.vo.EquipmentMaintainTaskVO;
import com.skua.modules.equipment.vo.EquipmentSparePartListVO;
@Mapper
public interface EquipmentMaintainTaskMapper extends BaseMapper<EquipmentMaintainTask> {
......@@ -64,12 +62,18 @@ public interface EquipmentMaintainTaskMapper extends BaseMapper<EquipmentMaintai
//新增每个任务对应维护内容的结果
Integer addTaskResult(String id,String taskId,String standardId,String result);
/**
* 获取保养任务日历数据
* @param equipmentMaintainTaskDTO
* @return
*/
List<EquipmentMaintainTaskCalendarVO> getTaskCalendarList(EquipmentMaintainTaskDTO equipmentMaintainTaskDTO);
/**
* 维修维护报表-维修工单列表
* @param maintainTaskForm
* @return
*/
List<EquipmentMaintainTaskForm> queryMaintainTaskFormByList(EquipmentMaintainTaskForm maintainTaskForm);
}
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/mapper/EquipmentRepairMapper.java
package com.skua.modules.equipment.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.skua.modules.equipment.entity.EquipmentRepair;
import com.skua.modules.equipment.vo.EquipmentRepairForm;
import com.skua.modules.equipment.vo.EquipmentRepairVO;
import org.apache.ibatis.annotations.Param;
......@@ -14,7 +16,7 @@ import java.util.Map;
* 设备维修流程
*/
public interface EquipmentRepairMapper extends BaseMapper<EquipmentRepair> {
List<Map<String, Object>> getUserByPositions(@Param(value = "userId") String userId);
/**
* <pre>
......@@ -48,4 +50,10 @@ public interface EquipmentRepairMapper extends BaseMapper<EquipmentRepair> {
*/
List<Map<String, Object>> queryStatistics(@Param(value = "equipmentRepairVO")EquipmentRepairVO equipmentRepairVO);
/**
* 维修维护报表-维修工单列表
* @param equipmentRepairForm
* @return
*/
List<EquipmentRepairForm> queryRepairFormList( EquipmentRepairForm equipmentRepairForm);
}
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/mapper/ProductionEquipmentMapper.java
......@@ -48,6 +48,15 @@ public interface ProductionEquipmentMapper {
//获取保养费用
Double getMaintainCost(@Param("startTime") String startTime, @Param("endTime") String endTime);
/***
* 根据维修类型获取维修费用（单位万元）
* @param startTime
* @param endTime
* @return
*/
Double getMaintainCostByMaintenanceType(@Param("maintenanceType") String maintenanceType,@Param("startTime") String startTime, @Param("endTime") String endTime);
//获取生产设备等级
List<ProportionStatisticsVO> getLevelByTime(ReportStatisticsDTO reportStatisticsDTO);
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/mapper/xml/EquipmentMaintainTaskMapper.xml
......@@ -200,4 +200,39 @@
b.start_time
</select>
<!-- 维修维护报表-维修工单列表 -->
<select id="queryMaintainTaskFormByList" resultType="com.skua.modules.equipment.vo.EquipmentMaintainTaskForm">
select aaa.* from (
select t.depart_id, ei.equipment_name, ec.id 'equipment_category_id', ec.des 'equipment_category', emp.maintenance_type, di.item_text 'maintenance_type_name', t.maintain_plan_name , emp.start_time ,emp.end_time,u.realname 'maintenanceUser' , ems.maintenance_content
from equipment_maintain_task t
left join equipment_maintain_plan emp on t.plan_id = emp.id
left join sys_dict_item di on di.item_value = emp.maintenance_type
left join sys_user u on u.id = t.maintainer_id
LEFT JOIN equipment_maintain_plan_standard eps ON eps.plan_id = emp.id
LEFT JOIN equipment_maintain_standard ems ON ems.id = eps.standard_id
left join equipment_info ei on ei.id = t.equipment_id
left join equipment_category ec on ei.equipment_type = ec.id
)aaa
<where>
<if test="departId != null and departId !=''">
and aaa.depart_id = #{departId}
</if>
<if test="departIds != null and departIds !=''">
and aaa.depart_id in(${departIds})
</if>
<if test="equipmentCategoryId != null and equipmentCategoryId !=''">
and aaa.equipment_category_id = #{equipmentCategoryId}
</if>
<if test="maintenanceType != null and maintenanceType !=''">
and aaa.maintenance_type = #{maintenanceType}
</if>
<if test="startTime != null and startTime !=''">
and aaa.start_time &gt;= #{startTime}
</if>
<if test="endTime != null and endTime !=''">
and aaa.end_time &lt;= #{endTime}
</if>
</where>
</select>
</mapper>
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/mapper/xml/EquipmentRepairMapper.xml
......@@ -115,4 +115,68 @@
group by a.finish_flag
</select>
<!-- 维修维护报表-维修工单列表 -->
<select id="queryRepairFormList" resultType="com.skua.modules.equipment.vo.EquipmentMaintainTaskForm">
select aaa.* from (
select
ei.equipment_name , ec.des 'equipment_category', di.item_text 'maintenance_type',
ifnull(u.realname,'-') 'maintenance_user',
er.depart_id,er.repair_date,er.fault_reason,er.is_stop,er.reality_maintenance_start_time,er.reality_maintenance_end_time,
ifnull(er.fault_library_id,'-') 'repair_content'
from equipment_repair er
left join equipment_info ei on ei.id = er.info_id
left join equipment_category ec on ei.equipment_type = ec.id
left join sys_user u on er.maintenance_user = u.id
left join sys_dict_item di on di.item_value = er.maintenance_type
)aaa
<where>
<if test="departId != null and departId !=''">
and aaa.depart_id = #{departId}
</if>
<if test="departIds != null and departIds !=''">
and aaa.depart_id in(${departIds})
</if>
<!--<if test="param.startTime != null and param.startTime !=''">
and aaa.repair_date &gt;= #{param.startTime}
</if>
<if test="param.departIds != null and param.departIds !=''">
and aaa.repair_date &lt;= #{param.endTime}
</if>-->
<if test="finishFlag != null and finishFlag !=''">
and aaa.finish_flag = #{finishFlag}
</if>
<if test="repairDate != null and repairDate !=''">
and aaa.repair_date = #{repairDate}
</if>
<if test="realityMaintenanceEndTime != null and realityMaintenanceEndTime !=''">
and aaa.reality_maintenance_end_time = #{realityMaintenanceEndTime}
</if>
<if test="repairDate_begin != null and repairDate_begin !=''">
and aaa.repair_date &gt;= #{repairDate_begin}
</if>
<if test="repairDate_end != null and repairDate_end !=''">
and aaa.repair_date &lt;= #{repairDate_end}
</if>
<if test="realityMaintenanceEndTime_begin != null and realityMaintenanceEndTime_begin !=''">
and aaa.reality_maintenance_end_time &gt;= #{realityMaintenanceEndTime_begin}
</if>
<if test="realityMaintenanceEndTime_end != null and realityMaintenanceEndTime_end !=''">
and aaa.reality_maintenance_end_time &lt;= #{realityMaintenanceEndTime_end}
</if>
<if test="equipmentCategory != null and equipmentCategory !=''">
and aaa.equipment_category = #{equipmentCategory}
</if>
<if test="maintenanceType != null and maintenanceType !=''">
and aaa.maintenance_type = #{maintenanceType}
</if>
</where>
</select>
</mapper>
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/mapper/xml/ProductionEquipmentMapper.xml
......@@ -103,6 +103,21 @@
and #{endTime}
</if>
</select>
<select id="getMaintainCostByMaintenanceType" parameterType="java.lang.String" resultType="java.lang.Double">
select round(ifnull(sum(maintenance_cost)/10000,0),2) maintenance_cost
from equipment_maintain_task emt , equipment_maintain_plan emp
WHERE emt.plan_id = emp.id and emt.del_flag = 0
<if test="maintenanceType !=null and maintenanceType !=''">
and emp.maintenance_type = #{maintenanceType}
</if>
<if test="startTime !=null and startTime !=''">
AND emt.maintain_time &gt;= #{startTime}
</if>
<if test="endTime !=null and endTime !=''">
AND emt.maintain_time &lt;= #{endTime}
</if>
</select>
<select id="getEquipmentStatisticsDetailsNew" resultType="com.skua.modules.equipment.vo.EquipmentStatisticsCountVO">
select d.depart_name , d.id 'depart_id',
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/service/IEquipmentMaintainTaskService.java
......@@ -3,11 +3,13 @@ package com.skua.modules.equipment.service;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.skua.modules.equipment.dto.EquipmentMaintainTaskDTO;
import com.skua.modules.equipment.entity.EquipmentMaintainTask;
import com.skua.modules.equipment.vo.EquipmentMaintainTaskCalendarVO;
import com.skua.modules.equipment.vo.EquipmentMaintainTaskForm;
import com.skua.modules.equipment.vo.EquipmentMaintainTaskVO;
public interface IEquipmentMaintainTaskService extends IService<EquipmentMaintainTask> {
......@@ -41,4 +43,19 @@ public interface IEquipmentMaintainTaskService extends IService<EquipmentMaintai
*/
boolean updateResultsEnforcement(String id);
/***
* 维修维护报表-维修工单列表
* @param page
* @param maintainTaskForm
* @return
*/
IPage<EquipmentMaintainTaskForm> queryMaintainTaskFormByPage(Page<EquipmentMaintainTaskForm> page, EquipmentMaintainTaskForm maintainTaskForm);
/**
* 列表
* @param maintainTaskForm
* @return
*/
List<EquipmentMaintainTaskForm> queryMaintainTaskFormByList( EquipmentMaintainTaskForm maintainTaskForm);
}
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/service/IEquipmentRepairService.java
package com.skua.modules.equipment.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.skua.core.api.vo.Result;
import com.skua.modules.equipment.entity.EquipmentRepair;
import com.skua.modules.equipment.vo.EquipmentRepairForm;
import com.skua.modules.equipment.vo.EquipmentRepairVO;
import java.util.List;
......@@ -23,7 +25,7 @@ public interface IEquipmentRepairService extends IService<EquipmentRepair> {
* @param equipmentRepairVO
* @return
* @author Li Yuanyuan, 2023年4月18日 下午4:36:52
* @throws Exception
* @throws Exception
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
void taskGzjx(Result<EquipmentRepairVO> result, EquipmentRepairVO equipmentRepairVO) throws Exception;
......@@ -44,7 +46,7 @@ public interface IEquipmentRepairService extends IService<EquipmentRepair> {
* @param result
* @param equipmentRepairVO
* @author Li Yuanyuan, 2023年4月18日 下午4:54:44
* @throws Exception
* @throws Exception
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
void taskWx(Result<EquipmentRepairVO> result, EquipmentRepairVO equipmentRepairVO) throws Exception;
......@@ -55,7 +57,7 @@ public interface IEquipmentRepairService extends IService<EquipmentRepair> {
* @param result
* @param equipmentRepairVO
* @author Li Yuanyuan, 2023年4月18日 下午4:54:44
* @throws Exception
* @throws Exception
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
void taskgzys(Result<EquipmentRepairVO> result, EquipmentRepairVO equipmentRepairVO) throws Exception;
......@@ -81,4 +83,13 @@ public interface IEquipmentRepairService extends IService<EquipmentRepair> {
*/
Map<String, Object> statistics(EquipmentRepairVO equipmentRepairVO);
/**
* 维修维护报表-维修工单列表
* @param page
* @param equipmentRepairForm
* @return
*/
IPage<EquipmentRepairForm> queryRepairFormByPage(Page<EquipmentRepairForm> page, EquipmentRepairForm equipmentRepairForm);
List<EquipmentRepairForm> queryRepairFormList( EquipmentRepairForm equipmentRepairForm);
}
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/service/impl/EquipmentMaintainTaskServiceImpl.java
......@@ -9,6 +9,8 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.skua.modules.equipment.vo.*;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
......@@ -37,13 +39,6 @@ import com.skua.modules.equipment.mapper.EquipmentMaintainTaskMapper;
import com.skua.modules.equipment.mapper.EquipmentMaintainTaskSparepartMapper;
import com.skua.modules.equipment.service.IEquipmentMaintainTaskService;
import com.skua.modules.equipment.util.UnitUtils;
import com.skua.modules.equipment.vo.EquipmentMaintainPlanVO;
import com.skua.modules.equipment.vo.EquipmentMaintainStandardVO;
import com.skua.modules.equipment.vo.EquipmentMaintainTaskCalendarVO;
import com.skua.modules.equipment.vo.EquipmentMaintainTaskCheckVO;
import com.skua.modules.equipment.vo.EquipmentMaintainTaskVO;
import com.skua.modules.equipment.vo.EquipmentMaintenanceContentVO;
import com.skua.modules.equipment.vo.EquipmentSparePartListVO;
import com.skua.modules.supplies.service.IEquipmentSparepartSuppliesAdjustService;
......@@ -363,6 +358,27 @@ public class EquipmentMaintainTaskServiceImpl extends ServiceImpl<EquipmentMaint
return taskCalendarMap;
}
/***
* 维修维护报表-维修工单列表
* @param page
* @param maintainTaskForm
* @return
*/
public IPage<EquipmentMaintainTaskForm> queryMaintainTaskFormByPage(Page<EquipmentMaintainTaskForm> page, EquipmentMaintainTaskForm maintainTaskForm){
List<EquipmentMaintainTaskForm> dataList = this.baseMapper.queryMaintainTaskFormByList(maintainTaskForm);
page.setRecords(dataList);
return page;
}
/**
* 列表
* @param maintainTaskForm
* @return
*/
public List<EquipmentMaintainTaskForm> queryMaintainTaskFormByList( EquipmentMaintainTaskForm maintainTaskForm){
List<EquipmentMaintainTaskForm> dataList = this.baseMapper.queryMaintainTaskFormByList(maintainTaskForm);
return dataList;
}
@Override
public boolean updateResultsEnforcement(String id) {
baseMapper.updateResultsEnforcement(new Date(), 1, 2, id);
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/service/impl/EquipmentRepairServiceImpl.java
package com.skua.modules.equipment.service.impl;
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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.skua.core.api.vo.Result;
......@@ -19,6 +20,7 @@ import com.skua.modules.equipment.service.IEquipmentDefectManagementService;
import com.skua.modules.equipment.service.IEquipmentInfoService;
import com.skua.modules.equipment.service.IEquipmentRepairChildService;
import com.skua.modules.equipment.service.IEquipmentRepairService;
import com.skua.modules.equipment.vo.EquipmentRepairForm;
import com.skua.modules.equipment.vo.EquipmentRepairVO;
import com.skua.modules.flow.business.service.FlowBusinessService;
import com.skua.modules.flow.business.service.IFlowService;
......@@ -59,7 +61,7 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe
private IEquipmentDefectManagementService equipmentDefectManagementService;
@Autowired
private IEquipmentInfoService equipmentInfoService;
@Override
public List<FlowProcessFormFieldInfoVO> buildCustomData(String businessId, List<FlowProcessFormFieldInfoVO> flowProcessFormFieldInfoVOs) {
EquipmentRepair obj = new EquipmentRepair();
......@@ -183,11 +185,11 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe
QueryWrapper<EquipmentRepairChild> queryWrapper = new QueryWrapper<EquipmentRepairChild>();
queryWrapper.eq("repair_id", id);
equipmentRepairChildService.remove(queryWrapper);
//更新物料库存数量-出库仓库
List<EquipmentRepairChild> childList = equipmentRepairVO.getEquipmentRepairChildList();
handleSparepartInOrOut(childList,maintenanceUser,"out");
//设置维修记录和备品备件关联关系
childList.forEach(equipmentRepairChild ->{
//设置维修记录主键
......@@ -198,7 +200,7 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe
equipmentRepairChildService.saveOrUpdateBatch(childList);
}
}
if(testRunTime>0) {
//流程进入下一节点,暂时不做维修时间大于0的操作
flowBusinessService.completeTask(ProcessConstant.PASS_KEY, equipmentRepairVO.getFlow());
......@@ -216,9 +218,9 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe
String executionId = equipmentRepairVO.getFlow().getExecutionId();
//更新表单数据
EquipmentRepair equipmentRepair = BeanExtUtils.bean2Bean(equipmentRepairVO, EquipmentRepair.class);
equipmentRepair.setFinishFlag("yys");//修改设备状态，已验收
//流程进入下一节点，并行网关设置判定条件
String maintenanceType = equipmentRepair.getMaintenanceType();
String checkResult = equipmentRepair.getCheckResult();
......@@ -288,10 +290,26 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe
vo.setFlow(flow);
}
}
return pageList.setRecords(equipmentRepairVOS);
}
/**
* 维修维护报表-维修工单列表
* @param page
* @param equipmentRepairForm
* @return
*/
public IPage<EquipmentRepairForm> queryRepairFormByPage(Page<EquipmentRepairForm> page, EquipmentRepairForm equipmentRepairForm){
List<EquipmentRepairForm> dataList = this.baseMapper.queryRepairFormList(equipmentRepairForm);
page.setRecords(dataList);
return page;
}
public List<EquipmentRepairForm> queryRepairFormList( EquipmentRepairForm equipmentRepairForm){
List<EquipmentRepairForm> dataList = this.baseMapper.queryRepairFormList(equipmentRepairForm);
return dataList;
}
@Override
public Map<String, Object> statistics(EquipmentRepairVO equipmentRepairVO) {
Map<String,Object> statisticsMap = new HashMap<String,Object>();
......@@ -315,7 +333,7 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe
statisticsMap.put("total", total);
return statisticsMap;
}
/**
* <pre>
* 备品备件数据按照仓库id做分组处理
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/service/impl/ProductionEquipmentServiceImpl.java
......@@ -65,6 +65,7 @@ public class ProductionEquipmentServiceImpl implements IProductionEquipmentServi
Double maintainCost = 0.00;
Double totalCost = 0.00;
Double costRing = 0.00;
Double dxjgCost = 0d;
//ab总数
Integer ABEquipmentNum = 0;
......@@ -216,6 +217,8 @@ public class ProductionEquipmentServiceImpl implements IProductionEquipmentServi
repairCompleteRing = (repairCompleteRate - lastRepairCompleteRate) / lastRepairCompleteRate * 100;
}
//维护维修费用
//大修费用
dxjgCost = productionEquipmentMapper.getMaintainCostByMaintenanceType("dxjg",reportStatisticsDTO.getTime() + YEAR_START, reportStatisticsDTO.getTime() + YEAR_END);
//维修费
repairCost = productionEquipmentMapper.getRepairCost(reportStatisticsDTO.getTime() + YEAR_START, reportStatisticsDTO.getTime() + YEAR_END);
//保养费
......@@ -228,6 +231,7 @@ public class ProductionEquipmentServiceImpl implements IProductionEquipmentServi
costRing = (totalCost - (repairCost1 + maintainCost1)) / (repairCost1 + maintainCost1) * 100;
}
}
productionEquipmentVO.setEquipmentNum(equipmentNum);
productionEquipmentVO.setAbEquipmentNum(ABEquipmentNum);
//本月新增
......@@ -253,6 +257,8 @@ public class ProductionEquipmentServiceImpl implements IProductionEquipmentServi
//维修计划完成月环比
BigDecimal bigDecimal3 = new BigDecimal(repairCompleteRing).setScale(2, BigDecimal.ROUND_HALF_UP);
productionEquipmentVO.setRepairCompleteRingRate(bigDecimal3.toString() + "%");
//大修技改费用
productionEquipmentVO.setDxCost(dxjgCost+"");
//维护维修费用
productionEquipmentVO.setRepairMaintainCost(JSUtils.divide(totalCost,10000));
//维修费用
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/vo/EquipmentMaintainRepairReportVO.java 0 → 100644
package com.skua.modules.equipment.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.List;
/**
* @auther kangwei
* @create 2025-03-08-15:24
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="EquipmentMaintainRepairReportVO对象", description="设备维修维护报表")
public class EquipmentMaintainRepairReportVO {
@ApiModelProperty(value = "机构ID")
private java.lang.String departId;
@ApiModelProperty(value = "机构名称")
private java.lang.String departName;
@ApiModelProperty(value = "月度计划性维修维护内容")
private List<EquipmentMaintainTaskForm> maintainTaskFormList; //月度计划性维修维护内容
@ApiModelProperty(value = "设备报修维修工单")
private List<EquipmentRepairForm> equipmentRepairFormList; //设备报修维修工单
}
sk-module-equipment/src/main/java/com/skua/modules/equipment/vo/EquipmentMaintainTaskForm.java 0 → 100644
package com.skua.modules.equipment.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
* @auther kangwei
* @create 2025-03-07-17:56
*/
/**
* 月度计划性维修维护内容
*/
@Data
@ApiModel(value="equipment_repair对象", description="月度计划性维修维护内容")
public class EquipmentMaintainTaskForm {
@ApiModelProperty(value = "机构ID集合")
private java.lang.String departIds;
@ApiModelProperty(value = "机构ID")
private java.lang.String departId;
@ApiModelProperty(value = "机构名称")
private java.lang.String departName;
@Excel(name = "设备名称", width = 15)
@ApiModelProperty(value = "设备名称")
private String equipmentName;
@Excel(name = "设备分类编号", width = 15)
@ApiModelProperty(value = "设备分类编号")
private String equipmentCategoryId;
@Excel(name = "设备分类名称", width = 15)
@ApiModelProperty(value = "设备分类名称")
private String equipmentCategory;
@Excel(name = "维护保养类型", width = 15)
@ApiModelProperty(value = "维护保养类型")
private String maintenanceType;
@Excel(name = "设备分类名称", width = 15)
@ApiModelProperty(value = "设备分类名称")
private String maintenanceTypeName;
@Excel(name = "维护保养项目", width = 15)
@ApiModelProperty(value = "维护保养项目")
private String maintainPlanName;
@Excel(name = "维护保养内容", width = 15)
@ApiModelProperty(value = "维护保养内容")
private String maintenanceContent;
@Excel(name = "计划开始时间", width = 15)
@ApiModelProperty(value = "计划开始时间")
private String startTime;
@Excel(name = "计划结束时间", width = 15)
@ApiModelProperty(value = "计划结束时间")
private String endTime;
@Excel(name = "维修负责人", width = 15)
@ApiModelProperty(value = "维修负责人")
private java.lang.String maintenanceUser;
}
sk-module-equipment/src/main/java/com/skua/modules/equipment/vo/EquipmentRepairForm.java 0 → 100644
package com.skua.modules.equipment.vo;
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 com.skua.core.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 设备报修维修
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="equipment_repair对象", description="设备报修维修工单")
public class EquipmentRepairForm {
@ApiModelProperty(value = "机构ID集合")
private java.lang.String departIds;
@ApiModelProperty(value = "机构ID")
private java.lang.String departId;
@ApiModelProperty(value = "机构名称")
private java.lang.String departName;
/**设备id*/
@Excel(name = "设备id", width = 15)
@ApiModelProperty(value = "设备id")
private String infoId;
@Excel(name = "设备名称", width = 15)
@ApiModelProperty(value = "设备名称")
private String equipmentName;
@Excel(name = "设备分类名称", width = 15)
@ApiModelProperty(value = "设备分类名称")
private String equipmentCategory;
@Excel(name = "办结标记，yes办结", width = 15)
@ApiModelProperty(value = "办结标记，yes办结")
@Dict(dicCode = "equipment_repair_state")
private java.lang.String finishFlag;
@Excel(name = "维修方式", width = 15)
@ApiModelProperty(value = "维修方式")
private java.lang.String maintenanceType;
@Excel(name = "维修人", width = 15)
@ApiModelProperty(value = "维修人")
private java.lang.String maintenanceUser;
/**报修时间*/
@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 java.util.Date repairDate;
@ApiModelProperty(value = "搜索条件:故障时间-开始时间")
private String repairDate_begin;
@ApiModelProperty(value = "搜索条件:故障时间-结束时间")
private String repairDate_end;
/**故障原因*/
@Excel(name = "故障原因", width = 15)
@ApiModelProperty(value = "故障原因")
private java.lang.String faultReason;
@Excel(name = "维修内容", width = 15)
@ApiModelProperty(value = "维修内容")
private java.lang.String repairContent;
@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 java.util.Date realityMaintenanceEndTime;
@ApiModelProperty(value = "搜索条件:修复时间-开始时间")
private String realityMaintenanceEndTime_begin;
@ApiModelProperty(value = "搜索条件:修复时间-结束时间")
private String realityMaintenanceEndTime_end;
/**故障内容*/
@Excel(name = "故障内容", width = 15)
@ApiModelProperty(value = "故障内容")
private java.lang.String faultContent;
}
sk-module-equipment/src/main/java/com/skua/modules/equipment/vo/ProductionEquipmentVO.java
......@@ -45,4 +45,8 @@ public class ProductionEquipmentVO {
private String repairCost;
//维修费用
private String maintainCost;
//大修费用
private String dxCost;
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!