From b3a108890cd928e07311c21c314444547ac44f03 Mon Sep 17 00:00:00 2001 From: weizhiqiang <> Date: Fri, 29 Jul 2022 17:00:55 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=99=84=E4=BB=B6=E3=80=91=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E8=B0=83=E6=95=B4=EF=BC=8C=E6=96=B9=E4=BE=BF=E5=90=8E?= =?UTF-8?q?=E6=9C=9F=E6=8B=86=E5=88=86=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eve/service/SysEnclosureService.java | 8 ------- .../service/impl/SysEnclosureServiceImpl.java | 9 +------- .../impl/SysStaffArchivesServiceImpl.java | 5 +++-- .../impl/SysStaffCertificateServiceImpl.java | 5 +++-- .../impl/SysStaffContractServiceImpl.java | 5 +++-- .../impl/SysStaffEducationServiceImpl.java | 6 ++--- .../impl/SysStaffFamilyServiceImpl.java | 5 +++-- .../impl/SysStaffJobResumeServiceImpl.java | 5 +++-- .../impl/SysStaffLanguageServiceImpl.java | 5 +++-- .../impl/SysStaffRewardPunishServiceImpl.java | 5 +++-- .../eve/service/impl/JobDiaryServiceImpl.java | 22 +++++++++---------- .../impl/SealServicePhoneServiceImpl.java | 6 ++--- .../WagesSocialSecurityFundServiceImpl.java | 20 ++++++++--------- .../service/impl/SysWorkPlanServiceImpl.java | 11 +++++----- 14 files changed, 55 insertions(+), 62 deletions(-) diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/SysEnclosureService.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/SysEnclosureService.java index 927d5c3b..49a74c44 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/SysEnclosureService.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/SysEnclosureService.java @@ -48,12 +48,4 @@ public interface SysEnclosureService { void queryEnclosureInfo(InputObject inputObject, OutputObject outputObject); - /** - * 根据ids(逗号隔开)获取多个附件信息 - * - * @param enclosureInfoIds ids(逗号隔开) - * @return - */ - List> queryEnclosureInfoListByIds(String enclosureInfoIds); - } diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SysEnclosureServiceImpl.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SysEnclosureServiceImpl.java index 0bcdd320..662643b7 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SysEnclosureServiceImpl.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SysEnclosureServiceImpl.java @@ -547,16 +547,9 @@ public class SysEnclosureServiceImpl implements SysEnclosureService { @Override public void queryEnclosureInfo(InputObject inputObject, OutputObject outputObject) { Map map = inputObject.getParams(); - String enclosureInfoIds = map.get("enclosureInfoIds").toString(); - List> beans = queryEnclosureInfoListByIds(enclosureInfoIds); + List> beans = sysEnclosureDao.queryEnclosureInfo(map.get("enclosureInfoIds").toString()); outputObject.setBeans(beans); outputObject.settotal(beans.size()); } - @Override - public List> queryEnclosureInfoListByIds(String enclosureInfoIds) { - List> beans = sysEnclosureDao.queryEnclosureInfo(enclosureInfoIds); - return beans; - } - } diff --git a/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffArchivesServiceImpl.java b/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffArchivesServiceImpl.java index 4a88807c..3b0d84f8 100644 --- a/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffArchivesServiceImpl.java +++ b/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffArchivesServiceImpl.java @@ -12,6 +12,7 @@ import com.skyeye.common.util.DateUtil; import com.skyeye.common.util.ToolUtil; import com.skyeye.eve.dao.SysEnclosureDao; import com.skyeye.eve.dao.SysStaffArchivesDao; +import com.skyeye.eve.service.IEnclosureService; import com.skyeye.eve.service.ISysDictDataService; import com.skyeye.eve.service.SysStaffArchivesService; import org.springframework.beans.factory.annotation.Autowired; @@ -36,7 +37,7 @@ public class SysStaffArchivesServiceImpl implements SysStaffArchivesService { private SysStaffArchivesDao sysStaffArchivesDao; @Autowired - private SysEnclosureDao sysEnclosureDao; + private IEnclosureService iEnclosureService; @Autowired private ISysDictDataService iSysDictDataService; @@ -140,7 +141,7 @@ public class SysStaffArchivesServiceImpl implements SysStaffArchivesService { iSysDictDataService.getDictDataNameByIdBean(archivesMation, "educationId", "educationName"); // 附件 if (archivesMation.containsKey("enclosure") && !ToolUtil.isBlank(archivesMation.get("enclosure").toString())) { - List> beans = sysEnclosureDao.queryEnclosureInfo(archivesMation.get("enclosure").toString()); + List> beans = iEnclosureService.queryEnclosureInfoByIds(archivesMation.get("enclosure").toString()); archivesMation.put("enclosureInfo", beans); } outputObject.setBean(archivesMation); diff --git a/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffCertificateServiceImpl.java b/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffCertificateServiceImpl.java index 93e5b57e..7ef71898 100644 --- a/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffCertificateServiceImpl.java +++ b/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffCertificateServiceImpl.java @@ -13,6 +13,7 @@ import com.skyeye.common.util.ToolUtil; import com.skyeye.eve.dao.SysEnclosureDao; import com.skyeye.eve.dao.SysStaffCertificateDao; import com.skyeye.eve.entity.ehr.common.PointStaffQueryDo; +import com.skyeye.eve.service.IEnclosureService; import com.skyeye.eve.service.ISysDictDataService; import com.skyeye.eve.service.SysStaffCertificateService; import org.springframework.beans.factory.annotation.Autowired; @@ -37,7 +38,7 @@ public class SysStaffCertificateServiceImpl implements SysStaffCertificateServic private SysStaffCertificateDao sysStaffCertificateDao; @Autowired - private SysEnclosureDao sysEnclosureDao; + private IEnclosureService iEnclosureService; @Autowired private ISysDictDataService iSysDictDataService; @@ -88,7 +89,7 @@ public class SysStaffCertificateServiceImpl implements SysStaffCertificateServic iSysDictDataService.getDictDataNameByIdBean(certificate, "typeId", "certificateTypeName"); // 附件 if (certificate.containsKey("enclosure") && !ToolUtil.isBlank(certificate.get("enclosure").toString())) { - List> beans = sysEnclosureDao.queryEnclosureInfo(certificate.get("enclosure").toString()); + List> beans = iEnclosureService.queryEnclosureInfoByIds(certificate.get("enclosure").toString()); certificate.put("enclosureInfo", beans); } outputObject.setBean(certificate); diff --git a/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffContractServiceImpl.java b/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffContractServiceImpl.java index a5d59758..df789792 100644 --- a/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffContractServiceImpl.java +++ b/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffContractServiceImpl.java @@ -13,6 +13,7 @@ import com.skyeye.common.util.ToolUtil; import com.skyeye.eve.dao.SysEnclosureDao; import com.skyeye.eve.dao.SysStaffContractDao; import com.skyeye.eve.entity.ehr.common.PointStaffQueryDo; +import com.skyeye.eve.service.IEnclosureService; import com.skyeye.eve.service.ISysDictDataService; import com.skyeye.eve.service.SysStaffContractService; import org.springframework.beans.factory.annotation.Autowired; @@ -37,7 +38,7 @@ public class SysStaffContractServiceImpl implements SysStaffContractService { private SysStaffContractDao sysStaffContractDao; @Autowired - private SysEnclosureDao sysEnclosureDao; + private IEnclosureService iEnclosureService; @Autowired private ISysDictDataService iSysDictDataService; @@ -109,7 +110,7 @@ public class SysStaffContractServiceImpl implements SysStaffContractService { if (certificate != null && !certificate.isEmpty()) { // 附件 if (certificate.containsKey("enclosure") && !ToolUtil.isBlank(certificate.get("enclosure").toString())) { - List> beans = sysEnclosureDao.queryEnclosureInfo(certificate.get("enclosure").toString()); + List> beans = iEnclosureService.queryEnclosureInfoByIds(certificate.get("enclosure").toString()); certificate.put("enclosureInfo", beans); } outputObject.setBean(certificate); diff --git a/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffEducationServiceImpl.java b/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffEducationServiceImpl.java index 8de23f79..a1da803d 100644 --- a/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffEducationServiceImpl.java +++ b/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffEducationServiceImpl.java @@ -10,9 +10,9 @@ import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; import com.skyeye.common.util.DateUtil; import com.skyeye.common.util.ToolUtil; -import com.skyeye.eve.dao.SysEnclosureDao; import com.skyeye.eve.dao.SysStaffEducationDao; import com.skyeye.eve.entity.ehr.common.PointStaffQueryDo; +import com.skyeye.eve.service.IEnclosureService; import com.skyeye.eve.service.ISysDictDataService; import com.skyeye.eve.service.SysStaffEducationService; import org.springframework.beans.factory.annotation.Autowired; @@ -37,7 +37,7 @@ public class SysStaffEducationServiceImpl implements SysStaffEducationService { private SysStaffEducationDao sysStaffEducationDao; @Autowired - private SysEnclosureDao sysEnclosureDao; + private IEnclosureService iEnclosureService; @Autowired private ISysDictDataService iSysDictDataService; @@ -92,7 +92,7 @@ public class SysStaffEducationServiceImpl implements SysStaffEducationService { iSysDictDataService.getDictDataNameByIdBean(certificate, "schoolNature", "schoolNatureName"); // 附件 if (certificate.containsKey("enclosure") && !ToolUtil.isBlank(certificate.get("enclosure").toString())) { - List> beans = sysEnclosureDao.queryEnclosureInfo(certificate.get("enclosure").toString()); + List> beans = iEnclosureService.queryEnclosureInfoByIds(certificate.get("enclosure").toString()); certificate.put("enclosureInfo", beans); } outputObject.setBean(certificate); diff --git a/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffFamilyServiceImpl.java b/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffFamilyServiceImpl.java index 5596eda2..69586460 100644 --- a/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffFamilyServiceImpl.java +++ b/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffFamilyServiceImpl.java @@ -13,6 +13,7 @@ import com.skyeye.common.util.ToolUtil; import com.skyeye.eve.dao.SysEnclosureDao; import com.skyeye.eve.dao.SysStaffFamilyDao; import com.skyeye.eve.entity.ehr.common.PointStaffQueryDo; +import com.skyeye.eve.service.IEnclosureService; import com.skyeye.eve.service.ISysDictDataService; import com.skyeye.eve.service.SysStaffFamilyService; import org.springframework.beans.factory.annotation.Autowired; @@ -37,7 +38,7 @@ public class SysStaffFamilyServiceImpl implements SysStaffFamilyService { private SysStaffFamilyDao sysStaffFamilyDao; @Autowired - private SysEnclosureDao sysEnclosureDao; + private IEnclosureService iEnclosureService; @Autowired private ISysDictDataService iSysDictDataService; @@ -92,7 +93,7 @@ public class SysStaffFamilyServiceImpl implements SysStaffFamilyService { iSysDictDataService.getDictDataNameByIdBean(certificate, "politicId", "politicName"); // 附件 if (certificate.containsKey("enclosure") && !ToolUtil.isBlank(certificate.get("enclosure").toString())) { - List> beans = sysEnclosureDao.queryEnclosureInfo(certificate.get("enclosure").toString()); + List> beans = iEnclosureService.queryEnclosureInfoByIds(certificate.get("enclosure").toString()); certificate.put("enclosureInfo", beans); } outputObject.setBean(certificate); diff --git a/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffJobResumeServiceImpl.java b/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffJobResumeServiceImpl.java index cdd91903..e7a3ea70 100644 --- a/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffJobResumeServiceImpl.java +++ b/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffJobResumeServiceImpl.java @@ -13,6 +13,7 @@ import com.skyeye.common.util.ToolUtil; import com.skyeye.eve.dao.SysEnclosureDao; import com.skyeye.eve.dao.SysStaffJobResumeDao; import com.skyeye.eve.entity.ehr.common.PointStaffQueryDo; +import com.skyeye.eve.service.IEnclosureService; import com.skyeye.eve.service.SysStaffJobResumeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -36,7 +37,7 @@ public class SysStaffJobResumeServiceImpl implements SysStaffJobResumeService { private SysStaffJobResumeDao sysStaffJobResumeDao; @Autowired - private SysEnclosureDao sysEnclosureDao; + private IEnclosureService iEnclosureService; /** * 查询所有工作履历列表 @@ -82,7 +83,7 @@ public class SysStaffJobResumeServiceImpl implements SysStaffJobResumeService { if (certificate != null && !certificate.isEmpty()) { // 附件 if (certificate.containsKey("enclosure") && !ToolUtil.isBlank(certificate.get("enclosure").toString())) { - List> beans = sysEnclosureDao.queryEnclosureInfo(certificate.get("enclosure").toString()); + List> beans = iEnclosureService.queryEnclosureInfoByIds(certificate.get("enclosure").toString()); certificate.put("enclosureInfo", beans); } outputObject.setBean(certificate); diff --git a/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffLanguageServiceImpl.java b/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffLanguageServiceImpl.java index 278a74ee..a5c4d05d 100644 --- a/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffLanguageServiceImpl.java +++ b/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffLanguageServiceImpl.java @@ -14,6 +14,7 @@ import com.skyeye.eve.dao.SysEnclosureDao; import com.skyeye.eve.dao.SysStaffLanguageDao; import com.skyeye.eve.entity.ehr.common.PointStaffQueryDo; import com.skyeye.eve.entity.ehr.language.SysStaffLanguageQueryDo; +import com.skyeye.eve.service.IEnclosureService; import com.skyeye.eve.service.ISysDictDataService; import com.skyeye.eve.service.SysDictDataService; import com.skyeye.eve.service.SysStaffLanguageService; @@ -39,7 +40,7 @@ public class SysStaffLanguageServiceImpl implements SysStaffLanguageService { private SysStaffLanguageDao sysStaffLanguageDao; @Autowired - private SysEnclosureDao sysEnclosureDao; + private IEnclosureService iEnclosureService; @Autowired private ISysDictDataService iSysDictDataService; @@ -90,7 +91,7 @@ public class SysStaffLanguageServiceImpl implements SysStaffLanguageService { iSysDictDataService.getDictDataNameByIdBean(certificate, "languageId", "languageTypeName"); // 附件 if (certificate.containsKey("enclosure") && !ToolUtil.isBlank(certificate.get("enclosure").toString())) { - List> beans = sysEnclosureDao.queryEnclosureInfo(certificate.get("enclosure").toString()); + List> beans = iEnclosureService.queryEnclosureInfoByIds(certificate.get("enclosure").toString()); certificate.put("enclosureInfo", beans); } outputObject.setBean(certificate); diff --git a/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffRewardPunishServiceImpl.java b/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffRewardPunishServiceImpl.java index 1e8c035c..938c069b 100644 --- a/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffRewardPunishServiceImpl.java +++ b/skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffRewardPunishServiceImpl.java @@ -13,6 +13,7 @@ import com.skyeye.common.util.ToolUtil; import com.skyeye.eve.dao.SysEnclosureDao; import com.skyeye.eve.dao.SysStaffRewardPunishDao; import com.skyeye.eve.entity.ehr.common.PointStaffQueryDo; +import com.skyeye.eve.service.IEnclosureService; import com.skyeye.eve.service.ISysDictDataService; import com.skyeye.eve.service.SysStaffRewardPunishService; import org.springframework.beans.factory.annotation.Autowired; @@ -37,7 +38,7 @@ public class SysStaffRewardPunishServiceImpl implements SysStaffRewardPunishServ private SysStaffRewardPunishDao sysStaffRewardPunishDao; @Autowired - private SysEnclosureDao sysEnclosureDao; + private IEnclosureService iEnclosureService; @Autowired private ISysDictDataService iSysDictDataService; @@ -91,7 +92,7 @@ public class SysStaffRewardPunishServiceImpl implements SysStaffRewardPunishServ iSysDictDataService.getDictDataNameByIdBean(certificate, "typeId", "rewardPunishTypeName"); // 附件 if (certificate.containsKey("enclosure") && !ToolUtil.isBlank(certificate.get("enclosure").toString())) { - List> beans = sysEnclosureDao.queryEnclosureInfo(certificate.get("enclosure").toString()); + List> beans = iEnclosureService.queryEnclosureInfoByIds(certificate.get("enclosure").toString()); certificate.put("enclosureInfo", beans); } outputObject.setBean(certificate); diff --git a/skyeye-promote/skyeye-jobdiary/src/main/java/com/skyeye/eve/service/impl/JobDiaryServiceImpl.java b/skyeye-promote/skyeye-jobdiary/src/main/java/com/skyeye/eve/service/impl/JobDiaryServiceImpl.java index dfaef083..588420d6 100644 --- a/skyeye-promote/skyeye-jobdiary/src/main/java/com/skyeye/eve/service/impl/JobDiaryServiceImpl.java +++ b/skyeye-promote/skyeye-jobdiary/src/main/java/com/skyeye/eve/service/impl/JobDiaryServiceImpl.java @@ -12,7 +12,7 @@ import com.skyeye.common.util.DataCommonUtil; import com.skyeye.common.util.DateUtil; import com.skyeye.common.util.ToolUtil; import com.skyeye.eve.dao.JobDiaryDao; -import com.skyeye.eve.dao.SysEnclosureDao; +import com.skyeye.eve.service.IEnclosureService; import com.skyeye.eve.service.JobDiaryService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -38,7 +38,7 @@ public class JobDiaryServiceImpl implements JobDiaryService { private JobDiaryDao jobDiaryDao; @Autowired - private SysEnclosureDao sysEnclosureDao; + private IEnclosureService iEnclosureService; /** * 遍历我收到的日志 @@ -122,7 +122,7 @@ public class JobDiaryServiceImpl implements JobDiaryService { } Map bean = jobDiaryDao.queryJobDiaryDetails(map); if (!ToolUtil.isBlank(bean.get("enclosureInfo").toString())) { - bean.put("enclosureInfo", sysEnclosureDao.queryEnclosureInfo(bean.get("enclosureInfo").toString())); + bean.put("enclosureInfo", iEnclosureService.queryEnclosureInfoByIds(bean.get("enclosureInfo").toString())); } outputObject.setBean(bean); outputObject.settotal(1); @@ -193,7 +193,7 @@ public class JobDiaryServiceImpl implements JobDiaryService { Map map = inputObject.getParams(); Map bean = jobDiaryDao.selectMysendDetails(map); if (!ToolUtil.isBlank(bean.get("enclosureInfo").toString())) { - bean.put("enclosureInfo", sysEnclosureDao.queryEnclosureInfo(bean.get("enclosureInfo").toString())); + bean.put("enclosureInfo", iEnclosureService.queryEnclosureInfoByIds(bean.get("enclosureInfo").toString())); } outputObject.setBean(bean); outputObject.settotal(1); @@ -261,7 +261,7 @@ public class JobDiaryServiceImpl implements JobDiaryService { Map map = inputObject.getParams(); Map bean = jobDiaryDao.selectMysendWeekDetails(map); if (!ToolUtil.isBlank(bean.get("enclosureInfo").toString())) { - bean.put("enclosureInfo", sysEnclosureDao.queryEnclosureInfo(bean.get("enclosureInfo").toString())); + bean.put("enclosureInfo", iEnclosureService.queryEnclosureInfoByIds(bean.get("enclosureInfo").toString())); } outputObject.setBean(bean); outputObject.settotal(1); @@ -284,7 +284,7 @@ public class JobDiaryServiceImpl implements JobDiaryService { } Map bean = jobDiaryDao.queryWeekJobDiaryDetails(map); if (!ToolUtil.isBlank(bean.get("enclosureInfo").toString())) { - bean.put("enclosureInfo", sysEnclosureDao.queryEnclosureInfo(bean.get("enclosureInfo").toString())); + bean.put("enclosureInfo", iEnclosureService.queryEnclosureInfoByIds(bean.get("enclosureInfo").toString())); } outputObject.setBean(bean); outputObject.settotal(1); @@ -332,7 +332,7 @@ public class JobDiaryServiceImpl implements JobDiaryService { Map map = inputObject.getParams(); Map bean = jobDiaryDao.selectMysendMonthDetails(map); if (!ToolUtil.isBlank(bean.get("enclosureInfo").toString())) { - bean.put("enclosureInfo", sysEnclosureDao.queryEnclosureInfo(bean.get("enclosureInfo").toString())); + bean.put("enclosureInfo", iEnclosureService.queryEnclosureInfoByIds(bean.get("enclosureInfo").toString())); } outputObject.setBean(bean); outputObject.settotal(1); @@ -355,7 +355,7 @@ public class JobDiaryServiceImpl implements JobDiaryService { } Map bean = jobDiaryDao.queryMonthJobDiaryDetails(map); if (!ToolUtil.isBlank(bean.get("enclosureInfo").toString())) { - bean.put("enclosureInfo", sysEnclosureDao.queryEnclosureInfo(bean.get("enclosureInfo").toString())); + bean.put("enclosureInfo", iEnclosureService.queryEnclosureInfoByIds(bean.get("enclosureInfo").toString())); } outputObject.setBean(bean); outputObject.settotal(1); @@ -392,7 +392,7 @@ public class JobDiaryServiceImpl implements JobDiaryService { Map map = inputObject.getParams(); Map bean = jobDiaryDao.queryJobDiaryDayMysendToEdit(map); if (!ToolUtil.isBlank(bean.get("enclosureInfo").toString())) { - bean.put("enclosureInfo", sysEnclosureDao.queryEnclosureInfo(bean.get("enclosureInfo").toString())); + bean.put("enclosureInfo", iEnclosureService.queryEnclosureInfoByIds(bean.get("enclosureInfo").toString())); } bean.put("userInfo", jobDiaryDao.queryJobDiaryDayReceivedUserInfoById(map)); outputObject.setBean(bean); @@ -441,7 +441,7 @@ public class JobDiaryServiceImpl implements JobDiaryService { Map map = inputObject.getParams(); Map bean = jobDiaryDao.queryWeekJobDiaryDayMysendToEdit(map); if (!ToolUtil.isBlank(bean.get("enclosureInfo").toString())) { - bean.put("enclosureInfo", sysEnclosureDao.queryEnclosureInfo(bean.get("enclosureInfo").toString())); + bean.put("enclosureInfo", iEnclosureService.queryEnclosureInfoByIds(bean.get("enclosureInfo").toString())); } bean.put("userInfo", jobDiaryDao.queryWeekJobDiaryDayReceivedUserInfoById(map)); outputObject.setBean(bean); @@ -490,7 +490,7 @@ public class JobDiaryServiceImpl implements JobDiaryService { Map map = inputObject.getParams(); Map bean = jobDiaryDao.queryMonthJobDiaryDayMysendToEdit(map); if (!ToolUtil.isBlank(bean.get("enclosureInfo").toString())) { - bean.put("enclosureInfo", sysEnclosureDao.queryEnclosureInfo(bean.get("enclosureInfo").toString())); + bean.put("enclosureInfo", iEnclosureService.queryEnclosureInfoByIds(bean.get("enclosureInfo").toString())); } bean.put("userInfo", jobDiaryDao.queryMonthJobDiaryDayReceivedUserInfoById(map)); outputObject.setBean(bean); diff --git a/skyeye-promote/skyeye-user-phone/src/main/java/com/skyeye/service/impl/SealServicePhoneServiceImpl.java b/skyeye-promote/skyeye-user-phone/src/main/java/com/skyeye/service/impl/SealServicePhoneServiceImpl.java index 3e110a58..e8e75f0e 100644 --- a/skyeye-promote/skyeye-user-phone/src/main/java/com/skyeye/service/impl/SealServicePhoneServiceImpl.java +++ b/skyeye-promote/skyeye-user-phone/src/main/java/com/skyeye/service/impl/SealServicePhoneServiceImpl.java @@ -11,7 +11,7 @@ import com.skyeye.common.object.OutputObject; import com.skyeye.common.util.DateUtil; import com.skyeye.common.util.ToolUtil; import com.skyeye.dao.SealServicePhoneDao; -import com.skyeye.eve.dao.SysEnclosureDao; +import com.skyeye.eve.service.IEnclosureService; import com.skyeye.service.SealServicePhoneService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,7 +27,7 @@ public class SealServicePhoneServiceImpl implements SealServicePhoneService { private SealServicePhoneDao sealServicePhoneDao; @Autowired - private SysEnclosureDao sysEnclosureDao; + private IEnclosureService iEnclosureService; /** * 手机端查询不同状态下的工单数量 @@ -89,7 +89,7 @@ public class SealServicePhoneServiceImpl implements SealServicePhoneService { Map map = inputObject.getParams(); List> beans = sealServicePhoneDao.queryFeedBackList(map); for (Map item : beans) { - item.put("enclosureInfo", sysEnclosureDao.queryEnclosureInfo(item.get("enclosureInfo").toString())); + item.put("enclosureInfo", iEnclosureService.queryEnclosureInfoByIds(item.get("enclosureInfo").toString())); } outputObject.setBeans(beans); outputObject.settotal(beans.size()); diff --git a/skyeye-promote/skyeye-wages/src/main/java/com/skyeye/eve/service/impl/WagesSocialSecurityFundServiceImpl.java b/skyeye-promote/skyeye-wages/src/main/java/com/skyeye/eve/service/impl/WagesSocialSecurityFundServiceImpl.java index f765f75e..507143f9 100644 --- a/skyeye-promote/skyeye-wages/src/main/java/com/skyeye/eve/service/impl/WagesSocialSecurityFundServiceImpl.java +++ b/skyeye-promote/skyeye-wages/src/main/java/com/skyeye/eve/service/impl/WagesSocialSecurityFundServiceImpl.java @@ -12,9 +12,9 @@ import com.skyeye.common.object.OutputObject; import com.skyeye.common.util.DataCommonUtil; import com.skyeye.common.util.DateUtil; import com.skyeye.common.util.ToolUtil; -import com.skyeye.eve.dao.SysEnclosureDao; import com.skyeye.eve.dao.WagesSocialSecurityFundApplicableObjectsDao; import com.skyeye.eve.dao.WagesSocialSecurityFundDao; +import com.skyeye.eve.service.IEnclosureService; import com.skyeye.eve.service.WagesSocialSecurityFundService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,19 +39,19 @@ public class WagesSocialSecurityFundServiceImpl implements WagesSocialSecurityFu private WagesSocialSecurityFundApplicableObjectsDao wagesSocialSecurityFundApplicableObjectsDao; @Autowired - private SysEnclosureDao sysEnclosureDao; + private IEnclosureService iEnclosureService; /** * 社保公积金状态 */ - public static enum STATE { + public enum State { START_UP(1, "启用"), START_DOWN(2, "禁用"), START_DELETE(3, "删除"); private int state; private String name; - STATE(int state, String name) { + State(int state, String name) { this.state = state; this.name = name; } @@ -95,7 +95,7 @@ public class WagesSocialSecurityFundServiceImpl implements WagesSocialSecurityFu outputObject.setreturnMessage("The same name exists, please replace it."); return; } - map.put("state", STATE.START_UP.getState()); + map.put("state", State.START_UP.getState()); DataCommonUtil.setCommonData(map, inputObject.getLogParams().get("id").toString()); wagesSocialSecurityFundDao.insertWagesSocialSecurityFundMation(map); // 处理社保公积金使用对象信息 @@ -138,7 +138,7 @@ public class WagesSocialSecurityFundServiceImpl implements WagesSocialSecurityFu outputObject.setreturnMessage("The data does not exist."); return; } - bean.put("enclosureInfo", sysEnclosureDao.queryEnclosureInfo(bean.get("enclosure").toString())); + bean.put("enclosureInfo", iEnclosureService.queryEnclosureInfoByIds(bean.get("enclosure").toString())); getWagesSocialSecurityFundApplicableObjects(bean, id); outputObject.setBean(bean); outputObject.settotal(1); @@ -221,7 +221,7 @@ public class WagesSocialSecurityFundServiceImpl implements WagesSocialSecurityFu @Override public void deleteWagesSocialSecurityFundMationById(InputObject inputObject, OutputObject outputObject) { Map map = inputObject.getParams(); - wagesSocialSecurityFundDao.editWagesSocialSecurityFundStateMationById(map.get("id").toString(), STATE.START_DELETE.getState()); + wagesSocialSecurityFundDao.editWagesSocialSecurityFundStateMationById(map.get("id").toString(), State.START_DELETE.getState()); } /** @@ -233,7 +233,7 @@ public class WagesSocialSecurityFundServiceImpl implements WagesSocialSecurityFu @Override public void enableWagesSocialSecurityFundMationById(InputObject inputObject, OutputObject outputObject) { Map map = inputObject.getParams(); - wagesSocialSecurityFundDao.editWagesSocialSecurityFundStateMationById(map.get("id").toString(), STATE.START_UP.getState()); + wagesSocialSecurityFundDao.editWagesSocialSecurityFundStateMationById(map.get("id").toString(), State.START_UP.getState()); } /** @@ -245,7 +245,7 @@ public class WagesSocialSecurityFundServiceImpl implements WagesSocialSecurityFu @Override public void disableWagesSocialSecurityFundMationById(InputObject inputObject, OutputObject outputObject) { Map map = inputObject.getParams(); - wagesSocialSecurityFundDao.editWagesSocialSecurityFundStateMationById(map.get("id").toString(), STATE.START_DOWN.getState()); + wagesSocialSecurityFundDao.editWagesSocialSecurityFundStateMationById(map.get("id").toString(), State.START_DOWN.getState()); } /** @@ -263,7 +263,7 @@ public class WagesSocialSecurityFundServiceImpl implements WagesSocialSecurityFu outputObject.setreturnMessage("The data does not exist."); return; } - bean.put("enclosureInfo", sysEnclosureDao.queryEnclosureInfo(bean.get("enclosure").toString())); + bean.put("enclosureInfo", iEnclosureService.queryEnclosureInfoByIds(bean.get("enclosure").toString())); getWagesSocialSecurityFundApplicableObjects(bean, id); outputObject.setBean(bean); outputObject.settotal(1); diff --git a/skyeye-promote/skyeye-workplan/src/main/java/com/skyeye/eve/service/impl/SysWorkPlanServiceImpl.java b/skyeye-promote/skyeye-workplan/src/main/java/com/skyeye/eve/service/impl/SysWorkPlanServiceImpl.java index c5350d9e..c2310e50 100644 --- a/skyeye-promote/skyeye-workplan/src/main/java/com/skyeye/eve/service/impl/SysWorkPlanServiceImpl.java +++ b/skyeye-promote/skyeye-workplan/src/main/java/com/skyeye/eve/service/impl/SysWorkPlanServiceImpl.java @@ -19,6 +19,7 @@ import com.skyeye.common.util.ToolUtil; import com.skyeye.eve.dao.ScheduleDayDao; import com.skyeye.eve.dao.SysWorkPlanDao; import com.skyeye.eve.entity.workplan.SysWorkPlanQueryDo; +import com.skyeye.eve.service.IEnclosureService; import com.skyeye.eve.service.ScheduleDayService; import com.skyeye.eve.service.SysEnclosureService; import com.skyeye.eve.service.SysWorkPlanService; @@ -61,7 +62,7 @@ public class SysWorkPlanServiceImpl implements SysWorkPlanService { private JobMateMationService jobMateMationService; @Autowired - private SysEnclosureService sysEnclosureService; + private IEnclosureService iEnclosureService; private static final String MESSAGE_TITLE = "计划提醒"; @@ -501,7 +502,7 @@ public class SysWorkPlanServiceImpl implements SysWorkPlanService { // 获取计划执行人信息 List> executors = sysWorkPlanDao.querySysWorkPlanExecutorsToEditById(map); // 获取附件信息 - List> enclosures = sysEnclosureService.queryEnclosureInfoListByIds(bean.get("enclosureInfo").toString()); + List> enclosures = iEnclosureService.queryEnclosureInfoByIds(bean.get("enclosureInfo").toString()); bean.put("executors", executors); bean.put("enclosures", enclosures); outputObject.setBean(bean); @@ -664,10 +665,10 @@ public class SysWorkPlanServiceImpl implements SysWorkPlanService { Map bean = sysWorkPlanDao.querySysWorkPlanDetailsById(map.get("id").toString(), map.get("executorId").toString()); if (bean != null && !bean.isEmpty()) { bean.put("planCycle", WorkPlanConstants.SysWorkPlan.getClockInName(bean.get("planCycle").toString())); - //获取计划执行人信息 + // 获取计划执行人信息 List> executors = sysWorkPlanDao.querySysWorkPlanExecutorsToEditById(map); - //获取附件信息 - List> enclosures = sysEnclosureService.queryEnclosureInfoListByIds(bean.get("enclosureInfo").toString()); + // 获取附件信息 + List> enclosures = iEnclosureService.queryEnclosureInfoByIds(bean.get("enclosureInfo").toString()); bean.put("executors", executors); bean.put("enclosures", enclosures); outputObject.setBean(bean);