Skip to content

F
fgqyxxlr
Commit 9a0f240e by zhangwei
Options

提交0818

parent 0d633fd5
Showing with 1353 additions and 104 deletions
.DS_Store
No preview for this file type
ruoyi-admin/src/main/resources/application-druid.yml
...@@ -6,9 +6,9 @@ spring: ...@@ -6,9 +6,9 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
url: jdbc:mysql://localhost:3306/mac mysql?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://172.16.5.6:3306/feigong?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root username: root
password: root password: gBV4lMfojU+*
# 从库数据源 # 从库数据源
slave: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭
......
ruoyi-admin/src/main/resources/application.yml
...@@ -7,7 +7,7 @@ ruoyi: ...@@ -7,7 +7,7 @@ ruoyi:
# 版权年份 # 版权年份
copyrightYear: 2019 copyrightYear: 2019
# 实例演示开关 # 实例演示开关
demoEnabled: true demoEnabled: false
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
profile: /Users/zhangwei/Documents/xiangmushujuku profile: /Users/zhangwei/Documents/xiangmushujuku
# 获取ip地址开关 # 获取ip地址开关
......
ruoyi-admin/src/main/resources/logback.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<!-- 日志存放路径 --> <!-- 日志存放路径 -->
<!--<property name="log.path" value="/Users/zhangwei/Documents/xiangmushujuku/logs" />--> <property name="log.path" value="/home/logs" />
<property name="log.path" value="E:/orhon/fgqyxxlr/logs" /> <!-- <property name="log.path" value="E:/orhon/fgqyxxlr/logs" />-->
<!-- <property name="log.path" value="/Users/zhangwei/Documents/xiangmushujuku/logs" />-->
<!-- 日志输出格式 --> <!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" /> <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
......
ruoyi-admin/src/main/resources/templates/login.html
...@@ -18,6 +18,23 @@ ...@@ -18,6 +18,23 @@
<style type="text/css">label.error { <style type="text/css">label.error {
position: inherit; position: inherit;
}</style> }</style>
<style>
.tianjia{
filter:alpha(opacity=50);
-moz-opacity:1;
-khtml-opacity: 1;
opacity: 1;
}
.tianjia img{
width: 90%;
}
</style>
<script> <script>
if (window.top !== window.self) { if (window.top !== window.self) {
alert('未登录或登录超时。请重新登录'); alert('未登录或登录超时。请重新登录');
...@@ -36,6 +53,9 @@ ...@@ -36,6 +53,9 @@
</div> </div>
<div class="m-b"></div> <div class="m-b"></div>
<h4 style="font-size: 30px;">欢迎使用非公企业和社会组织信息管理系统</strong></h4> <h4 style="font-size: 30px;">欢迎使用非公企业和社会组织信息管理系统</strong></h4>
<div class="tianjia">
<img style="float:left" src="../img/left.png"/>
</div>
<strong th:if="${@config.getKey('sys.account.registerUser')}">还没有账号？ <a th:href="@{/register}">立即注册&raquo;</a></strong> <strong th:if="${@config.getKey('sys.account.registerUser')}">还没有账号？ <a th:href="@{/register}">立即注册&raquo;</a></strong>
</div> </div>
</div> </div>
......
ruoyi-admin/target/classes/application-druid.yml
...@@ -6,9 +6,9 @@ spring: ...@@ -6,9 +6,9 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
url: jdbc:mysql://localhost:3306/mac mysql?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://172.16.5.6:3306/feigong?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root username: root
password: root password: gBV4lMfojU+*
# 从库数据源 # 从库数据源
slave: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭
......
ruoyi-admin/target/classes/application.yml
...@@ -7,7 +7,7 @@ ruoyi: ...@@ -7,7 +7,7 @@ ruoyi:
# 版权年份 # 版权年份
copyrightYear: 2019 copyrightYear: 2019
# 实例演示开关 # 实例演示开关
demoEnabled: true demoEnabled: false
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
profile: /Users/zhangwei/Documents/xiangmushujuku profile: /Users/zhangwei/Documents/xiangmushujuku
# 获取ip地址开关 # 获取ip地址开关
......
ruoyi-admin/target/classes/logback.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<!-- 日志存放路径 --> <!-- 日志存放路径 -->
<!--<property name="log.path" value="/Users/zhangwei/Documents/xiangmushujuku/logs" />--> <property name="log.path" value="/home/logs" />
<property name="log.path" value="E:/orhon/fgqyxxlr/logs" /> <!-- <property name="log.path" value="E:/orhon/fgqyxxlr/logs" />-->
<!-- <property name="log.path" value="/Users/zhangwei/Documents/xiangmushujuku/logs" />-->
<!-- 日志输出格式 --> <!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" /> <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
......
ruoyi-admin/target/classes/templates/login.html
...@@ -18,6 +18,23 @@ ...@@ -18,6 +18,23 @@
<style type="text/css">label.error { <style type="text/css">label.error {
position: inherit; position: inherit;
}</style> }</style>
<style>
.tianjia{
filter:alpha(opacity=50);
-moz-opacity:1;
-khtml-opacity: 1;
opacity: 1;
}
.tianjia img{
width: 90%;
}
</style>
<script> <script>
if (window.top !== window.self) { if (window.top !== window.self) {
alert('未登录或登录超时。请重新登录'); alert('未登录或登录超时。请重新登录');
...@@ -36,6 +53,9 @@ ...@@ -36,6 +53,9 @@
</div> </div>
<div class="m-b"></div> <div class="m-b"></div>
<h4 style="font-size: 30px;">欢迎使用非公企业和社会组织信息管理系统</strong></h4> <h4 style="font-size: 30px;">欢迎使用非公企业和社会组织信息管理系统</strong></h4>
<div class="tianjia">
<img style="float:left" src="../img/left.png"/>
</div>
<strong th:if="${@config.getKey('sys.account.registerUser')}">还没有账号？ <a th:href="@{/register}">立即注册&raquo;</a></strong> <strong th:if="${@config.getKey('sys.account.registerUser')}">还没有账号？ <a th:href="@{/register}">立即注册&raquo;</a></strong>
</div> </div>
</div> </div>
......
ruoyi-admin/target/classes/templates/system/fgqy/add.html
...@@ -337,22 +337,59 @@ ...@@ -337,22 +337,59 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">法定代表人姓名：</label> <label class="col-sm-3 control-label">法定代表人：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="shzzxm" class="form-control" type="text" placeholder="请输入法定代表人姓名"> <input name="fddbr" class="form-control" type="text" required>
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">法定代表人电话：</label> <label class="col-sm-3 control-label">法定代表人联系方式：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" placeholder="请输入法定代表人电话"> <input name="shzzdh" class="form-control" type="text" >
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人党内职务：</label>
<div class="col-sm-8">
<input name="fddbr" class="form-control" type="text" required>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人行政职务：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治面貌：</label>
<div class="col-sm-8">
<input name="fddbr" class="form-control" type="text" required>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治待遇：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
</div>
</div>
</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
...@@ -372,18 +409,142 @@ ...@@ -372,18 +409,142 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">党组织书记姓名：</label> <label class="col-sm-3 control-label">党组织书记姓名：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text" placeholder="请输入党组织书记姓名"> <input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">党组织书记电话：</label> <label class="col-sm-3 control-label">党组织班子成员姓名：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text" placeholder="请输入党组织书记电话"> <input name="dzzsjxm" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
</div> </div>
<h4 class="form-header h4">党员情况</h4> <h4 class="form-header h4">党员情况</h4>
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/OrhonFgqy.java
...@@ -182,6 +182,7 @@ public class OrhonFgqy extends com.ruoyi.common.core.domain.BaseEntity ...@@ -182,6 +182,7 @@ public class OrhonFgqy extends com.ruoyi.common.core.domain.BaseEntity
@com.ruoyi.common.annotation.Excel(name = "经营范围") @com.ruoyi.common.annotation.Excel(name = "经营范围")
private String jyfw; private String jyfw;
/** 住所 */ /** 住所 */
@com.ruoyi.common.annotation.Excel(name = "住所") @com.ruoyi.common.annotation.Excel(name = "住所")
private String zs; private String zs;
...@@ -254,6 +255,248 @@ public class OrhonFgqy extends com.ruoyi.common.core.domain.BaseEntity ...@@ -254,6 +255,248 @@ public class OrhonFgqy extends com.ruoyi.common.core.domain.BaseEntity
@com.ruoyi.common.annotation.Excel(name = "年内发展党员数") @com.ruoyi.common.annotation.Excel(name = "年内发展党员数")
private String nnfzdys; private String nnfzdys;
public OrhonFgqy() {
}
public String getZcbjbz() {
return zcbjbz;
}
public void setZcbjbz(String zcbjbz) {
this.zcbjbz = zcbjbz;
}
public String getZch() {
return zch;
}
public void setZch(String zch) {
this.zch = zch;
}
public java.util.Date getJyqxz() {
return jyqxz;
}
public void setJyqxz(java.util.Date jyqxz) {
this.jyqxz = jyqxz;
}
public java.util.Date getJyqxzhi() {
return jyqxzhi;
}
public void setJyqxzhi(java.util.Date jyqxzhi) {
this.jyqxzhi = jyqxzhi;
}
public String getHyml() {
return hyml;
}
public void setHyml(String hyml) {
this.hyml = hyml;
}
public String getScztlx() {
return scztlx;
}
public void setScztlx(String scztlx) {
this.scztlx = scztlx;
}
public String getDjjg() {
return djjg;
}
public void setDjjg(String djjg) {
this.djjg = djjg;
}
public String getDjzt() {
return djzt;
}
public void setDjzt(String djzt) {
this.djzt = djzt;
}
public String getZczbwy() {
return zczbwy;
}
public void setZczbwy(String zczbwy) {
this.zczbwy = zczbwy;
}
public java.util.Date getSjhzsj() {
return sjhzsj;
}
public void setSjhzsj(java.util.Date sjhzsj) {
this.sjhzsj = sjhzsj;
}
public java.util.Date getClrq() {
return clrq;
}
public void setClrq(java.util.Date clrq) {
this.clrq = clrq;
}
public String getTyshxydm() {
return tyshxydm;
}
public void setTyshxydm(String tyshxydm) {
this.tyshxydm = tyshxydm;
}
public String getZs() {
return zs;
}
public void setZs(String zs) {
this.zs = zs;
}
public String getDzzmc() {
return dzzmc;
}
public void setDzzmc(String dzzmc) {
this.dzzmc = dzzmc;
}
public String getDzzsdgx() {
return dzzsdgx;
}
public void setDzzsdgx(String dzzsdgx) {
this.dzzsdgx = dzzsdgx;
}
public String getHjxx() {
return hjxx;
}
public void setHjxx(String hjxx) {
this.hjxx = hjxx;
}
public String getDfzh() {
return dfzh;
}
public void setDfzh(String dfzh) {
this.dfzh = dfzh;
}
public String getYwdy() {
return ywdy;
}
public void setYwdy(String ywdy) {
this.ywdy = ywdy;
}
public String getJjfzsl() {
return jjfzsl;
}
public void setJjfzsl(String jjfzsl) {
this.jjfzsl = jjfzsl;
}
public String getFzdxsl() {
return fzdxsl;
}
public void setFzdxsl(String fzdxsl) {
this.fzdxsl = fzdxsl;
}
public String getDfsjbz() {
return dfsjbz;
}
public void setDfsjbz(String dfsjbz) {
this.dfsjbz = dfsjbz;
}
public String getHdzdmj() {
return hdzdmj;
}
public void setHdzdmj(String hdzdmj) {
this.hdzdmj = hdzdmj;
}
public String getDjjf() {
return djjf;
}
public void setDjjf(String djjf) {
this.djjf = djjf;
}
public String getSfpdjzdy() {
return sfpdjzdy;
}
public void setSfpdjzdy(String sfpdjzdy) {
this.sfpdjzdy = sfpdjzdy;
}
public String getXjpdjg() {
return xjpdjg;
}
public void setXjpdjg(String xjpdjg) {
this.xjpdjg = xjpdjg;
}
public String getJcqk() {
return jcqk;
}
public void setJcqk(String jcqk) {
this.jcqk = jcqk;
}
public String getDzzbgdz() {
return dzzbgdz;
}
public void setDzzbgdz(String dzzbgdz) {
this.dzzbgdz = dzzbgdz;
}
public String getLxdhjczh() {
return lxdhjczh;
}
public void setLxdhjczh(String lxdhjczh) {
this.lxdhjczh = lxdhjczh;
}
public String getDzyx() {
return dzyx;
}
public void setDzyx(String dzyx) {
this.dzyx = dzyx;
}
public String getJyfw() {
return jyfw;
}
public void setJyfw(String jyfw) {
this.jyfw = jyfw;
}
public String getNnfzdys() { public String getNnfzdys() {
return nnfzdys; return nnfzdys;
......
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