|
|
@ -1329,13 +1329,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
if (confirmation == null) { |
|
|
|
return rb.setMsg("该申请不存在"); |
|
|
|
} |
|
|
|
if ("2".equals(confirmation.getAuditState())) { |
|
|
|
if (confirmation.getAuditState() == 2) { |
|
|
|
return rb.setMsg("该申请已驳回,不允许重复操作"); |
|
|
|
} |
|
|
|
if ("3".equals(confirmation.getAuditState())) { |
|
|
|
if (confirmation.getAuditState() == 3) { |
|
|
|
return rb.setMsg("该申请已审核通过,不允许驳回"); |
|
|
|
} |
|
|
|
if ("4".equals(confirmation.getAuditState())) { |
|
|
|
if (confirmation.getAuditState() == 4) { |
|
|
|
return rb.setMsg("该申请已撤回,不允许驳回"); |
|
|
|
} |
|
|
|
if (confirmation.getFirst() == 1) { |
|
|
@ -1397,13 +1397,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
if (confirmation == null) { |
|
|
|
return rb.setMsg("该申请不存在"); |
|
|
|
} |
|
|
|
if ("3".equals(confirmation.getAuditState())) { |
|
|
|
if (confirmation.getAuditState() == 3) { |
|
|
|
return rb.setMsg("该申请已审核通过,不允许重复操作"); |
|
|
|
} |
|
|
|
if ("2".equals(confirmation.getAuditState())) { |
|
|
|
if (confirmation.getAuditState() == 2) { |
|
|
|
return rb.setMsg("该申请已驳回,不允许确认"); |
|
|
|
} |
|
|
|
if ("4".equals(confirmation.getAuditState())) { |
|
|
|
if (confirmation.getAuditState() == 4) { |
|
|
|
return rb.setMsg("该申请已撤回,不允许确认"); |
|
|
|
} |
|
|
|
confirmation.setAuditState(3); |
|
|
@ -3333,13 +3333,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
if (confirmation == null) { |
|
|
|
return rb.setMsg("该申请不存在"); |
|
|
|
} |
|
|
|
if ("3".equals(confirmation.getAuditState())) { |
|
|
|
if (confirmation.getAuditState() == 3) { |
|
|
|
return rb.setMsg("该申请已审核通过,不允许撤回"); |
|
|
|
} |
|
|
|
if ("4".equals(confirmation.getAuditState())) { |
|
|
|
if (confirmation.getAuditState() == 4) { |
|
|
|
return rb.setMsg("该申请已撤回,不允许重复撤回"); |
|
|
|
} |
|
|
|
if ("2".equals(confirmation.getAuditState())) { |
|
|
|
if (confirmation.getAuditState() == 2) { |
|
|
|
return rb.setMsg("该申请已驳回,不允许撤回"); |
|
|
|
} |
|
|
|
if (!userSid.equals(confirmation.getCreateBySid())) { |
|
|
@ -3724,13 +3724,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
if (confirmation == null) { |
|
|
|
return rb.setMsg("该申请不存在"); |
|
|
|
} |
|
|
|
if ("3".equals(confirmation.getAuditState())) { |
|
|
|
if (confirmation.getAuditState() == 3) { |
|
|
|
return rb.setMsg("该申请已审核通过,不允许撤回"); |
|
|
|
} |
|
|
|
if ("4".equals(confirmation.getAuditState())) { |
|
|
|
if (confirmation.getAuditState() == 4) { |
|
|
|
return rb.setMsg("该申请已撤回,不允许重复撤回"); |
|
|
|
} |
|
|
|
if ("2".equals(confirmation.getAuditState())) { |
|
|
|
if (confirmation.getAuditState() == 2) { |
|
|
|
return rb.setMsg("该申请已驳回,不允许撤回"); |
|
|
|
} |
|
|
|
if (!userSid.equals(confirmation.getCreateBySid())) { |
|
|
@ -3762,13 +3762,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
if (confirmation == null) { |
|
|
|
return rb.setMsg("该申请不存在"); |
|
|
|
} |
|
|
|
if ("2".equals(confirmation.getAuditState())) { |
|
|
|
if (confirmation.getAuditState() == 2) { |
|
|
|
return rb.setMsg("该申请已驳回,不允许重复操作"); |
|
|
|
} |
|
|
|
if ("3".equals(confirmation.getAuditState())) { |
|
|
|
if (confirmation.getAuditState() == 3) { |
|
|
|
return rb.setMsg("该申请已审核通过,不允许驳回"); |
|
|
|
} |
|
|
|
if ("4".equals(confirmation.getAuditState())) { |
|
|
|
if (confirmation.getAuditState() == 4) { |
|
|
|
return rb.setMsg("该申请已撤回,不允许驳回"); |
|
|
|
} |
|
|
|
if (confirmation.getFirst() == 1) { |
|
|
@ -3804,13 +3804,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
if (confirmation == null) { |
|
|
|
return rb.setMsg("该申请不存在"); |
|
|
|
} |
|
|
|
if ("3".equals(confirmation.getAuditState())) { |
|
|
|
if (confirmation.getAuditState() == 3) { |
|
|
|
return rb.setMsg("该申请已审核通过,不允许重复操作"); |
|
|
|
} |
|
|
|
if ("2".equals(confirmation.getAuditState())) { |
|
|
|
if (confirmation.getAuditState() == 2) { |
|
|
|
return rb.setMsg("该申请已驳回,不允许确认"); |
|
|
|
} |
|
|
|
if ("4".equals(confirmation.getAuditState())) { |
|
|
|
if (confirmation.getAuditState() == 4) { |
|
|
|
return rb.setMsg("该申请已撤回,不允许确认"); |
|
|
|
} |
|
|
|
String collectionTypeKey = confirmation.getCollectionTypeKey(); //收款方式
|
|
|
|