|
|
@ -20,6 +20,7 @@ import com.daqing.framework.domain.guarantee.DgComplianceInvestigation; |
|
|
|
import com.daqing.framework.domain.guarantee.DgWorkConferenceConsider; |
|
|
|
import com.daqing.framework.domain.guarantee.DgWorkConferenceConsider; |
|
|
|
import com.daqing.framework.domain.guarantee.GuaranteeCode; |
|
|
|
import com.daqing.framework.domain.guarantee.GuaranteeCode; |
|
|
|
import com.daqing.framework.domain.guarantee.po.AttacheAndABUserIdPO; |
|
|
|
import com.daqing.framework.domain.guarantee.po.AttacheAndABUserIdPO; |
|
|
|
|
|
|
|
import com.daqing.framework.domain.hrms.ext.EmployeeVO; |
|
|
|
import com.daqing.framework.exception.ExceptionCast; |
|
|
|
import com.daqing.framework.exception.ExceptionCast; |
|
|
|
import com.daqing.framework.model.StatusCode; |
|
|
|
import com.daqing.framework.model.StatusCode; |
|
|
|
import com.daqing.framework.model.response.CommonCode; |
|
|
|
import com.daqing.framework.model.response.CommonCode; |
|
|
@ -528,6 +529,16 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian |
|
|
|
dgComplianceInvestigationInfoResponse.setOpinion(dgComplianceInvestigation.getOpinion()); |
|
|
|
dgComplianceInvestigationInfoResponse.setOpinion(dgComplianceInvestigation.getOpinion()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// 获取C角姓名
|
|
|
|
|
|
|
|
Integer userId = this.getBaseMapper().getCUserId(this.getComplianceInvestigation(iid).getBusinessId()); |
|
|
|
|
|
|
|
if (userId != null) { |
|
|
|
|
|
|
|
Integer[] userIds = new Integer[1]; |
|
|
|
|
|
|
|
userIds[0] = userId; |
|
|
|
|
|
|
|
ResponseResult<List<EmployeeVO>> result = hrmsFeignService.listEmpNameByUserId(userIds); |
|
|
|
|
|
|
|
if (result.getData() != null && result.getData().size() != 0) { |
|
|
|
|
|
|
|
dgComplianceInvestigationInfoResponse.setCName(result.getData().get(0).getName()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
return dgComplianceInvestigationInfoResponse; |
|
|
|
return dgComplianceInvestigationInfoResponse; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -557,6 +568,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian |
|
|
|
* 将接收的数组图片拼装成字符串类型 |
|
|
|
* 将接收的数组图片拼装成字符串类型 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
@Override |
|
|
|
|
|
|
|
@Transactional |
|
|
|
public String getFileUrl(String[] fileUrls) { |
|
|
|
public String getFileUrl(String[] fileUrls) { |
|
|
|
StringBuilder fileUrl = new StringBuilder(); |
|
|
|
StringBuilder fileUrl = new StringBuilder(); |
|
|
|
if (null != fileUrls && fileUrls.length != 0) { |
|
|
|
if (null != fileUrls && fileUrls.length != 0) { |
|
|
|