bug修改

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

@@ -121,41 +121,30 @@ public class StorageDeviceGetController {
         StorageDeviceget storageDeviceget = null;
         try {
         	//保存领用数据
-        	ContentBean cb=(ContentBean)mapper.readValue(contentBeanJson, ContentBean.class);
-        	storageDeviceget = (StorageDeviceget)mapper.readValue(deviceGetJson, StorageDeviceget.class);
-        	storageDeviceget.setDeviceName(cb.getDeviceName());
-        	storageDeviceget.setDeviceType(cb.getDeviceTypeId());
-        	storageDeviceget.setModel(cb.getModel());
-        	storageDeviceget.setNumber(cb.getNumber());
-        	storageDeviceget.setUseCount(cb.getUseCount());
-        	storageDeviceget.setBackCount(0);
-        	storageDeviceget.setHouseId(storageDeviceget.getHouseId());
-        	deviceGetService.save(storageDeviceget);
-        	
-        	//根据设备编号获取入库表的该设备信息
-        	modelMap.put("number", storageDeviceget.getNumber());
-        	modelMap.put("model", storageDeviceget.getModel());
-        	List<StorageDeviceinput> inputList=deviceInputService.getUseCount(modelMap);
-        	inputList.get(0).setStatus(4);//领用状态
-        	inputList.get(0).setUseCount(inputList.get(0).getUseCount()-storageDeviceget.getGetCount());//数量减少
-        	deviceInputService.updateByPrimaryKeySelective(inputList.get(0));
-        	//改变入库的数量
-        	/*StorageDeviceinputExample storageDeviceinputExample2 = new StorageDeviceinputExample();
-        	Criteria criteria2 = storageDeviceinputExample2.createCriteria();
-        	criteria2.andNumberEqualTo(cb.getNumber());
-        	List<StorageDeviceinput> list=deviceInputService.queryByNumber(storageDeviceinputExample2);
-        	StorageDeviceinputExample storageDeviceinputExample=new StorageDeviceinputExample();
-        	StorageDeviceinputExample.Criteria criteria=storageDeviceinputExample.createCriteria();
-        	criteria.andIdEqualTo(Integer.valueOf(storageDeviceget.getInputId()));
-        	List<StorageDeviceinput> inputlist = deviceInputService.queryByDevice(storageDeviceinputExample);
-            if(inputlist!=null){
-            	StorageDeviceinput storageDeviceinput=list.get(0);
-            	//使其状态改变为领用
-            	storageDeviceinput.setStatus(4);
-            	storageDeviceinput.setUseCount(storageDeviceinput.getUseCount()-storageDeviceget.getGetCount());
-            	deviceInputService.save(storageDeviceinput);
-            }*/
-            modelMap.put("status", "success");
+        	storageDeviceget = (StorageDeviceget) mapper.readValue(deviceGetJson, StorageDeviceget.class);
+			if (ParameterUtil.isnull(storageDeviceget.getId())) {
+				ContentBean cb=(ContentBean)mapper.readValue(contentBeanJson, ContentBean.class);
+				storageDeviceget.setDeviceName(cb.getDeviceName());
+				storageDeviceget.setDeviceType(cb.getDeviceTypeId());
+				storageDeviceget.setModel(cb.getModel());
+				storageDeviceget.setNumber(cb.getNumber());
+				storageDeviceget.setUseCount(cb.getUseCount());
+				storageDeviceget.setBackCount(0);
+				storageDeviceget.setHouseId(storageDeviceget.getHouseId());
+				deviceGetService.save(storageDeviceget);
+
+				//根据设备编号获取入库表的该设备信息
+				modelMap.put("number", storageDeviceget.getNumber());
+				modelMap.put("model", storageDeviceget.getModel());
+				List<StorageDeviceinput> inputList = deviceInputService.getUseCount(modelMap);
+				inputList.get(0).setStatus(4);//领用状态
+				inputList.get(0).setUseCount(inputList.get(0).getUseCount() - storageDeviceget.getGetCount());//数量减少
+				deviceInputService.updateByPrimaryKeySelective(inputList.get(0));
+				modelMap.put("status", "success");
+			}else{
+				deviceGetService.updateByPrimaryKeySelective(storageDeviceget);
+				modelMap.put("status", "success");
+			}
         } catch (IOException e) {
             modelMap.put("status", "error");
             e.printStackTrace();
@@ -297,6 +286,26 @@ public class StorageDeviceGetController {
     	list.add(storageDeviceget);
         return list;
     }
+
+
+    /**
+     * 根据ID获取修改信息
+     * @throws Exception
+     */
+    @RequestMapping(value ="/getEditGetById",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+   	@ApiOperation(value="根据ID获取修改信息", notes = "根据ID获取修改信息")
+   	@ApiImplicitParams({
+   		 @ApiImplicitParam(name = "id", value = "id", paramType = "query")
+   	})
+    public List<StorageDeviceget> getEditGetById(String id) throws Exception{
+    	StorageDeviceget storageDeviceget=null;
+    	if(id != null && !"".equals(id)){
+    		storageDeviceget=deviceGetService.selectByPrimaryKeys(Integer.valueOf(id));
+    	}
+    	List<StorageDeviceget> list =new ArrayList<StorageDeviceget>();
+    	list.add(storageDeviceget);
+        return list;
+    }
     
     /**
      * 根据ID获取归还信息

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

@@ -21,6 +21,7 @@ public interface StorageDevicegetMapper {
     List<StorageDeviceget> selectByExample(StorageDevicegetExample example);
 
     StorageDeviceget selectByPrimaryKey(Integer id);
+    StorageDeviceget selectByPrimaryKeys(Integer id);
 
     int updateByExampleSelective(@Param("record") StorageDeviceget record, @Param("example") StorageDevicegetExample example);
 

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

@@ -396,4 +396,29 @@
     GROUP BY device_type 
     order by device_type asc
   </select>
+
+  <select id="selectByPrimaryKeys" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    SELECT
+      gets.id,
+      gets.device_type,
+      gets.get_time,
+      gets.device_name,
+      gets.model,
+      gets.get_count,
+      gets.back_count,
+      gets.book_keeper,
+      gets. HANDLER,
+      gets.house_id,
+      gets.number,
+      gets.collator,
+      gets.use_count,
+      gets.remark,
+      gets.input_id,
+      gets.org_id,
+      inputs.storage_rack storageRack
+    FROM
+      storage_deviceget gets
+    LEFT JOIN storage_deviceinput inputs ON gets.input_id = inputs.id
+    where gets.id = #{id,jdbcType=INTEGER}
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/device/model/StorageDeviceget.java

@@ -37,8 +37,9 @@ public class StorageDeviceget {
     
     //业务字段
     private String orgName;
-    
-    
+
+    //货架
+    private String storageRack;
 
     public String getOrgName() {
 		return orgName;
@@ -303,4 +304,12 @@ public class StorageDeviceget {
     public void setOrgId(Integer orgId) {
         this.orgId = orgId;
     }
+
+    public String getStorageRack() {
+        return storageRack;
+    }
+
+    public void setStorageRack(String storageRack) {
+        this.storageRack = storageRack;
+    }
 }

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

@@ -14,6 +14,7 @@ public interface StorageDeviceGetService {
 	void save(StorageDeviceget storageDeviceget);
 
 	StorageDeviceget selectByPrimaryKey(int id);
+	StorageDeviceget selectByPrimaryKeys(int id);
 
 	void updateByPrimaryKeySelective(StorageDeviceget storageDeviceget);
 

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

@@ -43,6 +43,12 @@ public class StorageDeviceGetServiceImpl implements StorageDeviceGetService{
 		return deviceGetMapper.selectByPrimaryKey(id);
 	}
 
+	@Override
+	public StorageDeviceget selectByPrimaryKeys(int id) {
+		// TODO Auto-generated method stub
+		return deviceGetMapper.selectByPrimaryKeys(id);
+	}
+
 	//增加归还信息
 	@Override
 	public void updateByPrimaryKeySelective(StorageDeviceget storageDeviceget) {