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

BUG修改

This commit is contained in:
haozq 2024-11-16 18:14:24 +08:00
parent e45e662644
commit b2bf6135d4
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/bonus/gzgqj/business/bases/service/PartApplyServiceImpl.java
View File

@ -116,7 +116,7 @@ public class PartApplyServiceImpl implements PartApplyService{
String status=data.getStatus();
PartApplyAppVo vo=mapper.getAuditStatus(data);
if(!"1".equals(vo.getStatus())){
return ServerResponse.createSuccess("该数据已被审核,请刷新重试");
return ServerResponse.createErroe("该数据已被审核,请刷新重试");
}
Long userId= Objects.requireNonNull(UserUtil.getLoginUser()).getUserId();
AuditRecord voo=new AuditRecord();
@ -169,7 +169,7 @@ public class PartApplyServiceImpl implements PartApplyService{
PartApplyAppVo vo=mapper.getAuditStatus(data);
if(!"2".equals(vo.getStatus())){
return ServerResponse.createSuccess("该数据状态已变更,请刷新数据重试");
return ServerResponse.createErroe("该数据状态已变更,请刷新数据重试");
}
Long userId= Objects.requireNonNull(UserUtil.getLoginUser()).getUserId();
AuditRecord voo=new AuditRecord();

2
src/main/java/com/bonus/gzgqj/business/bases/service/PartInputServiceImpl.java
View File

@ -131,7 +131,7 @@ public class PartInputServiceImpl implements PartInputService{
//最后入库就是最终价格
mapper.updateTypeNum(paTypeVo);
});
return ServerResponse.createSuccess("入库成功");
return ServerResponse.createSuccess("入库成功","入库成功");
}
return ServerResponse.createErroe("入库失败");

8
src/main/java/com/bonus/gzgqj/business/plan/entity/PlanApplyAuditBean.java
View File

@ -30,13 +30,13 @@ public class PlanApplyAuditBean {
/**
* 工程id
*/
@Excel(name = "工程名称", width = 10.0, orderNum = "2")
@Excel(name = "工程名称", width = 12.0, orderNum = "2")
private String projectId;
/**
* 项目部分
*/
@Excel(name = "项目部分", width = 10.0, orderNum = "3")
@Excel(name = "项目部分", width = 15.0, orderNum = "3")
private String projectPart;
/**
@ -48,7 +48,7 @@ public class PlanApplyAuditBean {
/**
* 施工地点
*/
@Excel(name = "备注", width = 10.0, orderNum = "10")
@Excel(name = "备注", width = 20.0, orderNum = "10")
private String remark;
@ -65,7 +65,7 @@ public class PlanApplyAuditBean {
/**
* 创建时间
*/
@Excel(name = "提交时间", width = 10.0, orderNum = "6")
@Excel(name = "提交时间", width = 15.0, orderNum = "6")
private String createTime;
/**
* 状态

4
src/main/java/com/bonus/gzgqj/business/plan/service/PlanAuditServiceImpl.java
View File

@ -59,10 +59,10 @@ public class PlanAuditServiceImpl implements PlanAuditService {
//审核通过
if("2".equals(auditStatus)) {
auditSuccess(o,statusType,acount,plan);
return ServerResponse.createSuccess("审核成功");
return ServerResponse.createSuccess("审核成功","审核成功");
}else {//审核驳回
aduitError(o,statusType,acount);
return ServerResponse.createSuccess("驳回成功");
return ServerResponse.createSuccess("驳回成功","驳回成功");
}
}
}catch (Exception e) {