Commit 4e0e81b9 authored by wufeifan's avatar wufeifan

更新了导出excel时的日期格式

parent acc25353
package com.yeejoin.equipmanage.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.equipmanage.common.entity.vo.EquipmentFaultVO;
import com.yeejoin.equipmanage.service.IEquipmentFaultService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import java.util.Date;
import java.util.List;
/**
* @Auther wff
* @Date 2022 09 05
* (这个Controller可以写在EquipmentDetailController)
**/
@RestController
@Api(tags = "故障管理 Api")
@RequestMapping(value = "/equipment-fault", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public class EquipmentFaultController {
//@Autowired
//IEquipmentDetailService equipmentDetailService;
@Autowired
IEquipmentFaultService iEquipmentFaultService;
///**
// * 查询所有故障记录
// */
//@GetMapping(value = "/getEquipmentFaultAll")
//@TycloudOperation(ApiLevel = UserType.AGENCY)
//@ApiOperation(httpMethod = "GET", value = "装备及故障列表", notes = "装备及故障列表")
//public List<EquipmentFaultVO> getEquipmentFaultAll() {
// List<DetailssAmountVO> detailssAmountVOS = equipmentDetailService.getall();
// ArrayList<EquipmentFaultVO> equipmentFaults = new ArrayList<>();
// EquipmentFaultVO equipmentFault = new EquipmentFaultVO();
// for (DetailssAmountVO detailssAmountVO : detailssAmountVOS) {
// equipmentFault.setEqName(detailssAmountVO.getEquipmentName());
// equipmentFault.setName(detailssAmountVO.getName());
// equipmentFaults.add(equipmentFault);
// }
// return equipmentFaults;
//}
@RequestMapping(value = "/listDate", method = RequestMethod.GET)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public IPage<EquipmentFaultVO> listPage(@RequestParam(value = "current") int pageNum,
@RequestParam(value = "size") int pageSize,
@RequestParam(required = false) String code,
@RequestParam(required = false)String eqCode,
@RequestParam(required = false)String name,
@RequestParam(required = false)Date faultOccurTime) {
int start = (pageNum - 1) * pageSize;
List<EquipmentFaultVO> list = iEquipmentFaultService.selectEquipmentFaultList(start, pageSize, code, eqCode, name, faultOccurTime);
int count = iEquipmentFaultService.selectEquipmentFaultListCount(code, eqCode, name, faultOccurTime);
Page psge = new Page(pageNum, pageSize, count);
psge.setRecords(list);
return psge;
}
/*@RequestMapping(value = "/listDate", method = RequestMethod.GET)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public Page listPage(@RequestParam(value = "current") int pageNum,
@RequestParam(value = "size") int pageSize,
@RequestParam(required = false) String name,
@RequestParam(required = false) String standard,
@RequestParam(required = false) String manufacturerName) {
int start = (pageNum - 1) * pageSize;
List<Map<String, Object>> list = equipmentDetailService.selectEquList(start, pageSize, name, standard, manufacturerName);
List<Map<String, Object>> list2 = equipmentDetailService.selectEquListcount(name, standard, manufacturerName);
Page psge = new Page(pageNum, pageSize, list2 == null ? 0 : list2.size());
psge.setRecords(list);
return psge;
}*/
}
package com.yeejoin.equipmanage.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.equipmanage.common.entity.EquipmentDetail;
import com.yeejoin.equipmanage.common.entity.vo.EquipmentFaultVO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.Date;
import java.util.List;
@Repository
public interface EquipmentFaultMapper extends BaseMapper<EquipmentDetail> {
/**
* 故障管理分页列表
*/
List<EquipmentFaultVO> selectEquipmentFaultList(@Param("current") int current, @Param("size") int size, @Param("code") String code, @Param("eqCode") String eqCode, @Param("name") String name, @Param("faultOccurTime") Date faultOccurTime);
int selectEquipmentFaultListcount(@Param("code") String code, @Param("eqCode") String eqCode, @Param("name") String name, @Param("faultOccurTime") Date faultOccurTime);
}
package com.yeejoin.equipmanage.service;
import com.yeejoin.equipmanage.common.entity.vo.EquipmentFaultVO;
import java.util.Date;
import java.util.List;
/**
* 装备故障 服务类
*/
public interface IEquipmentFaultService {
List<EquipmentFaultVO> selectEquipmentFaultList(int pageNum, int pageSize, String code, String eqCode, String name, Date faultOccurTime);
int selectEquipmentFaultListCount(String code, String eqCode, String name, Date faultOccurTime);
}
package com.yeejoin.equipmanage.service.impl;
import com.yeejoin.equipmanage.common.entity.vo.EquipmentFaultVO;
import com.yeejoin.equipmanage.mapper.EquipmentFaultMapper;
import com.yeejoin.equipmanage.service.IEquipmentFaultService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
@Service
public class EquipmentFaultServiceImpl implements IEquipmentFaultService {
@Autowired
EquipmentFaultMapper equipmentFaultMapper;
@Override
public List<EquipmentFaultVO> selectEquipmentFaultList(int pageNum, int pageSize, String code, String eqCode, String name, Date faultOccurTime) {
return equipmentFaultMapper.selectEquipmentFaultList(pageNum, pageSize, code, eqCode, name, faultOccurTime);
}
@Override
public int selectEquipmentFaultListCount(String code, String eqCode, String name, Date faultOccurTime) {
return equipmentFaultMapper.selectEquipmentFaultListcount(code, eqCode, name, faultOccurTime);
}
/*public Page<EquipmentFaultVO> page(Page<EquipmentFaultVO> pageBean, EquipmentFaultReq equipmentFaultReq) {
List<EquipmentFaultVO> list = equipmentFaultMapper.page(pageBean.offset(), pageBean.getSize(), equipmentFaultReq);
int count = equipmentFaultMapper.count(equipmentFaultReq);
pageBean.setRecords(list);
pageBean.setTotal(count);
return pageBean;
}*/
}
<?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.yeejoin.equipmanage.mapper.EquipmentFaultMapper">
<select id="selectEquipmentFaultList" resultType="com.yeejoin.equipmanage.common.entity.vo.EquipmentFaultVO">
SELECT
wled.id,
wlec.code AS code,
wlec.name AS eq_name,
wled.eq_code,
wled.name,
wlef.type,
wlef.reason,
wlef.measure,
wlp.create_date AS faultOccurTime
FROM
wl_equipment_detail wled
LEFT JOIN wl_equipment_specific wles ON wled.id = wles.equipment_detail_id
LEFT JOIN wl_equipment_params wlp ON wles.iot_code = wlp.detail_id
LEFT JOIN wl_equipment_category wlec ON wled.code = wlec.code
LEFT JOIN wl_equipment_fault_knowledge wlef ON wlp.fault_knowledge_id = wlef.type
<where>
<if test="code != null and code != ''"> AND wled.code LIKE CONCAT('%',#{code},'%' )</if>
<if test="eqCode != null and eqCode != ''"> AND wled.eq_code LIKE CONCAT('%',#{eqCode},'%' )</if>
<if test="name != null and name != ''"> AND wled.name LIKE CONCAT('%',#{name},'%' )</if>
<if test="faultOccurTime != null and faultOccurTime != ''"> AND faultOccurTime LIKE CONCAT('%',#{faultOccurTime},'%' )</if>
</where>
ORDER BY wlp.create_date DESC
LIMIT #{current},#{size}
</select>
<select id="selectEquipmentFaultListcount" resultType="Integer">
SELECT
COUNT(1)
FROM
wl_equipment_detail wled
LEFT JOIN wl_equipment_specific wles ON wled.id = wles.equipment_detail_id
LEFT JOIN wl_equipment_params wlp ON wles.iot_code = wlp.detail_id
LEFT JOIN wl_equipment_category wlec ON wled.code = wlec.code
LEFT JOIN wl_equipment_fault_knowledge wlef ON wlp.fault_knowledge_id = wlef.type
<where>
<if test="code != null and code != ''"> AND wled.code LIKE CONCAT('%',#{code},'%' )</if>
<if test="eqCode != null and eqCode != ''"> AND wled.eq_code LIKE CONCAT('%',#{eqCode},'%' )</if>
<if test="name != null and name != ''"> AND wled.name LIKE CONCAT('%',#{name},'%' )</if>
<if test="faultOccurTime != null and faultOccurTime != ''"> AND wlp.create_date LIKE CONCAT('%',#{faultOccurTime},'%' )</if>
</where>
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment