Skip to content

F
fgqyxxlr
Commit 9842c1ad by liru
Options

非公企业 社会组织修改

parent 0976af6a
Showing with 712 additions and 212 deletions
ruoyi-admin/src/main/resources/templates/demo/table/reportfour.html
...@@ -83,10 +83,10 @@ ...@@ -83,10 +83,10 @@
field: 'dys', field: 'dys',
title: '党员数(名)' title: '党员数(名)'
}, { }, {
field: 'shzzxm', field: 'fddbr',
title: '社会组织负责人姓名' title: '社会组织负责人姓名'
}, { }, {
field: 'shzzdh', field: 'fddbrdh',
title: '社会组织负责人联系方式' title: '社会组织负责人联系方式'
}, { }, {
field: 'isdy', field: 'isdy',
......
ruoyi-admin/src/main/resources/templates/demo/table/reportsix.html
...@@ -83,10 +83,10 @@ ...@@ -83,10 +83,10 @@
field: 'dys', field: 'dys',
title: '党员数(名)' title: '党员数(名)'
}, { }, {
field: 'shzzxm', field: 'fddbr',
title: '法定代表人姓名' title: '法定代表人姓名'
}, { }, {
field: 'shzzdh', field: 'fddbrdh',
title: '法定代表人联系方式' title: '法定代表人联系方式'
}, { }, {
field: 'isdy', field: 'isdy',
......
ruoyi-admin/src/main/resources/templates/demo/table/reportthree.html
...@@ -83,10 +83,10 @@ ...@@ -83,10 +83,10 @@
field: 'dys', field: 'dys',
title: '党员数(名)' title: '党员数(名)'
}, { }, {
field: 'shzzxm', field: 'fddbr',
title: '法定代表人姓名' title: '法定代表人姓名'
}, { }, {
field: 'shzzdh', field: 'fddbrdh',
title: '法定代表人联系方式' title: '法定代表人联系方式'
}, { }, {
field: 'isdy', field: 'isdy',
......
ruoyi-admin/src/main/resources/templates/system/shzz/add.html
...@@ -381,7 +381,7 @@ ...@@ -381,7 +381,7 @@
<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="sjdzz" class="form-control" type="text"> <input name="sjdzz" class="form-control" type="text" placeholder="请输入上级党组织">
</div> </div>
</div> </div>
</div> </div>
...@@ -414,7 +414,30 @@ ...@@ -414,7 +414,30 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-6"></div> <div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">是否建立工会：</label>
<div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('is_gh')}">
<input type="radio" th:id="${'isgh_' + dict.dictCode}" name="isgh" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'isgh_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</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">
<div class="radio-box" th:each="dict : ${@dict.getType('is_jcfnzz')}">
<input type="radio" th:id="${'isjcfnzz_' + dict.dictCode}" name="isjljcfnzz" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'isjcfnzz_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
</div>
</div>
</div> </div>
<h4 class="form-header h4">党组织班子情况</h4> <h4 class="form-header h4">党组织班子情况</h4>
...@@ -431,7 +454,7 @@ ...@@ -431,7 +454,7 @@
<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" > <input name="fddbrdh" class="form-control" type="text" >
</div> </div>
</div> </div>
</div> </div>
...@@ -442,7 +465,7 @@ ...@@ -442,7 +465,7 @@
<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="fddbr" class="form-control" type="text" required> <input name="fddbrdnzw" class="form-control" type="text" required>
</div> </div>
</div> </div>
</div> </div>
...@@ -450,7 +473,7 @@ ...@@ -450,7 +473,7 @@
<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" > <input name="fddbrxzzw" class="form-control" type="text" >
</div> </div>
</div> </div>
</div> </div>
...@@ -460,7 +483,7 @@ ...@@ -460,7 +483,7 @@
<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="fddbr" class="form-control" type="text" required> <input name="fddbrzzmm" class="form-control" type="text" required>
</div> </div>
</div> </div>
</div> </div>
...@@ -468,7 +491,7 @@ ...@@ -468,7 +491,7 @@
<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" > <input name="fddbrzzdy" class="form-control" type="text" >
</div> </div>
</div> </div>
</div> </div>
...@@ -511,7 +534,7 @@ ...@@ -511,7 +534,7 @@
<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"> <input name="dzzsjdnzw" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -519,7 +542,7 @@ ...@@ -519,7 +542,7 @@
<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"> <input name="dzzsjxzzw" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -529,7 +552,7 @@ ...@@ -529,7 +552,7 @@
<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"> <input name="dzzsjzzdy" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -540,7 +563,7 @@ ...@@ -540,7 +563,7 @@
<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"> <input name="daabzcyxm" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -548,7 +571,7 @@ ...@@ -548,7 +571,7 @@
<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"> <input name="daabzcydh" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -558,7 +581,7 @@ ...@@ -558,7 +581,7 @@
<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"> <input name="daabzcydnzw" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -566,7 +589,7 @@ ...@@ -566,7 +589,7 @@
<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"> <input name="daabzcyxzzw" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -576,7 +599,7 @@ ...@@ -576,7 +599,7 @@
<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"> <input name="daabzcyzzdy" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -588,7 +611,7 @@ ...@@ -588,7 +611,7 @@
<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"> <input name="dwgzzxm" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -596,7 +619,7 @@ ...@@ -596,7 +619,7 @@
<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"> <input name="dwgzzdh" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -606,7 +629,7 @@ ...@@ -606,7 +629,7 @@
<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"> <input name="dwgzzdnzw" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -614,7 +637,7 @@ ...@@ -614,7 +637,7 @@
<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"> <input name="dwgzzxzzw" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -624,7 +647,7 @@ ...@@ -624,7 +647,7 @@
<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"> <input name="dwgzzzzdy" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -648,7 +671,7 @@ ...@@ -648,7 +671,7 @@
<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="dys" class="form-control" type="text"> <input name="dys" class="form-control" type="text" placeholder="请输入党员数">
</div> </div>
</div> </div>
</div> </div>
...@@ -674,20 +697,66 @@ ...@@ -674,20 +697,66 @@
<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="dfsjbz" class="form-control" type="text" placeholder="请输入党费收缴标准"> <input name="zzdysl" class="form-control" type="text" placeholder="请输入在职党员数量">
</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>
<div class="col-sm-8">
<input name="ybdysl" class="form-control" type="text" placeholder="请输入预备党员数量">
</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="lddysl" class="form-control" type="text" placeholder="请输入流动党员数量">
</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="slhkddysl" class="form-control" type="text" placeholder="请输入失联或口袋党员数量">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<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="nnfzdys" class="form-control" type="text" placeholder="请输入年内发展党员数"> <input name="nnfzdys" class="form-control" type="text" placeholder="请输入年内发展党员数">
</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="qtsl" class="form-control" type="text" placeholder="请输入其他数量">
</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="dfsjbz" class="form-control" type="text" placeholder="请输入党费收缴标准">
</div>
</div>
</div>
</div> </div>
...@@ -722,15 +791,33 @@ ...@@ -722,15 +791,33 @@
<div class="col-sm-8"> <div class="col-sm-8">
<input name="djjf" class="form-control" type="text" placeholder="请输入党建经费"> <input name="djjf" class="form-control" type="text" placeholder="请输入党建经费">
</div> </div>
</div> </div><div class="col-md-6">
</div>
<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">
<div class="radio-box" th:each="dict : ${@dict.getType('orhon_isdy')}"> <input name="sjbfe" class="form-control" type="text" placeholder="请输入上级拨付额">
<input type="radio" th:id="${'isdy_' + dict.dictCode}" name="sfpdjzdy" th:value="${dict.dictValue}" th:checked="${dict.default}"> </div>
<label th:for="${'isdy_' + dict.dictCode}" th:text="${dict.dictLabel}"></label> </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="bjppe" class="form-control" type="text" placeholder="请输入本级匹配额">
</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">
<div class="radio-box" th:each="dict : ${@dict.getType('orhon_isdy')}">
<input type="radio" th:id="${'isdy_' + dict.dictCode}" name="sfpdjzdy" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'isdy_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -741,7 +828,7 @@ ...@@ -741,7 +828,7 @@
<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="djzdyxm" class="form-control" type="text"> <input name="djzdyxm" class="form-control" type="text" placeholder="请输入党建指导员姓名">
</div> </div>
</div> </div>
</div> </div>
...@@ -749,31 +836,26 @@ ...@@ -749,31 +836,26 @@
<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="djzdydh" class="form-control" type="text"> <input name="djzdydh" class="form-control" type="text" placeholder="请输入党建指导员电话">
</div> </div>
</div> </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">
<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">
<div class="radio-box" th:each="dict : ${@dict.getType('is_gh')}"> <input name="gzdwjzw" class="form-control" type="text" placeholder="请输入党建指导员工作单位及职务">
<input type="radio" th:id="${'isgh_' + dict.dictCode}" name="isgh" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'isgh_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<h4 class="form-header h4">党建工作特色</h4> <h4 class="form-header h4">党建工作特色</h4>
<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">
<div class="radio-box" th:each="dict : ${@dict.getType('is_sqlh')}"> <div class="radio-box" th:each="dict : ${@dict.getType('is_sqlh')}">
<input type="radio" th:id="${'issqlh_' + dict.dictCode}" name="issqlh" th:value="${dict.dictValue}" th:checked="${dict.default}"> <input type="radio" th:id="${'issqlh_' + dict.dictCode}" name="issqlh" th:value="${dict.dictValue}" th:checked="${dict.default}">
...@@ -794,6 +876,24 @@ ...@@ -794,6 +876,24 @@
<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>
<div class="col-sm-8">
<input name="qdsj" class="form-control" type="text" placeholder="请输入评定时间">
</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="qdjb" class="form-control" type="text" placeholder="请输入评定级别">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<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="jcqk" class="form-control" type="text" placeholder="请输入奖惩情况"> <input name="jcqk" class="form-control" type="text" placeholder="请输入奖惩情况">
...@@ -844,14 +944,14 @@ ...@@ -844,14 +944,14 @@
</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">-->
<textarea name="jzzjjtfs" class="form-control"></textarea> <!-- <textarea name="jzzjjtfs" class="form-control"></textarea>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> </div>
</form> </form>
......
ruoyi-admin/src/main/resources/templates/system/shzz/add_bak.html
...@@ -40,15 +40,15 @@ ...@@ -40,15 +40,15 @@
</div> </div>
</div> </div>
<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"> <input name="fddbr" class="form-control" type="text">
</div> </div>
</div> </div>
<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"> <input name="fddbrdh" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
......
ruoyi-admin/src/main/resources/templates/system/shzz/edit.html
...@@ -424,7 +424,7 @@ ...@@ -424,7 +424,7 @@
<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" > <input name="fddbrdh" class="form-control" type="text" >
</div> </div>
</div> </div>
</div> </div>
...@@ -435,7 +435,7 @@ ...@@ -435,7 +435,7 @@
<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="fddbr" class="form-control" type="text" required> <input name="fddbrdnzw" class="form-control" type="text" required>
</div> </div>
</div> </div>
</div> </div>
...@@ -443,7 +443,7 @@ ...@@ -443,7 +443,7 @@
<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" > <input name="fddbrxzzw" class="form-control" type="text" >
</div> </div>
</div> </div>
</div> </div>
...@@ -453,7 +453,7 @@ ...@@ -453,7 +453,7 @@
<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="fddbr" class="form-control" type="text" required> <input name="fddbrzzmm" class="form-control" type="text" required>
</div> </div>
</div> </div>
</div> </div>
...@@ -461,7 +461,7 @@ ...@@ -461,7 +461,7 @@
<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" > <input name="fddbrzzzdy" class="form-control" type="text" >
</div> </div>
</div> </div>
</div> </div>
...@@ -504,7 +504,7 @@ ...@@ -504,7 +504,7 @@
<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"> <input name="dzzsjdnzw" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -512,7 +512,7 @@ ...@@ -512,7 +512,7 @@
<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"> <input name="dzzsjxzzw" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -522,7 +522,7 @@ ...@@ -522,7 +522,7 @@
<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"> <input name="dzzsjzzdy" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -533,7 +533,7 @@ ...@@ -533,7 +533,7 @@
<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"> <input name="dzzbzcyxm" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -541,7 +541,7 @@ ...@@ -541,7 +541,7 @@
<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"> <input name="dzzbzcydh" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -551,7 +551,7 @@ ...@@ -551,7 +551,7 @@
<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"> <input name="dzzbzcydnzw" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -559,7 +559,7 @@ ...@@ -559,7 +559,7 @@
<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"> <input name="dzzbzcyxzzw" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -569,7 +569,7 @@ ...@@ -569,7 +569,7 @@
<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"> <input name="dzzbzcyzzdy" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -581,7 +581,7 @@ ...@@ -581,7 +581,7 @@
<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"> <input name="dwgzzxm" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -589,7 +589,7 @@ ...@@ -589,7 +589,7 @@
<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"> <input name="dwgzzdh" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -599,7 +599,7 @@ ...@@ -599,7 +599,7 @@
<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"> <input name="dwgzzdnzw" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -607,7 +607,7 @@ ...@@ -607,7 +607,7 @@
<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"> <input name="dwgzzxzzw" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -617,7 +617,7 @@ ...@@ -617,7 +617,7 @@
<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"> <input name="dwgzzzzdy" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
......
ruoyi-admin/src/main/resources/templates/system/shzz/edit_bak.html
...@@ -41,15 +41,15 @@ ...@@ -41,15 +41,15 @@
</div> </div>
</div> </div>
<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" th:field="*{shzzxm}" class="form-control" type="text"> <input name="fddbr" th:field="*{fddbr}" class="form-control" type="text">
</div> </div>
</div> </div>
<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" th:field="*{shzzdh}" class="form-control" type="text"> <input name="fddbrdh" th:field="*{fddbrdh}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
......
ruoyi-admin/src/main/resources/templates/system/shzz/shzz.html
...@@ -60,14 +60,14 @@ ...@@ -60,14 +60,14 @@
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<li> <li>
<label>社会组织负责人姓名：</label> <label>法定代表人：</label>
<input type="text" name="shzzxm"/> <input type="text" name="fddbr"/>
</li> </li>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<li> <li>
<label>社会组织负责人电话：</label> <label>法定代表人电话：</label>
<input type="text" name="shzzdh"/> <input type="text" name="fddbrdh"/>
</li> </li>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
title: '法定代表人姓名' title: '法定代表人姓名'
}, },
{ {
field: 'shzzdh', field: 'fddbrdh',
title: '法定代表人电话' title: '法定代表人电话'
}, },
......
ruoyi-admin/target/classes/templates/demo/table/reportfour.html
...@@ -83,10 +83,10 @@ ...@@ -83,10 +83,10 @@
field: 'dys', field: 'dys',
title: '党员数(名)' title: '党员数(名)'
}, { }, {
field: 'shzzxm', field: 'fddbr',
title: '社会组织负责人姓名' title: '社会组织负责人姓名'
}, { }, {
field: 'shzzdh', field: 'fddbrdh',
title: '社会组织负责人联系方式' title: '社会组织负责人联系方式'
}, { }, {
field: 'isdy', field: 'isdy',
......
ruoyi-admin/target/classes/templates/demo/table/reportsix.html
...@@ -83,10 +83,10 @@ ...@@ -83,10 +83,10 @@
field: 'dys', field: 'dys',
title: '党员数(名)' title: '党员数(名)'
}, { }, {
field: 'shzzxm', field: 'fddbr',
title: '法定代表人姓名' title: '法定代表人姓名'
}, { }, {
field: 'shzzdh', field: 'fddbrdh',
title: '法定代表人联系方式' title: '法定代表人联系方式'
}, { }, {
field: 'isdy', field: 'isdy',
......
ruoyi-admin/target/classes/templates/demo/table/reportthree.html
...@@ -83,10 +83,10 @@ ...@@ -83,10 +83,10 @@
field: 'dys', field: 'dys',
title: '党员数(名)' title: '党员数(名)'
}, { }, {
field: 'shzzxm', field: 'fddbr',
title: '法定代表人姓名' title: '法定代表人姓名'
}, { }, {
field: 'shzzdh', field: 'fddbrdh',
title: '法定代表人联系方式' title: '法定代表人联系方式'
}, { }, {
field: 'isdy', field: 'isdy',
......
ruoyi-admin/target/classes/templates/system/shzz/add.html
...@@ -381,7 +381,7 @@ ...@@ -381,7 +381,7 @@
<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="sjdzz" class="form-control" type="text"> <input name="sjdzz" class="form-control" type="text" placeholder="请输入上级党组织">
</div> </div>
</div> </div>
</div> </div>
...@@ -414,7 +414,30 @@ ...@@ -414,7 +414,30 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-6"></div> <div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">是否建立工会：</label>
<div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('is_gh')}">
<input type="radio" th:id="${'isgh_' + dict.dictCode}" name="isgh" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'isgh_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</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">
<div class="radio-box" th:each="dict : ${@dict.getType('is_jcfnzz')}">
<input type="radio" th:id="${'isjcfnzz_' + dict.dictCode}" name="isjljcfnzz" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'isjcfnzz_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
</div>
</div>
</div> </div>
<h4 class="form-header h4">党组织班子情况</h4> <h4 class="form-header h4">党组织班子情况</h4>
...@@ -431,7 +454,7 @@ ...@@ -431,7 +454,7 @@
<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" > <input name="fddbrdh" class="form-control" type="text" >
</div> </div>
</div> </div>
</div> </div>
...@@ -442,7 +465,7 @@ ...@@ -442,7 +465,7 @@
<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="fddbr" class="form-control" type="text" required> <input name="fddbrdnzw" class="form-control" type="text" required>
</div> </div>
</div> </div>
</div> </div>
...@@ -450,7 +473,7 @@ ...@@ -450,7 +473,7 @@
<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" > <input name="fddbrxzzw" class="form-control" type="text" >
</div> </div>
</div> </div>
</div> </div>
...@@ -460,7 +483,7 @@ ...@@ -460,7 +483,7 @@
<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="fddbr" class="form-control" type="text" required> <input name="fddbrzzmm" class="form-control" type="text" required>
</div> </div>
</div> </div>
</div> </div>
...@@ -468,7 +491,7 @@ ...@@ -468,7 +491,7 @@
<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" > <input name="fddbrzzdy" class="form-control" type="text" >
</div> </div>
</div> </div>
</div> </div>
...@@ -511,7 +534,7 @@ ...@@ -511,7 +534,7 @@
<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"> <input name="dzzsjdnzw" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -519,7 +542,7 @@ ...@@ -519,7 +542,7 @@
<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"> <input name="dzzsjxzzw" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -529,7 +552,7 @@ ...@@ -529,7 +552,7 @@
<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"> <input name="dzzsjzzdy" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -540,7 +563,7 @@ ...@@ -540,7 +563,7 @@
<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"> <input name="daabzcyxm" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -548,7 +571,7 @@ ...@@ -548,7 +571,7 @@
<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"> <input name="daabzcydh" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -558,7 +581,7 @@ ...@@ -558,7 +581,7 @@
<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"> <input name="daabzcydnzw" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -566,7 +589,7 @@ ...@@ -566,7 +589,7 @@
<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"> <input name="daabzcyxzzw" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -576,7 +599,7 @@ ...@@ -576,7 +599,7 @@
<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"> <input name="daabzcyzzdy" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -588,7 +611,7 @@ ...@@ -588,7 +611,7 @@
<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"> <input name="dwgzzxm" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -596,7 +619,7 @@ ...@@ -596,7 +619,7 @@
<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"> <input name="dwgzzdh" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -606,7 +629,7 @@ ...@@ -606,7 +629,7 @@
<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"> <input name="dwgzzdnzw" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -614,7 +637,7 @@ ...@@ -614,7 +637,7 @@
<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"> <input name="dwgzzxzzw" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -624,7 +647,7 @@ ...@@ -624,7 +647,7 @@
<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"> <input name="dwgzzzzdy" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -648,7 +671,7 @@ ...@@ -648,7 +671,7 @@
<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="dys" class="form-control" type="text"> <input name="dys" class="form-control" type="text" placeholder="请输入党员数">
</div> </div>
</div> </div>
</div> </div>
...@@ -674,20 +697,66 @@ ...@@ -674,20 +697,66 @@
<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="dfsjbz" class="form-control" type="text" placeholder="请输入党费收缴标准"> <input name="zzdysl" class="form-control" type="text" placeholder="请输入在职党员数量">
</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>
<div class="col-sm-8">
<input name="ybdysl" class="form-control" type="text" placeholder="请输入预备党员数量">
</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="lddysl" class="form-control" type="text" placeholder="请输入流动党员数量">
</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="slhkddysl" class="form-control" type="text" placeholder="请输入失联或口袋党员数量">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<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="nnfzdys" class="form-control" type="text" placeholder="请输入年内发展党员数"> <input name="nnfzdys" class="form-control" type="text" placeholder="请输入年内发展党员数">
</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="qtsl" class="form-control" type="text" placeholder="请输入其他数量">
</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="dfsjbz" class="form-control" type="text" placeholder="请输入党费收缴标准">
</div>
</div>
</div>
</div> </div>
...@@ -722,15 +791,33 @@ ...@@ -722,15 +791,33 @@
<div class="col-sm-8"> <div class="col-sm-8">
<input name="djjf" class="form-control" type="text" placeholder="请输入党建经费"> <input name="djjf" class="form-control" type="text" placeholder="请输入党建经费">
</div> </div>
</div> </div><div class="col-md-6">
</div>
<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">
<div class="radio-box" th:each="dict : ${@dict.getType('orhon_isdy')}"> <input name="sjbfe" class="form-control" type="text" placeholder="请输入上级拨付额">
<input type="radio" th:id="${'isdy_' + dict.dictCode}" name="sfpdjzdy" th:value="${dict.dictValue}" th:checked="${dict.default}"> </div>
<label th:for="${'isdy_' + dict.dictCode}" th:text="${dict.dictLabel}"></label> </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="bjppe" class="form-control" type="text" placeholder="请输入本级匹配额">
</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">
<div class="radio-box" th:each="dict : ${@dict.getType('orhon_isdy')}">
<input type="radio" th:id="${'isdy_' + dict.dictCode}" name="sfpdjzdy" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'isdy_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -741,7 +828,7 @@ ...@@ -741,7 +828,7 @@
<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="djzdyxm" class="form-control" type="text"> <input name="djzdyxm" class="form-control" type="text" placeholder="请输入党建指导员姓名">
</div> </div>
</div> </div>
</div> </div>
...@@ -749,31 +836,26 @@ ...@@ -749,31 +836,26 @@
<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="djzdydh" class="form-control" type="text"> <input name="djzdydh" class="form-control" type="text" placeholder="请输入党建指导员电话">
</div> </div>
</div> </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">
<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">
<div class="radio-box" th:each="dict : ${@dict.getType('is_gh')}"> <input name="gzdwjzw" class="form-control" type="text" placeholder="请输入党建指导员工作单位及职务">
<input type="radio" th:id="${'isgh_' + dict.dictCode}" name="isgh" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'isgh_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<h4 class="form-header h4">党建工作特色</h4> <h4 class="form-header h4">党建工作特色</h4>
<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">
<div class="radio-box" th:each="dict : ${@dict.getType('is_sqlh')}"> <div class="radio-box" th:each="dict : ${@dict.getType('is_sqlh')}">
<input type="radio" th:id="${'issqlh_' + dict.dictCode}" name="issqlh" th:value="${dict.dictValue}" th:checked="${dict.default}"> <input type="radio" th:id="${'issqlh_' + dict.dictCode}" name="issqlh" th:value="${dict.dictValue}" th:checked="${dict.default}">
...@@ -794,6 +876,24 @@ ...@@ -794,6 +876,24 @@
<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>
<div class="col-sm-8">
<input name="qdsj" class="form-control" type="text" placeholder="请输入评定时间">
</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="qdjb" class="form-control" type="text" placeholder="请输入评定级别">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<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="jcqk" class="form-control" type="text" placeholder="请输入奖惩情况"> <input name="jcqk" class="form-control" type="text" placeholder="请输入奖惩情况">
...@@ -844,14 +944,14 @@ ...@@ -844,14 +944,14 @@
</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">-->
<textarea name="jzzjjtfs" class="form-control"></textarea> <!-- <textarea name="jzzjjtfs" class="form-control"></textarea>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> </div>
</form> </form>
......
ruoyi-admin/target/classes/templates/system/shzz/add_bak.html
...@@ -40,15 +40,15 @@ ...@@ -40,15 +40,15 @@
</div> </div>
</div> </div>
<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"> <input name="fddbr" class="form-control" type="text">
</div> </div>
</div> </div>
<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"> <input name="fddbrdh" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
......
ruoyi-admin/target/classes/templates/system/shzz/edit.html
...@@ -424,7 +424,7 @@ ...@@ -424,7 +424,7 @@
<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" > <input name="fddbrdh" class="form-control" type="text" >
</div> </div>
</div> </div>
</div> </div>
...@@ -435,7 +435,7 @@ ...@@ -435,7 +435,7 @@
<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="fddbr" class="form-control" type="text" required> <input name="fddbrdnzw" class="form-control" type="text" required>
</div> </div>
</div> </div>
</div> </div>
...@@ -443,7 +443,7 @@ ...@@ -443,7 +443,7 @@
<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" > <input name="fddbrxzzw" class="form-control" type="text" >
</div> </div>
</div> </div>
</div> </div>
...@@ -453,7 +453,7 @@ ...@@ -453,7 +453,7 @@
<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="fddbr" class="form-control" type="text" required> <input name="fddbrzzmm" class="form-control" type="text" required>
</div> </div>
</div> </div>
</div> </div>
...@@ -461,7 +461,7 @@ ...@@ -461,7 +461,7 @@
<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" > <input name="fddbrzzzdy" class="form-control" type="text" >
</div> </div>
</div> </div>
</div> </div>
...@@ -504,7 +504,7 @@ ...@@ -504,7 +504,7 @@
<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"> <input name="dzzsjdnzw" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -512,7 +512,7 @@ ...@@ -512,7 +512,7 @@
<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"> <input name="dzzsjxzzw" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -522,7 +522,7 @@ ...@@ -522,7 +522,7 @@
<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"> <input name="dzzsjzzdy" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -533,7 +533,7 @@ ...@@ -533,7 +533,7 @@
<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"> <input name="dzzbzcyxm" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -541,7 +541,7 @@ ...@@ -541,7 +541,7 @@
<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"> <input name="dzzbzcydh" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -551,7 +551,7 @@ ...@@ -551,7 +551,7 @@
<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"> <input name="dzzbzcydnzw" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -559,7 +559,7 @@ ...@@ -559,7 +559,7 @@
<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"> <input name="dzzbzcyxzzw" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -569,7 +569,7 @@ ...@@ -569,7 +569,7 @@
<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"> <input name="dzzbzcyzzdy" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -581,7 +581,7 @@ ...@@ -581,7 +581,7 @@
<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"> <input name="dwgzzxm" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -589,7 +589,7 @@ ...@@ -589,7 +589,7 @@
<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"> <input name="dwgzzdh" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -599,7 +599,7 @@ ...@@ -599,7 +599,7 @@
<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"> <input name="dwgzzdnzw" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -607,7 +607,7 @@ ...@@ -607,7 +607,7 @@
<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"> <input name="dwgzzxzzw" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
...@@ -617,7 +617,7 @@ ...@@ -617,7 +617,7 @@
<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"> <input name="dwgzzzzdy" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
......
ruoyi-admin/target/classes/templates/system/shzz/edit_bak.html
...@@ -41,15 +41,15 @@ ...@@ -41,15 +41,15 @@
</div> </div>
</div> </div>
<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" th:field="*{shzzxm}" class="form-control" type="text"> <input name="fddbr" th:field="*{fddbr}" class="form-control" type="text">
</div> </div>
</div> </div>
<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" th:field="*{shzzdh}" class="form-control" type="text"> <input name="fddbrdh" th:field="*{fddbrdh}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
......
ruoyi-admin/target/classes/templates/system/shzz/shzz.html
...@@ -60,14 +60,14 @@ ...@@ -60,14 +60,14 @@
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<li> <li>
<label>社会组织负责人姓名：</label> <label>法定代表人：</label>
<input type="text" name="shzzxm"/> <input type="text" name="fddbr"/>
</li> </li>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<li> <li>
<label>社会组织负责人电话：</label> <label>法定代表人电话：</label>
<input type="text" name="shzzdh"/> <input type="text" name="fddbrdh"/>
</li> </li>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
title: '法定代表人姓名' title: '法定代表人姓名'
}, },
{ {
field: 'shzzdh', field: 'fddbrdh',
title: '法定代表人电话' title: '法定代表人电话'
}, },
......
ruoyi-system/src/main/resources/mapper/system/OrhonFgqyMapper.xml
...@@ -14,8 +14,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -14,8 +14,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="nyysr" column="nyysr" /> <result property="nyysr" column="nyysr" />
<result property="cyrs" column="cyrs" /> <result property="cyrs" column="cyrs" />
<result property="dys" column="dys" /> <result property="dys" column="dys" />
<result property="shzzxm" column="shzzxm" /> <result property="fddbr" column="fddbr" />
<result property="shzzdh" column="shzzdh" /> <result property="fddbrdh" column="fddbrdh" />
<result property="fddbrdnzw" column="fddbrdnzw" />
<result property="fddbrxzzw" column="fddbrxzzw" />
<result property="fddbrzzmm" column="fddbrzzmm" />
<result property="fddbrzzdy" column="fddbrzzdy" />
<result property="isdy" column="isdy" /> <result property="isdy" column="isdy" />
<result property="isgh" column="isgh" /> <result property="isgh" column="isgh" />
<result property="istzz" column="istzz" /> <result property="istzz" column="istzz" />
...@@ -25,6 +29,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -25,6 +29,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="sjdzz" column="sjdzz" /> <result property="sjdzz" column="sjdzz" />
<result property="dzzsjxm" column="dzzsjxm" /> <result property="dzzsjxm" column="dzzsjxm" />
<result property="dzzsjdh" column="dzzsjdh" /> <result property="dzzsjdh" column="dzzsjdh" />
<result property="dzzsjdnzw" column="dzzsjdnzw" />
<result property="dzzsjxzzw" column="dzzsjxzzw" />
<result property="dzzsjzzdy" column="dzzsjzzdy" />
<result property="dzzbzcyxm" column="dzzbzcyxm" />
<result property="dzzbzcydh" column="dzzbzcydh" />
<result property="dzzbzcydnzw" column="dzzbzcydnzw" />
<result property="dzzbzcyxzzw" column="dzzbzcyxzzw" />
<result property="dzzbzcyzzdy" column="dzzbzcyzzdy" />
<result property="dwgzzxm" column="dwgzzxm" />
<result property="dwgzzdh" column="dwgzzdh" />
<result property="dwgzzdnzw" column="dwgzzdnzw" />
<result property="dwgzzxzzw" column="dwgzzxzzw" />
<result property="dwgzzzzdy" column="dwgzzzzdy" />
<result property="djfs" column="djfs" /> <result property="djfs" column="djfs" />
<result property="djzdyxm" column="djzdyxm" /> <result property="djzdyxm" column="djzdyxm" />
<result property="djzdydh" column="djzdydh" /> <result property="djzdydh" column="djzdydh" />
...@@ -121,8 +138,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -121,8 +138,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="nyysr != null">nyysr,</if> <if test="nyysr != null">nyysr,</if>
<if test="cyrs != null">cyrs,</if> <if test="cyrs != null">cyrs,</if>
<if test="dys != null">dys,</if> <if test="dys != null">dys,</if>
<if test="shzzxm != null">shzzxm,</if> <if test="fddbr != null">fddbr,</if>
<if test="shzzdh != null">shzzdh,</if> <if test="fddbrdh != null">fddbrdh,</if>
<if test="fddbrdnzw != null">fddbrdnzw,</if>
<if test="fddbrxzzw != null">fddbrxzzw,</if>
<if test="fddbrzzmm != null">fddbrzzmm,</if>
<if test="fddbrzzdy != null">fddbrzzdy,</if>
<if test="isdy != null">isdy,</if> <if test="isdy != null">isdy,</if>
<if test="isgh != null">isgh,</if> <if test="isgh != null">isgh,</if>
<if test="istzz != null">istzz,</if> <if test="istzz != null">istzz,</if>
...@@ -132,6 +153,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -132,6 +153,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sjdzz != null">sjdzz,</if> <if test="sjdzz != null">sjdzz,</if>
<if test="dzzsjxm != null">dzzsjxm,</if> <if test="dzzsjxm != null">dzzsjxm,</if>
<if test="dzzsjdh != null">dzzsjdh,</if> <if test="dzzsjdh != null">dzzsjdh,</if>
<if test="dzzsjdnzw != null">dzzsjdnzw,</if>
<if test="dzzsjxzzw != null">dzzsjxzzw,</if>
<if test="dzzsjzzdy != null">dzzsjzzdy,</if>
<if test="dzzbzcyxm != null">dzzbzcyxm,</if>
<if test="dzzbzcydh != null">dzzbzcydh,</if>
<if test="dzzbzcydnzw != null">dzzbzcydnzw,</if>
<if test="dzzbzcyxzzw != null">dzzbzcyxzzw,</if>
<if test="dzzbzcyzzdy != null">dzzbzcyzzdy,</if>
<if test="dwgzzxm != null">dwgzzxm,</if>
<if test="dwgzzdh != null">dwgzzdh,</if>
<if test="dwgzzdnzw != null">dwgzzdnzw,</if>
<if test="dwgzzxzzw != null">dwgzzxzzw,</if>
<if test="dwgzzzzdy != null">dwgzzzzdy,</if>
<if test="djfs != null">djfs,</if> <if test="djfs != null">djfs,</if>
<if test="djzdyxm != null">djzdyxm,</if> <if test="djzdyxm != null">djzdyxm,</if>
<if test="djzdydh != null">djzdydh,</if> <if test="djzdydh != null">djzdydh,</if>
...@@ -182,8 +216,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -182,8 +216,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="nyysr != null">#{nyysr},</if> <if test="nyysr != null">#{nyysr},</if>
<if test="cyrs != null">#{cyrs},</if> <if test="cyrs != null">#{cyrs},</if>
<if test="dys != null">#{dys},</if> <if test="dys != null">#{dys},</if>
<if test="shzzxm != null">#{shzzxm},</if> <if test="fddbr != null">#{fddbr},</if>
<if test="shzzdh != null">#{shzzdh},</if> <if test="fddbrdh != null">#{fddbrdh},</if>
<if test="fddbrdnzw != null">#{fddbrdnzw},</if>
<if test="fddbrxzzw != null">#{fddbrxzzw},</if>
<if test="fddbrzzmm != null">#{fddbrzzmm},</if>
<if test="fddbrzzdy != null">#{fddbrzzdy},</if>
<if test="isdy != null">#{isdy},</if> <if test="isdy != null">#{isdy},</if>
<if test="isgh != null">#{isgh},</if> <if test="isgh != null">#{isgh},</if>
<if test="istzz != null">#{istzz},</if> <if test="istzz != null">#{istzz},</if>
...@@ -193,6 +231,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -193,6 +231,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sjdzz != null">#{sjdzz},</if> <if test="sjdzz != null">#{sjdzz},</if>
<if test="dzzsjxm != null">#{dzzsjxm},</if> <if test="dzzsjxm != null">#{dzzsjxm},</if>
<if test="dzzsjdh != null">#{dzzsjdh},</if> <if test="dzzsjdh != null">#{dzzsjdh},</if>
<if test="dzzsjdnzw != null">#{dzzsjdnzw},</if>
<if test="dzzsjxzzw != null">#{dzzsjxzzw},</if>
<if test="dzzsjzzdy != null">#{dzzsjzzdy},</if>
<if test="dzzbzcyxm != null">#{dzzbzcyxm},</if>
<if test="dzzbzcydh != null">#{dzzbzcydh},</if>
<if test="dzzbzcydnzw != null">#{dzzbzcydnzw},</if>
<if test="dzzbzcyxzzw != null">#{dzzbzcyxzzw},</if>
<if test="dzzbzcyzzdy != null">#{dzzbzcyzzdy},</if>
<if test="dwgzzxm != null">#{dwgzzxm},</if>
<if test="dwgzzdh != null">#{dwgzzdh},</if>
<if test="dwgzzdnzw != null">#{dwgzzdnzw},</if>
<if test="dwgzzxzzw != null">#{dwgzzxzzw},</if>
<if test="dwgzzzzdy != null">#{dwgzzzzdy},</if>
<if test="djfs != null">#{djfs},</if> <if test="djfs != null">#{djfs},</if>
<if test="djzdyxm != null">#{djzdyxm},</if> <if test="djzdyxm != null">#{djzdyxm},</if>
<if test="djzdydh != null">#{djzdydh},</if> <if test="djzdydh != null">#{djzdydh},</if>
...@@ -246,8 +297,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -246,8 +297,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="nyysr != null">nyysr = #{nyysr},</if> <if test="nyysr != null">nyysr = #{nyysr},</if>
<if test="cyrs != null">cyrs = #{cyrs},</if> <if test="cyrs != null">cyrs = #{cyrs},</if>
<if test="dys != null">dys = #{dys},</if> <if test="dys != null">dys = #{dys},</if>
<if test="shzzxm != null">shzzxm = #{shzzxm},</if> <if test="fddbr != null">fddbr = #{fddbr},</if>
<if test="shzzdh != null">shzzdh = #{shzzdh},</if> <if test="fddbrdh != null">fddbrdh = #{fddbrdh},</if>
<if test="fddbrdnzw != null">fddbrdnzw = #{fddbrdnzw},</if>
<if test="fddbrxzzw != null">fddbrxzzw = #{fddbrxzzw},</if>
<if test="fddbrzzmm != null">fddbrzzmm = #{fddbrzzmm},</if>
<if test="fddbrzzdy != null">fddbrzzdy = #{fddbrzzdy},</if>
<if test="isdy != null">isdy = #{isdy},</if> <if test="isdy != null">isdy = #{isdy},</if>
<if test="isgh != null">isgh = #{isgh},</if> <if test="isgh != null">isgh = #{isgh},</if>
<if test="istzz != null">istzz = #{istzz},</if> <if test="istzz != null">istzz = #{istzz},</if>
...@@ -257,6 +312,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -257,6 +312,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sjdzz != null">sjdzz = #{sjdzz},</if> <if test="sjdzz != null">sjdzz = #{sjdzz},</if>
<if test="dzzsjxm != null">dzzsjxm = #{dzzsjxm},</if> <if test="dzzsjxm != null">dzzsjxm = #{dzzsjxm},</if>
<if test="dzzsjdh != null">dzzsjdh = #{dzzsjdh},</if> <if test="dzzsjdh != null">dzzsjdh = #{dzzsjdh},</if>
<if test="dzzsjdnzw != null">dzzsjdnzw = #{dzzsjdnzw},</if>
<if test="dzzsjxzzw != null">dzzsjxzzw = #{dzzsjxzzw},</if>
<if test="dzzsjzzdy != null">dzzsjzzdy = #{dzzsjzzdy},</if>
<if test="dzzbzcyxm != null">dzzbzcyxm = #{dzzbzcyxm},</if>
<if test="dzzbzcydh != null">dzzbzcydh = #{dzzbzcydh},</if>
<if test="dzzbzcydnzw != null">dzzbzcydnzw = #{dzzbzcydnzw},</if>
<if test="dzzbzcyxzzw != null">dzzbzcyxzzw = #{dzzbzcyxzzw},</if>
<if test="dzzbzcyzzdy != null">dzzbzcyzzdy = #{dzzbzcyzzdy},</if>
<if test="dwgzzxm != null">dwgzzxm = #{dwgzzxm},</if>
<if test="dwgzzdh != null">dwgzzdh = #{dwgzzdh},</if>
<if test="dwgzzdnzw != null">dwgzzdnzw = #{dwgzzdnzw},</if>
<if test="dwgzzxzzw != null">dwgzzxzzw = #{dwgzzxzzw},</if>
<if test="dwgzzzzdy != null">dwgzzzzdy = #{dwgzzzzdy},</if>
<if test="djfs != null">djfs = #{djfs},</if> <if test="djfs != null">djfs = #{djfs},</if>
<if test="djzdyxm != null">djzdyxm = #{djzdyxm},</if> <if test="djzdyxm != null">djzdyxm = #{djzdyxm},</if>
<if test="djzdydh != null">djzdydh = #{djzdydh},</if> <if test="djzdydh != null">djzdydh = #{djzdydh},</if>
......
ruoyi-system/src/main/resources/mapper/system/OrhonShzzMapper.xml
...@@ -11,8 +11,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -11,8 +11,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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" />
<result property="shzzxm" column="shzzxm" /> <result property="fddbr" column="fddbr" />
<result property="shzzdh" column="shzzdh" /> <result property="fddbrdh" column="fddbrdh" />
<result property="fddbrdnzw" column="fddbrdnzw" />
<result property="fddbrxzzw" column="fddbrxzzw" />
<result property="fddbrzzmm" column="fddbrzzmm" />
<result property="fddbrzzdy" column="fddbrzzdy" />
<result property="isdy" column="isdy" /> <result property="isdy" column="isdy" />
<result property="isgh" column="isgh" /> <result property="isgh" column="isgh" />
<result property="istzz" column="istzz" /> <result property="istzz" column="istzz" />
...@@ -22,6 +26,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -22,6 +26,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="sjdzz" column="sjdzz" /> <result property="sjdzz" column="sjdzz" />
<result property="dzzsjxm" column="dzzsjxm" /> <result property="dzzsjxm" column="dzzsjxm" />
<result property="dzzsjdh" column="dzzsjdh" /> <result property="dzzsjdh" column="dzzsjdh" />
<result property="dzzsjdnzw" column="dzzsjdnzw" />
<result property="dzzsjxzzw" column="dzzsjxzzw" />
<result property="dzzsjzzdy" column="dzzsjzzdy" />
<result property="dzzbzcyxm" column="dzzbzcyxm" />
<result property="dzzbzcydh" column="dzzbzcydh" />
<result property="dzzbzcydnzw" column="dzzbzcydnzw" />
<result property="dzzbzcyxzzw" column="dzzbzcyxzzw" />
<result property="dzzbzcyzzdy" column="dzzbzcyzzdy" />
<result property="dwgzzxm" column="dwgzzxm" />
<result property="dwgzzdh" column="dwgzzdh" />
<result property="dwgzzdnzw" column="dwgzzdnzw" />
<result property="dwgzzxzzw" column="dwgzzxzzw" />
<result property="dwgzzzzdy" column="dwgzzzzdy" />
<result property="djfs" column="djfs" /> <result property="djfs" column="djfs" />
<result property="deptId" column="dept_id" /> <result property="deptId" column="dept_id" />
<result property="dys" column="dys" /> <result property="dys" column="dys" />
...@@ -31,7 +48,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -31,7 +48,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="wjldzzyy" column="wjldzzyy" /> <result property="wjldzzyy" column="wjldzzyy" />
<result property="jzzjjtfs" column="jzzjjtfs" /> <result property="jzzjjtfs" column="jzzjjtfs" />
<result property="issqlh" column="issqlh" /> <result property="issqlh" column="issqlh" />
<result property="nbxh" column="nbxh" /> <result property="nbxh" column="nbxh" />
<result property="djbm" column="djbm" /> <result property="djbm" column="djbm" />
<result property="zzjgdm" column="zzjgdm" /> <result property="zzjgdm" column="zzjgdm" />
...@@ -60,7 +76,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -60,7 +76,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="dzzsdgx" column="dzzsdgx" /> <result property="dzzsdgx" column="dzzsdgx" />
<result property="hjxx" column="hjxx" /> <result property="hjxx" column="hjxx" />
<result property="dfzh" column="dfzh" /> <result property="dfzh" column="dfzh" />
<result property="fddbr" column="fddbr" />
<result property="ywdy" column="ywdy" /> <result property="ywdy" column="ywdy" />
<result property="jjfzsl" column="jjfzsl" /> <result property="jjfzsl" column="jjfzsl" />
<result property="fzdxsl" column="fzdxsl" /> <result property="fzdxsl" column="fzdxsl" />
...@@ -89,8 +104,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -89,8 +104,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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>
<if test="shzzxm != null and shzzxm != ''"> and shzzxm = #{shzzxm}</if> <if test="fddbr != null and fddbr != ''"> and fddbr = #{fddbr}</if>
<if test="shzzdh != null and shzzdh != ''"> and shzzdh = #{shzzdh}</if> <if test="fddbrdh != null and fddbrdh != ''"> and fddbrdh = #{fddbrdh}</if>
<if test="fddbrdnzw != null and fddbrdnzw != ''"> and fddbrdnzw = #{fddbrdnzw}</if>
<if test="fddbrxzzw != null and fddbrxzzw != ''"> and fddbrxzzw = #{fddbrxzzw}</if>
<if test="fddbrzzmm != null and fddbrzzmm != ''"> and fddbrzzmm = #{fddbrzzmm}</if>
<if test="fddbrzzdy != null and fddbrzzdy != ''"> and fddbrzzdy = #{fddbrzzdy}</if>
<if test="isdy != null and isdy != ''"> and isdy = #{isdy}</if> <if test="isdy != null and isdy != ''"> and isdy = #{isdy}</if>
<if test="isgh != null and isgh != ''"> and isgh = #{isgh}</if> <if test="isgh != null and isgh != ''"> and isgh = #{isgh}</if>
<if test="istzz != null and istzz != ''"> and istzz = #{istzz}</if> <if test="istzz != null and istzz != ''"> and istzz = #{istzz}</if>
...@@ -100,6 +119,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -100,6 +119,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sjdzz != null and sjdzz != ''"> and sjdzz = #{sjdzz}</if> <if test="sjdzz != null and sjdzz != ''"> and sjdzz = #{sjdzz}</if>
<if test="dzzsjxm != null and dzzsjxm != ''"> and dzzsjxm = #{dzzsjxm}</if> <if test="dzzsjxm != null and dzzsjxm != ''"> and dzzsjxm = #{dzzsjxm}</if>
<if test="dzzsjdh != null and dzzsjdh != ''"> and dzzsjdh = #{dzzsjdh}</if> <if test="dzzsjdh != null and dzzsjdh != ''"> and dzzsjdh = #{dzzsjdh}</if>
<if test="dzzsjdnzw != null and dzzsjdnzw != ''"> and dzzsjdnzw = #{dzzsjdnzw}</if>
<if test="dzzsjxzzw != null and dzzsjxzzw != ''"> and dzzsjxzzw = #{dzzsjxzzw}</if>
<if test="dzzsjzzdy != null and dzzsjzzdy != ''"> and dzzsjzzdy = #{dzzsjzzdy}</if>
<if test="dzzbzcyxm != null and dzzbzcyxm != ''"> and dzzbzcyxm = #{dzzbzcyxm}</if>
<if test="dzzbzcydh != null and dzzbzcydh != ''"> and dzzbzcydh = #{dzzbzcydh}</if>
<if test="dzzbzcydnzw != null and dzzbzcydnzw != ''"> and dzzbzcydnzw = #{dzzbzcydnzw}</if>
<if test="dzzbzcyxzzw != null and dzzbzcyxzzw != ''"> and dzzbzcyxzzw = #{dzzbzcyxzzw}</if>
<if test="dzzbzcyzzdy != null and dzzbzcyzzdy != ''"> and dzzbzcyzzdy = #{dzzbzcyzzdy}</if>
<if test="dwgzzxm != null and dwgzzxm != ''"> and dwgzzxm = #{dwgzzxm}</if>
<if test="dwgzzdh != null and dwgzzdh != ''"> and dwgzzdh = #{dwgzzdh}</if>
<if test="dwgzzdnzw != null and dwgzzdnzw != ''"> and dwgzzdnzw = #{dwgzzdnzw}</if>
<if test="dwgzzxzzw != null and dwgzzxzzw != ''"> and dwgzzxzzw = #{dwgzzxzzw}</if>
<if test="dwgzzzzdy != null and dwgzzzzdy != ''"> and dwgzzzzdy = #{dwgzzzzdy}</if>
<if test="djfs != null and djfs != ''"> and djfs = #{djfs}</if> <if test="djfs != null and djfs != ''"> and djfs = #{djfs}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if> <if test="deptId != null "> and dept_id = #{deptId}</if>
<if test="params.beginDys != null and params.beginDys != '' and params.endDys != null and params.endDys != ''"> and dys between #{params.beginDys} and #{params.endDys}</if> <if test="params.beginDys != null and params.beginDys != '' and params.endDys != null and params.endDys != ''"> and dys between #{params.beginDys} and #{params.endDys}</if>
...@@ -126,8 +158,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -126,8 +158,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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>
<if test="shzzxm != null">shzzxm,</if> <if test="fddbr != null">fddbr,</if>
<if test="shzzdh != null">shzzdh,</if> <if test="fddbrdh != null">fddbrdh,</if>
<if test="fddbrdnzw != null">fddbrdnzw,</if>
<if test="fddbrxzzw != null">fddbrxzzw,</if>
<if test="fddbrzzmm != null">fddbrzzmm,</if>
<if test="fddbrzzdy != null">fddbrzzdy,</if>
<if test="isdy != null">isdy,</if> <if test="isdy != null">isdy,</if>
<if test="isgh != null">isgh,</if> <if test="isgh != null">isgh,</if>
<if test="istzz != null">istzz,</if> <if test="istzz != null">istzz,</if>
...@@ -137,6 +173,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -137,6 +173,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sjdzz != null">sjdzz,</if> <if test="sjdzz != null">sjdzz,</if>
<if test="dzzsjxm != null">dzzsjxm,</if> <if test="dzzsjxm != null">dzzsjxm,</if>
<if test="dzzsjdh != null">dzzsjdh,</if> <if test="dzzsjdh != null">dzzsjdh,</if>
<if test="dzzsjdnzw != null">dzzsjdnzw,</if>
<if test="dzzsjxzzw != null">dzzsjxzzw,</if>
<if test="dzzsjzzdy != null">dzzsjzzdy,</if>
<if test="dzzbzcyxm != null">dzzbzcyxm,</if>
<if test="dzzbzcydh != null">dzzbzcydh,</if>
<if test="dzzbzcydnzw != null">dzzbzcydnzw,</if>
<if test="dzzbzcyxzzw != null">dzzbzcyxzzw,</if>
<if test="dzzbzcyzzdy != null">dzzbzcyzzdy,</if>
<if test="dwgzzxm != null">dwgzzxm,</if>
<if test="dwgzzdh != null">dwgzzdh,</if>
<if test="dwgzzdnzw != null">dwgzzdnzw,</if>
<if test="dwgzzxzzw != null">dwgzzxzzw,</if>
<if test="dwgzzzzdy != null">dwgzzzzdy,</if>
<if test="djfs != null">djfs,</if> <if test="djfs != null">djfs,</if>
<if test="deptId != null">dept_id,</if> <if test="deptId != null">dept_id,</if>
<if test="dys != null">dys,</if> <if test="dys != null">dys,</if>
...@@ -146,7 +195,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -146,7 +195,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="wjldzzyy != null">wjldzzyy,</if> <if test="wjldzzyy != null">wjldzzyy,</if>
<if test="jzzjjtfs != null">jzzjjtfs,</if> <if test="jzzjjtfs != null">jzzjjtfs,</if>
<if test="issqlh != null">issqlh,</if> <if test="issqlh != null">issqlh,</if>
<if test="nbxh != null">nbxh,</if> <if test="nbxh != null">nbxh,</if>
<if test="djbm != null">djbm,</if> <if test="djbm != null">djbm,</if>
<if test="zzjgdm != null">zzjgdm,</if> <if test="zzjgdm != null">zzjgdm,</if>
...@@ -197,8 +245,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -197,8 +245,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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>
<if test="shzzxm != null">#{shzzxm},</if> <if test="fddbr != null">#{fddbr},</if>
<if test="shzzdh != null">#{shzzdh},</if> <if test="fddbrdh != null">#{fddbrdh},</if>
<if test="fddbrdnzw != null">#{fddbrdnzw},</if>
<if test="fddbrxzzw != null">#{fddbrxzzw},</if>
<if test="fddbrzzmm != null">#{fddbrzzmm},</if>
<if test="fddbrzzdy != null">#{fddbrzzdy},</if>
<if test="isdy != null">#{isdy},</if> <if test="isdy != null">#{isdy},</if>
<if test="isgh != null">#{isgh},</if> <if test="isgh != null">#{isgh},</if>
<if test="istzz != null">#{istzz},</if> <if test="istzz != null">#{istzz},</if>
...@@ -208,6 +260,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -208,6 +260,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sjdzz != null">#{sjdzz},</if> <if test="sjdzz != null">#{sjdzz},</if>
<if test="dzzsjxm != null">#{dzzsjxm},</if> <if test="dzzsjxm != null">#{dzzsjxm},</if>
<if test="dzzsjdh != null">#{dzzsjdh},</if> <if test="dzzsjdh != null">#{dzzsjdh},</if>
<if test="dzzsjdnzw != null">#{dzzsjdnzw},</if>
<if test="dzzsjxzzw != null">#{dzzsjxzzw},</if>
<if test="dzzsjzzdy != null">#{dzzsjzzdy},</if>
<if test="dzzbzcyxm != null">#{dzzbzcyxm},</if>
<if test="dzzbzcydh != null">#{dzzbzcydh},</if>
<if test="dzzbzcydnzw != null">#{dzzbzcydnzw},</if>
<if test="dzzbzcyxzzw != null">#{dzzbzcyxzzw},</if>
<if test="dzzbzcyzzdy != null">#{dzzbzcyzzdy},</if>
<if test="dwgzzxm != null">#{dwgzzxm},</if>
<if test="dwgzzdh != null">#{dwgzzdh},</if>
<if test="dwgzzdnzw != null">#{dwgzzdnzw},</if>
<if test="dwgzzxzzw != null">#{dwgzzxzzw},</if>
<if test="dwgzzzzdy != null">#{dwgzzzzdy},</if>
<if test="djfs != null">#{djfs},</if> <if test="djfs != null">#{djfs},</if>
<if test="deptId != null">#{deptId},</if> <if test="deptId != null">#{deptId},</if>
<if test="dys != null">#{dys},</if> <if test="dys != null">#{dys},</if>
...@@ -271,8 +336,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -271,8 +336,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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>
<if test="shzzxm != null">shzzxm = #{shzzxm},</if> <if test="fddbr != null">fddbr = #{fddbr},</if>
<if test="shzzdh != null">shzzdh = #{shzzdh},</if> <if test="fddbrdh != null">fddbrdh = #{fddbrdh},</if>
<if test="fddbrdnzw != null">fddbrdnzw = #{fddbrdnzw},</if>
<if test="fddbrxzzw != null">fddbrxzzw = #{fddbrxzzw},</if>
<if test="fddbrzzmm != null">fddbrzzmm = #{fddbrzzmm},</if>
<if test="fddbrzzdy != null">fddbrzzdy = #{fddbrzzdy},</if>
<if test="isdy != null">isdy = #{isdy},</if> <if test="isdy != null">isdy = #{isdy},</if>
<if test="isgh != null">isgh = #{isgh},</if> <if test="isgh != null">isgh = #{isgh},</if>
<if test="istzz != null">istzz = #{istzz},</if> <if test="istzz != null">istzz = #{istzz},</if>
...@@ -282,6 +351,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -282,6 +351,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sjdzz != null">sjdzz = #{sjdzz},</if> <if test="sjdzz != null">sjdzz = #{sjdzz},</if>
<if test="dzzsjxm != null">dzzsjxm = #{dzzsjxm},</if> <if test="dzzsjxm != null">dzzsjxm = #{dzzsjxm},</if>
<if test="dzzsjdh != null">dzzsjdh = #{dzzsjdh},</if> <if test="dzzsjdh != null">dzzsjdh = #{dzzsjdh},</if>
<if test="dzzsjdnzw != null">dzzsjdnzw = #{dzzsjdnzw},</if>
<if test="dzzsjxzzw != null">dzzsjxzzw = #{dzzsjxzzw},</if>
<if test="dzzsjzzdy != null">dzzsjzzdy = #{dzzsjzzdy},</if>
<if test="dzzbzcyxm != null">dzzbzcyxm = #{dzzbzcyxm},</if>
<if test="dzzbzcydh != null">dzzbzcydh = #{dzzbzcydh},</if>
<if test="dzzbzcydnzw != null">dzzbzcydnzw = #{dzzbzcydnzw},</if>
<if test="dzzbzcyxzzw != null">dzzbzcyxzzw = #{dzzbzcyxzzw},</if>
<if test="dzzbzcyzzdy != null">dzzbzcyzzdy = #{dzzbzcyzzdy},</if>
<if test="dwgzzxm != null">dwgzzxm = #{dwgzzxm},</if>
<if test="dwgzzdh != null">dwgzzdh = #{dwgzzdh},</if>
<if test="dwgzzdnzw != null">dwgzzdnzw = #{dwgzzdnzw},</if>
<if test="dwgzzxzzw != null">dwgzzxzzw = #{dwgzzxzzw},</if>
<if test="dwgzzzzdy != null">dwgzzzzdy = #{dwgzzzzdy},</if>
<if test="djfs != null">djfs = #{djfs},</if> <if test="djfs != null">djfs = #{djfs},</if>
<if test="deptId != null">dept_id = #{deptId},</if> <if test="deptId != null">dept_id = #{deptId},</if>
<if test="dys != null">dys = #{dys},</if> <if test="dys != null">dys = #{dys},</if>
......
ruoyi-system/target/classes/mapper/system/OrhonFgqyMapper.xml
...@@ -14,8 +14,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -14,8 +14,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="nyysr" column="nyysr" /> <result property="nyysr" column="nyysr" />
<result property="cyrs" column="cyrs" /> <result property="cyrs" column="cyrs" />
<result property="dys" column="dys" /> <result property="dys" column="dys" />
<result property="shzzxm" column="shzzxm" /> <result property="fddbr" column="fddbr" />
<result property="shzzdh" column="shzzdh" /> <result property="fddbrdh" column="fddbrdh" />
<result property="fddbrdnzw" column="fddbrdnzw" />
<result property="fddbrxzzw" column="fddbrxzzw" />
<result property="fddbrzzmm" column="fddbrzzmm" />
<result property="fddbrzzdy" column="fddbrzzdy" />
<result property="isdy" column="isdy" /> <result property="isdy" column="isdy" />
<result property="isgh" column="isgh" /> <result property="isgh" column="isgh" />
<result property="istzz" column="istzz" /> <result property="istzz" column="istzz" />
...@@ -25,6 +29,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -25,6 +29,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="sjdzz" column="sjdzz" /> <result property="sjdzz" column="sjdzz" />
<result property="dzzsjxm" column="dzzsjxm" /> <result property="dzzsjxm" column="dzzsjxm" />
<result property="dzzsjdh" column="dzzsjdh" /> <result property="dzzsjdh" column="dzzsjdh" />
<result property="dzzsjdnzw" column="dzzsjdnzw" />
<result property="dzzsjxzzw" column="dzzsjxzzw" />
<result property="dzzsjzzdy" column="dzzsjzzdy" />
<result property="dzzbzcyxm" column="dzzbzcyxm" />
<result property="dzzbzcydh" column="dzzbzcydh" />
<result property="dzzbzcydnzw" column="dzzbzcydnzw" />
<result property="dzzbzcyxzzw" column="dzzbzcyxzzw" />
<result property="dzzbzcyzzdy" column="dzzbzcyzzdy" />
<result property="dwgzzxm" column="dwgzzxm" />
<result property="dwgzzdh" column="dwgzzdh" />
<result property="dwgzzdnzw" column="dwgzzdnzw" />
<result property="dwgzzxzzw" column="dwgzzxzzw" />
<result property="dwgzzzzdy" column="dwgzzzzdy" />
<result property="djfs" column="djfs" /> <result property="djfs" column="djfs" />
<result property="djzdyxm" column="djzdyxm" /> <result property="djzdyxm" column="djzdyxm" />
<result property="djzdydh" column="djzdydh" /> <result property="djzdydh" column="djzdydh" />
...@@ -121,8 +138,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -121,8 +138,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="nyysr != null">nyysr,</if> <if test="nyysr != null">nyysr,</if>
<if test="cyrs != null">cyrs,</if> <if test="cyrs != null">cyrs,</if>
<if test="dys != null">dys,</if> <if test="dys != null">dys,</if>
<if test="shzzxm != null">shzzxm,</if> <if test="fddbr != null">fddbr,</if>
<if test="shzzdh != null">shzzdh,</if> <if test="fddbrdh != null">fddbrdh,</if>
<if test="fddbrdnzw != null">fddbrdnzw,</if>
<if test="fddbrxzzw != null">fddbrxzzw,</if>
<if test="fddbrzzmm != null">fddbrzzmm,</if>
<if test="fddbrzzdy != null">fddbrzzdy,</if>
<if test="isdy != null">isdy,</if> <if test="isdy != null">isdy,</if>
<if test="isgh != null">isgh,</if> <if test="isgh != null">isgh,</if>
<if test="istzz != null">istzz,</if> <if test="istzz != null">istzz,</if>
...@@ -132,6 +153,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -132,6 +153,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sjdzz != null">sjdzz,</if> <if test="sjdzz != null">sjdzz,</if>
<if test="dzzsjxm != null">dzzsjxm,</if> <if test="dzzsjxm != null">dzzsjxm,</if>
<if test="dzzsjdh != null">dzzsjdh,</if> <if test="dzzsjdh != null">dzzsjdh,</if>
<if test="dzzsjdnzw != null">dzzsjdnzw,</if>
<if test="dzzsjxzzw != null">dzzsjxzzw,</if>
<if test="dzzsjzzdy != null">dzzsjzzdy,</if>
<if test="dzzbzcyxm != null">dzzbzcyxm,</if>
<if test="dzzbzcydh != null">dzzbzcydh,</if>
<if test="dzzbzcydnzw != null">dzzbzcydnzw,</if>
<if test="dzzbzcyxzzw != null">dzzbzcyxzzw,</if>
<if test="dzzbzcyzzdy != null">dzzbzcyzzdy,</if>
<if test="dwgzzxm != null">dwgzzxm,</if>
<if test="dwgzzdh != null">dwgzzdh,</if>
<if test="dwgzzdnzw != null">dwgzzdnzw,</if>
<if test="dwgzzxzzw != null">dwgzzxzzw,</if>
<if test="dwgzzzzdy != null">dwgzzzzdy,</if>
<if test="djfs != null">djfs,</if> <if test="djfs != null">djfs,</if>
<if test="djzdyxm != null">djzdyxm,</if> <if test="djzdyxm != null">djzdyxm,</if>
<if test="djzdydh != null">djzdydh,</if> <if test="djzdydh != null">djzdydh,</if>
...@@ -182,8 +216,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -182,8 +216,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="nyysr != null">#{nyysr},</if> <if test="nyysr != null">#{nyysr},</if>
<if test="cyrs != null">#{cyrs},</if> <if test="cyrs != null">#{cyrs},</if>
<if test="dys != null">#{dys},</if> <if test="dys != null">#{dys},</if>
<if test="shzzxm != null">#{shzzxm},</if> <if test="fddbr != null">#{fddbr},</if>
<if test="shzzdh != null">#{shzzdh},</if> <if test="fddbrdh != null">#{fddbrdh},</if>
<if test="fddbrdnzw != null">#{fddbrdnzw},</if>
<if test="fddbrxzzw != null">#{fddbrxzzw},</if>
<if test="fddbrzzmm != null">#{fddbrzzmm},</if>
<if test="fddbrzzdy != null">#{fddbrzzdy},</if>
<if test="isdy != null">#{isdy},</if> <if test="isdy != null">#{isdy},</if>
<if test="isgh != null">#{isgh},</if> <if test="isgh != null">#{isgh},</if>
<if test="istzz != null">#{istzz},</if> <if test="istzz != null">#{istzz},</if>
...@@ -193,6 +231,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -193,6 +231,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sjdzz != null">#{sjdzz},</if> <if test="sjdzz != null">#{sjdzz},</if>
<if test="dzzsjxm != null">#{dzzsjxm},</if> <if test="dzzsjxm != null">#{dzzsjxm},</if>
<if test="dzzsjdh != null">#{dzzsjdh},</if> <if test="dzzsjdh != null">#{dzzsjdh},</if>
<if test="dzzsjdnzw != null">#{dzzsjdnzw},</if>
<if test="dzzsjxzzw != null">#{dzzsjxzzw},</if>
<if test="dzzsjzzdy != null">#{dzzsjzzdy},</if>
<if test="dzzbzcyxm != null">#{dzzbzcyxm},</if>
<if test="dzzbzcydh != null">#{dzzbzcydh},</if>
<if test="dzzbzcydnzw != null">#{dzzbzcydnzw},</if>
<if test="dzzbzcyxzzw != null">#{dzzbzcyxzzw},</if>
<if test="dzzbzcyzzdy != null">#{dzzbzcyzzdy},</if>
<if test="dwgzzxm != null">#{dwgzzxm},</if>
<if test="dwgzzdh != null">#{dwgzzdh},</if>
<if test="dwgzzdnzw != null">#{dwgzzdnzw},</if>
<if test="dwgzzxzzw != null">#{dwgzzxzzw},</if>
<if test="dwgzzzzdy != null">#{dwgzzzzdy},</if>
<if test="djfs != null">#{djfs},</if> <if test="djfs != null">#{djfs},</if>
<if test="djzdyxm != null">#{djzdyxm},</if> <if test="djzdyxm != null">#{djzdyxm},</if>
<if test="djzdydh != null">#{djzdydh},</if> <if test="djzdydh != null">#{djzdydh},</if>
...@@ -246,8 +297,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -246,8 +297,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="nyysr != null">nyysr = #{nyysr},</if> <if test="nyysr != null">nyysr = #{nyysr},</if>
<if test="cyrs != null">cyrs = #{cyrs},</if> <if test="cyrs != null">cyrs = #{cyrs},</if>
<if test="dys != null">dys = #{dys},</if> <if test="dys != null">dys = #{dys},</if>
<if test="shzzxm != null">shzzxm = #{shzzxm},</if> <if test="fddbr != null">fddbr = #{fddbr},</if>
<if test="shzzdh != null">shzzdh = #{shzzdh},</if> <if test="fddbrdh != null">fddbrdh = #{fddbrdh},</if>
<if test="fddbrdnzw != null">fddbrdnzw = #{fddbrdnzw},</if>
<if test="fddbrxzzw != null">fddbrxzzw = #{fddbrxzzw},</if>
<if test="fddbrzzmm != null">fddbrzzmm = #{fddbrzzmm},</if>
<if test="fddbrzzdy != null">fddbrzzdy = #{fddbrzzdy},</if>
<if test="isdy != null">isdy = #{isdy},</if> <if test="isdy != null">isdy = #{isdy},</if>
<if test="isgh != null">isgh = #{isgh},</if> <if test="isgh != null">isgh = #{isgh},</if>
<if test="istzz != null">istzz = #{istzz},</if> <if test="istzz != null">istzz = #{istzz},</if>
...@@ -257,6 +312,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -257,6 +312,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sjdzz != null">sjdzz = #{sjdzz},</if> <if test="sjdzz != null">sjdzz = #{sjdzz},</if>
<if test="dzzsjxm != null">dzzsjxm = #{dzzsjxm},</if> <if test="dzzsjxm != null">dzzsjxm = #{dzzsjxm},</if>
<if test="dzzsjdh != null">dzzsjdh = #{dzzsjdh},</if> <if test="dzzsjdh != null">dzzsjdh = #{dzzsjdh},</if>
<if test="dzzsjdnzw != null">dzzsjdnzw = #{dzzsjdnzw},</if>
<if test="dzzsjxzzw != null">dzzsjxzzw = #{dzzsjxzzw},</if>
<if test="dzzsjzzdy != null">dzzsjzzdy = #{dzzsjzzdy},</if>
<if test="dzzbzcyxm != null">dzzbzcyxm = #{dzzbzcyxm},</if>
<if test="dzzbzcydh != null">dzzbzcydh = #{dzzbzcydh},</if>
<if test="dzzbzcydnzw != null">dzzbzcydnzw = #{dzzbzcydnzw},</if>
<if test="dzzbzcyxzzw != null">dzzbzcyxzzw = #{dzzbzcyxzzw},</if>
<if test="dzzbzcyzzdy != null">dzzbzcyzzdy = #{dzzbzcyzzdy},</if>
<if test="dwgzzxm != null">dwgzzxm = #{dwgzzxm},</if>
<if test="dwgzzdh != null">dwgzzdh = #{dwgzzdh},</if>
<if test="dwgzzdnzw != null">dwgzzdnzw = #{dwgzzdnzw},</if>
<if test="dwgzzxzzw != null">dwgzzxzzw = #{dwgzzxzzw},</if>
<if test="dwgzzzzdy != null">dwgzzzzdy = #{dwgzzzzdy},</if>
<if test="djfs != null">djfs = #{djfs},</if> <if test="djfs != null">djfs = #{djfs},</if>
<if test="djzdyxm != null">djzdyxm = #{djzdyxm},</if> <if test="djzdyxm != null">djzdyxm = #{djzdyxm},</if>
<if test="djzdydh != null">djzdydh = #{djzdydh},</if> <if test="djzdydh != null">djzdydh = #{djzdydh},</if>
......
ruoyi-system/target/classes/mapper/system/OrhonShzzMapper.xml
...@@ -11,8 +11,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -11,8 +11,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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" />
<result property="shzzxm" column="shzzxm" /> <result property="fddbr" column="fddbr" />
<result property="shzzdh" column="shzzdh" /> <result property="fddbrdh" column="fddbrdh" />
<result property="fddbrdnzw" column="fddbrdnzw" />
<result property="fddbrxzzw" column="fddbrxzzw" />
<result property="fddbrzzmm" column="fddbrzzmm" />
<result property="fddbrzzdy" column="fddbrzzdy" />
<result property="isdy" column="isdy" /> <result property="isdy" column="isdy" />
<result property="isgh" column="isgh" /> <result property="isgh" column="isgh" />
<result property="istzz" column="istzz" /> <result property="istzz" column="istzz" />
...@@ -22,6 +26,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -22,6 +26,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="sjdzz" column="sjdzz" /> <result property="sjdzz" column="sjdzz" />
<result property="dzzsjxm" column="dzzsjxm" /> <result property="dzzsjxm" column="dzzsjxm" />
<result property="dzzsjdh" column="dzzsjdh" /> <result property="dzzsjdh" column="dzzsjdh" />
<result property="dzzsjdnzw" column="dzzsjdnzw" />
<result property="dzzsjxzzw" column="dzzsjxzzw" />
<result property="dzzsjzzdy" column="dzzsjzzdy" />
<result property="dzzbzcyxm" column="dzzbzcyxm" />
<result property="dzzbzcydh" column="dzzbzcydh" />
<result property="dzzbzcydnzw" column="dzzbzcydnzw" />
<result property="dzzbzcyxzzw" column="dzzbzcyxzzw" />
<result property="dzzbzcyzzdy" column="dzzbzcyzzdy" />
<result property="dwgzzxm" column="dwgzzxm" />
<result property="dwgzzdh" column="dwgzzdh" />
<result property="dwgzzdnzw" column="dwgzzdnzw" />
<result property="dwgzzxzzw" column="dwgzzxzzw" />
<result property="dwgzzzzdy" column="dwgzzzzdy" />
<result property="djfs" column="djfs" /> <result property="djfs" column="djfs" />
<result property="deptId" column="dept_id" /> <result property="deptId" column="dept_id" />
<result property="dys" column="dys" /> <result property="dys" column="dys" />
...@@ -31,7 +48,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -31,7 +48,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="wjldzzyy" column="wjldzzyy" /> <result property="wjldzzyy" column="wjldzzyy" />
<result property="jzzjjtfs" column="jzzjjtfs" /> <result property="jzzjjtfs" column="jzzjjtfs" />
<result property="issqlh" column="issqlh" /> <result property="issqlh" column="issqlh" />
<result property="nbxh" column="nbxh" /> <result property="nbxh" column="nbxh" />
<result property="djbm" column="djbm" /> <result property="djbm" column="djbm" />
<result property="zzjgdm" column="zzjgdm" /> <result property="zzjgdm" column="zzjgdm" />
...@@ -60,7 +76,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -60,7 +76,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="dzzsdgx" column="dzzsdgx" /> <result property="dzzsdgx" column="dzzsdgx" />
<result property="hjxx" column="hjxx" /> <result property="hjxx" column="hjxx" />
<result property="dfzh" column="dfzh" /> <result property="dfzh" column="dfzh" />
<result property="fddbr" column="fddbr" />
<result property="ywdy" column="ywdy" /> <result property="ywdy" column="ywdy" />
<result property="jjfzsl" column="jjfzsl" /> <result property="jjfzsl" column="jjfzsl" />
<result property="fzdxsl" column="fzdxsl" /> <result property="fzdxsl" column="fzdxsl" />
...@@ -89,8 +104,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -89,8 +104,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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>
<if test="shzzxm != null and shzzxm != ''"> and shzzxm = #{shzzxm}</if> <if test="fddbr != null and fddbr != ''"> and fddbr = #{fddbr}</if>
<if test="shzzdh != null and shzzdh != ''"> and shzzdh = #{shzzdh}</if> <if test="fddbrdh != null and fddbrdh != ''"> and fddbrdh = #{fddbrdh}</if>
<if test="fddbrdnzw != null and fddbrdnzw != ''"> and fddbrdnzw = #{fddbrdnzw}</if>
<if test="fddbrxzzw != null and fddbrxzzw != ''"> and fddbrxzzw = #{fddbrxzzw}</if>
<if test="fddbrzzmm != null and fddbrzzmm != ''"> and fddbrzzmm = #{fddbrzzmm}</if>
<if test="fddbrzzdy != null and fddbrzzdy != ''"> and fddbrzzdy = #{fddbrzzdy}</if>
<if test="isdy != null and isdy != ''"> and isdy = #{isdy}</if> <if test="isdy != null and isdy != ''"> and isdy = #{isdy}</if>
<if test="isgh != null and isgh != ''"> and isgh = #{isgh}</if> <if test="isgh != null and isgh != ''"> and isgh = #{isgh}</if>
<if test="istzz != null and istzz != ''"> and istzz = #{istzz}</if> <if test="istzz != null and istzz != ''"> and istzz = #{istzz}</if>
...@@ -100,6 +119,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -100,6 +119,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sjdzz != null and sjdzz != ''"> and sjdzz = #{sjdzz}</if> <if test="sjdzz != null and sjdzz != ''"> and sjdzz = #{sjdzz}</if>
<if test="dzzsjxm != null and dzzsjxm != ''"> and dzzsjxm = #{dzzsjxm}</if> <if test="dzzsjxm != null and dzzsjxm != ''"> and dzzsjxm = #{dzzsjxm}</if>
<if test="dzzsjdh != null and dzzsjdh != ''"> and dzzsjdh = #{dzzsjdh}</if> <if test="dzzsjdh != null and dzzsjdh != ''"> and dzzsjdh = #{dzzsjdh}</if>
<if test="dzzsjdnzw != null and dzzsjdnzw != ''"> and dzzsjdnzw = #{dzzsjdnzw}</if>
<if test="dzzsjxzzw != null and dzzsjxzzw != ''"> and dzzsjxzzw = #{dzzsjxzzw}</if>
<if test="dzzsjzzdy != null and dzzsjzzdy != ''"> and dzzsjzzdy = #{dzzsjzzdy}</if>
<if test="dzzbzcyxm != null and dzzbzcyxm != ''"> and dzzbzcyxm = #{dzzbzcyxm}</if>
<if test="dzzbzcydh != null and dzzbzcydh != ''"> and dzzbzcydh = #{dzzbzcydh}</if>
<if test="dzzbzcydnzw != null and dzzbzcydnzw != ''"> and dzzbzcydnzw = #{dzzbzcydnzw}</if>
<if test="dzzbzcyxzzw != null and dzzbzcyxzzw != ''"> and dzzbzcyxzzw = #{dzzbzcyxzzw}</if>
<if test="dzzbzcyzzdy != null and dzzbzcyzzdy != ''"> and dzzbzcyzzdy = #{dzzbzcyzzdy}</if>
<if test="dwgzzxm != null and dwgzzxm != ''"> and dwgzzxm = #{dwgzzxm}</if>
<if test="dwgzzdh != null and dwgzzdh != ''"> and dwgzzdh = #{dwgzzdh}</if>
<if test="dwgzzdnzw != null and dwgzzdnzw != ''"> and dwgzzdnzw = #{dwgzzdnzw}</if>
<if test="dwgzzxzzw != null and dwgzzxzzw != ''"> and dwgzzxzzw = #{dwgzzxzzw}</if>
<if test="dwgzzzzdy != null and dwgzzzzdy != ''"> and dwgzzzzdy = #{dwgzzzzdy}</if>
<if test="djfs != null and djfs != ''"> and djfs = #{djfs}</if> <if test="djfs != null and djfs != ''"> and djfs = #{djfs}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if> <if test="deptId != null "> and dept_id = #{deptId}</if>
<if test="params.beginDys != null and params.beginDys != '' and params.endDys != null and params.endDys != ''"> and dys between #{params.beginDys} and #{params.endDys}</if> <if test="params.beginDys != null and params.beginDys != '' and params.endDys != null and params.endDys != ''"> and dys between #{params.beginDys} and #{params.endDys}</if>
...@@ -126,8 +158,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -126,8 +158,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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>
<if test="shzzxm != null">shzzxm,</if> <if test="fddbr != null">fddbr,</if>
<if test="shzzdh != null">shzzdh,</if> <if test="fddbrdh != null">fddbrdh,</if>
<if test="fddbrdnzw != null">fddbrdnzw,</if>
<if test="fddbrxzzw != null">fddbrxzzw,</if>
<if test="fddbrzzmm != null">fddbrzzmm,</if>
<if test="fddbrzzdy != null">fddbrzzdy,</if>
<if test="isdy != null">isdy,</if> <if test="isdy != null">isdy,</if>
<if test="isgh != null">isgh,</if> <if test="isgh != null">isgh,</if>
<if test="istzz != null">istzz,</if> <if test="istzz != null">istzz,</if>
...@@ -137,6 +173,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -137,6 +173,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sjdzz != null">sjdzz,</if> <if test="sjdzz != null">sjdzz,</if>
<if test="dzzsjxm != null">dzzsjxm,</if> <if test="dzzsjxm != null">dzzsjxm,</if>
<if test="dzzsjdh != null">dzzsjdh,</if> <if test="dzzsjdh != null">dzzsjdh,</if>
<if test="dzzsjdnzw != null">dzzsjdnzw,</if>
<if test="dzzsjxzzw != null">dzzsjxzzw,</if>
<if test="dzzsjzzdy != null">dzzsjzzdy,</if>
<if test="dzzbzcyxm != null">dzzbzcyxm,</if>
<if test="dzzbzcydh != null">dzzbzcydh,</if>
<if test="dzzbzcydnzw != null">dzzbzcydnzw,</if>
<if test="dzzbzcyxzzw != null">dzzbzcyxzzw,</if>
<if test="dzzbzcyzzdy != null">dzzbzcyzzdy,</if>
<if test="dwgzzxm != null">dwgzzxm,</if>
<if test="dwgzzdh != null">dwgzzdh,</if>
<if test="dwgzzdnzw != null">dwgzzdnzw,</if>
<if test="dwgzzxzzw != null">dwgzzxzzw,</if>
<if test="dwgzzzzdy != null">dwgzzzzdy,</if>
<if test="djfs != null">djfs,</if> <if test="djfs != null">djfs,</if>
<if test="deptId != null">dept_id,</if> <if test="deptId != null">dept_id,</if>
<if test="dys != null">dys,</if> <if test="dys != null">dys,</if>
...@@ -146,7 +195,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -146,7 +195,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="wjldzzyy != null">wjldzzyy,</if> <if test="wjldzzyy != null">wjldzzyy,</if>
<if test="jzzjjtfs != null">jzzjjtfs,</if> <if test="jzzjjtfs != null">jzzjjtfs,</if>
<if test="issqlh != null">issqlh,</if> <if test="issqlh != null">issqlh,</if>
<if test="nbxh != null">nbxh,</if> <if test="nbxh != null">nbxh,</if>
<if test="djbm != null">djbm,</if> <if test="djbm != null">djbm,</if>
<if test="zzjgdm != null">zzjgdm,</if> <if test="zzjgdm != null">zzjgdm,</if>
...@@ -197,8 +245,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -197,8 +245,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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>
<if test="shzzxm != null">#{shzzxm},</if> <if test="fddbr != null">#{fddbr},</if>
<if test="shzzdh != null">#{shzzdh},</if> <if test="fddbrdh != null">#{fddbrdh},</if>
<if test="fddbrdnzw != null">#{fddbrdnzw},</if>
<if test="fddbrxzzw != null">#{fddbrxzzw},</if>
<if test="fddbrzzmm != null">#{fddbrzzmm},</if>
<if test="fddbrzzdy != null">#{fddbrzzdy},</if>
<if test="isdy != null">#{isdy},</if> <if test="isdy != null">#{isdy},</if>
<if test="isgh != null">#{isgh},</if> <if test="isgh != null">#{isgh},</if>
<if test="istzz != null">#{istzz},</if> <if test="istzz != null">#{istzz},</if>
...@@ -208,6 +260,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -208,6 +260,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sjdzz != null">#{sjdzz},</if> <if test="sjdzz != null">#{sjdzz},</if>
<if test="dzzsjxm != null">#{dzzsjxm},</if> <if test="dzzsjxm != null">#{dzzsjxm},</if>
<if test="dzzsjdh != null">#{dzzsjdh},</if> <if test="dzzsjdh != null">#{dzzsjdh},</if>
<if test="dzzsjdnzw != null">#{dzzsjdnzw},</if>
<if test="dzzsjxzzw != null">#{dzzsjxzzw},</if>
<if test="dzzsjzzdy != null">#{dzzsjzzdy},</if>
<if test="dzzbzcyxm != null">#{dzzbzcyxm},</if>
<if test="dzzbzcydh != null">#{dzzbzcydh},</if>
<if test="dzzbzcydnzw != null">#{dzzbzcydnzw},</if>
<if test="dzzbzcyxzzw != null">#{dzzbzcyxzzw},</if>
<if test="dzzbzcyzzdy != null">#{dzzbzcyzzdy},</if>
<if test="dwgzzxm != null">#{dwgzzxm},</if>
<if test="dwgzzdh != null">#{dwgzzdh},</if>
<if test="dwgzzdnzw != null">#{dwgzzdnzw},</if>
<if test="dwgzzxzzw != null">#{dwgzzxzzw},</if>
<if test="dwgzzzzdy != null">#{dwgzzzzdy},</if>
<if test="djfs != null">#{djfs},</if> <if test="djfs != null">#{djfs},</if>
<if test="deptId != null">#{deptId},</if> <if test="deptId != null">#{deptId},</if>
<if test="dys != null">#{dys},</if> <if test="dys != null">#{dys},</if>
...@@ -271,8 +336,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -271,8 +336,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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>
<if test="shzzxm != null">shzzxm = #{shzzxm},</if> <if test="fddbr != null">fddbr = #{fddbr},</if>
<if test="shzzdh != null">shzzdh = #{shzzdh},</if> <if test="fddbrdh != null">fddbrdh = #{fddbrdh},</if>
<if test="fddbrdnzw != null">fddbrdnzw = #{fddbrdnzw},</if>
<if test="fddbrxzzw != null">fddbrxzzw = #{fddbrxzzw},</if>
<if test="fddbrzzmm != null">fddbrzzmm = #{fddbrzzmm},</if>
<if test="fddbrzzdy != null">fddbrzzdy = #{fddbrzzdy},</if>
<if test="isdy != null">isdy = #{isdy},</if> <if test="isdy != null">isdy = #{isdy},</if>
<if test="isgh != null">isgh = #{isgh},</if> <if test="isgh != null">isgh = #{isgh},</if>
<if test="istzz != null">istzz = #{istzz},</if> <if test="istzz != null">istzz = #{istzz},</if>
...@@ -282,6 +351,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -282,6 +351,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sjdzz != null">sjdzz = #{sjdzz},</if> <if test="sjdzz != null">sjdzz = #{sjdzz},</if>
<if test="dzzsjxm != null">dzzsjxm = #{dzzsjxm},</if> <if test="dzzsjxm != null">dzzsjxm = #{dzzsjxm},</if>
<if test="dzzsjdh != null">dzzsjdh = #{dzzsjdh},</if> <if test="dzzsjdh != null">dzzsjdh = #{dzzsjdh},</if>
<if test="dzzsjdnzw != null">dzzsjdnzw = #{dzzsjdnzw},</if>
<if test="dzzsjxzzw != null">dzzsjxzzw = #{dzzsjxzzw},</if>
<if test="dzzsjzzdy != null">dzzsjzzdy = #{dzzsjzzdy},</if>
<if test="dzzbzcyxm != null">dzzbzcyxm = #{dzzbzcyxm},</if>
<if test="dzzbzcydh != null">dzzbzcydh = #{dzzbzcydh},</if>
<if test="dzzbzcydnzw != null">dzzbzcydnzw = #{dzzbzcydnzw},</if>
<if test="dzzbzcyxzzw != null">dzzbzcyxzzw = #{dzzbzcyxzzw},</if>
<if test="dzzbzcyzzdy != null">dzzbzcyzzdy = #{dzzbzcyzzdy},</if>
<if test="dwgzzxm != null">dwgzzxm = #{dwgzzxm},</if>
<if test="dwgzzdh != null">dwgzzdh = #{dwgzzdh},</if>
<if test="dwgzzdnzw != null">dwgzzdnzw = #{dwgzzdnzw},</if>
<if test="dwgzzxzzw != null">dwgzzxzzw = #{dwgzzxzzw},</if>
<if test="dwgzzzzdy != null">dwgzzzzdy = #{dwgzzzzdy},</if>
<if test="djfs != null">djfs = #{djfs},</if> <if test="djfs != null">djfs = #{djfs},</if>
<if test="deptId != null">dept_id = #{deptId},</if> <if test="deptId != null">dept_id = #{deptId},</if>
<if test="dys != null">dys = #{dys},</if> <if test="dys != null">dys = #{dys},</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