fix:企业端理事会详情

jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilController.java

@@ -6,12 +6,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.vo.LoginUser;
+import com.jero.data.entity.DetailForCaseCommittee;
 import com.jero.data.entity.PayCaseCouncil;
 import com.jero.data.entity.PayCaseCouncilSubitem;
 import com.jero.data.service.IPayCaseCouncilService;
 import com.jero.data.service.IPayCaseCouncilSubitemService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,7 +63,20 @@ public class PayCaseCouncilController extends JeroController<PayCaseCouncil, IPa
 		 return Result.OK("添加成功！");
 	 }
 
+	 /**
+	  * 分标委表-企业端通过理事会id查询详情
+	  *
+	  * @param id
+	  * @return
+	  */
+	 @ApiOperation(value="分标委表-企业端通过理事会id查询详情", notes="分标委表-企业端通过理事会id查询详情")
+	 @GetMapping(value = "/detail")
+	 public Result<?> detail(@RequestParam(name="id",required = true) String id) {
 
+		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		 DetailForCaseCommittee detailForCaseCommittee  = payCaseCouncilService.detail(id,sysUser.getId());
+		 return Result.OK(detailForCaseCommittee);
+	 }
 
 	 /**
 	  *  编辑

jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilMapper.java

@@ -1,5 +1,6 @@
 package com.jero.data.mapper;
 
+import com.jero.data.entity.DetailForCaseCommittee;
 import com.jero.data.entity.PayCaseCouncil;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -11,4 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface PayCaseCouncilMapper extends BaseMapper<PayCaseCouncil> {
 
+    DetailForCaseCommittee detail(String id, String userId);
+
 }

jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilMapper.xml

@@ -2,4 +2,24 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jero.data.mapper.PayCaseCouncilMapper">
 
+    <resultMap id="searchFile" type="com.jero.data.entity.DetailForCaseCommittee">
+        <id property="id" column="id"></id>
+        <result property="name" column="name"></result>
+        <result property="remarks" column="remarks"></result>
+        <result property="principal" column="principal"></result>
+        <collection property="files" ofType="com.jero.data.entity.Files" javaType="java.util.List" select="listForChildren" column="{id=id,userId=userId}" >
+            <result property="fileId" column="fileId"></result>
+            <result property="fileName" column="fileName"></result>
+            <result property="createTime" column="createTime"></result>
+        </collection>
+    </resultMap>
+
+    <select id="detail" resultMap="searchFile">
+        SELECT  pcc.name,pcc.id,pcc.remarks,pcc.create_by as principal ,#{userId} as userId FROM pay_case_council pcc where pcc.id=#{id}
+     </select>
+    <select id="listForChildren" resultType="com.jero.data.entity.Files">
+        SELECT  ossf.id as fileId,ossf.file_name as fileName,ossf.create_time as createTime FROM pay_case_council pcc left join pay_working_group_distribution_record pwgdr on(pcc.id=pwgdr.project_id) left join oss_file
+           ossf on(pwgdr.file_id=ossf.id) where pcc.id=#{id}
+             and pwgdr.contacts_id=#{userId} group by pwgdr.id
+    </select>
 </mapper>

jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilService.java

@@ -1,5 +1,6 @@
 package com.jero.data.service;
 
+import com.jero.data.entity.DetailForCaseCommittee;
 import com.jero.data.entity.PayCaseCouncil;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -11,4 +12,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IPayCaseCouncilService extends IService<PayCaseCouncil> {
 
+    DetailForCaseCommittee detail(String id, String userId);
+
 }

jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilServiceImpl.java

@@ -1,5 +1,6 @@
 package com.jero.data.service.impl;
 
+import com.jero.data.entity.DetailForCaseCommittee;
 import com.jero.data.entity.PayCaseCouncil;
 import com.jero.data.mapper.PayCaseCouncilMapper;
 import com.jero.data.service.IPayCaseCouncilService;
@@ -7,6 +8,8 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.annotation.Resource;
+
 /**
  * @Description: pay_case_council
  * @Author: jeecg-boot
@@ -16,4 +19,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class PayCaseCouncilServiceImpl extends ServiceImpl<PayCaseCouncilMapper, PayCaseCouncil> implements IPayCaseCouncilService {
 
+    @Resource
+    private PayCaseCouncilMapper payCaseCouncilMapper;
+    @Override
+    public DetailForCaseCommittee detail(String id, String userId) {
+        return payCaseCouncilMapper.detail(id,userId);
+    }
 }