|
|
@@ -457,7 +457,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
public Object publicReleaseListDtails(InputPublicDtails in) {
|
|
|
Map<String,Object> map =new HashMap<String, Object>();
|
|
|
addParams(in, map);
|
|
|
- Date date = new Date();
|
|
|
Pagination<OutPublicDtails> page = (Pagination<OutPublicDtails>) findPage("listPublicDtails", "countPublicDtails", map, in.getPageNo(), in.getPageSize());
|
|
|
return page;
|
|
|
}
|
|
|
@@ -468,6 +467,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
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.getCreateStart()!=null) map.put("createStart", in.getCreateStart());
|
|
|
+ if(in.getCreateEnd()!=null) map.put("createEnd", in.getCreateEnd()+" 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());
|