部分修改

heheng

2024-11-21 b3631dd074d7fa5520f7afcf2cdc1ab681700e7c

部分修改

 expert-admin/src/main/java/com/gkhy/web/controller/bussiness/ExpertClassifyController.java

@@ -22,7 +22,7 @@
    @ApiOperation(value = "专家分类列表(树形)")
    @GetMapping("/tree")
    @Anonymous
    @RepeatSubmit
   // @RepeatSubmit
    public AjaxResult classifyTree(SysExpertClassify expertClassify){
        return AjaxResult.success(expertClassifyService.classifyTree(expertClassify));
    }

 expert-admin/src/main/java/com/gkhy/web/controller/common/CommonController.java

@@ -5,6 +5,7 @@
import com.gkhy.common.config.ExpertConfig;
import com.gkhy.common.constant.Constants;
import com.gkhy.common.core.domain.AjaxResult;
import com.gkhy.common.exception.ServiceException;
import com.gkhy.common.utils.StringUtils;
import com.gkhy.common.utils.file.FileUploadUtils;
import com.gkhy.common.utils.file.FileUtils;
@@ -15,14 +16,12 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.util.ArrayList;
import java.util.List;

@@ -172,4 +171,22 @@
            log.error("下载文件失败", e);
        }
    }


    @ApiOperation(value = "删除附件")
    @DeleteMapping("/removeFile")
    public void removeFile(@RequestParam(required = true) String path){
        // 本地资源路径
        String localPath = ExpertConfig.getProfile();
        // 数据库资源地址
        String deletePath = localPath + path;
        File dirFile=new File(deletePath);
        if(!dirFile.exists()){
            throw new ServiceException("文件不存在");
        }
        if(!dirFile.isFile()){
            throw new ServiceException("非文件，不能删除");
        }
        dirFile.delete();
    }
}

 expert-system/src/main/java/com/gkhy/system/domain/ProjectFile.java

@@ -7,8 +7,8 @@
import com.gkhy.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@@ -20,8 +20,10 @@
 * @author expert
 * @date 2024-11-14
 */
@EqualsAndHashCode(callSuper = true)
@TableName(resultMap = "com.gkhy.system.mapper.ProjectFileMapper.ProjectFileResult")
@ApiModel(value = "项目附件对象", description = "项目附件对象表")
@Data
public class ProjectFile extends BaseEntity {
    private static final long serialVersionUID = 1L;

@@ -66,6 +68,12 @@
    private String fileName;

    /**
     * 附件名称
     */
    @ApiModelProperty(value = "附件原名称")
    private String originalFileName;

    /**
     * 后缀
     */
    @ApiModelProperty(value = "后缀")
@@ -94,112 +102,5 @@
     */
    private Long delFlag;

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

    public Long getId() {
        return id;
    }

    public void setProjectId(Long projectId) {
        this.projectId = projectId;
    }

    public Long getProjectId() {
        return projectId;
    }

    public void setModule(String module) {
        this.module = module;
    }

    public String getModule() {
        return module;
    }

    public void setFilePath(String filePath) {
        this.filePath = filePath;
    }

    public String getFilePath() {
        return filePath;
    }

    public void setFileUrl(String fileUrl) {
        this.fileUrl = fileUrl;
    }

    public String getFileUrl() {
        return fileUrl;
    }

    public void setFileName(String fileName) {
        this.fileName = fileName;
    }

    public String getFileName() {
        return fileName;
    }

    public void setFileSuffix(String fileSuffix) {
        this.fileSuffix = fileSuffix;
    }

    public String getFileSuffix() {
        return fileSuffix;
    }

    public void setFileDesc(String fileDesc) {
        this.fileDesc = fileDesc;
    }

    public String getFileDesc() {
        return fileDesc;
    }

    public void setFileSize(Long fileSize) {
        this.fileSize = fileSize;
    }

    public Long getFileSize() {
        return fileSize;
    }

    public void setFileType(String fileType) {
        this.fileType = fileType;
    }

    public String getFileType() {
        return fileType;
    }

    public void setDelFlag(Long delFlag) {
        this.delFlag = delFlag;
    }

    public Long getDelFlag() {
        return delFlag;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                .append("id", getId())
                .append("projectId", getProjectId())
                .append("module", getModule())
                .append("filePath", getFilePath())
                .append("fileUrl", getFileUrl())
                .append("fileName", getFileName())
                .append("fileSuffix", getFileSuffix())
                .append("fileDesc", getFileDesc())
                .append("fileSize", getFileSize())
                .append("fileType", getFileType())
                .append("delFlag", getDelFlag())
                .append("createBy", getCreateBy())
                .append("createTime", getCreateTime())
                .append("updateBy", getUpdateBy())
                .append("updateTime", getUpdateTime())
                .toString();
    }
}

 expert-system/src/main/java/com/gkhy/system/domain/SysExpertInfo.java

@@ -6,8 +6,8 @@
import com.gkhy.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.hibernate.validator.constraints.Length;

@@ -26,8 +26,8 @@
 * @author kzy
 * @since 2023-11-27 16:33:33
 */
@Getter
@Setter
@EqualsAndHashCode(callSuper = true)
@Data
@TableName("sys_expert_info")
@Accessors(chain = true)
@ApiModel(value = "SysExpertInfo对象", description = "系统专家信息表")
@@ -213,10 +213,12 @@

    @JsonFormat(pattern = "yyyy-MM-dd")
    @TableField("employment_date_start")
    @ApiModelProperty("聘书有效开始时间")
    private Date employmentDateStart;

    @JsonFormat(pattern = "yyyy-MM-dd")
    @TableField("employment_date_end")
    @ApiModelProperty("聘书有效结束时间")
    private Date employmentDateEnd;

    @NotNull(message ="业务处室不能为空" )
@@ -224,7 +226,7 @@
    @TableField("dept_id")
    private Long deptId;

    @ApiModelProperty("专家证书")
    @ApiModelProperty("专家聘书")
    @TableField("expert_certificate")
    private String expertCertificate;


 expert-system/src/main/java/com/gkhy/system/domain/vo/request/ProjectArchiveReq.java

@@ -23,14 +23,14 @@
    private Long id;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(name = "项目结束日期",required = true)
    @ApiModelProperty(value = "项目结束日期",required = true)
    @NotNull(message = "结束日期必填")
    private Date projectEndTime;

    @ApiModelProperty(name = "项目总结")
    @ApiModelProperty(value = "项目总结")
    private String desc;

    @ApiModelProperty(name = "项目附件")
    @ApiModelProperty(value = "项目附件")
    private List<ProjectFile> projectFile;

}

 expert-system/src/main/java/com/gkhy/system/domain/vo/request/ProjectCheckReq.java

@@ -14,7 +14,7 @@
public class ProjectCheckReq implements Serializable {
    private static final long serialVersionUID = 1L;

    @ApiModelProperty(name = "审批状态(3审批通过、1审批不通)",required = true)
    @ApiModelProperty(value = "审批状态(3审批通过、1审批不通)",required = true)
    @NotNull(message = "参数不能为空")
    private Long state;

@@ -22,6 +22,6 @@
    @NotNull
    private Long id;

    @ApiModelProperty(name = "项目附件-类型1审批单附件")
    @ApiModelProperty(value = "项目附件-类型1审批单附件")
    private List<ProjectFile> projectFile;
}

 expert-system/src/main/java/com/gkhy/system/domain/vo/request/ProjectExpertSaveBatchReqDto.java

@@ -24,7 +24,10 @@
    /**
     * 项目id
     */
    @ApiModelProperty(name = "项目id",required = true)
    @ApiModelProperty(value = "项目id",required = true)
    @NotNull(message = "项目不能为空")
    private Long id;

    @ApiModelProperty(value = "步骤1暂存2专家选取3审批4完结")
    private Long step;
}

 expert-system/src/main/java/com/gkhy/system/domain/vo/request/ProjectExpertSaveReqDto.java

@@ -29,11 +29,11 @@
//    @ApiModelProperty(name = "项目名称",required = true)
//    @NotNull(message = "项目不能为空")
//    private Long projectId;
    @ApiModelProperty(name = "专家id",required = true)
    @ApiModelProperty(value = "专家id",required = true)
    @NotNull(message = "选择专家")
    private Long expertId;

    @ApiModelProperty(name = "专家名称",required = true)
    @ApiModelProperty(value = "专家名称",required = true)
    @NotBlank(message = "选择专家名称")
    private String expertName;

@@ -49,11 +49,11 @@
//    @ApiModelProperty(name = "评估状态0未评估1已评估")
//    private Long evaluationState;

    @ApiModelProperty(name = "选取方式1固定2随机",required = true)
    @ApiModelProperty(value = "选取方式1固定2随机",required = true)
    @NotNull(message = "选取方式不能为空")
    private Long selectionMode;

    @ApiModelProperty(name = "是否组长0否1是",required = true)
    @ApiModelProperty(value = "是否组长0否1是",required = true)
    @NotNull(message = "是否组长不能为空")
    private Long teamLeader;


 expert-system/src/main/java/com/gkhy/system/domain/vo/request/ProjectExpertTeamLeaderReqDto.java

@@ -14,7 +14,7 @@
    @NotNull
    private Long id;

    @ApiModelProperty(name = "是否组长0否1是",required = true)
    @ApiModelProperty(value = "是否组长0否1是",required = true)
    @NotNull(message = "是否组长不能为空")
    private Long teamLeader;
}

 expert-system/src/main/java/com/gkhy/system/domain/vo/request/ProjectManageSaveReq.java

@@ -24,41 +24,41 @@
    /**
     * 项目名称
     */
    @ApiModelProperty(name = "项目名称",required = true)
    @ApiModelProperty(value = "项目名称",required = true)
    @NotBlank(message = "项目名称不能为空")
    private String projectName;

    /**
     * 处室
     */
    @ApiModelProperty(name = "处室",required = true)
    @ApiModelProperty(value = "处室",required = true)
    @NotNull(message = "处室不能为空")
    private Long deptId;

    /**
     * 部门名称
     */
    @ApiModelProperty(name = "处室名称",required = true)
    @ApiModelProperty(value = "处室名称",required = true)
    @NotBlank(message = "处室不能为空")
    private String deptName;

    /**
     * 被检单位
     */
    @ApiModelProperty(name = "被检单位")
    @ApiModelProperty(value = "被检单位")
    private String companyName;

    /**
     * 项目地址
     */
    @ApiModelProperty(name = "项目地址",required = true)
    @ApiModelProperty(value = "项目地址",required = true)
    @NotBlank(message = "项目地址不能为空")
    private String projectAddress;

    /**
     * 部门带队人员
     */
    @ApiModelProperty(name = "部门带队人员",required = true)
    @ApiModelProperty(value = "部门带队人员",required = true)
    @NotBlank(message = "处室带队人员不能为空")
    private String deptUserName;

@@ -66,7 +66,7 @@
     * 项目预计开始日期
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty(name = "项目预计开始日期",required = true)
    @ApiModelProperty(value = "项目预计开始日期",required = true)
    @NotNull(message = "项目预计开始日期不能为空")
    private Date projectDateStart;

@@ -74,12 +74,12 @@
     * 项目预计结束日期
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty(name = "项目预计结束日期", required = true)
    @ApiModelProperty(value = "项目预计结束日期", required = true)
    @NotNull(message = "项目预计结束日期不能为空")
    private Date projectDateEnd;


    @ApiModelProperty(name = "项目概况",required = true)
    @ApiModelProperty(value = "项目概况",required = true)
    @NotBlank(message = "项目概况不能为空")
    private String remark;
}

 expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectExpertCheckResp.java

@@ -10,10 +10,10 @@
public class ProjectExpertCheckResp implements Serializable {
    private static final long serialVersionUID = 1L;

    @ApiModelProperty(name = "项目专家id")
    @ApiModelProperty(value = "项目专家id")
    private Long id;

    @ApiModelProperty(name = "专家id")
    @ApiModelProperty(value = "专家id")
    private Long expertId;

    @ApiModelProperty("专家名称")
@@ -25,10 +25,10 @@
    @ApiModelProperty("身份证号码")
    private String idCard;

    @ApiModelProperty(name = "选取方式1固定2随机")
    @ApiModelProperty(value = "选取方式1固定2随机")
    private Long selectionMode;

    @ApiModelProperty(name = "是否组长0否1是")
    @ApiModelProperty(value = "是否组长0否1是")
    private Long teamLeader;

    @ApiModelProperty("评定等级1、一级，2、二级，3、三级")

 expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectExpertEvaluationResp.java

@@ -14,12 +14,12 @@
    /**
     * 总分
     */
    @ApiModelProperty(name = "总分")
    @ApiModelProperty(value = "总分")
    private Long score;

    /**
     * 评估状态0未评估1已评估
     */
    @ApiModelProperty(name = "评估状态0未评估1已评估")
    @ApiModelProperty(value = "评估状态0未评估1已评估")
    private Long evaluationState;
}

 expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectExpertManagementInfoRes.java

@@ -49,14 +49,14 @@
    /**
     * 项目地址
     */
    @ApiModelProperty(name = "项目地址")
    @ApiModelProperty(value = "项目地址")
    private String projectAddress;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(name = "项目审批时间")
    @ApiModelProperty(value = "项目审批时间")
    private Date projectCheckTime;

    @ApiModelProperty(name = "审批状态(0暂存，1选取专家，2生成审批单，3审批通过，4完结)")
    @ApiModelProperty(value = "审批状态(0暂存，1选取专家，2生成审批单，3审批通过，4完结)")
    private String state;

    @ApiModelProperty(value = "步骤1暂存2专家选取3审批4完结")

 expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectExpertResp.java

@@ -22,16 +22,16 @@
    /**
     * 项目名称
     */
    @ApiModelProperty(name = "项目名称")
    @ApiModelProperty(value = "项目名称")
    private String projectName;

    @ApiModelProperty(name = "项目id")
    @ApiModelProperty(value = "项目id")
    private Long projectId;

    @ApiModelProperty(name = "总分")
    @ApiModelProperty(value = "总分")
    private Long score;

    @ApiModelProperty(name = "专家id")
    @ApiModelProperty(value = "专家id")
    private Long expertId;

    @ApiModelProperty("专家名称")
@@ -41,17 +41,17 @@
    @ApiModelProperty("身份证号码")
    private String idCard;

    @ApiModelProperty(name = "选取方式1固定2随机")
    @ApiModelProperty(value = "选取方式1固定2随机")
    private Long selectionMode;

    @ApiModelProperty(name = "是否组长0否1是")
    @ApiModelProperty(value = "是否组长0否1是")
    private Long teamLeader;

    @ApiModelProperty("专家领域")
    private String domain;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(name = "评审时间")
    @ApiModelProperty(value = "评审时间")
    private Date updateTime;

}

 expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectExpertSectionResp.java

@@ -11,7 +11,7 @@
public class ProjectExpertSectionResp implements Serializable {
    private static final long serialVersionUID = 1L;

    @ApiModelProperty(name = "专家id")
    @ApiModelProperty(value = "专家id")
    private Long id;

    @ApiModelProperty("专家名称")

 expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectExpertStateResp.java

@@ -15,23 +15,23 @@

    private Long id;

    @ApiModelProperty(name = "项目名称")
    @ApiModelProperty(value = "项目名称")
    private String projectName;

    @ApiModelProperty(name = "评估状态0未评估1已评估")
    @ApiModelProperty(value = "评估状态0未评估1已评估")
    private Long evaluationState;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(name = "项目审批时间")
    @ApiModelProperty(value = "项目审批时间")
    private Date projectCheckTime;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(name = "项目结束日期")
    @ApiModelProperty(value = "项目结束日期")
    private Date projectEndTime;

    @ApiModelProperty(name = "处室名称")
    @ApiModelProperty(value = "处室名称")
    private String deptName;

    @ApiModelProperty(name = "专家人数")
    @ApiModelProperty(value = "专家人数")
    private Long expertNum;
}

 expert-system/src/main/java/com/gkhy/system/mapper/SysExpertInfoMapper.java

@@ -6,7 +6,6 @@
import com.gkhy.system.domain.vo.request.SysExpertSearchReqDto;
import com.gkhy.system.domain.vo.response.ProjectExpertSectionResp;
import com.gkhy.system.domain.vo.response.SysExpertSearchRep;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;
@@ -19,7 +18,7 @@
 * @author kzy
 * @since 2023-11-27 16:33:33
 */
@Mapper

public interface SysExpertInfoMapper extends BaseMapper<SysExpertInfo> {
    /**
     * 根据条件获取专家信息列表

 expert-system/src/main/java/com/gkhy/system/service/IProjectFileService.java

对比新文件
@@ -0,0 +1,25 @@
package com.gkhy.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.gkhy.system.domain.ProjectFile;

import java.util.List;

/**
 * 项目附件Service接口
 *
 * @author expert
 * @date 2024-11-14
 */
public interface IProjectFileService extends IService<ProjectFile> {


    /**
     * 新增项目附件
     *
     * @param projectFile 项目附件
     * @return 结果
     */
    public Boolean saveBatchProjectFile(List<ProjectFile> projectFile);

}

 expert-system/src/main/java/com/gkhy/system/service/impl/ProjectFileServiceImpl.java

对比新文件
@@ -0,0 +1,28 @@
package com.gkhy.system.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.system.domain.ProjectFile;
import com.gkhy.system.mapper.ProjectFileMapper;
import com.gkhy.system.service.IProjectFileService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * 项目附件Service业务层处理
 *
 * @author expert
 * @date 2024-11-14
 */
@Service
public class ProjectFileServiceImpl extends ServiceImpl<ProjectFileMapper, ProjectFile> implements IProjectFileService {
    @Autowired
    private ProjectFileMapper projectFileMapper;


    @Override
    public Boolean saveBatchProjectFile(List<ProjectFile> projectFile) {
        return saveBatch(projectFile);
    }
}

 expert-system/src/main/java/com/gkhy/system/service/impl/ProjectManagementServiceImpl.java

@@ -17,6 +17,7 @@
import com.gkhy.system.mapper.ProjectExpertMapper;
import com.gkhy.system.mapper.ProjectFileMapper;
import com.gkhy.system.mapper.ProjectManagementMapper;
import com.gkhy.system.service.IProjectFileService;
import com.gkhy.system.service.IProjectManagementService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -44,6 +45,9 @@

    @Autowired
    private ProjectExpertDetailMapper projectExpertDetailMapper;

    @Autowired
    private IProjectFileService projectFileService;

    /**
     * 查询项目管理
@@ -130,11 +134,11 @@
            throw new ServiceException("固定专家不能为空！");
        }

        if (projectManagement1.getStep() == 1 || projectManagement1.getStep() == 2){
        if ((projectManagement1.getStep() == 1 || projectManagement1.getStep() == 2) && (projectManagement.getStep() == 2 ) ){
            projectManagementSave.setStep(2L);
            projectManagementSave.setState(1L);
        }else if (projectManagement1.getStep() == 3){
            projectManagementSave.setStep(3L);
        }else if (projectManagement1.getStep() == 2 && projectManagement.getStep() == 3){
            projectManagementSave.setStep(2L);
            projectManagementSave.setState(2L);
            projectManagementSave.setProjectCheckTime(new Date());
            List<ProjectExpertSaveReqDto> collect = saveData.stream()
@@ -179,7 +183,6 @@
                throw new ServiceException("保存专家失败！");
            }
        }

        int i = projectManagementMapper.updateProjectManagement(projectManagementSave);
        if (i < 1){
            throw new ServiceException("保存专家失败！");
@@ -267,14 +270,9 @@
        if (req.getState() != 3L &&  req.getState() != 1 ){
            throw new ServiceException("参数异常！");
        }
        if (projectManagement.getStep() != 3){
            throw new ServiceException("非审批步骤！");
        }
        Long state = projectManagement.getState();
        if (req.getState() == 3 && state != 2){
        if (state != 2){
            throw new ServiceException("未生成审批单不可审批通过操作！");
        }else if (req.getState() == 1 && state != 2){
            throw new ServiceException("不可操作！");
        }

        List<ProjectFile> projectFile = req.getProjectFile();
@@ -283,7 +281,7 @@
        projectManagementUp.setState(req.getState());
        projectManagementUp.setUpdateBy(SecurityUtils.getUsername());
        if (req.getState() == 3){
            projectManagementUp.setStep(4L);
            projectManagementUp.setStep(3L);
        }else if (req.getState() == 1){
            projectManagementUp.setStep(2L);
        }
@@ -300,8 +298,9 @@
                file.setCreateBy(username);
                file.setProjectId(req.getId());
            });
            int i1 = projectFileMapper.insertProjectFiles(projectFile);
            if (i1 < 1){
            //int i1 = projectFileMapper.insertProjectFiles(projectFile);
            Boolean b = projectFileService.saveBatchProjectFile(projectFile);
            if (!b){
                throw new ServiceException("保存附件失败！");
            }
        }
@@ -319,6 +318,7 @@
        ProjectManagement projectManagementUp = new ProjectManagement();
        projectManagementUp.setId(req.getId());
        projectManagementUp.setState(4L);
        projectManagementUp.setStep(4L);
        projectManagementUp.setDesc(req.getDesc());
        projectManagementUp.setProjectEndTime(req.getProjectEndTime());
        projectManagementUp.setUpdateBy(SecurityUtils.getUsername());
@@ -329,8 +329,12 @@
                file.setCreateBy(username);
                file.setProjectId(req.getId());
            });
            int i1 = projectFileMapper.insertProjectFiles(projectFile);
            if (i1 < 1){
//            int i1 = projectFileMapper.insertProjectFiles(projectFile);
//            if (i1 < 1){
//                throw new ServiceException("保存附件失败！");
//            }
            Boolean b = projectFileService.saveBatchProjectFile(projectFile);
            if (!b){
                throw new ServiceException("保存附件失败！");
            }
        }

 expert-system/src/main/java/com/gkhy/system/service/impl/SysExpertInfoServiceImpl.java

@@ -103,9 +103,10 @@
    @Override
    public boolean changeApprove(SysExpertInfo expertInfo) {
        checkExpertInfoDataScope(expertInfo.getId());
        SysExpertInfo se=new SysExpertInfo().setId(expertInfo.getId()).setState(expertInfo.getState());
        se.setUpdateBy(SecurityUtils.getUsername());
        return updateById(se);
        //SysExpertInfo se=new SysExpertInfo().setId(expertInfo.getId()).setState(expertInfo.getState());
        expertInfo.setUpdateBy(SecurityUtils.getUsername());
//        se.setUpdateBy(SecurityUtils.getUsername());
        return updateById(expertInfo);
    }

    @Override

 expert-system/src/main/resources/mapper/system/ProjectFileMapper.xml

@@ -11,6 +11,7 @@
        <result property="filePath"    column="file_path"    />
        <result property="fileUrl"    column="file_url"    />
        <result property="fileName"    column="file_name"    />
        <result property="originalFileName" column="original_file_name"/>
        <result property="fileSuffix"    column="file_suffix"    />
        <result property="fileDesc"    column="file_desc"    />
        <result property="fileSize"    column="file_size"    />
@@ -23,7 +24,8 @@
    </resultMap>

    <sql id="selectProjectFileVo">
        select id, project_id, module, file_path, file_url, file_name, file_suffix, file_desc, file_size, file_type, del_flag, create_by, create_time, update_by, update_time from project_file
        select id, project_id, module, file_path, file_url, file_name, file_suffix, file_desc,
            original_file_name,file_size, file_type, del_flag, create_by, create_time, update_by, update_time from project_file
    </sql>

    <select id="selectProjectFileList" parameterType="ProjectFile" resultMap="ProjectFileResult">
@@ -55,6 +57,7 @@
            <if test="filePath != null">file_path,</if>
            <if test="fileUrl != null">file_url,</if>
            <if test="fileName != null">file_name,</if>
            <if test="originalFileName != null">original_file_name,</if>
            <if test="fileSuffix != null">file_suffix,</if>
            <if test="fileDesc != null">file_desc,</if>
            <if test="fileSize != null">file_size,</if>
@@ -71,6 +74,7 @@
            <if test="filePath != null">#{filePath},</if>
            <if test="fileUrl != null">#{fileUrl},</if>
            <if test="fileName != null">#{fileName},</if>
            <if test="originalFileName != null">#{originalFileName},</if>
            <if test="fileSuffix != null">#{fileSuffix},</if>
            <if test="fileDesc != null">#{fileDesc},</if>
            <if test="fileSize != null">#{fileSize},</if>

 expert-system/src/main/resources/mapper/system/ProjectManagementMapper.xml

@@ -64,7 +64,7 @@
        select id, project_name, dept_id, dept_name, company_name, project_address, dept_user_name,
               version, state, remark, project_date_start, project_date_end, expert_certificate,
               evaluation_state, expert_num, del_flag, create_by, create_time, update_by, update_time,project_check_time,expert_id,
               expert_name,project_end_time,'desc',step
               expert_name,project_end_time,`desc`,step
        from project_management
    </sql>


 expert-system/src/main/resources/mapper/system/SysExpertInfoMapper.xml

@@ -8,7 +8,7 @@
               graduation_school,degree,speciality,current_profession,support_direction_safety,
               support_direction_prevention,support_direction_emergency,resume_key,paper_situation_key,
               reward_key,achievement_key,personal_opinion_key,recommend_unit_opinion_key,remark,create_by,
               create_time,big_classify,small_classify,del_flag,source,rating_level,employment_date_start,employment_date_end,expert_certificate,dept_id
               create_time,big_classify,small_classify,del_flag,source,rating_level,employment_date_start,employment_date_end,expert_certificate,dept_id,domain
        from sys_expert_info
    </sql>

@@ -21,12 +21,16 @@

    <select id="expertInfoList" resultType="com.gkhy.system.domain.SysExpertInfo">
        select id,name,sex,birthday,phone,title,degree,state,speciality,big_classify,small_classify,id_card,company_name,
            domain,level,current_profession,duty_status,support_direction_safety,create_time,rating_level,employment_date_start,employment_date_end,expert_certificate from sys_expert_info
            domain,level,current_profession,duty_status,support_direction_safety,support_direction_prevention,support_direction_emergency,create_time,
            rating_level,employment_date_start,employment_date_end,expert_certificate from sys_expert_info
        <where>
            and del_flag = 0
            <if test="name != null and name != ''">
                and name like concat('%', #{name}, '%')
            </if>
            <if test="idCard != null and idCard != ''">
                and id_card like concat('%', #{idCard}, '%')
            </if>
            <if test="bigClassify != null">
                and big_classify = #{bigClassify}
            </if>