Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/TranSettlementReport.java

@@ -169,6 +169,16 @@ public class TranSettlementReport extends BaseModel<TranSettlementReport> {
      * 付款截图
      */
     private String paymentScreenshot;
+    /**
+     * 请款人
+     */
+    private String requester;
+    /**
+     * 请款日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date requestDate;
     /**
      * 审核流id
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranSettlementReportServiceImpl.java

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
 import com.winsea.svc.base.base.entity.CommonRoleResource;
+import com.winsea.svc.base.base.entity.CommonStaff;
 import com.winsea.svc.base.base.service.ICommonRoleResourceService;
+import com.winsea.svc.base.base.service.ICommonStaffService;
 import com.winsea.svc.base.security.entity.User;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
@@ -46,10 +48,6 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
     @SofaReference
     private ICommonRoleResourceService roleResourceService;
     @Autowired
-    private IDriverPayeeInfoService driverPayeeInfoService;
-    @Autowired
-    private IDriverViewInfoService driverViewInfoService;
-    @Autowired
     private IContractManagementInfoService contractManagementInfoService;
     @Autowired
     private ITranPriceApproveService tranPriceApproveService;
@@ -63,6 +61,8 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
     private IExpenseInfoService expenseInfoService;
     @Autowired
     private IBatchReviewInfoService batchReviewInfoService;
+    @Autowired
+    private ICommonStaffService staffService;
 
 
 
@@ -74,7 +74,6 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
      */
     @Override
     public List<TranSettlementReport> getTranSettlementReport(TranSettlementReport tranSettlementReport1) {
-
         List<TranSettlementReport> tranSettlementReports = this.selectList(new EntityWrapper<TranSettlementReport>()
         .eq("batch_id",tranSettlementReport1.getBatchId()));
         if(!CollectionUtils.isEmpty(tranSettlementReports)){
@@ -255,8 +254,8 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
             //1 修改扣款
             else if (tranSettlementReport.getFlag() == 1) {
                 tranSettlementReport1.setDeductionAmount(tranSettlementReport.getDeductionAmount());
-                tranSettlementReport1.setAmountIngPayable(tranSettlementReport1.getAmountIngPayable()-Float.valueOf(tranSettlementReport.getDeductionAmount()));
-                tranSettlementReport1.setAmountNotPayable(tranSettlementReport1.getAmountNotPayable()-Float.valueOf(tranSettlementReport.getDeductionAmount()));
+                tranSettlementReport1.setAmountIngPayable(tranSettlementReport1.getSettlementWeight()*tranSettlementReport1.getTransportPrice()-Float.valueOf(tranSettlementReport1.getDeductionAmount()));
+                tranSettlementReport1.setAmountNotPayable(tranSettlementReport1.getAmountIngPayable()-tranSettlementReport1.getAmountEdPayable());
                 //更改汽运结算信息
                 this.updateById(tranSettlementReport1);
                 return "OK";
@@ -527,6 +526,8 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
         //批量
         if (!CollectionUtils.isEmpty(tranSettlementReportList)) {
             for (TranSettlementReport tranSettlementReport1 : tranSettlementReportList) {
+                tranSettlementReport1.setRequestDate(new Date());
+                tranSettlementReport1.setRequester(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffName());
                 tranSettlementReport1.setBatchId(batchReviewInfo.getId());
                 this.updateById(tranSettlementReport1);
             }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/workflow/TranSettlementReportListener.java

@@ -89,10 +89,8 @@ public class TranSettlementReportListener extends AbstractWorkflowTaskListener {
                 settlementReport.setWorkflowId(batchReviewInfo.getWorkflowId());
                 settlementReport.setStatus(batchReviewInfo.getStatus());
                 settlementReport.setApproveStatus(batchReviewInfo.getApproveStatus());
-
+                tranSettlementReportService.updateAllColumnById(settlementReport);
             }
-            tranSettlementReportService.updateBatchById(tranSettlementReports);
-
         }
 
     }