Quellcode durchsuchen

公出详情导出修改

anderx vor 4 Jahren
Ursprung
Commit
05af913b7b

+ 20 - 19
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -321,37 +321,38 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	@Override
 	public Object publicReleaseListDtails(InputPublicDtails in) {
 		Map<String,Object> map =new HashMap<String, Object>();
-		if(in.getAid()!=null)map.put("aid", in.getAid());
-		if(in.getSid()!=null)map.put("sid", in.getSid());
-		if(in.getDepId()!=null)map.put("depId", in.getDepId());
-		if(in.getReleaseStart()!=null)map.put("releaseStart", in.getReleaseStart());
-		if(in.getReleaseEnd()!=null)map.put("releaseEnd", in.getReleaseEnd()+" 23:59:59");
-		if(in.getUid()!=null)map.put("uid", in.getUid());
-		if(in.getStatus()!=null)map.put("status", in.getStatus());
-		if(in.getClockIn()!=null)map.put("clockIn", in.getClockIn());
+		addParams(in, map);
+
+		return (Pagination<OutPublicDtails>) findPage("listPublicDtails", "countPublicDtails", map, in.getPageNo(), in.getPageSize());
+	}
+
+	private void addParams(InputPublicDtails in, Map<String, Object> map) {
+		if(in.getAid()!=null) map.put("aid", in.getAid());
+		if(in.getSid()!=null) map.put("sid", in.getSid());
+		if(in.getDepId()!=null) map.put("depId", in.getDepId());
+		if(in.getReleaseStart()!=null) map.put("releaseStart", in.getReleaseStart());
+		if(in.getReleaseEnd()!=null) map.put("releaseEnd", in.getReleaseEnd()+" 23:59:59");
+		if(in.getUid()!=null) map.put("uid", in.getUid());
+		if(in.getStatus()!=null) map.put("status", in.getStatus());
+		if(in.getClockIn()!=null) map.put("clockIn", in.getClockIn());
 		if(TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)
-				||TokenManager.hasRole(AFTConstants.CED_ASSISTANT)){in.setType(2);}
+				||TokenManager.hasRole(AFTConstants.CED_ASSISTANT)){
+			in.setType(2);}
 		else if(TokenManager.hasRole(AFTConstants.COMPANY_MANAGER)){
 			in.setType(1);
 			map.put("deps", orderService.selectMyDeps());
 		} else{
 			in.setType(0);
-			if (in.getAid()==null)map.put("aid",TokenManager.getAdminId());
+			if (in.getAid()==null) map.put("aid",TokenManager.getAdminId());
 		}
-		map.put("type",in.getType());
-
-		return (Pagination<OutPublicDtails>) findPage("listPublicDtails", "countPublicDtails", map, in.getPageNo(), in.getPageSize());
+		map.put("type", in.getType());
 	}
-	
+
 	@SuppressWarnings("unchecked")
 	@Override
 	public List<OutPublicDtails> publicReleaseListDtailsList(InputPublicDtails in) {
 		Map<String,Object> map =new HashMap<String, Object>();
-		if(in.getAid()!=null)map.put("aid", in.getAid());
-		if(in.getReleaseStart()!=null)map.put("releaseStart", in.getReleaseStart());
-		if(in.getReleaseEnd()!=null)map.put("releaseEnd", in.getReleaseEnd()+" 23:59:59");
-		if(in.getUid()!=null)map.put("uid", in.getUid());
-		if(in.getStatus()!=null)map.put("status", in.getStatus());
+		addParams(in, map);
 		return (List<OutPublicDtails>) findList("listPublicDtails", map, in.getPageNo(), 99999);
 	}