From 6cb78673f9809a4d7f41de50fd89f69b74a93ab0 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Wed, 2 Apr 2025 10:18:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9Fbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/service/impl/AppServiceImpl.java | 11 +++++----- .../service/impl/BusinessServiceImpl.java | 8 +++++++ .../impl/AdmissionRequestServiceImpl.java | 9 ++++---- .../impl/OutsourcingProServiceImpl.java | 21 ++++++++++--------- .../mapper/system/AdmissionRequestMapper.xml | 1 - .../mapper/system/SupervisionUnitMapper.xml | 4 ++-- 6 files changed, 30 insertions(+), 24 deletions(-) diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/impl/AppServiceImpl.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/impl/AppServiceImpl.java index 19969c7..a10b2bd 100644 --- a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/impl/AppServiceImpl.java +++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/impl/AppServiceImpl.java @@ -834,7 +834,7 @@ public class AppServiceImpl implements AppService { AjaxResult ajaxResult = AjaxResult.success(); //查询监理人员详细信息 SupervisorPerson bean = appMapper.listSupervisorPersonById(supervisorPerson); - setOtherData2(bean); + // setOtherData2(bean); //人脸照片 SysFileInfo fileInfo = new SysFileInfo(); fileInfo.setFileName("人脸照片.png"); @@ -844,7 +844,6 @@ public class AppServiceImpl implements AppService { fileInfo.setCreateTime(bean.getCreateTime()); fileInfo.setFileSize("0"); bean.setFacePhoto(Collections.singletonList(fileInfo)); - //查询体检文件 fileInfo = getPersonFileInfo(StaticVariableUtils.FIVE,StaticVariableUtils.THREE,StaticVariableUtils.ONE, supervisorPerson.getUuid()); @@ -870,10 +869,10 @@ public class AppServiceImpl implements AppService { @Override public List listSupervisorPerson(SupervisorPerson bean) { List list= appMapper.listSupervisorPerson(bean); - for (SupervisorPerson vo:list){ - setOtherData(vo); - - } +// for (SupervisorPerson vo:list){ +// setOtherData(vo); +// +// } return list; } diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java index 22273ea..37ccc8e 100644 --- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java +++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java @@ -467,6 +467,14 @@ public class BusinessServiceImpl implements BusinessService { userList.addAll(jlList); } } + if("03".equals(auditTask.getUserType())){ + if(StringUtils.isNotEmpty(contUserId)){ + userList.add(contUserId); + } + if(StringUtils.isNotEmpty(supUserId)){ + userList.add(supUserId); + } + } auditTask.setExamineId(newExamineId); auditTask.setExamineType(examineType); if("01".equals(auditTask.getUserType())){ diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/AdmissionRequestServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/AdmissionRequestServiceImpl.java index d66424d..aec99f7 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/AdmissionRequestServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/AdmissionRequestServiceImpl.java @@ -240,15 +240,14 @@ public class AdmissionRequestServiceImpl implements AdmissionRequestService { AdmissionRequest proUser = arMapper.getUserInToPro(bean); if(proUser!=null){ if(!"3".equals(proUser.getOutStatus())){ - return new AjaxResult(201,"该人员已在其他工程入场,清先出场后再入场"); + return new AjaxResult(201,"该人员已在其他工程入场,请先出场后再入场"); } } if ("".equals(bean.getConsUserId())) { - AdmissionRequest admissionRequest = arMapper.checkUserNameUnique(bean); - if (admissionRequest != null) { + if (admissionRequest != null && StringUtils.isNotEmpty(admissionRequest.getOutStatus()) ) { //已出场的 人员再次入场 - if("3".equals(admissionRequest.getOutStatus())){ + if( "3".equals(admissionRequest.getOutStatus())){ arMapper.delFileById(admissionRequest); id = String.valueOf(admissionRequest.getId()); uuid = admissionRequest.getUuid(); @@ -360,7 +359,7 @@ public class AdmissionRequestServiceImpl implements AdmissionRequestService { AjaxResult ajaxResult = AjaxResult.success(); //查询监理人员详细信息 AdmissionRequest admissionRequest = arMapper.getData(bean); - setOtherData3(admissionRequest); + // setOtherData3(admissionRequest); SysFileInfo fileInfo = new SysFileInfo(); if (StringUtils.isNotEmpty(admissionRequest.getFacePath())) { fileInfo.setName("人脸照片.png"); diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/OutsourcingProServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/OutsourcingProServiceImpl.java index adc7d16..b89de7f 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/OutsourcingProServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/OutsourcingProServiceImpl.java @@ -65,9 +65,9 @@ public class OutsourcingProServiceImpl implements OutsourcingProService { @Override public List listSupervisorPerson(SupervisorPerson bean) { List list= mapper.listSupervisorPerson(bean); - for (SupervisorPerson vo:list){ - setOtherData(vo); - } +// for (SupervisorPerson vo:list){ +// setOtherData(vo); +// } return list; } public void setOtherData(SupervisorPerson vo){ @@ -75,8 +75,9 @@ public class OutsourcingProServiceImpl implements OutsourcingProService { String idCard=mapper.getIdCardByPhone(vo.getPhone()); if(!StringHelper.isNullOrEmptyString(idCard)){ vo.setIdCard(idCard); - String sex=getSexByIdCar(idCard); - if(!StringHelper.isNullOrEmptyString(sex)){ + + if(StringHelper.isNullOrEmptyString(vo.getSex())){ + String sex=getSexByIdCar(idCard); vo.setSex(sex); } Integer age= IdcardUtil.getAgeByIdCard(idCard); @@ -94,7 +95,7 @@ public class OutsourcingProServiceImpl implements OutsourcingProService { vo.setIdCard(idCard); String sex=getSexByIdCar1(idCard); if(!StringHelper.isNullOrEmptyString(sex)){ - vo.setSex(sex); + // vo.setSex(sex); } Integer age= IdcardUtil.getAgeByIdCard(idCard); vo.setAge(age); @@ -141,7 +142,7 @@ public class OutsourcingProServiceImpl implements OutsourcingProService { AjaxResult ajaxResult = AjaxResult.success(); //查询监理人员详细信息 SupervisorPerson bean = mapper.listSupervisorPersonById(supervisorPerson); - setOtherData3(bean); + // setOtherData3(bean); //人脸照片 SysFileInfo fileInfo = new SysFileInfo(); if(!StringUtils.isEmpty(bean.getFaceUrl())){ @@ -362,9 +363,9 @@ public class OutsourcingProServiceImpl implements OutsourcingProService { subPerson.setUserId(userId); subPerson.setType("1"); List getConsPersonList = mapper.getSubPersonList(subPerson); - for (SubPerson vo:getConsPersonList){ - setOtherData2(vo); - } +// for (SubPerson vo:getConsPersonList){ +// setOtherData2(vo); +// } List list = mapper.getAnnotationsByTaskIdAndUserId(subPerson); // 使用哈希表存储注释列表，提高查找效率 Set annotationSet = new HashSet<>(list); diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml index 842d5cb..9974ae1 100644 --- a/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml +++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml @@ -715,7 +715,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update lk_cont_person set into_status = '0', - cons_name=#{consName}, out_status = '0', admission_date = null, departure_date = null, diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml index 658229a..70a295b 100644 --- a/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml +++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml @@ -201,10 +201,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and lps.status = #{status} - AND ppi.pro_name = #{proName} + AND ppi.pro_name like concat('%',#{proName},'%') - AND psi.sup_name = #{supName} + AND ppi.sup_name like concat('%',#{supName},'%') AND ppi.pro_id = #{proId}