feat: 获取当月评分，和总清运数

guzijian
1 parent 6ccc8629
Showing 12 changed files with 191 additions and 18 deletions
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderEvaluateMapper.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMapper.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrder.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderEvaluate.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/TransportationEnterpriseVo.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderEvaluateService.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderEvaluateServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/resources/mapper/GarOrderEvaluateMapper.xml
trash-garbage/src/main/resources/mapper/GarOrderMapper.xml
@@ -12,6 +12,7 @@ import com.trash.common.utils.StringUtils;
 import com.trash.common.utils.file.FileUploadUtils;
 import com.trash.common.utils.poi.ExcelUtil;
 import com.trash.common.utils.sql.SqlUtil;
+import com.trash.enterprise.domain.TransportationEnterprise;
 import com.trash.framework.config.ServerConfig;
 import com.trash.garbage.custom.BizException;
 import com.trash.garbage.global.Result;
@@ -117,6 +118,13 @@ public class GarbageOrderController {
         return Result.OK(garOrderService.queryOrderWebDetail(id));
     }
+
+    @GetMapping("/company")
+    public Result<?> queryEnterpriseList(TransportationEnterprise enterprise){
+        startPage();
+        return Result.OK(garOrderService.queryEnterpriseList(enterprise));
+    }
+
     protected void startPage() {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
@@ -2,6 +2,9 @@ package com.trash.garbage.mapper;
 import com.trash.garbage.pojo.domain.GarOrderEvaluate;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 /**
 * @author 20412
@@ -11,6 +14,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface GarOrderEvaluateMapper extends BaseMapper<GarOrderEvaluate> {
+    List<GarOrderEvaluate> queryEvaluateByEnterpriseIds(@Param("list") List<Long> enterpriseIds, @Param("type") Integer value);
 }
@@ -2,6 +2,9 @@ package com.trash.garbage.mapper;
 import com.trash.garbage.pojo.domain.GarOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 /**
 * @author 20412
@@ -11,6 +14,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface GarOrderMapper extends BaseMapper<GarOrder> {
+    List<GarOrder> queryCleanNumberByEnterpriseIds(@Param("list") List<Long> enterpriseIds,@Param("status") Integer value);
 }
@@ -23,6 +23,13 @@ public class GarOrder implements Serializable {
     @TableId
     private String garOrderId;
+	/**
+	 * 新增的一列数据 用于存储count字段
+	 * 注解非常关键
+	 */
+	@TableField(exist = false)
+	private Long count;
+
     /**
      * 用户id
      */
@@ -383,7 +390,11 @@ public class GarOrder implements Serializable {
 		this.garOrderCarType = garOrderCarType;
 	}
+	public Long getCount() {
+		return count;
+	}
-    
-
+	public void setCount(Long count) {
+		this.count = count;
+	}
 }
 \ No newline at end of file
 package com.trash.garbage.pojo.domain;
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -41,24 +42,33 @@ public class GarOrderEvaluate implements Serializable {
      */
     private Integer garEvaluateScore;
+	/**
+	 * 评价对象
+	 */
+	private Integer garEvaluateTarget;
+
     /**
      * 修改人
      */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
     private String garUpdateBy;
     /**
      * 创建人
      */
+	@TableField(fill = FieldFill.INSERT)
     private String garCreateBy;
     /**
      * 修改时间
      */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
     private Date garUpdateTime;
     /**
      * 创建时间
      */
+	@TableField(fill = FieldFill.INSERT)
     private Date garCreateTime;
     /**
@@ -69,6 +79,14 @@ public class GarOrderEvaluate implements Serializable {
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
+	public Integer getGarEvaluateTarget() {
+		return garEvaluateTarget;
+	}
+
+	public void setGarEvaluateTarget(Integer garEvaluateTarget) {
+		this.garEvaluateTarget = garEvaluateTarget;
+	}
+
 	public String getGarEvaluateId() {
 		return garEvaluateId;
 	}
+package com.trash.garbage.pojo.vo;
+
+import com.trash.enterprise.domain.TransportationEnterprise;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@ToString
+@EqualsAndHashCode
+public class TransportationEnterpriseVo extends TransportationEnterprise {
+    private Integer score;
+
+    private Integer cleanNumber;
+
+    public Integer getCleanNumber() {
+        return cleanNumber;
+    }
+
+    public void setCleanNumber(Integer cleanNumber) {
+        this.cleanNumber = cleanNumber;
+    }
+
+    public Integer getScore() {
+        return score;
+    }
+
+    public void setScore(Integer score) {
+        this.score = score;
+    }
+}
@@ -2,6 +2,9 @@ package com.trash.garbage.service;
 import com.trash.garbage.pojo.domain.GarOrderEvaluate;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 /**
 * @author 20412
@@ -10,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
 */
 public interface GarOrderEvaluateService extends IService<GarOrderEvaluate> {
+    List<GarOrderEvaluate> queryEvaluateByEnterpriseIds( List<Long> enterpriseIds, Integer value);
 }
@@ -2,6 +2,7 @@ package com.trash.garbage.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
+import com.trash.enterprise.domain.TransportationEnterprise;
 import com.trash.garbage.pojo.domain.GarOrder;
 import com.trash.garbage.pojo.dto.*;
 import com.trash.garbage.pojo.vo.OrderDetailVo;
@@ -60,4 +61,6 @@ public interface GarOrderService extends IService&lt;GarOrder&gt; {
     PageInfo queryOrderListByGarOrderPage(OrderWebDto dto);
     OrderDetailVo queryOrderWebDetail(String id);
+
+    PageInfo queryEnterpriseList(TransportationEnterprise enterprise);
 }
 package com.trash.garbage.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.trash.garbage.pojo.domain.GarOrderEvaluate;
 import com.trash.garbage.service.GarOrderEvaluateService;
 import com.trash.garbage.mapper.GarOrderEvaluateMapper;
 import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
 * @author 20412
 * @description 针对表【gar_order_evaluate(建筑垃圾-派单评分)】的数据库操作Service实现
@@ -15,6 +19,13 @@ import org.springframework.stereotype.Service;
 public class GarOrderEvaluateServiceImpl extends ServiceImpl<GarOrderEvaluateMapper, GarOrderEvaluate>
     implements GarOrderEvaluateService{
+    @Override
+    public List<GarOrderEvaluate> queryEvaluateByEnterpriseIds(List<Long> enterpriseIds, Integer value) {
+        if (CollectionUtil.isEmpty(enterpriseIds)){
+            return new ArrayList<>();
+        }
+        return baseMapper.queryEvaluateByEnterpriseIds(enterpriseIds,value);
+    }
 }
 package com.trash.garbage.service.impl;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.stream.Collectors;
 import com.trash.enterprise.domain.TransportationEnterprise;
 import com.trash.enterprise.service.ITransportationEnterpriseService;
 import com.trash.garbage.pojo.dto.*;
+import com.trash.garbage.pojo.vo.TransportationEnterpriseVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -50,6 +49,9 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     private GarOrderImageService garOrderImageService;
     @Autowired
+    private ITransportationEnterpriseService transportationEnterpriseService;
+
+    @Autowired
     private GarOrderEvaluateService garOrderEvaluateService;
     @Autowired
@@ -321,12 +323,67 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         return vo;
     }
+    @Override
+    public PageInfo queryEnterpriseList(TransportationEnterprise enterprise) {
+        List<TransportationEnterprise> list = transportationEnterpriseService.selectTransportationEnterpriseList(enterprise);
+        long total = new PageInfo<>(list).getTotal();
+        List<Long> enterpriseIds = list.stream().map(TransportationEnterprise::getId).collect(Collectors.toList());
+        List<GarOrder> orderList = baseMapper.queryCleanNumberByEnterpriseIds(enterpriseIds, GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue());
+        List<GarOrderEvaluate> evaluateList = garOrderEvaluateService.queryEvaluateByEnterpriseIds(enterpriseIds, GlobalStatus.GarOrderStatus.EVALUATE_TYPE_COMPANY.getValue());
+        Map<String, List<GarOrderEvaluate>> evaluateMap = new HashMap<>();
+        for (GarOrderEvaluate garOrderEvaluate : evaluateList) {
+            List<GarOrderEvaluate> evaluate = evaluateMap.get(garOrderEvaluate.getGarCompanyId());
+            if (CollectionUtil.isEmpty(evaluate)) {
+                evaluateMap.put(garOrderEvaluate.getGarCompanyId(), new ArrayList<>(Arrays.asList(garOrderEvaluate)));
+            } else {
+                evaluate.add(garOrderEvaluate);
+            }
+        }
+
+        List<TransportationEnterpriseVo> voList = list.stream().map(item -> {
+                    TransportationEnterpriseVo vo = new TransportationEnterpriseVo();
+                    BeanUtils.copyProperties(item, vo);
+                    List<GarOrderEvaluate> evaluate = evaluateMap.get(String.valueOf(item.getId()));
+                    handleCleanNumber(vo, orderList);
+                    handleScore(vo, evaluate);
+                    return vo;
+                })
+                .collect(Collectors.toList());
+        PageInfo<TransportationEnterpriseVo> pageInfo = new PageInfo<>();
+        pageInfo.setList(voList);
+        pageInfo.setTotal(total);
+        return pageInfo;
+    }
+
+    private void handleCleanNumber(TransportationEnterpriseVo vo, List<GarOrder> orderList) {
+        Long cleanNumber = 0L;
+        for (GarOrder order : orderList) {
+            if (vo.getId().toString().equals(order.getGarOrderCompanyId())) {
+                cleanNumber = order.getCount();
+            }
+        }
+        vo.setCleanNumber(cleanNumber.intValue());
+    }
+
+    private void handleScore(TransportationEnterpriseVo vo, List<GarOrderEvaluate> evaluate) {
+        int score = 0;
+        if (CollectionUtil.isNotEmpty(evaluate)) {
+            for (GarOrderEvaluate orderEvaluate : evaluate) {
+                score += orderEvaluate.getGarEvaluateScore();
+            }
+            vo.setScore(score / evaluate.size());
+        } else {
+            vo.setScore(score);
+        }
+    }
+
     private void evaluate(EvaluateDto dto, GarOrder order, GarUser user) {
         GarOrderEvaluate evaluate = new GarOrderEvaluate();
         evaluate.setGarOrderId(order.getGarOrderId());
         evaluate.setGarEvaluateContent(dto.getContent());
         evaluate.setGarEvaluateScore(dto.getScore());
         evaluate.setGarCompanyId(order.getGarOrderCompanyId());
+        evaluate.setGarEvaluateTarget(dto.getEvaluateType());
         garOrderEvaluateService.save(evaluate);
         // 修改订单评价状态
         LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();
@@ -5,21 +5,35 @@
 <mapper namespace="com.trash.garbage.mapper.GarOrderEvaluateMapper">
     <resultMap id="BaseResultMap" type="com.trash.garbage.pojo.domain.GarOrderEvaluate">
-            <id property="garEvaluateId" column="gar_evaluate_id" jdbcType="VARCHAR"/>
-            <result property="garEvaluateContent" column="gar_evaluate_content" jdbcType="VARCHAR"/>
-            <result property="garOrderId" column="gar_order_id" jdbcType="VARCHAR"/>
-            <result property="garEvaluateScore" column="gar_evaluate_score" jdbcType="TINYINT"/>
-            <result property="garUpdateBy" column="gar_update_by" jdbcType="VARCHAR"/>
-            <result property="garCreateBy" column="gar_create_by" jdbcType="VARCHAR"/>
-            <result property="garUpdateTime" column="gar_update_time" jdbcType="TIMESTAMP"/>
-            <result property="garCreateTime" column="gar_create_time" jdbcType="TIMESTAMP"/>
-            <result property="garRemark" column="gar_remark" jdbcType="VARCHAR"/>
-            <result property="garCompanyId" column="gar_company_id" jdbcType="VARCHAR"/>
+        <id property="garEvaluateId" column="gar_evaluate_id" jdbcType="VARCHAR"/>
+        <result property="garEvaluateContent" column="gar_evaluate_content" jdbcType="VARCHAR"/>
+        <result property="garOrderId" column="gar_order_id" jdbcType="VARCHAR"/>
+        <result property="garEvaluateScore" column="gar_evaluate_score" jdbcType="TINYINT"/>
+        <result property="garEvaluateTarget" column="gar_evaluate_target" jdbcType="TINYINT"/>
+        <result property="garUpdateBy" column="gar_update_by" jdbcType="VARCHAR"/>
+        <result property="garCreateBy" column="gar_create_by" jdbcType="VARCHAR"/>
+        <result property="garUpdateTime" column="gar_update_time" jdbcType="TIMESTAMP"/>
+        <result property="garCreateTime" column="gar_create_time" jdbcType="TIMESTAMP"/>
+        <result property="garRemark" column="gar_remark" jdbcType="VARCHAR"/>
+        <result property="garCompanyId" column="gar_company_id" jdbcType="VARCHAR"/>
     </resultMap>
     <sql id="Base_Column_List">
-        gar_evaluate_id,gar_evaluate_content,gar_evaluate_score,
+        gar_evaluate_id
+        ,gar_evaluate_content,gar_evaluate_score,
         gar_update_by,gar_create_by,gar_update_time,
-        gar_create_time,gar_remark,gar_order_id,gar_company_id
+        gar_create_time,gar_remark,gar_order_id,gar_company_id,gar_evaluate_target
     </sql>
+    <select id="queryEvaluateByEnterpriseIds" resultType="com.trash.garbage.pojo.domain.GarOrderEvaluate">
+        select
+        <include refid="Base_Column_List"></include>
+        from gar_order_evaluate
+        where gar_evaluate_target = #{type}
+        and gar_create_time &gt;= date_sub(curdate(), interval 1 month)
+        and gar_create_time &lt;= DATE_FORMAT(NOW(),'%Y-%m-%d 23:59:59')
+        and gar_company_id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </select>
 </mapper>
@@ -41,4 +41,14 @@
         gar_create_by,gar_update_by,gar_remark,gar_reason,gar_cancel_flag,
         gar_evaluate_flag,gar_order_car_number,gar_order_car_type,gar_handler_evaluate_flag
     </sql>
+    <select id="queryCleanNumberByEnterpriseIds" resultType="com.trash.garbage.pojo.domain.GarOrder">
+        select gar_order_company_id, count(gar_order_company_id) as count
+        from gar_order
+        where gar_order_handler_status = #{status}
+        and gar_order_company_id in
+        <foreach collection="list" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        group by gar_order_company_id
+    </select>
 </mapper>