fix 修改计算加分

ruoyi-system/src/main/java/com/ruoyi/system/domain/bonus/ZxBonus.java

@@ -52,8 +52,8 @@ public class ZxBonus extends BaseEntity
     private String bonusReason;
 
     /** 加分时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "加分时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "加分时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date bonusTime;
     /**
      * 附件

ruoyi-system/src/main/java/com/ruoyi/system/domain/investment/ZxInvestment.java

@@ -47,13 +47,25 @@ public class ZxInvestment extends BaseEntity
     /** 联系内容 */
     @Excel(name = "联系内容")
     private String contactsContent;
+    /**
+     * 招商项目状态 1:待审核 2：已审核 3：已签约
+     */
+    private String type;
 
     /** 录入时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "录入时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date publishTime;
 
-    public void setInvestmentId(Long investmentId) 
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public void setInvestmentId(Long investmentId)
     {
         this.investmentId = investmentId;
     }

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

@@ -37,6 +37,27 @@ public class MemberAssessmentInfo extends BaseEntity
     /** 活动分数 */
     @Excel(name = "活动分数")
     private Long activityScore;
+    /**
+     * 活动视察调研
+     */
+    private Long activityScdyScore;
+    /**
+     * 活动活动联络组调研
+     */
+    private Long activityLlzScore;
+    /**
+     * 活动界别调研
+     */
+    private Long activityJbScore;
+
+    /**
+     * 活动办实事调研
+     */
+    private Long activityBssScore;
+    /**
+     * 招商
+     */
+    private Long investmentScore;
 
     /** 加分(其他分数) */
     @Excel(name = "加分(其他分数)")
@@ -62,6 +83,46 @@ public class MemberAssessmentInfo extends BaseEntity
     @Excel(name = "年份")
     private String year;
 
+    public Long getInvestmentScore() {
+        return investmentScore;
+    }
+
+    public void setInvestmentScore(Long investmentScore) {
+        this.investmentScore = investmentScore;
+    }
+
+    public Long getActivityScdyScore() {
+        return activityScdyScore;
+    }
+
+    public void setActivityScdyScore(Long activityScdyScore) {
+        this.activityScdyScore = activityScdyScore;
+    }
+
+    public Long getActivityLlzScore() {
+        return activityLlzScore;
+    }
+
+    public void setActivityLlzScore(Long activityLlzScore) {
+        this.activityLlzScore = activityLlzScore;
+    }
+
+    public Long getActivityJbScore() {
+        return activityJbScore;
+    }
+
+    public void setActivityJbScore(Long activityJbScore) {
+        this.activityJbScore = activityJbScore;
+    }
+
+    public Long getActivityBssScore() {
+        return activityBssScore;
+    }
+
+    public void setActivityBssScore(Long activityBssScore) {
+        this.activityBssScore = activityBssScore;
+    }
+
     public Long getFullScore() {
         return fullScore;
     }

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 address;
     /**
      * 是否是常委
      */
@@ -82,6 +86,14 @@ public class MemberInfo extends BaseEntity
      */
     private String pie;
 
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
     public String getIsMember() {
         return isMember;
     }

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MemberInfoVo.java

@@ -3,6 +3,7 @@ package com.ruoyi.system.domain.vo;
 import com.ruoyi.system.domain.ProposalInfo;
 import com.ruoyi.system.domain.activity.ZxActivity;
 import com.ruoyi.system.domain.conference.ZxConference;
+import com.ruoyi.system.domain.investment.ZxInvestment;
 import com.ruoyi.system.domain.member.MemberAssessmentInfo;
 import com.ruoyi.system.domain.member.MemberInfo;
 import com.ruoyi.system.domain.speak.ZxSpeak;
@@ -42,15 +43,78 @@ public class MemberInfoVo {
      * 活动集合
      */
     private List<ZxActivity> zxActivityList;
+    /**
+     * 视察调研集合
+     */
+    private List<ZxActivity> activityScdyList;
+
+    /**
+     * 联络组活动集合
+     */
+    private List<ZxActivity> activityLlzList;
+
+    /**
+     * 界别集合
+     */
+    private List<ZxActivity> activityJbList;
+
+    /**
+     * 为群众办实事集合
+     */
+    private List<ZxActivity> activityBssList;
     /**
      * 发言集合
      */
     private List<ZxSpeak> zxSpeakList;
+    /**
+     * 政协委员招商
+     */
+    private List<ZxInvestment> zxInvestmentList;
     /**
      * 相关集合
      */
     private Map<String,Object> map;
 
+    public List<ZxActivity> getActivityScdyList() {
+        return activityScdyList;
+    }
+
+    public void setActivityScdyList(List<ZxActivity> activityScdyList) {
+        this.activityScdyList = activityScdyList;
+    }
+
+    public List<ZxActivity> getActivityLlzList() {
+        return activityLlzList;
+    }
+
+    public void setActivityLlzList(List<ZxActivity> activityLlzList) {
+        this.activityLlzList = activityLlzList;
+    }
+
+    public List<ZxActivity> getActivityJbList() {
+        return activityJbList;
+    }
+
+    public void setActivityJbList(List<ZxActivity> activityJbList) {
+        this.activityJbList = activityJbList;
+    }
+
+    public List<ZxActivity> getActivityBssList() {
+        return activityBssList;
+    }
+
+    public void setActivityBssList(List<ZxActivity> activityBssList) {
+        this.activityBssList = activityBssList;
+    }
+
+    public List<ZxInvestment> getZxInvestmentList() {
+        return zxInvestmentList;
+    }
+
+    public void setZxInvestmentList(List<ZxInvestment> zxInvestmentList) {
+        this.zxInvestmentList = zxInvestmentList;
+    }
+
     public MemberAssessmentInfo getMemberAssessmentInfo() {
         return memberAssessmentInfo;
     }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MemberInfoServiceImpl.java

@@ -18,6 +18,7 @@ import com.ruoyi.system.domain.assessment.ZxAssessment;
 import com.ruoyi.system.domain.bonus.ZxBonus;
 import com.ruoyi.system.domain.conference.ZxConference;
 import com.ruoyi.system.domain.conference.ZxConferenceUser;
+import com.ruoyi.system.domain.investment.ZxInvestment;
 import com.ruoyi.system.domain.member.MemberAssessmentInfo;
 import com.ruoyi.system.domain.member.MemberInfo;
 import com.ruoyi.system.domain.member.MemberInfoTree;
@@ -84,6 +85,8 @@ public class MemberInfoServiceImpl implements IMemberInfoService {
     protected Validator validator;
     @Autowired
     private SysUserRoleMapper userRoleMapper;
+    @Autowired
+    private ZxInvestmentMapper zxInvestmentMapper;
 
 
     /**
@@ -121,24 +124,34 @@ public class MemberInfoServiceImpl implements IMemberInfoService {
         List<SqmyInfo> sqmyInfos = sqmyInfoMapper.selectSqmyInfoList(sqmyInfo);
         memberInfoVo.setSqmyInfoList(sqmyInfos);
 
+        //会议
         ZxConference zxConference = new ZxConference();
         zxConference.setUserId(userId);
         List<ZxConference> zxConferences = zxConferenceMapper.selectZxConferenceList(zxConference);
         if (zxConferences != null) {
             memberInfoVo.setZxConferenceList(zxConferences);
         }
+        //活动
         ZxActivity zxActivity = new ZxActivity();
         zxActivity.setUserId(userId);
         List<ZxActivity> zxActivities = zxActivityMapper.selectZxActivityList(zxActivity);
         if (zxActivities != null) {
             memberInfoVo.setZxActivityList(zxActivities);
         }
+        //发言
         ZxSpeak zxSpeak = new ZxSpeak();
         zxSpeak.setUserId(userId);
         List<ZxSpeak> zxSpeaks = zxSpeakMapper.selectZxSpeakList(zxSpeak);
         if (zxSpeaks != null) {
             memberInfoVo.setZxSpeakList(zxSpeaks);
         }
+        //招商
+        ZxInvestment zxInvestment = new ZxInvestment();
+        zxInvestment.setUserId(userId);
+        List<ZxInvestment> zxInvestments = zxInvestmentMapper.selectZxInvestmentList(zxInvestment);
+        if (zxInvestments != null){
+            memberInfoVo.setZxInvestmentList(zxInvestments);
+        }
         return memberInfoVo;
     }
 
@@ -164,8 +177,16 @@ public class MemberInfoServiceImpl implements IMemberInfoService {
         map.put("conferenceNum", 0);
         //全会
         map.put("plenarySessionNum", 0);
-        //活动
-        map.put("activityNum", 0);
+        //活动视察调研
+        map.put("activityScdyNum", 0);
+        //活动联络组
+        map.put("activityLlzNum", 0);
+        //活动界别
+        map.put("activityJbNum", 0);
+        //活动为群众办实事
+        map.put("activityBssNum", 0);
+        //招商数量
+        map.put("investmentNum", 0);
         //发言数量
         map.put("speakNum", 0);
         //查询提案情况
@@ -196,6 +217,7 @@ public class MemberInfoServiceImpl implements IMemberInfoService {
         if (zxConferences != null && zxConferences.size() > 0) {
             long count = zxConferences.stream().filter(e -> e.getConferenceType().equals(ONE)).count();
             map.put("plenarySessionNum", count);
+            map.put("conferenceNum", zxConferences.size());
         }
         //查询活动
         ZxActivity zxActivity = new ZxActivity();
@@ -205,6 +227,27 @@ public class MemberInfoServiceImpl implements IMemberInfoService {
         memberInfoVo.setZxActivityList(zxActivities);
         if (zxActivities != null && zxActivities.size() > 0) {
             map.put("activityNum", zxActivities.size());
+            Map<String, List<ZxActivity>> collectType = zxActivities.stream().collect(Collectors.groupingBy(ZxActivity::getActivityType));
+            List<ZxActivity> activityScdyList = collectType.get(TWO);
+            if (activityScdyList != null){
+                //活动视察调研
+                map.put("activityScdyNum", activityScdyList.size());
+            }
+            List<ZxActivity> activityLlzList = collectType.get(THR);
+            if (activityLlzList != null){
+                //活动联络组
+                map.put("activityLlzNum", activityLlzList.size());
+            }
+            List<ZxActivity> activityJbList = collectType.get(THR);
+            if (activityJbList != null){
+                //活动界别
+                map.put("activityJbNum", activityJbList.size());
+            }
+            List<ZxActivity> activityBssList = collectType.get(THR);
+            if (activityBssList != null){
+                //活动为群众办实事
+                map.put("activityBssNum", activityBssList.size());
+            }
         }
 
         //查询发言不计算分
@@ -216,6 +259,13 @@ public class MemberInfoServiceImpl implements IMemberInfoService {
         if (zxSpeaks != null && zxSpeaks.size() > 0) {
             map.put("speakNum", zxSpeaks.size());
         }
+        //招商
+        ZxInvestment zxInvestment = new ZxInvestment();
+        zxInvestment.setUserId(userId);
+        List<ZxInvestment> zxInvestments = zxInvestmentMapper.selectZxInvestmentList(zxInvestment);
+        if (zxInvestments != null){
+            memberInfoVo.setZxInvestmentList(zxInvestments);
+        }
         //查询委员得分和排名
         MemberAssessmentInfo memberAssessmentInfo = new MemberAssessmentInfo();
         memberAssessmentInfo.setUserId(userId);

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskService.java

@@ -9,6 +9,7 @@ import com.ruoyi.system.domain.assessment.ZxAssessment;
 import com.ruoyi.system.domain.bonus.ZxBonus;
 import com.ruoyi.system.domain.conference.ZxConference;
 import com.ruoyi.system.domain.conference.ZxConferenceUser;
+import com.ruoyi.system.domain.investment.ZxInvestment;
 import com.ruoyi.system.domain.member.MemberAssessmentInfo;
 import com.ruoyi.system.domain.member.MemberInfo;
 import com.ruoyi.system.domain.sqmy.SqmyInfo;
@@ -55,6 +56,9 @@ public class TaskService {
     @Autowired
     private MemberAssessmentInfoMapper memberAssessmentInfoMapper;
 
+    @Autowired
+    private ZxInvestmentMapper zxInvestmentMapper;
+
     /**
      * 更新所有委员分数，排名
      */
@@ -119,9 +123,13 @@ public class TaskService {
                 zxActivity.setUserId(SecurityUtils.getUserId());
                 zxActivity.setYear(year);
                 List<ZxActivity> zxActivities = zxActivityMapper.selectZxActivityList(zxActivity);
+                //招商
+                ZxInvestment zxInvestment = new ZxInvestment();
+                zxInvestment.setUserId(SecurityUtils.getUserId());
+                zxInvestment.setYear(year);
+                List<ZxInvestment> zxInvestments = zxInvestmentMapper.selectZxInvestmentList(zxInvestment);
                 //计算得分 勿删
                 if (zxAssessments != null && zxAssessments.size() > 0) {
-
                     //计算提案得分
                     if (proposalInfos != null && proposalInfos.size() > 0) {
                         //获取分值上限
@@ -243,7 +251,7 @@ public class TaskService {
                                 List<ZxConferenceUser> zxConferenceUserList = conference.getZxConferenceUserList();
                                 if (zxConferenceUserList != null && zxConferenceUserList.size() > 0) {
                                     //获取到不参加会议的数量
-                                    proposalCount = proposalCount + zxConferenceUserList.stream().filter(e -> "N".equals(e.getIsJoin())).count();
+                                    proposalCount = proposalCount + zxConferenceUserList.stream().filter(e -> "N".equals(e.getIsJoin()) && THR.equals(e.getApproval())).count();
                                 }
                             }
                             if (proposalCount > 0) {
@@ -261,7 +269,7 @@ public class TaskService {
                                 List<ZxConferenceUser> zxConferenceUserList = conference.getZxConferenceUserList();
                                 if (zxConferenceUserList != null && zxConferenceUserList.size() > 0) {
                                     //获取到不参加会议的数量
-                                    proposalCount = proposalCount + zxConferenceUserList.stream().filter(e -> "N".equals(e.getIsJoin())).count();
+                                    proposalCount = proposalCount + zxConferenceUserList.stream().filter(e -> "N".equals(e.getIsJoin()) && THR.equals(e.getApproval())).count();
                                 }
                             }
                             if (proposalCount > 0) {
@@ -292,7 +300,7 @@ public class TaskService {
                                 List<ZxActivityUser> zxActivityUserList = activity.getZxActivityUserList();
                                 if (zxActivityUserList != null && zxActivityUserList.size() > 0) {
                                     //获取到不参加会议的数量
-                                    proposalCount = proposalCount + zxActivityUserList.stream().filter(e -> "N".equals(e.getIsJoin())).count();
+                                    proposalCount = proposalCount + zxActivityUserList.stream().filter(e -> "N".equals(e.getIsJoin()) && THR.equals(e.getApproval())).count();
                                 }
                             }
                             if (proposalCount > 0) {
@@ -326,6 +334,15 @@ public class TaskService {
                                 String assessmentTypeId = zxAssessment.getAssessmentTypeId();
                                 //获取参与数量
                                 proposalCount = zxActivities.stream().filter(e -> e.getActivityType().equals(assessmentTypeId)).count();
+                                if (ONE.equals(assessmentTypeId)) {
+                                    memberAssessmentInf.setActivityScdyScore(assessmentScore1);
+                                } else if (TWO.equals(assessmentTypeId)) {
+                                    memberAssessmentInf.setActivityLlzScore(assessmentScore1);
+                                } else if (THR.equals(assessmentTypeId)) {
+                                    memberAssessmentInf.setActivityJbScore(assessmentScore1);
+                                } else if (FOR.equals(assessmentTypeId)) {
+                                    memberAssessmentInf.setActivityBssScore(assessmentScore1);
+                                }
                                 if (proposalCount > 0) {
                                     nowScore = nowScore + assessmentScore1;
                                 }
@@ -338,6 +355,41 @@ public class TaskService {
                             fullScore = fullScore + assessmentTotal;
                         }
                     }
+                    //计算招商分数
+                    if (zxInvestments != null && zxInvestments.size() > 0) {
+                        //定义当前分数
+                        nowScore = 0L;
+                        //获取分值上限
+                        assessmentTotal = zxAssessments.stream().filter(e -> "assessment_bonus".equals(e.getAssessmentProjectId()) && 0 == e.getParentId()).collect(Collectors.toList())
+                                .get(0).getAssessmentTotal();
+                        //去查询这个是否有有效的招商线索
+                        proposalCount = zxInvestments.stream().filter(e -> e.getUserId().equals(userId) && e.getType().equals(TWO)).count();
+                        if (proposalCount > 0) {
+                            //获取对应类型的分值
+                            assessmentScore = zxAssessments.stream().filter(e -> "assessment_bonus".equals(e.getAssessmentProjectId()) && ONE.equals(e.getAssessmentTypeId())).collect(Collectors.toList())
+                                    .get(0).getAssessmentScore();
+                            //计算当前分数
+                            nowScore = nowScore + proposalCount * assessmentScore;
+                        }
+                        //当前分数小于上限值，继续找下一个条件
+                        if (nowScore < assessmentTotal) {
+                            //查询这个人是否有招商线索转换为签约项目
+                            proposalCount = zxInvestments.stream().filter(e -> e.getUserId().equals(userId) && e.getType().equals(THR)).count();
+                            if (proposalCount > 0) {
+                                //获取对应类型的分值
+                                assessmentScore = zxAssessments.stream().filter(e -> "assessment_bonus".equals(e.getAssessmentProjectId()) && TWO.equals(e.getAssessmentTypeId())).collect(Collectors.toList())
+                                        .get(0).getAssessmentScore();
+                                //计算当前分数
+                                nowScore = nowScore + proposalCount * assessmentScore;
+                            }
+                        }
+                        if (nowScore > assessmentTotal) {
+                            nowScore = assessmentTotal;
+                        }
+                        memberAssessmentInf.setActivityScore(nowScore);
+                        //计算满分上限
+                        fullScore = fullScore + assessmentTotal;
+                    }
                     //计算加分
                     ZxBonus zxBonus = new ZxBonus();
                     zxBonus.setUserId(userId);

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

@@ -14,6 +14,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="bonusScore"    column="bonus_score"    />
         <result property="totalScore"    column="total_score"    />
         <result property="fullScore"    column="full_score"    />
+        <result property="activityScdyScore"    column="activity_scdy_score"    />
+        <result property="activityLlzScore"    column="activity_llz_score"    />
+        <result property="activityJbScore"    column="activity_jb_score"    />
+        <result property="activityBssScore"    column="activity_bss_score"    />
+        <result property="investmentScore"    column="investment_score"    />
         <result property="rank"    column="rank"    />
         <result property="totalPeople"    column="total_people"    />
         <result property="year"    column="year_data"    />
@@ -25,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectMemberAssessmentInfoVo">
-        select member_assessment_id, user_id, proposal_score,full_score,total_people, sqmy_score, conference_score, activity_score, bonus_score, total_score, rank, year_data, create_by, create_time, update_by, update_time, remark from member_assessment_info
+        select member_assessment_id, user_id,investment_score,activity_bss_score,activity_jb_score,activity_scdy_score,activity_llz_score, proposal_score,full_score,total_people, sqmy_score, conference_score, activity_score, bonus_score, total_score, rank, year_data, create_by, create_time, update_by, update_time, remark from member_assessment_info
     </sql>
 
     <select id="selectMemberAssessmentInfoList" parameterType="MemberAssessmentInfo" resultMap="MemberAssessmentInfoResult">
@@ -59,6 +64,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bonusScore != null">bonus_score,</if>
             <if test="totalScore != null">total_score,</if>
             <if test="fullScore != null">full_score,</if>
+            <if test="activityScdyScore != null">activity_scdy_score,</if>
+            <if test="activityLlzScore != null">activity_llz_score,</if>
+            <if test="activityJbScore != null">activity_jb_score,</if>
+            <if test="activityBssScore != null">activity_bss_score,</if>
+            <if test="investmentScore != null">investmentScore,</if>
             <if test="totalPeople != null">total_people,</if>
             <if test="rank != null">rank,</if>
             <if test="year != null">year_data,</if>
@@ -77,6 +87,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bonusScore != null">#{bonusScore},</if>
             <if test="totalScore != null">#{totalScore},</if>
             <if test="fullScore != null">#{fullScore},</if>
+            <if test="activityScdyScore != null">#{activityScdyScore},</if>
+            <if test="activityLlzScore != null">#{activityLlzScore},</if>
+            <if test="activityJbScore != null">#{activityJbScore},</if>
+            <if test="activityBssScore != null">#{activityBssScore},</if>
+            <if test="investmentScore != null">#{investmentScore},</if>
             <if test="totalPeople != null">#{totalPeople},</if>
             <if test="rank != null">#{rank},</if>
             <if test="year != null">#{year},</if>
@@ -99,6 +114,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bonusScore != null">bonus_score = #{bonusScore},</if>
             <if test="totalScore != null">total_score = #{totalScore},</if>
             <if test="fullScore != null">full_score = #{fullScore},</if>
+            <if test="activityScdyScore != null">activity_scdy_score = #{activityScdyScore},</if>
+            <if test="activityLlzScore != null">activity_llz_score = #{activityLlzScore},</if>
+            <if test="activityJbScore != null">activity_jb_score = #{activityJbScore},</if>
+            <if test="activityBssScore != null">activity_bss_score = #{activityBssScore},</if>
+            <if test="investmentScore != null">investment_score = #{investmentScore},</if>
             <if test="totalPeople != null">total_people = #{totalPeople},</if>
             <if test="rank != null">rank = #{rank},</if>
             <if test="year != null">year_data = #{year},</if>

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

@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isMember"    column="is_member"    />
         <result property="score"    column="score"    />
         <result property="ranking"    column="ranking"    />
+        <result property="address"    column="address"    />
         <result property="grade"    column="grade"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
@@ -28,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectMemberInfoVo">
-        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
+        select member_id, user_id, name, card,address, 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">
@@ -72,6 +73,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="address != null">address,</if>
             <if test="isMember != null and isMember !=''">is_member,</if>
             <if test="score != null">score,</if>
             <if test="ranking != null">ranking,</if>
@@ -93,6 +95,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="address != null">#{address},</if>
             <if test="isMember != null and isMember != ''">#{isMember},</if>
             <if test="score != null">#{score},</if>
             <if test="ranking != null">#{ranking},</if>
@@ -118,6 +121,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="address != null and address != ''">address = #{address},</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>

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

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="contactsPhone"    column="contacts_phone"    />
         <result property="contactsContent"    column="contacts_content"    />
         <result property="publishTime"    column="publish_time"    />
+        <result property="type"    column="type"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -22,13 +23,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectZxInvestmentVo">
-        select investment_id, user_id, name, clue_name, investment_amount, contacts_name, contacts_phone, contacts_content, publish_time, create_by, create_time, update_by, update_time, remark from zx_investment
+        select investment_id, user_id, name, clue_name,type, investment_amount, contacts_name, contacts_phone, contacts_content, publish_time, create_by, create_time, update_by, update_time, remark from zx_investment
     </sql>
 
     <select id="selectZxInvestmentList" parameterType="ZxInvestment" resultMap="ZxInvestmentResult">
         <include refid="selectZxInvestmentVo"/>
         <where>  
             <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="type != null and type != ''"> and type = #{type}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="clueName != null  and clueName != ''"> and clue_name like concat('%', #{clueName}, '%')</if>
             <if test="investmentAmount != null  and investmentAmount != ''"> and investment_amount = #{investmentAmount}</if>
@@ -36,6 +38,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="contactsPhone != null  and contactsPhone != ''"> and contacts_phone = #{contactsPhone}</if>
             <if test="contactsContent != null  and contactsContent != ''"> and contacts_content = #{contactsContent}</if>
             <if test="publishTime != null "> and publish_time = #{publishTime}</if>
+            <if test="year != null and year != ''"><!-- 开始时间检索 -->
+                AND date_format(publish_time,'%Y') = #{year}
+            </if>
         </where>
     </select>
     
@@ -49,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="userId != null">user_id,</if>
             <if test="name != null">name,</if>
+            <if test="type != null">type,</if>
             <if test="clueName != null">clue_name,</if>
             <if test="investmentAmount != null">investment_amount,</if>
             <if test="contactsName != null">contacts_name,</if>
@@ -64,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null">#{userId},</if>
             <if test="name != null">#{name},</if>
+            <if test="type != null">#{type},</if>
             <if test="clueName != null">#{clueName},</if>
             <if test="investmentAmount != null">#{investmentAmount},</if>
             <if test="contactsName != null">#{contactsName},</if>
@@ -83,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="userId != null">user_id = #{userId},</if>
             <if test="name != null">name = #{name},</if>
+            <if test="type != null">type = #{type},</if>
             <if test="clueName != null">clue_name = #{clueName},</if>
             <if test="investmentAmount != null">investment_amount = #{investmentAmount},</if>
             <if test="contactsName != null">contacts_name = #{contactsName},</if>