|
@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.fjhx.common.enums.FlowStatusEnum1;
|
|
import com.fjhx.common.enums.FlowStatusEnum1;
|
|
|
|
+import com.fjhx.file.utils.ObsFileUtil;
|
|
import com.fjhx.flow.entity.flow.po.FlowExample;
|
|
import com.fjhx.flow.entity.flow.po.FlowExample;
|
|
import com.fjhx.flow.enums.FlowStatusEnum;
|
|
import com.fjhx.flow.enums.FlowStatusEnum;
|
|
import com.fjhx.flow.service.flow.FlowExampleService;
|
|
import com.fjhx.flow.service.flow.FlowExampleService;
|
|
@@ -15,10 +16,12 @@ import com.fjhx.oa.entity.education.vo.EducationSubsidyVo;
|
|
import com.fjhx.oa.mapper.education.EducationSubsidyMapper;
|
|
import com.fjhx.oa.mapper.education.EducationSubsidyMapper;
|
|
import com.fjhx.oa.service.education.EducationConfigService;
|
|
import com.fjhx.oa.service.education.EducationConfigService;
|
|
import com.fjhx.oa.service.education.EducationSubsidyService;
|
|
import com.fjhx.oa.service.education.EducationSubsidyService;
|
|
|
|
+import com.fjhx.tenant.utils.DeptUstil;
|
|
import com.ruoyi.common.core.domain.BasePo;
|
|
import com.ruoyi.common.core.domain.BasePo;
|
|
import com.ruoyi.common.utils.SecurityUtils;
|
|
import com.ruoyi.common.utils.SecurityUtils;
|
|
import com.ruoyi.common.utils.wrapper.IWrapper;
|
|
import com.ruoyi.common.utils.wrapper.IWrapper;
|
|
import com.ruoyi.common.utils.wrapper.SqlField;
|
|
import com.ruoyi.common.utils.wrapper.SqlField;
|
|
|
|
+import com.ruoyi.system.utils.UserUtil;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
@@ -52,7 +55,7 @@ public class EducationSubsidyServiceImpl extends ServiceImpl<EducationSubsidyMap
|
|
wrapper.orderByDesc("es", EducationSubsidy::getId);
|
|
wrapper.orderByDesc("es", EducationSubsidy::getId);
|
|
Page<EducationSubsidyVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
|
|
Page<EducationSubsidyVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
|
|
List<EducationSubsidyVo> records = page.getRecords();
|
|
List<EducationSubsidyVo> records = page.getRecords();
|
|
- setDetail(records);
|
|
|
|
|
|
+ setInfo(records);
|
|
return page;
|
|
return page;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -60,23 +63,28 @@ public class EducationSubsidyServiceImpl extends ServiceImpl<EducationSubsidyMap
|
|
public EducationSubsidyVo detail(Long id) {
|
|
public EducationSubsidyVo detail(Long id) {
|
|
EducationSubsidy EducationSubsidy = this.getById(id);
|
|
EducationSubsidy EducationSubsidy = this.getById(id);
|
|
EducationSubsidyVo result = BeanUtil.toBean(EducationSubsidy, EducationSubsidyVo.class);
|
|
EducationSubsidyVo result = BeanUtil.toBean(EducationSubsidy, EducationSubsidyVo.class);
|
|
- setDetail(Arrays.asList(result));
|
|
|
|
|
|
+ setInfo(Arrays.asList(result));
|
|
|
|
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
|
|
- void setDetail(List<EducationSubsidyVo> records) {
|
|
|
|
|
|
+ void setInfo(List<EducationSubsidyVo> records) {
|
|
if (ObjectUtil.isEmpty(records)) {
|
|
if (ObjectUtil.isEmpty(records)) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
educationConfigService.attributeAssign(records, EducationSubsidyVo::getEducationId, (item, education) -> {
|
|
educationConfigService.attributeAssign(records, EducationSubsidyVo::getEducationId, (item, education) -> {
|
|
item.setEducationName(education.getName());
|
|
item.setEducationName(education.getName());
|
|
});
|
|
});
|
|
|
|
+
|
|
|
|
+ UserUtil.assignmentNickName(records, EducationSubsidyVo::getCreateUser, EducationSubsidyVo::setCreateUserName);
|
|
|
|
+ DeptUstil.assignmentNickName(records, EducationSubsidyVo::getDeptId, EducationSubsidyVo::setDeptName);
|
|
|
|
+ DeptUstil.assignmentNickName(records, EducationSubsidyVo::getCompanyId, EducationSubsidyVo::setCompanyName);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void addOrEdit(EducationSubsidyDto educationSubsidyDto) {
|
|
public void addOrEdit(EducationSubsidyDto educationSubsidyDto) {
|
|
this.saveOrUpdate(educationSubsidyDto);
|
|
this.saveOrUpdate(educationSubsidyDto);
|
|
|
|
+ ObsFileUtil.editFile(educationSubsidyDto.getFileList(), educationSubsidyDto.getId());
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|