Antiloveg 8 years ago
parent
commit
4d27ca89f8

+ 16 - 9
src/main/java/com/goafanti/admin/controller/AdminContractApiController.java

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

+ 7 - 4
src/main/java/com/goafanti/contract/controller/ContractApiController.java

@@ -180,8 +180,12 @@ public class ContractApiController extends CertifyApiController {
 
 		Contract c = new Contract();
 		BeanUtils.copyProperties(contract, c);
-
-		res.setData(contractService.updateByPrimaryKeySelective(c));
+		Contract ct = contractService.selectByPrimaryKey(c.getId());
+		if (null != ct && !ContractStatus.COMPLETE.getCode().equals(ct.getStatus())) {
+			res.setData(contractService.updateByPrimaryKeySelective(c));
+		} else {
+			res.getError().add(buildError("", "当前合同已完成(结款),无法操作!"));
+		}
 		return res;
 	}
 
@@ -230,8 +234,7 @@ public class ContractApiController extends CertifyApiController {
 			pNo = Integer.parseInt(pageNo);
 		}
 		res.setData(contractService.getClientList(contractId, serialNumber, type, status, startDateFormattedDate,
-				endDateFormattedDate, completeStartDate,
-				completeEndDate, pNo, pSize));
+				endDateFormattedDate, completeStartDate, completeEndDate, pNo, pSize));
 		return res;
 	}