From 508b2e39ccab5d82bbb0abeccb30935f07edd8fe Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Wed, 15 May 2024 10:05:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=E7=A6=85=E9=81=9313=E5=8F=B7?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEnterpriseComplaintController.java | 2 +- ...AppEnterpriseLawEnforcementController.java | 2 + .../controller/AppThirdLoginController.java | 13 +++-- .../auth/common/constant/UserConstants.java | 2 +- .../auth/framework/config/ShiroConfig.java | 2 + .../XssAndSqlHttpServletRequestWrapper.java | 1 + .../domain/EnforcementInspectionProgram.java | 10 ++++ .../zdxt/code/domain/EnterpriseComplaint.java | 48 ++++++++++++++++++- .../code/domain/EnterpriseInformation.java | 9 ++++ .../code/domain/EnterpriseLawEnforcement.java | 9 ++++ ...forcementInspectionProgramServiceImpl.java | 2 +- .../impl/EnterpriseComplaintServiceImpl.java | 2 +- .../EnterpriseLawEnforcementServiceImpl.java | 1 + .../service/impl/ThirdLoginServiceImpl.java | 4 ++ .../mapper/EnforcementRegistrationMapper.xml | 36 ++++++-------- .../mapper/EnterpriseInformationMapper.xml | 8 +++- .../mapper/EnterpriseLawEnforcementMapper.xml | 23 +++++---- 17 files changed, 134 insertions(+), 40 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java index 65eab25c..93ca9b24 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java @@ -60,7 +60,7 @@ public class AppEnterpriseComplaintController extends BaseController /** * 新增保存企业执法-在线投诉 */ - @RequiresPermissions("code:complaint:add") +// @RequiresPermissions("code:complaint:add") @PostMapping("/add") @ResponseBody public ZDResponse addSave(@RequestBody EnterpriseComplaint enterpriseComplaint) diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java index 56bc57c5..faf7aa51 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java @@ -1,5 +1,7 @@ package com.zdxt.app.controller; +import com.zdxt.auth.dto.UserBean; +import com.zdxt.auth.feign.UserApi; import com.zdxt.code.domain.EnterpriseLawEnforcement; import com.zdxt.code.domain.LinkageDict; import com.zdxt.code.service.IEnterpriseLawEnforcementService; diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java index 24c664dd..a92a71aa 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java @@ -12,6 +12,7 @@ import com.zdxt.code.service.ThirdLoginService; import com.zdxt.code.utils.HttpUtil; import com.zdxt.code.utils.IdCardCryptoUtil; import com.zdxt.common.ZDResponse; +import com.zdxt.common.util.RedisCache; import com.zdxt.domain.auth.User; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -52,6 +53,8 @@ public class AppThirdLoginController { @Autowired private UserApi userApi; + @Autowired + private RedisCache redisCache; /** * 深圳易平台登录 @@ -59,6 +62,11 @@ public class AppThirdLoginController { @GetMapping("/szyptLogin/{code}") @ResponseBody public ZDResponse szyptLogin(@PathVariable String code){ + + System.out.println("====================== code ======================"); + System.out.println(code); + System.out.println("====================== code ======================"); + String accessToken = ""; String userInfo = ""; try { @@ -73,13 +81,12 @@ public class AppThirdLoginController { System.out.println("====================== userInfo ======================"); System.out.println(userInfo); System.out.println("====================== userInfo ======================"); + + redisCache.setCacheObject("shiro:app:1731", new User()); // todo:这里需要将转换出来的User存redis用于做权限 } catch (Exception e) { e.printStackTrace(); } JSONObject jsonObject = JSONObject.parseObject(userInfo); - System.out.println("====================== userInfo ======================"); - System.out.println(jsonObject); - System.out.println("====================== userInfo ======================"); return ZDResponse.success(); } diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/common/constant/UserConstants.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/common/constant/UserConstants.java index b2c5c8ec..33cdf73b 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/common/constant/UserConstants.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/common/constant/UserConstants.java @@ -32,7 +32,7 @@ public class UserConstants * 用户名长度限制 */ public static final int USERNAME_MIN_LENGTH = 2; - public static final int USERNAME_MAX_LENGTH = 20; + public static final int USERNAME_MAX_LENGTH = 30; /** 登录名称是否唯一的返回结果码 */ public final static String USER_NAME_UNIQUE = "0"; diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ShiroConfig.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ShiroConfig.java index a7762ad5..06f02775 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ShiroConfig.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ShiroConfig.java @@ -288,6 +288,8 @@ public class ShiroConfig { filterChainDefinitionMap.put("/app/**", "anon"); filterChainDefinitionMap.put("/app-z/**", "anon"); filterChainDefinitionMap.put("/Cesium-1.95/**", "anon"); + // 临时放开附件, 不然浏览器玩不了 + filterChainDefinitionMap.put("/common/upload", "anon"); filterChainDefinitionMap.put("/api/**", "anon"); filterChainDefinitionMap.put("/auth-center/**", "anon"); diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/XssAndSqlHttpServletRequestWrapper.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/XssAndSqlHttpServletRequestWrapper.java index cf663161..f19a2745 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/XssAndSqlHttpServletRequestWrapper.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/XssAndSqlHttpServletRequestWrapper.java @@ -295,6 +295,7 @@ public class XssAndSqlHttpServletRequestWrapper extends HttpServletRequestWrappe Map submitParams = new HashMap(parameterMap); Set submitNames = submitParams.keySet(); for (String submitName : submitNames) { + if ("cronExpression".equals(submitName)) { return false; } Object submitValues = submitParams.get(submitName); if ((submitValues instanceof String)) { if (checkXSSAndSql((String) submitValues)) { diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementInspectionProgram.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementInspectionProgram.java index 9f0db193..6de9cbd4 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementInspectionProgram.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementInspectionProgram.java @@ -49,6 +49,8 @@ public class EnforcementInspectionProgram extends BaseDomain */ private List fileList; + private List fileListObj; + /** * 执法计划 */ @@ -204,6 +206,14 @@ public class EnforcementInspectionProgram extends BaseDomain this.isPublish = isPublish; } + public List getFileListObj() { + return fileListObj; + } + + public void setFileListObj(List fileListObj) { + this.fileListObj = fileListObj; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java index 9b80dc9b..91326e07 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java @@ -40,7 +40,53 @@ public class EnterpriseComplaint extends BaseDomain */ private List fileList; - public void setId(String id) + public String enterpriseNumber; + public String lawEnforcementIncident; + public String enforceTypeText; + public String enterpriseName; + private List fileListObj; + + public String getEnforceTypeText() { + return enforceTypeText; + } + + public void setEnforceTypeText(String enforceTypeText) { + this.enforceTypeText = enforceTypeText; + } + + public String getEnterpriseNumber() { + return enterpriseNumber; + } + + public void setEnterpriseNumber(String enterpriseNumber) { + this.enterpriseNumber = enterpriseNumber; + } + + public List getFileListObj() { + return fileListObj; + } + + public void setFileListObj(List fileListObj) { + this.fileListObj = fileListObj; + } + + public String getEnterpriseName() { + return enterpriseName; + } + + public void setEnterpriseName(String enterpriseName) { + this.enterpriseName = enterpriseName; + } + + public String getLawEnforcementIncident() { + return lawEnforcementIncident; + } + + public void setLawEnforcementIncident(String lawEnforcementIncident) { + this.lawEnforcementIncident = lawEnforcementIncident; + } + + public void setId(String id) { this.id = id; } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java index d29d9917..6d160d2a 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java @@ -28,6 +28,7 @@ public class EnterpriseInformation extends BaseDomain /** 企业类型 */ private String enterpriseType; + private String companyOrgType; /** 企业地址 */ private String enterpriseAddress; @@ -219,6 +220,14 @@ public class EnterpriseInformation extends BaseDomain this.enterpriseTel = enterpriseTel; } + public String getCompanyOrgType() { + return companyOrgType; + } + + public void setCompanyOrgType(String companyOrgType) { + this.companyOrgType = companyOrgType; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java index c08bb60a..1826c87e 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java @@ -99,6 +99,15 @@ public class EnterpriseLawEnforcement extends BaseDomain private String lawEnforcerText; private String lawCertificateNumTwo; private String lawEnforcerTextTwo; + private String dataScopeId; + + public String getDataScopeId() { + return dataScopeId; + } + + public void setDataScopeId(String dataScopeId) { + this.dataScopeId = dataScopeId; + } public String getLawEnforcerTextTwo() { return lawEnforcerTextTwo; diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementInspectionProgramServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementInspectionProgramServiceImpl.java index b6d1cbf1..997e80e2 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementInspectionProgramServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementInspectionProgramServiceImpl.java @@ -98,7 +98,7 @@ public class EnforcementInspectionProgramServiceImpl implements IEnforcementInsp { enforcementInspectionProgram.setCreateTime(DateUtils.getNowDate()); - UserBean user = userApi.getCurrentUser(); + UserBean user = userApi.getUserByUserId(enforcementInspectionProgram.getUserId()); enforcementInspectionProgram.setCreateTime(DateUtils.getNowDate()); enforcementInspectionProgram.setId(IdUtil.simpleUUID()); enforcementInspectionProgram.setUserId(user.getUserId()); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java index 7334f439..a93b8d7e 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java @@ -71,7 +71,7 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi @Override public int insertEnterpriseComplaint(EnterpriseComplaint enterpriseComplaint) { - UserBean user = userApi.getCurrentUser(); + UserBean user = userApi.getUserByUserId(enterpriseComplaint.getUserId()); enterpriseComplaint.setCreateTime(DateUtils.getNowDate()); enterpriseComplaint.setId(IdUtil.simpleUUID()); int i = enterpriseComplaintMapper.insertEnterpriseComplaint(enterpriseComplaint); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java index 4c8eb6fa..9b2f18c6 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java @@ -12,6 +12,7 @@ import com.zdxt.code.domain.EnterpriseMerchantAuthorization; import com.zdxt.code.domain.LinkageDict; import com.zdxt.code.service.IEnterpriseMerchantAuthorizationService; import com.zdxt.code.service.ILinkageDictService; +import com.zdxt.common.annotation.DataScope; import com.zdxt.common.util.DateUtils; import com.zdxt.common.util.StringUtils; import com.zdxt.common.zdxtFile.ZdxtFileCommon; diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java index 8d8bbadd..7aa14f26 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java @@ -106,6 +106,10 @@ public class ThirdLoginServiceImpl implements ThirdLoginService { enterpriseInformation.setEnterpriseNumber(jsonObject.getString("corpCid")); //企业名称 enterpriseInformation.setEnterpriseName(jsonObject.getString("corpName")); + //企业类型 + enterpriseInformation.setCompanyOrgType(jsonObject.getString("companyOrgType")); + //注册时间 + enterpriseInformation.setEstablishmentTime(jsonObject.getSqlDate("establishDate")); //经营范围 enterpriseInformation.setBusinessScope(jsonObject.getString("businessScope")); //注册地址 diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index f7dbda1c..16a81c53 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -73,43 +73,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and status = #{status} and law_enforcement_code = #{lawEnforcementCode} - and ( law_enforcement_item like concat(concat('%',#{searchValue}),'%') + and ( law_enforcement_item in (SELECT id FROM linkage_dict where title like concat(concat('%',#{searchValue}),'%')) or law_enforcement like concat(concat('%',#{searchValue}),'%') or law_enforcer like concat(concat('%',#{searchValue}),'%') + or law_enforcer_two like concat(concat('%',#{searchValue}),'%') + or enterprise_name like concat(concat('%',#{searchValue}),'%') ) - and DATE_FORMAT(create_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m') + and DATE_FORMAT(enforcement_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m') - and create_time >= CONCAT(YEAR(CURDATE()), '-', QUARTER(CURDATE()), '-01') - and create_time <= CONCAT(YEAR(CURDATE()), '-', + and enforcement_time >= CONCAT(YEAR(CURDATE()), '-', + CASE WHEN QUARTER(CURDATE()) IN (1) THEN 2 + WHEN QUARTER(CURDATE()) IN (2) THEN 4 + WHEN QUARTER(CURDATE()) IN (3) THEN 7 + ELSE 10 END, '-01') + and enforcement_time <= CONCAT(YEAR(CURDATE()), '-', CASE - WHEN QUARTER(CURDATE()) IN (1, 2, 3) THEN 3 - WHEN QUARTER(CURDATE()) IN (4, 5, 6) THEN 6 - WHEN QUARTER(CURDATE()) IN (7, 8, 9) THEN 9 + WHEN QUARTER(CURDATE()) IN (1) THEN 3 + WHEN QUARTER(CURDATE()) IN (2) THEN 6 + WHEN QUARTER(CURDATE()) IN (3) THEN 9 ELSE 12 END, '-', DAY(LAST_DAY(CURDATE()))) - and DATE_FORMAT(create_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y') + and DATE_FORMAT(enforcement_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y') - and DATE_FORMAT(create_time, '%Y-%m') = #{dateSearch} - - - and DATE_FORMAT(create_time, '%Y-%m') = ]]> #{beginTime} - - - and DATE_FORMAT(create_time, '%Y-%m') #{endTime} - - - AND create_time = ]]> #{params.beginEnforcementTime} - - - AND create_time #{params.endEnforcementTime} + and DATE_FORMAT(enforcement_time, '%Y-%m') = #{dateSearch} order by create_time desc diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml index a93f331e..54ca1792 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml @@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -26,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, enterprise_name, enterprise_number, enterprise_type, enterprise_address, legal_person, registered_capital, establishment_time, + select id, enterprise_name, enterprise_number, enterprise_type, company_org_type, enterprise_address, legal_person, registered_capital, establishment_time, operating_term, business_scope, create_time, create_by, user_id, dept_id,is_unsubscribe ,is_delete,salt,enterprise_tel from enterprise_information @@ -36,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and enterprise_name like concat('%', #{enterpriseName}, '%') and enterprise_number like concat('%', #{enterpriseNumber}, '%') and enterprise_type = #{enterpriseType} + and company_org_type = #{companyOrgType} and enterprise_address = #{enterpriseAddress} and legal_person = #{legalPerson} and registered_capital = #{registeredCapital} @@ -71,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" enterprise_name, enterprise_number, enterprise_type, + company_org_type, enterprise_address, legal_person, registered_capital, @@ -90,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{enterpriseName}, #{enterpriseNumber}, #{enterpriseType}, + #{companyOrgType}, #{enterpriseAddress}, #{legalPerson}, #{registeredCapital}, @@ -112,6 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" enterprise_name = #{enterpriseName}, enterprise_type = #{enterpriseType}, + company_org_type = #{companyOrgType}, enterprise_address = #{enterpriseAddress}, legal_person = #{legalPerson}, registered_capital = #{registeredCapital}, @@ -130,6 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" enterprise_name = #{enterpriseName}, enterprise_type = #{enterpriseType}, + company_org_type = #{companyOrgType}, enterprise_address = #{enterpriseAddress}, legal_person = #{legalPerson}, registered_capital = #{registeredCapital}, diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml index ed57a081..504a9717 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml @@ -40,7 +40,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and enterprise_name like concat('%', #{enterpriseName}, '%') and check_time = #{checkTime} and law_enforcer = #{lawEnforcer} - and law_enforcer_id = #{lawEnforcerId} and law_enforcer_tel = #{lawEnforcerTel} and status = #{lawEnforcerTel} and is_submit = #{isSubmit} @@ -59,31 +58,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and ( enterprise_name like concat(concat('%',#{searchValue}),'%') - or check_item like concat(concat('%',#{searchValue}),'%') + or check_item in (SELECT id FROM linkage_dict where title like concat(concat('%',#{searchValue}),'%')) or law_enforcement_code like concat(concat('%',#{searchValue}),'%') or law_enforcement like concat(concat('%',#{searchValue}),'%') ) - and DATE_FORMAT(create_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m') + and DATE_FORMAT(check_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m') - and create_time >= CONCAT(YEAR(CURDATE()), '-', QUARTER(CURDATE()), '-01') - and create_time <= CONCAT(YEAR(CURDATE()), '-', + and check_time >= CONCAT(YEAR(CURDATE()), '-', + CASE WHEN QUARTER(CURDATE()) IN (1) THEN 2 + WHEN QUARTER(CURDATE()) IN (2) THEN 4 + WHEN QUARTER(CURDATE()) IN (3) THEN 7 + ELSE 10 END, '-01') + and check_time <= CONCAT(YEAR(CURDATE()), '-', CASE - WHEN QUARTER(CURDATE()) IN (1, 2, 3) THEN 3 - WHEN QUARTER(CURDATE()) IN (4, 5, 6) THEN 6 - WHEN QUARTER(CURDATE()) IN (7, 8, 9) THEN 9 + WHEN QUARTER(CURDATE()) IN (1) THEN 3 + WHEN QUARTER(CURDATE()) IN (2) THEN 6 + WHEN QUARTER(CURDATE()) IN (3) THEN 9 ELSE 12 END, '-', DAY(LAST_DAY(CURDATE()))) - and DATE_FORMAT(create_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y') + and DATE_FORMAT(check_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y') - and DATE_FORMAT(create_time, '%Y-%m') = #{searchDate} + and DATE_FORMAT(check_time, '%Y-%m') = #{searchDate} order by create_time desc