fix 年度履职报告

ruoyi-admin/src/main/java/com/ruoyi/web/controller/member/MemberInfoController.java

@@ -50,8 +50,7 @@ public class MemberInfoController extends BaseController {
      * 获取委员菜单下拉树列表
      */
     @GetMapping("/treeSelect")
-    public AjaxResult treeSelect(MemberInfo memberInfo)
-    {
+    public AjaxResult treeSelect(MemberInfo memberInfo) {
         List<MemberInfo> list = memberInfoService.selectMemberInfoList(memberInfo);
         return success(memberInfoService.buildMemberInfoTreeSelect(list));
     }
@@ -91,9 +90,18 @@ public class MemberInfoController extends BaseController {
      * 获取委员履职信息详细信息
      */
     @PreAuthorize("@ss.hasPermi('member:info:queryJop')")
-    @GetMapping(value = "/getInfoJop/{memberId}")
-    public AjaxResult getInfoJop(@PathVariable("memberId") Long memberId) {
-        return success(memberInfoService.getInfoJop(memberId));
+    @PostMapping(value = "/getInfoJop")
+    public AjaxResult getInfoJop(@RequestBody MemberInfo memberInfo) {
+        return success(memberInfoService.getInfoJop(memberInfo));
+    }
+
+    /**
+     * 获取委员履职年度报告
+     */
+    @PreAuthorize("@ss.hasPermi('member:info:queryJop')")
+    @PostMapping(value = "/getMemberReport")
+    public AjaxResult getMemberReport(@RequestBody MemberInfo memberInfo) {
+        return success(memberInfoService.getMemberReport(memberInfo));
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -2,6 +2,9 @@ package com.ruoyi.web.controller.system;
 
 import java.util.List;
 import java.util.Set;
+
+import com.ruoyi.system.domain.member.MemberInfo;
+import com.ruoyi.system.service.IMemberInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -34,6 +37,9 @@ public class SysLoginController
     @Autowired
     private SysPermissionService permissionService;
 
+    @Autowired
+    private IMemberInfoService memberInfoService;
+
     /**
      * 登录方法
      * 
@@ -64,7 +70,14 @@ public class SysLoginController
         Set<String> roles = permissionService.getRolePermission(user);
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(user);
+        MemberInfo memberInfo = new MemberInfo();
+        memberInfo.setUserId(user.getUserId());
         AjaxResult ajax = AjaxResult.success();
+        ajax.put("memberInfo", null);
+        List<MemberInfo> memberInfoList = memberInfoService.selectMemberInfoList(memberInfo);
+        if (memberInfoList != null && memberInfoList.size() > 0){
+            ajax.put("memberInfo", memberInfoList.get(0));
+        }
         ajax.put("user", user);
         ajax.put("roles", roles);
         ajax.put("permissions", permissions);

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -37,11 +37,23 @@ public class BaseEntity implements Serializable
 
     /** 备注 */
     private String remark;
+    /**
+     * 年份
+     */
+    private String year;
 
     /** 请求参数 */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private Map<String, Object> params;
 
+    public String getYear() {
+        return year;
+    }
+
+    public void setYear(String year) {
+        this.year = year;
+    }
+
     public String getSearchValue()
     {
         return searchValue;

ruoyi-system/src/main/java/com/ruoyi/system/mapper/MemberInfoMapper.java

@@ -20,6 +20,13 @@ public interface MemberInfoMapper
      * @return 委员信息
      */
     public MemberInfo selectMemberInfoByMemberId(Long memberId);
+    /**
+     * 查询委员信息
+     *
+     * @param userId 委员账号主键
+     * @return 委员信息
+     */
+    public MemberInfo selectMemberInfoByUserId(Long userId);
 
     /**
      * 查询委员信息列表

ruoyi-system/src/main/java/com/ruoyi/system/service/IMemberInfoService.java

@@ -26,7 +26,11 @@ public interface IMemberInfoService
     /**
      * 获取委员履职信息详细信息
      */
-    public MemberInfoVo getInfoJop(Long memberId);
+    public MemberInfoVo getInfoJop(MemberInfo memberInfo);
+    /**
+     * 获取委员履职年度报告
+     */
+    public MemberInfoVo getMemberReport(MemberInfo memberInfo);
 
     /**
      * 查询委员信息列表

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

@@ -4,6 +4,7 @@ package com.ruoyi.system.service.impl;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+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.member.MemberInfo;
@@ -36,6 +37,9 @@ public class MemberInfoServiceImpl implements IMemberInfoService
     @Autowired
     private ZxSpeakMapper zxSpeakMapper;
 
+    @Autowired
+    private ProposalInfoMapper proposalInfoMapper;
+
     @Autowired
     private SysDictDataMapper dictDataMapper;
 
@@ -55,9 +59,9 @@ public class MemberInfoServiceImpl implements IMemberInfoService
      * 获取委员履职信息详细信息
      */
     @Override
-    public MemberInfoVo getInfoJop(Long memberId) {
+    public MemberInfoVo getInfoJop(MemberInfo memberInfos) {
         MemberInfoVo  memberInfoVo = new MemberInfoVo();
-        MemberInfo memberInfo = memberInfoMapper.selectMemberInfoByMemberId(memberId);
+        MemberInfo memberInfo = memberInfoMapper.selectMemberInfoByMemberId(memberInfos.getMemberId());
         memberInfoVo.setMemberInfo(memberInfo);
         //todo 提案/社情民意还有联民提案的
         ZxConference zxConference = new ZxConference();
@@ -82,6 +86,23 @@ public class MemberInfoServiceImpl implements IMemberInfoService
         return memberInfoVo;
     }
 
+    /**
+     * 获取委员履职年度报告
+     */
+    @Override
+    public MemberInfoVo getMemberReport(MemberInfo memberInfo) {
+        MemberInfoVo  memberInfoVo = new MemberInfoVo();
+        //查询出委员信息
+        Long userId = memberInfo.getUserId();
+        MemberInfo memberInfoSelect = memberInfoMapper.selectMemberInfoByUserId(memberInfo.getUserId());
+        //查询履职情况
+        ProposalInfo proposalInfo = new ProposalInfo();
+        proposalInfo.setProposalUserId(userId);
+        proposalInfoMapper.selectProposalInfoListByUser(proposalInfo);
+
+        return null;
+    }
+
     /**
      * 查询委员信息列表
      * 

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

@@ -52,7 +52,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectMemberInfoVo"/>
         where member_id = #{memberId}
     </select>
-        
+    <select id="selectMemberInfoByUserId" parameterType="Long" resultMap="MemberInfoResult">
+        <include refid="selectMemberInfoVo"/>
+        where user_id = #{userId}
+    </select>
+
     <insert id="insertMemberInfo" parameterType="MemberInfo" useGeneratedKeys="true" keyProperty="memberId">
         insert into member_info
         <trim prefix="(" suffix=")" suffixOverrides=",">

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

@@ -64,6 +64,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="publishDept != null  and publishDept != ''"> and a.publish_dept = #{publishDept}</if>
             <if test="publishDeptId != null "> and a.publish_dept_id = #{publishDeptId}</if>
             <if test="userId != null "> and b.user_id = #{userId}</if>
+            <if test="year != null and year != ''"><!-- 开始时间检索 -->
+                AND date_format(a.publish_time,'%y') = date_format(#{year},'%y')
+            </if>
         </where>
         order by a.publish_time DESC
     </select>

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

@@ -59,6 +59,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="conferenceAddress != null  and conferenceAddress != ''"> and a.conference_address = #{conferenceAddress}</if>
             <if test="publishTime != null "> and a.publish_time = #{publishTime}</if>
             <if test="userId != null "> and b.user_id = #{userId}</if>
+            <if test="year != null and year != ''"><!-- 开始时间检索 -->
+                AND date_format(a.publish_time,'%y') = date_format(#{year},'%y')
+            </if>
         </where>
         order  by a.publish_time DESC
     </select>

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

@@ -44,7 +44,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="publishTime != null "> and publish_time = #{publishTime}</if>
             <if test="speakStatus != null  and speakStatus != ''"> and speak_status = #{speakStatus}</if>
             <if test="userId != null  "> and user_id = #{userId}</if>
+            <if test="year != null and year != ''"><!-- 开始时间检索 -->
+                AND date_format(publish_time,'%y') = date_format(#{year},'%y')
+            </if>
         </where>
+        order by publish_time DESC
     </select>
     
     <select id="selectZxSpeakBySpeakId" parameterType="Long" resultMap="ZxSpeakResult">