feat: 薪资范围问题

src/com/engine/salary/mapper/salarybill/SalarySendRangeObjMapper.java

@@ -1,10 +1,10 @@
 package com.engine.salary.mapper.salarybill;
 
 import com.engine.salary.entity.salaryBill.po.SalarySendRangeObj;
-import java.util.Date;
-import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface SalarySendRangeObjMapper {
     int deleteByPrimaryKey(Long id);
 
@@ -16,7 +16,9 @@ public interface SalarySendRangeObjMapper {
 
     List<SalarySendRangeObj> selectByAll(SalarySendRangeObj salarySendRangeObj);
 
-    List<SalarySendRangeObj> selectBySalarySendIdAndSalarySendRangeId(@Param("salarySendId") Long salarySendId, @Param("salarySendRangeId") Long salarySendRangeId);
+    List<SalarySendRangeObj> selectBySalarySendIdAndSalarySendRangeId(@Param("salarySendId") Long salarySendId,
+                                                                      @Param("salarySendRangeIds") List<Long> salarySendRangeId,
+                                                                      @Param("tenantKey") String tenantKey);
 
     int updateBatchSelective(List<SalarySendRangeObj> list);
 

src/com/engine/salary/mapper/salarybill/SalarySendRangeObjMapper.xml

@@ -187,12 +187,15 @@
     </select>
 
   <select id="selectBySalarySendIdAndSalarySendRangeId" resultMap="BaseResultMap">
-        <!--@mbg.generated-->
         select
         <include refid="Base_Column_List"/>
         from hrsa_salary_send_range_obj
-        where salary_send_id=#{salarySendId,jdbcType=BIGINT} and
-        salary_send_range_id=#{salarySendRangeId,jdbcType=BIGINT}
+        where salary_send_id=#{salarySendId,jdbcType=BIGINT}
+        <if test="salarySendRangeIds != null and salarySendRangeIds.size() != 0">
+          <foreach collection="salarySendRangeIds" separator="," open=" and (" close=" )" item="salarySendRangeId">
+            salary_send_range_id=#{salarySendRangeId,jdbcType=BIGINT}
+          </foreach>
+        </if>
     </select>
 
   <update id="updateBatchSelective" parameterType="java.util.List">

src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml

@@ -32,7 +32,7 @@
         , t.creator
         , t.delete_type
         , t.tenant_key
-        , t.shared_type
+        , t.1】
         , t.tax_agent_ids
     </sql>
 

src/com/engine/salary/service/SalarySendRangeObjService.java

@@ -0,0 +1,60 @@
+package com.engine.salary.service;
+
+import com.engine.salary.entity.salaryBill.po.SalarySendRangeObj;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * @Description: 工资单发放撤回筛选范围对象
+ * @Author: LFC
+ */
+public interface SalarySendRangeObjService {
+
+    /**
+     * 根据名称和工资单发放id获取列表
+     *
+     * @param salarySendId
+     * @param rangeIds
+     * @param currentTenantKey
+     * @return
+     */
+    List<SalarySendRangeObj> listBySalarySendIdAndRangeIds(Long salarySendId, List<Long> rangeIds, String currentTenantKey);
+
+    /**
+     * 保存筛选范围对象
+     *
+     * @param listObj
+     * @param currentEmployeeId
+     * @param currentTenantKey
+     */
+    void batchInsert(List<SalarySendRangeObj> listObj, Long currentEmployeeId, String currentTenantKey);
+
+    /**
+     * 根据工资饭发放id删除
+     *
+     * @param salarySendIds
+     * @param currentTenantKey
+     */
+    void deleteBySalarySendIds(Collection<Long> salarySendIds, String currentTenantKey);
+
+    /**
+     * 根据范围id删除
+     *
+     * @param rangeIds
+     * @param currentEmployeeId
+     * @param currentTenantKey
+     */
+    void deleteByRangeIds(Collection<Long> rangeIds, Long currentEmployeeId, String currentTenantKey);
+
+    /**
+     * 根据发放id和范围id获取发放信息id
+     *
+     * @param salarySendId
+     * @param rangeIds
+     * @param employeeId
+     * @param tenantKey
+     * @return
+     */
+    List<Long> getSendInfoIdsBySalarySendIdAndRangeIds(Long salarySendId, List<Long> rangeIds, Long employeeId, String tenantKey);
+}

src/com/engine/salary/service/impl/SalarySendRangeObjServiceImpl.java

@@ -0,0 +1,54 @@
+package com.engine.salary.service.impl;
+
+import com.engine.core.impl.Service;
+import com.engine.salary.entity.salaryBill.po.SalarySendRangeObj;
+import com.engine.salary.mapper.salarybill.SalarySendRangeObjMapper;
+import com.engine.salary.service.SalarySendRangeObjService;
+import org.apache.ibatis.session.SqlSession;
+import weaver.conn.mybatis.MyBatisFactory;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Function;
+
+public class SalarySendRangeObjServiceImpl extends Service implements SalarySendRangeObjService {
+
+    private <R> R runSalarySendRangeObjMapper(Function<SalarySendRangeObjMapper, R> mapper) {
+        try (SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession()){
+            final SalarySendRangeObjMapper salarySendRangeObjMapper  = sqlSession.getMapper(SalarySendRangeObjMapper.class);
+            return mapper.apply(salarySendRangeObjMapper);
+        }
+    }
+
+    @Override
+    public List<SalarySendRangeObj> listBySalarySendIdAndRangeIds(Long salarySendId, List<Long> rangeIds, String currentTenantKey) {
+        if (salarySendId == null) {
+            return Collections.emptyList();
+        }
+        runSalarySendRangeObjMapper(mapper->
+                mapper.selectBySalarySendIdAndSalarySendRangeId(salarySendId, rangeIds, currentTenantKey)
+        );
+        return null;
+    }
+
+    @Override
+    public void batchInsert(List<SalarySendRangeObj> listObj, Long currentEmployeeId, String currentTenantKey) {
+
+    }
+
+    @Override
+    public void deleteBySalarySendIds(Collection<Long> salarySendIds, String currentTenantKey) {
+
+    }
+
+    @Override
+    public void deleteByRangeIds(Collection<Long> rangeIds, Long currentEmployeeId, String currentTenantKey) {
+
+    }
+
+    @Override
+    public List<Long> getSendInfoIdsBySalarySendIdAndRangeIds(Long salarySendId, List<Long> rangeIds, Long employeeId, String tenantKey) {
+        return null;
+    }
+}

src/com/engine/salary/service/impl/SalarySendRangeServiceImpl.java

@@ -0,0 +1,43 @@
+package com.engine.salary.service.impl;
+
+import com.engine.core.impl.Service;
+import com.engine.salary.service.SalarySendRangeService;
+
+import java.util.Collection;
+
+public class SalarySendRangeServiceImpl extends Service implements SalarySendRangeService {
+    @Override
+    public void save() {
+
+    }
+
+    @Override
+    public void listPage() {
+
+    }
+
+    @Override
+    public void listDTO() {
+
+    }
+
+    @Override
+    public void listByIds() {
+
+    }
+
+    @Override
+    public void getById(Long id) {
+
+    }
+
+    @Override
+    public void deleteBySalarySendIds(Collection<Long> sendIds) {
+
+    }
+
+    @Override
+    public void getSendInfoIdsBySendId(Collection<Long> sendIds) {
+
+    }
+}