综合查询-设备订单详情
This commit is contained in:
		
							parent
							
								
									de6cdb60a8
								
							
						
					
					
						commit
						443d65531c
					
				| 
						 | 
					@ -270,4 +270,7 @@ public class DevInfo extends BaseEntity {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @ApiModelProperty(value = "上传人")
 | 
					    @ApiModelProperty(value = "上传人")
 | 
				
			||||||
    private String nickName;
 | 
					    private String nickName;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @ApiModelProperty(value = "租赁次数")
 | 
				
			||||||
 | 
					    private Integer rentNum;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -189,5 +189,7 @@ public interface DevInfoMapper {
 | 
				
			||||||
    List<DevInfoVo> getTagDevList(DevInfoVo devInfoVo);
 | 
					    List<DevInfoVo> getTagDevList(DevInfoVo devInfoVo);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    List<DevInfoVo> getDevList(DevInfoVo devInfo);
 | 
					    List<DevInfoVo> getDevList(DevInfoVo devInfo);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    DevInfo getDevStatus(DevInfoVo devInfoVo);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -761,7 +761,13 @@ public class DevInfoServiceImpl implements DevInfoService {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @Override
 | 
					    @Override
 | 
				
			||||||
    public List<DevInfoVo> getDevList(DevInfoVo devInfo) {
 | 
					    public List<DevInfoVo> getDevList(DevInfoVo devInfo) {
 | 
				
			||||||
        return devInfoMapper.getDevList(devInfo);
 | 
					        List<DevInfoVo> devList = devInfoMapper.getDevList(devInfo);
 | 
				
			||||||
 | 
					        for (DevInfoVo devInfoVo : devList) {
 | 
				
			||||||
 | 
					           DevInfo devInfo1 = devInfoMapper.getDevStatus(devInfoVo);
 | 
				
			||||||
 | 
					            devInfoVo.setRentNum(devInfo1.getRentNum());
 | 
				
			||||||
 | 
					            devInfoVo.setMaStatus(devInfo1.getMaStatus());
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        return devList;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @Override
 | 
					    @Override
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -855,5 +855,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 | 
				
			||||||
        ORDER BY
 | 
					        ORDER BY
 | 
				
			||||||
            d.create_time DESC
 | 
					            d.create_time DESC
 | 
				
			||||||
    </select>
 | 
					    </select>
 | 
				
			||||||
 | 
					    <select id="getDevStatus" resultType="com.bonus.material.device.domain.DevInfo">
 | 
				
			||||||
 | 
					        SELECT
 | 
				
			||||||
 | 
					            COUNT(*) num as rentNum,
 | 
				
			||||||
 | 
					            mdi.ma_status as maStatus
 | 
				
			||||||
 | 
					        FROM
 | 
				
			||||||
 | 
					            ma_order_info moi
 | 
				
			||||||
 | 
					                LEFT JOIN ma_order_details md ON moi.order_id = md.order_id
 | 
				
			||||||
 | 
					                LEFT JOIN ma_dev_info mdi ON mdi.ma_id = md.ma_id
 | 
				
			||||||
 | 
					                LEFT JOIN lease_repair_record lrr ON moi.order_id = lrr.order_id
 | 
				
			||||||
 | 
					                AND md.ma_id = lrr.ma_id
 | 
				
			||||||
 | 
					                LEFT JOIN sys_user su ON moi.buyer_id = su.user_id
 | 
				
			||||||
 | 
					                LEFT JOIN sys_dept sd ON moi.buyer_company = sd.dept_id
 | 
				
			||||||
 | 
					        WHERE
 | 
				
			||||||
 | 
					            md.ma_id = #{maId}
 | 
				
			||||||
 | 
					        ORDER BY
 | 
				
			||||||
 | 
					            moi.order_time DESC
 | 
				
			||||||
 | 
					    </select>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
</mapper>
 | 
					</mapper>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue