bug修改
This commit is contained in:
parent
1ecf314a2a
commit
d5384b25b3
|
|
@ -411,9 +411,9 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
|
||||||
List<BackApplyInfo> list = new ArrayList();
|
List<BackApplyInfo> list = new ArrayList();
|
||||||
for (BackApplyInfo backApplyInfo1 : backApplyDetails) {
|
for (BackApplyInfo backApplyInfo1 : backApplyDetails) {
|
||||||
BackApplyInfo backCheckDetails = new BackApplyInfo();
|
BackApplyInfo backCheckDetails = new BackApplyInfo();
|
||||||
if (backApplyInfoList != null) {
|
for (BackApplyInfo backApplyInfo2 : backApplyInfoList) {
|
||||||
if (backApplyInfo1.getCompanyId().equals(backApplyInfoList.get(0).getCompanyId())) {
|
if (backApplyInfo1.getCompanyId().equals(backApplyInfo2.getCompanyId())) {
|
||||||
backCheckDetails.setParentId(backApplyInfoList.get(0).getId().intValue());
|
backCheckDetails.setParentId(backApplyInfo2.getId().intValue());
|
||||||
backCheckDetails.setTypeId(backApplyInfo1.getTypeId());
|
backCheckDetails.setTypeId(backApplyInfo1.getTypeId());
|
||||||
backCheckDetails.setMaId(backApplyInfo1.getMaId());
|
backCheckDetails.setMaId(backApplyInfo1.getMaId());
|
||||||
backCheckDetails.setCreateBy(SecurityUtils.getLoginUser().getUserid().toString());
|
backCheckDetails.setCreateBy(SecurityUtils.getLoginUser().getUserid().toString());
|
||||||
|
|
@ -605,7 +605,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
|
||||||
DirectApplyInfo directApplyInfos = getDirectApplyInfoById(directApplyInfoDetails.getId());
|
DirectApplyInfo directApplyInfos = getDirectApplyInfoById(directApplyInfoDetails.getId());
|
||||||
directApplyInfos.setStatus("1");
|
directApplyInfos.setStatus("1");
|
||||||
directApplyInfos.setAuditor(SecurityUtils.getLoginUser().getUsername());
|
directApplyInfos.setAuditor(SecurityUtils.getLoginUser().getUsername());
|
||||||
directApplyInfos.setAuditTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
|
directApplyInfos.setAuditTime(DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss"));
|
||||||
res = refuseDirectApplyInfo(directApplyInfos);
|
res = refuseDirectApplyInfo(directApplyInfos);
|
||||||
} else {
|
} else {
|
||||||
return res;
|
return res;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue