Merge branch 'master' of http://129.211.99.254:8088/hg-hubin/long-tern-care-service

apply/apply-service/src/main/java/com/hungraim/ltc/dao/AprTaskMapper.java

 package com.hungraim.ltc.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ltc.pojo.entity.eval.ChAprTask;
+import com.hungraim.ltc.pojo.entity.assessment.ChAprTask;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 

apply/apply-service/src/main/java/com/hungraim/ltc/service/impl/DisableServiceImpl.java

@@ -4,12 +4,12 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ltc.dao.*;
+import com.hungraim.ltc.pojo.entity.assessment.ChAprTask;
+import com.hungraim.ltc.pojo.entity.disable.*;
 import com.hungraim.ltc.pojo.vo.disable.DisableExamineInfoVO;
 import com.hungraim.ltc.pojo.vo.disable.DisableVO;
 import com.hungraim.ltc.pojo.vo.disable.ExamineRecord;
-import com.hungraim.ltc.dao.*;
-import com.hungraim.ltc.pojo.entity.disable.*;
-import com.hungraim.ltc.pojo.entity.eval.ChAprTask;
 import com.hungraim.ltc.service.DisableService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;

assessment/assessment-service/src/main/java/com/hungraim/ltc/controller/TaskController.java

 package com.hungraim.ltc.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.hungraim.ltc.pojo.entity.assessment.ChAprEmp;
 import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
-import com.hungraim.ltc.pojo.entity.eval.ChAprEmp;
 import com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO;
 import com.hungraim.ltc.pojo.vo.assessment.TaskGroupVO;
 import com.hungraim.ltc.pojo.vo.assessment.TaskReportVO;

assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/AprEmpMapper.java

 package com.hungraim.ltc.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ltc.pojo.entity.eval.ChAprEmp;
+import com.hungraim.ltc.pojo.entity.assessment.ChAprEmp;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 

assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/AprPeronInfoMapper.java

 package com.hungraim.ltc.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ltc.pojo.entity.eval.ChAprPersonInfo;
+import com.hungraim.ltc.pojo.entity.assessment.ChAprPersonInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 

assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/AprReportMapper.java

 package com.hungraim.ltc.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ltc.pojo.entity.eval.ChAprReport;
+import com.hungraim.ltc.pojo.entity.assessment.ChAprReport;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 

assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/ChAprTaskPushMapper.java

 package com.hungraim.ltc.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ltc.pojo.entity.eval.ChAprTaskPush;
+import com.hungraim.ltc.pojo.entity.assessment.ChAprTaskPush;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 

assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/TaskEmpMapper.java

 package com.hungraim.ltc.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ltc.pojo.entity.eval.ChAprTaskEmp;
+import com.hungraim.ltc.pojo.entity.assessment.ChAprTaskEmp;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 

assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/TaskMapper.java

@@ -2,7 +2,7 @@ package com.hungraim.ltc.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hungraim.ltc.pojo.entity.eval.ChAprTask;
+import com.hungraim.ltc.pojo.entity.assessment.ChAprTask;
 import com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO;
 import com.hungraim.ltc.pojo.vo.assessment.TaskGroupVO;
 import com.hungraim.ltc.pojo.vo.assessment.TaskReportVO;

assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/TaskPushMapper.java

 package com.hungraim.ltc.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ltc.pojo.entity.eval.ChAprTaskPush;
+import com.hungraim.ltc.pojo.entity.assessment.ChAprTaskPush;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 

assessment/assessment-service/src/main/java/com/hungraim/ltc/service/TaskService.java

 package com.hungraim.ltc.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.hungraim.ltc.pojo.entity.assessment.ChAprEmp;
 import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
-import com.hungraim.ltc.pojo.entity.eval.ChAprEmp;
 import com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO;
 import com.hungraim.ltc.pojo.vo.assessment.TaskGroupVO;
 import com.hungraim.ltc.pojo.vo.assessment.TaskReportVO;

assessment/assessment-service/src/main/java/com/hungraim/ltc/service/impl/TaskServiceImpl.java

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.dao.*;
+import com.hungraim.ltc.pojo.entity.assessment.*;
 import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
-import com.hungraim.ltc.pojo.entity.eval.*;
 import com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO;
 import com.hungraim.ltc.pojo.vo.assessment.TaskGroupVO;
 import com.hungraim.ltc.pojo.vo.assessment.TaskReportVO;

assessment/assessment-service/src/main/resources/mapper/ChAprTaskPushMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hungraim.ltc.dao.ChAprTaskPushMapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ltc.pojo.entity.eval.ChAprTaskPush">
-    <id column="TASK_PUSH_ID" jdbcType="DECIMAL" property="taskPushId" />
-    <result column="TASK_POOL_ID" jdbcType="VARCHAR" property="taskPoolId" />
-    <result column="TIME" jdbcType="TIMESTAMP" property="time" />
-    <result column="EVALUATE_ADDRESS_ID" jdbcType="DECIMAL" property="evaluateAddressId" />
-    <result column="GROUP_NUMBER" jdbcType="VARCHAR" property="groupNumber" />
-    <result column="ORDER_NUMBER" jdbcType="DECIMAL" property="orderNumber" />
-    <result column="TASK_ID" jdbcType="DECIMAL" property="taskId" />
-    <result column="PLANNED_ARRIVAL_TIME" jdbcType="TIMESTAMP" property="plannedArrivalTime" />
-    <result column="PLANNED_DEPARTURE_TIME" jdbcType="TIMESTAMP" property="plannedDepartureTime" />
-    <result column="DISTANCE_STATION_KILOMETERS" jdbcType="DECIMAL" property="distanceStationKilometers" />
+  <resultMap id="BaseResultMap" type="com.hungraim.ltc.pojo.entity.assessment.ChAprTaskPush">
+    <id column="TASK_PUSH_ID" jdbcType="DECIMAL" property="taskPushId"/>
+    <result column="TASK_POOL_ID" jdbcType="VARCHAR" property="taskPoolId"/>
+    <result column="TIME" jdbcType="TIMESTAMP" property="time"/>
+    <result column="EVALUATE_ADDRESS_ID" jdbcType="DECIMAL" property="evaluateAddressId"/>
+    <result column="GROUP_NUMBER" jdbcType="VARCHAR" property="groupNumber"/>
+    <result column="ORDER_NUMBER" jdbcType="DECIMAL" property="orderNumber"/>
+    <result column="TASK_ID" jdbcType="DECIMAL" property="taskId"/>
+    <result column="PLANNED_ARRIVAL_TIME" jdbcType="TIMESTAMP" property="plannedArrivalTime"/>
+    <result column="PLANNED_DEPARTURE_TIME" jdbcType="TIMESTAMP" property="plannedDepartureTime"/>
+    <result column="DISTANCE_STATION_KILOMETERS" jdbcType="DECIMAL" property="distanceStationKilometers"/>
     <result column="DISTANCE_STATION_TRAVEL_TIME" jdbcType="DECIMAL" property="distanceStationTravelTime" />
     <result column="TOTAL_DISTANCE" jdbcType="DECIMAL" property="totalDistance" />
     <result column="LENGTH_OF_TIME" jdbcType="DECIMAL" property="lengthOfTime" />

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/eval/ChAprEmp.java → common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/assessment/ChAprEmp.java

-package com.hungraim.ltc.pojo.entity.eval;
+package com.hungraim.ltc.pojo.entity.assessment;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.KeySequence;

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/eval/ChAprPersonInfo.java → common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/assessment/ChAprPersonInfo.java

-package com.hungraim.ltc.pojo.entity.eval;
+package com.hungraim.ltc.pojo.entity.assessment;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.KeySequence;

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/eval/ChAprReport.java → common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/assessment/ChAprReport.java

-package com.hungraim.ltc.pojo.entity.eval;
+package com.hungraim.ltc.pojo.entity.assessment;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.KeySequence;

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/eval/ChAprReportEvaluate.java → common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/assessment/ChAprReportEvaluate.java

-package com.hungraim.ltc.pojo.entity.eval;
+package com.hungraim.ltc.pojo.entity.assessment;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.KeySequence;

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/eval/ChAprTask.java → common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/assessment/ChAprTask.java

-package com.hungraim.ltc.pojo.entity.eval;
+package com.hungraim.ltc.pojo.entity.assessment;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.KeySequence;

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/eval/ChAprTaskEmp.java → common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/assessment/ChAprTaskEmp.java

-package com.hungraim.ltc.pojo.entity.eval;
+package com.hungraim.ltc.pojo.entity.assessment;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.KeySequence;

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/eval/ChAprTaskPush.java → common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/assessment/ChAprTaskPush.java

-package com.hungraim.ltc.pojo.entity.eval;
+package com.hungraim.ltc.pojo.entity.assessment;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.KeySequence;

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/eval/ChCfgAprGroupDetail.java → common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/assessment/ChCfgAprGroupDetail.java

-package com.hungraim.ltc.pojo.entity.eval;
+package com.hungraim.ltc.pojo.entity.assessment;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.KeySequence;