app首页接口

wangqian
1 parent b5a68cd3
Showing 6 changed files with 106 additions and 40 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/homepage/vo/HomePageSummaryReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/homepage/vo/AppHomePageSummaryReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/homepage/HomepageSummaryMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/HomepageSummaryServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/MaintainSummaryServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/homepage/HomepageSummaryMapper.xml
@@ -18,4 +18,20 @@ public class HomePageSummaryReqVO {
     private String queryType;
     @Schema(description = "查询状态", example = "新提交工单:1，进行中工单:2 ,已完成工单:3")
     private String queryState;
+
+    public void setBeginTime(String beginTime) {
+        if (beginTime != null && !beginTime.contains(" ")) {
+            this.beginTime = beginTime + " 00:00:00";
+        } else {
+            this.beginTime = beginTime;
+        }
+    }
+
+    public void setEndTime(String endTime) {
+        if (endTime != null && !endTime.contains(" ")) {
+            this.endTime = endTime + " 23:59:59";
+        } else {
+            this.endTime = endTime;
+        }
+    }
 }
@@ -15,4 +15,20 @@ public class AppHomePageSummaryReqVO{
     @NotEmpty
     @Schema(description = "结束时间", example = "2025-12-10")
     public String endTime;
+
+    public void setBeginTime(String beginTime) {
+        if (beginTime != null && !beginTime.contains(" ")) {
+            this.beginTime = beginTime + " 00:00:00";
+        } else {
+            this.beginTime = beginTime;
+        }
+    }
+
+    public void setEndTime(String endTime) {
+        if (endTime != null && !endTime.contains(" ")) {
+            this.endTime = endTime + " 23:59:59";
+        } else {
+            this.endTime = endTime;
+        }
+    }
 }
@@ -127,7 +127,15 @@ public interface HomepageSummaryMapper  extends BaseMapperX&lt;DepartmentCostDO&gt; {
      * @Return java.util.List<com.zteits.urbanops.module.garden.controller.app.homepage.vo.TaskDetailsRspVo>
      */
     IPage<TaskDetailsRspVo> queryCompletedTaskDetails(IPage<TaskDetailsRspVo> page, @Param("userId") Long userId);
-
-    IPage<TaskDetailsRspVo> queryPendingTaskDetails(IPage<TaskDetailsRspVo> page, @Param("roleIds") List<Long> roleIds);
+    /**
+     * @Author wangqian
+     * @Description 待办任务
+     * @Date 2026/1/7 20:33
+     * @Param page
+     * @param roleIds
+     * @param userId
+     * @Return com.baomidou.mybatisplus.core.metadata.IPage<com.zteits.urbanops.module.garden.controller.app.homepage.vo.TaskDetailsRspVo>
+     */
+    IPage<TaskDetailsRspVo> queryPendingTaskDetails(IPage<TaskDetailsRspVo> page, @Param("roleIds") List<Long> roleIds, @Param("userId") Long userId);
 }
@@ -83,7 +83,7 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
         } else {
             //待办
             List<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
-            mpPage = homepageSummaryMapper.queryPendingTaskDetails(mpPage,roleIds);
+            mpPage = homepageSummaryMapper.queryPendingTaskDetails(mpPage,roleIds, userId);
         }
         return new PageResult<>(mpPage.getRecords(), mpPage.getTotal());
     }
@@ -116,7 +116,7 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
             Calendar tempEnd = Calendar.getInstance();
             tempEnd.setTime(end);
-            //tempEnd.add(Calendar.DATE, +1);// 日期加1(包含结束)
+            tempEnd.add(Calendar.DATE, +1);// 日期加1(包含结束)
             while (tempStart.before(tempEnd)) {
                 days.add(dateFormat.format(tempStart.getTime()));
                 tempStart.add(Calendar.DAY_OF_YEAR, 1);
@@ -680,7 +680,7 @@ public class MaintainSummaryServiceImpl implements MaintainSummaryService {
             Calendar tempEnd = Calendar.getInstance();
             tempEnd.setTime(end);
-            //tempEnd.add(Calendar.DATE, +1);// 日期加1(包含结束)
+            tempEnd.add(Calendar.DATE, +1);// 日期加1(包含结束)
             while (tempStart.before(tempEnd)) {
                 days.add(dateFormat.format(tempStart.getTime()));
                 tempStart.add(Calendar.DAY_OF_YEAR, 1);
@@ -90,7 +90,7 @@
                 AND v.date_value >= #{beginTime}
             </if>
             <if test="endTime != null and endTime != ''">
-                AND v.date_value &lt;  #{endTime}
+                AND v.date_value &lt;=  #{endTime}
             </if>
         </where>
         group by  v.date_value,busi_line
@@ -112,7 +112,7 @@
                 AND v.date_value >= #{beginTime}
             </if>
             <if test="endTime != null and endTime != ''">
-                AND v.date_value &lt;  #{endTime}
+                AND v.date_value &lt;=  #{endTime}
             </if>
         </where>
          group by  v.date_value,busi_line
@@ -133,7 +133,7 @@
                 AND t.create_time >= #{beginTime}
             </if>
             <if test="endTime != null and endTime != ''">
-                AND t.create_time &lt; #{endTime}
+                AND t.create_time &lt;= #{endTime}
             </if>
         </where>
         GROUP BY
@@ -154,7 +154,7 @@
                 AND t.create_time >= #{beginTime}
             </if>
             <if test="endTime != null and endTime != ''">
-                AND t.create_time &lt; #{endTime}
+                AND t.create_time &lt;= #{endTime}
             </if>
         </where>
         GROUP BY
@@ -175,7 +175,7 @@
                 AND t.create_time >= #{beginTime}
             </if>
             <if test="endTime != null and endTime != ''">
-                AND t.create_time &lt; #{endTime}
+                AND t.create_time &lt;= #{endTime}
             </if>
         </where>
         GROUP BY
@@ -199,7 +199,7 @@
                 AND t.create_time >= #{beginTime}
             </if>
             <if test="endTime != null and endTime != ''">
-                AND t.create_time &lt; #{endTime}
+                AND t.create_time &lt;= #{endTime}
             </if>
         </where>
         GROUP BY
@@ -231,7 +231,7 @@
                 AND t.create_time >= #{beginTime}
             </if>
             <if test="endTime != null and endTime != ''">
-                AND t.create_time &lt; #{endTime}
+                AND t.create_time &lt;= #{endTime}
             </if>
         </where>
         GROUP BY
@@ -279,7 +279,7 @@
                 AND v.date_value >= #{beginTime}
             </if>
             <if test="endTime != null and endTime != ''">
-                AND v.date_value &lt; #{endTime}
+                AND v.date_value &lt;= #{endTime}
             </if>
         </where>
         group by v.date_value,t.busi_line,t.worker_company_id
@@ -301,7 +301,7 @@
             AND finish_time >= #{beginTime}
         </if>
         <if test="endTime != null and endTime != ''">
-            AND finish_time &lt; #{endTime}
+            AND finish_time &lt;= #{endTime}
         </if>
         GROUP BY DATE_FORMAT(finish_time,'%Y-%m-%d')
         UNION ALL
@@ -314,7 +314,7 @@
             AND finish_time >= #{beginTime}
         </if>
         <if test="endTime != null and endTime != ''">
-            AND finish_time &lt; #{endTime}
+            AND finish_time &lt;= #{endTime}
         </if>
         GROUP BY DATE_FORMAT(finish_time,'%Y-%m-%d')
         ) AS temp_total
@@ -343,7 +343,7 @@
             AND a.begin_time  >= #{beginTime}
         </if>
         <if test="endTime != null and endTime != ''">
-            AND a.end_time &lt; #{endTime}
+            AND a.end_time &lt;= #{endTime}
         </if>
         GROUP BY
             DATE_FORMAT(a.begin_time, '%Y-%m-%d')
@@ -365,7 +365,7 @@
                 AND a.begin_time  >= #{beginTime}
             </if>
             <if test="endTime != null and endTime != ''">
-                AND a.end_time &lt; #{endTime}
+                AND a.end_time &lt;= #{endTime}
             </if>
         GROUP BY
              DATE_FORMAT(a.begin_time, '%Y-%m-%d')
@@ -378,40 +378,66 @@
     <!--已完成任务详情-->
     <select id="queryCompletedTaskDetails"  resultType="com.zteits.urbanops.module.garden.controller.app.homepage.vo.TaskDetailsRspVo" >
         -- 巡查已办理
-        SELECT taskName, busiDateTime
+        SELECT taskName, busiDateTime, pressingType
         FROM (
-            SELECT B.plan_name as taskName,A.finish_time as busiDateTime
+            SELECT B.plan_name as taskName,A.finish_time as busiDateTime, null as pressingType
             from garden_inspection_plan_commit a , garden_inspection_plan b
-            where a.batch_no=b.batch_no  and  user_id = #{userId}
+            where a.batch_no=b.batch_no
+              and  user_id = #{userId}
             union all
             -- 养护已办理
-            SELECT b.plan_name as taskName,a.finish_time as busiDateTime
+            SELECT b.plan_name as taskName,a.finish_time as busiDateTime, null as pressingType
             from garden_maintain_plan_commit a , garden_maintain_plan  b
-            where a.batch_no=b.batch_no  and user_id = #{userId}
+            where a.batch_no=b.batch_no
+              and user_id = #{userId}
+            union all
+            -- 工单已办
+            SELECT
+                res.order_name as taskName, res.create_time as busiDateTime, res.pressing_type as  pressingType
+            FROM (
+                SELECT
+                m.order_name,m.create_time, m.pressing_type,
+                ROW_NUMBER() OVER (
+                PARTITION BY m.order_no
+                ORDER BY t.START_TIME_ DESC, t.ID_ DESC
+                ) AS rn
+                FROM act_hi_taskinst t
+                LEFT JOIN workorder_main_info m   ON t.PROC_INST_ID_ = m.process_instance_id  AND m.deleted = 0
+                WHERE t.END_TIME_ IS NOT NULL AND m.order_name IS NOT NULL
+                AND t.ASSIGNEE_ = #{userId}
+                ) res
+            WHERE res.rn = 1
              ) t
         ORDER BY busiDateTime DESC
     </select>
     <!--待办任务详情-->
     <select id="queryPendingTaskDetails"  resultType="com.zteits.urbanops.module.garden.controller.app.homepage.vo.TaskDetailsRspVo" >
-        SELECT taskName, busiDateTime
+        SELECT taskName, busiDateTime, pressingType
         FROM (
-                 SELECT a.plan_name as taskName,a.begin_time as busiDateTime
-                 from garden_inspection_plan a
-                          INNER JOIN  garden_inspection_plan_role b  on a.batch_no=b.batch_no
-                 where a.finish_state in(1,3)
-                        AND b.role_id IN
-                        <foreach collection='roleIds' item='roleId' open='(' close=')' separator=','>
-                            #{roleId}
-                        </foreach>
-                 union all
-                 SELECT a.plan_name as taskName,a.begin_time as busiDateTime
-                 from garden_maintain_plan a
-                          INNER JOIN  garden_maintain_plan_role b  on a.batch_no=b.batch_no
-                 where a.finish_state in(1,3)
-                        AND b.role_id IN
-                        <foreach collection='roleIds' item='roleId' open='(' close=')' separator=','>
-                            #{roleId}
-                        </foreach>
+             SELECT a.plan_name as taskName,a.begin_time as busiDateTime,null as pressingType
+             from garden_inspection_plan a
+                      INNER JOIN  garden_inspection_plan_role b  on a.batch_no=b.batch_no
+             where a.finish_state in(1,3)
+                    AND b.role_id IN
+                    <foreach collection='roleIds' item='roleId' open='(' close=')' separator=','>
+                        #{roleId}
+                    </foreach>
+             union all
+             SELECT a.plan_name as taskName,a.begin_time as busiDateTime, null as pressingType
+             from garden_maintain_plan a
+                      INNER JOIN  garden_maintain_plan_role b  on a.batch_no=b.batch_no
+             where a.finish_state in(1,3)
+                    AND b.role_id IN
+                    <foreach collection='roleIds' item='roleId' open='(' close=')' separator=','>
+                        #{roleId}
+                    </foreach>
+             union all
+             SELECT
+                m.order_name as taskName ,m.create_time as busiDateTime , m.pressing_type as pressingType
+             FROM act_ru_task t
+             LEFT JOIN workorder_main_info m ON t.PROC_INST_ID_ = m.process_instance_id AND m.deleted = 0
+             WHERE  t.SUSPENSION_STATE_ = 1 and m.order_name is not null
+                    AND t.ASSIGNEE_ = #{userId}
              ) t
         ORDER BY busiDateTime DESC
     </select>