巡检模块代码物理合并2

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

 package com.yeejoin.amos.patrol.business.controller;
 
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
 import com.yeejoin.amos.patrol.business.feign.JcsFeignClient;
@@ -22,6 +23,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import javax.persistence.Column;
 import java.util.*;
@@ -139,6 +141,12 @@ public class PlanController extends AbstractBaseController {
     @RequestMapping(value = "/addPlan", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse checkPlanAdd(@ApiParam(value = "巡检计划", required = true) @RequestBody Plan param) {
         try {
+
+
+            if ( param.getDayBegin().getTime()> param.getDayEnd().getTime()){
+                throw new BadRequest("开始时间不能大于结束时间");
+            }
+
             String userId = getUserId();
             ReginParams reginParams = getSelectedOrgInfo();
             String loginOrgCode = getOrgCode(reginParams);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/entity/mybatis/CheckPtListBo.java

@@ -54,6 +54,17 @@ public class CheckPtListBo {
 	 */
 	private String Level;
 
+
+	private String nonum;
+
+	public String getNonum() {
+		return nonum;
+	}
+
+	public void setNonum(String nonum) {
+		this.nonum = nonum;
+	}
+
 	public String getPointID() {
 		return pointID;
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PointServiceImpl.java

@@ -1377,13 +1377,23 @@ public class PointServiceImpl implements IPointService {
         Page<CheckPtListBo> result = new PageImpl<CheckPtListBo>(content, param, total);
 
         List< HashMap<String, Object>> colModel=new ArrayList<>();
+
+        HashMap<String, Object> temph0 = new HashMap<>();
+        temph0.put("fid","nonum");
+        temph0.put("dataIndex","nonum");
+        temph0.put("name","编号");
+        temph0.put("title","编号");
+        temph0.put("type","nonum");
+        temph0.put("key","nonum");
+
         HashMap<String, Object> temph1 = new HashMap<>();
-        temph1.put("fid","pointNo");
-        temph1.put("dataIndex","pointNo");
+        temph1.put("fid","no");
+        temph1.put("dataIndex","no");
         temph1.put("name","编号");
         temph1.put("title","编号");
-        temph1.put("type","pointNo");
-        temph1.put("key","pointNo");
+        temph1.put("type","no");
+        temph1.put("key","no");
+        temph1.put("idVisable",false);
         HashMap<String, Object> temph2 = new HashMap<>();
         temph2.put("fid","name");
         temph2.put("dataIndex","name");
@@ -1435,6 +1445,7 @@ public class PointServiceImpl implements IPointService {
         temph8.put("key","errorMsg");
 
         colModel.add(temph1);
+        colModel.add(temph0);
         colModel.add(temph2);
         // colModel.add(temph3);
         colModel.add(temph4);

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -262,7 +262,10 @@
 					pt.user_dept userDept
 				FROM
 				p_plan_task pt
+				LEFT JOIN p_plan_task_detail b
+				ON pt.id = b.task_no
 				INNER JOIN  p_plan p ON pt.plan_id = p.id
+				where  b.task_no is not null
 			) a
 		<include refid="plan-task-app-where"/>
 		<if test="orderBy != null and orderBy != ''"> order by ${orderBy} </if>