join zt_task

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

@@ -45,14 +45,16 @@ public class OpenApiController extends BaseController {
     @PostMapping(value = "getAllTaskestimate")
     public Result<TaskestimateVo> getAllTaskestimate(@RequestBody DateDto2 param) {
         StringBuilder builder = new StringBuilder();
-        builder.append("select a.account, a.date, ROUND(sum(a.consumed),2) as consumed, b.realname as name from zt_taskestimate a LEFT JOIN zt_user b on b.account=a.account  where ");
+        builder.append("select a.account, a.date, ROUND(sum(a.consumed),2) as consumed, b.realname as name from zt_taskestimate a LEFT JOIN zt_user b on b.account=a.account ");
+        // 20258-3-20 需要join zt_task.deleted=0， 不然会跟个人工时统计数据会有出入(left=0)
+        builder.append(" LEFT JOIN zt_task c on c.id=a.task  where c.deleted = '0' and ");
         String startTime = param.getStartTime();
         String endTime = param.getEndTime();
         BaseRuntimeException.isBlank(startTime, null, "开始时间不能为空");
         BaseRuntimeException.isBlank(endTime, null, "结束时间不能为空");
         builder.append(" a.date between '").append(startTime).append("' and '").append(endTime).append("'");
-        // 20258-3-19 统计剩余时间大于0的
-        builder.append(" and a.left>0");
+
+//        builder.append(" and a.left>0");
 
         builder.append(" GROUP BY a.account,a.date");
         List<TaskestimateVo> res = taskesTimateMapper.getList(builder.toString());