维修状态新增待进行
This commit is contained in:
parent
42b985147d
commit
499a9ad4d5
|
|
@ -31,6 +31,10 @@ public enum TaskStatusEnum {
|
||||||
* 维修进行中
|
* 维修进行中
|
||||||
*/
|
*/
|
||||||
REPAIRING("43", "维修进行中"),
|
REPAIRING("43", "维修进行中"),
|
||||||
|
/**
|
||||||
|
* 维修待进行
|
||||||
|
*/
|
||||||
|
REPAIRPENDING("42", "维修待进行"),
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 待报废任务--待审核
|
* 待报废任务--待审核
|
||||||
|
|
|
||||||
|
|
@ -493,8 +493,8 @@ public class BackReceiveServiceImpl implements BackReceiveService {
|
||||||
applyInfo.setTaskType(Integer.valueOf(taskType));
|
applyInfo.setTaskType(Integer.valueOf(taskType));
|
||||||
String taskStatus = "";
|
String taskStatus = "";
|
||||||
if (TaskTypeEnum.MAINTENANCE_TASK.getCode().equals(taskType)) {
|
if (TaskTypeEnum.MAINTENANCE_TASK.getCode().equals(taskType)) {
|
||||||
//taskStatus = "43";
|
//taskStatus = "42";
|
||||||
taskStatus = TaskStatusEnum.REPAIRING.getCode();
|
taskStatus = TaskStatusEnum.REPAIRPENDING.getCode();
|
||||||
}
|
}
|
||||||
if (TaskTypeEnum.SCRAP_TASK.getCode().equals(taskType)) {
|
if (TaskTypeEnum.SCRAP_TASK.getCode().equals(taskType)) {
|
||||||
//taskStatus = "120";
|
//taskStatus = "120";
|
||||||
|
|
|
||||||
|
|
@ -10,9 +10,10 @@ import com.bonus.sgzb.base.service.RepairService;
|
||||||
import com.bonus.sgzb.common.core.exception.ServiceException;
|
import com.bonus.sgzb.common.core.exception.ServiceException;
|
||||||
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
|
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
|
||||||
import com.bonus.sgzb.common.security.utils.SecurityUtils;
|
import com.bonus.sgzb.common.security.utils.SecurityUtils;
|
||||||
|
import com.bonus.sgzb.material.domain.TmTask;
|
||||||
|
import com.bonus.sgzb.material.mapper.TaskMapper;
|
||||||
import com.bonus.sgzb.system.api.domain.SysUser;
|
import com.bonus.sgzb.system.api.domain.SysUser;
|
||||||
import com.bonus.sgzb.system.api.model.LoginUser;
|
import com.bonus.sgzb.system.api.model.LoginUser;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
@ -30,6 +31,9 @@ public class RepairServiceImpl implements RepairService {
|
||||||
@Autowired
|
@Autowired
|
||||||
private RepairMapper mapper;
|
private RepairMapper mapper;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private TaskMapper taskMapper;
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<RepairTask> getRepairTaskList(RepairTask bean) {
|
public List<RepairTask> getRepairTaskList(RepairTask bean) {
|
||||||
|
|
@ -58,6 +62,12 @@ public class RepairServiceImpl implements RepairService {
|
||||||
bean.setCreateBy(loginUser.getUserid());
|
bean.setCreateBy(loginUser.getUserid());
|
||||||
List<RepairPartDetails> partList = bean.getPartList();
|
List<RepairPartDetails> partList = bean.getPartList();
|
||||||
BigDecimal sfCosts = new BigDecimal("0");
|
BigDecimal sfCosts = new BigDecimal("0");
|
||||||
|
// 修改任务状态
|
||||||
|
TmTask tmTask = new TmTask();
|
||||||
|
tmTask.setTaskStatus(43);
|
||||||
|
tmTask.setTaskId(Long.valueOf(bean.getTaskId()));
|
||||||
|
taskMapper.updateTashStatus(tmTask);
|
||||||
|
|
||||||
String nbType = "1";
|
String nbType = "1";
|
||||||
String fcType = "2";
|
String fcType = "2";
|
||||||
String sfPart = "1";
|
String sfPart = "1";
|
||||||
|
|
|
||||||
|
|
@ -79,6 +79,7 @@ public interface TaskMapper {
|
||||||
int insertSelective(TmTask bean);
|
int insertSelective(TmTask bean);
|
||||||
|
|
||||||
int insertAgreement(TmTask task);
|
int insertAgreement(TmTask task);
|
||||||
|
int updateTashStatus(TmTask task);
|
||||||
|
|
||||||
int insertTmTaskByBackInfo(BackApplyInfo backApplyInfo);
|
int insertTmTaskByBackInfo(BackApplyInfo backApplyInfo);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -211,6 +211,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
</trim>
|
</trim>
|
||||||
where task_id = #{taskId}
|
where task_id = #{taskId}
|
||||||
</update>
|
</update>
|
||||||
|
<update id="updateTashStatus">
|
||||||
|
UPDATE tm_task tt
|
||||||
|
SET tt.task_status = #{taskStatus}
|
||||||
|
WHERE
|
||||||
|
tt.task_id = #{taskId}
|
||||||
|
</update>
|
||||||
|
|
||||||
<delete id="deleteTmTaskByTaskId" parameterType="Long">
|
<delete id="deleteTmTaskByTaskId" parameterType="Long">
|
||||||
delete from tm_task where task_id = #{taskId}
|
delete from tm_task where task_id = #{taskId}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue