测试bug修改

ruoyi-pay/src/main/java/com/ruoyi/pay/service/IPayBaohuoEmployeeService.java

@@ -46,4 +46,6 @@ public interface IPayBaohuoEmployeeService {
      * 校验并批量删除包活工单员工关联信息
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<PayBaohuoEmployeeVo> queryList2(PayBaohuoEmployeeBo bhEmployee);
 }

ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayBaohuoEmployeeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.pay.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
@@ -57,6 +58,11 @@ public class PayBaohuoEmployeeServiceImpl implements IPayBaohuoEmployeeService {
         LambdaQueryWrapper<PayBaohuoEmployee> lqw = buildQueryWrapper(bo);
         return baseMapper.selectVoList(lqw);
     }
+    @Override
+    public List<PayBaohuoEmployeeVo> queryList2(PayBaohuoEmployeeBo bo) {
+        LambdaQueryWrapper<PayBaohuoEmployee> lqw = buildQueryWrapper2(bo);
+        return baseMapper.selectVoList(lqw);
+    }
 
     private LambdaQueryWrapper<PayBaohuoEmployee> buildQueryWrapper(PayBaohuoEmployeeBo bo) {
         Map<String, Object> params = bo.getParams();
@@ -72,6 +78,21 @@ public class PayBaohuoEmployeeServiceImpl implements IPayBaohuoEmployeeService {
         lqw.eq(bo.getIntime() != null, PayBaohuoEmployee::getIntime, bo.getIntime());
         return lqw;
     }
+    private LambdaQueryWrapper<PayBaohuoEmployee> buildQueryWrapper2(PayBaohuoEmployeeBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<PayBaohuoEmployee> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getTenantId() != null, PayBaohuoEmployee::getTenantId, bo.getTenantId());
+        lqw.eq(bo.getWoId() != null, PayBaohuoEmployee::getWoId, bo.getWoId());
+        lqw.eq(bo.getEmpId() != null, PayBaohuoEmployee::getEmpId, bo.getEmpId());
+        lqw.eq(bo.getDeptId() != null, PayBaohuoEmployee::getDeptId, bo.getDeptId());
+        lqw.like(StringUtils.isNotBlank(bo.getEmpName()), PayBaohuoEmployee::getEmpName, bo.getEmpName());
+        lqw.eq(bo.getAmount() != null, PayBaohuoEmployee::getAmount, bo.getAmount());
+        lqw.eq(StringUtils.isNotBlank(bo.getMonth()), PayBaohuoEmployee::getMonth, bo.getMonth());
+        lqw.eq(bo.getHelper() != null, PayBaohuoEmployee::getHelper, bo.getHelper());
+        lqw.apply(bo.getIntime()!= null, "DATE_FORMAT (intime,'%Y-%m')={0}", DateUtil.format(bo.getIntime(),"yyyy-MM"));
+        /*lqw.eq(bo.getIntime() != null, PayBaohuoEmployee::getIntime, bo.getIntime());*/
+        return lqw;
+    }
 
     /**
      * 新增包活工单员工关联

ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayBaohuoWorktimeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.pay.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
@@ -57,6 +58,10 @@ public class PayBaohuoWorktimeServiceImpl implements IPayBaohuoWorktimeService {
         LambdaQueryWrapper<PayBaohuoWorktime> lqw = buildQueryWrapper(bo);
         return baseMapper.selectVoList(lqw);
     }
+    public List<PayBaohuoWorktimeVo> queryList2(PayBaohuoWorktimeBo bo) {
+        LambdaQueryWrapper<PayBaohuoWorktime> lqw = buildQueryWrapper2(bo);
+        return baseMapper.selectVoList(lqw);
+    }
 
     private LambdaQueryWrapper<PayBaohuoWorktime> buildQueryWrapper(PayBaohuoWorktimeBo bo) {
         Map<String, Object> params = bo.getParams();
@@ -72,6 +77,21 @@ public class PayBaohuoWorktimeServiceImpl implements IPayBaohuoWorktimeService {
         lqw.eq(bo.getIntime() != null, PayBaohuoWorktime::getIntime, bo.getIntime());
         return lqw;
     }
+    private LambdaQueryWrapper<PayBaohuoWorktime> buildQueryWrapper2(PayBaohuoWorktimeBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<PayBaohuoWorktime> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getTenantId() != null, PayBaohuoWorktime::getTenantId, bo.getTenantId());
+        lqw.eq(bo.getWoId() != null, PayBaohuoWorktime::getWoId, bo.getWoId());
+        lqw.eq(bo.getEmpId() != null, PayBaohuoWorktime::getEmpId, bo.getEmpId());
+        lqw.eq(bo.getBheId() != null, PayBaohuoWorktime::getBheId, bo.getBheId());
+        lqw.eq(bo.getStime() != null, PayBaohuoWorktime::getStime, bo.getStime());
+        lqw.eq(bo.getEtime() != null, PayBaohuoWorktime::getEtime, bo.getEtime());
+        lqw.eq(bo.getValidHours() != null, PayBaohuoWorktime::getValidHours, bo.getValidHours());
+        lqw.apply(bo.getDate()!= null, "DATE_FORMAT (date,'%Y-%m')={0}", DateUtil.format(bo.getDate(),"yyyy-MM"));
+/*        lqw.eq(bo.getDate() != null, PayBaohuoWorktime::getDate, bo.getDate());*/
+        lqw.eq(bo.getIntime() != null, PayBaohuoWorktime::getIntime, bo.getIntime());
+        return lqw;
+    }
 
     /**
      * 新增包活工单工时关联

ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayWorkOrderCheckServiceImpl.java

@@ -56,7 +56,7 @@ public class PayWorkOrderCheckServiceImpl implements IPayWorkOrderCheckService {
         PayBaohuoWorktimeBo bhtime = new PayBaohuoWorktimeBo();
         bhtime.setEmpId(employeeInfo.getId());
         bhtime.setDate(yearMonth);
-        List<PayBaohuoWorktimeVo> bhtimes = bhworktimeService.queryList(bhtime);
+        List<PayBaohuoWorktimeVo> bhtimes = bhworktimeService.queryList2(bhtime);
 
         Collections.sort(bhtimes, new Comparator<PayBaohuoWorktimeVo>() {
             //按照工作日期排序
@@ -84,7 +84,7 @@ public class PayWorkOrderCheckServiceImpl implements IPayWorkOrderCheckService {
         bhEmployee.setEmpName(empName);
         bhEmployee.setIntime(yearMonth);
         bhEmployee.setTenantId(tenantId);
-        List<PayBaohuoEmployeeVo> bhEmployees = bhemployeeService.queryList(bhEmployee);
+        List<PayBaohuoEmployeeVo> bhEmployees = bhemployeeService.queryList2(bhEmployee);
         /*for(SgrBaohuoEmployee bhe:bhEmployees){
             if(bhe.getHelper()==0){
                 baohuogongzi = baohuogongzi.add(bhe.getAmount());
@@ -121,7 +121,7 @@ public class PayWorkOrderCheckServiceImpl implements IPayWorkOrderCheckService {
         bhEmployee.setEmpName(empName);
         bhEmployee.setIntime(yearMonth);
         bhEmployee.setTenantId(tenantId);
-        List<PayBaohuoEmployeeVo> bhEmployees = bhemployeeService.queryList(bhEmployee);
+        List<PayBaohuoEmployeeVo> bhEmployees = bhemployeeService.queryList2(bhEmployee);
         for(PayBaohuoEmployeeVo bhe:bhEmployees){
             if(bhe.getHelper()==0){
                 // baohuogongzi = baohuogongzi.add(bhe.getAmount());

ruoyi-ui/src/views/pay/employeeInfo/index.vue

@@ -82,7 +82,7 @@
             icon="el-icon-plus"
             size="mini"
             @click="handleAdd"
-            v-hasPermi="['secure:empinfo:add']"
+            v-hasPermi="['pay:employeeInfo:add']"
           >新增</el-button>
         </el-col>
         <el-col :span="1.5">
@@ -93,7 +93,7 @@
             size="mini"
             :disabled="single"
             @click="handleUpdate"
-            v-hasPermi="['secure:empinfo:edit']"
+            v-hasPermi="['pay:employeeInfo:edit']"
           >修改</el-button>
         </el-col>
         <el-col :span="1.5">
@@ -103,7 +103,7 @@
             icon="el-icon-download"
             size="mini"
             @click="handleExport"
-            v-hasPermi="['secure:empinfo:export']"
+            v-hasPermi="['pay:employeeInfo:export']"
           >导出</el-button>
         </el-col>
         <el-col :span="1.5">