功能修改-sjx

blade-service/blade-desk/src/main/java/org/springblade/desk/cost/mapper/CostStatisticsMapper.java

@@ -75,7 +75,7 @@ public interface CostStatisticsMapper extends BaseMapper<CostStatisticsEntity> {
 	List<StStockInoutRecordExcel> exportWorkCenterMaterialCost(@Param("workCenterId")Long workCenterId, @Param("month")String month);
 	List<StStockInoutRecordExcel> exportAssistantMaterialCost(@Param("month")String month);
 
-	BigDecimal getWorkCenterMaterialCostByUser(@Param("userCode")String userCode, @Param("month")String month);
+	BigDecimal getWorkCenterMaterialCostByUser(@Param("userCodeList")List<String> userCodeList, @Param("month")String month);
 
-	BigDecimal getAssistantMaterialCostByUser(@Param("userCode")String userCode,@Param("month")String month);
+	BigDecimal getAssistantMaterialCostByUser(@Param("userCodeList")List<String> userCodeList,@Param("month")String month);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/cost/mapper/CostStatisticsMapper.xml

@@ -80,7 +80,10 @@
         WHERE
             a.IS_DELETED = 0
           AND a.IN_OUT_TYPE = 1
-          AND b.code = #{userCode}
+          AND b.code in
+            <foreach collection="userCodeList" item="userCode" open="(" close=")" separator=",">
+                #{userCode}
+            </foreach>
           AND to_char( IN_OUT_DATE, 'yyyy-MM' ) = #{month}
           AND a.GOODS_ID NOT IN ( SELECT id FROM ST_GOODS WHERE GOODS_CODE IN ( SELECT GOODS_CODE FROM MES_COST_CALCULATION_GOODS ) )
     </select>
@@ -104,7 +107,10 @@
             ST_STOCK_INOUT_RECORD a left join blade_user b on a.user_id = b.id
         WHERE
             a.is_deleted = 0
-          AND b.code != #{userCode}
+          AND b.code not in
+            <foreach collection="userCodeList" item="userCode" open="(" close=")" separator=",">
+                #{userCode}
+            </foreach>
           AND a.IN_OUT_TYPE = 1
           AND to_char( IN_OUT_DATE, 'yyyy-MM' ) = #{month}
           AND a.GOODS_ID NOT IN ( SELECT id FROM ST_GOODS WHERE GOODS_CODE IN ( SELECT GOODS_CODE FROM MES_COST_CALCULATION_GOODS ) )

blade-service/blade-desk/src/main/java/org/springblade/desk/cost/service/impl/CostStatisticsServiceImpl.java

@@ -117,8 +117,8 @@ public class CostStatisticsServiceImpl extends BaseServiceImpl<CostStatisticsMap
 			BigDecimal erpWorkCenterMaterialCost = BigDecimal.ZERO;
 			BigDecimal assistantMaterialCost = BigDecimal.ZERO;
 			//查询成分配置人员
-			CostCalculationEmployeeEntity costCalculationEmployee = costCalculationEmployeeService.getOne(Wrappers.<CostCalculationEmployeeEntity>lambdaQuery().eq(CostCalculationEmployeeEntity::getWorkCenterId,workCenter.getId()));
+			List<CostCalculationEmployeeEntity> costCalculationEmployeeList = costCalculationEmployeeService.list(Wrappers.<CostCalculationEmployeeEntity>lambdaQuery().eq(CostCalculationEmployeeEntity::getWorkCenterId,workCenter.getId()));
-			if(costCalculationEmployee == null){
+			if(CollectionUtils.isEmpty(costCalculationEmployeeList)){
 				//作业中心材料费用(剔除成本计算维护的物料)
 				workCenterMaterialCost = baseMapper.getWorkCenterMaterialCost(workCenter.getId(),month);
 				//费用科目中维护的作业中心材料费用
@@ -130,11 +130,12 @@ public class CostStatisticsServiceImpl extends BaseServiceImpl<CostStatisticsMap
 				//材料费用
 				materialCost = workCenterMaterialCost.add(assistantMaterialCost).add(erpWorkCenterMaterialCost);
 			}else{
+				List<String> userCodeList = costCalculationEmployeeList.stream().map(CostCalculationEmployeeEntity::getEmployeeCode).collect(Collectors.toList());
 				//作业中心材料费用(剔除成本计算维护的物料)
-				workCenterMaterialCost = baseMapper.getWorkCenterMaterialCostByUser(costCalculationEmployee.getEmployeeCode(),month);
+				workCenterMaterialCost = baseMapper.getWorkCenterMaterialCostByUser(userCodeList,month);
 				//费用科目中维护的作业中心材料费用
 				erpWorkCenterMaterialCost = getMaterialCost(subjectFeeList,workCenter,month);
-				assistantMaterialCost = baseMapper.getAssistantMaterialCostByUser(costCalculationEmployee.getEmployeeCode(),month);
+				assistantMaterialCost = baseMapper.getAssistantMaterialCostByUser(userCodeList,month);
 				//材料费用
 				materialCost = workCenterMaterialCost.add(assistantMaterialCost).add(erpWorkCenterMaterialCost);
 			}