Skip to content

F
fgqyxxlr
Commit f59cf6c0 by liru
Options

统计相关修改

parent 18de8dde
Showing with 254 additions and 58 deletions
ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/ReportController.java
......@@ -144,28 +144,6 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
rspData.setTotal(reportOneResultList.size());
return rspData;
}
/**
* 第2个报表
* 社会组织“两个覆盖”专项行动摸底排查情况统计表
*/
@PostMapping("/two")
@ResponseBody
public TableDataInfo reporttwo(){
OrhonShzz orhonShzz=new OrhonShzz();
SysUser sysUser = ShiroUtils.getSysUser();
startPage();
if ( !sysUser.getLoginName().equals("admin") ) {
orhonShzz.setDeptId(sysUser.getUserDeptId().longValue());
}
java.util.List<com.ruoyi.system.domain.OrhonShzz> list = orhonShzzService.selectOrhonShzzList(orhonShzz);
List<ReportTwoResult> listResult=new ArrayList<>();
//社会组织“两个覆盖”专项行动摸底排查情况统计表 查询条件
return getDataTable(listResult);
}
private void initResult(ReportOneResult tmpResult) {
tmpResult.setDwl(0);
......@@ -205,6 +183,188 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
tmpResult.setGmysfgqy(0);
tmpResult.setGmyxfgqy(0);
}
/**
* 第2个报表
* 社会组织“两个覆盖”专项行动摸底排查情况统计表
*/
@PostMapping("/two")
@ResponseBody
public TableDataInfo reporttwo(){
SysDictData sysDictData = new SysDictData();
sysDictData.setDictType("orhon_shzz_type");
List<SysDictData> shzzTypeList = this.dictDataService.selectDictDataList(sysDictData);
TableDataInfo rspData = new TableDataInfo();
List<OrhonShzz> allShzz = this.orhonShzzService.selectOrhonShzzList(new OrhonShzz());
Map<String, ReportTwoResult> qiquMap = new HashMap<>(12);
for (OrhonShzz orhonShzz : allShzz) {
ReportTwoResult tmpResult = null;
if ( qiquMap.get(orhonShzz.getType()) == null) {
tmpResult = new ReportTwoResult();
this.initResultTwo(tmpResult);
qiquMap.put(orhonShzz.getType(), tmpResult);
} else {
tmpResult = qiquMap.get(orhonShzz.getType());
}
tmpResult.setDws(tmpResult.getDws() + 1);
if ( orhonShzz.getIsdzz() != null && orhonShzz.getIsdzz().equals("1")) {
// 已建立党组织
tmpResult.setSl(tmpResult.getSl() + 1);
tmpResult.setDdjldzzdshzz(tmpResult.getDdjldzzdshzz() + 1);
if( orhonShzz.getIssqlh() != null && "1".equals(orhonShzz.getIssqlh())) {
tmpResult.setDdlghdshzz(tmpResult.getDdlghdshzz() + 1);
}
if ( orhonShzz.getIsgh() != null && "1".equals(orhonShzz.getIsgh())) {
tmpResult.setYjlghzzdshzz(tmpResult.getYjlghzzdshzz() + 1);
}
if (orhonShzz.getIstzz() != null && "1".equals(orhonShzz.getIstzz())) {
tmpResult.setYjlgqtzzdshzz(tmpResult.getYjlgqtzzdshzz() + 1);
}
if (orhonShzz.getIsjljcfnzz() != null && "1".equals(orhonShzz.getIsjljcfnzz())) {
tmpResult.setYjlfnjjzzdshzz(tmpResult.getYjlfnjjzzdshzz() + 1);
}
// djzdyhdjzdzlxdshzz党建指导员或党建指导组联系的社会组织
if (orhonShzz.getIshdzd() != null && ("1".equals(orhonShzz.getIshdzd())||"2".equals(orhonShzz.getIshdzd()))) {
tmpResult.setYgdhdcsdshzz(tmpResult.getYgdhdcsdshzz() + 1);
}
if ( orhonShzz.getIshdzd() != null && "1".equals(orhonShzz.getIshdzd())) {
tmpResult.setDdjl(tmpResult.getDdjl() + 1);
}
if (orhonShzz.getIshdzd() != null && "2".equals(orhonShzz.getIshdzd())) {
tmpResult.setLhjl(tmpResult.getLhjl() + 1);
}
if (orhonShzz.getDzzlx() != null && "1".equals(orhonShzz.getDzzlx()) ) {
// 党委
tmpResult.setDwys(tmpResult.getDwys() + 1);
} else if (orhonShzz.getDzzlx() != null && "3".equals(orhonShzz.getDzzlx()) ) {
// 党总支
tmpResult.setDzzs(tmpResult.getDzzs() + 1);
}
//bndxjldzzdshzz 本年度新建立党组织的社会组织
//bndxjlddzzs本年度新建立的党组织数
try {
tmpResult.setCyrysl( Integer.parseInt( orhonShzz.getCyrs()) + tmpResult.getCyrysl());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
try {
tmpResult.setDys(Integer.parseInt(orhonShzz.getDys()) + tmpResult.getDys());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
try {
tmpResult.setNnfzdydshzz ( Integer.parseInt( orhonShzz.getNnfzdys()) + tmpResult.getNnfzdydshzz());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
try {
tmpResult.setFzdys( Integer.parseInt( orhonShzz.getFzdxsl()) + tmpResult.getFzdys());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
if ( orhonShzz.getDjzdyxm()!= null) {
tmpResult.setXpdjgzzdys(tmpResult.getXpdjgzzdys() + 1);
}
if ( orhonShzz.getDys()!= null && Integer.parseInt( orhonShzz.getDys())>0) {
tmpResult.setYdydshzz(tmpResult.getYdydshzz() + 1);
}
} else {
// 空或者不等于1的统统为未建立
//weidjzdyhdjzdzlxdshzz党建指导员或党建指导组联系的社会组织
if (orhonShzz.getIsgh() != null && "1".equals(orhonShzz.getIsgh())) {
tmpResult.setWeiyjlghzzdshzz(tmpResult.getWeiyjlghzzdshzz() + 1);
}
if (orhonShzz.getIstzz() != null && "1".equals(orhonShzz.getIstzz())) {
tmpResult.setWeiyjlgqzzdshzz(tmpResult.getWeiyjlgqzzdshzz() + 1);
}
if (orhonShzz.getIsjljcfnzz() != null && "1".equals(orhonShzz.getIsjljcfnzz())) {
tmpResult.setWeiyjlfnjczzdshzz(tmpResult.getWeiyjlfnjczzdshzz() + 1);
}
// weihyzgbmzddshzz;行业主管部门指导的社会组织
// weismxz;苏木乡镇或街道社区党组织联系的社会组织
try {
tmpResult.setWeicyrs( Integer.parseInt( orhonShzz.getCyrs()) + tmpResult.getWeicyrs());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
try {
tmpResult.setWeidys(Integer.parseInt(orhonShzz.getDys()) + tmpResult.getWeidys());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
try {
tmpResult.setWeinnfzdys( Integer.parseInt( orhonShzz.getNnfzdys()) + tmpResult.getWeinnfzdys());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
if ( orhonShzz.getDjzdyxm()!= null) {
tmpResult.setWeixpdjgzzdys(tmpResult.getWeixpdjgzzdys() + 1);
}
}
}
List<ReportTwoResult> reportTwoResultList = new ArrayList<>(shzzTypeList.size());
for (SysDictData dictData : shzzTypeList) {
ReportTwoResult result = qiquMap.get(dictData.getDictValue());
if(result == null){
result = new ReportTwoResult();
this.initResultTwo(result);
}
result.setType(dictData.getDictLabel());
reportTwoResultList.add(result);
}
rspData.setRows(reportTwoResultList);
rspData.setTotal(reportTwoResultList.size());
return rspData;
}
private void initResultTwo(ReportTwoResult tmpResult) {
tmpResult.setDws(0);
tmpResult.setSl(0);
tmpResult.setDdjldzzdshzz(0);
tmpResult.setDdlghdshzz(0);
tmpResult.setYjlghzzdshzz(0);
tmpResult.setYjlgqtzzdshzz(0);
tmpResult.setYjlfnjjzzdshzz(0);
tmpResult.setDjzdyhdjzdzlxdshzz(0);
tmpResult.setYgdhdcsdshzz(0);
tmpResult.setDdjl(0);
tmpResult.setLhjl(0);
tmpResult.setDwys(0);
tmpResult.setDzzs(0);
tmpResult.setBndxjldzzdshzz(0);
tmpResult.setBndxjlddzzs(0);
tmpResult.setCyrysl(0);
tmpResult.setDys(0);
tmpResult.setNnfzdydshzz(0);
tmpResult.setFzdys(0);
tmpResult.setXpdjgzzdys(0);
tmpResult.setYdydshzz(0);
tmpResult.setWeidjzdyhdjzdzlxdshzz(0);
tmpResult.setWeiyjlghzzdshzz(0);
tmpResult.setWeiyjlgqzzdshzz(0);
tmpResult.setWeiyjlfnjczzdshzz(0);
tmpResult.setWeihyzgbmzddshzz(0);
tmpResult.setWeismxz(0);
tmpResult.setWeicyrs(0);
tmpResult.setWeidys(0);
tmpResult.setWeinnfzdys(0);
tmpResult.setWeixpdjgzzdys(0);
}
/**
* 第3个报表
* 已建立党组织的非公企业台账
......@@ -273,6 +433,7 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
orhonFgqy.setDeptId(sysUser.getUserDeptId().longValue());
}
//僵尸空壳影子非公企业台账 查询条件
orhonFgqy.setLx("2");
java.util.List<com.ruoyi.system.domain.OrhonFgqy> list = orhonFgqyService.selectOrhonFgqyList(orhonFgqy);
return getDataTable(list);
......@@ -291,9 +452,7 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
orhonShzz.setDeptId(sysUser.getUserDeptId().longValue());
}
//休眠社会组织台账 查询条件
orhonShzz.setLx("1");
java.util.List<com.ruoyi.system.domain.OrhonShzz> list = orhonShzzService.selectOrhonShzzList(orhonShzz);
return getDataTable(list);
......
ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/domain/ReportTwoResult.java
......@@ -22,8 +22,8 @@ public class ReportTwoResult {
private Integer nnfzdydshzz;
private Integer fzdys;
private Integer xpdjgzzdys;
private Integer ydydshzz;
private Integer weiydydshzz;
private Integer weidjzdyhdjzdzlxdshzz;
private Integer weiyjlghzzdshzz;
private Integer weiyjlgqzzdshzz;
......@@ -35,6 +35,14 @@ public class ReportTwoResult {
private Integer weinnfzdys;
private Integer weixpdjgzzdys;
public Integer getYdydshzz() {
return ydydshzz;
}
public void setYdydshzz(Integer ydydshzz) {
this.ydydshzz = ydydshzz;
}
public String getType() {
return type;
}
......@@ -203,13 +211,6 @@ public class ReportTwoResult {
this.xpdjgzzdys = xpdjgzzdys;
}
public Integer getWeiydydshzz() {
return weiydydshzz;
}
public void setWeiydydshzz(Integer weiydydshzz) {
this.weiydydshzz = weiydydshzz;
}
public Integer getWeidjzdyhdjzdzlxdshzz() {
return weidjzdyhdjzdzlxdshzz;
......
ruoyi-admin/src/main/resources/templates/demo/table/reporttwo.html
......@@ -43,10 +43,7 @@
],
[ {
field: 'type',
title: '类别',
formatter: function(value, row, index) {
return $.table.selectDictLabel(shzzlxDatas, value);
}
title: '类别'
}, {
field: 'dws',
title: '单位数'
......
ruoyi-admin/target/classes/templates/system/fgqy/add.html
......@@ -363,7 +363,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人：</label>
<div class="col-sm-8">
<input name="fddbr" class="form-control" type="text" required>
<input name="fddbr" class="form-control" type="text" required placeholder="请输入法定代表人">
</div>
</div>
</div>
......@@ -371,7 +371,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人联系方式：</label>
<div class="col-sm-8">
<input name="fddbrdh" class="form-control" type="text" >
<input name="fddbrdh" class="form-control" type="text" placeholder="请输入法定代表人联系方式">
</div>
</div>
</div>
......@@ -382,7 +382,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人党内职务：</label>
<div class="col-sm-8">
<input name="fddbrdnzw" class="form-control" type="text" required>
<input name="fddbrdnzw" class="form-control" type="text" required placeholder="请输入法定代表人党内职务">
</div>
</div>
</div>
......@@ -390,7 +390,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人行政职务：</label>
<div class="col-sm-8">
<input name="fddbrxzzw" class="form-control" type="text" >
<input name="fddbrxzzw" class="form-control" type="text" placeholder="请输入法定代表人行政职务">
</div>
</div>
</div>
......@@ -400,7 +400,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治面貌：</label>
<div class="col-sm-8">
<input name="fddbrzzmm" class="form-control" type="text" required>
<input name="fddbrzzmm" class="form-control" type="text" required placeholder="请输入法定代表人政治面貌">
</div>
</div>
</div>
......@@ -408,7 +408,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治待遇：</label>
<div class="col-sm-8">
<input name="fddbrzzdy" class="form-control" type="text" >
<input name="fddbrzzdy" class="form-control" type="text" placeholder="请输入法定代表人政治待遇">
</div>
</div>
</div>
......@@ -433,7 +433,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dzzsjxm" class="form-control" type="text" placeholder="请输入党组织书记姓名">
</div>
</div>
</div>
......@@ -441,7 +441,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
<input name="dzzsjdh" class="form-control" type="text" placeholder="请输入党组织书记联系方式">
</div>
</div>
</div>
......@@ -451,7 +451,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjdnzw" class="form-control" type="text">
<input name="dzzsjdnzw" class="form-control" type="text" placeholder="请输入党组织书记党内职务">
</div>
</div>
</div>
......@@ -459,7 +459,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjxzzw" class="form-control" type="text">
<input name="dzzsjxzzw" class="form-control" type="text" placeholder="请输入党组织书记行政职务">
</div>
</div>
</div>
......@@ -469,7 +469,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjzzdy" class="form-control" type="text">
<input name="dzzsjzzdy" class="form-control" type="text" placeholder="请输入党组织书记政治待遇">
</div>
</div>
</div>
......@@ -480,7 +480,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员姓名：</label>
<div class="col-sm-8">
<input name="dzzbzcyxm" class="form-control" type="text">
<input name="dzzbzcyxm" class="form-control" type="text" placeholder="请输入党组织班子成员姓名">
</div>
</div>
</div>
......@@ -488,7 +488,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员联系方式：</label>
<div class="col-sm-8">
<input name="dzzbzcydh" class="form-control" type="text">
<input name="dzzbzcydh" class="form-control" type="text" placeholder="请输入党组织班子成员联系方式">
</div>
</div>
</div>
......@@ -498,7 +498,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员党内职务：</label>
<div class="col-sm-8">
<input name="dzzbzcydnzw" class="form-control" type="text">
<input name="dzzbzcydnzw" class="form-control" type="text" placeholder="请输入党组织班子成员党内职务">
</div>
</div>
</div>
......@@ -506,7 +506,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员行政职务：</label>
<div class="col-sm-8">
<input name="dzzbzcyxzzw" class="form-control" type="text">
<input name="dzzbzcyxzzw" class="form-control" type="text" placeholder="请输入党组织班子成员行政职务">
</div>
</div>
</div>
......@@ -516,7 +516,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员政治待遇：</label>
<div class="col-sm-8">
<input name="dzzbzcyzzdy" class="form-control" type="text">
<input name="dzzbzcyzzdy" class="form-control" type="text" placeholder="请输入党组织班子成员政治待遇">
</div>
</div>
</div>
......@@ -528,7 +528,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者姓名：</label>
<div class="col-sm-8">
<input name="dwgzzxm" class="form-control" type="text">
<input name="dwgzzxm" class="form-control" type="text" placeholder="请输入党务工作者姓名">
</div>
</div>
</div>
......@@ -536,7 +536,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者联系方式：</label>
<div class="col-sm-8">
<input name="dwgzzdh" class="form-control" type="text">
<input name="dwgzzdh" class="form-control" type="text" placeholder="请输入党务工作者联系方式">
</div>
</div>
</div>
......@@ -546,7 +546,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者党内职务：</label>
<div class="col-sm-8">
<input name="dwgzzdnzw" class="form-control" type="text">
<input name="dwgzzdnzw" class="form-control" type="text" placeholder="请输入党务工作者党内职务">
</div>
</div>
</div>
......@@ -554,7 +554,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者行政职务：</label>
<div class="col-sm-8">
<input name="dwgzzxzzw" class="form-control" type="text">
<input name="dwgzzxzzw" class="form-control" type="text" placeholder="请输入党务工作者行政职务">
</div>
</div>
</div>
......@@ -564,7 +564,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者政治待遇：</label>
<div class="col-sm-8">
<input name="dwgzzzzdy" class="form-control" type="text">
<input name="dwgzzzzdy" class="form-control" type="text" placeholder="请输入党务工作者政治待遇">
</div>
</div>
</div>
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/OrhonFgqy.java
......@@ -36,6 +36,10 @@ public class OrhonFgqy extends com.ruoyi.common.core.domain.BaseEntity
@com.ruoyi.common.annotation.Excel(name = "非公企业类型类型")
private String type;
/** 类型（休眠1，僵尸空壳影子2，正常0） */
@com.ruoyi.common.annotation.Excel(name = "类型")
private String lx;
/** 所在地 */
@com.ruoyi.common.annotation.Excel(name = "所在地")
private String szd;
......@@ -1045,6 +1049,14 @@ public class OrhonFgqy extends com.ruoyi.common.core.domain.BaseEntity
return slhkddysl;
}
public String getLx() {
return lx;
}
public void setLx(String lx) {
this.lx = lx;
}
public void setSlhkddysl(String slhkddysl) {
this.slhkddysl = slhkddysl;
}
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/OrhonShzz.java
......@@ -26,6 +26,10 @@ public class OrhonShzz extends com.ruoyi.common.core.domain.BaseEntity
@com.ruoyi.common.annotation.Excel(name = "社会组织类型")
private String type;
/** 类型（休眠1，僵尸空壳影子2，正常0） */
@com.ruoyi.common.annotation.Excel(name = "类型")
private String lx;
/** 所在地 */
@com.ruoyi.common.annotation.Excel(name = "所在地")
private String szd;
......@@ -1106,6 +1110,14 @@ public class OrhonShzz extends com.ruoyi.common.core.domain.BaseEntity
return qtsl;
}
public String getLx() {
return lx;
}
public void setLx(String lx) {
this.lx = lx;
}
public void setQtsl(String qtsl) {
this.qtsl = qtsl;
}
......
ruoyi-system/src/main/resources/mapper/system/OrhonFgqyMapper.xml
......@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="mc" column="mc" />
<result property="deptId" column="dept_id" />
<result property="type" column="type" />
<result property="lx" column="lx" />
<result property="szd" column="szd" />
<result property="zcze" column="zcze" />
<result property="nyysr" column="nyysr" />
......@@ -95,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="mc != null and mc != ''"> and mc like concat('%','${mc}','%' )</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="lx != null and lx != ''"> and lx = #{lx}</if>
<if test="szd != null and szd != ''"> and szd = #{szd}</if>
<if test="params.beginZcze != null and params.beginZcze != '' and params.endZcze != null and params.endZcze != ''"> and zcze between #{params.beginZcze} and #{params.endZcze}</if>
<if test="params.beginNyysr != null and params.beginNyysr != '' and params.endNyysr != null and params.endNyysr != ''"> and nyysr between #{params.beginNyysr} and #{params.endNyysr}</if>
......@@ -133,6 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="mc != null and mc != ''">mc,</if>
<if test="deptId != null">dept_id,</if>
<if test="type != null">type,</if>
<if test="lx != null">lx,</if>
<if test="szd != null">szd,</if>
<if test="zcze != null">zcze,</if>
<if test="nyysr != null">nyysr,</if>
......@@ -211,6 +214,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="mc != null and mc != ''">#{mc},</if>
<if test="deptId != null">#{deptId},</if>
<if test="type != null">#{type},</if>
<if test="lx != null">#{lx},</if>
<if test="szd != null">#{szd},</if>
<if test="zcze != null">#{zcze},</if>
<if test="nyysr != null">#{nyysr},</if>
......@@ -292,6 +296,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="mc != null and mc != ''">mc = #{mc},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
<if test="type != null">type = #{type},</if>
<if test="lx != null">lx = #{lx},</if>
<if test="szd != null">szd = #{szd},</if>
<if test="zcze != null">zcze = #{zcze},</if>
<if test="nyysr != null">nyysr = #{nyysr},</if>
......
ruoyi-system/src/main/resources/mapper/system/OrhonShzzMapper.xml
......@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="id" column="id" />
<result property="mc" column="mc" />
<result property="type" column="type" />
<result property="lx" column="lx" />
<result property="szd" column="szd" />
<result property="zcze" column="zcze" />
<result property="cyrs" column="cyrs" />
......@@ -113,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="mc != null and mc != ''"> and mc like concat('%', #{mc}, '%')</if>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="lx != null and lx != ''"> and lx = #{lx}</if>
<if test="szd != null and szd != ''"> and szd like concat('%', #{szd}, '%')</if>
<if test="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>
......@@ -167,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="id != null">id,</if>
<if test="mc != null and mc != ''">mc,</if>
<if test="type != null">type,</if>
<if test="lx != null">lx,</if>
<if test="szd != null">szd,</if>
<if test="zcze != null">zcze,</if>
<if test="cyrs != null">cyrs,</if>
......@@ -266,6 +269,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="id != null">#{id},</if>
<if test="mc != null and mc != ''">#{mc},</if>
<if test="type != null">#{type},</if>
<if test="lx != null">#{lx},</if>
<if test="szd != null">#{szd},</if>
<if test="zcze != null">#{zcze},</if>
<if test="cyrs != null">#{cyrs},</if>
......@@ -369,6 +373,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=",">
<if test="mc != null and mc != ''">mc = #{mc},</if>
<if test="type != null">type = #{type},</if>
<if test="lx != null">lx = #{lx},</if>
<if test="szd != null">szd = #{szd},</if>
<if test="zcze != null">zcze = #{zcze},</if>
<if test="cyrs != null">cyrs = #{cyrs},</if>
......
ruoyi-system/target/classes/mapper/system/OrhonShzzMapper.xml
......@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="id" column="id" />
<result property="mc" column="mc" />
<result property="type" column="type" />
<result property="lx" column="lx" />
<result property="szd" column="szd" />
<result property="zcze" column="zcze" />
<result property="cyrs" column="cyrs" />
......@@ -113,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="mc != null and mc != ''"> and mc like concat('%', #{mc}, '%')</if>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="lx != null and lx != ''"> and lx = #{lx}</if>
<if test="szd != null and szd != ''"> and szd like concat('%', #{szd}, '%')</if>
<if test="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>
......@@ -167,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="id != null">id,</if>
<if test="mc != null and mc != ''">mc,</if>
<if test="type != null">type,</if>
<if test="lx != null">lx,</if>
<if test="szd != null">szd,</if>
<if test="zcze != null">zcze,</if>
<if test="cyrs != null">cyrs,</if>
......@@ -266,6 +269,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="id != null">#{id},</if>
<if test="mc != null and mc != ''">#{mc},</if>
<if test="type != null">#{type},</if>
<if test="lx != null">#{lx},</if>
<if test="szd != null">#{szd},</if>
<if test="zcze != null">#{zcze},</if>
<if test="cyrs != null">#{cyrs},</if>
......@@ -369,6 +373,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=",">
<if test="mc != null and mc != ''">mc = #{mc},</if>
<if test="type != null">type = #{type},</if>
<if test="lx != null">lx = #{lx},</if>
<if test="szd != null">szd = #{szd},</if>
<if test="zcze != null">zcze = #{zcze},</if>
<if test="cyrs != null">cyrs = #{cyrs},</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment