Compare commits
No commits in common. "9472c21b52b0b266056c75192560627e933efcc5" and "dbedaa1a3e3e5f75ff6b9c794433b07360a8abf5" have entirely different histories.
9472c21b52
...
dbedaa1a3e
|
|
@ -1,7 +1,6 @@
|
||||||
package com.bonus.material.device.domain.vo;
|
package com.bonus.material.device.domain.vo;
|
||||||
|
|
||||||
import com.bonus.material.device.domain.DevInfo;
|
import com.bonus.material.device.domain.DevInfo;
|
||||||
import com.bonus.material.device.domain.MaDevQc;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
@ -137,9 +136,6 @@ public class DevInfoVo extends DevInfo {
|
||||||
@ApiModelProperty(value = "出租记录信息")
|
@ApiModelProperty(value = "出租记录信息")
|
||||||
private List<LeaseVo> leaseList;
|
private List<LeaseVo> leaseList;
|
||||||
|
|
||||||
@ApiModelProperty(value = "出租记录信息")
|
|
||||||
private List<MaDevQc> qcList;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "公司上架装备数量")
|
@ApiModelProperty(value = "公司上架装备数量")
|
||||||
private Integer devUapNum;
|
private Integer devUapNum;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -43,6 +43,4 @@ public interface MaDevQcMapper {
|
||||||
String selectTaskNumByMonth(Date nowDate);
|
String selectTaskNumByMonth(Date nowDate);
|
||||||
|
|
||||||
List<MaDevQc> selectQcList(MaDevQc maDevQc);
|
List<MaDevQc> selectQcList(MaDevQc maDevQc);
|
||||||
|
|
||||||
List<MaDevQc> getQcList(Long maId);
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,6 @@ import com.bonus.common.core.web.domain.AjaxResult;
|
||||||
import com.bonus.common.security.utils.SecurityUtils;
|
import com.bonus.common.security.utils.SecurityUtils;
|
||||||
import com.bonus.material.book.domain.BookCarInfoDto;
|
import com.bonus.material.book.domain.BookCarInfoDto;
|
||||||
import com.bonus.material.device.domain.DevInfo;
|
import com.bonus.material.device.domain.DevInfo;
|
||||||
import com.bonus.material.device.domain.MaDevQc;
|
|
||||||
import com.bonus.material.device.domain.dto.DevInfoImpDto;
|
import com.bonus.material.device.domain.dto.DevInfoImpDto;
|
||||||
import com.bonus.material.device.domain.dto.InfoMotionDto;
|
import com.bonus.material.device.domain.dto.InfoMotionDto;
|
||||||
import com.bonus.material.device.domain.vo.DevInfoPropertyVo;
|
import com.bonus.material.device.domain.vo.DevInfoPropertyVo;
|
||||||
|
|
@ -22,7 +21,6 @@ import com.bonus.material.device.domain.vo.DevNameVo;
|
||||||
import com.bonus.material.device.domain.vo.LeaseVo;
|
import com.bonus.material.device.domain.vo.LeaseVo;
|
||||||
import com.bonus.material.device.mapper.BmFileInfoMapper;
|
import com.bonus.material.device.mapper.BmFileInfoMapper;
|
||||||
import com.bonus.material.device.mapper.DevInfoMapper;
|
import com.bonus.material.device.mapper.DevInfoMapper;
|
||||||
import com.bonus.material.device.mapper.MaDevQcMapper;
|
|
||||||
import com.bonus.material.device.service.DevInfoService;
|
import com.bonus.material.device.service.DevInfoService;
|
||||||
import com.bonus.system.api.model.LoginUser;
|
import com.bonus.system.api.model.LoginUser;
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
|
|
@ -76,9 +74,6 @@ public class DevInfoServiceImpl implements DevInfoService {
|
||||||
@Resource
|
@Resource
|
||||||
protected Validator validator;
|
protected Validator validator;
|
||||||
|
|
||||||
@Resource
|
|
||||||
private MaDevQcMapper maDevQcMapper;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询设备信息
|
* 查询设备信息
|
||||||
*
|
*
|
||||||
|
|
@ -145,10 +140,6 @@ public class DevInfoServiceImpl implements DevInfoService {
|
||||||
//查询自定义属性
|
//查询自定义属性
|
||||||
List<DevInfoPropertyVo> properties = devInfoMapper.selectDevInfoProperties(maId);
|
List<DevInfoPropertyVo> properties = devInfoMapper.selectDevInfoProperties(maId);
|
||||||
devInfoVo.setDevInfoProperties(properties);
|
devInfoVo.setDevInfoProperties(properties);
|
||||||
|
|
||||||
//查询质检记录
|
|
||||||
List<MaDevQc> qcList = maDevQcMapper.getQcList(maId);
|
|
||||||
devInfoVo.setQcList(qcList);
|
|
||||||
}
|
}
|
||||||
return devInfoVo;
|
return devInfoVo;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -108,8 +108,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
and DATE_FORMAT(mdq.create_time,'%Y-%m-%d') between #{createStartTime} and #{createEndTime}
|
and DATE_FORMAT(mdq.create_time,'%Y-%m-%d') between #{createStartTime} and #{createEndTime}
|
||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
<select id="getQcList" resultType="com.bonus.material.device.domain.MaDevQc">
|
|
||||||
select * from ma_dev_qc where ma_id = #{maId} limit 10
|
|
||||||
</select>
|
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue