|
@@ -74,7 +74,7 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
|
|
|
PojoUtils.pojoCopy(mtCompanyAttestationInfo, mtCompanyAttestation);
|
|
|
mtCompanyAttestation = mtCompanyAttestationInfo;
|
|
|
} else {
|
|
|
- if(userInfo != null){
|
|
|
+ if (userInfo != null) {
|
|
|
//如果是新建,设置创建者名称
|
|
|
mtCompanyAttestation.setCreateUser(userInfo.getName());
|
|
|
}
|
|
@@ -98,7 +98,8 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
|
|
|
Long companyId = mtCompanyAttestation.getMtCompanyId();
|
|
|
|
|
|
//认证处理
|
|
|
- MaintenanceCompany maintenanceCompany = auditHandle(mtCompanyAttestation, companyAttestationRequest, ApiConstants.CompanyConstants.MAINTENANCE_PASS);
|
|
|
+ MaintenanceCompany maintenanceCompany = auditHandle(mtCompanyAttestation, companyAttestationRequest,
|
|
|
+ ApiConstants.CompanyConstants.MAINTENANCE_PASS);
|
|
|
//1.将认证通过的信息赋值到本来公司信息中
|
|
|
maintenanceCompany.copyAttestation(mtCompanyAttestation);
|
|
|
//2.设置企业电梯台量
|
|
@@ -121,7 +122,8 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
|
|
|
public RestResponse auditFail(CompanyAttestationRequest companyAttestationRequest) {
|
|
|
MtCompanyAttestation mtCompanyAttestation = this.getById(companyAttestationRequest.getId());
|
|
|
//认证处理
|
|
|
- MaintenanceCompany maintenanceCompany = auditHandle(mtCompanyAttestation, companyAttestationRequest, ApiConstants.CompanyConstants.MAINTENANCE_PASS);
|
|
|
+ MaintenanceCompany maintenanceCompany = auditHandle(mtCompanyAttestation, companyAttestationRequest,
|
|
|
+ ApiConstants.CompanyConstants.MAINTENANCE_PASS);
|
|
|
this.updateById(mtCompanyAttestation);
|
|
|
maintenanceCompanyService.updateById(maintenanceCompany);
|
|
|
return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, "操作成功");
|
|
@@ -157,15 +159,15 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
|
|
|
);
|
|
|
List<CompanyAttestationResponse> companyAttestationResponseList = new ArrayList<>();
|
|
|
List<MtCompanyAttestation> mtCompanyAttestationList = mtCompanyAttestationPage.getRecords();
|
|
|
- if(mtCompanyAttestationList != null && mtCompanyAttestationList.size() > 0){
|
|
|
+ if (mtCompanyAttestationList != null && mtCompanyAttestationList.size() > 0) {
|
|
|
List<Long> customerManagerIdList = ProjectUtils.getAttrList(mtCompanyAttestationList, "customerManagerId", null);
|
|
|
List<UserInfo> userInfoList = (List<UserInfo>) userInfoService.listByIds(customerManagerIdList);
|
|
|
Map<Long, UserInfo> customerManagerIdToUserInfo = ProjectUtils.attrToObjMap(userInfoList, "userId", null);
|
|
|
- for(MtCompanyAttestation mtCompanyAttestation : mtCompanyAttestationList){
|
|
|
+ for (MtCompanyAttestation mtCompanyAttestation : mtCompanyAttestationList) {
|
|
|
CompanyAttestationResponse companyAttestationResponse = new CompanyAttestationResponse(mtCompanyAttestation);
|
|
|
//设置客户经理名称
|
|
|
UserInfo userInfo = customerManagerIdToUserInfo.get(mtCompanyAttestation.getCustomerManagerId());
|
|
|
- if(userInfo != null){
|
|
|
+ if (userInfo != null) {
|
|
|
companyAttestationResponse.setCustomerManagerName(userInfo.getName());
|
|
|
}
|
|
|
companyAttestationResponseList.add(companyAttestationResponse);
|
|
@@ -183,7 +185,8 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
|
|
|
* @param auditResult 审核结果
|
|
|
* @return
|
|
|
*/
|
|
|
- private MaintenanceCompany auditHandle(MtCompanyAttestation mtCompanyAttestation, CompanyAttestationRequest companyAttestationRequest, int auditResult) {
|
|
|
+ private MaintenanceCompany auditHandle(MtCompanyAttestation mtCompanyAttestation,
|
|
|
+ CompanyAttestationRequest companyAttestationRequest, int auditResult) {
|
|
|
MaintenanceCompany maintenanceCompany = maintenanceCompanyService.getById(mtCompanyAttestation.getMtCompanyId());
|
|
|
//设置认证时间
|
|
|
mtCompanyAttestation.setDealTime(LocalDateTime.now());
|