Merge remote-tracking branch 'origin/master'

admin

2024-04-16 b169b0c298fb294adbc5bd332982908afca4e819

Merge remote-tracking branch 'origin/master'

 jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/controller/EmInspectionPlanItemsProjectController.java

@@ -7,8 +7,10 @@
import javax.servlet.http.HttpServletResponse;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jcdm.common.exception.ServiceException;
import com.jcdm.framework.websocket.WebSocketUsers;
import com.jcdm.main.em.inspectionPlanTask.domain.EmInspectionPlanTask;
import com.jcdm.main.em.inspectionPlanTask.service.IEmInspectionPlanTaskService;
@@ -44,16 +46,22 @@
    @GetMapping("/findPlanItemsProjectByPlanId")
    public AjaxResult list2(EmInspectionPlanItemsProject emInspectionPlanItemsProject)
    {
        EmInspectionPlanTask byId = emInspectionPlanTaskService.getById(emInspectionPlanItemsProject.getPlanTaskId());

        List<EmInspectionPlanItemsProject> planTaskIdList = emInspectionPlanItemsProjectService
                .list(new LambdaQueryWrapper<EmInspectionPlanItemsProject>()
                        .eq(EmInspectionPlanItemsProject::getPlanTaskId,emInspectionPlanItemsProject.getPlanTaskId())
                        .eq(EmInspectionPlanItemsProject::getItemsType,emInspectionPlanItemsProject.getItemsType()));

        if (StrUtil.isBlank(emInspectionPlanItemsProject.getPlanTaskCode())){
            throw new ServiceException("未获取到计划编号，请重试!");
        }
        Map<String,Object> resultMap = new HashMap<>();
        resultMap.put("planItemsProject", planTaskIdList);
        resultMap.put("planTask",byId);
        List<EmInspectionPlanTask> list = emInspectionPlanTaskService.list(new LambdaQueryWrapper<EmInspectionPlanTask>()
                .eq(EmInspectionPlanTask::getPlanCode, emInspectionPlanItemsProject.getPlanTaskCode()));
        if (CollUtil.isNotEmpty(list)){
            EmInspectionPlanTask byId = list.get(0);
            List<EmInspectionPlanItemsProject> planTaskIdList = emInspectionPlanItemsProjectService
                    .list(new LambdaQueryWrapper<EmInspectionPlanItemsProject>()
                            .eq(EmInspectionPlanItemsProject::getPlanTaskId,byId.getId())
                            .eq(EmInspectionPlanItemsProject::getItemsType,emInspectionPlanItemsProject.getItemsType()));

            resultMap.put("planItemsProject", planTaskIdList);
            resultMap.put("planTask",byId);
        }
        return AjaxResult.success(resultMap);
    }


 jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/domain/EmInspectionPlanItemsProject.java

@@ -1,5 +1,6 @@
package com.jcdm.main.em.inspectionPlanItemsProject.domain;

import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -12,6 +13,7 @@
 * @author Yi
 * @date 2024-03-23
 */
@Data
public class EmInspectionPlanItemsProject extends BaseEntity
{
    private static final long serialVersionUID = 1L;
@@ -55,6 +57,9 @@
    /** 任务ID */
    private Long planTaskId;

    @TableField(exist = false)
    private String planTaskCode;

    public void setId(Long id) 
    {
        this.id = id;