weizhiqiang1995/erp-pro
1
1
Fork 0
mirror of https://github.com/weizhiqiang1995/erp-pro.git synced 2025-02-20 21:33:10 +08:00
Code Issues Projects Releases Packages Wiki Activity

【附件】附件调整，方便后期拆分服务

Browse source
This commit is contained in:
weizhiqiang 2022-07-29 17:00:55 +08:00
parent a469c45ef9
commit b3a108890c
14 changed files with 55 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/SysEnclosureService.java
View file

@ -48,12 +48,4 @@ public interface SysEnclosureService {
void queryEnclosureInfo(InputObject inputObject, OutputObject outputObject);
/**
* 根据ids(逗号隔开)获取多个附件信息
*
* @param enclosureInfoIds ids(逗号隔开)
* @return
*/
List<Map<String, Object>> queryEnclosureInfoListByIds(String enclosureInfoIds);
}

9
skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SysEnclosureServiceImpl.java
View file

@ -547,16 +547,9 @@ public class SysEnclosureServiceImpl implements SysEnclosureService {
@Override
public void queryEnclosureInfo(InputObject inputObject, OutputObject outputObject) {
Map<String, Object> map = inputObject.getParams();
String enclosureInfoIds = map.get("enclosureInfoIds").toString();
List<Map<String, Object>> beans = queryEnclosureInfoListByIds(enclosureInfoIds);
List<Map<String, Object>> beans = sysEnclosureDao.queryEnclosureInfo(map.get("enclosureInfoIds").toString());
outputObject.setBeans(beans);
outputObject.settotal(beans.size());
}
@Override
public List<Map<String, Object>> queryEnclosureInfoListByIds(String enclosureInfoIds) {
List<Map<String, Object>> beans = sysEnclosureDao.queryEnclosureInfo(enclosureInfoIds);
return beans;
}
}

5
skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffArchivesServiceImpl.java
View file

@ -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<Map<String, Object>> beans = sysEnclosureDao.queryEnclosureInfo(archivesMation.get("enclosure").toString());
List<Map<String, Object>> beans = iEnclosureService.queryEnclosureInfoByIds(archivesMation.get("enclosure").toString());
archivesMation.put("enclosureInfo", beans);
}
outputObject.setBean(archivesMation);

5
skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffCertificateServiceImpl.java
View file

@ -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<Map<String, Object>> beans = sysEnclosureDao.queryEnclosureInfo(certificate.get("enclosure").toString());
List<Map<String, Object>> beans = iEnclosureService.queryEnclosureInfoByIds(certificate.get("enclosure").toString());
certificate.put("enclosureInfo", beans);
}
outputObject.setBean(certificate);

5
skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffContractServiceImpl.java
View file

@ -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<Map<String, Object>> beans = sysEnclosureDao.queryEnclosureInfo(certificate.get("enclosure").toString());
List<Map<String, Object>> beans = iEnclosureService.queryEnclosureInfoByIds(certificate.get("enclosure").toString());
certificate.put("enclosureInfo", beans);
}
outputObject.setBean(certificate);

6
skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffEducationServiceImpl.java
View file

@ -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<Map<String, Object>> beans = sysEnclosureDao.queryEnclosureInfo(certificate.get("enclosure").toString());
List<Map<String, Object>> beans = iEnclosureService.queryEnclosureInfoByIds(certificate.get("enclosure").toString());
certificate.put("enclosureInfo", beans);
}
outputObject.setBean(certificate);

5
skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffFamilyServiceImpl.java
View file

@ -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<Map<String, Object>> beans = sysEnclosureDao.queryEnclosureInfo(certificate.get("enclosure").toString());
List<Map<String, Object>> beans = iEnclosureService.queryEnclosureInfoByIds(certificate.get("enclosure").toString());
certificate.put("enclosureInfo", beans);
}
outputObject.setBean(certificate);

5
skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffJobResumeServiceImpl.java
View file

@ -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<Map<String, Object>> beans = sysEnclosureDao.queryEnclosureInfo(certificate.get("enclosure").toString());
List<Map<String, Object>> beans = iEnclosureService.queryEnclosureInfoByIds(certificate.get("enclosure").toString());
certificate.put("enclosureInfo", beans);
}
outputObject.setBean(certificate);

5
skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffLanguageServiceImpl.java
View file

@ -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<Map<String, Object>> beans = sysEnclosureDao.queryEnclosureInfo(certificate.get("enclosure").toString());
List<Map<String, Object>> beans = iEnclosureService.queryEnclosureInfoByIds(certificate.get("enclosure").toString());
certificate.put("enclosureInfo", beans);
}
outputObject.setBean(certificate);

5
skyeye-promote/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffRewardPunishServiceImpl.java
View file

@ -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<Map<String, Object>> beans = sysEnclosureDao.queryEnclosureInfo(certificate.get("enclosure").toString());
List<Map<String, Object>> beans = iEnclosureService.queryEnclosureInfoByIds(certificate.get("enclosure").toString());
certificate.put("enclosureInfo", beans);
}
outputObject.setBean(certificate);

22
skyeye-promote/skyeye-jobdiary/src/main/java/com/skyeye/eve/service/impl/JobDiaryServiceImpl.java
View file

@ -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<String, Object> 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<String, Object> map = inputObject.getParams();
Map<String, Object> 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<String, Object> map = inputObject.getParams();
Map<String, Object> 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<String, Object> 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<String, Object> map = inputObject.getParams();
Map<String, Object> 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<String, Object> 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<String, Object> map = inputObject.getParams();
Map<String, Object> 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<String, Object> map = inputObject.getParams();
Map<String, Object> 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<String, Object> map = inputObject.getParams();
Map<String, Object> 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);

6
skyeye-promote/skyeye-user-phone/src/main/java/com/skyeye/service/impl/SealServicePhoneServiceImpl.java
View file

@ -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<String, Object> map = inputObject.getParams();
List<Map<String, Object>> beans = sealServicePhoneDao.queryFeedBackList(map);
for (Map<String, Object> 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());

20
skyeye-promote/skyeye-wages/src/main/java/com/skyeye/eve/service/impl/WagesSocialSecurityFundServiceImpl.java
View file

@ -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<String, Object> 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<String, Object> 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<String, Object> 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);

11
skyeye-promote/skyeye-workplan/src/main/java/com/skyeye/eve/service/impl/SysWorkPlanServiceImpl.java
View file

@ -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<Map<String, Object>> executors = sysWorkPlanDao.querySysWorkPlanExecutorsToEditById(map);
// 获取附件信息
List<Map<String, Object>> enclosures = sysEnclosureService.queryEnclosureInfoListByIds(bean.get("enclosureInfo").toString());
List<Map<String, Object>> 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<String, Object> 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<Map<String, Object>> executors = sysWorkPlanDao.querySysWorkPlanExecutorsToEditById(map);
//获取附件信息
List<Map<String, Object>> enclosures = sysEnclosureService.queryEnclosureInfoListByIds(bean.get("enclosureInfo").toString());
// 获取附件信息
List<Map<String, Object>> enclosures = iEnclosureService.queryEnclosureInfoByIds(bean.get("enclosureInfo").toString());
bean.put("executors", executors);
bean.put("enclosures", enclosures);
outputObject.setBean(bean);