From ff7588a160085774211ec284a415bb774fec7ccd Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Sat, 1 Jun 2024 17:52:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E6=AD=A3=E5=BC=8F=E7=8E=AF?= =?UTF-8?q?=E5=A2=83bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEnterpriseInformationController.java | 4 ++-- .../resources/templates/system/user/user.html | 2 +- .../zdxt/code/domain/EnforcementRegistration.java | 11 +++++++++++ .../zdxt/code/domain/EnterpriseInformation.java | 15 ++++++++------- .../code/service/impl/ThirdLoginServiceImpl.java | 2 +- .../mapper/EnforcementRegistrationMapper.xml | 6 +++++- 6 files changed, 28 insertions(+), 12 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java index 070ca351..2bc7ac60 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java @@ -76,8 +76,8 @@ public class AppEnterpriseInformationController extends BaseController /** * 新增保存企业信息登记 */ - @RequiresPermissions("code:information:add") - @PostMapping("/add") +// @RequiresPermissions("code:information:add") + @PostMapping("/addSave") @ResponseBody public ZDResponse addSave(@RequestBody EnterpriseInformation enterpriseInformation) { diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/user.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/user.html index b047ee7f..52e24627 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/user.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/user.html @@ -229,7 +229,7 @@ // actions.push(' 查看 '); actions.push(' 编辑 '); actions.push(' 删除 '); - // actions.push(' 重置'); + actions.push(' 重置'); return actions.join(''); } }] diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java index a09e8df4..a2e8197a 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java @@ -124,6 +124,9 @@ public class EnforcementRegistration extends BaseDomain */ private String endTime; + /** 未扫码原因 */ + private String enforce; + /** * 关键字查询 */ @@ -136,6 +139,14 @@ public class EnforcementRegistration extends BaseDomain private String subsidiaryerText; private List fileListObj; + public String getEnforce() { + return enforce; + } + + public void setEnforce(String enforce) { + this.enforce = enforce; + } + public List getFileListObj() { return fileListObj; } 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 b7edb7df..a15bdf5e 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 @@ -3,6 +3,7 @@ package com.zdxt.code.domain; import com.zdxt.common.BaseDomain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; import java.util.List; @@ -40,7 +41,7 @@ public class EnterpriseInformation extends BaseDomain private String registeredCapital; /** 成立日期 */ - private Date establishmentTime; + private String establishmentTime; /** 营业期限 */ private String operatingTerm; @@ -163,15 +164,15 @@ public class EnterpriseInformation extends BaseDomain { return registeredCapital; } - public void setEstablishmentTime(Date establishmentTime) - { - this.establishmentTime = establishmentTime; - } - public Date getEstablishmentTime() - { + public String getEstablishmentTime() { return establishmentTime; } + + public void setEstablishmentTime(String establishmentTime) { + this.establishmentTime = establishmentTime; + } + public void setOperatingTerm(String operatingTerm) { this.operatingTerm = operatingTerm; 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 73bd4b28..6bcecfe9 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 @@ -133,7 +133,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService { //企业类型 enterpriseInformation.setCompanyOrgType(jsonObject.getString("companyOrgType")); //注册时间 - enterpriseInformation.setEstablishmentTime(jsonObject.getSqlDate("establishDate")); + enterpriseInformation.setEstablishmentTime(jsonObject.getString("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 16a81c53..1a67d365 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -43,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, law_enforcement, law_enforcement_id, enterprise_id, enterprise_name, enterprise_number, enforcement_time, create_time, create_by, law_enforcer, law_enforcer_id, law_enforcer_tel, law_enforcer_two, law_enforcer_id_two, law_enforcer_tel_two, subsidiaryer, subsidiaryer_id, subsidiaryer_tel, law_enforcement_item, law_enforcement_basis, remark, reslut, user_id, dept_id, is_delete, status, law_enforcement_code,is_complaint,is_submit from enforcement_registration + select id, law_enforcement, law_enforcement_id, enforce, enterprise_id, enterprise_name, enterprise_number, enforcement_time, create_time, create_by, law_enforcer, law_enforcer_id, law_enforcer_tel, law_enforcer_two, law_enforcer_id_two, law_enforcer_tel_two, subsidiaryer, subsidiaryer_id, subsidiaryer_tel, law_enforcement_item, law_enforcement_basis, remark, reslut, user_id, dept_id, is_delete, status, law_enforcement_code,is_complaint,is_submit from enforcement_registration