Просмотр исходного кода

合同管理---合同编号下拉(排序)

Antiloveg лет назад: 8
Родитель
Сommit
a8f78cc677

+ 2 - 2
src/main/java/com/goafanti/contract/service/ContractService.java

@@ -1,11 +1,11 @@
 package com.goafanti.contract.service;
 
 import java.util.List;
-import java.util.Map;
 
 import com.goafanti.common.model.Contract;
 import com.goafanti.contract.bo.ContractDetail;
 import com.goafanti.contract.bo.ContractManageListBo;
+import com.goafanti.contract.bo.ContractSerialNumber;
 import com.goafanti.core.mybatis.page.Pagination;
 
 public interface ContractService {
@@ -27,7 +27,7 @@ public interface ContractService {
 
 	void updateSubmit(Contract c, String[] principals, String signDateFormattedDate);
 
-	Map<String, Integer> selectContractSerialNumber();
+	List<ContractSerialNumber> selectContractSerialNumber();
 
 	int deleteByPrimaryKey(List<String> asList);
 

+ 2 - 10
src/main/java/com/goafanti/contract/service/impl/ContractServiceImpl.java

@@ -7,7 +7,6 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.TreeMap;
 import java.util.UUID;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -250,19 +249,12 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 	}
 
 	@Override
-	public Map<String, Integer> selectContractSerialNumber() {
+	public List<ContractSerialNumber> selectContractSerialNumber() {
 		String principal = null;
 		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
 			principal = TokenManager.getAdminId();
 		}
-		List<ContractSerialNumber> list = contractMapper.selectContractSerialNumber(principal);
-		Map<String, Integer> map = new TreeMap<>();
-		if (null != list && list.size() > 0) {
-			for (ContractSerialNumber c : list) {
-				map.put(c.getContractId(), c.getSerialNumber());
-			}
-		}
-		return map;
+		return contractMapper.selectContractSerialNumber(principal);
 	}
 
 	@Override