|
|
|
@ -30,6 +30,7 @@ import cn.hutool.core.date.DateUtil; |
|
|
|
import com.alibaba.fastjson.JSON; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.yxt.anrui.as.api.asarrearsoutapply.*; |
|
|
|
import com.yxt.anrui.as.api.asarrearsoutapply.flowable.*; |
|
|
|
import com.yxt.anrui.as.feign.base.billno.Rule; |
|
|
|
import com.yxt.anrui.as.feign.flowable.flow.*; |
|
|
|
@ -46,17 +47,13 @@ import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign; |
|
|
|
import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo; |
|
|
|
import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign; |
|
|
|
import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign; |
|
|
|
import com.yxt.common.base.config.component.FileUploadComponent; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import com.yxt.common.base.service.MybatisBaseService; |
|
|
|
import com.yxt.common.base.utils.PagerUtil; |
|
|
|
import com.yxt.common.core.query.PagerQuery; |
|
|
|
import com.yxt.common.core.result.ResultBean; |
|
|
|
import com.yxt.common.core.vo.PagerVo; |
|
|
|
import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApply; |
|
|
|
import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyQuery; |
|
|
|
import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyVo; |
|
|
|
import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyDetailsVo; |
|
|
|
import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyDto; |
|
|
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
@ -94,58 +91,29 @@ public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApp |
|
|
|
private FlowFeign flowFeign; |
|
|
|
@Autowired |
|
|
|
private MessageFeign messageFeign; |
|
|
|
@Autowired |
|
|
|
private FileUploadComponent fileUploadComponent; |
|
|
|
|
|
|
|
public PagerVo<AsArrearsoutApplyVo> listPageVo(PagerQuery<AsArrearsoutApplyQuery> pq) { |
|
|
|
AsArrearsoutApplyQuery query = pq.getParams(); |
|
|
|
QueryWrapper<AsArrearsoutApply> qw = new QueryWrapper<>(); |
|
|
|
//========================================数据授权开始
|
|
|
|
if (StringUtils.isNotBlank(query.getMenuUrl())) { |
|
|
|
PrivilegeQuery privilegeQuery = new PrivilegeQuery(); |
|
|
|
privilegeQuery.setOrgPath(query.getOrgPath()); |
|
|
|
privilegeQuery.setMenuUrl(query.getMenuUrl()); |
|
|
|
privilegeQuery.setMenuSid(query.getMenuSid()); |
|
|
|
privilegeQuery.setUserSid(query.getUserSid()); |
|
|
|
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); |
|
|
|
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { |
|
|
|
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
|
|
|
|
String orgSidPath = query.getOrgPath(); |
|
|
|
orgSidPath = orgSidPath + "/"; |
|
|
|
int i1 = orgSidPath.indexOf("/"); |
|
|
|
int i2 = orgSidPath.indexOf("/", i1 + 1); |
|
|
|
int i3 = orgSidPath.indexOf("/", i2 + 1); |
|
|
|
int i4 = orgSidPath.indexOf("/", i3 + 1); |
|
|
|
String orgLevelKey = defaultIdReltBean.getData(); |
|
|
|
if ("1".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i1); |
|
|
|
qw.like("orgSidPath", orgSidPath); |
|
|
|
} else if ("2".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i2); |
|
|
|
qw.like("orgSidPath", orgSidPath); |
|
|
|
} else if ("3".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i3); |
|
|
|
qw.like("orgSidPath", orgSidPath); |
|
|
|
} else if ("4".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i4); |
|
|
|
qw.like("orgSidPath", orgSidPath); |
|
|
|
} else if ("5".equals(orgLevelKey)) { |
|
|
|
qw.eq("createBySid", query.getUserSid()); |
|
|
|
} else { |
|
|
|
PagerVo<AsArrearsoutApplyVo> p = new PagerVo<>(); |
|
|
|
return p; |
|
|
|
} |
|
|
|
} else { |
|
|
|
PagerVo<AsArrearsoutApplyVo> p = new PagerVo<>(); |
|
|
|
return p; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getCreateOrgName())) { |
|
|
|
qw.like("useOrgName", query.getCreateOrgName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getDeptName())) { |
|
|
|
qw.like("deptName", query.getDeptName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getCreateByName())) { |
|
|
|
qw.like("createByName", query.getCreateByName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getBillNo())) { |
|
|
|
qw.like("billNo", query.getBillNo()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getPairBillNo())){ |
|
|
|
qw.like("pairBillNo",query.getPairBillNo()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getBillType())){ |
|
|
|
qw.like("billType",query.getBillType()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getSubject())){ |
|
|
|
qw.like("subject",query.getSubject()); |
|
|
|
if (StringUtils.isNotBlank(query.getBillTypeValue())){ |
|
|
|
qw.like("billTypeValue",query.getBillTypeValue()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getCustomerName())){ |
|
|
|
qw.like("customerName",query.getCustomerName()); |
|
|
|
@ -156,6 +124,16 @@ public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApp |
|
|
|
if (StringUtils.isNotBlank(query.getVehMark())){ |
|
|
|
qw.like("vehMark",query.getVehMark()); |
|
|
|
} |
|
|
|
String createStartTime = query.getCreateStartTime(); |
|
|
|
String createEndTime = query.getCreateEndTime(); |
|
|
|
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
String finishStartTime = query.getFinishStartTime(); |
|
|
|
String finishEndTime = query.getFinishEndTime(); |
|
|
|
qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(finishEndTime), "date_format (finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
IPage<AsArrearsoutApply> page = PagerUtil.queryToPage(pq); |
|
|
|
IPage<AsArrearsoutApplyVo> pagging = baseMapper.selectPageVo(page, qw); |
|
|
|
PagerVo<AsArrearsoutApplyVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
@ -193,6 +171,13 @@ public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApp |
|
|
|
AsArrearsoutApply entity = new AsArrearsoutApply(); |
|
|
|
BeanUtil.copyProperties(dto, entity, "id", "sid"); |
|
|
|
entity.setNodeState("待提交"); |
|
|
|
List<AsArrearsoutApplyFile> filePaths = dto.getFilePaths(); |
|
|
|
String url = ""; |
|
|
|
for (AsArrearsoutApplyFile asArrearsoutApplyFile : filePaths) { |
|
|
|
String filePath = asArrearsoutApplyFile.getUrl().replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
url = url + filePath + ","; |
|
|
|
} |
|
|
|
entity.setFilePath(url); |
|
|
|
baseMapper.insert(entity); |
|
|
|
return entity.getSid(); |
|
|
|
} |
|
|
|
@ -204,6 +189,13 @@ public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApp |
|
|
|
} |
|
|
|
AsArrearsoutApply entity = fetchBySid(dtoSid); |
|
|
|
BeanUtil.copyProperties(dto, entity, "id", "sid"); |
|
|
|
List<AsArrearsoutApplyFile> filePaths = dto.getFilePaths(); |
|
|
|
String url = ""; |
|
|
|
for (AsArrearsoutApplyFile asArrearsoutApplyFile : filePaths) { |
|
|
|
String filePath = asArrearsoutApplyFile.getUrl().replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
url = url + filePath + ","; |
|
|
|
} |
|
|
|
entity.setFilePath(url); |
|
|
|
baseMapper.updateById(entity); |
|
|
|
} |
|
|
|
|
|
|
|
@ -211,6 +203,16 @@ public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApp |
|
|
|
AsArrearsoutApply entity = fetchBySid(sid); |
|
|
|
AsArrearsoutApplyDetailsVo vo = new AsArrearsoutApplyDetailsVo(); |
|
|
|
BeanUtil.copyProperties(entity, vo); |
|
|
|
String filePath = entity.getFilePath(); |
|
|
|
String[] filePaths = filePath.split(","); |
|
|
|
List<AsArrearsoutApplyFile> urlPahts = new ArrayList<>(); |
|
|
|
for (String path : filePaths) { |
|
|
|
String url = fileUploadComponent.getUrlPrefix() + path; |
|
|
|
AsArrearsoutApplyFile asArrearsoutApplyFile = new AsArrearsoutApplyFile(); |
|
|
|
asArrearsoutApplyFile.setUrl(url); |
|
|
|
urlPahts.add(asArrearsoutApplyFile); |
|
|
|
} |
|
|
|
vo.setFilePaths(urlPahts); |
|
|
|
return vo; |
|
|
|
} |
|
|
|
|
|
|
|
@ -508,4 +510,15 @@ public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApp |
|
|
|
flowFeign.delegate(delegateQuery); |
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean delAll(String[] sids) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
//查询该sid中是否有流程不是待提交的
|
|
|
|
int count = baseMapper.selectBySid(StringUtils.join(sids, ",")); |
|
|
|
if (count > 0) { |
|
|
|
return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败"); |
|
|
|
} |
|
|
|
delBySids(sids); |
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
} |
fanzongzhe
11 months ago