导出

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

@@ -33,10 +33,10 @@ public class ZsyzLdpsController extends BaseController
 {
     @Autowired
     private IZsyzLdpsService zsyzLdpsService;
-
     /**
      * 查询招商引资_领导批示列表
      */
+
     @PreAuthorize("@ss.hasPermi('system:ldps:list')")
     @GetMapping("/list")
     public TableDataInfo list(ZsyzLdps zsyzLdps)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -234,4 +234,6 @@ public class SysUserController extends BaseController {
     public AjaxResult deptTree(SysDept dept) {
         return success(deptService.selectDeptTreeList(dept));
     }
+
+
 }

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

@@ -33,7 +33,7 @@ public class ZsyzQyxx extends BaseEntity
     /**
      * 项目线索名称
      */
-    @Excel(name = "项目线索名称")
+    @Excel(name = "项目线索名称", needMerge = true)
     private String xmxsmc;
 
     public String getXmxsmc() {
@@ -45,20 +45,20 @@ public class ZsyzQyxx extends BaseEntity
     }
 
     /** 项目名称 */
-    @Excel(name = "项目名称")
+    @Excel(name = "项目名称", needMerge = true)
     private String xmmc;
 
     /** 对方签约人 */
-    @Excel(name = "对方签约人")
+    @Excel(name = "对方签约人", needMerge = true)
     private String dfqyr;
 
     /** 我方签约人 */
-    @Excel(name = "我方签约人")
+    @Excel(name = "我方签约人", needMerge = true)
     private String wfqyr;
 
     /** 填报日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "填报日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "填报日期", width = 30, dateFormat = "yyyy-MM-dd", needMerge = true)
     private Date tbrq;
 
     /** 签约日期 */

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

@@ -25,43 +25,43 @@ public class ZsyzSbbzb extends BaseEntity
     private Long id;
 
     /** 单位名称 */
-    @Excel(name = "单位名称")
+    @Excel(name = "单位名称" ,width = 20, needMerge = true)
     private String sbdw;
 
     /** 填表日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "填表日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "填表日期", width = 30, dateFormat = "yyyy-MM-dd", needMerge = true)
     private Date tbrq;
 
     /** 项目负责人 */
-    @Excel(name = "项目负责人")
+    @Excel(name = "项目负责人", needMerge = true)
     private String zszxfzr;
 
     /** 项目线索名称 */
-    @Excel(name = "项目线索名称")
+    @Excel(name = "项目线索名称", needMerge = true)
     private String xmxsmc;
 
     /** 项目编号 */
-    @Excel(name = "项目编号")
+    @Excel(name = "项目编号", needMerge = true)
     private String xmbh;
 
     /** 是否为领航信息项目 1：是，2：否 */
-    @Excel(name = "是否为领航信息项目 1=是,2=否")
+    @Excel(name = "是否为领航信息项目 Y=是,N=否", needMerge = true)
     private String sfwlhxxxm;
 
     /** 引资地区 */
     private String yzdqId;
 
     /** 引资地区名称 */
-    @Excel(name = "引资地区")
+    @Excel(name = "引资地区", needMerge = true)
     private String yzdqName;
 
     /** 引资省市名称 */
-    @Excel(name = "引资省市")
+    @Excel(name = "引资省市", needMerge = true)
     private String yzssName;
 
     /** 拟投资额（亿元） */
-    @Excel(name = "拟投资额(亿元)")
+    @Excel(name = "拟投资额(亿元)", needMerge = true)
     private String ntze;
 
     /** 产业类型id */
@@ -69,27 +69,27 @@ public class ZsyzSbbzb extends BaseEntity
     private String cylxId;
 
     /** 产业类型名称 */
-    @Excel(name = "产业类型")
+    @Excel(name = "产业类型", needMerge = true)
     private String cylxName;
 
     /** 项目类别（1：首位产业，2：工业项目，3：战新产业，4：现代服务业，5：三产融合，6：共引共建项目，7：其他） */
-    @Excel(name = "项目类别", readConverterExp = "1=首位产业,2=工业项目,3=战新产业,4=现代服务业,5=三产融合,6=共引共建项目,7=其他")
+    @Excel(name = "项目类别", readConverterExp = "1=首位产业,2=工业项目,3=战新产业,4=现代服务业,5=三产融合,6=共引共建项目,7=其他", needMerge = true)
     private String xmlb;
 
     /** 投资类别 */
-    @Excel(name = "投资类别")
+    @Excel(name = "投资类别", needMerge = true)
     private String tzlb;
 
     /** 拟落户地 */
-    @Excel(name = "拟落户地")
+    @Excel(name = "拟落户地", needMerge = true)
     private String nlhd;
 
     /** 承载平台 */
-    @Excel(name = "承载平台")
+    @Excel(name = "承载平台", needMerge = true)
     private String czpt;
 
     /** 投资主体 */
-    @Excel(name = "投资主体")
+    @Excel(name = "投资主体", needMerge = true)
     private String tzzt;
 
     /** 项目进度 */
@@ -97,60 +97,60 @@ public class ZsyzSbbzb extends BaseEntity
     private String xmjz;
 
     /** 个体投资人身份证号码 */
-    @Excel(name = "个体投资人身份证号码")
+    @Excel(name = "个体投资人身份证号码", needMerge = true)
     private String gtzzrsfzhm;
 
     /** 企业投资人信用证代码 */
-    @Excel(name = "企业投资人信用证代码")
+    @Excel(name = "企业投资人信用证代码", needMerge = true)
     private String qytzrxyzdm;
 
     /** 企业背景（1：500强企业，2：上市公司，3：行业100强，4：头部企业，5：外资企业，6：民营企业，7：高新技术企业，8：其他） */
-    @Excel(name = "企业背景", readConverterExp = "1=500强企业,2=上市公司,3=行业100强,4=头部企业,5=外资企业,6=民营企业,7=高新技术企业,8=其他")
+    @Excel(name = "企业背景", readConverterExp = "1=500强企业,2=上市公司,3=行业100强,4=头部企业,5=外资企业,6=民营企业,7=高新技术企业,8=其他", needMerge = true)
     private String qybj;
 
     /** 投资方简介 */
-    @Excel(name = "投资方简介")
+    @Excel(name = "投资方简介", needMerge = true)
     private String tzfjj;
 
     /** 上年度销售额(万元) */
-    @Excel(name = "上年度销售额(万元)")
+    @Excel(name = "上年度销售额(万元)", needMerge = true)
     private String sndxse;
 
     /** 上年度纳税额(万元) */
-    @Excel(name = "上年度纳税额(万元)")
+    @Excel(name = "上年度纳税额(万元)", needMerge = true)
     private String sndnse;
 
     /** 投资人姓名 */
-    @Excel(name = "投资人姓名")
+    @Excel(name = "投资人姓名", needMerge = true)
     private String tzrxm;
 
     /** 投资人职务 */
-    @Excel(name = "投资人职务")
+    @Excel(name = "投资人职务", needMerge = true)
     private String tzrzw;
 
     /** 投资人电话 */
-    @Excel(name = "投资人电话")
+    @Excel(name = "投资人电话", needMerge = true)
     private String tzrdh;
 
     /** 项目简介 */
-    @Excel(name = "项目简介")
+    @Excel(name = "项目简介", needMerge = true)
     private String xmjj;
 
     /** 首谈人 */
-    @Excel(name = "首谈人")
+    @Excel(name = "首谈人", needMerge = true)
     private String name;
 
     /** 首谈日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "首谈日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "首谈日期", width = 30, dateFormat = "yyyy-MM-dd", needMerge = true)
     private Date strq;
 
     /** 首谈人手机号 */
-    @Excel(name = "首谈人手机号")
+    @Excel(name = "首谈人手机号", needMerge = true)
     private String phone;
 
     /** 首谈人职务 */
-    @Excel(name = "首谈人职务")
+    @Excel(name = "首谈人职务", needMerge = true)
     private String zw;
 
     /** 申请人用户ID */
@@ -162,13 +162,13 @@ public class ZsyzSbbzb extends BaseEntity
     private String type;
 
     /** 项目进度 1:项目首谈 2:项目承接 3:项目签约 4:项目开工 5:项目投产  */
-    @Excel(name = "项目进度",readConverterExp =" 1=项目首谈, 2=项目承接, 3=项目签约, 4=项目开工, 5=项目投产")
+    @Excel(name = "项目进度",readConverterExp =" 1=项目首谈, 2=项目承接, 3=项目签约, 4=项目开工, 5=项目投产", needMerge = true)
     private String progress;
 
     /**
      * 项目状态 1:待审核 2:已通过 3:被退回
      */
-    @Excel(name = "项目状态",readConverterExp ="1=待审核, 2=已通过, 3=被退回")
+    @Excel(name = "项目状态",readConverterExp ="1=待审核, 2=已通过, 3=被退回", needMerge = true)
     private String xmStatus;
 
     /** 申请人部门ID */
@@ -184,7 +184,7 @@ public class ZsyzSbbzb extends BaseEntity
     private Long cjdId;
 
     /** 承接地部门名称 */
-    @Excel(name = "承接地")
+    @Excel(name = "承接地", needMerge = true)
     private String cjdName;
 
     /** 是否需要会议支持 N:否 Y:是 */
@@ -192,7 +192,7 @@ public class ZsyzSbbzb extends BaseEntity
     private String isMeet;
 
     /** 会议申请备注 */
-    @Excel(name = "会议申请备注")
+    @Excel(name = "会议申请备注", needMerge = true)
     private String meetRemark;
 
     /**
@@ -215,62 +215,62 @@ public class ZsyzSbbzb extends BaseEntity
 
 
     /** 签约信息对象 */
-    /*@Excels({
-            @Excel(name = "企业注册名称+项目名称", targetAttr = "xmmc"),
-            @Excel(name = "建设内容", targetAttr = "jsnr"),
-            @Excel(name = "对方签约人", targetAttr = "dfqyr"),
-            @Excel(name = "我方签约人", targetAttr = "wfqyr"),
-            @Excel(name = "签约日期",targetAttr = "qyrq", width = 30, dateFormat = "yyyy-MM-dd"),
-            @Excel(name = "协议投资额（万元）", targetAttr = "xytze"),
-            @Excel(name = "市外资金（万元）", targetAttr = "swzj"),
-            @Excel(name = "固定资产投资额（万元）", targetAttr = "gdzctze"),
-            @Excel(name = "项目跟进人姓名", targetAttr = "xmgjrxm"),
-            @Excel(name = "项目跟进人职务", targetAttr = "xmgjrzw"),
-            @Excel(name = "项目跟进人手机号", targetAttr = "xmgjrsjh"),
-            @Excel(name = "项目所在地", targetAttr = "xmszd"),
-            @Excel(name = "所属行业", targetAttr = "sshy", readConverterExp = "1=智能 (汽车) 制造,2=装备制造,3=轻工制造,4=新材料,5=新能源,6=生物医药,7=石油化工,8=电子元器件 (信息),9=汽车零部件,10=纺织服装,11=农产品深加工,12=食品加工,13=大数据,14=大健康,15=文化旅游,16=现代服务业,17=三产融台,18=其他 "),
-            @Excel(name = "投资方式", targetAttr = "tzfs", readConverterExp = "1=独资,2=合资,3=合作,4=收购,5=参股,6=兼并,7=其他"),
-            @Excel(name = "建设方式", targetAttr = "jsfs", readConverterExp = "1=新建,2=改建,3=扩建,4=租赁"),
-            @Excel(name = "租赁厂房(平方米)", targetAttr = "zlcf"),
-            @Excel(name = "供地面积(亩)", targetAttr = "gdmj"),
+    @Excels({
+            @Excel(name = "企业注册名称+项目名称", targetAttr = "xmmc", needMerge = true),
+            @Excel(name = "建设内容", targetAttr = "jsnr", needMerge = true),
+            @Excel(name = "对方签约人", targetAttr = "dfqyr", needMerge = true),
+            @Excel(name = "我方签约人", targetAttr = "wfqyr", needMerge = true),
+            @Excel(name = "签约日期",targetAttr = "qyrq", width = 30, dateFormat = "yyyy-MM-dd", needMerge = true),
+            @Excel(name = "协议投资额（万元）", targetAttr = "xytze", needMerge = true),
+            @Excel(name = "市外资金（万元）", targetAttr = "swzj", needMerge = true),
+            @Excel(name = "固定资产投资额（万元）", targetAttr = "gdzctze", needMerge = true),
+            @Excel(name = "项目跟进人姓名", targetAttr = "xmgjrxm", needMerge = true),
+            @Excel(name = "项目跟进人职务", targetAttr = "xmgjrzw", needMerge = true),
+            @Excel(name = "项目跟进人手机号", targetAttr = "xmgjrsjh", needMerge = true),
+            @Excel(name = "项目所在地", targetAttr = "xmszd", needMerge = true),
+            @Excel(name = "所属行业", targetAttr = "sshy", readConverterExp = "1=智能 (汽车) 制造,2=装备制造,3=轻工制造,4=新材料,5=新能源,6=生物医药,7=石油化工,8=电子元器件 (信息),9=汽车零部件,10=纺织服装,11=农产品深加工,12=食品加工,13=大数据,14=大健康,15=文化旅游,16=现代服务业,17=三产融台,18=其他 ", needMerge = true),
+            @Excel(name = "投资方式", targetAttr = "tzfs", readConverterExp = "1=独资,2=合资,3=合作,4=收购,5=参股,6=兼并,7=其他", needMerge = true),
+            @Excel(name = "建设方式", targetAttr = "jsfs", readConverterExp = "1=新建,2=改建,3=扩建,4=租赁", needMerge = true),
+            @Excel(name = "租赁厂房(平方米)", targetAttr = "zlcf", needMerge = true),
+            @Excel(name = "供地面积(亩)", targetAttr = "gdmj", needMerge = true),
            // @Excel(name = "备注", targetAttr = "remark"),
-            @Excel(name = "注册日期", targetAttr = "zcrq", width = 30, dateFormat = "yyyy-MM-dd"),
-            @Excel(name = "注册资本（万元）", targetAttr = "zczb"),
-            @Excel(name = "法人代表", targetAttr = "frdb"),
-            @Excel(name = "联系方式", targetAttr = "lxfs"),
-            @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 = "签约信息")
+            @Excel(name = "注册日期", targetAttr = "zcrq", width = 30, dateFormat = "yyyy-MM-dd", needMerge = true),
+            @Excel(name = "注册资本（万元）", targetAttr = "zczb", needMerge = true),
+            @Excel(name = "法人代表", targetAttr = "frdb", needMerge = true),
+            @Excel(name = "联系方式", targetAttr = "lxfs", needMerge = true),
+            @Excel(name = "经营范围", targetAttr = "jyfw", needMerge = true),
+            @Excel(name = "立项日期", targetAttr = "lxrq", width = 30, dateFormat = "yyyy-MM-dd", needMerge = true),
+            @Excel(name = "计划开工日期", targetAttr = "nkgrq", width = 30, dateFormat = "yyyy-MM-dd", needMerge = true)
+    })
+    //@Excel(name = "签约信息")
     private ZsyzQyxx zsyzQyxx;
 
 
 
     /** 开工信息对象 */
-    /*@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"),
+    @Excels({
+            @Excel(name = "开工日期", targetAttr = "kgrq", width = 30, dateFormat = "yyyy-MM-dd", needMerge = true),
+            @Excel(name = "拟竣工日期", targetAttr = "njgrq", width = 30, dateFormat = "yyyy-MM-dd", needMerge = true),
+            @Excel(name = "拟投产时间", targetAttr = "ntcsj", width = 30, dateFormat = "yyyy-MM-dd", needMerge = true),
             //@Excel(name = "分期投资情况", targetAttr = "jsnr"), 没有这个字段吧
             //@Excel(name = "备注", targetAttr = "remark")
-    })*/
-    @Excel(name = "开工信息")
+    })
+    //@Excel(name = "开工信息", needMerge = true)
     private ZsyzKgxx zsyzKgxx;
 
 
     /** 投产信息对象 */
-    /*@Excels({
-            @Excel(name = "投产日期", targetAttr = "tcrq", width = 30, dateFormat = "yyyy-MM-dd"),
-            @Excel(name = "实际到资额（万元）", targetAttr = "sjdze"),
-            @Excel(name = "用地面积（亩）", targetAttr = "ydmj"),
-            @Excel(name = "新建厂房（平方米）", targetAttr = "xjcf"),
-            @Excel(name = "设备发票（万元）", targetAttr = "sbfp"),
+    @Excels({
+            @Excel(name = "投产日期", targetAttr = "tcrq", width = 30, dateFormat = "yyyy-MM-dd", needMerge = true),
+            @Excel(name = "实际到资额（万元）", targetAttr = "sjdze", needMerge = true),
+            @Excel(name = "用地面积（亩）", targetAttr = "ydmj", needMerge = true),
+            @Excel(name = "新建厂房（平方米）", targetAttr = "xjcf", needMerge = true),
+            @Excel(name = "设备发票（万元）", targetAttr = "sbfp", needMerge = true),
             //@Excel(name = "新增应税销售额", targetAttr = "xjcf"),
             //@Excel(name = "租赁厂房项目增值税抵扣设备投资额", targetAttr = "xjcf"),
             //@Excel(name = "备注", targetAttr = "remark")
-    })*/
-    @Excel(name = "投产信息")
+    })
+    //@Excel(name = "投产信息")
     private ZsyzTcxx zsyzTcxx;
 
     //项目进展

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

@@ -373,7 +373,7 @@
         t.sbqd, t.sbfp, t.sbht, t.fkpz, t.zlcf,
         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
+        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

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

@@ -72,7 +72,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 ,
@@ -89,20 +89,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 ,
@@ -119,18 +119,18 @@
         <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 != ''"><!-- 开始时间检索 -->
+            <if test="params.beginTime != null and params.beginTime != ''">&lt;!&ndash; 开始时间检索 &ndash;&gt;
                 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 != ''"><!-- 结束时间检索 -->
+            <if test="params.endTime != null and params.endTime != ''">&lt;!&ndash; 结束时间检索 &ndash;&gt;
                 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>-->
 
     <insert id="insertZsyzShyj" parameterType="ZsyzShyj" useGeneratedKeys="true" keyProperty="id">
         insert into zsyz_shyj