计划状态查询修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/PlanController.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.supervision.business.controller;
 import java.util.HashMap;
 import java.util.List;
 
+import com.yeejoin.amos.supervision.common.enums.PlanStatusEnum;
 import com.yeejoin.amos.supervision.core.common.request.AddPlanRequest;
 import com.yeejoin.amos.supervision.core.common.response.PlanPointRespone;
 import org.slf4j.Logger;
@@ -26,6 +27,8 @@ import com.yeejoin.amos.supervision.dao.entity.Plan;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 @RestController
 @RequestMapping(value = "/api/plan")
@@ -215,4 +218,11 @@ public class PlanController extends AbstractBaseController {
         return CommonResponseUtil.success(planRequest);
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "计划状态", notes = "计划状态")
+    @RequestMapping(value = "/planStatus/list", method = RequestMethod.GET)
+    public ResponseModel getPlanStatusList() {
+        return ResponseHelper.buildResponse(PlanStatusEnum.getEnumList());
+    }
+
 }

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

@@ -6,6 +6,7 @@ import lombok.Data;
 import java.util.ArrayList;
 import java.util.List;
 
+
 @Data
 public class CheckRecordParam {
 	@ApiModelProperty(value = "任务id",required = true)
@@ -26,8 +27,11 @@ public class CheckRecordParam {
 	@ApiModelProperty(value = "检查时间")
 	private String checkTime;
 
+	/**
+	 * 0 不结束，1结束
+	 */
 	@ApiModelProperty(value = "任务状态是否结束")
-	private String planTaskStatus;    // 0 不结束，1结束
+	private String planTaskStatus;
 
 	/**
 	 * 检查项

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/InputItemServiceImpl.java

@@ -160,9 +160,9 @@ public class InputItemServiceImpl implements IInputItemService {
             targetInputItem.setName(targetInputItem.getName() + "复制");
             targetInputItem.setCreateBy(userId);
             targetInputItem.setCreateDate(new Date());
-            if (targetInputItem.getItemNo() != null && targetInputItem.getItemNo().indexOf("-") > 0)
+            if (targetInputItem.getItemNo() != null && targetInputItem.getItemNo().indexOf("-") > 0) {
                 targetInputItem.setItemNo(targetInputItem.getItemNo().substring(0, targetInputItem.getItemNo().indexOf("-")) + "-" + new Date().getTime());
-            else {
+            } else {
                 targetInputItem.setItemNo(targetInputItem.getItemNo() + "-" + new Date().getTime());
             }
             inputItemDao.save(targetInputItem);

amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_plan.xml

@@ -126,6 +126,7 @@
 	<if test="userId!=null"> and FIND_IN_SET(#{userId},a.user_id)</if>
 	<if test="orgCode!=null"> and (a.org_Code like concat (#{orgCode},"-%")or a.org_Code= #{orgCode})</if>
 	<if test="ownerId!=null"> and b.owner_id = #{ownerId}</if>
+	<if test="planStatus!=null and planStatus != '' "> and a.`status` = #{planStatus}</if>
 	</select>
 	<!--巡检计划查询 -->
 	<select id="getPlanInfo" resultType="java.util.HashMap">
@@ -174,6 +175,7 @@
 		<if test="userId!=null"> and FIND_IN_SET(#{userId},a.user_id)</if>
 		<if test="orgCode!=null"> and (a.org_Code like concat (#{orgCode},"-%")or a.org_Code= #{orgCode})</if>
 		<if test="ownerId!=null"> and b.owner_id = #{ownerId}</if>
+		<if test="planStatus!=null and planStatus != '' "> and a.`status` = #{planStatus}</if>
 		order by a.id desc
 		<choose>
 	     <when test="pageSize==-1"></when>