新增个人按日查询

gis_domain/src/main/java/com/gis/domain/dto/PersonalPageDateDto.java

@@ -0,0 +1,27 @@
+package com.gis.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+
+/**
+ * Created by owen on 2021/3/5 0026 12:13
+ * 工时表(windows版用这个，生产环境不用这个表统计)
+ */
+@Data
+public class PersonalPageDateDto extends PageDateDto {
+
+    @ApiModelProperty(value = "账号")
+    private String account;
+
+
+//    @NotBlank(message = "日期不能为空")
+//    @ApiModelProperty(value = "日期,yyyy-MM-dd", required = true)
+//    private String date;
+
+
+
+
+}

gis_mapper/src/main/java/com/gis/mapper/TaskesTimateMapper.java

@@ -2,6 +2,7 @@ package com.gis.mapper;
 
 
 import com.gis.domain.dto.DeptDto;
+import com.gis.domain.dto.PersonalPageDateDto;
 import com.gis.domain.dto.WorkPageDto;
 import com.gis.domain.entity.EffortEntity;
 import com.gis.domain.entity.TaskesTimateEntity;
@@ -71,4 +72,8 @@ public interface TaskesTimateMapper extends ZtBaseMapper<TaskesTimateEntity, Lon
 
     @SelectProvider(type = TaskesTimateProvider.class, method = "detail")
     List<DetailVo> workByMonthDetail(WorkPageDto param);
+
+
+    @SelectProvider(type = TaskesTimateProvider.class, method = "dayDetail")
+    List<DetailVo> workByDayDetail(PersonalPageDateDto param);
 }

gis_mapper/src/main/java/com/gis/mapper/provider/TaskesTimateProvider.java

@@ -1,6 +1,7 @@
 package com.gis.mapper.provider;
 
 import com.gis.domain.dto.DeptDto;
+import com.gis.domain.dto.PersonalPageDateDto;
 import com.gis.domain.dto.PersonalPageDto;
 import com.gis.domain.dto.WorkPageDto;
 import lombok.extern.slf4j.Slf4j;
@@ -89,4 +90,37 @@ public class TaskesTimateProvider {
         return sql.toString();
     }
 
+
+    public String dayDetail(PersonalPageDateDto param){
+        StringBuffer sql = new StringBuffer("select a.*,b.project,c.name as projectName,c.code,d.realname as realname, e.id as deptId, e.name as deptName " +
+                "from zt_taskestimate a left join zt_task b on b.id = a.task left join zt_project c on c.id=b.project " +
+                "left join zt_user d  on d.account = a.account left join zt_dept e on d.dept = e.id " +
+                "where b.deleted = '0' ");
+
+
+
+        String account = param.getAccount();
+        if(StringUtils.isNotBlank(account)){
+            sql.append(" AND a.account = '").append(account).append("'");
+        }
+
+        String startTime = param.getStartTime();
+        if(StringUtils.isNotBlank(startTime) ){
+
+            sql.append(" and a.date >= ").append("'").append(startTime).append("'");
+
+        }
+
+        String endTime = param.getEndTime();
+        if (StringUtils.isNotBlank(endTime)) {
+            sql.append(" and a.date <= ").append("'").append(endTime).append("'");
+        }
+
+
+        sql.append(" order by a.date asc");
+
+        log.info("sql: {}", sql.toString());
+        return sql.toString();
+    }
+
 }

gis_service/src/main/java/com/gis/service/TaskesTimateService.java

@@ -4,6 +4,7 @@ package com.gis.service;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.DeptDto;
 import com.gis.domain.dto.PageDto;
+import com.gis.domain.dto.PersonalPageDateDto;
 import com.gis.domain.dto.WorkPageDto;
 import com.gis.domain.entity.TaskesTimateEntity;
 import com.gis.domain.vo.FinanceMonthVo;
@@ -32,4 +33,6 @@ public interface TaskesTimateService extends IBaseService<TaskesTimateEntity, Lo
     Result workByMonth(WorkPageDto param);
 
     Result<DetailVo> workByMonthDetail(WorkPageDto param);
+
+    Result<DetailVo> workByDayDetail(PersonalPageDateDto param);
 }

gis_service/src/main/java/com/gis/service/impl/TaskesTimateServiceImpl.java

@@ -6,6 +6,7 @@ import com.gis.common.util.ExcelUtils;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.DeptDto;
 import com.gis.domain.dto.PageDto;
+import com.gis.domain.dto.PersonalPageDateDto;
 import com.gis.domain.dto.WorkPageDto;
 import com.gis.domain.entity.TaskesTimateEntity;
 import com.gis.domain.vo.FinanceMonthVo;
@@ -163,5 +164,12 @@ public class TaskesTimateServiceImpl extends ZtBaseServiceImpl<TaskesTimateEntit
         return Result.success(new PageInfo<>(effortVos));
     }
 
+    @Override
+    public Result<DetailVo> workByDayDetail(PersonalPageDateDto param) {
+        startPage(param);
+        List<DetailVo> effortVos = entityMapper.workByDayDetail(param);
+        return Result.success(new PageInfo<>(effortVos));
+    }
+
 
 }

gis_web/src/main/java/com/gis/web/controller/PersonalController.java

@@ -1,6 +1,7 @@
 package com.gis.web.controller;
 
 import com.gis.common.util.Result;
+import com.gis.domain.dto.PersonalPageDateDto;
 import com.gis.domain.dto.PersonalPageDto;
 import com.gis.domain.dto.WorkPageDto;
 import com.gis.domain.entity.UserEntity;
@@ -64,5 +65,12 @@ public class PersonalController extends BaseController {
         return taskesTimateService.workByMonthDetail(workPageDto);
     }
 
+
+    @ApiOperation(value = "日详情（date:当月日期：yyyy-MM-dd）")
+    @PostMapping(value = "workByDayDetail")
+    public Result<DetailVo> workByDayDetail(@RequestBody PersonalPageDateDto param) {
+        return taskesTimateService.workByDayDetail(param);
+    }
+
     
 }

remark.md

@@ -39,6 +39,15 @@
                 FROM zt_taskestimate a left join zt_task b on b.id = a.task left join zt_project c on c.id=b.project left join zt_user d  on d.account = a.account 
                 WHERE b.deleted = '0' AND DATE_FORMAT( date, '%Y%m' ) = DATE_FORMAT('2021-03-1' , '%Y%m' ) GROUP BY a.account, b.project order by c.id, a.account;
                 
+                
+
+     
+     # 按日期查询工时
+     select * from zt_taskestimate where account = 'wuweihao' AND date= '2021-04-02';    
+     
+     # 个人整个月的工时
+     select * from zt_taskestimate where account = 'wufan' AND DATE_FORMAT( date, '%Y%m' ) = DATE_FORMAT('2021-03-1' , '%Y%m' ); 
+                
 ## 日志
    2021-03-24
     目前只部署在本地，没有部署到服务器 http://127.0.0.1:8004/doc.html