Merge remote-tracking branch 'origin/developer' into developer

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

@@ -196,7 +196,10 @@ public class CheckController extends AbstractBaseController {
     public CommonResponse saveCheckRecord(
             @ApiParam(value = "检查信息") @RequestBody() CheckRecordParam requestParam) {
         try {
-            CheckDto checkDto = checkService.saveCheckRecord(requestParam, getSelectedOrgInfo());
+            ReginParams reginParams = getSelectedOrgInfo();
+            String orgCode = getOrgCode(reginParams);
+            requestParam.setOrgCode(orgCode);
+            CheckDto checkDto = checkService.saveCheckRecord(requestParam, reginParams);
             return CommonResponseUtil.success(checkDto);
         } catch (Exception e) {
             log.error(e.getMessage(), e);

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

@@ -10,10 +10,8 @@ import java.util.List;
  */
 @Data
 public class CheckInputParam {
-	private long inputItemId;
+	private Long inputItemId;
 	private String inputValue;
-	private String selectName;
-	private boolean isCheck;
 	private String remark;
 	private Long routePointItemId;
 	private List<CheckShotDto> checkInputShot;

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

@@ -13,37 +13,27 @@ import java.util.List;
 @ApiModel(value = "任务提交")
 public class CheckRecordParam {
 
-	@ApiModelProperty(value = "任务id",required = true)
-	private Long planTaskId;
+    @ApiModelProperty(value = "任务id", required = true)
+    private Long planTaskId;
 
-	@ApiModelProperty(value = "点id",required = true)
-	private Long pointId;
+    @ApiModelProperty(value = "点id", required = true)
+    private Long pointId;
 
-	@ApiModelProperty(value = "点名称")
-	private String pointName;
+    @ApiModelProperty(value = "任务id")
+    private String orgCode;
 
-	@ApiModelProperty(value = "检查记录id")
-	private Long checkId;
+    @ApiModelProperty(value = "备注")
+    private String remark;
 
-	@ApiModelProperty(value = "执行人id")
-	private String userId;
+    @ApiModelProperty(value = "维保日期,非必输")
+    private String checkTime;
 
-	@ApiModelProperty(value = "任务id")
-	private String orgCode;
+    @ApiModelProperty(value = "路线id,非必输")
+    private Long routeId;
 
-	@ApiModelProperty(value = "备注")
-	private String remark;
-
-
-	@ApiModelProperty(value = "路线id")
-	private Long routeId;
-
-	@ApiModelProperty(value = "检查时间")
-	private String checkTime;
-
-	/**
-	 * 检查项
-	 */
-	@ApiModelProperty(value = "检查项",required = true)
-	private List<CheckInputParam> checkItems;
+    /**
+     * 检查项
+     */
+    @ApiModelProperty(value = "检查项", required = true)
+    private List<CheckInputParam> checkItems;
 }

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

@@ -138,11 +138,10 @@ public class CheckServiceImpl implements ICheckService {
             check.setPlanTaskId(recordParam.getPlanTaskId());
             check.setPlanId(planTask.getPlanId());
             check.setPlanName(detail.get("planName").toString());
-            check.setPointName(detail.get("pointName").toString());
-            recordParam.setPointName(detail.get("pointName").toString());
-            check.setPointId(recordParam.getPointId());
+            check.setPointName(point.getName());
+            check.setPointId(point.getId());
             check.setRemark(recordParam.getRemark());
-            check.setCheckTime(DateUtil.getLongDate(recordParam.getCheckTime()));
+            check.setCheckTime(new Date());
             check.setUploadTime(new Date());
             check.setOrgCode(recordParam.getOrgCode());
             check.setUserId(mtUserSeq);
@@ -158,10 +157,12 @@ public class CheckServiceImpl implements ICheckService {
                 CheckInput checkInput = new CheckInput();
                 checkInput.setCreateDate(new Date());
                 checkInput.setOrgCode(recordParam.getOrgCode());
-                checkInput.setInputId(Long.valueOf(item.getInputItemId() + ""));
+                checkInput.setInputId(inputItem.getId());
                 checkInput.setInputName(inputItem.getName());
+                checkInput.setInputValue(item.getInputValue());
                 checkInput.setOrderNo(inputItem.getOrderNo());
                 checkInput.setRemark(item.getRemark());
+                checkInput.setRoutePointItemId(item.getRoutePointItemId());
                 //1.校验结果
                 if (XJConstant.INPUT_ITEM_SELECT.equals(inputItem.getItemType())) {
                     paraseSelect(checkInput, inputItem.getDataJson(), item, inputItem.getIsScore());
@@ -176,15 +177,13 @@ public class CheckServiceImpl implements ICheckService {
                     Map<String, Object> unCheckMap = Maps.newHashMap();
                     unCheckMap.put("itemId", item.getInputItemId());
                     unCheckMap.put("routeId", check.getRouteId());
-                    unCheckMap.put("pointId", recordParam.getPointId());
+                    unCheckMap.put("pointId", point.getId());
                     unCheckMap.put("name", inputItem.getName());
                     unCheckMap.put("inputValue", item.getInputValue());
                     unqualifiedCheckItemList.add(unCheckMap);
                 } else {
                     checkInput.setIsOk(CheckStatusEnum.QUALIFIED.getCode());
                 }
-                checkInput.setRoutePointItemId(item.getRoutePointItemId());
-                checkInput.setInputValue(item.getInputValue());
                 score += checkInput.getScore();
                 for (CheckShotDto shotDto : item.getCheckInputShot()) {
                     CheckShot img = new CheckShot();
@@ -218,7 +217,7 @@ public class CheckServiceImpl implements ICheckService {
             Check finalCheck = check;
             //4.检查项入库
             checkItemList.forEach(checkInput -> checkInput.setCheckId(finalCheck.getId()));
-            if(!checkItemList.isEmpty()){
+            if (!checkItemList.isEmpty()) {
                 checkInputDao.saveAll(checkItemList);
             }
             List<CheckShot> allShot = new ArrayList<>();
@@ -245,7 +244,7 @@ public class CheckServiceImpl implements ICheckService {
     private void checkCanFinishTask(String mtUserSeq, PlanTask planTask, Long pointId) throws Exception {
         int status;
         int count = checkService.checkHasRecord(planTask.getId(), pointId);
-        if(count > 0){
+        if (count > 0) {
             throw new RuntimeException("任务已执行，不能重复执行");
         }
         if (!ToolUtils.transBeanList(planTask.getUserId()).contains(mtUserSeq)) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/util/CheckParamUtil.java

@@ -15,11 +15,8 @@ public class CheckParamUtil {
 			String operator = daoCriteria.getOperator();
 			String name = daoCriteria.getPropertyName();
 			if("checkTime".equals(name)){
-				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
 				param.setCheckTime(daoCriterias.get(i).getValue().toString());
-			}else if("userId".equals(name)){
-				param.setUserId(daoCriterias.get(i).getValue().toString());
-			}else if("routeId".equals(name)){
+			} else if("routeId".equals(name)){
 				param.setRouteId(Long.valueOf(daoCriterias.get(i).getValue().toString()));
 			}else if("orgCode".equals(name) && operator.equals(QueryOperatorEnum.EQUAL.getName())){
 				param.setOrgCode(daoCriterias.get(i).getValue().toString()+"%");

amos-boot-system-maintenance/src/main/resources/db/mapper/plan_task_detail.xml

@@ -8,7 +8,11 @@
 	
 	<select id="findPlanTaskByTaskIdAndPointId" resultType="Map">
 		SELECT
-			p.name planName, pt.begin_time beginTime, pt.end_time endTime, pp.name pointName, pp.point_no pointNo, ptd.id planTaskDetailId, pt.route_id routeId, pr.name routeName
+			p.name planName,
+		    pp.name pointName,
+		    ptd.id planTaskDetailId,
+		    pt.route_id routeId,
+		    pr.name routeName
 		FROM
 			p_plan_task pt
 		LEFT JOIN p_plan p ON pt.plan_id = p.id