1

ruoyi-admin/pom.xml

@@ -61,6 +61,7 @@
             <artifactId>ruoyi-generator</artifactId>
         </dependency>
 
+
     </dependencies>
 
     <build>

ruoyi-admin/src/main/java/com/ruoyi/web/controller/projectV2/ZsyzSbbzbController.java

@@ -68,7 +68,7 @@ public class ZsyzSbbzbController extends BaseController
     /**
      * 导出招商引资_申报_首谈信息_主列表
      */
-    @PreAuthorize("@ss.hasPermi('projectV2:sbbzb:export')")
+    /*@PreAuthorize("@ss.hasPermi('projectV2:sbbzb:export')")
     @Log(title = "招商引资_申报_首谈信息_主", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, ZsyzSbbzb zsyzSbbzb)
@@ -82,8 +82,28 @@ public class ZsyzSbbzbController extends BaseController
         }
         util.exportExcel(response, list, "招商引资_项目信息");
 
+    }*/
+
+    /**
+     * 导出招商引资_申报_首谈信息_主列表
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:sbbzb:export')")
+    @Log(title = "招商引资_申报_首谈信息_主", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public AjaxResult export(@RequestBody ZsyzSbbzb zsyzSbbzb)
+    {
+        List<ZsyzSbbzb> list = zsyzSbbzbService.selectZsyzSbbzbListDc(zsyzSbbzb);
+        ExcelUtil<ZsyzSbbzb> util = new ExcelUtil<ZsyzSbbzb>(ZsyzSbbzb.class);
+        if ("1".equals(zsyzSbbzb.getExportType())) {
+            // 不显示用户ID（单个）
+            util.hideColumn("sbdw","tbrq","zszxfzr","yzdqName","yzssName","ntze","xmlb","czpt","tzzt","gtzzrsfzhm","qytzrxyzdm","tzfjj",
+                    "sndxse","sndnse","tzrxm","tzrzw","tzrdh","xmjj","phone","zw","progress","xmStatus","meetRemark","zsyzQyxx","zsyzKgxx","zsyzTcxx");
+        }
+        return util.exportExcel(list, "招商引资_项目信息");
+
     }
 
+
     /**
      * 获取招商引资_申报_首谈信息_主详细信息
      */

ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -84,6 +84,7 @@ import com.ruoyi.common.utils.file.FileTypeUtils;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.common.utils.file.ImageUtils;
 import com.ruoyi.common.utils.reflect.ReflectUtils;
+import org.springframework.scheduling.annotation.Async;
 
 /**
  * Excel相关处理
@@ -487,6 +488,7 @@ public class ExcelUtil<T>
      * @param sheetName 工作表的名称
      * @return 结果
      */
+    @Async
     public AjaxResult exportExcel(List<T> list, String sheetName)
     {
         return exportExcel(list, sheetName, StringUtils.EMPTY);
@@ -597,6 +599,7 @@ public class ExcelUtil<T>
         {
             writeSheet();
             wb.write(response.getOutputStream());
+
         }
         catch (Exception e)
         {
@@ -622,7 +625,7 @@ public class ExcelUtil<T>
             String filename = encodingFilename(sheetName);
             out = new FileOutputStream(getAbsoluteFile(filename));
             wb.write(out);
-            return AjaxResult.success(filename);
+            return AjaxResult.success("/profile/download/"+filename);
         }
         catch (Exception e)
         {

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/projectV2/ZsyzSbbzbServiceImpl.java

@@ -329,20 +329,29 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
     @Override
     @DataScope(deptAlias = "s")
     public List<ZsyzSbbzb> selectZsyzSbbzbListDc(ZsyzSbbzb zsyzSbbzb) {
-
+        Map<String, Object> paramsMap = zsyzSbbzb.getParams();
+        Object year = paramsMap.get("year");
+        if (ObjectUtils.isNotEmpty(year)){
+            paramsMap.put("beginTime",year+"0101");
+            paramsMap.put("endTime",year+"1231");
+        }
         List<ZsyzSbbzb> zsyzSbbzbList = zsyzSbbzbMapper.selectZsyzSbbzbListDc(zsyzSbbzb);
-        for (ZsyzSbbzb sbbzb : zsyzSbbzbList) {
 
-            //查询投资方
-            XmProjectInvestor xmProjectInvestor = new XmProjectInvestor();
-            xmProjectInvestor.setXmId(sbbzb.getId());
-            List<XmProjectInvestor> xmProjectInvestorList = xmProjectInvestorMapper.selectXmProjectInvestorList(xmProjectInvestor);
-            sbbzb.setXmProjectInvestor(xmProjectInvestorList);
-            //查询自然人
-            XmProjectPersion xmProjectPersion = new XmProjectPersion();
-            xmProjectPersion.setXmId(sbbzb.getId());
-            List<XmProjectPersion> xmProjectPersionList = xmProjectPersionMapper.selectXmProjectPersionList(xmProjectPersion);
-            sbbzb.setXmProjectPersion(xmProjectPersionList);
+        List<XmProjectInvestor> xmProjectInvestorList = xmProjectInvestorMapper.selectXmProjectInvestorList(new XmProjectInvestor());
+        List<XmProjectPersion> xmProjectPersionList = xmProjectPersionMapper.selectXmProjectPersionList(new XmProjectPersion());
+
+        //一项目id进行分组
+        //查询投资方
+        Map<String,List<XmProjectInvestor>> mapXmProjectInvestor = xmProjectInvestorList.stream().collect(Collectors.groupingBy(XmProjectInvestor::getXmbh));
+        //查询自然人
+        Map<String,List<XmProjectPersion>> mapXmProjectPersion = xmProjectPersionList.stream().collect(Collectors.groupingBy(XmProjectPersion::getXmbh));
+        for (ZsyzSbbzb sbbzb : zsyzSbbzbList) {
+            if(mapXmProjectInvestor.get(sbbzb.getXmbh())!=null){
+                sbbzb.setXmProjectInvestor(mapXmProjectInvestor.get(sbbzb.getXmbh()));
+            }
+            if(mapXmProjectPersion.get(sbbzb.getXmbh())!=null){
+                sbbzb.setXmProjectPersion(mapXmProjectPersion.get(sbbzb.getXmbh()));
+            }
         }
 
         return zsyzSbbzbList;

ruoyi-system/src/main/resources/mapper/system/fgw/FgwJdapMapper.xml

@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
-    <select id="selectFgwJdapNum" resultMap="FgwJdapResult">
+    <!--<select id="selectFgwJdapNum" resultMap="FgwJdapResult">
         SELECT
             ANY_VALUE(id) as id,
             xm_id
@@ -61,9 +61,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and sfwc = '0'
         GROUP BY
             xm_id
-    </select>
+    </select>-->
 
-    <!--<select id="selectFgwJdapNum" resultMap="FgwJdapResult">
+    <select id="selectFgwJdapNum" resultMap="FgwJdapResult">
         SELECT
             id,
             xm_id
@@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and sfwc = '0'
         GROUP BY
             xm_id
-    </select>-->
+    </select>
     <select id="selectFgwJdapCqxmNum" resultMap="FgwJdapResult">
         SELECT
             xm_id

ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzLcjlMapper.xml

@@ -44,18 +44,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
-<!--    <select id="selectZsyzLcjlListQc" parameterType="ZsyzLcjl" resultMap="ZsyzLcjlResult">
+    <select id="selectZsyzLcjlListQc" parameterType="ZsyzLcjl" resultMap="ZsyzLcjlResult">
         select ANY_VALUE(a.id) as id, ANY_VALUE(a.xm_id) as xm_id, ANY_VALUE(a.xmbh) as xmbh, ANY_VALUE(a.xmmc)as xmmc,
                ANY_VALUE(a.dept_id) as dept_id, ANY_VALUE(a.dept_name) as dept_name, ANY_VALUE(MAX(a.cl_time)) as cl_time, ANY_VALUE(a.progress) as progress, ANY_VALUE(a.xm_status) as xm_status
         from (select id, xm_id, xmbh, xmmc, dept_id, dept_name, cl_time, progress, xm_status
         from zsyz_lcjl order by xm_id, cl_time desc) a group by xm_id
-    </select>-->
+    </select>
 
-    <select id="selectZsyzLcjlListQc" resultType="com.ruoyi.system.domain.projectV2.ZsyzLcjl">
+   <!-- <select id="selectZsyzLcjlListQc" resultType="com.ruoyi.system.domain.projectV2.ZsyzLcjl">
         select id, xm_id, xmbh, xmmc,dept_id, dept_name, MAX(cl_time) as cl_time, progress, xm_status
         from (select id, xm_id, xmbh, xmmc, dept_id, dept_name, cl_time , progress, xm_status
         from zsyz_lcjl order by xm_id, cl_time desc) a group by xm_id
-    </select>
+    </select>-->
 
     <insert id="insertZsyzLcjl" parameterType="ZsyzLcjl" useGeneratedKeys="true" keyProperty="id">
         insert into zsyz_lcjl

ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzSbbzbMapper.xml

@@ -462,24 +462,24 @@
             <if test="isMeet != null  and isMeet != ''">and s.is_meet = #{isMeet}</if>
             <if test="meetRemark != null  and meetRemark != ''">and s.meet_remark = #{meetRemark}</if>
             <if test="shjg != null  and shjg != ''">and s.shjg = #{shjg}</if>
-            /*下面所有时间判断勿动*/
+            <!--下面所有时间判断勿动-->
             <if test="params.beginTime != null and params.beginTime != '' and progress == null"><!-- 开始时间检索 -->
-             AND(
-                    ( date_format(s.tbrq,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
-                    AND date_format(s.tbrq,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
-                    )
-                    or
-                    ( date_format(q.qyrq,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
-                    AND date_format(q.qyrq,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
-                    )
-                    or
-                     ( date_format(k.kgrq,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
-                    AND date_format(k.kgrq,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
-                    )
-                    or
-                    ( date_format(t.tcrq,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
-                    AND date_format(t.tcrq,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
-                    )
+                AND(
+                ( date_format(s.tbrq,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
+                AND date_format(s.tbrq,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
+                )
+                or
+                ( date_format(q.qyrq,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
+                AND date_format(q.qyrq,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
+                )
+                or
+                ( date_format(k.kgrq,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
+                AND date_format(k.kgrq,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
+                )
+                or
+                ( date_format(t.tcrq,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
+                AND date_format(t.tcrq,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
+                )
                 )
             </if>
             <if test="params.beginTime != null and params.beginTime != '' and progress != null and progress == '3'.toString()"><!-- 开始时间检索 -->
@@ -518,7 +518,7 @@
             <if test="params.endTime != null and params.endTime != '' and progress != null and progress == '2'.toString()"><!-- 结束时间检索 -->
                 AND date_format(s.tbrq,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
             </if>
-            /*时间判断结束*/
+            <!--时间判断结束-->
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
@@ -1199,7 +1199,7 @@
         <if test="progress != null  and progress != ''">and find_in_set(s.progress , #{progress})</if>
         <if test="xmStatus != null  and xmStatus != ''">and s.xm_status = #{xmStatus}</if>
         <if test="cjdId != null ">and cjd_id = #{cjdId}</if>
-        /*下面所有时间判断勿动*/
+        <!--下面所有时间判断勿动-->
         <if test="params.beginTime != null and params.beginTime != '' and progress == null"><!-- 开始时间检索 -->
             AND(
             ( date_format(s.tbrq,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
@@ -1255,7 +1255,7 @@
         <if test="params.endTime != null and params.endTime != '' and progress != null and progress == '2'.toString()"><!-- 结束时间检索 -->
             AND date_format(s.tbrq,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
         </if>
-        /*时间判断结束*/
+        <!--时间判断结束-->
         order by s.update_time desc)
         UNION
         (
@@ -1414,7 +1414,7 @@
         <if test="progress != null  and progress != ''">and find_in_set(s.progress , #{progress})</if>
         <if test="xmStatus != null  and xmStatus != ''">and s.xm_status = #{xmStatus}</if>
         <if test="cjdId != null ">and cjd_id = #{cjdId}</if>
-        /*下面所有时间判断勿动*/
+        <!--下面所有时间判断勿动-->
         <if test="params.beginTime != null and params.beginTime != '' and progress == null"><!-- 开始时间检索 -->
             AND(
             ( date_format(s.tbrq,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
@@ -1470,7 +1470,7 @@
         <if test="params.endTime != null and params.endTime != '' and progress != null and progress == '2'.toString()"><!-- 结束时间检索 -->
             AND date_format(s.tbrq,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
         </if>
-        /*时间判断结束*/
+        <!--时间判断结束-->
         order by s.update_time desc)
 
 

ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzShyjMapper.xml

@@ -48,7 +48,7 @@
     </select>
 
 
-    <!--<select id="selectZsyzShyjListByWt" resultMap="ZsyzShyjResult">
+    <select id="selectZsyzShyjListByWt" resultMap="ZsyzShyjResult">
         SELECT
         ANY_VALUE ( s.id ) as id,
         ANY_VALUE ( s.xm_id ) as xm_id ,
@@ -65,20 +65,20 @@
         <where>
             s.shjg = '3'
             <if test="xmmc != null  and xmmc != ''">and s.xmmc like concat( #{xmmc}, '%') </if>
-            <if test="params.beginTime != null and params.beginTime != ''">&lt;!&ndash; 开始时间检索 &ndash;&gt;
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
                 AND date_format(s.create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
             </if>
-            <if test="params.endTime != null and params.endTime != ''">&lt;!&ndash; 结束时间检索 &ndash;&gt;
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
                 AND date_format(s.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
             </if>
         </where>
-        &lt;!&ndash; 数据范围过滤 &ndash;&gt;
+        <!-- 数据范围过滤 -->
         ${params.dataScope}
         GROUP BY
         s.xm_id
-    </select>-->
+    </select>
 
-<!--    <select id="selectZsyzShyjListByWt" resultMap="ZsyzShyjResult">
+    <!--<select id="selectZsyzShyjListByWt" resultMap="ZsyzShyjResult">
         SELECT
         s.id,
         s.xm_id ,