bug修改

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/src/main/java/com/yeejoin/amos/patrol/core/common/response/AppCheckInputRespone.java

@@ -18,6 +18,16 @@ public class AppCheckInputRespone{
 	private String pictureJson;
 	
 	private String isMultiline;
+
+	private String defaultValue;
+
+	public String getDefaultValue() {
+		return defaultValue;
+	}
+
+	public void setDefaultValue(String defaultValue) {
+		this.defaultValue = defaultValue;
+	}
 	
 	private String orderNo;
 	

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/entity/mybatis/PointCheckDetailBo.java

@@ -16,6 +16,16 @@ public class PointCheckDetailBo {
 	
 	private String planName;
 
+	private String defaultValue;
+
+	public String getDefaultValue() {
+		return defaultValue;
+	}
+
+	public void setDefaultValue(String defaultValue) {
+		this.defaultValue = defaultValue;
+	}
+
 	private int shortMinNumber;
 
 	private int shortMaxNumber;

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

@@ -357,7 +357,6 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
             throw new YeeException("计划不存在");
         }
 
-        if (StringUtil.isNotEmpty(plan.getUserId())) {
             //2.数据必输校验，不满足直接return，不再向下进行
             Boolean fileFlag = PlanTaskUtil.checkMustFile(plan);
             if (!fileFlag) {
@@ -384,17 +383,6 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
             //6.插入planTask及planTaskDetail
             insertPlanTaskAndDetNew(list, plan, flag, new Date());
 
-            //7.重新统计计划
-            if (ObjectUtils.isEmpty(plan.getUserId())) {
-                return;
-            }
-
-//            reformStatisticsPlanTask(strBginDate, strEndDate, plan.getUserId(), plan.getBizOrgCode());
-            //8.通知3d数据统计进行更新（换流站全景监控）
-//            this.notifyBusinessRefresh(NotifyBusinessTypeEum.planTask.getCode());
-        }
-
-
     }
 
 
@@ -718,31 +706,12 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
             paramMap.put("next_gen_date", DateUtil.formatDatrToStr(now, "yyyy-MM-dd"));
             planMapper.updPlanStatusOrGenDate(paramMap);// 更新下次任务生成日期
         } else {
-            Map<String, String> deptMap = new HashMap<>();
             try {
                 String isFixDate = plan.getIsFixedDate();// 是否固定日期
                 List<Long> pointIdList = iRoutePointDao.queryRoutePointIds(plan.getRouteId());
                 int pointNum = iRoutePointDao.countRoutePoint(plan.getRouteId());
                 long batchNo = now.getTime();
 
-                Set<String> departmentIds = new HashSet<>();
-                List<String> depts = Arrays.asList(plan.getUserDept().split(","));
-                depts.stream().forEach(dept -> {
-                    deptMap.put(dept.substring(0, dept.indexOf("@")), dept.substring(dept.indexOf("@") + 1));
-                });
-                for (String entry : deptMap.keySet()) {
-                    String entryValue = deptMap.get(entry);
-                    departmentIds.add(entryValue);
-                }
-
-                StringBuffer departmentIdBuffer = new StringBuffer();
-                Iterator<String> it = departmentIds.iterator();
-                while (it.hasNext()) {
-                    departmentIdBuffer.append(it.next()).append(",");
-                }
-
-
-                List<PlanTask> planTaskList = new ArrayList<>();
                 List<PlanTaskDetail> planTaskDetailListSync = new ArrayList<>();
                 PlanTask planTask = new PlanTask();
                 List<PlanTask> taskList = new ArrayList<>();
@@ -756,10 +725,6 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
                     String orgCode = list.get(i).get("ORG_CODE") == null ? "-1" : String.valueOf(list.get(i).get("ORG_CODE"));
                     String unitCode = list.get(i).get("UNIT_CODE") == null ? "-1" : String.valueOf(list.get(i).get("UNIT_CODE"));
 
-//                planTask = iplanTaskDao.findByUserIdAndBeginTimeAndEndTimeAndPlanIdAndRouteId(userId, startTime, endTime, plan.getId(), plan.getRouteId());
-//                if (planTask != null) {
-//                    continue;
-//                }
                     planTask = new PlanTask();
 
                     //修改巡检p_plan_task orgcode为执行人的org_code  -- add by wujunkai 20201216
@@ -1517,6 +1482,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
                     AppCheckInputRespone input = new AppCheckInputRespone();
                     input.setInputName(action.getInputName());
                     input.setCheckInputId(action.getCheckInputId());
+                    input.setDefaultValue(action.getDefaultValue());
                     input.setDataJson(action.getDataJson());
                     input.setIsMultiline(action.getIsMultiline());
                     input.setIsMust(action.getIsMust());

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/quartz/JobService.java

@@ -425,7 +425,14 @@ public class JobService implements IJobService {
 
                 InputItem inputItem = inputItemDao.findById(arg.getInputItemId()).get();
                 CheckInput checkInput = new CheckInput();
-                checkInput = paraseSelect(checkInput, inputItem.getDataJson(),  inputItem.getIsScore());
+
+                if (XJConstant.INPUT_ITEM_SELECT.equals(inputItem.getItemType())) {
+                    checkInput = paraseSelect(checkInput, inputItem.getDataJson(),  inputItem.getIsScore());
+                } else if (XJConstant.INPUT_ITEM_NUMBER.equals(inputItem.getItemType())) {
+                    checkInput.setInputValue(inputItem.getDefaultValue());
+                } else if (XJConstant.INPUT_ITEM_TEXT.equals(inputItem.getItemType())) {
+                    checkInput.setInputValue(inputItem.getDefaultValue());
+                }
 
                 checkInput.setCheckId(check.getId());
                 checkInput.setInputId(arg.getInputItemId());

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -571,8 +571,7 @@
         <if test="type!=null and type==2">AND pt.check_date between #{startTime} and #{endTime} </if>
         <if test="type!=null and type==3">AND DATE_FORMAT(pt.check_date, '%Y') = left(#{checkTime}, 4)</if>
         <if test="userId!=null and userId!=0">AND FIND_IN_SET(#{userId}, pt.user_id)>0</if>
-        <!--        <if test="orgCode!=null">AND org_code LIKE #{orgCode}</if>-->
-        <if test="orgCode!=null">AND pt.org_code  LIKE concat(#{orgCode},'%') </if>
+        <if test="orgCode!=null">AND pt.org_code = #{orgCode} </if>
         GROUP BY stime
         order by stime ASC
     </select>

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -414,7 +414,8 @@
 	<select id="getPlanTaskPoints" resultType="Map">
 		SELECT
 			ptd.status,
-			P.NAME,
+			P.name,
+		    P.point_no pointNO,
 			P.ID pointId
 		FROM
 			( SELECT * FROM p_plan_task_detail ptd WHERE ptd.task_no = #{planTaskId} ) ptd
@@ -694,6 +695,7 @@
 			pii.risk_desc riskDesc,
 			pii.data_json dataJson,
 			pii.is_must isMust,
+			pii.default_value defaultValue,
 			pii.picture_json pictureJson,
 			pii.is_multiline isMultiline,
 			pii.order_no orderNo