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

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

@@ -256,7 +256,7 @@ public class AdminContractApiController extends CertifyApiController {
 	 * 合同列表
 	 * 合同列表
 	 */
 	 */
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
-	public Result listContract(Integer serialNumber, Integer type, Integer status, String startDateFormattedDate,
+	public Result listContract(String contractId, Integer serialNumber, Integer type, Integer status, String startDateFormattedDate,
 			String endDateFormattedDate, String province, String unitName, String uid, String pageNo, String pageSize) {
 			String endDateFormattedDate, String province, String unitName, String uid, String pageNo, String pageSize) {
 		Result res = new Result();
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pNo = 1;
@@ -267,7 +267,7 @@ public class AdminContractApiController extends CertifyApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 			pNo = Integer.parseInt(pageNo);
 		}
 		}
-		res.setData(contractService.getManageList(serialNumber, type, status, startDateFormattedDate,
+		res.setData(contractService.getManageList(contractId, serialNumber, type, status, startDateFormattedDate,
 				endDateFormattedDate, province, unitName, uid, pNo, pSize));
 				endDateFormattedDate, province, unitName, uid, pNo, pSize));
 		return res;
 		return res;
 	}
 	}

+ 8 - 2
src/main/java/com/goafanti/common/mapper/ContractMapper.xml

@@ -311,7 +311,10 @@
 	and cl.principal = #{principal,jdbcType=VARCHAR}
 	and cl.principal = #{principal,jdbcType=VARCHAR}
   </if>
   </if>
   <if test="serialNumber !=null">
   <if test="serialNumber !=null">
-    and c.serialNumber = #{serialNumber,jdbcType=VARCAHR}
+    and c.serialNumber = #{serialNumber,jdbcType=INTEGER}
+  </if>
+  <if test="id !=null">
+    and c.id = #{id,jdbcType=VARCAHR}
   </if>
   </if>
   <if test="type !=null">
   <if test="type !=null">
     and c.type = #{type,jdbcType=INTEGER}
     and c.type = #{type,jdbcType=INTEGER}
@@ -356,8 +359,11 @@
   <if test="principal != null">
   <if test="principal != null">
 	and cl.principal = #{principal,jdbcType=VARCHAR}
 	and cl.principal = #{principal,jdbcType=VARCHAR}
   </if>
   </if>
+  <if test="id != null">
+	and cl.id = #{id,jdbcType=VARCHAR}
+  </if>
   <if test="serialNumber !=null">
   <if test="serialNumber !=null">
-    and c.serialNumber = #{serialNumber,jdbcType=VARCAHR}
+    and c.serialNumber = #{serialNumber,jdbcType=INTEGER}
   </if>
   </if>
    <if test="type !=null">
    <if test="type !=null">
     and c.type = #{type,jdbcType=INTEGER}
     and c.type = #{type,jdbcType=INTEGER}

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

@@ -9,7 +9,7 @@ import com.goafanti.core.mybatis.page.Pagination;
 
 
 public interface ContractService {
 public interface ContractService {
 
 
-	Pagination<ContractManageListBo> getManageList(Integer serialNumber, Integer type, Integer status, String startDateFormattedDate,
+	Pagination<ContractManageListBo> getManageList(String contractId, Integer serialNumber, Integer type, Integer status, String startDateFormattedDate,
 			String endDateFormattedDate, String province, String unitName, String uid, Integer pNo, Integer pSize);
 			String endDateFormattedDate, String province, String unitName, String uid, Integer pNo, Integer pSize);
 
 
 	Contract saveManageContract(Contract c);
 	Contract saveManageContract(Contract c);

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

@@ -50,7 +50,7 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 
 
 	@SuppressWarnings("unchecked")
 	@SuppressWarnings("unchecked")
 	@Override
 	@Override
-	public Pagination<ContractManageListBo> getManageList(Integer serialNumber, Integer type, Integer status,
+	public Pagination<ContractManageListBo> getManageList(String id, Integer serialNumber, Integer type, Integer status,
 			String startDateFormattedDate, String endDateFormattedDate, String province, String unitName, String uid,
 			String startDateFormattedDate, String endDateFormattedDate, String province, String unitName, String uid,
 			Integer pNo, Integer pSize) {
 			Integer pNo, Integer pSize) {
 		Date cStart = null;
 		Date cStart = null;
@@ -77,6 +77,10 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 		if (!StringUtils.isBlank(uid)) {
 		if (!StringUtils.isBlank(uid)) {
 			params.put("uid", uid);
 			params.put("uid", uid);
 		}
 		}
+		
+		if (!StringUtils.isBlank(id)) {
+			params.put("id", id);
+		}
 
 
 		if (!StringUtils.isBlank(startDateFormattedDate)) {
 		if (!StringUtils.isBlank(startDateFormattedDate)) {
 			try {
 			try {