chenrui
/
zdxtLawEnforcementCode
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

执法检查统计区域字段和筛选

v4
zouyx 2 years ago
parent
b695704aa9
commit
2c7b374bd0
9 changed files with 311 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java
  2. 10
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/jd.html
  3. 52
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html
  4. 148
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java
  5. 27
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java
  6. 1
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java
  7. 3
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java
  8. 26
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
  9. 60
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml

4
lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java
View File

@ -32,7 +32,7 @@ public class IdCardCryptoUtil {
//VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0
//VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0
//SXRpWEhVN3RHM3ZFbzRQcQ==
String userIdCode = IdCardCryptoUtil.symmetricEncryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", "1608644307579883522");
String userIdCode = IdCardCryptoUtil.symmetricEncryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", "123456789123456789");
String userNameCode = IdCardCryptoUtil.symmetricEncryptIdCard("eWIzY3BMRVNEQXhvUUlXMA==", "汪鑫");
// String secret = IdCardCryptoUtil.symmetricEncryptIdCard("eWIzY3BMRVNEQXhvUUlXMA==", "ae739d8c-86ed-4898-b57d-eed3be42debf");
@ -40,7 +40,7 @@ public class IdCardCryptoUtil {
String phone = IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", "AoQTc5m7o+maPsiYiikzYA==");
// System.out.println(userIdCode);
System.out.println(phone);
System.out.println(userIdCode);
// System.out.println(userNameCode);
//// System.out.println(secret);

10
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/jd.html
View File

@ -0,0 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<head>
<option value="">所有街道</option>
<option th:fragment="jd" th:each="j:${jdList}" th:text="${j.dictLabel}" th:value="${j.dictValue}"></option>
</head>
<body>
</body>
</html>

52
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html
View File

@ -83,6 +83,17 @@
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<p>区域：</p>
<select id="qy" name="qy" th:with="type=${@dict.getType('address_type')}" onchange="addressMake()">
<option value="">全市</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
<select id="jd" name="jd">
<option value="">所有街道</option>
<option th:fragment="jd" th:each="j:${jdList}" th:text="${j.dictLabel}" th:value="${j.dictValue}"></option>
</select>
</li>
<li>
<p>时段：</p>
<select id="year" name="year">
@ -153,7 +164,7 @@
<span id="closeButton" class="detail-close" onclick="closeC()">×</span>
<table id="bootstrap-table2"></table>
</div>
<div id="detail2" class="detail-list" style="width: 60%;">
<div id="detail2" class="detail-list" style="width: 75%;">
<span id="closeButton2" class="detail-close" onclick="closeUnite()">×</span>
<table id="bootstrap-table3"></table>
</div>
@ -243,6 +254,7 @@
var caseType=[];
var prefix = ctx + "code/registration";
var prefixC= ctx+"code/complaintStatic";
var prefixDict=ctx+'system/dict/data';
var quarterBoolean=/*[[${quarterBoolean}]]*/{};
var monthBoolean=/*[[${monthBoolean}]]*/{};
var unite=/*[[${unite}]]*/{};
@ -278,6 +290,7 @@
echarts4();
$('#detail').hide();
$('#detail2').hide();
$('#jd').hide();
$.ajax({
url:"/system/dict/data"+'/queryDict',
type:'GET',
@ -302,6 +315,14 @@
pageList: [10, 25, 50],
//quarterBoolean:quarterBoolean,
columns: [
{
field : 'qy',
title : '区域'
},
{
field : 'jd',
title : '街道'
},
{
field : 'bureauDeptName',
title : '执法部门',
@ -419,6 +440,14 @@
pageList: [10, 25, 50],
//quarterBoolean:quarterBoolean,
columns: [
{
field : 'qy',
title : '区域'
},
{
field : 'jd',
title : '街道'
},
{
field : 'bureauDeptName',
title : '执法部门',
@ -928,7 +957,7 @@
var options2 = {
modalName: "执法记录统计",
showHeader: true,
showFooter: true,
showFooter: false,
showColumns: false,
showRefresh: false,
showToggle: false,
@ -983,6 +1012,7 @@
console.log($.common.formToJSON($('form').eq(0).attr('id')));
search1();
timeType();
addressMake();
}
function rest2(){
$('form').eq(1).trigger("reset");
@ -1101,6 +1131,24 @@
}
})
}
function addressMake(){
var dateSearch = document.getElementById("qy");
console.log(dateSearch.value)
if(dateSearch.value!=null&&dateSearch.value!=""){
$("#jd").show();
$.ajax({
url:prefix+'/jdList',
type:'GET',
data: {"name":dateSearch.value},
success: function (response) {
$('#jd').html(response);
}
})
}else {
$("#jd").hide();
document.getElementById("jd").value='';
}
}
function setTab(prefix, num, total) {
console.log( document.getElementById(`${prefix}1`));
console.log( document.getElementById(`${prefix}2`));

148
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java
View File

@ -106,7 +106,7 @@ public class EnforcementRegistrationController extends BaseController
/**
* 查询执法端-执法登记列表
*/
@RequiresPermissions("code:registration:list")
/*@RequiresPermissions("code:registration:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(EnforcementRegistration enforcementRegistration)
@ -114,6 +114,138 @@ public class EnforcementRegistrationController extends BaseController
startPage();
List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList1(enforcementRegistration);
return getDataTable(list);
}*/
@RequiresPermissions("code:registration:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(EnforcementRegistration enforcementRegistration)
{
if(enforcementRegistration.getQy()!=null&&!"".equals(enforcementRegistration.getQy())){
if(enforcementRegistration.getJd()!=null&&!"".equals(enforcementRegistration.getJd())){
String qy=iDictDataService.selectDictLabel("address_Type",enforcementRegistration.getQy());
String jd=iDictDataService.selectDictLabel(enforcementRegistration.getQy(),enforcementRegistration.getJd());
enforcementRegistration.setJd(jd);
enforcementRegistration.setQy(qy);
List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationAndAddressList(enforcementRegistration);
for(int i=0;i<list.size();i++){
list.get(i).setQy(qy);
list.get(i).setJd(jd);
}
return getDataTable(list);
}else {
List<EnforcementRegistration> enforcementRegistrationList=new ArrayList<>();
String qy=iDictDataService.selectDictLabel("address_Type",enforcementRegistration.getQy());
List<DictData> jdList=iDictDataService.selectDictDataByType(enforcementRegistration.getQy());
enforcementRegistration.setQy(qy);
List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationAndAddressList(enforcementRegistration);
/*List<String> jdStrings=new ArrayList<>();
for(DictData dictData:jdList){
jdStrings.add(dictData.getDictLabel());
}*/
for(DictData jd:jdList){
List<EnforcementRegistration> jdEList=new ArrayList<>();
if(qy.equals("光明区")){
jdEList=list.stream().filter(item->item.getEnterpriseAddress().startsWith("深圳市光明新区"+jd.getDictLabel())||item.getEnterpriseAddress().startsWith("深圳市"+qy+jd.getDictLabel())).collect(Collectors.toList());
}else {
jdEList=list.stream().filter(item->item.getEnterpriseAddress().startsWith("深圳市"+qy+jd.getDictLabel())).collect(Collectors.toList());
}
if(jdEList.size()>0){
for(int i=0;i<jdEList.size();i++){
jdEList.get(i).setQy(qy);
jdEList.get(i).setJd(jd.getDictLabel());
}
enforcementRegistrationList.addAll(jdEList);
}
}
List<EnforcementRegistration>qtjdList=list.stream().filter(item->!jdMake(qy,jdList,item.getEnterpriseAddress())).collect(Collectors.toList());
if(qtjdList.size()>0){
for(int i=0;i<qtjdList.size();i++){
qtjdList.get(i).setQy(qy);
}
enforcementRegistrationList.addAll(qtjdList);
}
return getDataTable(enforcementRegistrationList);
}
}else {
List<DictData> qyList=iDictDataService.selectDictDataByType("address_Type");
List<String> qyStrings=new ArrayList<>();
for(DictData dictData:qyList){
qyStrings.add(dictData.getDictLabel());
}
List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationAndAddressList(enforcementRegistration);
List<EnforcementRegistration> enforcementRegistrationsList=new ArrayList<>();
for(DictData qy:qyList){
List<DictData> jdList=iDictDataService.selectDictDataByType(qy.getDictValue());
/*List<String> jdStrings=new ArrayList<>();
for(DictData dictData:jdList){
jdStrings.add(dictData.getDictLabel());
}*/
List<EnforcementRegistration> qyEList=new ArrayList<>();
if(qy.getDictLabel().equals("光明区")){
qyEList=list.stream().filter(item->item.getEnterpriseAddress().startsWith("深圳市光明新区")||item.getEnterpriseAddress().startsWith("深圳市"+qy.getDictLabel())).collect(Collectors.toList());
}else {
qyEList=list.stream().filter(item->item.getEnterpriseAddress().startsWith("深圳市"+qy.getDictLabel())).collect(Collectors.toList());
}
for(DictData jd:jdList){
List<EnforcementRegistration> jdEList=new ArrayList<>();
if(qy.getDictLabel().equals("光明区")){
jdEList=qyEList.stream().filter(item->item.getEnterpriseAddress().startsWith("深圳市光明新区"+jd.getDictLabel())||item.getEnterpriseAddress().startsWith("深圳市"+qy.getDictLabel()+jd.getDictLabel())).collect(Collectors.toList());
}else {
jdEList=qyEList.stream().filter(item->item.getEnterpriseAddress().startsWith("深圳市"+qy.getDictLabel()+jd.getDictLabel())).collect(Collectors.toList());
}
if(jdEList.size()>0){
for(int i=0;i<jdEList.size();i++){
jdEList.get(i).setQy(qy.getDictLabel());
jdEList.get(i).setJd(jd.getDictLabel());
}
enforcementRegistrationsList.addAll(jdEList);
}
}
List<EnforcementRegistration>qtjdList=qyEList.stream().filter(item->!jdMake(qy.getDictLabel(),jdList,item.getEnterpriseAddress())).collect(Collectors.toList());
if(qtjdList.size()>0){
for(int i=0;i<qtjdList.size();i++){
qtjdList.get(i).setQy(qy.getDictLabel());
}
enforcementRegistrationsList.addAll(qtjdList);
}
}
List<EnforcementRegistration>qtqyList=list.stream().filter(item->!qyMake(qyStrings,item.getEnterpriseAddress())).collect(Collectors.toList());
if(qtqyList.size()>0){
enforcementRegistrationsList.addAll(qtqyList);
}
return getDataTable(enforcementRegistrationsList);
}
}
public Boolean qyMake(List<String> strings,String s){
for (String string : strings) {
if(string.equals("光明区")){
if (s.startsWith("深圳市" + string)||s.startsWith("深圳市光明新区")) {
return true;
}
}else {
if (s.startsWith("深圳市" + string)) {
return true;
}
}
}
return false;
}
public Boolean jdMake(String qy,List<DictData> stringList,String s){
if(qy.equals("光明区")){
for(DictData d:stringList){
if(s.startsWith("深圳市"+qy+d.getDictLabel())||s.startsWith("深圳市光明新区"+d.getDictLabel())){
return true;
}
}
}else {
for (DictData d : stringList) {
if (s.startsWith("深圳市"+qy+d.getDictLabel())) {
return true;
}
}
}
return false;
}
@RequiresPermissions("code:registration:list")
@PostMapping("/selectUnite")
@ -158,9 +290,15 @@ public class EnforcementRegistrationController extends BaseController
@GetMapping("/searchType")
public String searchType(EnforcementRegistration enforcementRegistration,Model model)
{
if(enforcementRegistration.getQy()!=null&&!"".equals(enforcementRegistration.getQy())){
if(enforcementRegistration.getJd()!=null&&!"".equals(enforcementRegistration.getJd())){
enforcementRegistration.setJd(iDictDataService.selectDictLabel(enforcementRegistration.getQy(),enforcementRegistration.getJd()));
}
enforcementRegistration.setQy(iDictDataService.selectDictLabel("address_Type",enforcementRegistration.getQy()));
}
DecimalFormat str1=new DecimalFormat("0.00%");
model.addAttribute("year",enforcementRegistration.getYear());
List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList1(enforcementRegistration);
List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationAndAddressList(enforcementRegistration);
System.out.println(1);
List<EnforcementRegistration> uniteList=list.stream().filter(item->item.getUniteCheck()!=null&&!"".equals(item.getUniteCheck())).collect(Collectors.toList());
List<EnforcementRegistration> checkList=new ArrayList<>();
@ -313,6 +451,12 @@ public class EnforcementRegistrationController extends BaseController
return statisticsIndicatorList;
}
@GetMapping("/jdList")
public String statisticsEnterprise(SearchType searchType,Model model) {
model.addAttribute("jdList", iDictDataService.selectDictDataByType(searchType.getName()));
return prefix + "/jd";
}
/**
* 新增执法端-执法登记
*/

27
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java
View File

@ -159,6 +159,9 @@ public class EnforcementRegistration extends BaseDomain
private String enforceReason;
/** 临时用 */
private String qy;
private String jd;
private String enterpriseAddress;
private String lawCertificateNum;
private String lawCertificateNumText;
private String lawCertificateNumTwoText;
@ -673,4 +676,28 @@ public class EnforcementRegistration extends BaseDomain
public void setYear(String year) {
this.year = year;
}
public String getJd() {
return jd;
}
public void setJd(String jd) {
this.jd = jd;
}
public String getQy() {
return qy;
}
public void setQy(String qy) {
this.qy = qy;
}
public String getEnterpriseAddress() {
return enterpriseAddress;
}
public void setEnterpriseAddress(String enterpriseAddress) {
this.enterpriseAddress = enterpriseAddress;
}
}

1
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java
View File

@ -33,6 +33,7 @@ public interface EnforcementRegistrationMapper
*/
List<EnforcementRegistration> selectEnforcementRegistrationList(EnforcementRegistration enforcementRegistration);
List<EnforcementRegistration> selectEnforcementRegistrationList1(EnforcementRegistration enforcementRegistration);
List<EnforcementRegistration> selectEnforcementRegistrationAndAddressList(EnforcementRegistration enforcementRegistration);
List<EnforcementRegistration> selectUnite(EnforcementRegistration enforcementRegistration);
/**
* 查询企业端-执法登记列表

3
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java
View File

@ -35,6 +35,9 @@ public interface IEnforcementRegistrationService
List<EnforcementRegistration> selectEnforcementRegistrationList(EnforcementRegistration enforcementRegistration);
List<EnforcementRegistration> selectEnforcementRegistrationList1(EnforcementRegistration enforcementRegistration);
List<EnforcementRegistration> selectUnite(EnforcementRegistration enforcementRegistration);
List<EnforcementRegistration> selectEnforcementRegistrationAndAddressList(EnforcementRegistration enforcementRegistration);
/**
* 查询企业端-执法登录列表
* @param enforcementRegistration

26
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
View File

@ -1,7 +1,6 @@
package com.zdxt.code.service.impl;
import java.time.LocalDate;
import java.time.Month;
import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAdjusters;
import java.util.*;
@ -22,25 +21,15 @@ import com.zdxt.code.domain.dto.EnforcementRegistrationDto;
import com.zdxt.code.mapper.LinkageDictMapper;
import com.zdxt.code.service.*;
import com.zdxt.common.annotation.DataScope;
import com.zdxt.common.config.RuoYiConfig;
import com.zdxt.common.util.DateUtils;
import com.zdxt.common.util.StringUtils;
import com.zdxt.common.zdxtFile.AttFileRespDTO;
import com.zdxt.common.zdxtFile.FilePreviewUtilBean;
import com.zdxt.common.zdxtFile.ZdxtFileCommon;
import com.zdxt.domain.auth.Dept;
import com.zdxt.domain.auth.DictData;
import com.zdxt.flow.mapper.IUserMapper;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Row;
import org.dmg.pmml.association.Item;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zdxt.code.mapper.EnforcementRegistrationMapper;
import javax.servlet.http.HttpServletResponse;
/**
* 执法端-执法登记Service业务层处理
*
@ -248,7 +237,12 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
enforcementRegistrationMapper.selectEnforcementRegistrationList1(enforcementRegistration);
return enforcementRegistrations;
}
@Override
public List<EnforcementRegistration> selectEnforcementRegistrationAndAddressList(EnforcementRegistration enforcementRegistration) {
List<EnforcementRegistration> enforcementRegistrations =
enforcementRegistrationMapper.selectEnforcementRegistrationAndAddressList(enforcementRegistration);
return enforcementRegistrations;
}
@Override
public List<EnforcementRegistration> selectEnterpriseRegistrationList(EnforcementRegistration enforcementRegistration) {
List<EnforcementRegistration> enforcementRegistrations =
@ -563,6 +557,14 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
LocalDate lastDayOfMonth = lastLocalDate.with(TemporalAdjusters.lastDayOfMonth());
return firstDayOfMonth +"," + lastDayOfMonth;
}
public Boolean qyMake(List<String> stringList,String s){
for (String string : stringList) {
if (s.startsWith(string)) {
return true;
}
}
return false;
}
/*@Override
public void export(HttpServletResponse httpServletResponse,EnforcementRegistration enforcementRegistration,List<EnforcementRegistration> list){

60
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
View File

@ -207,6 +207,59 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by create_time desc
</select>
<select id="selectEnforcementRegistrationAndAddressList" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">
select r.id,r.bureau_dept_name,r.bureau_dept_id,r.law_enforcer,r.law_enforcer_two,r.enterprise_name,r.enterprise_number,i.enterprise_address,r.law_enforcement_item_text,r.unite_check,
r.check_category,r.check_css,r.is_complaint,r.create_time from enforcement_registration r
left join (select * from enterprise_information group by enterprise_number order by is_delete asc) i on r.enterprise_number=i.enterprise_number
<where>
and r.bureau_dept_name is not null
and r.law_enforcement_id is not null
and r.enterprise_name is not null
and r.enterprise_number is not null
and r.law_enforcer is not null
and r.law_enforcer_two is not null
and r.is_complaint is not null
and r.check_category is not null
and r.bureau_dept_id is not null
<if test="qy != null and qy != ''">
<if test="qy!='光明区'.toString()">and i.enterprise_address like concat('深圳市',#{qy}, '%')</if>
<if test="qy=='光明区'.toString()">and( i.enterprise_address like concat('深圳市',#{qy}, '%')or i.enterprise_address like '深圳市光明新区%')</if>
<if test="jd != null and jd != ''">
<if test="qy!='光明区'.toString()">and i.enterprise_address like concat('深圳市',#{qy},#{jd}, '%')</if>
<if test="qy=='光明区'.toString()">and( i.enterprise_address like concat('深圳市光明区',#{jd}, '%')or i.enterprise_address like concat('深圳市光明新区',#{jd}, '%'))</if>
</if>
</if>
<if test="deptQx != null and deptQx != ''">and r.bureau_dept_id =#{deptQx}</if>
<if test="lawEnforcement != null and lawEnforcement != ''"> and r.law_enforcement like concat('%', #{lawEnforcement}, '%')</if>
<if test="bureauDeptName != null and bureauDeptName != ''"> and r.bureau_dept_name like concat('%', #{bureauDeptName}, '%')</if>
<if test="enterpriseName != null and enterpriseName != ''"> and r.enterprise_name like concat('%', #{enterpriseName}, '%')</if>
<if test="lawEnforcer != null and lawEnforcer != ''"> and (r.law_enforcer like concat('%',#{lawEnforcer} ,'%') or r.law_enforcer_two like concat('%',#{lawEnforcer} ,'%'))</if>
<if test="isComplaint != null "> and r.is_complaint = #{isComplaint}</if>
<if test="uniteCheck == '0'.toString()"> and r.unite_check is not null</if>
<if test="uniteCheck == '1'.toString()"> and r.unite_check is null</if>
<if test="enforce == '0'.toString()"> and r.check_css is not null</if>
<if test="enforce == '1'.toString()"> and r.check_css is null</if>
<if test="checkCategory != null and checkCategory != ''"> and r.check_category = #{checkCategory}</if>
<if test="checkCss != null and checkCss != ''"> and r.check_css = #{checkCss}</if>
<if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
and DATE_FORMAT(r.create_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{beginTime},'%Y-%m-%d')
</if>
<if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
and DATE_FORMAT(r.create_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
</if>
<if test="year != null and year != ''">
AND YEAR(r.create_time) = #{year}
</if>
<if test="quarter != null and quarter != '' ">
AND QUARTER(r.create_time) = #{quarter}
</if>
<if test="month != null and month != '' ">
AND DATE_FORMAT(r.create_time, '%Y-%m') = #{month}
</if>
</where>
order by r.create_time desc
</select>
<select id="selectEnterpriseRegistrationList" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">
<include refid="selectEnforcementRegistrationVo"/>
<where>
@ -635,11 +688,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by t.create_time
</select>
<select id="selectUnite" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">
<include refid="selectEnforcementRegistrationVo"/>
select r.id,r.bureau_dept_name,r.bureau_dept_id,r.law_enforcer,r.law_enforcer_two,r.enterprise_name,r.enterprise_number,i.enterprise_address,r.law_enforcement_item_text,r.unite_check,
r.check_category,r.check_css,r.is_complaint,r.create_time,substring(i.enterprise_address,4,INSTR(i.enterprise_address, '区')-3)as qy,substring(i.enterprise_address,INSTR(i.enterprise_address, '区')+1,INSTR(i.enterprise_address, '街道')-INSTR(i.enterprise_address, '区')+1)as jd from enforcement_registration r
left join (select * from enterprise_information group by enterprise_number order by is_delete asc) i on r.enterprise_number=i.enterprise_number
<where>
<if test="uniteCheck != null and uniteCheck != ''">
and unite_check=#{uniteCheck}
and r.unite_check=#{uniteCheck}
</if>
</where>
order by i.enterprise_address
</select>
</mapper>
Write Preview
Loading…
Cancel
Save