Merge branch 'develop'

src/main/java/cn/ezhizao/project/business/deduct/controller/BizDeductController.java

@@ -317,7 +317,11 @@ public class BizDeductController extends BaseController {
         recordCondition.setWorkOrderIds(workOrders.stream().map(BizWorkOrder::getId).collect(Collectors.toList()));
         List<BizWorkOrderRecord> records = workOrderRecordService.getList(recordCondition);
         onceEntrust.forEach(l -> {
-            BizWorkOrderRecord record = records.stream().filter(v -> v.getWorkOrderId().equals(l.getWorkOrderId()) && v.getFromId().equals(0L) && v.getStatus().equals(3) && v.getCreateTime().compareTo(conditions.getStartMonth()) >= 0 && v.getCreateTime().compareTo(DateUtil.endOfMonth(conditions.getEndMonth())) <= 0).findFirst().orElse(null);
+            BizWorkOrderRecord record = records.stream().filter(v -> v.getWorkOrderId().equals(l.getWorkOrderId()) &&
+                    v.getFromId().equals(0L) &&
+                    v.getStatus().equals(3) && v.getFinishTime()!= null &&
+                    v.getFinishTime().compareTo(conditions.getStartMonth()) >= 0 &&
+                    v.getFinishTime().compareTo(DateUtil.endOfMonth(conditions.getEndMonth())) <= 0).findFirst().orElse(null);
             if (record != null) {
                 BizStatementAccountOnce item = new BizStatementAccountOnce();
                 item.setEntrustOrderId(bizDeduct.getEntrustOrderId());
@@ -403,6 +407,7 @@ public class BizDeductController extends BaseController {
         once.setMonth(bizDeduct.getMonth());
         once.setActuallyAmount(amount);
         once.setAmount(amount);
+        once.setCompanyNum(onceList.size());
         accounts.add(once);
     }
 
@@ -473,7 +478,8 @@ public class BizDeductController extends BaseController {
         zeroDeclaration.setTaskType("代理记账");
         zeroDeclaration.setAnnualIncome(zeroAnnualIncome);
         zeroDeclaration.setCompanyNum(zeroZero.size());
-        BizEntrustPrice zeroPrice = prices.stream().filter(v -> v.getIsZero() == 1).findFirst().orElse(null);
+        BizEntrustPrice zeroPrice = prices.stream().filter(v ->  v.getIsZero() !=null
+                 && v.getIsZero() == 1).findFirst().orElse(null);
         zeroDeclaration.setPrice(zeroPrice != null ? zeroPrice.getPrice() : BigDecimal.ZERO);
         zeroDeclaration.setAmount(zeroDeclaration.getPrice().multiply(BigDecimal.valueOf(zeroDeclaration.getCompanyNum())));
         zeroDeclaration.setActuallyAmount(zeroDeclaration.getAmount());
@@ -483,7 +489,7 @@ public class BizDeductController extends BaseController {
 
         // 年收入0
         String annualIncome = "0";
-        List<BizStatementAccountLoop> zero = loop.stream().filter(v -> v.getActuallyAnnualIncome().equals(annualIncome) && v.getIsZero() != 1).collect(Collectors.toList());
+        List<BizStatementAccountLoop> zero = loop.stream().filter(v -> v.getActuallyAnnualIncome().equals(annualIncome) &&  v.getIsZero() != null && v.getIsZero() != 1).collect(Collectors.toList());
         BizStatementAccount first = new BizStatementAccount();
         first.setTaskType("代理记账");
         first.setAnnualIncome(annualIncome);

src/main/java/cn/ezhizao/project/business/entrustOrder/controller/BizEntrustOrderController.java

@@ -186,10 +186,10 @@ public class BizEntrustOrderController extends BaseController {
         BizEntrustOrder entrustOrder = bizEntrustOrderService.getById(entrustOrderId);
         // 所有委托月
         List<BizEntrust> entrust = entrustService.query().eq("from_tenant_id", entrustOrder.getFromTenantId()).eq("to_tenant_id", entrustOrder.getTenantId()).list();
-        List<BizDeduct> deducts = bizDeductService.query().eq("from_tenant_id", entrustOrder.getFromTenantId()).eq("tenant_id", entrustOrder.getTenantId()).list();
-        entrust = entrust.stream().filter(v -> v.getWorkMonth() != null &&
-                deducts.stream().noneMatch(e -> v.getWorkMonth().compareTo(e.getStartMonth()) >= 0 && v.getWorkMonth().compareTo(e.getEndMonth()) <= 0)
-        ).collect(Collectors.toList());
+//        List<BizDeduct> deducts = bizDeductService.query().eq("from_tenant_id", entrustOrder.getFromTenantId()).eq("tenant_id", entrustOrder.getTenantId()).list();
+//        entrust = entrust.stream().filter(v -> v.getWorkMonth() != null &&
+//                deducts.stream().noneMatch(e -> v.getWorkMonth().compareTo(e.getStartMonth()) >= 0 && v.getWorkMonth().compareTo(e.getEndMonth()) <= 0)
+//        ).collect(Collectors.toList());
         List<String> months = entrust.stream().map(v -> DateTime.of(v.getWorkMonth()).toString("yyyy-MM-dd")).distinct().sorted().collect(Collectors.toList());
         return success(months);
     }

src/main/java/cn/ezhizao/project/business/workOrder/domain/BizWorkOrderRecord.java

@@ -4,10 +4,12 @@ import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
 import cn.ezhizao.framework.web.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -62,4 +64,6 @@ public class BizWorkOrderRecord extends BaseEntity
 
     @TableField(exist = false)
     private Long fromId;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date finishTime;
 }