1

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/controller/WxCorpInfoController.java

@@ -392,8 +392,10 @@ public class WxCorpInfoController {
                             if(!formula.getString("value").equals("")){
                                 double formulaDoubleValue = formula.getDoubleValue("value");
                                 BigDecimal bigDecimal = new BigDecimal(formulaDoubleValue);
-                                BigDecimal divide = bigDecimal.divide(new BigDecimal(workTime), 0, RoundingMode.HALF_UP);
-                                plan.setMoneyOfJob(divide);
+                                if(workTime>0){
+                                    BigDecimal divide = bigDecimal.divide(new BigDecimal(workTime), 0, RoundingMode.HALF_UP);
+                                    plan.setMoneyOfJob(divide);
+                                }
                             }
                         }
                     }

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/task/TimingTask.java

@@ -532,8 +532,10 @@ public class TimingTask {
                             if(!formula.getString("value").equals("")){
                                 double formulaDoubleValue = formula.getDoubleValue("value");
                                 BigDecimal bigDecimal = new BigDecimal(formulaDoubleValue);
-                                BigDecimal divide = bigDecimal.divide(new BigDecimal(workTime), 0, RoundingMode.HALF_UP);
-                                plan.setMoneyOfJob(divide);
+                                if(workTime>0){
+                                    BigDecimal divide = bigDecimal.divide(new BigDecimal(workTime), 0, RoundingMode.HALF_UP);
+                                    plan.setMoneyOfJob(divide);
+                                }
                             }
                         }
                     }

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

@@ -139,10 +139,11 @@
         IFNULL(SUM(IF(a.`user_procedure_team_id`IS NOT NULL,a.cost,NULL)),0) AS cost,
         IFNULL(SUM(IF(a.`user_procedure_team_id` IS NOT NULL,a.working_time,NULL)),0) AS workTime,
         IFNULL(SUM(IF(a.`user_procedure_team_id`IS NULL,a.cost,NULL)),0) AS tempCost,
-        IFNULL(SUM(IF(a.`user_procedure_team_id` IS NULL,a.working_time,NULL)),0) AS tempWorkTime
+        IFNULL(SUM(IF(a.`user_procedure_team_id` IS NULL,a.working_time*60,NULL)),0) AS tempWorkTime
         from report a
         left join user b on a.creator_id=b.id
         left join department c on c.department_id=b.department_id
+        left join plan p on p.id=a.plan_id
         where a.company_id=#{companyId}
         <if test="list!=null and list.size()>0">
             and c.department_id in
@@ -191,7 +192,7 @@
     </select>
 
     <select id="getPersonWorkHoursWagesDetailForTemp" resultType="java.util.Map">
-        select r.cost,r.working_time,r.finish_num, r.creator_id,DATE_FORMAT(r.create_date,'%Y%m%d') as createDate,
+        select r.cost,(r.working_time*60) as working_time,r.finish_num, r.creator_id,DATE_FORMAT(r.create_date,'%Y%m%d') as createDate,
         p.name as productName,DATE_FORMAT(plan.start_date,'%Y%m%d') as planStartDate,DATE_FORMAT(plan.end_date,'%Y%m%d') as planEndDate ,
         plan.task_change_notice_num as taskChangeNoticeNum,plan.plan_type as planType,u.name as checkerName,u2.name as creatorName,plan.task_name as taskName,plan.task_type_name
         from report r