2023年9月13日17:35:29

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjBrandDesc.java

@@ -150,4 +150,7 @@ public class PjBrandDesc implements Serializable {
 	 */
 	@ApiModelProperty(value = "排序")
 	private int sort;
+
+	@TableField(exist = false)
+	private boolean disabled = false;
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/brand/controller/BrandDescController.java

@@ -235,7 +235,7 @@ public class BrandDescController extends BladeController {
 			.eq(PjBrandDesc::getType, brandDesc.getType())
 			.eq(PjBrandDesc::getEnableOrNot, brandDesc.getEnableOrNot())
 			.like(ObjectUtils.isNotEmpty(brandDesc.getCname()), PjBrandDesc::getCname, brandDesc.getCname())
-		.orderByDesc(PjBrandDesc::getSort);
+			.orderByDesc(PjBrandDesc::getSort);
 		if (!AuthUtil.getUserRole().contains("admin")) {
 			lambdaQueryWrapper.eq(PjBrandDesc::getSalesCompanyId, AuthUtil.getDeptId());//公司
 		}
@@ -262,10 +262,14 @@ public class BrandDescController extends BladeController {
 		lambdaQueryWrapper.eq(PjBrandDesc::getTenantId, AuthUtil.getTenantId())
 			.eq(PjBrandDesc::getIsDeleted, 0)
 			.eq(PjBrandDesc::getType, brandDesc.getType())
-			.eq(PjBrandDesc::getEnableOrNot, brandDesc.getEnableOrNot())
 			.like(ObjectUtils.isNotEmpty(brandDesc.getCname()), PjBrandDesc::getCname, brandDesc.getCname())
 			.orderByDesc(PjBrandDesc::getSort);
 		List<PjBrandDesc> list = brandDescService.list(lambdaQueryWrapper);
+		list.forEach(e -> {
+			if (0 == e.getEnableOrNot()) {
+				e.setDisabled(true);
+			}
+		});
 		return R.data(list);
 	}
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/service/impl/GoodsDescServiceImpl.java

@@ -406,7 +406,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, PjGoodsDe
 		Integer count = baseMapper.selectCount(Wrappers.<PjGoodsDesc>lambdaQuery()
 			.ne(Objects.nonNull(goodsDesc.getId()), PjGoodsDesc::getId, goodsDesc.getId())
 			.eq(PjGoodsDesc::getCode, goodsDesc.getCode())
-			.eq(PjGoodsDesc::getTenantId, goodsDesc.getTenantId())
+			.eq(PjGoodsDesc::getTenantId, AuthUtil.getTenantId())
 			.eq(PjGoodsDesc::getIsDeleted, 0)
 		);
 		if (count > 0) {
@@ -424,7 +424,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, PjGoodsDe
 		Integer count = baseMapper.selectCount(Wrappers.<PjGoodsDesc>lambdaQuery()
 			.ne(Objects.nonNull(goodsDesc.getId()), PjGoodsDesc::getId, goodsDesc.getId())
 			.eq(PjGoodsDesc::getCname, goodsDesc.getCname())
-			.eq(PjGoodsDesc::getTenantId, goodsDesc.getTenantId())
+			.eq(PjGoodsDesc::getTenantId, AuthUtil.getTenantId())
 			.eq(PjGoodsDesc::getIsDeleted, 0)
 		);
 		if (count > 0) {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/maintenance/controller/MaintenanceController.java

@@ -111,7 +111,7 @@ public class MaintenanceController extends BladeController {
 			.or().like(Maintenance::getRepairDescription,maintenance.getRetrieval())
 			);
 		}
-		if (AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin")) {
 			if (ObjectUtils.isNotNull(maintenance.getStatus())) {
 				if (maintenance.getStatus() == 1) {
 					lambdaQueryWrapper.eq(Maintenance::getDispatchingWorkers,"1");

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/controller/OrderStatisticsController.java

@@ -30,6 +30,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.salesPart.entity.PjAccountManagement;
 import org.springblade.salesPart.entity.PjOrder;
 import org.springblade.salesPart.order.service.IOrderService;
 import org.springblade.system.user.entity.User;
@@ -64,6 +65,9 @@ public class OrderStatisticsController extends BladeController {
 	@GetMapping("/salesman")
 	public R<List<PjOrder>> salesman(PjOrder order) {
 		order.setTenantId(AuthUtil.getTenantId());
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			order.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));//公司
+		}
 		List<PjOrder> pjOrderList = orderService.salesman(order);
 		return R.data(pjOrderList);
 	}
@@ -84,6 +88,9 @@ public class OrderStatisticsController extends BladeController {
 			lambdaQueryWrapper.ge(PjOrder::getBusinesDate, order.getBusinesDateList().get(0));
 			lambdaQueryWrapper.le(PjOrder::getBusinesDate, order.getBusinesDateList().get(1));
 		}
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId());//公司
+		}
 		lambdaQueryWrapper.orderByDesc(PjOrder::getCreateTime);
 		IPage<PjOrder> pages = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 		String createUserIds = "";

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/mapper/OrderMapper.java

@@ -59,7 +59,8 @@ public interface OrderMapper extends BaseMapper<PjOrder> {
 
 	List<PjOrder> salesman(@Param("order") PjOrder order);
 
-	Map<String, BigDecimal> columnar(LocalDate firstDay, LocalDate lastDay,String tenantId);
+	Map<String, BigDecimal> columnar(@Param("firstDay")LocalDate firstDay, @Param("lastDay")LocalDate lastDay,
+									 @Param("tenantId")String tenantId,@Param("salesCompanyId")Long salesCompanyId);
 
     List<PjOrderStatisticsWeb> statisticsPage(IPage<PjOrderStatisticsWeb> page,@Param("order") PjOrderStatisticsWeb order);
 

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/mapper/OrderMapper.xml

@@ -142,6 +142,9 @@
         <if test="order.businesDateList != null and order.businesDateList[1] != null and order.businesDateList[1]!= ''">
             and po.busines_date &lt;= #{order.businesDateList[1]}
         </if>
+        <if test="order.salesCompanyId!=null">
+            and bu.dept_id = #{order.salesCompanyId}
+        </if>
         GROUP BY
             po.saler_id
     </select>
@@ -161,6 +164,9 @@
         <if test="lastDay != null">
             and po.busines_date &lt;= #{lastDay}
         </if>
+        <if test="salesCompanyId!=null">
+            and po.sales_company_id = #{salesCompanyId}
+        </if>
     </select>
     <select id="collectionStatisticsList" resultType="org.springblade.salesPart.vo.OrderStatistics">
         SELECT DISTINCT

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -266,7 +266,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 			// 获取该月份的第一天和最后一天
 			LocalDate firstDay = yearMonth.atDay(1);
 			LocalDate lastDay = yearMonth.atEndOfMonth();
-			Map<String, BigDecimal> sum = baseMapper.columnar(firstDay, lastDay, AuthUtil.getTenantId());
+			Map<String, BigDecimal> sum = new HashMap<>();
+			if (!AuthUtil.getUserRole().contains("admin")) {
+				sum = baseMapper.columnar(firstDay, lastDay, AuthUtil.getTenantId(),Long.parseLong(AuthUtil.getDeptId()));
+			}else{
+				sum = baseMapper.columnar(firstDay, lastDay, AuthUtil.getTenantId(),null);
+
+			}
 			number.add(sum.get("goodsTotalNum"));
 			amount.add(sum.get("totalMoney"));
 		}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/service/impl/ShipServiceImpl.java

@@ -280,6 +280,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 			gdShip.setCreateUser(AuthUtil.getUserId());
 			gdShip.setCreateTime(new Date());
 			gdShip.setTaskId(rwShip.getId());
+			gdShip.setSendTotalNum(new BigDecimal("0.00"));
 			baseMapper.insert(gdShip);
 
 			//根据销售id获得销售明细数据