admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
pengjie 2024-04-28 17:49:17 +08:00
parent 8ddd17a5fb
commit 0349e74d4a
4 changed files with 51 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/FlowOrgRepositoryServiceImpl.java
View File

@ -280,7 +280,7 @@ public class FlowOrgRepositoryServiceImpl implements OrgRepositoryService {
userDeptDo.setDeptName(deptById.getDeptName());
list.add(userDeptDo);
}
return list.stream().collect(Collectors.toMap(UserDeptDo::getUserId, v -> v));
return list.stream().collect(Collectors.toMap(UserDeptDo::getUserId, v -> v, (a, b) -> a));
}
@Override

3
src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java
View File

@ -341,7 +341,8 @@ public class WorkerInfo implements Serializable {
private Double safeScore;
@ApiModelProperty(value = "下发状态：1成功2失败3部分成功")
private Integer sendSuccessStatus;
@ApiModelProperty(value="资格证书信息")
private String specialCertificateImage;
@TableField(exist = false)
@ApiModelProperty(value = "人脸分数")
private java.lang.Integer faceScore;

31
src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java
View File

@ -2,7 +2,11 @@ package com.zhgd.xmgl.modules.xz.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.zhgd.annotation.OperLog;
import com.zhgd.xmgl.modules.project.entity.ProjectEnterprise;
import com.zhgd.xmgl.modules.project.service.IProjectEnterpriseService;
import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo;
import com.zhgd.xmgl.modules.worker.service.IEnterpriseInfoService;
import com.zhgd.xmgl.modules.xz.entity.XzMaterialDetail;
@ -64,6 +68,10 @@ public class XzMaterialController {
@Autowired
private IEnterpriseInfoService enterpriseInfoService;
@Autowired
private IProjectEnterpriseService projectEnterpriseService;
/**
* 分页列表查询
*
@ -77,15 +85,26 @@ public class XzMaterialController {
})
@PostMapping(value = "/page")
public Result<IPage<XzMaterial>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {
Object enterpriseId = map.get("enterpriseId");
map.remove("enterpriseId");
QueryWrapper<XzMaterial> queryWrapper = QueryGenerator.initPageQueryWrapper(XzMaterial.class, map);
Page<XzMaterial> page = PageUtil.getPage(map);
queryWrapper.orderByDesc("entry_time");
if (queryWrapper != null && StringUtils.isNotBlank(enterpriseId.toString())) {
List<Long> enterpriseIds = new ArrayList<>();
String projectSn = map.get("projectSn").toString();
ProjectEnterprise projectEnterprise = projectEnterpriseService.getOne(Wrappers.<ProjectEnterprise>lambdaQuery()
.eq(ProjectEnterprise::getProjectSn, projectSn).eq(ProjectEnterprise::getEnterpriseId, enterpriseId));
enterpriseIds.add(projectEnterprise.getEnterpriseId());
getChild(projectSn, projectEnterprise.getEnterpriseId(), enterpriseIds);
queryWrapper.lambda().in(XzMaterial::getEnterpriseId, enterpriseIds);
}
IPage<XzMaterial> pageList = xzMaterialService.page(page, queryWrapper);
if (pageList.getRecords().size() > 0) {
List<EnterpriseInfo> enterpriseInfos = enterpriseInfoService.listByIds(pageList.getRecords().stream().map(r -> r.getEnterpriseId()).collect(Collectors.toSet()));
for (XzMaterial record : pageList.getRecords()) {
for (EnterpriseInfo enterpriseInfo : enterpriseInfos) {
if (record.getEnterpriseId().equals(enterpriseInfo.getId().toString())) {
if (record.getEnterpriseId() != null && record.getEnterpriseId().equals(enterpriseInfo.getId().toString())) {
record.setEnterpriseName(enterpriseInfo.getEnterpriseName());
}
}
@ -94,6 +113,16 @@ public class XzMaterialController {
return Result.success(pageList);
}
private void getChild(String projectSn, Long enterpriseId, List<Long> enterpriseIds) {
List<Long> ids = projectEnterpriseService.list(Wrappers.<ProjectEnterprise>lambdaQuery()
.eq(ProjectEnterprise::getProjectSn, projectSn).eq(ProjectEnterprise::getParentEnterpriseId, enterpriseId))
.stream().map(p -> p.getEnterpriseId()).collect(Collectors.toList());
for (Long id : ids) {
getChild(projectSn, id, enterpriseIds);
enterpriseIds.add(id);
}
}
/**
* 列表查询
*

30
src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java
View File

@ -9,8 +9,10 @@ import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.entity.vo.SafeEducationQuestionAnswerDataVo;
import com.zhgd.xmgl.modules.edu.service.ISafeEducationQuestionAnswerService;
import com.zhgd.xmgl.modules.worker.entity.UfaceDev;
import com.zhgd.xmgl.modules.worker.entity.WorkerInfoAuditRecord;
import com.zhgd.xmgl.modules.worker.entity.WorkerSafeEducationWorker;
import com.zhgd.xmgl.modules.worker.service.IUfaceDevService;
import com.zhgd.xmgl.modules.worker.service.IWorkerInfoAuditRecordService;
import com.zhgd.xmgl.util.MessageUtil;
import io.swagger.annotations.Api;
@ -25,11 +27,9 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.lang.reflect.Array;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
@ -214,6 +214,9 @@ public class XzWorkerInfoAuditRecordController {
return result;
}
@Resource
private IUfaceDevService ufaceDevService;
@OperLog(operModul = "劳务管理", operType = "劳务人员审核通过", operDesc = "劳务人员审核通过")
@ApiOperation(value = "审核通过", notes = "审核通过", httpMethod = "POST")
@ApiImplicitParams({
@ -223,14 +226,17 @@ public class XzWorkerInfoAuditRecordController {
@PostMapping(value = "/adoptWorkerInfo")
public Result<WorkerInfoAuditRecord> adoptWorkerInfo(@RequestBody Map<String, Object> paramMap) {
List<String> ids = (List<String>) paramMap.get("id");
List<String> ufaceDevId = (List<String>) paramMap.get("ufaceDevId");
String ufaceDevIds = ufaceDevId.stream().collect(Collectors.joining(","));
for (String id : ids) {
paramMap.put("id", id);
paramMap.put("ufaceDevId", ufaceDevIds);
paramMap.put("accountType", 2);
paramMap.put("registerType", 2);
workerInfoAuditRecordService.adoptWorkerInfo(paramMap);
List<String> ufaceDevId = ufaceDevService.list(Wrappers.<UfaceDev>lambdaQuery().eq(UfaceDev::getProjectSn, paramMap.get("projectSn").toString()))
.stream().map(d -> d.getId().toString()).collect(Collectors.toList());
if (ufaceDevId.size() > 0) {
String ufaceDevIds = ufaceDevId.stream().collect(Collectors.joining(","));
for (String id : ids) {
paramMap.put("id", id);
paramMap.put("ufaceDevId", ufaceDevIds);
paramMap.put("accountType", 2);
paramMap.put("registerType", 2);
workerInfoAuditRecordService.adoptWorkerInfo(paramMap);
}
}
return Result.ok();
}