|
@ -2321,7 +2321,7 @@ public class DailyReportUploadService {
|
|
|
/**
|
|
|
* 管理员获取所有日报项目
|
|
|
*/
|
|
|
public List<BaseDailyReportItemDO> findReportItemListAdmin(String user,String projectCode,String title,String content,Integer state,String begin_time,String end_time,String createUser,String createUserName) throws Exception {
|
|
|
public List<BaseDailyReportItemDO> findReportItemListAdmin(String user,String projectCode,String title,String content,Integer state,String begin_time,String end_time,String createUser,String createUserName,String dept) throws Exception {
|
|
|
String sql = " select * from base_doctor_role where doctor_code='"+user+"' ";
|
|
|
List<Map<String,Object>> userRoles = jdbcTemplate.queryForList(sql);
|
|
|
if (userRoles.size()==0){
|
|
@ -2353,6 +2353,9 @@ public class DailyReportUploadService {
|
|
|
if (StringUtils.isNotBlank(createUserName)){
|
|
|
sql += " and i.create_user_name like '%"+createUserName+"%' ";
|
|
|
}
|
|
|
if (StringUtils.isNotBlank(dept)){
|
|
|
sql += " and i.dept='"+dept+"' ";
|
|
|
}
|
|
|
itemDOS = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(BaseDailyReportItemDO.class));
|
|
|
for (BaseDailyReportItemDO tmp:itemDOS){
|
|
|
List<BaseDailyReportItemMembersDO> membersDOS = reportItemMembersDao.findMembersByItemId(tmp.getId());
|
|
@ -4063,7 +4066,6 @@ public class DailyReportUploadService {
|
|
|
notReportObj.put("dept_name",deptNameTmp);
|
|
|
notReportObj.put("job_title_name",jobTitleNameTmp);
|
|
|
notReportObj.put("week_name",DateUtil.getWeekStr(tmpTime));
|
|
|
System.out.println(tmpTime+":"+DateUtil.getWeekStr(tmpTime));
|
|
|
notReportList.add(notReportObj);
|
|
|
}
|
|
|
}
|
|
@ -4086,7 +4088,6 @@ public class DailyReportUploadService {
|
|
|
notReportObj.put("dept_name",deptNameTmp);
|
|
|
notReportObj.put("job_title_name",jobTitleNameTmp);
|
|
|
notReportObj.put("week_name",DateUtil.getWeekStr(tmpTime));
|
|
|
System.out.println(DateUtil.getWeekStr(tmpTime));
|
|
|
notReportList.add(notReportObj);
|
|
|
}
|
|
|
}
|