Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffPatrolRecordDTO.java

@@ -88,6 +88,11 @@ public class StaffPatrolRecordDTO implements Serializable {
      */
 	private String status;
 
+    /**
+     * 是否手动结束 手动:1，定时任务传参:0
+     */
+	private Integer isHandEnd;
+
     /**
      * 删除标识 0.未删除 1.已删除
      */

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolRecordListResultDTO.java

@@ -45,4 +45,9 @@ public class PatrolRecordListResultDTO implements Serializable {
 	 */
 	private List<PatrolRecordDetailDTO> details;
 
+	/**
+	 * 是否手动结束 手动:1，定时任务传参:0
+	 */
+	private Integer isHandEnd;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffPatrolRecordEntity.java

@@ -88,4 +88,9 @@ public class StaffPatrolRecordEntity extends BaseEpmetEntity {
      */
 	private String status;
 
+	/**
+	 * 是否手动结束 手动:1，定时任务传参:0
+	 */
+	private Integer isHandEnd;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -209,6 +209,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
             dto.setStatus(record.getStatus());
             dto.setPatrolStartTime(DateUtils.format(record.getPatrolStartTime(), DateUtils.DATE_TIME_PATTERN));
             dto.setPatrolEndTime(DateUtils.format(record.getPatrolEndTime(), DateUtils.DATE_TIME_PATTERN));
+            dto.setIsHandEnd(record.getIsHandEnd());
             Integer minutes;
             if (("patrolling").equals(record.getStatus())) {
                 minutes = DateUtils.calculateMin(record.getPatrolStartTime(), new Date());

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/StatsStaffPatrolRecordDailyEntity.java

@@ -123,4 +123,5 @@ public class StatsStaffPatrolRecordDailyEntity extends BaseEpmetEntity {
 	 */
 	private String latestPatrolStatus;
 
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java

@@ -220,8 +220,14 @@ public class DataReportingServiceImpl implements DataReportingService {
 					//如果是对应一级分类，则二级分类为空。如果对应平阴二级分类，则取对应的一级分类
 					CustomerProjectCategoryDictEntity epmetCode = epmetCodeMap.get(code);
 					if (NumConstant.ONE == epmetCode.getLevel()) {
-						categoryCode = null;
 						parentCode = code;
+						//如果项目为一级分类 则二级分类默认给第一个
+						epmetCode = epmetCodeMap.get(code.concat("01"));
+						if (epmetCode == null){
+							log.warn(" 分类下没有子分类，无法拼接2级分类 code:{}",code);
+						} else {
+							categoryCode = epmetCode.getCategoryCode();
+						}
 					} else {
 						categoryCode = code;
 						parentCode = epmetCode.getParentCategoryCode();

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StatsStaffPatrolRecordDailyDao.java

@@ -62,7 +62,8 @@ public interface StatsStaffPatrolRecordDailyDao extends BaseDao<StatsStaffPatrol
      * @date 2021/7/1 10:36 上午
      */
     void updateStatsRecordEnd(@Param("userId")String userId,@Param("totalTime") Integer totalTime,
-                              @Param("projectCount")Integer projectCount,@Param("dateId")String dateId,@Param("gridId")String gridId);
+                              @Param("projectCount")Integer projectCount,@Param("dateId")String dateId,
+                              @Param("gridId")String gridId);
 
     /**
      * @Description  查询巡查人数

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffPatrolRecordEntity.java

@@ -88,4 +88,9 @@ public class StaffPatrolRecordEntity extends BaseEpmetEntity {
      */
 	private String status;
 
+	/**
+	 * 是否手动结束 手动:1，定时任务传参:0
+	 */
+	private Integer isHandEnd;
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StatsStaffPatrolRecordDailyEntity.java

@@ -123,4 +123,5 @@ public class StatsStaffPatrolRecordDailyEntity extends BaseEpmetEntity {
      */
 	private String latestPatrolStatus;
 
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java

@@ -264,6 +264,7 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		Integer totalTime = DateUtils.calculateSecond(record.getPatrolStartTime(), record.getPatrolEndTime()) + 59;
 		record.setTotalTime(totalTime);
 		record.setStatus(PatrolConstant.END);
+		record.setIsHandEnd(NumConstant.ONE);
 		baseDao.updateById(record);
 		//保存记录明细
 		StaffPatrolDetailEntity detailEntity = new StaffPatrolDetailEntity();
@@ -318,6 +319,7 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 				Integer totalTime = DateUtils.calculateSecond(item.getPatrolStartTime(), endTime) + 59;
 				item.setTotalTime(totalTime);
 				item.setUpdatedTime(null);
+				item.setIsHandEnd(NumConstant.ZERO);
 				statsPatrolUpdateEnd(item.getStaffId(),totalTime, item.getPatrolStartTime(), endTime, item.getGrid());
 			});
 

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.18__add_is_hand_end.sql

@@ -0,0 +1,7 @@
+alter table staff_patrol_record add column `IS_HAND_END` INT(1) NOT NULL DEFAULT 1 COMMENT '是否手动结束 手动:1，定时任务传参:0' AFTER `STATUS`;
+
+
+UPDATE staff_patrol_record
+SET is_hand_end  = 0
+WHERE ID IN (SELECT ID FROM (SELECT ID FROM staff_patrol_record WHERE CONVERT(ACTRUAL_END_TIME,char) LIKE '%23:59:59') temp);
+