fix 定时任务更新委员分数

ruoyi-system/src/main/java/com/ruoyi/system/domain/member/MemberInfo.java

@@ -53,6 +53,10 @@ public class MemberInfo extends BaseEntity
     /** 乡镇（经开区）委员工作室 */
     @Excel(name = "乡镇", readConverterExp = "经=开区")
     private String studio;
+    /**
+     * 是否是常委
+     */
+    private String isMember;
     /**
      * 排名
      */
@@ -76,6 +80,14 @@ public class MemberInfo extends BaseEntity
      */
     private String pie;
 
+    public String getIsMember() {
+        return isMember;
+    }
+
+    public void setIsMember(String isMember) {
+        this.isMember = isMember;
+    }
+
     public String getEle() {
         return ele;
     }

ruoyi-system/src/main/resources/mapper/system/MemberInfoMapper.xml

@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="avatar"    column="avatar"    />
         <result property="unit"    column="unit"    />
         <result property="studio"    column="studio"    />
+        <result property="isMember"    column="is_member"    />
         <result property="score"    column="score"    />
         <result property="ranking"    column="ranking"    />
         <result property="grade"    column="grade"    />
@@ -27,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectMemberInfoVo">
-        select member_id, user_id, name, card, boundary, party_affiliation, phonenumber, avatar, unit, studio,score,ranking,grade, del_flag, create_by, create_time, update_by, update_time, remark from member_info
+        select member_id, user_id, name, card, boundary, is_member,party_affiliation, phonenumber, avatar, unit, studio,score,ranking,grade, del_flag, create_by, create_time, update_by, update_time, remark from member_info
     </sql>
 
     <select id="selectMemberInfoList" parameterType="MemberInfo" resultMap="MemberInfoResult">
@@ -42,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="avatar != null  and avatar != ''"> and avatar = #{avatar}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
             <if test="studio != null  and studio != ''"> and studio = #{studio}</if>
+            <if test="isMember != null  and isMember != ''"> and is_member = #{isMember}</if>
             <if test="score != null  and score != ''"> and score = #{score}</if>
             <if test="ranking != null  and ranking != ''"> and ranking = #{ranking}</if>
             <if test="grade != null  and grade != ''"> and find_in_set(#{grade}, grade)</if>
@@ -69,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="avatar != null">avatar,</if>
             <if test="unit != null">unit,</if>
             <if test="studio != null">studio,</if>
+            <if test="isMember != null and isMember !=''">is_member,</if>
             <if test="score != null">score,</if>
             <if test="ranking != null">ranking,</if>
             <if test="grade != null">grade,</if>
@@ -89,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="avatar != null">#{avatar},</if>
             <if test="unit != null">#{unit},</if>
             <if test="studio != null">#{studio},</if>
+            <if test="isMember != null and isMember != ''">#{isMember},</if>
             <if test="score != null">#{score},</if>
             <if test="ranking != null">#{ranking},</if>
             <if test="grade != null">#{grade},</if>
@@ -113,6 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="avatar != null">avatar = #{avatar},</if>
             <if test="unit != null">unit = #{unit},</if>
             <if test="studio != null">studio = #{studio},</if>
+            <if test="isMember != null and isMember != ''">is_member = #{isMember},</if>
             <if test="score != null and score != ''">score = #{score},</if>
             <if test="ranking != null and ranking != ''">ranking = #{ranking},</if>
             <if test="grade != null and grade != ''">grade = #{grade},</if>

ruoyi-system/src/main/resources/mapper/system/ProposalInfoMapper.xml

@@ -132,7 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
         <if test="isAgree != null  and isAgree != ''"> and u.is_agree = #{isAgree}</if>
         <if test="type != null  and type != ''"> and u.type = #{type}</if>
-        <if test="userId != null  "> and u.user_id = #{userId}</if>
+        <if test="userId != null  "> and u.user_id = #{proposalUserId}</if>
         <if test="proposalNumber != null  and proposalNumber != ''"> and p.proposal_number = #{proposalNumber}</if>
         <if test="title != null  and title != ''"> and p.title = #{title}</if>
         <if test="proposalName != null  and proposalName != ''"> and p.proposal_name like concat('%', #{proposalName}, '%')</if>