|
|
@@ -325,7 +325,6 @@ public class AdminContractApiController extends CertifyApiController {
|
|
|
res.setData(contractService.updateByPrimaryKeySelective(c));
|
|
|
} else {
|
|
|
res.getError().add(buildError("", "当前合同已完成(结款),无法操作!"));
|
|
|
- return res;
|
|
|
}
|
|
|
}
|
|
|
return res;
|
|
|
@@ -374,7 +373,6 @@ public class AdminContractApiController extends CertifyApiController {
|
|
|
contractService.updateSubmit(c, principals, signDateFormattedDate);
|
|
|
} else {
|
|
|
res.getError().add(buildError("", "当前合同已完成(结款),无法操作!"));
|
|
|
- return res;
|
|
|
}
|
|
|
}
|
|
|
return res;
|
|
|
@@ -451,7 +449,12 @@ public class AdminContractApiController extends CertifyApiController {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
- contractLogService.insertCirculation(icl, principals, recordTimeFormattedDate);
|
|
|
+ Contract ct = contractService.selectByPrimaryKey(icl.getCid());
|
|
|
+ if (null != ct && !ContractStatus.COMPLETE.getCode().equals(ct.getStatus())) {
|
|
|
+ contractLogService.insertCirculation(icl, principals, recordTimeFormattedDate);
|
|
|
+ } else {
|
|
|
+ res.getError().add(buildError("", "当前合同已完成(结款),无法操作!"));
|
|
|
+ }
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
@@ -474,12 +477,16 @@ public class AdminContractApiController extends CertifyApiController {
|
|
|
status.remove(ContractStatus.OTHER.getCode().toString());
|
|
|
}
|
|
|
} else {
|
|
|
- /*if (TokenManager.hasPermission("ContractStatus" + ContractStatus.CREATE.getCode())) {
|
|
|
- status.put(ContractStatus.CREATE.getCode().toString(), ContractStatus.CREATE.getDesc());
|
|
|
- }
|
|
|
- if (TokenManager.hasPermission("ContractStatus" + ContractStatus.SIGN.getCode())) {
|
|
|
- status.put(ContractStatus.SIGN.getCode().toString(), ContractStatus.SIGN.getDesc());
|
|
|
- }*/
|
|
|
+ /*
|
|
|
+ * if (TokenManager.hasPermission("ContractStatus" +
|
|
|
+ * ContractStatus.CREATE.getCode())) {
|
|
|
+ * status.put(ContractStatus.CREATE.getCode().toString(),
|
|
|
+ * ContractStatus.CREATE.getDesc()); } if
|
|
|
+ * (TokenManager.hasPermission("ContractStatus" +
|
|
|
+ * ContractStatus.SIGN.getCode())) {
|
|
|
+ * status.put(ContractStatus.SIGN.getCode().toString(),
|
|
|
+ * ContractStatus.SIGN.getDesc()); }
|
|
|
+ */
|
|
|
if (TokenManager.hasPermission("ContractStatus" + ContractStatus.CIRCULATION.getCode())) {
|
|
|
status.put(ContractStatus.CIRCULATION.getCode().toString(), ContractStatus.CIRCULATION.getDesc());
|
|
|
}
|