Skip to content

L
long-tern-care-service
Commit 03792232 authored by 蔡镇泽's avatar 蔡镇泽
Browse files
Options

查询拒绝原因

parent a4340b23
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 12 deletions
assessment/assessment-service/src/main/java/com/hungraim/ltc/controller/TaskController.java
View file @ 03792232
package com.hungraim.ltc.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.hungraim.ltc.pojo.entity.assessment.ChRefuseReason;
import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
import com.hungraim.ltc.pojo.vo.assessment.*;
import com.hungraim.ltc.service.TaskService;
......@@ -281,18 +282,20 @@ public class TaskController {
/**
* 评定任务分组管理
*
* @param pushId 任务组id
* @param status 分组状态 未分配(拒绝(重新分配)):0;已分配:1;已接受:2;已完成:3;拒绝（中止）:4,拒绝（终止）:5
* @param pushId 任务组id
* @param status 分组状态 未分配(拒绝(重新分配)):0;已分配:1;已接受:2;已完成:3;拒绝（中止）:4,拒绝（终止）:5
* @param refuseReason 拒绝原因id
* @param refuseRemark 拒绝备注
*/
@RequestMapping("/taskGroup")
public Result taskGroup(Integer pushId, Integer status) {
public Result taskGroup(Integer pushId, Integer status, Integer refuseReason, String refuseRemark) {
if (status == null || status < 0 || status > 5) {
return Result.failed("状态异常!");
}
if (pushId == null) {
return Result.failed("任务组id不能为空!");
}
Result<Object> objectResult = taskService.taskGroup(pushId, status);
Result<Object> objectResult = taskService.taskGroup(pushId, status, refuseReason, refuseRemark);
if (!ResultCode.SUCCESS.getCode().equals(objectResult.getCode())) {
//失败
return Result.failed(objectResult.getMsg());
......@@ -301,6 +304,17 @@ public class TaskController {
}
/**
* 查询拒绝原因
*
* @return 拒绝原因
*/
@RequestMapping("/refuseReasonList")
public Result<List<ChRefuseReason>> refuseReasonList() {
List<ChRefuseReason> refuseReasons = taskService.refuseReasonList();
return Result.success(refuseReasons);
}
/**
* 设置预约日期和备注
*
* @param pushId 分组id
......
assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/DisableInfoMapper.java 0 → 100644
View file @ 03792232
package com.hungraim.ltc.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
/**
* 失能人员信息Mapper
*
* @author czz
*/
@Mapper
@Repository
public interface DisableInfoMapper extends BaseMapper<ChDisableInfo> {
}
assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/RefuseReasonMapper.java 0 → 100644
View file @ 03792232
package com.hungraim.ltc.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ltc.pojo.entity.assessment.ChRefuseReason;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
/**
* 拒绝原因Mapper
*
* @author czz
*/
@Mapper
@Repository
public interface RefuseReasonMapper extends BaseMapper<ChRefuseReason> {
}
assessment/assessment-service/src/main/java/com/hungraim/ltc/service/TaskService.java
View file @ 03792232
package com.hungraim.ltc.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.hungraim.ltc.pojo.entity.assessment.ChRefuseReason;
import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
import com.hungraim.ltc.pojo.vo.assessment.*;
import com.hungraim.ltc.util.Result;
......@@ -59,7 +60,7 @@ public interface TaskService {
List<TaskGroupVO> taskGroupList(String name, String certiCode, String tel);
Result<Object> taskGroup(Integer pushId, Integer status);
Result<Object> taskGroup(Integer pushId, Integer status, Integer refuseReason, String refuseRemark);
List<ChCfgSrvDisableLevel> cfgSrvDisableLevelList();
......@@ -74,4 +75,6 @@ public interface TaskService {
List<AllotTaskHisVO> allotTaskHisList();
Result<Object> updatePushTimeAndRemark(String pushId, Date timeDate, String remark);
List<ChRefuseReason> refuseReasonList();
}
assessment/assessment-service/src/main/java/com/hungraim/ltc/service/impl/TaskServiceImpl.java
View file @ 03792232
......@@ -7,6 +7,7 @@ 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.disable.ChDisableInfo;
import com.hungraim.ltc.pojo.vo.assessment.*;
import com.hungraim.ltc.service.TaskService;
import com.hungraim.ltc.util.Result;
......@@ -41,6 +42,10 @@ public class TaskServiceImpl implements TaskService {
private TaskPushHisMapper taskPushHisMapper;
@Autowired
private CfgSrvDisableLevelMapper cfgSrvDisableLevelMapper;
@Autowired
private DisableInfoMapper disableInfoMapper;
@Autowired
private RefuseReasonMapper refuseReasonMapper;
@Override
public IPage<TaskDistributionVO> taskDistributionList(String organId, String provincial, String city,
......@@ -163,18 +168,21 @@ public class TaskServiceImpl implements TaskService {
return Result.failed("评定人员必须是组长!");
}
String[] taskIds = taskId.split(",");
Date assignTime = new Date();//任务分配日期
//任务分配日期
Date assignTime = new Date();
for (String id : taskIds) {
ChAprTask task = taskMapper.selectById(id);
if (task == null) {
return Result.failed("无效的taskId!");
}
//更新评定任务信息
task.setAprEmpId(Integer.parseInt(empId));
task.setAssignTime(assignTime);
int count = taskMapper.updateById(task);
if (count != 1) {
return Result.failed("修改失败!");
}
taskMapper.updateById(task);
//更新失能人员信息
ChDisableInfo chDisableInfo = disableInfoMapper.selectById(task.getDisableInfoId());
chDisableInfo.setLastTaskId(task.getTaskId());
disableInfoMapper.updateById(chDisableInfo);
//生成组
ChAprTaskPush taskPush = new ChAprTaskPush();
taskPush.setAssignTime(new Date());
......@@ -199,12 +207,16 @@ public class TaskServiceImpl implements TaskService {
}
@Override
public Result<Object> taskGroup(Integer pushId, Integer status) {
public Result<Object> taskGroup(Integer pushId, Integer status, Integer refuseReason, String refuseRemark) {
ChAprTaskPush chAprTaskPush = taskPushMapper.selectById(pushId);
if (chAprTaskPush == null) {
return Result.failed("不存在的组!");
}
chAprTaskPush.setStatus(status.shortValue());
if (status == 4 || status == 5 || status == 0) {
chAprTaskPush.setRefuseReason(refuseReason.shortValue());
chAprTaskPush.setRefuseRemark(refuseRemark);
}
taskPushMapper.updateById(chAprTaskPush);
return Result.success();
}
......@@ -237,8 +249,12 @@ public class TaskServiceImpl implements TaskService {
}
}
for (ChAprTaskPush push : pushList) {
//更新任务组状态
push.setStatus(status.shortValue());
taskPushMapper.updateById(push);
//更新评定任务状态
ChAprTask chAprTask = taskMapper.selectById(push.getTaskId());
chAprTask.setTaskStatus(status);
}
return Result.success();
}
......@@ -267,4 +283,9 @@ public class TaskServiceImpl implements TaskService {
}
return Result.success();
}
@Override
public List<ChRefuseReason> refuseReasonList() {
return refuseReasonMapper.selectList(new QueryWrapper<>());
}
}
\ No newline at end of file
assessment/assessment-service/src/main/resources/mapper/ChDisableEvaluateMapper.xml
View file @ 03792232
......@@ -233,7 +233,7 @@
<select id="taskGroupInfoList" resultType="com.hungraim.ltc.pojo.vo.assessment.TaskGroupInfoVO">
select push.task_push_id taskPushId,
push.time time,
push.assignTime assignTime,
push.assign_time assignTime,
push.Group_number groupNumber,
task.apr_organ_id aprOrganId,
organ.ORGAN_NAME organName,
......
common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/assessment/ChRefuseReason.java 0 → 100644
View file @ 03792232
package com.hungraim.ltc.pojo.entity.assessment;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
/**
* 拒绝原因基表：ch_refuse_reason
*/
@Data
@TableName("CH_REFUSE_REASON")
@KeySequence("SEQ_CH_REFUSE_REASON")
public class ChRefuseReason {
/**
* 拒绝原因id
*/
@TableId(value = "refuse_reason_id", type = IdType.INPUT)
private Integer refuseReasonId;
/**
* 拒绝原因名称
*/
private String refuseReason;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment