1.app联调bug修改

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/dao/entity/CheckShot.java

@@ -45,11 +45,7 @@ public class CheckShot extends BasicEntity {
 	private String pointName;
 
 	/**
-	 * 拍照类型:定点（检查项拍照），普通（检
-	 *
-	 *
-	 *
-	 *
+	 * 拍照类型:1-检查项照片；2-不合格照片
 	 * 点现场照片）
 	 */
 	@Column(name="shot_type")

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/PlanTaskController.java

@@ -195,7 +195,7 @@ public class PlanTaskController extends AbstractBaseController {
      * @param
      * @return
      */
-    @PersonIdentify(isNeedIdentity = true)
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "维保任务查询-mobile", notes = "根据用户条件查询所有计划任务-mobile")
     @RequestMapping(value = "/queryPlanTask", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/param/CheckInputParam.java

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -20,7 +21,7 @@ public class CheckInputParam {
 	private boolean isCheck;
 	private String remark;
 	private Long routePointItemId;
-	private List<CheckShotDto> checkInputShot;
+	private List<CheckShotDto> checkInputShot = new ArrayList<>();
 
 	public CheckInputParam(String inputValue) {
 		this.inputValue = inputValue;

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/param/CheckRecordParam.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -37,5 +38,5 @@ public class CheckRecordParam {
 	 * 检查项
 	 */
 	@ApiModelProperty(value = "检查项",required = true)
-	private List<CheckInputParam> checkItems;
+	private List<CheckInputParam> checkItems = new ArrayList<>();
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/CheckServiceImpl.java

@@ -46,6 +46,7 @@ import com.yeejoin.amos.maintenance.core.util.query.BaseQuerySpecification;
 import com.yeejoin.amos.maintenance.dao.entity.*;
 import com.yeejoin.amos.maintenance.feign.RemoteSecurityService;
 import com.yeejoin.amos.maintenance.mqtt.MqttGateway;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.cxf.common.util.CollectionUtils;
 import org.assertj.core.util.Sets;
@@ -64,6 +65,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @Service("checkService")
+@Slf4j
 public class CheckServiceImpl implements ICheckService {
 
     @Autowired
@@ -266,7 +268,8 @@ public class CheckServiceImpl implements ICheckService {
             //7.返回不合格记录
             return new CheckDto(check.getId(), unqualifiedCheckItemList);
         } catch (Exception e) {
-            throw new Exception(e.getMessage());
+            log.error(e.getMessage(),e);
+            throw new Exception(e.getMessage(),e);
         }
     }
 
@@ -329,7 +332,9 @@ public class CheckServiceImpl implements ICheckService {
                 score = jsonObject.getIntValue(XJConstant.INPUT_ITEM_OK_SCORE);
             }
         }
-        if (XJConstant.YES.equals(isScore)) checkInput.setScore(score);
+        if (XJConstant.YES.equals(isScore)) {
+            checkInput.setScore(score);
+        }
         return checkInput;
     }
 
@@ -370,7 +375,9 @@ public class CheckServiceImpl implements ICheckService {
             checkInput.setIsOk(XJConstant.OK);
             score = OkScore;
         }
-        if (XJConstant.YES.equals(isScore)) checkInput.setScore(score);
+        if (XJConstant.YES.equals(isScore)) {
+            checkInput.setScore(score);
+        }
         return checkInput;
     }
 
@@ -399,7 +406,9 @@ public class CheckServiceImpl implements ICheckService {
                 }
             }
         }
-        if (XJConstant.YES.equals(isScore)) checkInput.setScore(score);
+        if (XJConstant.YES.equals(isScore)) {
+            checkInput.setScore(score);
+        }
         return checkInput;
     }