111

src/main/java/com/gct/aoid/service/impl/AoidDailyYieldServiceImpl.java

@@ -843,8 +843,7 @@ public class AoidDailyYieldServiceImpl extends ServiceImpl<AoidDailyYieldMapper,
     public void calculateProdDateData(String well,String[] orgs, String startDate, String endDate, String startTimeEveryDay) throws InvocationTargetException, IllegalAccessException, InstantiationException, NoSuchMethodException {
         LocalDateTime start = DateTimeUtil.formatDateTime(startDate + " " + startTimeEveryDay);
         LocalDateTime end = DateTimeUtil.formatDateTime(endDate+ " " + startTimeEveryDay);
-        if ( well!="")
-        {
+        if (!Objects.equals(well, "")) {
             List<List<String>> wellIdList = new ArrayList<>();
             wellIdList.add(Collections.singletonList(well));
             for (List<String> strings : wellIdList) {
@@ -884,6 +883,7 @@ public class AoidDailyYieldServiceImpl extends ServiceImpl<AoidDailyYieldMapper,
                         if (TimingSummaryJob.threadLocal.get()) {
                             String a2VolDataForCalProduction = baseDataClient.getA2VolDataForCalProduction(value.get(0).getWellId(), DateTimeUtil.formatDateStr(startDate));//可能用start 或 start+1
                             Object data = JSONObject.parseObject(a2VolDataForCalProduction, Result.class).getData();
+                            if (Objects.isNull(data)) return;
                             HashMap hashMap = JSONObject.parseObject(data.toString(), HashMap.class);
                             if (hashMap != null && hashMap.size() > 0) {
                                 BigDecimal prodTime = (BigDecimal) hashMap.get("prodTime");

src/main/java/com/gct/aoid/service/impl/LiqProdDailyCalServiceImpl.java

@@ -312,6 +312,8 @@ public class LiqProdDailyCalServiceImpl implements LiqProdDailyCalService {
 
         //re.setProdTime(prodTime);
         re.setProdTime((int) d);
+        //准东默认如果有一张共图也是算24小时
+        if (re.getProdTime()>0) re.setProdTime(24);
         //re.setProdTime(24);
         //endregion
         //设置有效/无效功图数的初始值