Merge remote-tracking branch 'origin/master'

zss

2024-05-31 781f2999683ca99577026df7ef4b748bf6366dac

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java

 inspect-server/src/main/java/com/yuanchu/mom/controller/InsBushingController.java

@@ -1,7 +1,12 @@
package com.yuanchu.mom.controller;

import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.service.InsBushingService;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@@ -19,4 +24,13 @@
@RequestMapping("/insBushing")
public class InsBushingController {

    private InsBushingService insBushingService;

    @ValueAuth
    @ApiModelProperty("/通过样品id获取样品下光纤配置内容")
    @PostMapping("/selectBushingBySampleId")
    public Result<?> selectBushingBySampleId(Integer sampleId){
        return Result.success(insBushingService.selectBushingBySampleId(sampleId));
    }

}

 inspect-server/src/main/java/com/yuanchu/mom/dto/BushingDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package com.yuanchu.mom.dto;

import com.yuanchu.mom.pojo.InsBushing;
import lombok.Data;

import java.util.List;

@Data
public class BushingDto extends InsBushing {

    private List<FiberDto> fiber;

    private List<FibersDto> fibers;

}

 inspect-server/src/main/java/com/yuanchu/mom/dto/FiberDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package com.yuanchu.mom.dto;

import com.yuanchu.mom.pojo.InsFiber;
import com.yuanchu.mom.pojo.InsProduct;
import lombok.Data;

import java.util.List;

@Data
public class FiberDto extends InsFiber {

    private List<InsProduct> productList;

}

 inspect-server/src/main/java/com/yuanchu/mom/dto/FibersDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
package com.yuanchu.mom.dto;

import com.yuanchu.mom.pojo.InsFibers;
import com.yuanchu.mom.pojo.InsProduct;
import lombok.Data;

import java.util.List;

@Data
public class FibersDto extends InsFibers {

    private List<FiberDto> fiber;

    private List<InsProduct> productList;

}

 inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto.java

@@ -11,4 +11,6 @@

    private List<InsProduct> insProduct;

    private List<BushingDto> bushing;

}

 inspect-server/src/main/java/com/yuanchu/mom/mapper/InsBushingMapper.java

@@ -1,7 +1,11 @@
package com.yuanchu.mom.mapper;

import com.yuanchu.mom.pojo.InsBushing;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.mom.dto.FiberDto;
import com.yuanchu.mom.dto.FibersDto;
import com.yuanchu.mom.pojo.InsBushing;

import java.util.List;

/**
 * <p>
@@ -13,4 +17,10 @@
 */
public interface InsBushingMapper extends BaseMapper<InsBushing> {

    List<FibersDto> selectFibersByBushingId(Integer bushingId);

    List<FiberDto> selectFiberByBushingId(Integer bushingId);

    List<FiberDto> selectFiberByFibersId(Integer fibersId);

}

 inspect-server/src/main/java/com/yuanchu/mom/pojo/InsFiber.java

@@ -1,19 +1,15 @@
package com.yuanchu.mom.pojo;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;

import com.baomidou.mybatisplus.annotation.*;
import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.common.OrderBy;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

import java.io.Serializable;
import java.time.LocalDateTime;

/**
 * <p>
@@ -47,9 +43,6 @@
    @ApiModelProperty("参考标准")
    @ValueTableShow(5)
    private String standard;

    @ApiModelProperty("关联 æ£€æµ‹é¡¹ç›®id")
    private Integer insProductId;

    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

 inspect-server/src/main/java/com/yuanchu/mom/pojo/InsFibers.java

@@ -1,19 +1,15 @@
package com.yuanchu.mom.pojo;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;

import com.baomidou.mybatisplus.annotation.*;
import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.common.OrderBy;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

import java.io.Serializable;
import java.time.LocalDateTime;

/**
 * <p>
@@ -47,9 +43,6 @@
    @ApiModelProperty("光纤检测量")
    @ValueTableShow(5)
    private String num;

    @ApiModelProperty("关联 æ£€æµ‹é¡¹ç›®id")
    private Integer insProductId;

    @ApiModelProperty("关联  å¥—管表id")
    private Integer insBushingId;

 inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java

@@ -200,4 +200,8 @@
    private String templateName;

    private String dic;

    private Integer insFiberId;

    private Integer insFibersId;
}

 inspect-server/src/main/java/com/yuanchu/mom/service/InsBushingService.java

@@ -1,7 +1,10 @@
package com.yuanchu.mom.service;

import com.yuanchu.mom.dto.BushingDto;
import com.yuanchu.mom.pojo.InsBushing;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;

/**
 * <p>
@@ -13,4 +16,6 @@
 */
public interface InsBushingService extends IService<InsBushing> {

    List<BushingDto> selectBushingBySampleId(Integer sampleId);

}

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsBushingServiceImpl.java

@@ -1,10 +1,18 @@
package com.yuanchu.mom.service.impl;

import com.yuanchu.mom.pojo.InsBushing;
import com.yuanchu.mom.mapper.InsBushingMapper;
import com.yuanchu.mom.service.InsBushingService;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.dto.BushingDto;
import com.yuanchu.mom.dto.FibersDto;
import com.yuanchu.mom.mapper.InsBushingMapper;
import com.yuanchu.mom.pojo.InsBushing;
import com.yuanchu.mom.service.InsBushingService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;

/**
 * <p>
@@ -15,6 +23,26 @@
 * @since 2024-05-30 05:58:16
 */
@Service
@AllArgsConstructor
public class InsBushingServiceImpl extends ServiceImpl<InsBushingMapper, InsBushing> implements InsBushingService {

    private InsBushingMapper insBushingMapper;

    @Override
    public List<BushingDto> selectBushingBySampleId(Integer sampleId) {
        List<InsBushing> insBushings = insBushingMapper.selectList(Wrappers.<InsBushing>lambdaQuery().eq(InsBushing::getInsSampleId, sampleId));
        List<BushingDto> bushingDtos = new ArrayList<>();
        for (InsBushing insBushing : insBushings) {
            BushingDto bushingDto = JSON.parseObject(JSON.toJSONString(insBushing), BushingDto.class);
            bushingDto.setFiber(insBushingMapper.selectFiberByBushingId(bushingDto.getId()));
            if(bushingDto.getFiber().size()==0){
                bushingDto.setFibers(insBushingMapper.selectFibersByBushingId(insBushing.getId()));
                for (FibersDto fibers : bushingDto.getFibers()) {
                    fibers.setFiber(insBushingMapper.selectFiberByFibersId(fibers.getId()));
                }
            }
            bushingDtos.add(bushingDto);
        }
        return bushingDtos;
    }
}

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java

@@ -9,10 +9,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.dto.CostStatisticsDto;
import com.yuanchu.mom.dto.SampleOrderDto;
import com.yuanchu.mom.dto.SampleProductDto;
import com.yuanchu.mom.dto.SampleProductDto2;
import com.yuanchu.mom.dto.*;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
@@ -58,6 +55,12 @@
    UserMapper userMapper;

    PowerMapper powerMapper;

    private InsBushingMapper insBushingMapper;

    private InsFibersMapper insFibersMapper;

    private InsFiberMapper insFiberMapper;

    CustomMapper customMapper;

@@ -133,23 +136,61 @@
            }
            insSampleMapper.insert(a);
            if (ObjectUtil.isNotEmpty(a.getInsProduct())) {
                for (InsProduct product : a.getInsProduct()) {
                    product.setId(null);
                    product.setCreateTime(null);
                    product.setUpdateTime(null);
                    product.setUpdateTime(null);
                    product.setUpdateUser(null);
                    product.setInsSampleId(a.getId());
                    if (product.getInspectionItemSubclass() == null) {
                        product.setInspectionItemSubclass("");
                addInsProductMethod(a.getId(), a.getInsProduct(), null, 0);
            }
            if (ObjectUtil.isNotEmpty(a.getBushing())) {
                for (BushingDto bushingDto : a.getBushing()) {
                    bushingDto.setInsSampleId(a.getInsOrderId());
                    insBushingMapper.insert(bushingDto);
                    if(bushingDto.getFiber().size()!=0){
                        for (FiberDto fiberDto : bushingDto.getFiber()) {
                            fiberDto.setInsBushingId(bushingDto.getId());
                            insFiberMapper.insert(fiberDto);
                            addInsProductMethod(a.getId(), fiberDto.getProductList(), fiberDto.getId(), 2);
                        }
                    }else{
                        for (FibersDto fibersDto : bushingDto.getFibers()) {
                            fibersDto.setInsBushingId(bushingDto.getId());
                            insFibersMapper.insert(fibersDto);
                            for (FiberDto fiberDto : fibersDto.getFiber()) {
                                fiberDto.setInsFibersId(fibersDto.getId());
                                insFiberMapper.insert(fiberDto);
                                addInsProductMethod(a.getId(), fiberDto.getProductList(), fiberDto.getId(), 2);
                            }
                            addInsProductMethod(a.getId(), fibersDto.getProductList(), fibersDto.getId(), 1);
                        }
                    }
                    insProductMapper.insert(product);
                }
            }
        });
        return insOrder.getId();
    }

    private void addInsProductMethod(Integer sampleId, List<InsProduct> productList, Integer id, Integer type) {
        for (InsProduct product : productList) {
            if(product.getState()==1){
                switch (type){
                    case 1:
                        product.setInsFibersId(id);
                        break;
                    case 2:
                        product.setInsFiberId(id);
                        break;
                }
                product.setId(null);
                product.setCreateTime(null);
                product.setUpdateTime(null);
                product.setUpdateTime(null);
                product.setUpdateUser(null);
                product.setInsSampleId(sampleId);
                if (product.getInspectionItemSubclass() == null) {
                    product.setInspectionItemSubclass("");
                }
                insProductMapper.insert(product);
            }
        }
    }

    @Override
    public Map<String, Object> getInsOrder(Integer id) {
        Map<String, Object> map = new HashMap<>();

 inspect-server/src/main/resources/mapper/InsBushingMapper.xml

@@ -14,5 +14,85 @@
        <result column="update_user" property="updateUser" />
        <result column="update_time" property="updateTime" />
    </resultMap>
    <select id="selectFibersByBushingId" resultMap="FibersDto">
        select
            fs.id, fs.code, fs.model, fs.standard, fs.num, fs.ins_bushing_id,
            p.id pid, p.inspection_item, p.inspection_item_classify, p.inspection_item_subclass, p.factory, p.laboratory, p.sample_type, p.sample, p.model pmodel, p.son_laboratory, p.unit, p.price, p.man_hour, p.man_hour_group, p.inspection_item_type, p.inspection_value_type, p.device_group, p.checkout_number, p.section, p.value_type, p.method, p.man_day, p.bsm, p.ask, p.tell, p.`last_value`, p.ins_result, p.state, p.ins_sample_id, p.template_id, p.dic, p.method_s
        from ins_fibers fs
        left join ins_product p on p.ins_fibers_id = fs.id
        where fs.ins_bushing_id = #{bushingId}
    </select>

    <select id="selectFiberByBushingId" resultMap="FiberDto">
        select f.id, f.bush_color, f.color, f.model, f.standard, f.ins_bushing_id,
            p.id pid, p.inspection_item, p.inspection_item_classify, p.inspection_item_subclass, p.factory, p.laboratory, p.sample_type, p.sample, p.model pmodel, p.son_laboratory, p.unit, p.price, p.man_hour, p.man_hour_group, p.inspection_item_type, p.inspection_value_type, p.device_group, p.checkout_number, p.section, p.value_type, p.method, p.man_day, p.bsm, p.ask, p.tell, p.`last_value`, p.ins_result, p.state, p.ins_sample_id, p.template_id, p.dic, p.method_s
        from ins_fiber f
        left join ins_product p on p.ins_fiber_id = f.id
        where f.ins_bushing_id = #{bushingId}
    </select>

    <select id="selectFiberByFibersId" resultMap="FiberDto">
        select f.id, f.bush_color, f.color, f.model, f.standard, f.ins_bushing_id,
               p.id pid, p.inspection_item, p.inspection_item_classify, p.inspection_item_subclass, p.factory, p.laboratory, p.sample_type, p.sample, p.model pmodel, p.son_laboratory, p.unit, p.price, p.man_hour, p.man_hour_group, p.inspection_item_type, p.inspection_value_type, p.device_group, p.checkout_number, p.section, p.value_type, p.method, p.man_day, p.bsm, p.ask, p.tell, p.`last_value`, p.ins_result, p.state, p.ins_sample_id, p.template_id, p.dic, p.method_s
        from ins_fiber f
        left join ins_product p on p.ins_fiber_id = f.id
        where f.ins_fibers_id = #{fibersId}
    </select>

    <resultMap id="FibersDto" type="com.yuanchu.mom.dto.FibersDto">
        <id property="id" column="id"/>
        <result property="code" column="code"/>
        <result property="insBushingId" column="ins_bushing_id"/>
        <result property="model" column="model"/>
        <result property="standard" column="standard"/>
        <result property="num" column="num"/>
        <collection property="productList" resultMap="product"/>
    </resultMap>

    <resultMap id="FiberDto" type="com.yuanchu.mom.dto.FiberDto">
        <id property="id" column="id"/>
        <result property="bushColor" column="bush_color"/>
        <result property="insBushingId" column="ins_bushing_id"/>
        <result property="model" column="model"/>
        <result property="standard" column="standard"/>
        <result property="color" column="color"/>
        <collection property="productList" resultMap="product"/>
    </resultMap>

    <resultMap id="product" type="com.yuanchu.mom.pojo.InsProduct">
        <id property="id" column="pid" jdbcType="INTEGER"/>
        <result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
        <result property="inspectionItemClassify" column="inspection_item_classify" jdbcType="VARCHAR"/>
        <result property="inspectionItemSubclass" column="inspection_item_subclass" jdbcType="VARCHAR"/>
        <result property="factory" column="factory" jdbcType="VARCHAR"/>
        <result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
        <result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
        <result property="sample" column="sample" jdbcType="VARCHAR"/>
        <result property="model" column="pmodel" jdbcType="VARCHAR"/>
        <result property="sonLaboratory" column="son_laboratory" jdbcType="VARCHAR"/>
        <result property="unit" column="unit" jdbcType="VARCHAR"/>
        <result property="price" column="price" jdbcType="DECIMAL"/>
        <result property="manHour" column="man_hour" jdbcType="DOUBLE"/>
        <result property="manHourGroup" column="man_hour_group" jdbcType="VARCHAR"/>
        <result property="inspectionItemType" column="inspection_item_type" jdbcType="VARCHAR"/>
        <result property="inspectionValueType" column="inspection_value_type" jdbcType="VARCHAR"/>
        <result property="deviceGroup" column="device_group" jdbcType="VARCHAR"/>
        <result property="checkoutNumber" column="checkout_number" jdbcType="INTEGER"/>
        <result property="section" column="section" jdbcType="VARCHAR"/>
        <result property="valueType" column="value_type" jdbcType="VARCHAR"/>
        <result property="method" column="method" jdbcType="VARCHAR"/>
        <result property="manDay" column="man_day" jdbcType="INTEGER"/>
        <result property="bsm" column="bsm" jdbcType="VARCHAR"/>
        <result property="ask" column="ask" jdbcType="VARCHAR"/>
        <result property="lastValue" column="last_value" jdbcType="VARCHAR"/>
        <result property="insResult" column="ins_result" jdbcType="INTEGER"/>
        <result property="state" column="state" jdbcType="INTEGER"/>
        <result property="insSampleId" column="ins_sample_id" jdbcType="INTEGER"/>
        <result property="createUser" column="create_user" jdbcType="INTEGER"/>
        <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
        <result property="templateId" column="template_id" jdbcType="INTEGER"/>
    </resultMap>

</mapper>

 inspect-server/src/main/resources/mapper/InsSampleMapper.xml

@@ -153,6 +153,8 @@
        left join ins_product_result ipr on ip.id = ipr.ins_product_id
        where ins_order_id = #{id}
        and state = 1
        and ins_fiber_id is null
        and ins_fibers_id is null
    </select>
    <select id="getInsOrderAndSample" resultMap="sampleDto">
        select isa.*,

 user-server/src/main/resources/mapper/UserMapper.xml

@@ -40,7 +40,7 @@
        where state = 1
    </select>
    <select id="getCustom" resultType="com.yuanchu.mom.pojo.User">
        select u.id,c.company,u.name,c.code,u.phone from user u
        select u.id,c.company,u.name,c.code,u.phone,c.id departId from user u
        left join custom c on u.company = c.id
        where u.id = #{userId}
    </select>