调整代码接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectCirculationController.java

@@ -114,7 +114,7 @@ public class TProjectCirculationController extends BaseController
     }
 
     /**
-     * 根据项目ID获取会议记录
+     * 根据项目ID获取项目流转记录
      */
     @ApiOperation("根据项目ID获取项目流转记录")
     @PreAuthorize("@ss.hasPermi('invest:circulation:query')")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectMeetingController.java

@@ -66,6 +66,7 @@ public class TProjectMeetingController extends BaseController
     public TableDataInfo list(TProjectMeeting tProjectMeeting)
     {
         startPage();
+        tProjectMeeting.setParticipants(getNickName());
         List<TProjectMeeting> list = tProjectMeetingService.selectTProjectMeetingList(tProjectMeeting);
         return getDataTable(list);
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectPoolController.java

@@ -165,6 +165,7 @@ public class TProjectPoolController extends BaseController
         tProjectCompany.setUpdateBy(getNickName());
         TProjectContacts tProjectContacts = tProjectPool.gettProjectContacts();
         tProjectContacts.setUpdateBy(getNickName());
+        tProjectContacts.setId(tProjectPool.getProjectContacts());
         // 上传并返回新文件名称
         // todo 保存附件信息
         List<TUnifyFile> tUnifyFileList = tProjectPool.getListFile();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectScoringController.java

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.invest;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -42,7 +43,6 @@ public class TProjectScoringController extends BaseController
      * 查询打分列表
      */
     @ApiOperation("查询打分列表")
-    @PreAuthorize("@ss.hasPermi('invest:scoring:list')")
     @GetMapping("/list")
     public TableDataInfo list(TProjectScoring tProjectScoring)
     {
@@ -69,7 +69,6 @@ public class TProjectScoringController extends BaseController
      * 获取打分详细信息
      */
     @ApiOperation("获取打分详细信息")
-    @PreAuthorize("@ss.hasPermi('invest:scoring:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
     {
@@ -80,7 +79,6 @@ public class TProjectScoringController extends BaseController
      * 新增打分
      */
     @ApiOperation("新增打分")
-    @PreAuthorize("@ss.hasPermi('invest:scoring:add')")
     @Log(title = "打分", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TProjectScoring tProjectScoring)
@@ -112,4 +110,36 @@ public class TProjectScoringController extends BaseController
     {
         return toAjax(tProjectScoringService.updateTProjectScoringByIds(ids));
     }
+
+    /**
+     * 根据会议ID查询汇总分数和平均分数
+     */
+    @ApiOperation("根据会议ID查询汇总分数和平均分数")
+    @GetMapping(value = "/selectMeetingId")
+    public AjaxResult selectMeetingId(String meetingId)
+    {
+        if (StringUtils.isEmpty(meetingId))
+        {
+            return error("查询打分数据'" + getNickName() + "'失败，请选择会议！");
+        }
+        return success(tProjectScoringService.selectMeetingId(meetingId));
+    }
+
+    /**
+     * 根据会议ID查询汇总分数和平均分数
+     */
+    @ApiOperation("根据会议ID查询是否打分和打分数据")
+    @GetMapping(value = "/getCanScoringMeetingId")
+    public AjaxResult getCanScoringMeetingId(String meetingId)
+    {
+        if (StringUtils.isEmpty(meetingId))
+        {
+            return error("查询打分数据'" + getNickName() + "'失败，请选择会议！");
+        }
+        TProjectScoring tProjectScoring = tProjectScoringService.getCanScoringMeetingId(meetingId,getUserId());
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("tProjectScoring", tProjectScoring);
+        return ajax;
+    }
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java

@@ -113,9 +113,9 @@ public class SwaggerConfig
         // 用ApiInfoBuilder进行定制
         return new ApiInfoBuilder()
                 // 设置标题
-                .title("标题：若依管理系统_接口文档")
+                .title("标题：系统_接口文档")
                 // 描述
-                .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
+                .description("描述：")
                 // 作者信息
                 .contact(new Contact(ruoyiConfig.getName(), null, null))
                 // 版本

ruoyi-system/src/main/java/com/ruoyi/invest/mapper/TProjectScoringMapper.java

@@ -1,7 +1,10 @@
 package com.ruoyi.invest.mapper;
 
 import java.util.List;
+import java.util.Map;
+
 import com.ruoyi.invest.domain.TProjectScoring;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 打分Mapper接口
@@ -66,4 +69,18 @@ public interface TProjectScoringMapper
      * @return 结果
      */
     public int updateTProjectScoringByIds(String[] ids);
+
+    /**
+     * 据会议ID查询汇总分数和平均分数
+     * @param meetingId
+     * @return
+     */
+    Map<String, String> selectMeetingId(String meetingId);
+
+    /**
+     * 根据会议ID和用户ID 查询打分数据
+     * @param meetingId
+     * @return
+     */
+    TProjectScoring getCanScoringMeetingId(@Param("meetingId")String meetingId,@Param("userId")Long userId);
 }

ruoyi-system/src/main/java/com/ruoyi/invest/service/ITProjectScoringService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.invest.service;
 
 import java.util.List;
+import java.util.Map;
+
 import com.ruoyi.invest.domain.TProjectScoring;
 
 /**
@@ -66,4 +68,20 @@ public interface ITProjectScoringService
      * @return 结果
      */
     public int updateTProjectScoringByIds(String[] ids);
+
+    /**
+     * 根据会议ID查询汇总分数和平均分数
+     * @param meetingId
+     * @return
+     */
+    Map<String,String> selectMeetingId(String meetingId);
+
+    /**
+     * 根据会议ID和用户ID 查询打分数据
+     * @param meetingId
+     * @param userId
+     * @return
+     */
+    TProjectScoring getCanScoringMeetingId(String meetingId, Long userId);
+
 }

ruoyi-system/src/main/java/com/ruoyi/invest/service/impl/TProjectScoringServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.invest.service.impl;
 
 import java.util.List;
+import java.util.Map;
+
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -106,4 +108,25 @@ public class TProjectScoringServiceImpl implements ITProjectScoringService
     public int updateTProjectScoringByIds(String[] ids) {
         return tProjectScoringMapper.updateTProjectScoringByIds(ids);
     }
+
+    /**
+     * 根据会议ID查询汇总分数和平均分数
+     * @param meetingId
+     * @return
+     */
+    @Override
+    public Map<String, String> selectMeetingId(String meetingId) {
+        return tProjectScoringMapper.selectMeetingId(meetingId);
+    }
+
+    /**
+     * 根据会议ID和用户ID 查询打分数据
+     * @param meetingId
+     * @param userId
+     * @return
+     */
+    @Override
+    public TProjectScoring getCanScoringMeetingId(String meetingId, Long userId) {
+        return tProjectScoringMapper.getCanScoringMeetingId(meetingId,userId);
+    }
 }

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

@@ -50,7 +50,6 @@ public interface ISysMenuService
      * 根据用户ID查询菜单树信息
      * 
      * @param userId 用户ID
-     * @param menuType 菜单类型
      * @return 菜单列表
      */
     public List<SysMenu> selectMenuTreeByUserId(Long userId);

ruoyi-system/src/main/resources/mapper/invest/TProjectCirculationMapper.xml

@@ -72,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="listProjectPoolId" parameterType="String" resultMap="TProjectCirculationResult">
         <include refid="selectTProjectCirculationVo"/>
         where project_pool_id = #{projectPoolId}
+        order by create_time
     </select>
 
 </mapper>

ruoyi-system/src/main/resources/mapper/invest/TProjectCompanyMapper.xml

@@ -111,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
-        where id = #{id}
+        where project_pool_id = #{id}
     </update>
 
     <delete id="deleteTProjectCompanyById" parameterType="String">

ruoyi-system/src/main/resources/mapper/invest/TProjectMeetingMapper.xml

@@ -24,7 +24,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
 
         <association property="tProjectPool" javaType="TProjectPool"  resultMap="TProjectPoolResult" />
-
     </resultMap>
 
     <resultMap type="TProjectPool" id="TProjectPoolResult">
@@ -33,19 +32,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="projectState"    column="project_state"    />
         <result property="projectGroup"    column="project_group"    />
         <result property="projectCode"    column="project_code"    />
+        <result property="investHead"    column="invest_head"    />
+        <result property="company"    column="company_name"    />
     </resultMap>
 
     <sql id="selectTProjectMeetingVo">
         select a.id, a.meeting_theme, a.meeting_code, a.meeting_type, a.project_pool_id, a.start_time, a.end_time, a.place, a.promoter, a.participants, a.promoter_id, a.participants_id,a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time,
-               b.project_name, b.project_stage, b.project_state, b.project_group ,b.project_code
+               b.project_name, b.project_stage, b.project_state, b.project_group ,b.project_code, b.invest_head,c.company_name
         from t_project_meeting a
              left join t_project_pool b ON a.project_pool_id = b.id
+             left join t_project_company c ON b.id = c.project_pool_id
     </sql>
 
     <select id="selectTProjectMeetingList" parameterType="TProjectMeeting" resultMap="TProjectMeetingResult">
         <include refid="selectTProjectMeetingVo"/>
         <where>
             a.del_flag = 0
+            <if test="participants != null  and participants != ''"> and ( a.participants like concat('%', #{participants}, '%') or a.promoter like concat('%', #{participants}, '%'))</if>
             <if test="projectPoolId != null  and projectPoolId != ''"> and a.project_pool_id = #{projectPoolId}</if>
             <if test="meetingTheme != null  and meetingTheme != ''"> and a.meeting_theme = #{meetingTheme}</if>
             <if test="meetingCode != null  and meetingCode != ''"> and a.meeting_code = #{meetingCode}</if>