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

工作票bug修复

Browse Source
This commit is contained in:
guoshengxiong 2025-07-09 10:06:07 +08:00
parent fe98b1766f
commit 19ceb728db
3 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/zhgd/xmgl/modules/policecamera/entity/WorkTicket.java
View File

@ -55,9 +55,9 @@ public class WorkTicket implements Serializable {
@ApiModelProperty(value = "工作票编号")
private java.lang.String workTicketNumber;
/**
* 施工区域s（多个,分割）
* 施工场站s（多个,分割）
*/
@ApiModelProperty(value = "施工区域s（多个,分割）")
@ApiModelProperty(value = "施工场站s（多个,分割）")
private java.lang.String constructionAreas;
/**
* 申请单位s（多个,分割）
@ -86,10 +86,10 @@ public class WorkTicket implements Serializable {
@ApiModelProperty(value = "施工计划时间结束")
private java.util.Date constructionTimeEnd;
/**
* 作业人员s（多个,分割）
* 作业人员
*/
@ApiModelProperty(value = "作业人员s（多个,分割）")
private java.lang.String operators;
@ApiModelProperty(value = "作业人员")
private java.lang.String operator;
/**
* 作业内容
*/
@ -120,4 +120,10 @@ public class WorkTicket implements Serializable {
*/
@ApiModelProperty(value = "状态：1:未开始;2:施工中;3:暂停中;4:已完工;")
private java.lang.Integer status;
/**
* 施工地点
*/
@ApiModelProperty(value = "施工地点")
private java.lang.String constructionAddr;
}

5
src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/WorkTicketVo.java
View File

@ -21,11 +21,6 @@ public class WorkTicketVo extends WorkTicket {
*/
@ApiModelProperty(value = "申请单位名称s（多个,分割）")
private java.lang.String applicantNames;
/**
* 作业人员名称s（多个,分割）
*/
@ApiModelProperty(value = "作业人员名称s（多个,分割）")
private java.lang.String operatorNames;
/**
* 执法记录仪设备列表
*/

8
src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java
View File

@ -27,7 +27,6 @@ import com.zhgd.xmgl.modules.project.service.IProjectConfigService;
import com.zhgd.xmgl.modules.quality.entity.QualityRegion;
import com.zhgd.xmgl.modules.quality.service.IQualityRegionService;
import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo;
import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
import com.zhgd.xmgl.modules.worker.service.impl.EnterpriseInfoServiceImpl;
import com.zhgd.xmgl.modules.worker.service.impl.WorkerInfoServiceImpl;
import com.zhgd.xmgl.util.EntityUtils;
@ -110,7 +109,6 @@ public class WorkTicketServiceImpl extends ServiceImpl<WorkTicketMapper, WorkTic
String projectSn = list.get(0).getProjectSn();
Map<Long, QualityRegion> regionMap = qualityRegionService.getQualityRegionMapByProjectSn(projectSn);
Map<Long, EnterpriseInfo> enterpriseMap = enterpriseInfoService.getEnterpriseMapByProjectSn(projectSn);
Map<Long, WorkerInfo> workerMap = workerInfoService.getWorkerMapByProjectSn(projectSn);
List<Long> ticketIds = list.stream().map(WorkTicketVo::getId).collect(Collectors.toList());
Map<Long, PoliceCameraItem> policeCameraItemMap = policeCameraItemService.getItemMapByProjectSn(projectSn);
Map<Long, List<PoliceCameraItem>> ticketMap = workTicketCameraRelService.list(new LambdaQueryWrapper<WorkTicketCameraRel>()
@ -129,12 +127,6 @@ public class WorkTicketServiceImpl extends ServiceImpl<WorkTicketMapper, WorkTic
regionMap,
QualityRegion::getRegionName
));
// 设置操作人名称
ticketVo.setOperatorNames(EntityUtils.convertIdsToNames(
ticketVo.getOperators(),
workerMap,
WorkerInfo::getWorkerName
));
ticketVo.setItemList(ticketMap.get(ticketVo.getId()));
}
}