双规优化

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CheckController.java

@@ -229,7 +229,6 @@ public class CheckController extends AbstractBaseController {
         String realName = user.getRealName();
         requestParam.setUserId(userId);
         requestParam.setUserName(realName);
-        requestParam.setIsOffline(requestParam.getIsOffline()==null?false:requestParam.getIsOffline());
         try {
             if (planTask != null) {
                 if (!ToolUtils.transBeanList(planTask.getUserId()).contains(userId.toString())) {

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java

@@ -498,9 +498,6 @@ public class CheckServiceImpl implements ICheckService {
                     routeParam.put("routeId", planTask.getRouteId());
                     routeParam.put("pointId", requestParam.getPointId());
 
-                    if (ObjectUtils.isEmpty(check)) {
-                        check = new Check();
-                    }
                     check.setPlanTaskDetailId(Long.parseLong(detail.get("planTaskDetailId").toString()));
                     check.setRouteId(Long.parseLong(detail.get("routeId").toString()));
                     check.setRouteName(detail.get("routeName").toString());
@@ -541,21 +538,21 @@ public class CheckServiceImpl implements ICheckService {
 
             check.setUserName(requestParam.getUserName());
 
-            check.setCheckMode(requestParam.getCheckMode());
+//            check.setCheckMode(requestParam.getCheckMode());
 
             List<CheckInputParam> list = requestParam.getCheckItems();
             List<CheckInput> checkItemList = new ArrayList<>();
             List<Map<String, Object>> unqualifiedcheckItemList = Lists.newArrayList();
             String error = "";
-            HashMap<String, String> errorClassifyNames = new HashMap<>();
+           // HashMap<String, String> errorClassifyNames = new HashMap<>();
             int score = 0;
             for (CheckInputParam item : list) {
-                String pointClassifyName = null;
-                PointClassify pointClassify = null;
-                if (StringUtil.isNotEmpty(item.getClassifyIds()) && iPointClassifyDao.existsById(item.getClassifyIds())) {
-                    pointClassify = iPointClassifyDao.findById(item.getClassifyIds()).get();
-                    pointClassifyName = pointClassify.getName();
-                }
+//                String pointClassifyName = null;
+//                PointClassify pointClassify = null;
+//                if (StringUtil.isNotEmpty(item.getClassifyIds()) && iPointClassifyDao.existsById(item.getClassifyIds())) {
+//                    pointClassify = iPointClassifyDao.findById(item.getClassifyIds()).get();
+//                    pointClassifyName = pointClassify.getName();
+//                }
                 InputItem inputItem = inputItemDao.findById(item.getInputItemId()).get();
                 CheckInput checkInput = new CheckInput();
 
@@ -576,9 +573,9 @@ public class CheckServiceImpl implements ICheckService {
                 }
 
                 if (XJConstant.NO.equals(checkInput.getIsOk())) {
-                    String classifyName = pointClassifyName != null ? pointClassifyName + "-" : "";
-                    error += (classifyName + inputItem.getName() + "=" + (ObjectUtils.isEmpty(item.getInputValue()) ? "" : item.getInputValue()) + ";");
-                    errorClassifyNames.put(pointClassifyName != null ? pointClassifyName : "", "");
+                   // String classifyName = pointClassifyName != null ? pointClassifyName + "-" : "";
+                    error += ( inputItem.getName() + "=" + (ObjectUtils.isEmpty(item.getInputValue()) ? "" : item.getInputValue()) + ";");
+                    // errorClassifyNames.put(pointClassifyName != null ? pointClassifyName : "", "");
                     checkInput.setIsOk(CheckStatusEnum.UNQUALIFIED.getCode());
                     Map<String, Object> unCheckMap = Maps.newHashMap();
                     unCheckMap.put("itemId", item.getInputItemId());
@@ -595,7 +592,7 @@ public class CheckServiceImpl implements ICheckService {
                 checkInput.setRoutePointItemId(item.getRoutePointItemId());
                 checkInput.setInputValue(item.getInputValue());
                 checkInput.setPointClassifyId(item.getClassifyIds());
-                checkInput.setPointClassifyName(pointClassifyName);
+                // checkInput.setPointClassifyName(pointClassifyName);
                 score += checkInput.getScore();
                 checkItemList.add(checkInput);
             }
@@ -620,7 +617,7 @@ public class CheckServiceImpl implements ICheckService {
             esTaskDetail.save(esTaskDetailDto);
 
             check.setError(error);
-            check.setErrorClassify(StringUtils.join(errorClassifyNames.keySet(), ","));
+            // check.setErrorClassify(StringUtils.join(errorClassifyNames.keySet(), ","));
 
             try {
                 log.error("手机app保存巡检记录++++++++++++++++++++++" + check.toString() + "<Over><Over><Over><Over>");