diff --git a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/enums/TaskStatusEnum.java b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/enums/TaskStatusEnum.java index 5544c24..ba6868d 100644 --- a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/enums/TaskStatusEnum.java +++ b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/enums/TaskStatusEnum.java @@ -31,6 +31,10 @@ public enum TaskStatusEnum { * 维修进行中 */ REPAIRING("43", "维修进行中"), + /** + * 维修待进行 + */ + REPAIRPENDING("42", "维修待进行"), /** * 待报废任务--待审核 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java index 619cdcc..348d89b 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java @@ -493,8 +493,8 @@ public class BackReceiveServiceImpl implements BackReceiveService { applyInfo.setTaskType(Integer.valueOf(taskType)); String taskStatus = ""; if (TaskTypeEnum.MAINTENANCE_TASK.getCode().equals(taskType)) { - //taskStatus = "43"; - taskStatus = TaskStatusEnum.REPAIRING.getCode(); + //taskStatus = "42"; + taskStatus = TaskStatusEnum.REPAIRPENDING.getCode(); } if (TaskTypeEnum.SCRAP_TASK.getCode().equals(taskType)) { //taskStatus = "120"; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java index 8a96fbf..00df5d4 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java @@ -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.web.domain.AjaxResult; 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.model.LoginUser; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -30,6 +31,9 @@ public class RepairServiceImpl implements RepairService { @Autowired private RepairMapper mapper; + @Autowired + private TaskMapper taskMapper; + @Override public List getRepairTaskList(RepairTask bean) { @@ -58,6 +62,12 @@ public class RepairServiceImpl implements RepairService { bean.setCreateBy(loginUser.getUserid()); List partList = bean.getPartList(); 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 fcType = "2"; String sfPart = "1"; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java index 2ebdd33..be10051 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java @@ -79,6 +79,7 @@ public interface TaskMapper { int insertSelective(TmTask bean); int insertAgreement(TmTask task); + int updateTashStatus(TmTask task); int insertTmTaskByBackInfo(BackApplyInfo backApplyInfo); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/TaskMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/TaskMapper.xml index 68d5726..61e8fec 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/TaskMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/TaskMapper.xml @@ -211,6 +211,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where task_id = #{taskId} + + UPDATE tm_task tt + SET tt.task_status = #{taskStatus} + WHERE + tt.task_id = #{taskId} + delete from tm_task where task_id = #{taskId}