From 5538a7d01eab983f4e1eeabf0bd738ec3b459e0f Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Mon, 18 Sep 2023 16:30:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E7=A6=8F?=
 =?UTF-8?q?=E5=88=A9=E6=96=B9=E6=A1=88=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sischeme/param/InsuranceSchemeParam.java  | 12 +++++++
 .../sischeme/InsuranceSchemeMapper.java       |  3 ++
 .../mapper/sischeme/InsuranceSchemeMapper.xml | 32 +++++++++++++++++++
 .../service/impl/SISchemeServiceImpl.java     |  7 ++--
 4 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/salary/entity/sischeme/param/InsuranceSchemeParam.java b/src/com/engine/salary/entity/sischeme/param/InsuranceSchemeParam.java
index aefe8063d..fd7deadb1 100644
--- a/src/com/engine/salary/entity/sischeme/param/InsuranceSchemeParam.java
+++ b/src/com/engine/salary/entity/sischeme/param/InsuranceSchemeParam.java
@@ -24,5 +24,17 @@ public class InsuranceSchemeParam extends BaseQueryParam {
 
     private WelfareTypeEnum welfareTypeEnum;
 
+    /**
+     * 方案名称
+     */
+    private String schemeName;
 
+    /**
+     * 缴纳类型
+     */
+    private Integer paymentType;
+    /**
+     * 福利类型
+     */
+    private Integer welfareType;
 }
diff --git a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.java b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.java
index 5ea511304..7403a8511 100644
--- a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.java
+++ b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.java
@@ -1,5 +1,6 @@
 package com.engine.salary.mapper.sischeme;
 
+import com.engine.salary.entity.sischeme.param.InsuranceSchemeParam;
 import com.engine.salary.entity.sischeme.po.InsuranceSchemePO;
 import org.apache.ibatis.annotations.Param;
 
@@ -61,6 +62,8 @@ public interface InsuranceSchemeMapper {
 
 
     List<InsuranceSchemePO> listByWelfareType(@Param("welfareType")Integer welfareType);
+    List<InsuranceSchemePO> list(InsuranceSchemeParam param);
+
 
     void deleteByIds(@Param("ids")Collection<Long> ids);
 }
diff --git a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml
index 9643d377d..d6a671a92 100644
--- a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml
+++ b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml
@@ -36,6 +36,22 @@
         , t.tax_agent_ids
     </sql>
 
+    <sql id="paramSql">
+        <!-- 关键字（方案名称） -->
+        <if test="schemeName != null and schemeName != ''">
+            AND scheme_name like CONCAT('%',#{schemeName},'%')
+        </if>
+    </sql>
+    <sql id="paramSql" databaseId="oracle">
+        <if test="schemeName != null and schemeName != ''">
+            AND scheme_name like '%'||#{schemeName}||'%'
+        </if>
+    </sql>
+    <sql id="paramSql" databaseId="sqlserver">
+        <if test="schemeName != null and schemeName != ''">
+            AND scheme_name like '%'+#{schemeName}+'%'
+        </if>
+    </sql>
 
     <!-- 根据主键获取单条记录 -->
     <select id="getById" resultMap="BaseResultMap" parameterType="Long">
@@ -175,6 +191,22 @@
         order by id desc
     </select>
 
+    <select id="list" resultMap="BaseResultMap">
+        SELECT
+        <include refid="baseColumns"/>
+        FROM hrsa_social_security_scheme t
+        WHERE t.delete_type = 0
+        <include refid="paramSql"/>
+        <if test="welfareType != null and welfareType != ''">
+            AND
+            t.welfare_type = #{welfareType}
+        </if>
+        <if test="paymentType != null">
+            AND
+            t.payment_type = #{paymentType}
+        </if>
+        order by id desc
+    </select>
 
     <update id="deleteByIds">
         UPDATE hrsa_social_security_scheme
diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java
index 81999f2db..44400f3c4 100644
--- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java
@@ -194,11 +194,13 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
     @Override
     public PageInfo<InsuranceSchemeListDTO> list(InsuranceSchemeParam queryParam) {
         SalaryAssert.notNull(queryParam.getWelfareTypeEnum(), SalaryI18nUtil.getI18nLabel(84026, "参数错误"));
+        queryParam.setWelfareType(queryParam.getWelfareTypeEnum().getValue());
         Long currentEmployeeId = (long) user.getUID();
         List<InsuranceSchemePO> insuranceSchemePOS;
         Boolean needAuth = getTaxAgentService().isNeedAuth(currentEmployeeId);
         if (needAuth) {
-            insuranceSchemePOS = getInsuranceSchemeMapper().listByWelfareType(queryParam.getWelfareTypeEnum().getValue());
+//            insuranceSchemePOS = getInsuranceSchemeMapper().listByWelfareType(queryParam.getWelfareTypeEnum().getValue());
+            insuranceSchemePOS = getInsuranceSchemeMapper().list(queryParam);
             Boolean isAdminEnable = getTaxAgentService().isAdminEnable((long) user.getUID());
             if (isAdminEnable) {
                 //管理员
@@ -217,7 +219,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
                 insuranceSchemePOS = new ArrayList<>();
             }
         } else {
-            insuranceSchemePOS = getInsuranceSchemeMapper().listByWelfareType(queryParam.getWelfareTypeEnum().getValue());
+//            insuranceSchemePOS = getInsuranceSchemeMapper().listByWelfareType(queryParam.getWelfareTypeEnum().getValue());
+            insuranceSchemePOS = getInsuranceSchemeMapper().list(queryParam);
         }
 
         PageInfo<InsuranceSchemeListDTO> dtoPage = new PageInfo<>(InsuranceSchemeListDTO.class);