Merge remote-tracking branch 'origin/czks1.0' into czks1.0
						commit
						0da519a9e3
					
				| 
						 | 
				
			
			@ -95,13 +95,11 @@ public class AppSafetyEnvironmentalInspectorController extends BaseController {
 | 
			
		|||
            uBean.put("INSPECTION_USER_SIGN_IMG", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
 | 
			
		||||
            strings.add(uBean.getString("INSPECTION_USER_SIGN_IMG")+"@@"+fileName);
 | 
			
		||||
        }
 | 
			
		||||
        pd.put("uBean", JSON.toJSONString(uBean));
 | 
			
		||||
        PageData verify = safetyenvironmentalinspectorService.verify(uBean);
 | 
			
		||||
        pd.put("verify",JSON.toJSONString(verify));
 | 
			
		||||
        map.put("pd", pd);
 | 
			
		||||
        map.put("result", errInfo);
 | 
			
		||||
        map.put("sendPicturesList",JSON.toJSONString(strings));
 | 
			
		||||
        map.put("dockData", JSON.toJSONString(pd));
 | 
			
		||||
        map.put("dockData", JSON.toJSONString(verify));
 | 
			
		||||
        return map;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue