Antiloveg 8 years ago
parent
commit
25644ca629

+ 14 - 1
src/main/java/com/goafanti/common/mapper/ContractMapper.xml

@@ -465,11 +465,18 @@
 	    and c.status= #{status ,jdbcType=INTEGER}
 	  </if>
 	   <if test="cStart !=null">
-	    and c.sign_date <![CDATA[ > ]]> #{cStart,jdbcType=TIMESTAMP}
+	    and c.sign_date <![CDATA[ >= ]]> #{cStart,jdbcType=TIMESTAMP}
 	  </if>
 	   <if test="cEnd !=null">
 	    and c.sign_date <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
 	  </if>
+	   <if test="lStart !=null">
+	    and c.complete_date <![CDATA[ >= ]]> #{lStart,jdbcType=TIMESTAMP}
+	  </if>
+	   <if test="lEnd !=null">
+	    and c.complete_date <![CDATA[ < ]]> #{lEnd,jdbcType=TIMESTAMP}
+	  </if>
+	  
 		order by c.serial_number DESC
 	  <if test="page_sql!=null">
 		${page_sql}
@@ -502,5 +509,11 @@
 	   <if test="cEnd !=null">
 	    and c.sign_date <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
 	  </if>
+	   <if test="lStart !=null">
+	    and c.complete_date <![CDATA[ >= ]]> #{lStart,jdbcType=TIMESTAMP}
+	  </if>
+	   <if test="lEnd !=null">
+	    and c.complete_date <![CDATA[ < ]]> #{lEnd,jdbcType=TIMESTAMP}
+	  </if>
   </select>
 </mapper>

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

@@ -218,7 +218,8 @@ public class ContractApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
 	public Result listContract(String contractId, Integer serialNumber, Integer type, Integer status,
-			String startDateFormattedDate, String endDateFormattedDate, String pageNo, String pageSize) {
+			String startDateFormattedDate, String endDateFormattedDate, String completeStartDate,
+			String completeEndDate, String pageNo, String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -229,7 +230,8 @@ public class ContractApiController extends CertifyApiController {
 			pNo = Integer.parseInt(pageNo);
 		}
 		res.setData(contractService.getClientList(contractId, serialNumber, type, status, startDateFormattedDate,
-				endDateFormattedDate, pNo, pSize));
+				endDateFormattedDate, completeStartDate,
+				completeEndDate, pNo, pSize));
 		return res;
 	}
 

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

@@ -11,8 +11,9 @@ import com.goafanti.core.mybatis.page.Pagination;
 
 public interface ContractService {
 
-	Pagination<ContractManageListBo> getManageList(String contractId, Integer serialNumber, Integer type, Integer status, String startDateFormattedDate,
-			String endDateFormattedDate, Integer province, String unitName, String uid, Integer pNo, Integer pSize);
+	Pagination<ContractManageListBo> getManageList(String contractId, Integer serialNumber, Integer type,
+			Integer status, String startDateFormattedDate, String endDateFormattedDate, Integer province,
+			String unitName, String uid, Integer pNo, Integer pSize);
 
 	Contract saveManageContract(Contract c);
 
@@ -32,8 +33,9 @@ public interface ContractService {
 
 	int deleteByPrimaryKey(List<String> asList);
 
-	Pagination<ContractClientListBo> getClientList(String contractId, Integer serialNumber, Integer type, Integer status,
-			String startDateFormattedDate, String endDateFormattedDate, Integer pNo, Integer pSize);
+	Pagination<ContractClientListBo> getClientList(String contractId, Integer serialNumber, Integer type,
+			Integer status, String startDateFormattedDate, String endDateFormattedDate, String completeStartDate,
+			String completeEndDate, Integer pNo, Integer pSize);
 
 	Contract saveContract(Contract c);
 

+ 41 - 23
src/main/java/com/goafanti/contract/service/impl/ContractServiceImpl.java

@@ -63,14 +63,13 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 	public Pagination<ContractManageListBo> getManageList(String contractId, Integer serialNumber, Integer type,
 			Integer status, String startDateFormattedDate, String endDateFormattedDate, Integer province,
 			String unitName, String uid, Integer pNo, Integer pSize) {
-		Map<String, Object> params = disposeParams(contractId, serialNumber, type,
-				status, startDateFormattedDate, endDateFormattedDate, province,
-				unitName, uid);
-		
+		Map<String, Object> params = disposeParams(contractId, serialNumber, type, status, startDateFormattedDate,
+				endDateFormattedDate, province, unitName, uid);
+
 		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
 			params.put("principal", TokenManager.getAdminId());
 		}
-		
+
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}
@@ -86,12 +85,35 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<ContractClientListBo> getClientList(String contractId, Integer serialNumber, Integer type,
-			Integer status, String startDateFormattedDate, String endDateFormattedDate, Integer pNo, Integer pSize) {
+			Integer status, String startDateFormattedDate, String endDateFormattedDate, String completeStartDate,
+			String completeEndDate, Integer pNo, Integer pSize) {
+
+		Map<String, Object> params = disposeParams(contractId, serialNumber, type, status, startDateFormattedDate,
+				endDateFormattedDate, null, null, TokenManager.getUserId());
 
-		Map<String, Object> params = disposeParams(contractId, serialNumber, type,
-				status, startDateFormattedDate, endDateFormattedDate, null,
-				null, TokenManager.getUserId());
+		Date lStart = null;
+		Date lEnd = null;
+		if (!StringUtils.isBlank(completeStartDate)) {
+			try {
+				lStart = DateUtils.parseDate(startDateFormattedDate, AFTConstants.YYYYMMDD);
+			} catch (ParseException e) {
+			}
+		}
 
+		if (null != lStart) {
+			params.put("lStart", lStart);
+		}
+
+		if (!StringUtils.isBlank(completeEndDate)) {
+			try {
+				lEnd = DateUtils.addDays(DateUtils.parseDate(endDateFormattedDate, AFTConstants.YYYYMMDD), 1);
+			} catch (ParseException e) {
+			}
+		}
+
+		if (null != lEnd) {
+			params.put("lEnd", lEnd);
+		}
 
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
@@ -176,12 +198,12 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 			} catch (ParseException e) {
 			}
 		}
-		
+
 		if (null != c.getStatus() && c.getStatus().equals(ContractStatus.CIRCULATION.getCode())) {
 			c.setStatus(ContractStatus.SIGN.getCode());
 			flag = true;
 		}
-		
+
 		c.setSignDate(signDate);
 		contractMapper.updateByPrimaryKeySelective(c);
 
@@ -190,7 +212,7 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 
 		for (int i = 0; i < principals.length; i++) {
 			ContractLog log = disposeContractLog(c);
-			if (flag){
+			if (flag) {
 				log.setStatus(ContractStatus.CIRCULATION.getCode());
 			}
 			log.setPrincipal(principals[i]);
@@ -219,7 +241,6 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 		return contractMapper.batchDeleteByPrimaryKey(id);
 	}
 
-	
 	@Override
 	public Contract saveContract(Contract c) {
 		c.setStatus(ContractStatus.CREATE.getCode());
@@ -229,7 +250,7 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 		contractLogMapper.insert(disposeContractLog(c));
 		return c;
 	}
-	
+
 	private ContractLog disposeContractLog(Contract c) {
 		ContractLog cl = new ContractLog();
 		cl.setId(UUID.randomUUID().toString());
@@ -245,7 +266,7 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 		cl.setCid(c.getId());
 		return cl;
 	}
-	
+
 	private Notice createNotice(Contract c, ContractLog l) {
 		Contract info = contractMapper.selectByPrimaryKey(c.getId());
 
@@ -270,7 +291,7 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 		n.setYear(info.getCognizanceYear());
 		return n;
 	}
-	
+
 	private Contract disposeContract(Contract c) {
 		c.setId(UUID.randomUUID().toString());
 		Calendar now = Calendar.getInstance();
@@ -287,17 +308,14 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 		c.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 		return c;
 	}
-	
-	private Map<String, Object> disposeParams(String contractId, Integer serialNumber, Integer type,
-			Integer status, String startDateFormattedDate, String endDateFormattedDate, Integer province,
-			String unitName, String uid){
+
+	private Map<String, Object> disposeParams(String contractId, Integer serialNumber, Integer type, Integer status,
+			String startDateFormattedDate, String endDateFormattedDate, Integer province, String unitName, String uid) {
 		Date cStart = null;
 		Date cEnd = null;
 
 		Map<String, Object> params = new HashMap<>();
 
-		
-
 		if (null != serialNumber) {
 			params.put("serialNumber", serialNumber);
 		}
@@ -331,7 +349,7 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 
 		if (!StringUtils.isBlank(endDateFormattedDate)) {
 			try {
-				cEnd = DateUtils.addDays(DateUtils.parseDate(endDateFormattedDate, AFTConstants.YYYYMMDD),1);
+				cEnd = DateUtils.addDays(DateUtils.parseDate(endDateFormattedDate, AFTConstants.YYYYMMDD), 1);
 			} catch (ParseException e) {
 			}
 		}