修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.java

@@ -217,9 +217,9 @@ public class OrgPersonController extends BaseController {
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
     public ResponseModel<Object> listPage(@RequestParam Map<String, Object> requestBody) {
-        if(redisUtils.get("userList") != null){
-            return ResponseHelper.buildResponse(redisUtils.get("userList"));
-        }
+//        if(redisUtils.get("userList") != null){
+//            return ResponseHelper.buildResponse(redisUtils.get("userList"));
+//        }
         return ResponseHelper.buildResponse(iOrgUsrService.pagePerson(
                 requestBody.containsKey("pageNum") ? requestBody.get("pageNum").toString()  :  null ,
                 requestBody.containsKey("pageSize") ? requestBody.get("pageSize").toString()  :  null ,

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -646,8 +646,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		calendar.set(Calendar.MINUTE,0);
 		calendar.set(Calendar.MILLISECOND,0);
 		//当前时间与晚上十二点的秒差
-		Long timeOut = (calendar.getTimeInMillis()-System.currentTimeMillis()) / 1000;
-		redisUtils.set("userList", pageBean, timeOut);
+//		Long timeOut = (calendar.getTimeInMillis()-System.currentTimeMillis()) / 1000;
+//		redisUtils.set("userList", pageBean, timeOut);
 		return pageBean;
 	}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/InputItemController.java

@@ -525,10 +525,10 @@ public class InputItemController extends AbstractBaseController {
 				Map<String,Object> map=new HashMap<>();
 				map.put("OkScore",param.getOkScore()!=null?param.getOkScore():0);
 				map.put("NoScore",param.getNoScore()!=null?param.getNoScore():0);
-				map.put("ValidUp",param.getValidUp()!=null?param.getNoScore():"");
-				map.put("ValidDown",param.getValidDown()!=null?param.getNoScore():"");
-				map.put("OkUp",param.getOkUp()!=null?param.getNoScore():"");
-				map.put("OkDown",param.getOkDown()!=null?param.getNoScore():"");
+				map.put("ValidUp",param.getValidUp()!=null?param.getValidUp():"");
+				map.put("ValidDown",param.getValidDown()!=null?param.getValidDown():"");
+				map.put("OkUp",param.getOkUp()!=null?param.getOkUp():"");
+				map.put("OkDown",param.getOkDown()!=null?param.getOkDown():"");
 				map.put("CheckValidUp",param.getCheckValidUp().equals("false")?false:true);
 				map.put("CheckValidDown",param.getCheckValidDown().equals("false")?false:true);
 				map.put("CheckOkUp",param.getCheckOkUp().equals("false")?false:true);