|
@@ -48,16 +48,18 @@ public class ContractDataService {
|
|
|
Map<Long, ContractDataModel> idToContractModel = contractDataModelList.stream().collect(Collectors.toMap(ContractDataModel::getId, a -> a));
|
|
|
//设置合同状态
|
|
|
contractDataModelList.forEach(a -> {
|
|
|
- switch (a.getStatus()) {
|
|
|
- case 2:
|
|
|
- a.setContractType(2);
|
|
|
- case 3:
|
|
|
- //合同结束,如果有续签,则合同未丢失,如果没有需求合同丢失
|
|
|
- a.setContractType(3);
|
|
|
- ContractDataModel contractDataModel = idToContractModel.get(a.getId());
|
|
|
- if (contractDataModel != null) {
|
|
|
- a.setContractType(0);
|
|
|
- }
|
|
|
+ if (a.getStatus() != null) {
|
|
|
+ switch (a.getStatus()) {
|
|
|
+ case 2:
|
|
|
+ a.setContractType(2);
|
|
|
+ case 3:
|
|
|
+ //合同结束,如果有续签,则合同未丢失,如果没有需求合同丢失
|
|
|
+ a.setContractType(3);
|
|
|
+ ContractDataModel contractDataModel = idToContractModel.get(a.getId());
|
|
|
+ if (contractDataModel != null) {
|
|
|
+ a.setContractType(0);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
});
|
|
|
}
|