导出修改

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

@@ -77,6 +77,11 @@ public class ZsyzSbbzbController extends BaseController
     {
         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");
+        }
         util.exportExcel(response, list, "招商引资_项目信息");
 
     }

ruoyi-system/src/main/java/com/ruoyi/system/domain/projectV2/ZsyzJzqk.java

@@ -23,23 +23,23 @@ public class ZsyzJzqk extends BaseEntity
     private Long id;
 
     /** 项目ID */
-    @Excel(name = "项目ID")
+    //@Excel(name = "项目ID")
     private Long xmId;
 
     /** 项目编号 */
-    @Excel(name = "项目编号")
+    //@Excel(name = "项目编号")
     private String xmbh;
 
     /** 项目名称 */
-    @Excel(name = "项目名称")
+    //@Excel(name = "项目名称")
     private String xmmc;
 
     /** 部门id */
-    @Excel(name = "部门id")
+    //@Excel(name = "部门id")
     private Long deptId;
 
     /** 部门名称 */
-    @Excel(name = "部门名称")
+    //@Excel(name = "部门名称")
     private String deptName;
 
     /** 洽谈人 */

ruoyi-system/src/main/java/com/ruoyi/system/domain/projectV2/ZsyzKgxx.java

@@ -23,11 +23,11 @@ public class ZsyzKgxx extends BaseEntity
     private Long id;
 
     /** 项目ID */
-    @Excel(name = "项目ID")
+    //@Excel(name = "项目ID")
     private Long xmId;
 
     /** 项目编号 */
-    @Excel(name = "项目编号")
+    //@Excel(name = "项目编号")
     private String xmbh;
 
     /**
@@ -43,7 +43,7 @@ public class ZsyzKgxx extends BaseEntity
         this.xmxsmc = xmxsmc;
     }
     /** 项目名称 */
-    @Excel(name = "项目名称")
+    //@Excel(name = "项目名称")
     private String xmmc;
 
     /** 开工日期 */

ruoyi-system/src/main/java/com/ruoyi/system/domain/projectV2/ZsyzQyxx.java

@@ -23,16 +23,17 @@ public class ZsyzQyxx extends BaseEntity
     private Long id;
 
     /** 项目ID */
-    @Excel(name = "项目ID")
+    //@Excel(name = "项目ID")
     private Long xmId;
 
     /** 项目编号 */
-    @Excel(name = "项目编号")
+    //@Excel(name = "项目编号")
     private String xmbh;
 
     /**
      * 项目线索名称
      */
+    @Excel(name = "项目线索名称")
     private String xmxsmc;
 
     public String getXmxsmc() {
@@ -95,15 +96,15 @@ public class ZsyzQyxx extends BaseEntity
     private String xmszd;
 
     /** 所属行业 字典 */
-    @Excel(name = "所属行业 字典")
+    @Excel(name = "所属行业", readConverterExp = "1=智能 (汽车) 制造,2=装备制造,3=轻工制造,4=新材料,5=新能源,6=生物医药,7=石油化工,8=电子元器件 (信息),9=汽车零部件,10=纺织服装,11=农产品深加工,12=食品加工,13=大数据,14=大健康,15=文化旅游,16=现代服务业,17=三产融台,18=其他 ")
     private String sshy;
 
-    /** 投资方式（1：独资，2：合资，3：合作，4：收购，5：参股，6：兼并，7：其他） */
-    @Excel(name = "投资方式")
+    /** 投资方式（1=独资，2=合资,3=合作,4=收购,5=参股,6=兼并,7=其他） */
+    @Excel(name = "投资方式", readConverterExp = "1=独资,2=合资,3=合作,4=收购,5=参股,6=兼并,7=其他")
     private String tzfs;
 
     /** 建设方式（1：新建，2：改建，3：扩建，4：租赁） */
-    @Excel(name = "建设方式")
+    @Excel(name = "建设方式", readConverterExp = "1=新建,2=改建,3=扩建,4=租赁")
     private String jsfs;
 
     /** 是否宜商（1：是，2：否） */
@@ -160,7 +161,7 @@ public class ZsyzQyxx extends BaseEntity
     private Date nkgrq;
 
     /** 文件地址 */
-    @Excel(name = "文件地址")
+    //@Excel(name = "文件地址")
     private String path;
 
     /** 附件集合 */

ruoyi-system/src/main/java/com/ruoyi/system/domain/projectV2/ZsyzSbbzb.java

@@ -65,7 +65,7 @@ public class ZsyzSbbzb extends BaseEntity
     private String ntze;
 
     /** 产业类型id */
-    @Excel(name = "产业类型id")
+    //@Excel(name = "产业类型id")
     private String cylxId;
 
     /** 产业类型名称 */
@@ -93,7 +93,7 @@ public class ZsyzSbbzb extends BaseEntity
     private String tzzt;
 
     /** 项目进度 */
-    @Excel(name = "项目进度")
+    //@Excel(name = "项目进度")
     private String xmjz;
 
     /** 个体投资人身份证号码 */
@@ -154,40 +154,41 @@ public class ZsyzSbbzb extends BaseEntity
     private String zw;
 
     /** 申请人用户ID */
-    @Excel(name = "申请人用户ID")
+    //@Excel(name = "申请人用户ID")
     private Long userId;
 
     /** 申报状态 1:正常 2:暂缓 */
-    @Excel(name = "申报状态 1:正常 2:暂缓")
+    //@Excel(name = "申报状态 1:正常 2:暂缓")
     private String type;
 
     /** 项目进度 1:项目首谈 2:项目承接 3:项目签约 4:项目开工 5:项目投产  */
-    @Excel(name = "项目进度 1=项目首谈待审核, 2=项目首谈已审核, 3=线索分发要素部门, 4=线索已指派, 5=线索已承接, 6=签约待审核, 7=签约已审核, 8=开工待审核, 9=开工已审核, 10=投产待审核, 11=投产已审核, 12=项目已入归")
+    @Excel(name = "项目进度",readConverterExp =" 1=项目首谈, 2=项目承接, 3=项目签约, 4=项目开工, 5=项目投产")
     private String progress;
 
     /**
      * 项目状态 1:待审核 2:已通过 3:被退回
      */
+    @Excel(name = "项目状态",readConverterExp ="1=待审核, 2=已通过, 3=被退回")
     private String xmStatus;
 
     /** 申请人部门ID */
-    @Excel(name = "申请人部门ID")
+    //@Excel(name = "申请人部门ID")
     private Long deptId;
 
     /** 是否删除 N:否 Y:是 */
-    @Excel(name = "是否删除 N:否 Y:是")
+    //@Excel(name = "是否删除 N:否 Y:是")
     private String isDel;
 
     /** 承接地id */
-    @Excel(name = "承接地id")
+    //@Excel(name = "承接地id")
     private Long cjdId;
 
     /** 承接地部门名称 */
-    @Excel(name = "承接地部门名称")
+    @Excel(name = "承接地")
     private String cjdName;
 
     /** 是否需要会议支持 N:否 Y:是 */
-    @Excel(name = "是否需要会议支持 N=否, Y=是")
+    //@Excel(name = "是否需要会议支持 N=否, Y=是")
     private String isMeet;
 
     /** 会议申请备注 */
@@ -214,7 +215,7 @@ public class ZsyzSbbzb extends BaseEntity
 
 
     /** 签约信息对象 */
-    @Excels({
+    /*@Excels({
             @Excel(name = "企业注册名称+项目名称", targetAttr = "xmmc"),
             @Excel(name = "建设内容", targetAttr = "jsnr"),
             @Excel(name = "对方签约人", targetAttr = "dfqyr"),
@@ -240,24 +241,26 @@ public class ZsyzSbbzb extends BaseEntity
             @Excel(name = "经营范围", targetAttr = "jyfw"),
             @Excel(name = "立项日期", targetAttr = "lxrq", width = 30, dateFormat = "yyyy-MM-dd"),
             @Excel(name = "计划开工日期", targetAttr = "nkgrq", width = 30, dateFormat = "yyyy-MM-dd")
-    })
+    })*/
+    @Excel(name = "签约信息")
     private ZsyzQyxx zsyzQyxx;
 
 
 
     /** 开工信息对象 */
-    @Excels({
+    /*@Excels({
             @Excel(name = "开工日期", targetAttr = "kgrq", width = 30, dateFormat = "yyyy-MM-dd"),
             @Excel(name = "拟竣工日期", targetAttr = "njgrq", width = 30, dateFormat = "yyyy-MM-dd"),
             @Excel(name = "拟投产时间", targetAttr = "ntcsj", width = 30, dateFormat = "yyyy-MM-dd"),
             //@Excel(name = "分期投资情况", targetAttr = "jsnr"), 没有这个字段吧
             //@Excel(name = "备注", targetAttr = "remark")
-    })
+    })*/
+    @Excel(name = "开工信息")
     private ZsyzKgxx zsyzKgxx;
 
 
     /** 投产信息对象 */
-    @Excels({
+    /*@Excels({
             @Excel(name = "投产日期", targetAttr = "tcrq", width = 30, dateFormat = "yyyy-MM-dd"),
             @Excel(name = "实际到资额（万元）", targetAttr = "sjdze"),
             @Excel(name = "用地面积（亩）", targetAttr = "ydmj"),
@@ -266,18 +269,35 @@ public class ZsyzSbbzb extends BaseEntity
             //@Excel(name = "新增应税销售额", targetAttr = "xjcf"),
             //@Excel(name = "租赁厂房项目增值税抵扣设备投资额", targetAttr = "xjcf"),
             //@Excel(name = "备注", targetAttr = "remark")
-    })
+    })*/
+    @Excel(name = "投产信息")
     private ZsyzTcxx zsyzTcxx;
 
-    // todo 最新进展
+    //项目进展
+    @Excel(name = "项目进展情况")
+    private List<ZsyzJzqk> zsyzJzqkList;
 
-   /* @Excels({
-            @Excel(name = "进展情况", targetAttr = "sjdze"),
-            @Excel(name = "存在问题", targetAttr = "ydmj"),
-            @Excel(name = "解决建议", targetAttr = "xjcf"),
-            @Excel(name = "下一步工作计划", targetAttr = "sbfp")
-    })
-    private ZsyzTcxx zsyzTcxx;*/
+
+    /***
+     * 导出控制字段（1：列表导出，2详情导出）
+     */
+    private String exportType;
+
+    public List<ZsyzJzqk> getZsyzJzqkList() {
+        return zsyzJzqkList;
+    }
+
+    public String getExportType() {
+        return exportType;
+    }
+
+    public void setZsyzJzqkList(List<ZsyzJzqk> zsyzJzqkList) {
+        this.zsyzJzqkList = zsyzJzqkList;
+    }
+
+    public void setExportType(String exportType) {
+        this.exportType = exportType;
+    }
 
     public String getXmStatus() {
         return xmStatus;

ruoyi-system/src/main/java/com/ruoyi/system/domain/projectV2/ZsyzTcxx.java

@@ -23,11 +23,11 @@ public class ZsyzTcxx extends BaseEntity
     private Long id;
 
     /** 项目ID */
-    @Excel(name = "项目ID")
+    //@Excel(name = "项目ID")
     private Long xmId;
 
     /** 项目编号 */
-    @Excel(name = "项目编号")
+    //@Excel(name = "项目编号")
     private String xmbh;
 
     /**
@@ -43,7 +43,7 @@ public class ZsyzTcxx extends BaseEntity
         this.xmxsmc = xmxsmc;
     }
     /** 项目名称 */
-    @Excel(name = "项目名称")
+    //@Excel(name = "项目名称")
     private String xmmc;
 
     /** 投产日期 */
@@ -66,67 +66,67 @@ public class ZsyzTcxx extends BaseEntity
     private String tcgjrsjh;
 
     /** 实际到资额（万元） */
-    @Excel(name = "实际到资额", readConverterExp = "万=元")
+    @Excel(name = "实际到资额（万元）" )
     private String sjdze;
 
     /** 用地面积（亩） */
-    @Excel(name = "用地面积", readConverterExp = "亩=")
+    @Excel(name = "用地面积（亩）")
     private String ydmj;
 
     /** 土地出让（万元） */
-    @Excel(name = "土地出让", readConverterExp = "万=元")
+    @Excel(name = "土地出让（万元）")
     private String tdcr;
 
     /** 新建厂房（平方米） */
-    @Excel(name = "新建厂房", readConverterExp = "平=方米")
+    @Excel(name = "新建厂房（平方米）")
     private String xjcf;
 
     /** 厂房投入（万元） */
-    @Excel(name = "厂房投入", readConverterExp = "万=元")
+    @Excel(name = "厂房投入（万元）")
     private String cftr;
 
     /** 设备清单（万元） */
-    @Excel(name = "设备清单", readConverterExp = "万=元")
+    @Excel(name = "设备清单（万元）")
     private String sbqd;
 
     /** 设备发票（万元） */
-    @Excel(name = "设备发票", readConverterExp = "万=元")
+    @Excel(name = "设备发票（万元）")
     private String sbfp;
 
     /** 设备合同（万元） */
-    @Excel(name = "设备合同", readConverterExp = "万=元")
+    @Excel(name = "设备合同（万元）")
     private String sbht;
 
     /** 付款凭证（万元） */
-    @Excel(name = "付款凭证", readConverterExp = "万=元")
+    @Excel(name = "付款凭证（万元）")
     private String fkpz;
 
     /** 租赁厂房（平方米） */
-    @Excel(name = "租赁厂房", readConverterExp = "平=方米")
+    @Excel(name = "租赁厂房（平方米）")
     private String zlcf;
 
     /** 租赁厂房投入（万元） */
-    @Excel(name = "租赁厂房投入", readConverterExp = "万=元")
+    @Excel(name = "租赁厂房投入（万元）")
     private String zlcftr;
 
     /** 租赁设备清单（万元） */
-    @Excel(name = "租赁设备清单", readConverterExp = "万=元")
+    @Excel(name = "租赁设备清单（万元）")
     private String zlsbqd;
 
     /** 租赁设备发票（万元） */
-    @Excel(name = "租赁设备发票", readConverterExp = "万=元")
+    @Excel(name = "租赁设备发票（万元）")
     private String zlsbfp;
 
     /** 租赁设备合同（万元） */
-    @Excel(name = "租赁设备合同", readConverterExp = "万=元")
+    @Excel(name = "租赁设备合同（万元）")
     private String zlsbht;
 
     /** 租赁付款凭证（万元） */
-    @Excel(name = "租赁付款凭证", readConverterExp = "万=元")
+    @Excel(name = "租赁付款凭证（万元）")
     private String zlfkpz;
 
     /** 实缴税收（万元） */
-    @Excel(name = "实缴税收", readConverterExp = "万=元")
+    @Excel(name = "实缴税收（万元）")
     private String sjss;
 
     /** 连续几个月 */
@@ -138,11 +138,11 @@ public class ZsyzTcxx extends BaseEntity
     private String jnsb;
 
     /** 装备投入（万元） */
-    @Excel(name = "装备投入", readConverterExp = "万=元")
+    @Excel(name = "装备投入(万元)")
     private String zbtr;
 
     /** 会计年度实缴税收（万元） */
-    @Excel(name = "会计年度实缴税收", readConverterExp = "万=元")
+    @Excel(name = "会计年度实缴税收(万元)")
     private String ndsjss;
 
     /** 其他 */

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

@@ -60,6 +60,7 @@
         <association property="zsyzKgxx" javaType="ZsyzKgxx" resultMap="ZsyzKgxxResult"/>
         <association property="zsyzTcxx" javaType="ZsyzTcxx" resultMap="ZsyzTcxxResult"/>
         <collection property="shyjList" javaType="java.util.List" resultMap="ZsyzShyjResult"/>
+        <collection property="zsyzJzqkList" javaType="java.util.List" resultMap="ZsyzJzqkResult"/>
 
     </resultMap>
 
@@ -178,6 +179,32 @@
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
     </resultMap>
+
+    <resultMap type="ZsyzJzqk" id="ZsyzJzqkResult">
+        <result property="id"    column="id"    />
+        <result property="xmId"    column="xm_id"    />
+        <result property="xmbh"    column="xmbh"    />
+        <result property="xmmc"    column="xmmc"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
+        <result property="qtrName"    column="qtr_name"    />
+        <result property="qtTime"    column="qt_time"    />
+        <result property="qtrxz"    column="qtrxz"    />
+        <result property="qtrdwzw"    column="qtrdwzw"    />
+        <result property="phone"    column="phone"    />
+        <result property="blsx"    column="blsx"    />
+        <result property="dbsx"    column="dbsx"    />
+        <result property="jzqk"    column="jzqk"    />
+        <result property="czwt"    column="czwt"    />
+        <result property="jjjy"    column="jjjy"    />
+        <result property="gzjh"    column="gzjh"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
     <sql id="selectZsyzSbbzbVo">
         select id,
                sbdw,
@@ -347,10 +374,13 @@
         t.zlcftr, t.zlsbqd, t.zlsbfp, t.zlsbht, t.zlfkpz, t.sjss, t.lxy, t.jnsb, t.zbtr, t.ndsjss, t.qt, t.create_by,
         t.create_time, t.update_by,
         t.update_time, t.remark
+        j.id, j.xm_id, j.xmbh, j.xmmc, j.dept_id, j.dept_name, j.qtr_name, j.qt_time, j.qtrxz, j.qtrdwzw, j.phone, j.blsx,
+        j.dbsx, j.jzqk, j.czwt, j.jjjy, j.gzjh
         from zsyz_sbbzb s
         left join zsyz_qyxx q on s.id = q.xm_id
         left join zsyz_kgxx k on s.id = k.xm_id
         left join zsyz_tcxx t on s.id = t.xm_id
+        left join zsyz_jzqk j on s.id = j.xm_id
         <where>
             s.is_del = 'N'
             <if test="sbdw != null  and sbdw != ''">and s.sbdw = #{sbdw}</if>