caozixuan 7 mesi fa
parent
commit
5b7581608b

+ 6 - 2
sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDingStatisticByCrmServiceImpl.java

@@ -120,8 +120,12 @@ public class TBDingStatisticByCrmServiceImpl extends ServiceImpl<TBDingStatistic
                         addHours = addHours.add(tbDingAdd.getAddHours());
                     }
                 }
-                tbDingStatisticByCrm.setAddDays(addDays);
-                tbDingStatisticByCrm.setAddHours(addHours);
+                if (SystemConstant.effectBigDecimal(addDays)) {
+                    tbDingStatisticByCrm.setAddDays(addDays);
+                }
+                if (SystemConstant.effectBigDecimal(addHours)) {
+                    tbDingStatisticByCrm.setAddHours(addHours);
+                }
                 tbDingStatisticByCrm.setWorkDays(tbDingStatisticByCrm.getWorkDays().add(addDays));
                 tbDingStatisticByCrm.setWorkHours(workHours.add(addHours));
             }

+ 6 - 3
sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDingStatisticByCustomServiceImpl.java

@@ -18,7 +18,6 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -113,8 +112,12 @@ public class TBDingStatisticByCustomServiceImpl extends ServiceImpl<TBDingStatis
                                 addHours = addHours.add(tbDingAdd.getAddHours());
                             }
                         }
-                        tbDingStatisticByCustom.setAddDays(addDays);
-                        tbDingStatisticByCustom.setAddHours(addHours);
+                        if (SystemConstant.effectBigDecimal(addDays)) {
+                            tbDingStatisticByCustom.setAddDays(addDays);
+                        }
+                        if (SystemConstant.effectBigDecimal(addHours)) {
+                            tbDingStatisticByCustom.setAddHours(addHours);
+                        }
                         tbDingStatisticByCustom.setWorkDays(tbDingStatisticByCustom.getWorkDays().add(addDays));
                     }
                 }

+ 6 - 2
sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDingStatisticByPersonServiceImpl.java

@@ -104,8 +104,12 @@ public class TBDingStatisticByPersonServiceImpl extends ServiceImpl<TBDingStatis
                         }
                     }
 
-                    tbDingStatisticByPerson.setAddDays(addDays);
-                    tbDingStatisticByPerson.setAddHours(addHours);
+                    if (SystemConstant.effectBigDecimal(addDays)) {
+                        tbDingStatisticByPerson.setAddDays(addDays);
+                    }
+                    if (SystemConstant.effectBigDecimal(addHours)) {
+                        tbDingStatisticByPerson.setAddHours(addHours);
+                    }
                     tbDingStatisticByPerson.setWorkDays(tbDingStatisticByPerson.getWorkDays().add(addDays));
                     tbDingStatisticByPerson.setWorkHours(workHours.add(addHours));
                     if (SystemConstant.strNotNull(addDaysDetail.toString())) {

+ 6 - 3
sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDingStatisticBySopServiceImpl.java

@@ -22,7 +22,6 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -101,8 +100,12 @@ public class TBDingStatisticBySopServiceImpl extends ServiceImpl<TBDingStatistic
                         addHours = addHours.add(tbDingAdd.getAddHours());
                     }
                 }
-                tbDingStatisticBySop.setAddDays(addDays);
-                tbDingStatisticBySop.setAddHours(addHours);
+                if (SystemConstant.effectBigDecimal(addDays)) {
+                    tbDingStatisticBySop.setAddDays(addDays);
+                }
+                if (SystemConstant.effectBigDecimal(addHours)) {
+                    tbDingStatisticBySop.setAddHours(addHours);
+                }
                 tbDingStatisticBySop.setWorkDays(tbDingStatisticBySop.getWorkDays().add(addDays));
                 tbDingStatisticBySop.setWorkHours(workHours.add(addHours));
             }

+ 6 - 3
sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDingStatisticBySupplierServiceImpl.java

@@ -23,7 +23,6 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -104,8 +103,12 @@ public class TBDingStatisticBySupplierServiceImpl extends ServiceImpl<TBDingStat
                             addHours = addHours.add(tbDingAdd.getAddHours());
                         }
                     }
-                    tbDingStatisticBySupplier.setAddDays(addDays);
-                    tbDingStatisticBySupplier.setAddHours(addHours);
+                    if (SystemConstant.effectBigDecimal(addDays)) {
+                        tbDingStatisticBySupplier.setAddDays(addDays);
+                    }
+                    if (SystemConstant.effectBigDecimal(addHours)) {
+                        tbDingStatisticBySupplier.setAddHours(addHours);
+                    }
                     tbDingStatisticBySupplier.setWorkDays(tbDingStatisticBySupplier.getWorkDays().add(addDays));
                     tbDingStatisticBySupplier.setWorkHours(workHours.add(addHours));
                 }