|
|
@@ -98,60 +98,60 @@ public class PublicInterForDetailServiceImpl implements PublicInterForDetailServ
|
|
|
if (whichpage.equals(MobileStatus.FEEPLEASE.getValue())) {
|
|
|
FeePlease fee = feePleaseDao.findOne(id);
|
|
|
if (fee != null) {
|
|
|
- if (fee.getFp_statuscode().equals(MobileStatus.COMMITED.name())) {
|
|
|
+ if (fee.getFp_statuscode().equals(MobileStatus.AUDITED.name())) {
|
|
|
+ map.put("error", "已审核的单据不能删除");
|
|
|
+ } else {
|
|
|
feePleaseDao.delete(id);
|
|
|
map.put("success", true);
|
|
|
flag = true;
|
|
|
- } else {
|
|
|
- map.put("error", "只能对提交状态的单据进行删除");
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
if (whichpage.equals(MobileStatus.VACATION.getValue())) {
|
|
|
Vacation va = vacationDao.findOne(id);
|
|
|
if (va != null) {
|
|
|
- if (va.getVa_statuscode().equals(MobileStatus.COMMITED.name())) {
|
|
|
+ if (va.getVa_statuscode().equals(MobileStatus.AUDITED.name())) {
|
|
|
+ map.put("error", "已审核的单据不能删除");
|
|
|
+ } else {
|
|
|
vacationDao.delete(id);
|
|
|
map.put("success", true);
|
|
|
flag = true;
|
|
|
- } else {
|
|
|
- map.put("error", "只能对提交状态的单据进行删除");
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
if (whichpage.equals(MobileStatus.WORKDAILY.getValue())) {
|
|
|
WorkDaily wo = workDailyDao.findOne(id);
|
|
|
if (wo != null) {
|
|
|
- if (wo.getWd_statuscode().equals(MobileStatus.COMMITED.name())) {
|
|
|
+ if (wo.getWd_statuscode().equals(MobileStatus.AUDITED.name())) {
|
|
|
+ map.put("error", "已审核的单据不能删除");
|
|
|
+ } else {
|
|
|
workDailyDao.delete(id);
|
|
|
map.put("success", true);
|
|
|
flag = true;
|
|
|
- } else {
|
|
|
- map.put("error", "只能对提交状态的单据进行删除");
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
if (whichpage.equals(MobileStatus.WORKOVERTIME.getValue())) {
|
|
|
WorkOvertime wo = workOvertimeDao.findOne(id);
|
|
|
if (wo != null) {
|
|
|
- if (wo.getWo_statuscode().equals(MobileStatus.COMMITED.name())) {
|
|
|
+ if (wo.getWo_statuscode().equals(MobileStatus.AUDITED.name())) {
|
|
|
+ map.put("error", "已审核的单据不能删除");
|
|
|
+ } else {
|
|
|
workOvertimeDao.delete(id);
|
|
|
map.put("success", true);
|
|
|
flag = true;
|
|
|
- } else {
|
|
|
- map.put("error", "只能对提交状态的单据进行删除");
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
if (whichpage.equals(MobileStatus.SIGNAPP.getValue())) {
|
|
|
SignApp si = signAppDao.findOne(id);
|
|
|
if (si != null) {
|
|
|
- if (si.getStatuscode().equals(MobileStatus.COMMITED.name())) {
|
|
|
+ if (si.getStatuscode().equals(MobileStatus.AUDITED.name())) {
|
|
|
+ map.put("error", "已审核的单据不能删除");
|
|
|
+ } else {
|
|
|
signAppDao.delete(id);
|
|
|
map.put("success", true);
|
|
|
flag = true;
|
|
|
- } else {
|
|
|
- map.put("error", "只能对提交状态的单据进行删除");
|
|
|
}
|
|
|
}
|
|
|
}
|