diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index d0c215aa..b65d3113 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -84,6 +84,12 @@ public class TmTaskController extends BaseController { return toAjax(tmTaskService.updateLeaseTaskAuditInfoCq(task)); } + @Log(title = "重庆领料确认通过接口", businessType = BusinessType.UPDATE) + @PostMapping("updateLeaseTaskStatusConfirmByCq") + public AjaxResult updateLeaseTaskStatusConfirmByCq(@RequestBody TmTask tmTask) { + return toAjax(tmTaskService.updateLeaseTaskStatusConfirmByCq(tmTask)); + } + /** * 领料审核驳回,分公司,分管,机具分公司统一接口 * diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java index eaab5730..431ed6b8 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java @@ -244,6 +244,7 @@ public class TmTask implements Serializable { @ApiModelProperty(value="领用类型:0 短期租赁 1长期领用") private String leaseType; + private String userId; private String userName; private String typeName; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java index bd871cf8..6033bb90 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java @@ -36,6 +36,14 @@ public interface TmTaskService{ /** 领料任务审核通过状态修改 */ int updateLeaseTaskAuditInfo(TmTask record); int updateLeaseTaskAuditInfoCq(TmTask record); + + /** + * 领料任务审核通过状态修改,只修改tmTask表状态 + * @param record 任务信息 + * @return 结果 + */ + int updateLeaseTaskStatusConfirmByCq(TmTask record); + /** 领料任务审核驳回状态修改 */ int updateLeaseTaskRejectInfo(TmTask record); int updateLeaseTaskRejectInfoCq(TmTask record); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index 73dd2a7c..e99a415e 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -98,7 +98,7 @@ public class TmTaskServiceImpl implements TmTaskService { List leaseApplyInfo = tmTaskMapper.getLeaseApplyInfo(taskId); for (LeaseApplyInfo applyInfo : leaseApplyInfo) { if (applyInfo.getStatus() != null) { - if (applyInfo.getStatus().equals("1") || applyInfo.getStatus().equals("3")) { + if ("1".equals(applyInfo.getStatus()) || "3".equals(applyInfo.getStatus())) { num++; } } @@ -138,7 +138,7 @@ public class TmTaskServiceImpl implements TmTaskService { List leaseApplyInfo = tmTaskMapper.getLeaseApplyInfo(taskId); for (LeaseApplyInfo applyInfo : leaseApplyInfo) { if (applyInfo.getStatus() != null) { - if (applyInfo.getStatus().equals("5") || applyInfo.getStatus().equals("7")) { + if ("5".equals(applyInfo.getStatus()) || "7".equals(applyInfo.getStatus())) { num++; } } @@ -222,6 +222,11 @@ public class TmTaskServiceImpl implements TmTaskService { return result; } + @Override + public int updateLeaseTaskStatusConfirmByCq(TmTask record) { + return tmTaskMapper.updateTmTaskAuditStatus(record); + } + /** * 获取领料申请列表 */ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java index ac6e3c6b..1762d341 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java @@ -13,7 +13,6 @@ import com.bonus.sgzb.common.core.web.page.TableDataInfo; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; import com.bonus.sgzb.material.domain.BackApplyInfo; -import com.bonus.sgzb.material.mapper.BackApplyMapper; import com.bonus.sgzb.material.service.BackApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -35,11 +34,9 @@ import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_SIZE; @RestController @RequestMapping("/backApply") public class BackApplyController extends BaseController { - @Autowired - private BackApplyService backApplyService; @Autowired - private BackApplyMapper backApplyMapper; + private BackApplyService backApplyService; /** * 获取退料审核列表 @@ -235,6 +232,7 @@ public class BackApplyController extends BaseController { return AjaxResult.success("退料任务创建成功"); } + @ApiOperation(value = "退料无需审批接口,如需审批请勿使用") @Log(title = "退料申请提交--by重庆", businessType = BusinessType.INSERT) @PostMapping("/submitBackApplyByCq") public AjaxResult submitBackApplyByCq(@RequestBody BackApplyInfo bean) {