投票列表

ruoyi-admin/src/main/java/com/ruoyi/web/controller/loan/LoanApplicationController.java

@@ -51,6 +51,17 @@ public class LoanApplicationController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 参会人员查看列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:application:conference:list')")
+    @GetMapping("/conference/list")
+    public TableDataInfo conferenceList(LoanApplication loanApplication) {
+        startPage();
+        List<LoanApplication> list = loanApplicationService.conferenceList(loanApplication);
+        return getDataTable(list);
+    }
+
     /**
      * 导出贷款申请主列表
      */

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/LoanApplicationServiceImpl.java

@@ -6,6 +6,8 @@ import com.deepoove.poi.data.PictureRenderData;
 import com.deepoove.poi.data.Pictures;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.*;
 import com.ruoyi.common.utils.poi.ExcelFillUtils;
@@ -142,6 +144,26 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         return loanApplications;
     }
 
+    @Override
+    public List<LoanApplication> conferenceList(LoanApplication loanApplication) {
+        //查询人员id
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        //判断当前角色是否是管理员和admin
+        List<SysRole> roles = user.getRoles();
+        Boolean bl = false;
+        for (SysRole role : roles) {
+            if(role.getRoleKey().equals("admin") || role.getRoleKey().equals("manager")){
+                bl = true;
+                break;
+            }
+        }
+        if(!bl){
+            loanApplication.setUserId(user.getUserId());
+        }
+        List<LoanApplication> loanApplications = loanApplicationMapper.conferenceList(loanApplication);
+        return loanApplications;
+    }
+
     /**
      * 文件管理
      *

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

@@ -67,4 +67,6 @@ public interface LoanApplicationMapper
      * @return 结果
      */
     public int deleteLoanApplicationByLoanApplicationIds(Long[] loanApplicationIds);
+
+    List<LoanApplication> conferenceList(LoanApplication loanApplication);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/conference/impl/SysUserConferenceServiceImpl.java

@@ -193,7 +193,23 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
     @Override
     @Transactional
     public AjaxResult vote(SysUserConference sysUserConference) {
+
         SysUser user = SecurityUtils.getLoginUser().getUser();
+        //查询所有人员的投票结果
+        List<SysUserConference> sysUserConferences = sysUserConferenceMapper.selectSysUserConferenceList(sysUserConference);
+        //如果投票人员不在参会人员中，投票失败
+        Boolean bo = false;
+        for (SysUserConference userConference : sysUserConferences) {
+            if(user.getUserId().equals(userConference.getUserId())){
+                bo = true;
+                break;
+            }
+        }
+        //为 false 时表示不在
+        if(!bo){
+            return AjaxResult.error("不是当前项目投票人员，投票失败");
+        }
+
         sysUserConference.setUserId(user.getUserId());
         sysUserConference.setUpdateTime(DateUtils.getNowDate());
         sysUserConferenceMapper.updateSysUserConferenceByUserId(sysUserConference);
@@ -233,8 +249,6 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
         if("N".equals(sysUserConference.getVotingResult())){
             bty++;
         }
-        //查询所有人员的投票结果
-        List<SysUserConference> sysUserConferences = sysUserConferenceMapper.selectSysUserConferenceList(sysUserConference);
         for (SysUserConference userConference : sysUserConferences) {
             //是否有人未投票
             if(!userConference.getUserId().equals(user.getUserId()) && StringUtils.isEmpty(userConference.getVotingResult())){

ruoyi-system/src/main/java/com/ruoyi/system/service/loan/ILoanApplicationService.java

@@ -119,4 +119,6 @@ public interface ILoanApplicationService
     public AjaxResult authorize(LoanApplication loanApplication);
 
     AjaxResult exportMb(LoanApplication loanApplication);
+
+    List<LoanApplication> conferenceList(LoanApplication loanApplication);
 }

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

@@ -164,7 +164,108 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectLoanApplicationVo"/>
         where loan_application_id = #{loanApplicationId}
     </select>
-        
+
+   <!-- <select id="conferenceList" parameterType="LoanApplication" resultMap="LoanApplicationResult">
+        SELECT
+        l.loan_application_id, l.loan_application_number, l.application_type,l.application_amount,l.enterprise_id,l.guarantee_shareholder_name,l.guarantee_shareholder_id_card, l.application_bank, l.usage_period, l.purpose_funds, l.repayment_source, l.enterprise_name, l.category_type, l.is_make, l.is_new, l.is_small,
+        l.is_duty, l.company_introduction, l.customer_type, l.corporation_front, l.corporation_back, l.corporation_name, l.corporation_id_card, l.corporation_phone,l.corporation_address,l.corporation_expiration_date, l.family_population, l.corporation_job, l.is_loan, l.receivable_pay, l.business_situation, l.business_efficiency,
+        l.corporation_marital_status, l.spouse_front, l.spouse_back, l.spouse_name, l.spouse_id_card, l.spouse_phone, l.guarantee_type, l.guarantee_front, l.guarantee_back, l.guarantee_name, l.guarantee_id_card, l.guarantee_phone, l.guarantee_marital_status, l.guarantee_spouse_front, l.guarantee_spouse_back, l.guarantee_spouse_name,
+        l.guarantee_spouse_id_card, l.guarantee_spouse_phone, l.user_id, l.id_card, l.application_time, l.file_time,l.review_time, l.loan_schedule, l.audit_schedule, l.audit_type, l.loan_application_type,l.review_schedule, l.a_user_id, l.a_user_name,l.a_authorize, l.b_user_id, l.b_user_name,l.f_user_id, l.f_user_name,
+        l.create_by, l.create_time, l.update_by, l.update_time, l.remark
+        from sys_user_conference s
+        LEFT JOIN loan_application l on l.loan_application_id = s.loan_application_id
+        where l.loan_application_id is not null
+        <if test="userId != null "> and s.user_id = #{userId} = #{userId}</if>
+        <if test="enterpriseName != null  and enterpriseName != ''"> and l.enterprise_name like concat('%', #{enterpriseName}, '%')</if>
+        <if test="applicationAmount != null "> and l.application_amount = #{applicationAmount}</if>
+        GROUP BY l.loan_application_id
+        ORDER BY review_time desc
+    </select>-->
+
+    <select id="conferenceList" parameterType="LoanApplication" resultMap="LoanApplicationResult">
+        SELECT
+            ANY_VALUE(l.loan_application_id) as loan_application_id,
+            ANY_VALUE(l.loan_application_number) as loan_application_number,
+            ANY_VALUE(l.application_type) as application_type,
+            ANY_VALUE(l.application_amount) as application_amount,
+            ANY_VALUE(l.enterprise_id) as enterprise_id,
+            ANY_VALUE(l.guarantee_shareholder_name) as guarantee_shareholder_name,
+            ANY_VALUE(l.guarantee_shareholder_id_card) as guarantee_shareholder_id_card,
+            ANY_VALUE(l.application_bank) as application_bank,
+            ANY_VALUE(l.usage_period) as usage_period,
+            ANY_VALUE(l.purpose_funds) as purpose_funds,
+            ANY_VALUE(l.repayment_source) as repayment_source,
+            ANY_VALUE(l.enterprise_name) as enterprise_name,
+            ANY_VALUE(l.category_type) as category_type,
+            ANY_VALUE(l.is_make) as is_make,
+            ANY_VALUE(l.is_new) as is_new,
+            ANY_VALUE(l.is_small) as is_small,
+            ANY_VALUE(l.is_duty) as is_duty,
+            ANY_VALUE(l.company_introduction) as company_introduction,
+            ANY_VALUE(l.customer_type) as customer_type,
+            ANY_VALUE(l.corporation_front) as corporation_front,
+            ANY_VALUE(l.corporation_back) as corporation_back,
+            ANY_VALUE(l.corporation_name) as corporation_name,
+            ANY_VALUE(l.corporation_id_card) as corporation_id_card,
+            ANY_VALUE(l.corporation_phone) as corporation_phone,
+            ANY_VALUE(l.corporation_address) as corporation_address,
+            ANY_VALUE(l.corporation_expiration_date) as corporation_expiration_date,
+            ANY_VALUE(l.family_population) as family_population,
+            ANY_VALUE(l.corporation_job) as corporation_job,
+            ANY_VALUE(l.is_loan) as is_loan,
+            ANY_VALUE(l.receivable_pay) as receivable_pay,
+            ANY_VALUE(l.business_situation) as business_situation,
+            ANY_VALUE(l.business_efficiency) as business_efficiency,
+            ANY_VALUE(l.corporation_marital_status) as corporation_marital_status,
+            ANY_VALUE(l.spouse_front) as spouse_front,
+            ANY_VALUE(l.spouse_back) as spouse_back,
+            ANY_VALUE(l.spouse_name) as spouse_name,
+            ANY_VALUE(l.spouse_id_card) as spouse_id_card,
+            ANY_VALUE(l.spouse_phone) as spouse_phone,
+            ANY_VALUE(l.guarantee_type) as guarantee_type,
+            ANY_VALUE(l.guarantee_front) as guarantee_front,
+            ANY_VALUE(l.guarantee_back) as guarantee_back,
+            ANY_VALUE(l.guarantee_name) as guarantee_name,
+            ANY_VALUE(l.guarantee_id_card) as guarantee_id_card,
+            ANY_VALUE(l.guarantee_phone) as guarantee_phone,
+            ANY_VALUE(l.guarantee_marital_status) as guarantee_marital_status,
+            ANY_VALUE(l.guarantee_spouse_front) as guarantee_spouse_front,
+            ANY_VALUE(l.guarantee_spouse_back) as guarantee_spouse_back,
+            ANY_VALUE(l.guarantee_spouse_name) as guarantee_spouse_name,
+            ANY_VALUE(l.guarantee_spouse_id_card) as guarantee_spouse_id_card,
+            ANY_VALUE(l.guarantee_spouse_phone) as guarantee_spouse_phone,
+            ANY_VALUE(l.user_id) as user_id,
+            ANY_VALUE(l.id_card) as id_card,
+            ANY_VALUE(l.application_time) as application_time,
+            ANY_VALUE(l.file_time) as file_time,
+            ANY_VALUE(l.review_time) as review_time,
+            ANY_VALUE(l.loan_schedule) as loan_schedule,
+            ANY_VALUE(l.audit_schedule) as audit_schedule,
+            ANY_VALUE(l.audit_type) as audit_type,
+            ANY_VALUE(l.loan_application_type) as loan_application_type,
+            ANY_VALUE(l.review_schedule) as review_schedule,
+            ANY_VALUE(l.a_user_id) as a_user_id,
+            ANY_VALUE(l.a_user_name) as a_user_name,
+            ANY_VALUE(l.a_authorize) as a_authorize,
+            ANY_VALUE(l.b_user_id) as b_user_id,
+            ANY_VALUE(l.b_user_name) as b_user_name,
+            ANY_VALUE(l.f_user_id) as f_user_id,
+            ANY_VALUE(l.f_user_name) as f_user_name,
+            ANY_VALUE(l.create_by) as create_by,
+            ANY_VALUE(l.create_time) as create_time,
+            ANY_VALUE(l.update_by) as update_by,
+            ANY_VALUE(l.update_time) as update_time,
+            ANY_VALUE(l.remark) as remark
+        from sys_user_conference s
+        LEFT JOIN loan_application l on l.loan_application_id = s.loan_application_id
+        where  l.loan_application_id is not null
+        <if test="userId != null "> and s.user_id = #{userId} = #{userId}</if>
+        <if test="enterpriseName != null  and enterpriseName != ''"> and l.enterprise_name like concat('%', #{enterpriseName}, '%')</if>
+        <if test="applicationAmount != null "> and l.application_amount = #{applicationAmount}</if>
+        GROUP BY l.loan_application_id
+        ORDER BY review_time desc
+    </select>
+
     <insert id="insertLoanApplication" parameterType="LoanApplication" useGeneratedKeys="true" keyProperty="loanApplicationId">
         insert into loan_application
         <trim prefix="(" suffix=")" suffixOverrides=",">