用户端代码提交

pz-system/src/main/java/com/pz/merchant/service/impl/EmployeesServiceImpl.java

@@ -238,19 +238,21 @@ public class EmployeesServiceImpl implements IEmployeesService {
     @Override
     public EmployeesVo queryByApp(Integer id) {
         EmployeesVo employeesVo = baseMapper.selectEmployeesById(id);
-        List<TotalOrderVo> totalOrder = totalOrderMapper.selectVoList(Wrappers.<TotalOrder>lambdaQuery()
-            .eq(TotalOrder::getEmId, employeesVo.getId())
-            .eq(TotalOrder::getIsSatisfaction, 1)
-            .orderByDesc(TotalOrder::getId));
-        if(null != totalOrder && totalOrder.size() != 0){
-            for (TotalOrderVo order : totalOrder) {
-                BusinessVo businessVo = businessMapper.selectVoOne(new LambdaQueryWrapper<Business>().eq(Business::getId, order.getBusinessId()));
-                if (null != businessVo) {
-                    order.setProject(businessVo.getName());
+        if(null != employeesVo){
+            List<TotalOrderVo> totalOrder = totalOrderMapper.selectVoList(Wrappers.<TotalOrder>lambdaQuery()
+                .eq(TotalOrder::getEmId, employeesVo.getId())
+                .eq(TotalOrder::getIsSatisfaction, 1)
+                .orderByDesc(TotalOrder::getId));
+            if(null != totalOrder && totalOrder.size() != 0){
+                for (TotalOrderVo order : totalOrder) {
+                    BusinessVo businessVo = businessMapper.selectVoOne(new LambdaQueryWrapper<Business>().eq(Business::getId, order.getBusinessId()));
+                    if (null != businessVo) {
+                        order.setProject(businessVo.getName());
+                    }
                 }
             }
+            employeesVo.setTotalOrderVo(totalOrder);
         }
-        employeesVo.setTotalOrderVo(totalOrder);
         return employeesVo;
     }
 

pz-system/src/main/resources/mapper/merchant/EmployeesMapper.xml

@@ -102,20 +102,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectEmployeesById" resultType="com.pz.merchant.domain.vo.EmployeesVo">
         SELECT e.id,
                s.avatar,
+               e.start_year,
+               e.working_hours,
                e.name,
                e.working_hours,
                ifnull(round((sum(if(o.is_satisfaction = 1, 1, 0)) / count(o.id)) * 100, 2), 0) AS satisfaction_rate
         FROM employees e
-                 INNER join total_order o on o.em_id = e.id
+                 left join total_order o on o.em_id = e.id
                  left join company c on c.id = e.company_id
                  left join sys_user s on s.user_id = e.uid
         WHERE e.`status` = 1
-          and e.now_type = 1
           and e.del_flag = 0
           and e.id = #{id}
         GROUP BY e.id,
                  e.`name`
-        HAVING satisfaction_rate >= #{favorableRate};
     </select>
 
     <select id="selectOrder" resultType="com.pz.merchant.domain.vo.OrderInfoVO">