yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

存放地点变更全路径orgPath

zhanglei
dimengzhe 2 years ago
parent
60ac9544af
commit
e9aabdabed
2 changed files with 38 additions and 63 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionInfoVo.java
  2. 98
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionInfoVo.java
View File

@ -112,6 +112,9 @@ public class AppScmVehicleGressionInfoVo implements Vo {
@ApiModelProperty("机构sid")
private String useOrgSid;
@ApiModelProperty("组织全路径")
@JsonProperty("orgPath")
private String orgSidPath;
}

98
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
View File

@ -248,14 +248,14 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
apply(StringUtils.isNotEmpty(inventEndDate), "date_format (applicantDate,'%Y-%m-%d') <= date_format('" + inventEndDate + "','%Y-%m-%d')"
);
//========================================数据授权开始
if(StringUtils.isNotBlank(query.getMenuUrl())){
if (StringUtils.isNotBlank(query.getMenuUrl())) {
//=======================
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if(StringUtils.isNotBlank(defaultIdReltBean.getData())){
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
@ -276,23 +276,23 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("svg.orgSidPath", orgSidPath);
} else if("5".equals(orgLevelKey)){
qw.eq("svg.createBySid",query.getUserSid());
}else{
} else if ("5".equals(orgLevelKey)) {
qw.eq("svg.createBySid", query.getUserSid());
} else {
PagerVo<ScmVehicleGressionPageVo> p = new PagerVo<>();
return p;
}
}else{
} else {
PagerVo<ScmVehicleGressionPageVo> p = new PagerVo<>();
return p;
}
}else{
} else {
if (StringUtils.isNotBlank(query.getUserSid())) {
qw.eq("svg.createBySid", query.getUserSid());
}
if(StringUtils.isNotBlank(query.getOrgPath())){
if (StringUtils.isNotBlank(query.getOrgPath())) {
String orgpath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
qw.eq("svg.useorgSid",orgpath);
qw.eq("svg.useorgSid", orgpath);
}
}
@ -301,11 +301,11 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
for (ScmVehicleGressionPageVo record : records) {
//根据sid查询该申请下的车辆
List<String> vinList = scmVehicleGressionVehService.selectByMainSid(record.getSid());
String vin = String.join(",",vinList);
String vin = String.join(",", vinList);
record.setVin(vin);
if(query.getUserSid().equals(record.getCreateBySid())){
if (query.getUserSid().equals(record.getCreateBySid())) {
record.setAllowModify(true);
}else{
} else {
record.setAllowModify(false);
}
String sid = record.getSid();
@ -367,9 +367,9 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
qw.apply(StringUtils.isNotEmpty(inventStartDate), "date_format (applicantDate,'%Y-%m-%d') >= date_format('" + inventStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(inventEndDate), "date_format (applicantDate,'%Y-%m-%d') <= date_format('" + inventEndDate + "','%Y-%m-%d')"
);
if(StringUtils.isNotBlank(query.getOrgPath())){
if (StringUtils.isNotBlank(query.getOrgPath())) {
String orgpath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
qw.eq("svg.useorgSid",orgpath);
qw.eq("svg.useorgSid", orgpath);
}
return qw;
}
@ -382,7 +382,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) {
qw.eq("svg.useOrgSid", pagerQuery.getParams().getUseOrgSid());
}
qw.eq("svg.nodeState","已办结");
qw.eq("svg.nodeState", "已办结");
IPage<ScmVehicleGressionPageVo> iPage = baseMapper.selectCarTransferList(page, qw);
List<ScmVehicleGressionPageVo> records = iPage.getRecords();
for (ScmVehicleGressionPageVo record : records) {
@ -427,14 +427,14 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
qw.eq("svg.handleState", query.getType());
}
//========================================数据授权开始
if(StringUtils.isNotBlank(query.getMenuSid())){
if (StringUtils.isNotBlank(query.getMenuSid())) {
//=======================
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuSid(query.getMenuSid());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if(StringUtils.isNotBlank(defaultIdReltBean.getData())){
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
@ -455,17 +455,17 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("svg.orgSidPath", orgSidPath);
} else if("5".equals(orgLevelKey)){
qw.eq("svg.createBySid",query.getUserSid());
}else{
} else if ("5".equals(orgLevelKey)) {
qw.eq("svg.createBySid", query.getUserSid());
} else {
PagerVo<AppScmVehicleGressionPageVo> p = new PagerVo<>();
return p;
}
}else{
} else {
PagerVo<AppScmVehicleGressionPageVo> p = new PagerVo<>();
return p;
}
}else{
} else {
if (StringUtils.isNotBlank(query.getOrgPath())) {
//切换机构
//根据用户所在组织全路径获取分公司sid
@ -485,14 +485,14 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
for (AppScmVehicleGressionPageVo record : records) {
List<ScmVehicleGressionVehVo> scmVehicleGressionVehVos = scmVehicleGressionVehService.selectInfoVoByMainSid(record.getSid());
record.setScmVehicleGressionVehs(scmVehicleGressionVehVos);
if(query.getUserSid().equals(record.getCreateBySid()) && record.isShowDetectBtn()){
if (query.getUserSid().equals(record.getCreateBySid()) && record.isShowDetectBtn()) {
record.setShowDetectBtn(true);
}else{
} else {
record.setShowDetectBtn(false);
}
if(query.getUserSid().equals(record.getCreateBySid()) && record.isShowUpdateBtn()){
if (query.getUserSid().equals(record.getCreateBySid()) && record.isShowUpdateBtn()) {
record.setShowUpdateBtn(true);
}else{
} else {
record.setShowUpdateBtn(false);
}
if ("已办结".equals(record.getState())) {
@ -561,13 +561,13 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
String useOrgSid = "";
//当前组织机构全路径sid
String orgSidPath = "";
if(StringUtils.isNotBlank(dto.getOrgPath())){
if (StringUtils.isNotBlank(dto.getOrgPath())) {
useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
orgSidPath = dto.getOrgPath();
}else{
} else {
useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
}
if(StringUtils.isBlank(orgSidPath)){
if (StringUtils.isBlank(orgSidPath)) {
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
if (!userVoResultBean.getSuccess()) {
@ -616,7 +616,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
if (scmVehicleGression == null) {
return rb.setMsg("该申请不存在");
}
BeanUtil.copyProperties(dto, scmVehicleGression,"orgSidPath");
BeanUtil.copyProperties(dto, scmVehicleGression, "orgSidPath");
baseMapper.updateById(scmVehicleGression);
scmVehicleGressionVehService.deleteByMainSid(scmVehicleGression.getSid());
scmVehicleGressionVehService.saveOrUpdateDto(scmVehicleGressionVehDtos, scmVehicleGression.getSid());
@ -658,33 +658,6 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
vo.setImage(image);
vo.setUserSid(vo.getCreateBySid());
return rb.success().setData(vo);
/* String type1 = "04"; //保单照片
String type2 = "05"; //现场照片
List<String> policyImage = new ArrayList<>();
List<String> image = new ArrayList<>();
String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData();
SysStaffinfoVo data1 = sysUserFeign.getSysUserByMobile(data.getStaffSid()).getData();
AppScmVehicleGressionInfoVo vo = baseMapper.getCarTransferInfo(sid, useOrgSid);
List<ScmVehicleGressionVehVo> scmVehicleGressionVehVos = scmVehicleGressionVehService.selectInfoVoByMainSid(sid);
vo.setScmVehicleGressionVehs(scmVehicleGressionVehVos);
vo.setApplicantName(data1.getName());
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
String format = simpleDateFormat.format(new Date());
vo.setApplicantDate(format);
vo.setUserSid(userSid);
List<ScmFile> scmFiles1 = scmFileService.selectByLinkSid(sid, type1);
for (ScmFile scmFile : scmFiles1) {
policyImage.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
}
vo.setPolicyImage(policyImage);
List<ScmFile> scmFiles2 = scmFileService.selectByLinkSid(sid, type2);
for (ScmFile scmFile : scmFiles2) {
policyImage.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
}
vo.setImage(image);
return vo;*/
}
/**
@ -890,10 +863,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
//用户的组织全路径
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
//用户的部门全路径sid
bv.setOrgSidPath(orgSidPath);
dto.setOrgPath(orgSidPath);
} else {
bv.setOrgSidPath(orgPath);
dto.setOrgPath(orgPath);
}
@ -969,7 +940,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
baseVehicleTempstateDto.setBusSid(businessSid);
baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
}
scmVehicleGression = fetchBySid(businessSid);
bv.setOrgSidPath(scmVehicleGression.getOrgSidPath());
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
Map<String, Object> variables = new HashMap<>();
//业务sid
@ -1367,7 +1339,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
ScmVehicleGression scmVehicleGression = fetchBySid(query.getBusinessSid());
String businessTaskId = scmVehicleGression.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if(query.getUserSid().equals(scmVehicleGression.getCreateBySid())){
if (query.getUserSid().equals(scmVehicleGression.getCreateBySid())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
@ -1378,7 +1350,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
//清除临时车辆表状态
baseVehicleTempstateFeign.delByBusSid(query.getBusinessSid());
return rb.success().setData(resultBean.getData());
}else{
} else {
if (businessTaskId.equals(query.getTaskId())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
@ -1584,7 +1556,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
long seconds = System.currentTimeMillis();
String typeName = dateStr + seconds + ".doc";
File file = new File(targetPath + "outdoor"+seconds+".ftl");
File file = new File(targetPath + "outdoor" + seconds + ".ftl");
File dir = new File(targetPath);
WordConvertUtils.inputStreamToFile(inputStream, file);
WordConvertUtils.creatWord1(dataMap, file, targetPath, typeName, dir);

Write Preview
Loading…
Cancel
Save