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

巡检问题修改

master
hp 3 years ago
parent
f2464acb73
commit
da0071f43d
3 changed files with 110 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml
  2. 25
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java
  3. 128
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml
View File

@ -23,7 +23,9 @@
<select id="getCarInventoryList" <select id="getCarInventoryList"
resultType="com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo"> resultType="com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo">
SELECT sid, SELECT
id,
sid,
vinNo as vin, vinNo as vin,
mainSid, mainSid,
location as warehouse, location as warehouse,

25
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java
View File

@ -294,7 +294,6 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
} }
if ("000".equals(pagerQuery.getParams().getState())) { if ("000".equals(pagerQuery.getParams().getState())) {
qw.eq("svp.patrolInspectionStateKey", pagerQuery.getParams().getState()); qw.eq("svp.patrolInspectionStateKey", pagerQuery.getParams().getState());
qw.eq("svp.isDelete", 0);
} }
if ("001".equals(pagerQuery.getParams().getState())) { if ("001".equals(pagerQuery.getParams().getState())) {
qw.eq("svp.patrolInspectionStateKey", pagerQuery.getParams().getState()); qw.eq("svp.patrolInspectionStateKey", pagerQuery.getParams().getState());
@ -324,6 +323,26 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
); );
AppScmVehiclePatrolinspectionPageQuery params = pagerQuery.getParams(); AppScmVehiclePatrolinspectionPageQuery params = pagerQuery.getParams();
IPage<AppScmVehiclePatrolinspectionPageVo> iPage = baseMapper.getCarInventoryList(page, qw, params.getNames()); IPage<AppScmVehiclePatrolinspectionPageVo> iPage = baseMapper.getCarInventoryList(page, qw, params.getNames());
for (AppScmVehiclePatrolinspectionPageVo record : iPage.getRecords()) {
List<ScmVehicleStayPatrolinspectionVo> scmVehicleStayPatrolinspectionVos = baseMapper.selPatrolinspection(record.getVin(), record.getId(), orgPath);
if (scmVehicleStayPatrolinspectionVos.size() > 0) {
for (ScmVehicleStayPatrolinspectionVo scmVehicleStayPatrolinspectionVo : scmVehicleStayPatrolinspectionVos) {
if (scmVehicleStayPatrolinspectionVo.getPatrolInspectionDate() == null) {
record.setNewInspectionDate("无");
} else {
record.setNewInspectionDate(scmVehicleStayPatrolinspectionVo.getPatrolInspectionDate());
}
if (scmVehicleStayPatrolinspectionVo.getPatrolInspectionName() == null) {
record.setNewInspectionName("无");
} else {
record.setNewInspectionName(scmVehicleStayPatrolinspectionVo.getPatrolInspectionName());
}
}
} else {
record.setNewInspectionDate("无");
record.setNewInspectionName("无");
}
}
return iPage; return iPage;
} }
@ -386,7 +405,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
return baseMapper.selectByMainSidAndVinNo(sid, vinNo); return baseMapper.selectByMainSidAndVinNo(sid, vinNo);
} }
public List<ScmVehiclePatrolinspection> getDetailedsByMainSid(String sid,String vinNo) { public List<ScmVehiclePatrolinspection> getDetailedsByMainSid(String sid, String vinNo) {
return baseMapper.getDetailedsByMainSid(sid,vinNo); return baseMapper.getDetailedsByMainSid(sid, vinNo);
} }
} }

128
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java
View File

@ -250,12 +250,13 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
String oneValue = "问题未解决"; String oneValue = "问题未解决";
String newDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date()); String newDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
ScmVehiclePatrolinspectionsheet scmVehiclePatrolinspectionsheet = new ScmVehiclePatrolinspectionsheet(); ScmVehiclePatrolinspectionsheet scmVehiclePatrolinspectionsheet = new ScmVehiclePatrolinspectionsheet();
String orgPath = dto.getOrgPath();
SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData(); SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
String useOrgSid = "";
String orgPath = dto.getOrgPath();
if (StringUtils.isBlank(orgPath)) { if (StringUtils.isBlank(orgPath)) {
orgPath = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData(); useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
} else { } else {
orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
} }
int counts = baseMapper.selectByMainSidAndVinNo(dto.getMainSid(), dto.getVinNo()); int counts = baseMapper.selectByMainSidAndVinNo(dto.getMainSid(), dto.getVinNo());
@ -279,50 +280,91 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
monthVoList = scmVehPatrolinspectionmonthService.selectListAll(); monthVoList = scmVehPatrolinspectionmonthService.selectListAll();
scmVehPatrolinspectionmonthVo = monthVoList.get(0); scmVehPatrolinspectionmonthVo = monthVoList.get(0);
} }
List<AppScmVehiclePatrolinspectionPageVo> list = scmVehiclePatrolinspectionService.selectByVinNo(dto.getVinNo(), orgPath); ScmVehiclePatrolinspection scmVehiclePatrolinspection = null;
if (list.size() > 0) { List<ScmVehiclePatrolinspection> scmVehiclePatrolinspections = scmVehiclePatrolinspectionService.getDetailedsByMainSid(scmVehPatrolinspectionmonthVo.getSid(), dto.getVinNo());
String id = list.get(0).getId(); if (scmVehiclePatrolinspections.size() > 0) {
String mainSid = list.get(0).getSid(); scmVehiclePatrolinspection = scmVehiclePatrolinspections.get(0);
/*if (!"000".equals(list.get(0).getStateKey()) && !"002".equals(list.get(0).getStateKey())) { }
scmVehiclePatrolinspectionService.deleteByVinNo(dto.getVinNo(), id); if (scmVehiclePatrolinspection == null) {
int count = baseMapper.selectByMainSidNum(mainSid); scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
if (count > 0) { scmVehiclePatrolinspection.setVinNo(dto.getVinNo());
baseMapper.deleteByMainSid(mainSid); scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid());
} scmVehiclePatrolinspection.setLocation(dto.getWarehouse());
}*/ scmVehiclePatrolinspection.setLocationSid(dto.getWarehouseSid());
if ("000".equals(list.get(0).getStateKey())) { scmVehiclePatrolinspection.setPatrolInspectionState(oneValue);
scmVehiclePatrolinspectionService.deleteByVinNo(dto.getVinNo(), id); scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey);
int count = baseMapper.selectByMainSidNum(mainSid); scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
scmVehiclePatrolinspection.setCreateBySid(dto.getUserSid());
scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
scmVehiclePatrolinspection.setPushState(dto.getPushState());
scmVehiclePatrolinspection.setState(0);
scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet, "sid");
scmVehiclePatrolinspectionsheet.setDutyName(dto.getLiableName());
scmVehiclePatrolinspectionsheet.setDutySid(dto.getLiableSid());
scmVehiclePatrolinspectionsheet.setCreateOrgSid(useOrgSid);
scmVehiclePatrolinspectionsheet.setCreateBySid(dto.getUserSid());
scmVehiclePatrolinspectionsheet.setUseOrgSid(useOrgSid);
scmVehiclePatrolinspectionsheet.setMainSid(scmVehiclePatrolinspection.getSid());
scmVehiclePatrolinspectionsheet.setModel(dto.getModel());
scmVehiclePatrolinspectionsheet.setModelSid(dto.getModelSid());
save(scmVehiclePatrolinspectionsheet);
} else {
if ("002".equals(scmVehiclePatrolinspection.getPatrolInspectionStateKey()) || "003".equals(scmVehiclePatrolinspection.getPatrolInspectionStateKey())) {
scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
scmVehiclePatrolinspection.setVinNo(dto.getVinNo());
scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid());
scmVehiclePatrolinspection.setLocation(dto.getWarehouse());
scmVehiclePatrolinspection.setLocationSid(dto.getWarehouseSid());
scmVehiclePatrolinspection.setPatrolInspectionState(oneValue);
scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey);
scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
scmVehiclePatrolinspection.setCreateBySid(dto.getUserSid());
scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
scmVehiclePatrolinspection.setPushState(dto.getPushState());
scmVehiclePatrolinspection.setState(0);
scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet, "sid");
scmVehiclePatrolinspectionsheet.setDutyName(dto.getLiableName());
scmVehiclePatrolinspectionsheet.setDutySid(dto.getLiableSid());
scmVehiclePatrolinspectionsheet.setCreateOrgSid(useOrgSid);
scmVehiclePatrolinspectionsheet.setCreateBySid(dto.getUserSid());
scmVehiclePatrolinspectionsheet.setUseOrgSid(useOrgSid);
scmVehiclePatrolinspectionsheet.setMainSid(scmVehiclePatrolinspection.getSid());
scmVehiclePatrolinspectionsheet.setModel(dto.getModel());
scmVehiclePatrolinspectionsheet.setModelSid(dto.getModelSid());
save(scmVehiclePatrolinspectionsheet);
} else {
scmVehiclePatrolinspection.setVinNo(dto.getVinNo());
scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid());
scmVehiclePatrolinspection.setLocation(dto.getWarehouse());
scmVehiclePatrolinspection.setLocationSid(dto.getWarehouseSid());
scmVehiclePatrolinspection.setPatrolInspectionState(oneValue);
scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey);
scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
scmVehiclePatrolinspection.setCreateBySid(dto.getUserSid());
scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
scmVehiclePatrolinspection.setPushState(dto.getPushState());
scmVehiclePatrolinspection.setState(1);
int count = baseMapper.selectByMainSidNum(scmVehiclePatrolinspection.getSid());
if (count > 0) { if (count > 0) {
baseMapper.deleteByMainSid(mainSid); baseMapper.deleteByMainSid(scmVehiclePatrolinspection.getSid());
} }
scmVehiclePatrolinspectionService.updateById(scmVehiclePatrolinspection);
BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet, "sid");
scmVehiclePatrolinspectionsheet.setDutyName(dto.getLiableName());
scmVehiclePatrolinspectionsheet.setDutySid(dto.getLiableSid());
scmVehiclePatrolinspectionsheet.setCreateOrgSid(useOrgSid);
scmVehiclePatrolinspectionsheet.setCreateBySid(dto.getUserSid());
scmVehiclePatrolinspectionsheet.setUseOrgSid(useOrgSid);
scmVehiclePatrolinspectionsheet.setMainSid(scmVehiclePatrolinspection.getSid());
scmVehiclePatrolinspectionsheet.setModel(dto.getModel());
scmVehiclePatrolinspectionsheet.setModelSid(dto.getModelSid());
save(scmVehiclePatrolinspectionsheet);
} }
} }
ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
scmVehiclePatrolinspection.setVinNo(dto.getVinNo());
scmVehiclePatrolinspection.setVehicleSid(dto.getVehicleSid());
scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid());
scmVehiclePatrolinspection.setLocation(dto.getWarehouse());
scmVehiclePatrolinspection.setLocationSid(dto.getWarehouseSid());
scmVehiclePatrolinspection.setPatrolInspectionState(oneValue);
scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey);
scmVehiclePatrolinspection.setCreateOrgSid(orgPath);
scmVehiclePatrolinspection.setCreateBySid(dto.getUserSid());
// scmVehiclePatrolinspection.setState(0);
scmVehiclePatrolinspection.setState(1);
scmVehiclePatrolinspection.setUseOrgSid(orgPath);
scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet, "sid");
scmVehiclePatrolinspectionsheet.setDutyName(dto.getLiableName());
scmVehiclePatrolinspectionsheet.setDutySid(dto.getLiableSid());
scmVehiclePatrolinspectionsheet.setCreateOrgSid(orgPath);
scmVehiclePatrolinspectionsheet.setCreateBySid(dto.getUserSid());
scmVehiclePatrolinspectionsheet.setUseOrgSid(orgPath);
scmVehiclePatrolinspectionsheet.setMainSid(scmVehiclePatrolinspection.getSid());
scmVehiclePatrolinspectionsheet.setModel(dto.getModel());
scmVehiclePatrolinspectionsheet.setModelSid(dto.getModelSid());
save(scmVehiclePatrolinspectionsheet);
scmFileService.deleteByLinkSidAndType(scmVehiclePatrolinspectionsheet.getSid(), type1); scmFileService.deleteByLinkSidAndType(scmVehiclePatrolinspectionsheet.getSid(), type1);
List<String> images = dto.getImages(); List<String> images = dto.getImages();
for (String s : images) { for (String s : images) {

Write Preview
Loading…
Cancel
Save