Merge branch 'main' of http://124.243.245.42:3000/zkr/shz-backend into main

ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/policy/PolicyInfo.java

@@ -63,4 +63,8 @@ public class PolicyInfo extends BaseEntity {
 
     @ApiModelProperty("浏览数")
     private Integer viewNum;
+
+    //标签
+    /** 1-大龄人员;2-低保人员;3-残疾人员;4-失地农名或联队职工;5-防止返贫;6-未就业大中专毕业生;7-退役军人;8-长期失业人员;9-城镇零就业家庭成员；10.刑满释放人员 **/
+    private String policyTag;
 }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/policy/PolicyInfoQuery.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 政策信息查询参数
  * @author kiro
@@ -21,4 +23,10 @@ public class PolicyInfoQuery {
 
     @ApiModelProperty("政策名称搜索关键词")
     private String searchValue;
+    //标签
+    /** 1-大龄人员;2-低保人员;3-残疾人员;4-失地农名或联队职工;5-防止返贫;6-未就业大中专毕业生;7-退役军人;8-长期失业人员;9-城镇零就业家庭成员；10.刑满释放人员 **/
+    @ApiModelProperty("标签")
+    private String policyTag;
+
+    private List<String> policyTags;
 }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/policy/impl/PolicyInfoServiceImpl.java

@@ -9,9 +9,11 @@ import com.ruoyi.cms.service.policy.IPolicyInfoService;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -30,6 +32,10 @@ public class PolicyInfoServiceImpl implements IPolicyInfoService {
     @Override
     public TableDataInfo getPortalList(PolicyInfoQuery query) {
         PageHelper.startPage(query.getPageNum(), query.getPageSize());
+        if (StringUtils.isNotEmpty(query.getPolicyTag())) {
+            List<String> policyTags = Arrays.asList(query.getPolicyTag().split(","));
+            query.setPolicyTags(policyTags);
+        }
         List<PolicyInfo> list = policyInfoMapper.selectPolicyInfoList(query);
         PageInfo<PolicyInfo> pageInfo = new PageInfo<>(list);
 

ruoyi-bussiness/src/main/resources/mapper/policy/PolicyInfoMapper.xml

@@ -23,17 +23,18 @@
         <result property="updateTime" column="update_time"/>
         <result property="delFlag" column="del_flag"/>
         <result property="remark" column="remark"/>
+        <result property="policyTag" column="policy_tag"/>
     </resultMap>
 
     <sql id="selectPolicyInfoListVo">
-        select id, zcmc, zclx, zc_level, source_unit, accept_unit, publish_time, view_num, create_time
+        select id, zcmc, zclx, zc_level, source_unit, accept_unit, publish_time, view_num, create_time, policy_tag
         from policy_info
     </sql>
 
     <sql id="selectPolicyInfoDetailVo">
         select id, zcmc, zclx, zc_level, source_unit, accept_unit, publish_time, 
                zc_content, subsidy_standard, handle_channel, apply_condition,
-               file_url, file_name, view_num, create_by, create_time, update_by, update_time, remark
+               file_url, file_name, view_num, create_by, create_time, update_by, update_time, remark, policy_tag
         from policy_info
     </sql>
 
@@ -44,6 +45,14 @@
             <if test="query.searchValue != null and query.searchValue != ''">
                 and zcmc like '%' || #{query.searchValue}::varchar || '%'
             </if>
+            <if test="query.policyTags != null and query.policyTags != ''">
+                and policy_tag is not null
+                and string_to_array(policy_tag, ',') &amp;&amp; ARRAY[
+                <foreach collection="query.policyTags" item="item" separator=",">
+                    #{item}::text
+                </foreach>
+                ]
+            </if>
         </where>
         order by publish_time desc, create_time desc
     </select>
@@ -61,11 +70,11 @@
         insert into policy_info (
             zcmc, zclx, zc_level, source_unit, accept_unit, publish_time,
             zc_content, subsidy_standard, handle_channel, apply_condition,
-            file_url, file_name, view_num, create_by, create_time, del_flag, remark
+            file_url, file_name, view_num, create_by, create_time, del_flag, remark, policy_tag
         ) values (
             #{zcmc}, #{zclx}, #{zcLevel}, #{sourceUnit}, #{acceptUnit}, #{publishTime},
             #{zcContent}, #{subsidyStandard}, #{handleChannel}, #{applyCondition},
-            #{fileUrl}, #{fileName}, #{viewNum}, #{createBy}, now(), '0', #{remark}
+            #{fileUrl}, #{fileName}, #{viewNum}, #{createBy}, now(), '0', #{remark}, #{policyTag}
         )
     </insert>
 
@@ -85,6 +94,7 @@
             <if test="fileUrl != null">file_url = #{fileUrl},</if>
             <if test="fileName != null">file_name = #{fileName},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="policyTag != null">policy_tag = #{policyTag},</if>
             update_by = #{updateBy},
             update_time = now()
         </set>

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java

@@ -1,21 +1,20 @@
 package com.ruoyi.common.core.domain.entity;
 
-import java.time.LocalDate;
-import java.util.Date;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import com.ruoyi.common.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * APP用户对象 app_user
  * @author lishundong
@@ -166,7 +165,7 @@ public class AppUser extends BaseEntity
     @ApiModelProperty("地纬userid")
     private String dwUserid;
 
-    /** 1-残疾人;2-职业（技工）院校毕业生;3-退役军人;4-高校毕业生;5-脱贫劳动力;6-零就业家庭人员;7-就业困难人员;8-失业人员;9-低保家庭 **/
+    /** 1-大龄人员;2-低保人员;3-残疾人员;4-失地农名或联队职工;5-防止返贫;6-未就业大中专毕业生;7-退役军人;8-长期失业人员;9-城镇零就业家庭成员；10.刑满释放人员 **/
     @ApiModelProperty("用户类型，以逗号分隔")
     private String userType;
 }