bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: bonus:eafbcb56401d9946f033cdcbeef4a1578fa4a4d8
Branches Tags
bonus:main
bonus:dev-nx
bonus:dev-nwcc
bonus:dev-nx-sx20240821b
bonus:macode20240820
bonus:dev-nx-sx20240821
bonus:dev-nw
bonus:dev-cq
bonus:dev-cq-rudy20240806b
bonus:dev-cq-rudy20240806
bonus:dev-nx-rudy20240806
bonus:dev-nx-rudy20240805
bonus:dev-nwcc-test
bonus:dev
bonus:flow_dev
bonus:test
bonus:master
..
compare: bonus:8bb53bf1d152f3e16383cce3cc89e5c070a8f5ba
Branches Tags
bonus:dev-nx
bonus:main
bonus:dev-nwcc
bonus:dev-nx-sx20240821b
bonus:macode20240820
bonus:dev-nx-sx20240821
bonus:dev-nw
bonus:dev-cq
bonus:dev-cq-rudy20240806b
bonus:dev-cq-rudy20240806
bonus:dev-nx-rudy20240806
bonus:dev-nx-rudy20240805
bonus:dev-nwcc-test
bonus:dev
bonus:flow_dev
bonus:test
bonus:master

No commits in common. "eafbcb56401d9946f033cdcbeef4a1578fa4a4d8" and "8bb53bf1d152f3e16383cce3cc89e5c070a8f5ba" have entirely different histories.
eafbcb5640 ... 8bb53bf1d1

1 changed files with 4 additions and 4 deletions
Show Stats Expand all files Collapse all files

8
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java
View File

@ -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();
for (BackApplyInfo backApplyInfo2 : backApplyInfoList) { if (backApplyInfoList != null) {
if (backApplyInfo1.getCompanyId().equals(backApplyInfo2.getCompanyId())) { if (backApplyInfo1.getCompanyId().equals(backApplyInfoList.get(0).getCompanyId())) {
backCheckDetails.setParentId(backApplyInfo2.getId().intValue()); backCheckDetails.setParentId(backApplyInfoList.get(0).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;