From c755c1bd9cf3fd759e1ba9eba00f62b419165c40 Mon Sep 17 00:00:00 2001 From: chenrui <1950717904@qq.com> Date: Sun, 15 Sep 2024 01:16:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AF=84=E4=BB=B7=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEnterpriseLawEnforcementController.java | 2 +- .../main/resources/mapper/system/UserMapper.xml | 3 ++- .../mapper/system/oracle/UserOracleDao.xml | 7 ++++--- .../com/zdxt/code/domain/EnterpriseEvaluate.java | 15 ++++++++++++++- .../impl/EnterpriseEvaluateServiceImpl.java | 7 +++++++ .../resources/mapper/EnterpriseEvaluateMapper.xml | 2 ++ 6 files changed, 30 insertions(+), 6 deletions(-) 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 724f4cdd..8ad50e70 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 @@ -388,7 +388,7 @@ public class AppEnterpriseLawEnforcementController extends BaseController // 执法人员需要展示用户名+执法码 UserBean userBean1 = new UserBean(); if (StringUtils.isNotEmpty(enfrorcement.getLawEnforcerId())) { - userBean1 = userApi.getUserByUserStrId(enfrorcement.getLawEnforcerId()); + userBean1 = userApi.getUserByUserId(Long.valueOf(enfrorcement.getLawEnforcerId())); if(StrUtil.isNotEmpty(String.valueOf(userBean1.getUserId()))){ String lawCertificateNum = StringUtils.isEmpty(userBean1.getLawCertificateNum())?"": userBean1.getLawCertificateNum(); diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml index 6315c806..5d80fc46 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml @@ -60,6 +60,7 @@ + @@ -154,7 +155,7 @@ select u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, - d.dept_name, d.leader from sys_user u + d.dept_name, d.leader,d.zzDisplayPath from sys_user u left join sys_dept d on u.dept_id = d.dept_id where u.del_flag = '0' diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseEvaluate.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseEvaluate.java index 1c24c4cd..e74d48ee 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseEvaluate.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseEvaluate.java @@ -26,6 +26,11 @@ public class EnterpriseEvaluate extends BaseDomain /** 案件ID */ private String enforcementId; + /** + * 批次ID-关联执法登记批次ID + */ + private String batchId; + /** 评价｜意见建议 */ private String evaluateDescription; @@ -70,7 +75,15 @@ public class EnterpriseEvaluate extends BaseDomain private List fileList; - public void setId(String id) + public String getBatchId() { + return batchId; + } + + public void setBatchId(String batchId) { + this.batchId = batchId; + } + + public void setId(String id) { this.id = id; } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseEvaluateServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseEvaluateServiceImpl.java index 833bcccb..3654755f 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseEvaluateServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseEvaluateServiceImpl.java @@ -14,6 +14,7 @@ import com.zdxt.code.mapper.EnforcementRegistrationMapper; import com.zdxt.code.mapper.EnterpriseEvaluateMapper; import com.zdxt.code.service.IEnterpriseEvaluateService; import com.zdxt.common.util.DateUtils; +import com.zdxt.common.util.StringUtils; import com.zdxt.common.zdxtFile.ZdxtFileCommon; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -92,6 +93,12 @@ public class EnterpriseEvaluateServiceImpl implements IEnterpriseEvaluateService enterpriseEvaluate.setEnterpriseName(enforcementRegistration.getEnterpriseName()); enterpriseEvaluate.setEnterpriseNumber(enforcementRegistration.getEnterpriseNumber()); } + //批次ID不为空，则判断为联合执法 + if(StringUtils.isNotEmpty(enforcementRegistration.getUniteCheck())){ + enterpriseEvaluate.setBatchId(enforcementRegistration.getUniteCheck()); + } + + int i = enterpriseEvaluateMapper.insertEnterpriseEvaluate(enterpriseEvaluate); if(i > 0 && enterpriseEvaluate.getFileList().size() > 0){ diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseEvaluateMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseEvaluateMapper.xml index a5a3b918..9defe7b4 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseEvaluateMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseEvaluateMapper.xml @@ -63,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" check_effect, check_quality, service_experience, + batch_id, #{id}, @@ -77,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{checkEffect}, #{checkQuality}, #{serviceExperience}, + #{batchId},