Skip to content

F
fgqyxxlr
Commit f59cf6c0 by liru
Options

统计相关修改

parent 18de8dde
Showing with 233 additions and 37 deletions
ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/domain/ReportTwoResult.java
...@@ -22,8 +22,8 @@ public class ReportTwoResult { ...@@ -22,8 +22,8 @@ public class ReportTwoResult {
private Integer nnfzdydshzz; private Integer nnfzdydshzz;
private Integer fzdys; private Integer fzdys;
private Integer xpdjgzzdys; private Integer xpdjgzzdys;
private Integer ydydshzz;
private Integer weiydydshzz;
private Integer weidjzdyhdjzdzlxdshzz; private Integer weidjzdyhdjzdzlxdshzz;
private Integer weiyjlghzzdshzz; private Integer weiyjlghzzdshzz;
private Integer weiyjlgqzzdshzz; private Integer weiyjlgqzzdshzz;
...@@ -35,6 +35,14 @@ public class ReportTwoResult { ...@@ -35,6 +35,14 @@ public class ReportTwoResult {
private Integer weinnfzdys; private Integer weinnfzdys;
private Integer weixpdjgzzdys; private Integer weixpdjgzzdys;
public Integer getYdydshzz() {
return ydydshzz;
}
public void setYdydshzz(Integer ydydshzz) {
this.ydydshzz = ydydshzz;
}
public String getType() { public String getType() {
return type; return type;
} }
...@@ -203,13 +211,6 @@ public class ReportTwoResult { ...@@ -203,13 +211,6 @@ public class ReportTwoResult {
this.xpdjgzzdys = xpdjgzzdys; this.xpdjgzzdys = xpdjgzzdys;
} }
public Integer getWeiydydshzz() {
return weiydydshzz;
}
public void setWeiydydshzz(Integer weiydydshzz) {
this.weiydydshzz = weiydydshzz;
}
public Integer getWeidjzdyhdjzdzlxdshzz() { public Integer getWeidjzdyhdjzdzlxdshzz() {
return weidjzdyhdjzdzlxdshzz; return weidjzdyhdjzdzlxdshzz;
......
ruoyi-admin/src/main/resources/templates/demo/table/reporttwo.html
...@@ -43,10 +43,7 @@ ...@@ -43,10 +43,7 @@
], ],
[ { [ {
field: 'type', field: 'type',
title: '类别', title: '类别'
formatter: function(value, row, index) {
return $.table.selectDictLabel(shzzlxDatas, value);
}
}, { }, {
field: 'dws', field: 'dws',
title: '单位数' title: '单位数'
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/OrhonFgqy.java
...@@ -36,6 +36,10 @@ public class OrhonFgqy extends com.ruoyi.common.core.domain.BaseEntity ...@@ -36,6 +36,10 @@ public class OrhonFgqy extends com.ruoyi.common.core.domain.BaseEntity
@com.ruoyi.common.annotation.Excel(name = "非公企业类型类型") @com.ruoyi.common.annotation.Excel(name = "非公企业类型类型")
private String type; private String type;
/** 类型（休眠1，僵尸空壳影子2，正常0） */
@com.ruoyi.common.annotation.Excel(name = "类型")
private String lx;
/** 所在地 */ /** 所在地 */
@com.ruoyi.common.annotation.Excel(name = "所在地") @com.ruoyi.common.annotation.Excel(name = "所在地")
private String szd; private String szd;
...@@ -1045,6 +1049,14 @@ public class OrhonFgqy extends com.ruoyi.common.core.domain.BaseEntity ...@@ -1045,6 +1049,14 @@ public class OrhonFgqy extends com.ruoyi.common.core.domain.BaseEntity
return slhkddysl; return slhkddysl;
} }
public String getLx() {
return lx;
}
public void setLx(String lx) {
this.lx = lx;
}
public void setSlhkddysl(String slhkddysl) { public void setSlhkddysl(String slhkddysl) {
this.slhkddysl = slhkddysl; this.slhkddysl = slhkddysl;
} }
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/OrhonShzz.java
...@@ -26,6 +26,10 @@ public class OrhonShzz extends com.ruoyi.common.core.domain.BaseEntity ...@@ -26,6 +26,10 @@ public class OrhonShzz extends com.ruoyi.common.core.domain.BaseEntity
@com.ruoyi.common.annotation.Excel(name = "社会组织类型") @com.ruoyi.common.annotation.Excel(name = "社会组织类型")
private String type; private String type;
/** 类型（休眠1，僵尸空壳影子2，正常0） */
@com.ruoyi.common.annotation.Excel(name = "类型")
private String lx;
/** 所在地 */ /** 所在地 */
@com.ruoyi.common.annotation.Excel(name = "所在地") @com.ruoyi.common.annotation.Excel(name = "所在地")
private String szd; private String szd;
...@@ -1106,6 +1110,14 @@ public class OrhonShzz extends com.ruoyi.common.core.domain.BaseEntity ...@@ -1106,6 +1110,14 @@ public class OrhonShzz extends com.ruoyi.common.core.domain.BaseEntity
return qtsl; return qtsl;
} }
public String getLx() {
return lx;
}
public void setLx(String lx) {
this.lx = lx;
}
public void setQtsl(String qtsl) { public void setQtsl(String qtsl) {
this.qtsl = qtsl; this.qtsl = qtsl;
} }
......
ruoyi-system/src/main/resources/mapper/system/OrhonFgqyMapper.xml
...@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="mc" column="mc" /> <result property="mc" column="mc" />
<result property="deptId" column="dept_id" /> <result property="deptId" column="dept_id" />
<result property="type" column="type" /> <result property="type" column="type" />
<result property="lx" column="lx" />
<result property="szd" column="szd" /> <result property="szd" column="szd" />
<result property="zcze" column="zcze" /> <result property="zcze" column="zcze" />
<result property="nyysr" column="nyysr" /> <result property="nyysr" column="nyysr" />
...@@ -95,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -95,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="mc != null and mc != ''"> and mc like concat('%','${mc}','%' )</if> <if test="mc != null and mc != ''"> and mc like concat('%','${mc}','%' )</if>
<if test="deptId != null "> and dept_id = #{deptId}</if> <if test="deptId != null "> and dept_id = #{deptId}</if>
<if test="type != null and type != ''"> and type = #{type}</if> <if test="type != null and type != ''"> and type = #{type}</if>
<if test="lx != null and lx != ''"> and lx = #{lx}</if>
<if test="szd != null and szd != ''"> and szd = #{szd}</if> <if test="szd != null and szd != ''"> and szd = #{szd}</if>
<if test="params.beginZcze != null and params.beginZcze != '' and params.endZcze != null and params.endZcze != ''"> and zcze between #{params.beginZcze} and #{params.endZcze}</if> <if test="params.beginZcze != null and params.beginZcze != '' and params.endZcze != null and params.endZcze != ''"> and zcze between #{params.beginZcze} and #{params.endZcze}</if>
<if test="params.beginNyysr != null and params.beginNyysr != '' and params.endNyysr != null and params.endNyysr != ''"> and nyysr between #{params.beginNyysr} and #{params.endNyysr}</if> <if test="params.beginNyysr != null and params.beginNyysr != '' and params.endNyysr != null and params.endNyysr != ''"> and nyysr between #{params.beginNyysr} and #{params.endNyysr}</if>
...@@ -133,6 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -133,6 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="mc != null and mc != ''">mc,</if> <if test="mc != null and mc != ''">mc,</if>
<if test="deptId != null">dept_id,</if> <if test="deptId != null">dept_id,</if>
<if test="type != null">type,</if> <if test="type != null">type,</if>
<if test="lx != null">lx,</if>
<if test="szd != null">szd,</if> <if test="szd != null">szd,</if>
<if test="zcze != null">zcze,</if> <if test="zcze != null">zcze,</if>
<if test="nyysr != null">nyysr,</if> <if test="nyysr != null">nyysr,</if>
...@@ -211,6 +214,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -211,6 +214,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="mc != null and mc != ''">#{mc},</if> <if test="mc != null and mc != ''">#{mc},</if>
<if test="deptId != null">#{deptId},</if> <if test="deptId != null">#{deptId},</if>
<if test="type != null">#{type},</if> <if test="type != null">#{type},</if>
<if test="lx != null">#{lx},</if>
<if test="szd != null">#{szd},</if> <if test="szd != null">#{szd},</if>
<if test="zcze != null">#{zcze},</if> <if test="zcze != null">#{zcze},</if>
<if test="nyysr != null">#{nyysr},</if> <if test="nyysr != null">#{nyysr},</if>
...@@ -292,6 +296,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -292,6 +296,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="mc != null and mc != ''">mc = #{mc},</if> <if test="mc != null and mc != ''">mc = #{mc},</if>
<if test="deptId != null">dept_id = #{deptId},</if> <if test="deptId != null">dept_id = #{deptId},</if>
<if test="type != null">type = #{type},</if> <if test="type != null">type = #{type},</if>
<if test="lx != null">lx = #{lx},</if>
<if test="szd != null">szd = #{szd},</if> <if test="szd != null">szd = #{szd},</if>
<if test="zcze != null">zcze = #{zcze},</if> <if test="zcze != null">zcze = #{zcze},</if>
<if test="nyysr != null">nyysr = #{nyysr},</if> <if test="nyysr != null">nyysr = #{nyysr},</if>
......
ruoyi-system/src/main/resources/mapper/system/OrhonShzzMapper.xml
...@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="id" column="id" /> <result property="id" column="id" />
<result property="mc" column="mc" /> <result property="mc" column="mc" />
<result property="type" column="type" /> <result property="type" column="type" />
<result property="lx" column="lx" />
<result property="szd" column="szd" /> <result property="szd" column="szd" />
<result property="zcze" column="zcze" /> <result property="zcze" column="zcze" />
<result property="cyrs" column="cyrs" /> <result property="cyrs" column="cyrs" />
...@@ -113,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -113,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where> <where>
<if test="mc != null and mc != ''"> and mc like concat('%', #{mc}, '%')</if> <if test="mc != null and mc != ''"> and mc like concat('%', #{mc}, '%')</if>
<if test="type != null and type != ''"> and type = #{type}</if> <if test="type != null and type != ''"> and type = #{type}</if>
<if test="lx != null and lx != ''"> and lx = #{lx}</if>
<if test="szd != null and szd != ''"> and szd like concat('%', #{szd}, '%')</if> <if test="szd != null and szd != ''"> and szd like concat('%', #{szd}, '%')</if>
<if test="params.beginZcze != null and params.beginZcze != '' and params.endZcze != null and params.endZcze != ''"> and zcze between #{params.beginZcze} and #{params.endZcze}</if> <if test="params.beginZcze != null and params.beginZcze != '' and params.endZcze != null and params.endZcze != ''"> and zcze between #{params.beginZcze} and #{params.endZcze}</if>
<if test="params.beginCyrs != null and params.beginCyrs != '' and params.endCyrs != null and params.endCyrs != ''"> and cyrs between #{params.beginCyrs} and #{params.endCyrs}</if> <if test="params.beginCyrs != null and params.beginCyrs != '' and params.endCyrs != null and params.endCyrs != ''"> and cyrs between #{params.beginCyrs} and #{params.endCyrs}</if>
...@@ -167,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -167,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="id != null">id,</if> <if test="id != null">id,</if>
<if test="mc != null and mc != ''">mc,</if> <if test="mc != null and mc != ''">mc,</if>
<if test="type != null">type,</if> <if test="type != null">type,</if>
<if test="lx != null">lx,</if>
<if test="szd != null">szd,</if> <if test="szd != null">szd,</if>
<if test="zcze != null">zcze,</if> <if test="zcze != null">zcze,</if>
<if test="cyrs != null">cyrs,</if> <if test="cyrs != null">cyrs,</if>
...@@ -266,6 +269,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -266,6 +269,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="id != null">#{id},</if> <if test="id != null">#{id},</if>
<if test="mc != null and mc != ''">#{mc},</if> <if test="mc != null and mc != ''">#{mc},</if>
<if test="type != null">#{type},</if> <if test="type != null">#{type},</if>
<if test="lx != null">#{lx},</if>
<if test="szd != null">#{szd},</if> <if test="szd != null">#{szd},</if>
<if test="zcze != null">#{zcze},</if> <if test="zcze != null">#{zcze},</if>
<if test="cyrs != null">#{cyrs},</if> <if test="cyrs != null">#{cyrs},</if>
...@@ -369,6 +373,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -369,6 +373,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="mc != null and mc != ''">mc = #{mc},</if> <if test="mc != null and mc != ''">mc = #{mc},</if>
<if test="type != null">type = #{type},</if> <if test="type != null">type = #{type},</if>
<if test="lx != null">lx = #{lx},</if>
<if test="szd != null">szd = #{szd},</if> <if test="szd != null">szd = #{szd},</if>
<if test="zcze != null">zcze = #{zcze},</if> <if test="zcze != null">zcze = #{zcze},</if>
<if test="cyrs != null">cyrs = #{cyrs},</if> <if test="cyrs != null">cyrs = #{cyrs},</if>
......
ruoyi-system/target/classes/mapper/system/OrhonShzzMapper.xml
...@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="id" column="id" /> <result property="id" column="id" />
<result property="mc" column="mc" /> <result property="mc" column="mc" />
<result property="type" column="type" /> <result property="type" column="type" />
<result property="lx" column="lx" />
<result property="szd" column="szd" /> <result property="szd" column="szd" />
<result property="zcze" column="zcze" /> <result property="zcze" column="zcze" />
<result property="cyrs" column="cyrs" /> <result property="cyrs" column="cyrs" />
...@@ -113,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -113,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where> <where>
<if test="mc != null and mc != ''"> and mc like concat('%', #{mc}, '%')</if> <if test="mc != null and mc != ''"> and mc like concat('%', #{mc}, '%')</if>
<if test="type != null and type != ''"> and type = #{type}</if> <if test="type != null and type != ''"> and type = #{type}</if>
<if test="lx != null and lx != ''"> and lx = #{lx}</if>
<if test="szd != null and szd != ''"> and szd like concat('%', #{szd}, '%')</if> <if test="szd != null and szd != ''"> and szd like concat('%', #{szd}, '%')</if>
<if test="params.beginZcze != null and params.beginZcze != '' and params.endZcze != null and params.endZcze != ''"> and zcze between #{params.beginZcze} and #{params.endZcze}</if> <if test="params.beginZcze != null and params.beginZcze != '' and params.endZcze != null and params.endZcze != ''"> and zcze between #{params.beginZcze} and #{params.endZcze}</if>
<if test="params.beginCyrs != null and params.beginCyrs != '' and params.endCyrs != null and params.endCyrs != ''"> and cyrs between #{params.beginCyrs} and #{params.endCyrs}</if> <if test="params.beginCyrs != null and params.beginCyrs != '' and params.endCyrs != null and params.endCyrs != ''"> and cyrs between #{params.beginCyrs} and #{params.endCyrs}</if>
...@@ -167,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -167,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="id != null">id,</if> <if test="id != null">id,</if>
<if test="mc != null and mc != ''">mc,</if> <if test="mc != null and mc != ''">mc,</if>
<if test="type != null">type,</if> <if test="type != null">type,</if>
<if test="lx != null">lx,</if>
<if test="szd != null">szd,</if> <if test="szd != null">szd,</if>
<if test="zcze != null">zcze,</if> <if test="zcze != null">zcze,</if>
<if test="cyrs != null">cyrs,</if> <if test="cyrs != null">cyrs,</if>
...@@ -266,6 +269,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -266,6 +269,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="id != null">#{id},</if> <if test="id != null">#{id},</if>
<if test="mc != null and mc != ''">#{mc},</if> <if test="mc != null and mc != ''">#{mc},</if>
<if test="type != null">#{type},</if> <if test="type != null">#{type},</if>
<if test="lx != null">#{lx},</if>
<if test="szd != null">#{szd},</if> <if test="szd != null">#{szd},</if>
<if test="zcze != null">#{zcze},</if> <if test="zcze != null">#{zcze},</if>
<if test="cyrs != null">#{cyrs},</if> <if test="cyrs != null">#{cyrs},</if>
...@@ -369,6 +373,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -369,6 +373,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="mc != null and mc != ''">mc = #{mc},</if> <if test="mc != null and mc != ''">mc = #{mc},</if>
<if test="type != null">type = #{type},</if> <if test="type != null">type = #{type},</if>
<if test="lx != null">lx = #{lx},</if>
<if test="szd != null">szd = #{szd},</if> <if test="szd != null">szd = #{szd},</if>
<if test="zcze != null">zcze = #{zcze},</if> <if test="zcze != null">zcze = #{zcze},</if>
<if test="cyrs != null">cyrs = #{cyrs},</if> <if test="cyrs != null">cyrs = #{cyrs},</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment