Browse Source

执法监督码查询,修改查询条件

v2
chenrui 3 years ago
parent
commit
c5709427a3
  1. 178
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/add.html
  2. 179
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/edit.html
  3. 205
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html
  4. 25
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java
  5. 12
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java
  6. 10
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java
  7. 6
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
  8. 2
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml

178
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/add.html

@ -0,0 +1,178 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增企业端-执法部门预约记录')" />
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-registration-add">
<div class="form-group">
<label class="col-sm-3 control-label">执法部门:</label>
<div class="col-sm-8">
<input name="lawEnforcement" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">执法部门ID:</label>
<div class="col-sm-8">
<input name="lawEnforcementId" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">被执法企业ID:</label>
<div class="col-sm-8">
<input name="enterpriseId" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">被执法企业:</label>
<div class="col-sm-8">
<input name="enterpriseName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">被执法企业税号:</label>
<div class="col-sm-8">
<input name="enterpriseNumber" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">执法时间:</label>
<div class="col-sm-8">
<div class="input-group date">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<input name="enforcementTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">执法人员姓名:</label>
<div class="col-sm-8">
<input name="lawEnforcer" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">执法人员ID:</label>
<div class="col-sm-8">
<input name="lawEnforcerId" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">执法人员联系方式:</label>
<div class="col-sm-8">
<input name="lawEnforcerTel" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">执法人员姓名2:</label>
<div class="col-sm-8">
<input name="lawEnforcerTwo" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">执法人员ID2:</label>
<div class="col-sm-8">
<input name="lawEnforcerIdTwo" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">执法人员联系方式2:</label>
<div class="col-sm-8">
<input name="lawEnforcerTelTwo" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">辅助人员姓名:</label>
<div class="col-sm-8">
<input name="subsidiaryer" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">辅助人员id:</label>
<div class="col-sm-8">
<input name="subsidiaryerId" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">辅助人员联系方式:</label>
<div class="col-sm-8">
<input name="subsidiaryerTel" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">执法事项:</label>
<div class="col-sm-8">
<textarea name="lawEnforcementItem" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">执法依据:</label>
<div class="col-sm-8">
<textarea name="lawEnforcementBasis" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">执法结果 0 合格 1 不合格:</label>
<div class="col-sm-8">
<input name="reslut" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">用户ID:</label>
<div class="col-sm-8">
<input name="userId" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">部门ID:</label>
<div class="col-sm-8">
<input name="deptId" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">是否删除 0 否 1 是:</label>
<div class="col-sm-8">
<input name="isDelete" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">数据状态 0 正常 1 取消:</label>
<div class="col-sm-8">
<div class="radio-box">
<input type="radio" name="status" value="">
<label th:for="status" th:text="未知"></label>
</div>
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">登记编号:</label>
<div class="col-sm-8">
<input name="lawEnforcementCode" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script type="text/javascript">
var prefix = ctx + "system/registration"
$("#form-registration-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-registration-add').serialize());
}
}
$("input[name='enforcementTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
</body>
</html>

179
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/edit.html

@ -0,0 +1,179 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改企业端-执法部门预约记录')" />
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-registration-edit" th:object="${enforcementRegistration}">
<input name="id" th:field="*{id}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">执法部门:</label>
<div class="col-sm-8">
<input name="lawEnforcement" th:field="*{lawEnforcement}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">执法部门ID:</label>
<div class="col-sm-8">
<input name="lawEnforcementId" th:field="*{lawEnforcementId}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">被执法企业ID:</label>
<div class="col-sm-8">
<input name="enterpriseId" th:field="*{enterpriseId}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">被执法企业:</label>
<div class="col-sm-8">
<input name="enterpriseName" th:field="*{enterpriseName}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">被执法企业税号:</label>
<div class="col-sm-8">
<input name="enterpriseNumber" th:field="*{enterpriseNumber}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">执法时间:</label>
<div class="col-sm-8">
<div class="input-group date">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<input name="enforcementTime" th:value="${#dates.format(enforcementRegistration.enforcementTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">执法人员姓名:</label>
<div class="col-sm-8">
<input name="lawEnforcer" th:field="*{lawEnforcer}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">执法人员ID:</label>
<div class="col-sm-8">
<input name="lawEnforcerId" th:field="*{lawEnforcerId}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">执法人员联系方式:</label>
<div class="col-sm-8">
<input name="lawEnforcerTel" th:field="*{lawEnforcerTel}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">执法人员姓名2:</label>
<div class="col-sm-8">
<input name="lawEnforcerTwo" th:field="*{lawEnforcerTwo}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">执法人员ID2:</label>
<div class="col-sm-8">
<input name="lawEnforcerIdTwo" th:field="*{lawEnforcerIdTwo}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">执法人员联系方式2:</label>
<div class="col-sm-8">
<input name="lawEnforcerTelTwo" th:field="*{lawEnforcerTelTwo}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">辅助人员姓名:</label>
<div class="col-sm-8">
<input name="subsidiaryer" th:field="*{subsidiaryer}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">辅助人员id:</label>
<div class="col-sm-8">
<input name="subsidiaryerId" th:field="*{subsidiaryerId}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">辅助人员联系方式:</label>
<div class="col-sm-8">
<input name="subsidiaryerTel" th:field="*{subsidiaryerTel}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">执法事项:</label>
<div class="col-sm-8">
<textarea name="lawEnforcementItem" class="form-control">[[*{lawEnforcementItem}]]</textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">执法依据:</label>
<div class="col-sm-8">
<textarea name="lawEnforcementBasis" class="form-control">[[*{lawEnforcementBasis}]]</textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">执法结果 0 合格 1 不合格:</label>
<div class="col-sm-8">
<input name="reslut" th:field="*{reslut}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">用户ID:</label>
<div class="col-sm-8">
<input name="userId" th:field="*{userId}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">部门ID:</label>
<div class="col-sm-8">
<input name="deptId" th:field="*{deptId}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">是否删除 0 否 1 是:</label>
<div class="col-sm-8">
<input name="isDelete" th:field="*{isDelete}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">数据状态 0 正常 1 取消:</label>
<div class="col-sm-8">
<div class="radio-box">
<input type="radio" name="status" value="">
<label th:for="status" th:text="未知"></label>
</div>
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">登记编号:</label>
<div class="col-sm-8">
<input name="lawEnforcementCode" th:field="*{lawEnforcementCode}" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script type="text/javascript">
var prefix = ctx + "system/registration";
$("#form-registration-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-registration-edit').serialize());
}
}
$("input[name='enforcementTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
</body>
</html>

205
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html

@ -0,0 +1,205 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('企业端-执法部门预约记录列表')" />
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<p>执法部门:</p>
<input type="text" name="lawEnforcement"/>
</li>
<li>
<p>企业名称:</p>
<input type="text" name="enterpriseName"/>
</li>
<li>
<p>企业税号:</p>
<input type="text" name="enterpriseNumber"/>
</li>
<li class="select-time">
<p>执法时间:</p>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginEnforcementTime]"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endEnforcementTime]"/>
</li>
<li>
<p>执法人员姓名:</p>
<input type="text" name="lawEnforcer"/>
</li>
<li>
<p>执法结果 0 合格 1 不合格:</p>
<select name="status">
<option value="">所有</option>
<option value="0">合格</option>
<option value="1">不合格</option>
</select>
</li>
<li>
<p>登记编号:</p>
<input type="text" name="lawEnforcementCode"/>
</li>
<li>
<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:registration:add">-->
<!-- <i class="fa fa-plus"></i> 添加-->
<!-- </a>-->
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:registration:edit">-->
<!-- <i class="fa fa-edit"></i> 修改-->
<!-- </a>-->
<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:registration:remove">-->
<!-- <i class="fa fa-remove"></i> 删除-->
<!-- </a>-->
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('system:registration:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:registration:remove')}]];
var prefix = ctx + "code/registration";
$(function() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "企业端-执法部门预约记录",
columns: [{
checkbox: true
},
{
field : 'id',
title : '主键ID',
visible: false
},
{
field : 'lawEnforcement',
title : '执法部门'
},
{
field : 'lawEnforcementId',
title : '执法部门ID'
},
{
field : 'enterpriseId',
title : '被执法企业ID'
},
{
field : 'enterpriseName',
title : '被执法企业'
},
{
field : 'enterpriseNumber',
title : '被执法企业税号'
},
{
field : 'enforcementTime',
title : '执法时间'
},
{
field : 'lawEnforcer',
title : '执法人员姓名'
},
{
field : 'lawEnforcerId',
title : '执法人员ID'
},
{
field : 'lawEnforcerTel',
title : '执法人员联系方式'
},
{
field : 'lawEnforcerTwo',
title : '执法人员姓名2'
},
{
field : 'lawEnforcerIdTwo',
title : '执法人员ID2'
},
{
field : 'lawEnforcerTelTwo',
title : '执法人员联系方式2'
},
{
field : 'subsidiaryer',
title : '辅助人员姓名'
},
{
field : 'subsidiaryerId',
title : '辅助人员id'
},
{
field : 'subsidiaryerTel',
title : '辅助人员联系方式'
},
{
field : 'lawEnforcementItem',
title : '执法事项'
},
{
field : 'lawEnforcementBasis',
title : '执法依据'
},
{
field : 'remark',
title : '备注'
},
{
field : 'reslut',
title : '执法结果 0 合格 1 不合格'
},
{
field : 'userId',
title : '用户ID'
},
{
field : 'deptId',
title : '部门ID'
},
{
field : 'isDelete',
title : '是否删除 0 否 1 是'
},
{
field : 'status',
title : '数据状态 0 正常 1 取消'
},
{
field : 'lawEnforcementCode',
title : '登记编号'
},
{
title: '操作',
align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
}]
};
$.table.init(options);
});
</script>
</body>
</html>

25
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java

@ -89,6 +89,10 @@ public class EnforcementRegistration extends BaseDomain
/** 是否删除 0 否 1 是 */
private Integer isDelete;
/**
* 是否投诉
*/
private Integer isComplaint;
/**
* 文件几个
@ -113,6 +117,11 @@ public class EnforcementRegistration extends BaseDomain
*/
private String endTime;
/**
* 关键字查询
*/
private String searchText;
public String getId() {
return id;
}
@ -338,4 +347,20 @@ public class EnforcementRegistration extends BaseDomain
public void setDateSearch(String dateSearch) {
this.dateSearch = dateSearch;
}
public String getSearchText() {
return searchText;
}
public void setSearchText(String searchText) {
this.searchText = searchText;
}
public Integer getIsComplaint() {
return isComplaint;
}
public void setIsComplaint(Integer isComplaint) {
this.isComplaint = isComplaint;
}
}

12
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java

@ -71,7 +71,7 @@ public class EnterpriseLawEnforcement extends BaseDomain
/**
* 搜索关键字
*/
private String searchText;
private String searchValue;
/**
* 日期查询
*/
@ -260,12 +260,14 @@ public class EnterpriseLawEnforcement extends BaseDomain
this.remark = remark;
}
public String getSearchText() {
return searchText;
@Override
public String getSearchValue() {
return searchValue;
}
public void setSearchText(String searchText) {
this.searchText = searchText;
@Override
public void setSearchValue(String searchValue) {
this.searchValue = searchValue;
}
public String getSearchDate() {

10
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java

@ -7,6 +7,8 @@ import cn.hutool.core.util.IdUtil;
import com.zdxt.auth.dto.UserBean;
import com.zdxt.auth.feign.UserApi;
import com.zdxt.auth.feign.ZdxtFileCommonApi;
import com.zdxt.code.domain.EnforcementRegistration;
import com.zdxt.code.mapper.EnforcementRegistrationMapper;
import com.zdxt.common.util.DateUtils;
import com.zdxt.common.zdxtFile.ZdxtFileCommon;
import org.springframework.beans.factory.annotation.Autowired;
@ -33,6 +35,9 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi
@Autowired
private UserApi userApi;
@Autowired
private EnforcementRegistrationMapper enforcementRegistrationMapper;
/**
* 查询企业执法-在线投诉
*
@ -81,6 +86,11 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi
zdxtFileCommon.setUploadPersonId(user.getUserId().toString());
zdxtFileCommon.setUploadPersonName(user.getUserName());
zdxtFileCommonApi.addZdxtFileCommon(zdxtFileCommon);
//修改执法记录状态为已投诉
EnforcementRegistration enforcementRegistration = new EnforcementRegistration();
enforcementRegistration.setIsComplaint(1);
enforcementRegistration.setId(enterpriseComplaint.getRelId());
enforcementRegistrationMapper.updateEnforcementRegistration(enforcementRegistration);
});
}
return i;

6
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml

@ -73,7 +73,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="searchValue != null and searchValue != ''">
and ( enterprise_name like concat(concat('%',#{searchValue}),'%')
or law_enforcement_code like concat(concat('%',#{searchValue}),'%')
or law_enforcer_tel like concat(concat('%',#{searchValue}),'%')
or law_enforcer like concat(concat('%',#{searchValue}),'%')
or law_enforcement_item like concat(concat('%',#{searchValue}),'%')
or law_enforcement like concat(concat('%',#{searchValue}),'%')
)
</if>
<if test="dateType != null and dateType == 1">
@ -212,7 +214,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteEnforcementRegistrationByIds" parameterType="String">
delete from enforcement_registration where id in
delete from enforcement_registration where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>

2
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml

@ -55,8 +55,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="searchValue != null and searchValue != ''">
and ( enterprise_name like concat(concat('%',#{searchValue}),'%')
or law_enforcement_code like concat(concat('%',#{searchValue}),'%')
or link_tel like concat(concat('%',#{searchValue}),'%')
or check_item like concat(concat('%',#{searchValue}),'%')
or law_enforcement like concat(concat('%',#{searchValue}),'%')
)
</if>
<if test="dateType != null and dateType == 1">

Loading…
Cancel
Save