bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化import引用，新增重庆领料确认接口

This commit is contained in:
syruan 2024-04-07 13:44:14 +08:00
parent c1d81433dd
commit 1dbfb3f562
5 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java
View File

@ -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));
}
/**
* 领料审核驳回，分公司，分管，机具分公司统一接口
*

1
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java
View File

@ -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;

8
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java
View File

@ -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);

9
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
View File

@ -98,7 +98,7 @@ public class TmTaskServiceImpl implements TmTaskService {
List<LeaseApplyInfo> 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> 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);
}
/**
* 获取领料申请列表
*/

6
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java
View File

@ -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) {