Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper into master

fhKeeper/formulahousekeeper/management-workshop/src/main/resources/mapper/ReportMapper.xml

@@ -135,8 +135,10 @@
     </select>
 
     <select id="getPersonWorkHoursWagesList" resultType="java.util.Map">
-        select b.id as userId,c.department_name as departmentName,b.name as userName,DATE_FORMAT(a.create_date,'%Y%m%d') as crateDate,IFNULL(SUM(a.cost),0) as cost,IFNULL(SUM(a.working_time),0) as workTime
-        ,ppt.`work_time` AS planWorkTime,ppt.`job_of_money` AS planCost,(ppt.`work_time`-IFNULL(SUM(a.working_time),0)) AS surplusTime,(ppt.`job_of_money`-IFNULL(SUM(a.cost),0)) AS surplusCost
+        select b.id AS userId,c.department_name AS departmentName,b.name AS userName,DATE_FORMAT(a.create_date,'%Y%m%d') AS crateDate,IFNULL(SUM(a.cost),0) AS cost,IFNULL(SUM(a.working_time),0) AS workTime
+        ,SUM(ppt.`work_time`) AS planWorkTime,SUM(ppt.`job_of_money`) AS planCost,
+        IF((SUM(ppt.`work_time`)-IFNULL(SUM(a.working_time),0))&lt;0,0,FORMAT((SUM(ppt.`work_time`)-IFNULL(SUM(a.working_time),0)),1)) AS surplusTime,
+        IF((SUM(ppt.`job_of_money`)-IFNULL(SUM(a.cost),0))&lt;0,0,FORMAT((SUM(ppt.`job_of_money`)-IFNULL(SUM(a.cost),0)),1)) AS surplusCost
         from report a
         LEFT JOIN `prod_procedure_team` ppt ON ppt.id=a.`user_procedure_team_id`
         left join user b on a.creator_id=b.id

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/statistic/index.vue

@@ -90,8 +90,8 @@
                     <template slot-scope="scope">
                         <div v-for="(items, indexs) in scope.row.personWorkHoursWages" :key="indexs" @click="showReportDetail(scope.row,item,0)" :class="`${scope.row.departmentCascade== '小计' ? '' : 'colorText'}`">
                             <div v-if="items.crateDate == item">
-                               <div style="color: black;"> {{items.workTime}}分钟  {{items.cost}}元</div> 
-                               <div>{{items.planWorkTime}}分钟  {{items.planCost}}元</div>
+                              <div  style="color: black;">{{items.planWorkTime}}分钟  {{items.planCost}}元</div>
+                               <div> {{items.workTime}}分钟  {{items.cost}}元</div> 
                                <div style="color: red;">{{items.surplusTime}}分钟  {{items.surplusCost}}元</div>
                             </div>
                         </div>