Commit 73f213c1 by QianQiXiang

Merge remote-tracking branch 'origin/developer' into developer

parents c8414f8a 83016f17
...@@ -42,26 +42,20 @@ import java.util.List; ...@@ -42,26 +42,20 @@ import java.util.List;
@RestController @RestController
public class AuditController extends WebBaseController { public class AuditController extends WebBaseController {
private static Logger logger = LoggerFactory.getLogger(AuditController.class); private static final Logger logger = LoggerFactory.getLogger(AuditController.class);
@Autowired @Autowired
private AuditApiService auditApiService; private AuditApiService auditApiService;
@Autowired @Autowired
private StaffClerkRelationApiService staffClerkRelationApiService; private StaffClerkRelationApiService staffClerkRelationApiService;
@Autowired @Autowired
private StaffApiService staffApiService; private StaffApiService staffApiService;
@Autowired @Autowired
private SyncHaobanToGicServiceApi syncHaobanToGicServiceApi; private SyncHaobanToGicServiceApi syncHaobanToGicServiceApi;
@Autowired @Autowired
private StaffDepartmentRelatedApiService staffDepartmentRelatedApiService; private StaffDepartmentRelatedApiService staffDepartmentRelatedApiService;
@Autowired @Autowired
private ClerkService clerkService; private ClerkService clerkService;
@Autowired
private ChannelCodeEnum channelCodeEnum;
//关联记录列表 //关联记录列表
...@@ -110,7 +104,7 @@ public class AuditController extends WebBaseController { ...@@ -110,7 +104,7 @@ public class AuditController extends WebBaseController {
List<StaffClerkBindLogDetailVO> voList = new ArrayList<StaffClerkBindLogDetailVO>(); List<StaffClerkBindLogDetailVO> voList = new ArrayList<StaffClerkBindLogDetailVO>();
for (StaffClerkBindLogDetailDTO staffClerkBindLogDetailDTO : list) { for (StaffClerkBindLogDetailDTO staffClerkBindLogDetailDTO : list) {
StaffClerkBindLogDetailVO vo = EntityUtil.changeEntityByJSON(StaffClerkBindLogDetailVO.class, staffClerkBindLogDetailDTO); StaffClerkBindLogDetailVO vo = EntityUtil.changeEntityByJSON(StaffClerkBindLogDetailVO.class, staffClerkBindLogDetailDTO);
vo.setUnbindReason(channelCodeEnum.getNameByCode(vo.getChannelCode())); //vo.setUnbindReason(ChannelCodeEnum.getNameByCode(vo.getChannelCode()));
voList.add(vo); voList.add(vo);
} }
Page<StaffClerkBindLogDetailVO> pageVO = new Page<>(); Page<StaffClerkBindLogDetailVO> pageVO = new Page<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment