账套

resource/sql/新增系统薪资项目.sql

@@ -14,4 +14,10 @@ INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_t
 INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655197430986, '累计大病医疗', 1655197430967, 'addUpDeductions_addUpIllnessMedical', '{累计专项附加扣除.累计大病医疗}', 'number', 'addUpDeductions', 0, 92, 0, '2022-06-14 17:03:51', '2022-06-14 17:03:51');
 
 
+INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (728615865977528321, 1, 705641858303836162, 1, 0, 0, '2022-05-31 17:36:04', '2022-05-31 17:36:04', 0, 'all_teams', 703433961629614103, 6);
+INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845567, 1, 733975748932845568, 1, 1, 0, '2022-06-14 14:52:53', '2022-06-14 14:52:53', 0, 'all_teams', 703433961629614083, 8);
+
+INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845569, 1, 674853617092214787, 1, 1, 0, '2022-06-14 14:52:53', '2022-06-14 14:52:53', 0, 'all_teams', 703433961629614083, 8);
+INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845572, 1, 674853617092214788, 1, 1, 0, '2022-06-14 14:52:53', '2022-06-14 14:52:53', 0, 'all_teams', 703433961629614083, 8);
+INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845578, 1, 674853617092214789, 1, 1, 0, '2022-06-14 14:52:53', '2022-06-14 14:52:53', 0, 'all_teams', 703433961629614083, 8);
 

src/com/engine/salary/biz/SalarySobBiz.java

@@ -73,4 +73,14 @@ public class SalarySobBiz {
             sqlSession.close();
         }
     }
+
+    public List<SalarySobPO> listByName(SalarySobPO build) {
+        SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
+        try {
+            SalarySobMapper mapper = sqlSession.getMapper(SalarySobMapper.class);
+            return mapper.listByName(build);
+        } finally {
+            sqlSession.close();
+        }
+    }
 }

src/com/engine/salary/mapper/salaryitem/SalaryItemMapper.xml

@@ -68,7 +68,7 @@
     <!-- 条件查询 -->
     <select id="listSome" resultMap="BaseResultMap" parameterType="com.engine.salary.entity.salaryitem.po.SalaryItemPO">
         SELECT
-        <include refid="baseColumns" />
+        <include refid="baseColumns"/>
         FROM hrsa_salary_item t
         WHERE delete_type = 0
         <if test="canEdit != null and canEdit != ''">
@@ -128,6 +128,12 @@
                 #{id}
             </foreach>
         </if>
+        <if test="sysSalaryItemIds != null and sysSalaryItemIds.size()>0">
+            AND sys_salary_item_id IN
+            <foreach collection="sysSalaryItemIds" open="(" item="id" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY id DESC
     </select>
 
@@ -330,43 +336,43 @@
 
     <insert id="batchInsert">
         INSERT INTO hrsa_salary_item
-        (id, name, code, system_type, sys_salary_item_id,   use_default, use_in_employee_salary,
+        (id, name, code, system_type, sys_salary_item_id, use_default, use_in_employee_salary,
         rounding_mode, pattern, value_type, formula_id, description, can_edit, create_time,
         update_time, creator, delete_type, tenant_key, data_type)
         VALUES
         <foreach collection="collection" item="item" separator=",">
             (#{item.id},#{item.name}, #{item.code}, #{item.systemType}, #{item.sysSalaryItemId},
-             #{item.useDefault}, #{item.useInEmployeeSalary}, #{item.roundingMode},
+            #{item.useDefault}, #{item.useInEmployeeSalary}, #{item.roundingMode},
             #{item.pattern},
-             #{item.valueType}, #{item.formulaId}, #{item.description}, #{item.canEdit},
+            #{item.valueType}, #{item.formulaId}, #{item.description}, #{item.canEdit},
             #{item.createTime}, #{item.updateTime}, #{item.creator}, 0, #{item.tenantKey}, #{item.dataType})
         </foreach>
     </insert>
     <insert id="batchInsert" databaseId="oracle">
         INSERT INTO hrsa_salary_item
-        (id,name, code, system_type, sys_salary_item_id,  use_default, use_in_employee_salary,
-        rounding_mode, pattern,  value_type, formula_id, description, can_edit, create_time,
+        (id,name, code, system_type, sys_salary_item_id, use_default, use_in_employee_salary,
+        rounding_mode, pattern, value_type, formula_id, description, can_edit, create_time,
         update_time, creator, delete_type, tenant_key, data_type)
 
         <foreach collection="collection" item="item" separator="union all">
             select #{item.id}, #{item.name}, #{item.code}, #{item.systemType}, #{item.sysSalaryItemId},
-             #{item.useDefault}, #{item.useInEmployeeSalary}, #{item.roundingMode},
+            #{item.useDefault}, #{item.useInEmployeeSalary}, #{item.roundingMode},
             #{item.pattern},
-             #{item.valueType}, #{item.formulaId}, #{item.description}, #{item.canEdit},
+            #{item.valueType}, #{item.formulaId}, #{item.description}, #{item.canEdit},
             #{item.createTime}, #{item.updateTime}, #{item.creator}, 0, #{item.tenantKey}, #{item.dataType} from dual
         </foreach>
     </insert>
     <insert id="batchInsert" databaseId="sqlserver">
         <foreach collection="collection" item="item" separator=";">
-        INSERT INTO hrsa_salary_item
-        (id,name, code, system_type, sys_salary_item_id,   use_default, use_in_employee_salary,
-        rounding_mode, pattern,  value_type, formula_id, description, can_edit, create_time,
-        update_time, creator, delete_type, tenant_key, data_type)
-        VALUES
+            INSERT INTO hrsa_salary_item
+            (id,name, code, system_type, sys_salary_item_id, use_default, use_in_employee_salary,
+            rounding_mode, pattern, value_type, formula_id, description, can_edit, create_time,
+            update_time, creator, delete_type, tenant_key, data_type)
+            VALUES
             (#{item.id},#{item.name}, #{item.code}, #{item.systemType}, #{item.sysSalaryItemId},
-             #{item.useDefault}, #{item.useInEmployeeSalary}, #{item.roundingMode},
+            #{item.useDefault}, #{item.useInEmployeeSalary}, #{item.roundingMode},
             #{item.pattern},
-             #{item.valueType}, #{item.formulaId}, #{item.description}, #{item.canEdit},
+            #{item.valueType}, #{item.formulaId}, #{item.description}, #{item.canEdit},
             #{item.createTime}, #{item.updateTime}, #{item.creator}, 0, #{item.tenantKey}, #{item.dataType})
         </foreach>
     </insert>

src/com/engine/salary/mapper/salarysob/SalarySobMapper.java

@@ -52,4 +52,5 @@ public interface SalarySobMapper {
 
     List<SalarySobPO> listByParam(@Param("param") SalarySobPO SalarySobPO);
 
+    List<SalarySobPO> listByName(SalarySobPO build);
 }

src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml

@@ -382,5 +382,16 @@
     </sql>
 
 
+    <select id="listByName" resultType="com.engine.salary.entity.salarysob.po.SalarySobPO">
+        SELECT
+        <include refid="baseColumns"/>
+        FROM
+        hrsa_salary_sob t
+        WHERE
+        delete_type = 0
+        and name = #{name}
+    </select>
+
+
 
 </mapper>

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

@@ -110,8 +110,8 @@ public class SalarySobServiceImpl extends Service implements SalarySobService {
         if (StringUtils.isEmpty(name)) {
             return Collections.emptyList();
         }
-        List<SalarySobPO> salarySobPOS = salarySobMapper.listSome(SalarySobPO.builder().name(name).build());
-        return filterByAuthority(salarySobPOS);
+        List<SalarySobPO> salarySobPOS = salarySobMapper.listByName(SalarySobPO.builder().name(name).build());
+        return salarySobPOS;
     }
 
     @Override