台账

src/main/java/com/chinaitop/depot/device/controller/StorageDeviceInputController.java

@@ -228,4 +228,39 @@ public class StorageDeviceInputController {
     	returnMap.put("useCount", useCount);
         return returnMap;
     }
+    
+    
+    /**
+     * 分页获取器材设备信息
+	 * @throws Exception 
+     */
+	@RequestMapping(value = "/getDeviceAccountList",produces = MediaType.APPLICATION_JSON_VALUE,method=RequestMethod.GET)
+    @ApiOperation(value="查询入库设备信息", notes = "查询入库设备列表，支持分页")
+  	@ApiImplicitParams({
+  			@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+  			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+  			@ApiImplicitParam(name = "orgName", value = "当前登录人组织名称", paramType = "query")
+  	})
+    public PageInfo<StorageDeviceinput> getDeviceAccountList(HttpServletRequest request,Integer pageNum, Integer pageSize, Integer deviceType ,String orgName) throws Exception{
+    	StorageDeviceinputExample storageDeviceinputExample=new StorageDeviceinputExample();
+    	StorageDeviceinputExample.Criteria criteria=storageDeviceinputExample.createCriteria();
+    	if(ParameterUtil.isnotnull(deviceType)){
+    		criteria.andDeviceTypeEqualTo(deviceType);
+    	}
+        //排序
+        storageDeviceinputExample.setOrderByClause("FIELD(status,0,1),input_time desc,id desc");
+   
+        if (pageNum!=null && pageSize!=null) {
+            PageHelper.startPage(pageNum, pageSize);
+        }
+        
+        List<StorageDeviceinput> list = deviceInputService.queryDeviceAccount(storageDeviceinputExample);
+         for (StorageDeviceinput storageDeviceinput : list) {
+        	 if(orgName!=null){
+        		 storageDeviceinput.setOrgName(orgName);
+        	 }
+		}
+        PageInfo<StorageDeviceinput> pageInfo = new PageInfo<StorageDeviceinput>(list);
+        return pageInfo;
+    }
 }

src/main/java/com/chinaitop/depot/device/mapper/StorageDeviceinputMapper.java

@@ -81,4 +81,6 @@ public interface StorageDeviceinputMapper {
 	List<StorageDeviceinput> getDeviceModelListRepair(String deviceName);
 
 	List<Map<String, Object>> queryCountByType();
+
+	List<StorageDeviceinput> queryDeviceAccount(StorageDeviceinputExample storageDeviceinputExample);
 }

src/main/java/com/chinaitop/depot/device/mapper/StorageDeviceinputMapper.xml

@@ -702,4 +702,27 @@
 			storage_deviceinput where device_type=5476  order by status asc
 
   </select>
+  
+  <!-- 台账 -->
+  <select id="queryDeviceAccount" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.device.model.StorageDeviceinputExample" >
+    SELECT
+	id,
+	device_type,
+	device_name,
+	model,
+	SUM(use_count) use_count,
+	SUM(broken_count) broken_count
+FROM
+	storage_deviceinput
+	<if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+GROUP BY
+	model,
+	device_name,
+	device_type
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/device/service/StorageDeviceInputService.java

@@ -71,6 +71,8 @@ public interface StorageDeviceInputService {
 
 	List<Map<String, Object>> queryCountByType();
 
+	List<StorageDeviceinput> queryDeviceAccount(StorageDeviceinputExample storageDeviceinputExample);
+
 
 
 }

src/main/java/com/chinaitop/depot/device/service/impl/StorageDeviceInputServiceImpl.java

@@ -229,6 +229,12 @@ public class StorageDeviceInputServiceImpl implements StorageDeviceInputService{
 		// TODO Auto-generated method stub
 		return deviceInputMapper.queryCountByType();
 	}
+
+	@Override
+	public List<StorageDeviceinput> queryDeviceAccount(StorageDeviceinputExample storageDeviceinputExample) {
+		// TODO Auto-generated method stub
+		return deviceInputMapper.queryDeviceAccount(storageDeviceinputExample);
+	}