修改维修回调添加销售订单

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CooperationOrganDao.java

@@ -31,4 +31,10 @@ public interface CooperationOrganDao extends BaseDAO<Integer, CooperationOrgan>
 
 
     List<OrganFullJobResourceNumDto> getOrganFullJobResourceNum();
+
+    /**
+     * 获取全部使用中合作单位
+     * @return
+     */
+    List<CooperationOrgan> getAllCooperationOrgan();
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/OperatingReportServiceImpl.java

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.OrganFullJobResourceNumDto;
+import com.ym.mec.biz.dal.entity.CooperationOrgan;
 import com.ym.mec.biz.dal.entity.FinancialExpenditure;
 import com.ym.mec.biz.dal.entity.OperatingReport;
 import com.ym.mec.biz.dal.enums.ExpenditureTypeEnum;
@@ -55,6 +56,16 @@ public class OperatingReportServiceImpl extends BaseServiceImpl<Integer, Operati
             operatingReport.setDistributionAmount(new BigDecimal(organFullJobResource.getNum()).multiply(fullJobFee).divide(new BigDecimal(12), 2, BigDecimal.ROUND_HALF_UP));
             organOperating.put(organFullJobResource.getOrganId(), operatingReport);
         }
+        //1、合作单位的全职资源分摊费用
+        List<CooperationOrgan> allCooperationOrgan = cooperationOrganDao.getAllCooperationOrgan();
+        for (CooperationOrgan cooperationOrgan : allCooperationOrgan) {
+            OperatingReport operatingReport = new OperatingReport();
+            operatingReport.setOrganId(cooperationOrgan.getOrganId());
+            operatingReport.setCooperationOrganId(cooperationOrgan.getId());
+            BigDecimal distributionAmount = cooperationOrgan.getFullJobResource().equals(1) ? fullJobFee.divide(new BigDecimal(12), 2, BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO;
+            operatingReport.setDistributionAmount(distributionAmount);
+            cooperationOperating.put(cooperationOrgan.getId(), operatingReport);
+        }
 
         //2、获取支出费用
         List<FinancialExpenditure> cooperationExpenditures = financialExpenditureDao.getCooperationExpenditure();
@@ -268,7 +279,6 @@ public class OperatingReportServiceImpl extends BaseServiceImpl<Integer, Operati
             updateReport(operatingReport, params);
         });
         cooperationOperating.forEach((organId, operatingReport) -> {
-            operatingReport.setDistributionAmount(fullJobFee.divide(new BigDecimal(12), 2, BigDecimal.ROUND_HALF_UP));
             operatingReport.setMonth(startTime);
             operatingReport.setCreateTime(nowDate);
             updateReport(operatingReport, params);

mec-biz/src/main/resources/config/mybatis/CooperationOrganMapper.xml

@@ -145,4 +145,10 @@
         WHERE full_job_resource_ =1 AND is_enable_=1 AND del_flag_ = 0
         GROUP BY organ_id_
     </select>
+
+    <!-- 获取全部使用中的合作单位 -->
+    <select id="getAllCooperationOrgan" resultMap="CooperationOrgan">
+        SELECT * FROM cooperation_organ
+        WHERE full_job_resource_ =1 AND is_enable_=1 AND del_flag_ = 0
+    </select>
 </mapper>