完善工时统计

wisenergy-mapper/src/main/resources/mapper/WorkProjectTimeCost.xml

@@ -109,7 +109,7 @@
 
 
     <select id="selectListByMonth" resultMap="projectStatisticsByMonth">
-        select <if test="projectId == null">'合计' AS project_name,</if> <if test="projectId != null"> project_name,</if>  group_CONCAT(DISTINCT YEAR (statistics_start),'年',MONTH (statistics_start),'月') AS date, sum(total_time) AS total_time, sum(cost) AS cost
+        select <if test="projectId == null">'合计' AS project_name,</if> <if test="projectId != null"> project_name,'合计' AS dept_name,</if>  group_CONCAT(DISTINCT YEAR (statistics_start),'年',MONTH (statistics_start),'月') AS date, sum(total_time) AS total_time, sum(cost) AS cost
         from work_project_time_cost ptc join work_project p on ptc.project_id = p.id join work_dept d on ptc.dept_id = d.id
         <where>
         <if test="projectId != null ">
@@ -148,6 +148,7 @@
             </if>
         </where>
         group by ptc.project_id,project_name,year(statistics_start),MONTH(statistics_start) <if test="projectId != null "> ,d.dept_name</if>
+
     </select>
 
 </mapper>
\ No newline at end of file

wisenergy-web-admin/pom.xml

@@ -32,7 +32,7 @@
 
     <!-- MAVEN构建 -->
     <build>
-        <finalName>${project.artifactId}-${moduleVersion.wisenergy-web-admin}</finalName>
+        <finalName>${project.artifactId}-${moduleVersion.wisenergy-web-admin}-测试</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>