Browse Source

催款统计表开发

anderx 4 years ago
parent
commit
edb351aa8d

+ 0 - 1
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -180,7 +180,6 @@ public class AdminNewOrderApiController extends CertifyApiController {
 				return res;
 			}
 		}
-		
 		if (StringUtils.isNotBlank(signDate)) {
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 			try {

+ 2 - 5
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -816,10 +816,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (StringUtils.isNotBlank(contractNo)) params.put("contractNo", contractNo);
 		if (StringUtils.isNotBlank(starTime)) params.put("starTime", starTime);
 		if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime+" 23:59:59");
-		if (specially==null){params.put("specially", 0);}
-		else {
-			params.put("specially", specially);
-		}
+		if (specially==null)specially=0;
+		params.put("specially", specially);
 		Integer i=null;
 		if(TokenManager.hasRole(AFTConstants.SALESMAN)) {
 			params.put("aid", TokenManager.getAdminId());
@@ -833,7 +831,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.CED)||
 				TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)){
 			i=3;
-
 		}
 		if (specially==1){
 			params.put("aid", aid);