|
|
@@ -11,10 +11,7 @@ import lombok.AllArgsConstructor;
|
|
|
import org.sky.core.log.exception.ServiceException;
|
|
|
import org.sky.core.mp.base.BaseServiceImpl;
|
|
|
import org.sky.core.secure.utils.SecureUtil;
|
|
|
-import org.sky.core.tool.utils.CollectionUtil;
|
|
|
-import org.sky.core.tool.utils.DateUtil;
|
|
|
-import org.sky.core.tool.utils.Func;
|
|
|
-import org.sky.core.tool.utils.StringUtil;
|
|
|
+import org.sky.core.tool.utils.*;
|
|
|
import org.sky.scientific.excel.XmExcel;
|
|
|
import org.sky.scientific.mapper.DepartmentMapper;
|
|
|
import org.sky.scientific.mapper.TechnicianMapper;
|
|
|
@@ -45,9 +42,6 @@ public class XmServiceImpl extends BaseServiceImpl<XmMapper, XmEntity> implement
|
|
|
private final TechnicianMapper technicianMapper;
|
|
|
private final DepartmentMapper departmentMapper;
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
@Override
|
|
|
public IPage<XmEntity> selectXmList(IPage<XmEntity> page, XmDTO xm) {
|
|
|
if (StringUtil.isBlank(xm.getYearAndMonth())) {
|
|
|
@@ -104,6 +98,14 @@ public class XmServiceImpl extends BaseServiceImpl<XmMapper, XmEntity> implement
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
+ public XmVO selectApprovalInfo(Long xmId) {
|
|
|
+ XmEntity xm = baseMapper.selectById(xmId);
|
|
|
+ xm.setXmfzrxm(technicianMapper.getNameById(xm.getXmfzr()));
|
|
|
+ xm.setXmsqdw(departmentMapper.getFullNameById(xm.getXmsqdwid()));
|
|
|
+ return BeanUtil.copyProperties(xm, XmVO.class);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
public boolean updateXm(XmUpdateDto dto) {
|
|
|
return baseMapper.updateXm(dto);
|
|
|
}
|
|
|
@@ -169,7 +171,6 @@ public class XmServiceImpl extends BaseServiceImpl<XmMapper, XmEntity> implement
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* 判断项目名称是否有效
|
|
|
*
|