修改

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/DriverInfoController.java

@@ -90,5 +90,15 @@ public class DriverInfoController {
     public DistinguishView bankShibie (String bankImg){
         return EntityAnalyse.bankShibie(bankImg);
     }
+
+    /**
+     * 司机详情
+     * @param driverInfo
+     * @return
+     */
+    @GetMapping("/getDriver")
+    DriverInfo getDriver(DriverInfo driverInfo){
+        return driverInfoService.getDriver(driverInfo);
+    }
 }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/OrderInfoController.java

@@ -68,12 +68,15 @@ public class OrderInfoController {
     public OrderInfo getOrderInfo(@RequestParam String id) {
         return orderInfoService.getOrderInfo(id);
     }
+
     /**
-     * haopinglv
+     * 订单货主/司机详情，好评率
+     * @param
+     * @return
      */
     @GetMapping("/selectHaoPing")
-    public OrderInfo selectHaoPing(@RequestParam String commonId) {
-        return orderInfoService.selectHaoPing(commonId);
+    public OrderInfo selectHaoPing(@RequestParam String commonId,String evaluateFlag) {
+        return orderInfoService.selectHaoPing(commonId,evaluateFlag);
     }
 
     /**

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

@@ -121,16 +121,19 @@ public class EvaluateInfo extends BaseModel<EvaluateInfo> {
      * 货主头像
      */
     private String ownerPortrait;
+
     /**
-     * 标识（1评价记录2货主评价）
+     * 标识（1评价记录2货主（司机）评价）
      */
     @TableField(exist = false)
     private String flag;
+
     /**
-     * 查询类型
+     * 1司机2货主
      */
     @TableField(exist = false)
     private String searchType;
+
     /**
      * 模糊查询
      */
@@ -144,22 +147,23 @@ public class EvaluateInfo extends BaseModel<EvaluateInfo> {
     private OrderInfo orderInfo;
 
     /**
-     * 标识（1hao2cha）
+     * 标识（1好2差）
      */
     @TableField(exist = false)
     private String haoType;
 
     /**
-     * haopingshu
+     * 好评数
      */
     @TableField(exist = false)
     private String haoCount;
 
     /**
-     * chapingshu
+     * 差评数
      */
     @TableField(exist = false)
     private String chaCount;
+
     @Override
     protected Serializable pkVal() {
         return this.id;

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

@@ -430,11 +430,19 @@ public class OrderInfo extends BaseModel<OrderInfo> {
      */
     @TableField(exist = false)
     private String carNumber;
+
     /**
      * 调用类型：1货主 2 司机
      */
     @TableField(exist = false)
     private String typeFlag;
+    
+    /**
+     * 评价标识(1司机2货主)
+     */
+    @TableField(exist = false)
+    private String evaluateFlag;
+
     @Override
     protected Serializable pkVal() {
         return this.id;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IDriverInfoService.java

@@ -45,5 +45,11 @@ public interface IDriverInfoService extends IService<DriverInfo> {
 
     Page<DriverInfo> selectDriverInfoPage(DriverInfo driverViewInfo);
 
+    /**
+     * 司机详情
+     * @param  driverInfo
+     * @return
+     */
+    DriverInfo getDriver(DriverInfo driverInfo);
 
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IOrderInfoService.java

@@ -86,7 +86,12 @@ public interface IOrderInfoService extends IService<OrderInfo> {
      */
     String examine(OrderInfo orderInfo);
 
-    OrderInfo selectHaoPing(String commonId);
+    /**
+     * 订单货主/司机详情，好评率
+     * @param
+     * @return
+     */
+    OrderInfo selectHaoPing(String commonId,String evaluateFlag);
 
     /**
      * 司机签合同

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

@@ -11,11 +11,8 @@ import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
 import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.DriverInfoMapper;
-import com.yh.saas.plugin.yiliangyiyun.service.IDriverCarInfoService;
-import com.yh.saas.plugin.yiliangyiyun.service.IDriverInfoService;
+import com.yh.saas.plugin.yiliangyiyun.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.yh.saas.plugin.yiliangyiyun.service.IDriverPayeeInfoService;
-import com.yh.saas.plugin.yiliangyiyun.service.INewsInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -43,7 +40,8 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, DriverI
     private IDriverPayeeInfoService driverPayeeInfoService;
     @Autowired
     private INewsInfoService newsInfoService;
-
+    @Autowired
+    private ICommonUserService commonUserService;
 
 
     /**
@@ -264,4 +262,29 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, DriverI
         return "NG";
     }
 
+    /**
+     * 司机详情
+     * @param  driverInfo
+     * @return
+     */
+    @Override
+    public DriverInfo getDriver(DriverInfo driverInfo){
+        //查询司机信息
+        DriverInfo driverInfo1 = this.selectOne(new EntityWrapper<DriverInfo>().eq("common_id",driverInfo.getCommonId())
+                .eq("delete_flag","0"));
+        //头像
+        CommonUser commonUser = commonUserService.selectOne(new EntityWrapper<CommonUser>().eq("id",driverInfo.getCommonId())
+                .eq("delete_flag","0"));
+        if (commonUser != null){
+            driverInfo1.setAvatarUrl(commonUser.getAvatarUrl());
+        }
+        //查询货主信息
+        List<DriverCarInfo> driverCarInfos = driverCarInfoService.selectList(new EntityWrapper<DriverCarInfo>().eq("driver_id",driverInfo1.getId())
+                .eq("delete_flag","0"));
+        if (!CollectionUtils.isEmpty(driverCarInfos)){
+            driverInfo1.setDriverCarInfoList(driverCarInfos);
+        }
+        return driverInfo1;
+    }
+
 }

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

@@ -74,18 +74,23 @@ public class EvaluateInfoServiceImpl extends ServiceImpl<EvaluateInfoMapper, Eva
         Integer dataCount = baseMapper.getCountByCondition(pageView);
         List<EvaluateInfo> dataList = baseMapper.getListByCondition(pageView);
 
-        Map<String, Object> pageView1 = new HashMap<>(12);
+        //查询好评数
+        Map<String, Object> pageView1 = new HashMap<>(7);
         pageView.put("evaluatorId", evaluateInfo.getEvaluatorId());
         pageView.put("evaluatoredId", evaluateInfo.getEvaluatoredId());
         pageView1.put("haoType", "1");
+        pageView.put("searchType", evaluateInfo.getSearchType());
         pageView1.put("flag", evaluateInfo.getFlag());
         Integer dataCount1 = baseMapper.getCountByCondition(pageView);
-        Map<String, Object> pageView2 = new HashMap<>(12);
+        //查询差评数
+        Map<String, Object> pageView2 = new HashMap<>(7);
         pageView.put("evaluatorId", evaluateInfo.getEvaluatorId());
         pageView.put("evaluatoredId", evaluateInfo.getEvaluatoredId());
         pageView2.put("haoType", "2");
+        pageView.put("searchType", evaluateInfo.getSearchType());
         pageView2.put("flag", evaluateInfo.getFlag());
         Integer dataCount2 = baseMapper.getCountByCondition(pageView);
+
         if(CollectionUtil.isNotEmpty(dataList)){
             for(int i =0 ;i<dataList.size();i++){
                 EvaluateInfo evaluateInfo1= dataList.get(i);
@@ -94,7 +99,7 @@ public class EvaluateInfoServiceImpl extends ServiceImpl<EvaluateInfoMapper, Eva
                 evaluateInfo1.setChaCount(String.valueOf(dataCount2));
 
                 CommonUser commonUser1 = commonUserService.selectOne(new EntityWrapper<CommonUser>()
-                        .eq("id", dataList.get(i).getEvaluatoredId()));
+                        .eq("id", dataList.get(i).getEvaluatorId()));
                 if (commonUser1 != null) {
                     evaluateInfo1.setOwnerPortrait(commonUser1.getAvatarUrl());
                 }

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

@@ -146,76 +146,131 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
 
 
     /**
-     * 订
-     *
+     * 订单货主/司机详情，好评率
      * @param
      * @return
      */
     @Override
-    public OrderInfo selectHaoPing(String commonId) {
+    public OrderInfo selectHaoPing(String commonId,String evaluateFlag) {
         OrderInfo orderInfo = new OrderInfo();
-        Integer count = this.selectCount(new EntityWrapper<OrderInfo>()
-                .eq("common_id", commonId));
-        String  hao = "";
-        Integer  zong =0;
-        if(count == 0){
-             count = this.selectCount(new EntityWrapper<OrderInfo>()
-                    .eq("cargo_common_id", commonId));
+        String hao = "";
+        Integer zong = 0;
+        if ("1".equals(evaluateFlag)){
+            //查询司机发运次数
+            Integer count = this.selectCount(new EntityWrapper<OrderInfo>()
+                    .eq("common_id", commonId).eq("order_status_key","25").eq("delete_flag","0"));
+            orderInfo.setCountFa(String.valueOf(count));
+
             Integer evaluateInfoCount = evaluateInfoService.selectCount(new EntityWrapper<EvaluateInfo>()
                     .eq("satisfaction", "5")
-            .eq("owner_id",commonId));
+                    .eq("evaluatored_id", commonId));
             orderInfo.setHaoPing(evaluateInfoCount);
             Integer evaluateInfoCount1 = evaluateInfoService.selectCount(new EntityWrapper<EvaluateInfo>()
                     .eq("satisfaction", "1")
-                    .eq("owner_id",commonId));
+                    .eq("evaluatored_id", commonId));
             orderInfo.setChaPing(evaluateInfoCount1);
             if (evaluateInfoCount >= 20 && count != 0) {
-                hao = String.valueOf(evaluateInfoCount/count*100+"%");
+                hao = String.valueOf(evaluateInfoCount / count * 100 + "%");
             }
+
             List<EvaluateInfo> evaluateInfos = evaluateInfoService.selectList(new EntityWrapper<EvaluateInfo>()
-            .eq("owner_id",commonId));
-            if(CollectionUtil.isNotEmpty(evaluateInfos)){
+                    .eq("evaluatored_id", commonId));
+            if (CollectionUtil.isNotEmpty(evaluateInfos)) {
                 int fen = 0;
-                for(int i=0;i<evaluateInfos.size();i++){
-
-                    fen = fen+Integer.parseInt(evaluateInfos.get(i).getComprehensiveSatisfaction());
+                for (int i = 0; i < evaluateInfos.size(); i++) {
+                    fen = fen + Integer.parseInt(evaluateInfos.get(i).getComprehensiveSatisfaction());
                 }
-                if(fen!= 0){
-                    zong=fen/(evaluateInfos.size()*5);
+                if (fen != 0) {
+                    zong = fen / (evaluateInfos.size() * 5);
                 }
             }
-        }
-        else{
+        }else {
+            Integer count = this.selectCount(new EntityWrapper<OrderInfo>()
+                    .eq("cargo_common_id", commonId).eq("cargo_owner_status_key","31").eq("delete_flag","0"));
+            orderInfo.setCountFa(String.valueOf(count));
+
             Integer evaluateInfoCount = evaluateInfoService.selectCount(new EntityWrapper<EvaluateInfo>()
                     .eq("satisfaction", "5")
-                     .eq("driver_id",commonId));
+                    .eq("evaluatored_id", commonId));
             orderInfo.setHaoPing(evaluateInfoCount);
             Integer evaluateInfoCount1 = evaluateInfoService.selectCount(new EntityWrapper<EvaluateInfo>()
                     .eq("satisfaction", "1")
-                    .eq("driver_id",commonId));
+                    .eq("evaluatored_id", commonId));
             orderInfo.setChaPing(evaluateInfoCount1);
             if (evaluateInfoCount >= 20 && count != 0) {
-                hao = String.valueOf(evaluateInfoCount/count*100+"%");
+                hao = String.valueOf(evaluateInfoCount / count * 100 + "%");
             }
             List<EvaluateInfo> evaluateInfos = evaluateInfoService.selectList(new EntityWrapper<EvaluateInfo>()
-                    .eq("driver_id",commonId));
-            if(CollectionUtil.isNotEmpty(evaluateInfos)){
+                    .eq("evaluatored_id", commonId));
+            if (CollectionUtil.isNotEmpty(evaluateInfos)) {
                 int fen = 0;
-                for(int i=0;i<evaluateInfos.size();i++){
-
-                    fen = fen+Integer.parseInt(evaluateInfos.get(i).getComprehensiveSatisfaction());
+                for (int i = 0; i < evaluateInfos.size(); i++) {
+                    fen = fen + Integer.parseInt(evaluateInfos.get(i).getComprehensiveSatisfaction());
                 }
-                if(fen!= 0){
-                    zong=fen/(evaluateInfos.size()*5);
+                if (fen != 0) {
+                    zong = fen / (evaluateInfos.size() * 5);
                 }
             }
         }
-        orderInfo.setCountFa(String.valueOf(count));
         orderInfo.setHaoPingLv(hao);
         orderInfo.setZong(zong);
         return orderInfo;
     }
 
+//        if(count == 0){
+//             count = this.selectCount(new EntityWrapper<OrderInfo>()
+//                    .eq("cargo_common_id", commonId));
+//            Integer evaluateInfoCount = evaluateInfoService.selectCount(new EntityWrapper<EvaluateInfo>()
+//                    .eq("satisfaction", "5")
+//            .eq("owner_id",commonId));
+//            orderInfo.setHaoPing(evaluateInfoCount);
+//            Integer evaluateInfoCount1 = evaluateInfoService.selectCount(new EntityWrapper<EvaluateInfo>()
+//                    .eq("satisfaction", "1")
+//                    .eq("owner_id",commonId));
+//            orderInfo.setChaPing(evaluateInfoCount1);
+//            if (evaluateInfoCount >= 20 && count != 0) {
+//                hao = String.valueOf(evaluateInfoCount/count*100+"%");
+//            }
+//            List<EvaluateInfo> evaluateInfos = evaluateInfoService.selectList(new EntityWrapper<EvaluateInfo>()
+//            .eq("owner_id",commonId));
+//            if(CollectionUtil.isNotEmpty(evaluateInfos)){
+//                int fen = 0;
+//                for(int i=0;i<evaluateInfos.size();i++){
+//
+//                    fen = fen+Integer.parseInt(evaluateInfos.get(i).getComprehensiveSatisfaction());
+//                }
+//                if(fen!= 0){
+//                    zong=fen/(evaluateInfos.size()*5);
+//                }
+//            }
+//        }
+//        else{
+//            Integer evaluateInfoCount = evaluateInfoService.selectCount(new EntityWrapper<EvaluateInfo>()
+//                    .eq("satisfaction", "5")
+//                     .eq("driver_id",commonId));
+//            orderInfo.setHaoPing(evaluateInfoCount);
+//            Integer evaluateInfoCount1 = evaluateInfoService.selectCount(new EntityWrapper<EvaluateInfo>()
+//                    .eq("satisfaction", "1")
+//                    .eq("driver_id",commonId));
+//            orderInfo.setChaPing(evaluateInfoCount1);
+//            if (evaluateInfoCount >= 20 && count != 0) {
+//                hao = String.valueOf(evaluateInfoCount/count*100+"%");
+//            }
+//            List<EvaluateInfo> evaluateInfos = evaluateInfoService.selectList(new EntityWrapper<EvaluateInfo>()
+//                    .eq("driver_id",commonId));
+//            if(CollectionUtil.isNotEmpty(evaluateInfos)){
+//                int fen = 0;
+//                for(int i=0;i<evaluateInfos.size();i++){
+//
+//                    fen = fen+Integer.parseInt(evaluateInfos.get(i).getComprehensiveSatisfaction());
+//                }
+//                if(fen!= 0){
+//                    zong=fen/(evaluateInfos.size()*5);
+//                }
+//            }
+//        }
+
+
     /**
      * 订单详情
      *

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/EvaluateInfoMapper.xml

@@ -9,10 +9,20 @@
         WHERE
         delete_flag = '0'
         <if test="haoType == 1">
-            AND satisfaction >= 4
+            <if test="searchType == 1">
+                AND satisfaction >= 4
+            </if>
+            <if test="searchType == 2">
+                AND comprehensive_satisfaction >= 4
+            </if>
         </if>
         <if test="haoType == 2">
-            AND satisfaction = 1
+            <if test="searchType == 1">
+                AND satisfaction = 1
+            </if>
+            <if test="searchType == 2">
+                AND comprehensive_satisfaction = 1
+            </if>
         </if>
         <if test="flag == 1">
             <if test="evaluatorId != null and evaluatorId != ''">
@@ -61,12 +71,21 @@
         WHERE
         delete_flag = '0'
         <if test="haoType == 1">
-            AND satisfaction >= 4
+            <if test="searchType == 1">
+                AND satisfaction >= 4
+            </if>
+            <if test="searchType == 2">
+                AND comprehensive_satisfaction >= 4
+            </if>
         </if>
         <if test="haoType == 2">
-            AND satisfaction = 1
+            <if test="searchType == 1">
+                AND satisfaction = 1
+            </if>
+            <if test="searchType == 2">
+                AND comprehensive_satisfaction = 1
+            </if>
         </if>
-
         <if test="flag == 1">
             <if test="evaluatorId != null and evaluatorId != ''">
                 AND evaluator_id = #{evaluatorId}