|
@@ -12,7 +12,9 @@ import org.springblade.control.entity.*;
|
|
import org.springblade.control.mapper.ExMInvoiceMapper;
|
|
import org.springblade.control.mapper.ExMInvoiceMapper;
|
|
import org.springblade.control.service.EMInvoiceService;
|
|
import org.springblade.control.service.EMInvoiceService;
|
|
import org.springblade.control.utils.BuildSerialUtils;
|
|
import org.springblade.control.utils.BuildSerialUtils;
|
|
|
|
+import org.springblade.control.vo.ContractInvoiceInfoVO;
|
|
import org.springblade.control.vo.EMDraftVO;
|
|
import org.springblade.control.vo.EMDraftVO;
|
|
|
|
+import org.springblade.control.vo.EMInvoiceInfoDetailVO;
|
|
import org.springblade.control.vo.EMInvoiceInfoVO;
|
|
import org.springblade.control.vo.EMInvoiceInfoVO;
|
|
import org.springblade.core.log.exception.ServiceException;
|
|
import org.springblade.core.log.exception.ServiceException;
|
|
import org.springblade.core.mp.base.BaseServiceImpl;
|
|
import org.springblade.core.mp.base.BaseServiceImpl;
|
|
@@ -52,6 +54,7 @@ public class EMInvoiceServiceImpl extends BaseServiceImpl<ExMInvoiceMapper, EMIn
|
|
EMInvoiceInfoVO vo = new EMInvoiceInfoVO();
|
|
EMInvoiceInfoVO vo = new EMInvoiceInfoVO();
|
|
BeanUtils.copyProperties(obj, vo);
|
|
BeanUtils.copyProperties(obj, vo);
|
|
vo.setCreateName(userMap.get(vo.getCreateUser()));
|
|
vo.setCreateName(userMap.get(vo.getCreateUser()));
|
|
|
|
+ vo.setInvoiceUserName(userMap.get(vo.getCreateUser()));
|
|
vo.setApprovalStatusName(vo.getStatus().equals(1) ? "待审批" : (vo.getStatus().equals(2) ? "已审批" : (vo.getStatus().equals(3) ? "已驳回" : "未上报")));
|
|
vo.setApprovalStatusName(vo.getStatus().equals(1) ? "待审批" : (vo.getStatus().equals(2) ? "已审批" : (vo.getStatus().equals(3) ? "已驳回" : "未上报")));
|
|
vo.setApprovalResultName(vo.getApprovalStatusName().equals("已审批") || vo.getApprovalStatusName().equals("已驳回") ? "已通过" : "未通过");
|
|
vo.setApprovalResultName(vo.getApprovalStatusName().equals("已审批") || vo.getApprovalStatusName().equals("已驳回") ? "已通过" : "未通过");
|
|
for (DictInfo dictInfo : dictInfoList1) {
|
|
for (DictInfo dictInfo : dictInfoList1) {
|
|
@@ -99,10 +102,40 @@ public class EMInvoiceServiceImpl extends BaseServiceImpl<ExMInvoiceMapper, EMIn
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public EMInvoiceInfoVO invoiceDetail(Long id) {
|
|
|
|
|
|
+ public EMInvoiceInfoDetailVO invoiceDetail(Long id) {
|
|
EMInvoiceInfo obj = baseMapper.selectById(id);
|
|
EMInvoiceInfo obj = baseMapper.selectById(id);
|
|
- EMInvoiceInfoVO vo = BeanUtil.copyProperties(obj, EMInvoiceInfoVO.class);
|
|
|
|
- //TODO vo.set
|
|
|
|
|
|
+ EMInvoiceInfoVO voBasic = BeanUtil.copyProperties(obj, EMInvoiceInfoVO.class);
|
|
|
|
+ EMInvoiceInfoDetailVO vo = new EMInvoiceInfoDetailVO();
|
|
|
|
+ if (obj != null && voBasic != null) {
|
|
|
|
+ Map<Long, String> userMap = iUserClient.selectUserAll().stream().filter(f -> ObjectUtil.isNotEmpty(f.getRealName())).collect(Collectors.toMap(User::getId, User::getRealName));
|
|
|
|
+ ControlProjectInfo projectInfo = jdbcTemplate.query("select name from c_control_project_info where id = " + obj.getProjectId(), new BeanPropertyRowMapper<>(ControlProjectInfo.class)).stream().findAny().orElse(null);
|
|
|
|
+ if (projectInfo != null) {
|
|
|
|
+ voBasic.setProjectName(projectInfo.getName());
|
|
|
|
+ }
|
|
|
|
+ List<DictInfo> dictInfoListFP = jdbcTemplate.query("select dict_name,dict_value from c_dict_info where code = 'invoice_type'", new BeanPropertyRowMapper<>(DictInfo.class));
|
|
|
|
+ for (DictInfo dictInfo : dictInfoListFP) {
|
|
|
|
+ if (voBasic.getInvoiceType().equals(dictInfo.getDictValue().intValue())) {
|
|
|
|
+ voBasic.setInvoiceTypeName(dictInfo.getDictName());
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ voBasic.setInvoiceUserName(userMap.get(voBasic.getInvoiceUserId()));
|
|
|
|
+
|
|
|
|
+ vo.setEmInvoiceInfoVO(voBasic);
|
|
|
|
+
|
|
|
|
+ List<ControlContractInfo> query = jdbcTemplate.query("select * from c_control_contract_info where project_id = " + obj.getProjectId(), new BeanPropertyRowMapper<>(ControlContractInfo.class));
|
|
|
|
+ if (query.size() == 1) {
|
|
|
|
+ ControlContractInfo controlContractInfo = query.get(0);
|
|
|
|
+ if (controlContractInfo != null) {
|
|
|
|
+ ContractInvoiceInfoVO voFPDetail = BeanUtil.copyProperties(controlContractInfo, ContractInvoiceInfoVO.class);
|
|
|
|
+ if (voFPDetail != null) {
|
|
|
|
+ vo.setContractInvoiceInfoVO(voFPDetail);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ vo.setEmInvoiceInfoVO(voBasic);
|
|
|
|
+
|
|
|
|
+ }
|
|
return vo;
|
|
return vo;
|
|
}
|
|
}
|
|
|
|
|