Browse Source

绑定平车增加参数判断

pt
ma 4 years ago
parent
commit
dbbda18f4f
  1. 2
      util/src/main/java/com/ccsens/util/CodeEnum.java
  2. 7
      wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/PatientProjectDao.java
  3. 7
      wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StepTaskDao.java
  4. 7
      wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/WisdomCarDao.java
  5. 2
      wisdomcar/src/main/java/com/ccsens/wisdomcar/service/PatientAndFamilyService.java
  6. 19
      wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java
  7. 10
      wisdomcar/src/main/resources/mapper_dao/PatientProjectDao.xml
  8. 10
      wisdomcar/src/main/resources/mapper_dao/StepTaskDao.xml
  9. 12
      wisdomcar/src/main/resources/mapper_dao/WisdomCarDao.xml

2
util/src/main/java/com/ccsens/util/CodeEnum.java

@ -215,6 +215,8 @@ public enum CodeEnum {
PM_NOT_MEMBER(175,"项目经理下必须有一个成员",true),
WisdomCar_NOT_Found(176,"没有找到绑定的平车信息",true),
WISDOM_CAR_RUNNED(177,"这段时间内平车正在运行,请结束平车运行或重新选择平车",true),
WISDOM_CAR_IS_EXIST(178,"平车不存在,请检查后操作",true),
TASK_IS_EXIST(179,"任务不存在,请检查后操作",true),
;

7
wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/PatientProjectDao.java

@ -21,4 +21,11 @@ public interface PatientProjectDao extends PatientProjectMapper {
List<PatientVo.PatientRecord> findPatientInfoByIdList(@Param("list") List<Long> newPatientIds);
PatientAndFamilyVo.PatientInfo queryPatientInfo(@Param("projectId")Long projectId);
/**
* 查询项目id是否存在
* @param projectId 项目id
* @return 0不存在
*/
Integer findPatientIsExist(@Param("id") Long projectId);
}

7
wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StepTaskDao.java

@ -28,4 +28,11 @@ public interface StepTaskDao extends StepTaskMapper {
* @return 任务环节
*/
StepTask getByCarAndStep(@Param("carId") Long carId, @Param("stepId") Long stepId, @Param("time") Long time);
/**
* 查询任务是否存在
* @param taskSubId 任务id
* @return 0不存在
*/
Integer findTaskIsExist(@Param("id") Long taskSubId);
}

7
wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/WisdomCarDao.java

@ -24,4 +24,11 @@ public interface WisdomCarDao {
* @return 次数
*/
long countUsed(@Param("carId") Long carId, @Param("startTime") Long startTime, @Param("endTime") Long endTime);
/**
* 查询平车是否存在
* @param carId 平车id
* @return 0不存在
*/
Integer findCarIsExist(@Param("id") Long carId);
}

2
wisdomcar/src/main/java/com/ccsens/wisdomcar/service/PatientAndFamilyService.java

@ -53,7 +53,7 @@ public class PatientAndFamilyService implements IPatientAndFamilyService{
@Override
public void updatePatientInfo(PatientAndFamilyDto.PatientInfo param) {
PatientProject patient = patientProjectDao.selectByPrimaryKey(param.getId());
if (ObjectUtil.isNotNull(param)){
if (ObjectUtil.isNotNull(patient)){
if (ObjectUtil.isNotNull(param.getName())){
patient.setName(param.getName());
}

19
wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java

@ -268,6 +268,25 @@ public class WisdomCarService implements IWisdomCarService {
@Override
public void bindingCar(WisdomCarDto.BindingCar param, Long userId) {
//查询平车id是否存在
Integer carIsExist = wisdomcarDao.findCarIsExist(param.getCarId());
if (0 == carIsExist){
throw new BaseException(CodeEnum.WISDOM_CAR_IS_EXIST);
}
//查询任务是否存在
Integer taskIsExist = stepTaskDao.findTaskIsExist(param.getTaskSubId());
if (0 == taskIsExist){
throw new BaseException(CodeEnum.TASK_IS_EXIST);
}
//查询患者是否存在
Integer patientIsExist = patientProjectDao.findPatientIsExist(param.getProjectId());
if (0 == patientIsExist){
throw new BaseException(Constant.PATIENT_NOT_FOUND);
}
//开始时间不能大于当前时间,结束时间不能小于开始时间
if (param.getEndTime() < param.getStartTime() || param.getStartTime() > System.currentTimeMillis()){
throw new BaseException(CodeEnum.PARAM_ERROR);
}
// 判断平车是否在运行中
long count = wisdomcarDao.countUsed(param.getCarId(), param.getStartTime(), param.getEndTime());
if (count >0) {

10
wisdomcar/src/main/resources/mapper_dao/PatientProjectDao.xml

@ -36,4 +36,14 @@
ORDER BY t_patient_project.created_at
DESC LIMIT 1
</select>
<select id="findPatientIsExist" resultType="Integer">
SELECT
COUNT(id)
FROM
t_patient_project
WHERE
project_id = #{id}
AND rec_status = 0
</select>
</mapper>

10
wisdomcar/src/main/resources/mapper_dao/StepTaskDao.xml

@ -26,4 +26,14 @@
AND pc.start_time &lt;= #{time} AND pc.end_time = 0 AND pc.start_time + 2 * 60 * 60 * 1000 > #{time}
order by pc.created_at desc limit 1
</select>
<select id="findTaskIsExist" resultType="Integer">
SELECT
COUNT(id)
FROM
t_step_task
WHERE
task_sub_id = #{id}
AND rec_status = 0
</select>
</mapper>

12
wisdomcar/src/main/resources/mapper_dao/WisdomCarDao.xml

@ -42,4 +42,16 @@ WHERE
)
AND rec_status = 0
</select>
<select id="findCarIsExist" resultType="Integer">
SELECT
COUNT(id)
FROM
t_wisdom_car
WHERE
id = #{id}
AND rec_status = 0
</select>
</mapper>
Loading…
Cancel
Save