1

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

@@ -12,6 +12,7 @@ import com.management.platform.util.DateTimeUtil;
 import com.management.platform.util.HttpRespMsg;
 import org.springframework.http.*;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;
@@ -351,10 +352,12 @@ public class WxCorpInfoController {
                             plan.setEndDate(localDateFromUnix);
                         }
                     }
-                    if(title.getJSONObject(0).getString("text").equals("工作时长")){
+                    if(title.getJSONObject(0).getString("text").equals("结算总时长")){
                         if(control.equals("Number")){
-                            double new_number = value.getDoubleValue("new_number");
-                            workTime=new_number;
+                            double new_number = StringUtils.isEmpty(value.getString("new_number")) ?0.0:value.getDoubleValue("new_number");
+                            BigDecimal bigDecimal = new BigDecimal(new_number);
+                            bigDecimal=bigDecimal.divide(new BigDecimal(plan.getPlanManNum()),1,RoundingMode.HALF_UP);
+                            workTime=bigDecimal.doubleValue();
                         }
                     }
                     BigDecimal bigDecimal = new BigDecimal(plan.getPlanManNum()==null?0:plan.getPlanManNum());

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

@@ -492,10 +492,12 @@ public class TimingTask {
                             plan.setEndDate(localDateFromUnix);
                         }
                     }
-                    if(title.getJSONObject(0).getString("text").equals("工作时长")){
+                    if(title.getJSONObject(0).getString("text").equals("结算总时长")){
                         if(control.equals("Number")){
-                            double new_number = value.getDoubleValue("new_number");
-                            workTime=new_number;
+                            double new_number = StringUtils.isEmpty(value.getString("new_number")) ?0.0:value.getDoubleValue("new_number");
+                            BigDecimal bigDecimal = new BigDecimal(new_number);
+                            bigDecimal=bigDecimal.divide(new BigDecimal(plan.getPlanManNum()),1,RoundingMode.HALF_UP);
+                            workTime=bigDecimal.doubleValue();
                         }
                     }
                     BigDecimal bigDecimal = new BigDecimal(plan.getPlanManNum()==null?0:plan.getPlanManNum());