包活工单接口修改

ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayWorkOrderBaohuoController.java

@@ -51,7 +51,14 @@ public class PayWorkOrderBaohuoController extends BaseController {
     @SaCheckPermission("pay:workOrderBaohuo:list")
     @GetMapping("/list")
     public TableDataInfo<PayWorkOrderBaohuoVo> list(PayWorkOrderBaohuoBo bo, PageQuery pageQuery) {
-
+        bo.setDeleted(0);
+        if (ObjectUtil.isNotNull(bo.getWorkDate()) || ObjectUtil.isNotNull(bo.getEmpId())) {
+            HashSet<Long> woids = iPayWorkOrderBaohuoService.getWoIdSet(bo.getWorkDate(), bo.getEmpId());
+            if (woids.isEmpty()) {
+                return TableDataInfo.build(new ArrayList<>());
+            }
+            bo.setWoids(new ArrayList<>(woids));
+        }
         return iPayWorkOrderBaohuoService.queryPageList(bo, pageQuery);
     }
 

ruoyi-pay/src/main/java/com/ruoyi/pay/mapper/PayWorkOrderBaohuoMapper.java

@@ -4,9 +4,11 @@ import com.ruoyi.pay.domain.PayWorkOrderBaohuo;
 import com.ruoyi.pay.domain.vo.PayWorkOrderBaohuoVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 
 /**
@@ -26,4 +28,6 @@ public interface PayWorkOrderBaohuoMapper extends BaseMapperPlus<PayWorkOrderBao
     void deleteAllWorkTimeByWoId(Long id);
 
     List<PayWorkOrderBaohuoVo> getWorkOrderListByDate(Date exportDate);
+
+    HashSet<Long> getWoIdSet(@Param("workDate")String workDate, @Param("empId") Long empId);
 }

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

@@ -10,6 +10,7 @@ import com.ruoyi.common.core.domain.PageQuery;
 
 import java.util.Collection;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 
 /**
@@ -53,4 +54,6 @@ public interface IPayWorkOrderBaohuoService {
     R<List<PaySalaryReport>> baohuoSum(String date, Long deptId,Long tenantId);
 
     List<PayWorkOrderBaohuoVo> getWorkOrderListByDate(Date exportDate);
+
+    HashSet<Long> getWoIdSet(String workDate, Long empId);
 }

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

@@ -104,6 +104,7 @@ public class PayWorkOrderBaohuoServiceImpl implements IPayWorkOrderBaohuoService
         lqw.eq(bo.getInstorageNum() != null, PayWorkOrderBaohuo::getInstorageNum, bo.getInstorageNum());
         lqw.like(StringUtils.isNotBlank(bo.getManagerName()), PayWorkOrderBaohuo::getManagerName, bo.getManagerName());
         lqw.eq(bo.getDeleted() != null, PayWorkOrderBaohuo::getDeleted, bo.getDeleted());
+        lqw.in(bo.getWoids()!=null&&bo.getWoids().size()>0,PayWorkOrderBaohuo::getId,bo.getWoids());
         return lqw;
     }
 
@@ -569,4 +570,9 @@ public class PayWorkOrderBaohuoServiceImpl implements IPayWorkOrderBaohuoService
     public List<PayWorkOrderBaohuoVo> getWorkOrderListByDate(Date exportDate) {
         return sgrWorkOrderBaohuoMapper.getWorkOrderListByDate(exportDate);
     }
+
+    @Override
+    public HashSet<Long> getWoIdSet(String workDate, Long empId) {
+        return baseMapper.getWoIdSet(workDate,empId);
+    }
 }

ruoyi-pay/src/main/resources/mapper/pay/PayWorkOrderBaohuoMapper.xml

@@ -58,4 +58,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE date_format(#{exportDate},'%y%m') = date_format(b.instorage_time,'%y%m')
         ORDER BY a.wo_id ASC
     </select>
+
+    <select id="getWoIdSet" resultType="java.lang.Long">
+        SELECT DISTINCT wo_id FROM sgr_baohuo_worktime
+        <where>
+            <if test="empId != null">
+                AND emp_id = #{empId}
+            </if>
+            <if test="workDate != null and workDate != ''">
+                AND date = #{workDate}
+            </if>
+
+        </where>
+    </select>
 </mapper>