Browse Source

合同下拉接口

Antiloveg 8 years ago
parent
commit
6770dce678

+ 10 - 0
src/main/java/com/goafanti/admin/controller/AdminContractApiController.java

@@ -56,6 +56,16 @@ public class AdminContractApiController extends CertifyApiController {
 	private CopyrightInfoService	copyrightInfoService;
 	@Resource
 	private TechProjectService		techProjectService;
+	
+	/**
+	 * 合同编号下拉
+	 */
+	@RequestMapping(value= "/serialNumber", method = RequestMethod.GET)
+	public Result contractSerialNumber(){
+		Result res = new Result();
+		res.setData(contractService.selectContractSerialNumber());
+		return res;
+	}
 
 	/**
 	 * 合同管理--创建高企认定申请

+ 5 - 0
src/main/java/com/goafanti/common/dao/ContractMapper.java

@@ -1,7 +1,10 @@
 package com.goafanti.common.dao;
 
+import java.util.List;
+
 import com.goafanti.common.model.Contract;
 import com.goafanti.contract.bo.ContractDetail;
+import com.goafanti.contract.bo.ContractSerialNumber;
 
 public interface ContractMapper {
     int deleteByPrimaryKey(String id);
@@ -17,4 +20,6 @@ public interface ContractMapper {
     int updateByPrimaryKey(Contract record);
 
 	ContractDetail selectContractDetail(String id);
+
+	List<ContractSerialNumber> selectContractSerialNumber(String principal);
 }

+ 16 - 0
src/main/java/com/goafanti/common/mapper/ContractMapper.xml

@@ -400,4 +400,20 @@
 	LEFT JOIN admin a on a.id = c.founder
 	where c.deleted_sign = 0 and c.id = #{id,jdbcType=VARCHAR}
   </select>
+  
+  
+  <select id="selectContractSerialNumber" resultType="com.goafanti.contract.bo.ContractSerialNumber" parameterType="java.lang.String">
+  	 select c.id as contractId, c.serial_number as serialNumber
+   from contract c 
+    <if test="principal != null">	
+		LEFT JOIN contract_log cl on cl.cid = c.id
+   </if>
+   where c.deleted_sign = 0
+   <if test="principal !=null">	
+   and cl.principal = #{principal,jdbcType=VARCHAR}
+   </if>
+    <if test="principal != null">
+	group by c.id
+  </if>
+  </select>
 </mapper>

+ 26 - 0
src/main/java/com/goafanti/contract/bo/ContractSerialNumber.java

@@ -0,0 +1,26 @@
+package com.goafanti.contract.bo;
+
+public class ContractSerialNumber {
+	private String contractId;
+	
+	private Integer serialNumber;
+
+	public String getContractId() {
+		return contractId;
+	}
+
+	public void setContractId(String contractId) {
+		this.contractId = contractId;
+	}
+
+	public Integer getSerialNumber() {
+		return serialNumber;
+	}
+
+	public void setSerialNumber(Integer serialNumber) {
+		this.serialNumber = serialNumber;
+	}
+	
+	
+
+}

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

@@ -1,5 +1,7 @@
 package com.goafanti.contract.service;
 
+import java.util.Map;
+
 import com.goafanti.common.model.Contract;
 import com.goafanti.contract.bo.ContractDetail;
 import com.goafanti.contract.bo.ContractManageListBo;
@@ -24,4 +26,6 @@ public interface ContractService {
 
 	void updateSubmit(Contract c, String[] principals, String signDateFormattedDate);
 
+	Map<String, Integer> selectContractSerialNumber();
+
 }

+ 17 - 1
src/main/java/com/goafanti/contract/service/impl/ContractServiceImpl.java

@@ -30,6 +30,7 @@ import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.contract.bo.ContractDetail;
 import com.goafanti.contract.bo.ContractManageListBo;
+import com.goafanti.contract.bo.ContractSerialNumber;
 import com.goafanti.contract.service.ContractService;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -219,7 +220,7 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 		c.setStatus(ContractStatus.CIRCULATION.getCode());
 		c.setSignDate(signDate);
 		contractMapper.updateByPrimaryKeySelective(c);
-		
+
 		ContractLog clog = disposeContractLog(c);
 		clog.setStatus(ContractStatus.SIGN.getCode());
 		clog.setRecordTime(signDate);
@@ -264,4 +265,19 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 		return n;
 	}
 
+	@Override
+	public Map<String, Integer> selectContractSerialNumber() {
+		String principal = null;
+		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
+			principal = TokenManager.getAdminId();
+		}
+		List<ContractSerialNumber> list = contractMapper.selectContractSerialNumber(principal);
+		Map<String, Integer> map = new HashMap<>();
+		if (null != list && list.size() > 0) {
+			for (ContractSerialNumber c : list) {
+				map.put(c.getContractId(), c.getSerialNumber());
+			}
+		}
+		return map;
+	}
 }