update import

kongzy

2024-10-30 e7afed8cdb301a311dbad5ed23c7ff9f826b2c48

update import

 assess-system/src/main/java/com/gkhy/assess/system/domain/AssEstimateTask.java

@@ -12,6 +12,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@@ -45,7 +46,8 @@
    private Long leaderId;

    @NotBlank(message ="联系人不能为空" )
    @ApiModelProperty(value = "联系人(10个字符)",required = true)
    @Length(min=1,max=20,message = "联系人不能超过{max}字符")
    @ApiModelProperty(value = "联系人(20个字符)",required = true)
    @TableField("link_man")
    private String linkMan;


 assess-system/src/main/java/com/gkhy/assess/system/domain/SysAgency.java

@@ -126,6 +126,7 @@


    @NotBlank(message = "资质证书编号不能为空")
    @Length(min = 1, max = 20, message = "资质证书编号不能超过20位")
    @ApiModelProperty(value = "资质证书编号",required = true)
    @TableField("cert_number")
    private String certNumber;

 assess-system/src/main/java/com/gkhy/assess/system/excel/ExpertExcelListener.java

@@ -40,6 +40,8 @@
    public void invoke(SysExpertInfoExcelVO sysExpertInfoExcelVO, AnalysisContext analysisContext) {
        if(!StringUtils.isBlank(sysExpertInfoExcelVO.getName())){
            cachedDateList.add(sysExpertInfoExcelVO);
        }else{
            System.out.println("ffffff");
        }
        if(cachedDateList.size()>=BATCH_COUNT){
            saveData();
@@ -55,24 +57,28 @@
            SysExpertInfo existExpertInfo = SpringUtil.getBean(SysExpertInfoService.class).getOne(Wrappers.<SysExpertInfo>lambdaQuery()
                    .eq(true, SysExpertInfo::getIdCard, idCard)
                    .last(" limit 1"));
            direction=direction.replace("安全生产：","").trim();
            String[] splits = direction.split("、");
            List<String> safetyArray=new ArrayList<>();
            for(String str:splits){
                str=str.trim();
                String code="1";
                if(str.equals("现场检查")){
                    code="1";
                }else if(str.equals("调查评估")){
                    code="2";
                }else if(str.equals("咨询服务")){
                    code="3";
                }else if(str.equals("教育培训")){
                    code="4";
                }else{
                    code="5";
            List<String> safetyArray = new ArrayList<>();
            if(!StringUtils.isBlank(direction)) {
                direction = direction.replace("安全生产：", "").trim();
                String[] splits = direction.split("、");
                for (String str : splits) {
                    str = str.trim();
                    String code = "1";
                    if (str.equals("现场检查")) {
                        code = "1";
                    } else if (str.equals("调查评估")) {
                        code = "2";
                    } else if (str.equals("咨询服务")) {
                        code = "3";
                    } else if (str.equals("教育培训")) {
                        code = "4";
                    } else {
                        code = "5";
                    }
                    safetyArray.add(code);
                }
                safetyArray.add(code);
            }else{
                safetyArray.add("5");
            }
            if(existExpertInfo!=null){
                existExpertInfo.setState(2);

 assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssInvestigationServiceImpl.java

@@ -65,6 +65,9 @@
        accessFiles.addAll(investigation.getCompanyImages());
        accessFiles.addAll(investigation.getDeviceImages());
        accessFiles.addAll(investigation.getInvestingationImages());
        if(accessFiles.isEmpty()){
            throw new ApiException("现场勘验照片不能为空");
        }
        if(investigation.getInvestingationVideos()!=null&& !investigation.getInvestingationVideos().isEmpty()){
            accessFiles.addAll(investigation.getInvestingationVideos());
        }