更新试验数据管理

whycrzg

2021-04-06 c773d0c150a4d90003bc7e3c776fe09e871cab30

更新试验数据管理

 src/main/java/com/whyc/controller/ProjectManageController.java

@@ -276,17 +276,13 @@

    /**
     * @param proNameCode
     * @param proNum
     * @return  实验名称、上传日期、归档日期 (操作TODO)
     * @return 实验名称、试验日期、结论字段 etc
     */
    @GetMapping("archiveExperimentData")
    @ApiOperation(notes = "(操作TODO)",value = "项目归档管理-试验数据")
    public Response searchArchiveExperimentData(@ApiParam(value = "项目名称代码", required = true) @RequestParam String proNameCode,
                                                                 @ApiParam(value = "项目编号", required = true) @RequestParam String proNum) {
        ProjectArchiveManage pam = new ProjectArchiveManage();
        pam.setProNum(proNum);
        pam.setProNameCode(proNameCode);
        return archiveManageService.searchArchiveExperimentData(pam);
    @ApiOperation(notes = "TODO 文件格式和下载地址", value = "项目归档管理-试验数据")
    public Response searchArchiveExperimentData(@ApiParam(value = "项目名称代码", required = true) @RequestParam String proNameCode) {
    //TODO fileName file
        return archiveManageService.searchArchiveExperimentData(proNameCode);
    }

    @GetMapping("archiveTechnologicalAchievements")

 src/main/java/com/whyc/mapper/TestPlanMapper.java

@@ -2,6 +2,10 @@

import com.whyc.pojo.TestPlan;

import java.util.List;

public interface TestPlanMapper extends CustomMapper<TestPlan> {

    //试验数据
     List<TestPlan> searchArchiveExperimentData(TestPlan testPlan);
}

 src/main/java/com/whyc/service/ProjectArchiveManageService.java

@@ -5,9 +5,11 @@
import com.whyc.dto.Response;
import com.whyc.mapper.ProjectArchiveManageMapper;
import com.whyc.mapper.ProjectManageMapper;
import com.whyc.mapper.TestPlanMapper;
import com.whyc.pojo.ProjectArchiveExperiment;
import com.whyc.pojo.ProjectArchiveManage;
import com.whyc.pojo.ProjectManage;
import com.whyc.pojo.TestPlan;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -23,6 +25,7 @@

    @Resource
    private ProjectManageMapper projectManageMapper;


    public Response searchDocumentation(ProjectArchiveManage pam) {

@@ -169,6 +172,7 @@
     * @param pam
     * @return
     */
    @Deprecated
    public Response searchArchiveExperimentData(ProjectArchiveManage pam) {
        Response<Object> response = new Response<>();
        List<ProjectArchiveExperiment> lists = projectArchiveManageMapper.searchArchiveExperimentData(pam);
@@ -245,4 +249,28 @@
        }
        return response;
    }



    @Resource
    private TestPlanMapper testPlanMapper;
    /**
     * 项目归档管理-试验数据管理
     * @param proNameCode
     * @return
     */
    public Response searchArchiveExperimentData(String proNameCode) {
        Response<Object> response = new Response<>();
        try {
            TestPlan testPlan = new TestPlan();
            testPlan.setProId(proNameCode);
            List<TestPlan> lists =  testPlanMapper.searchArchiveExperimentData(testPlan);
            response.setMsg(1, "查询成功");
            response.setData(lists);
        } catch (Exception e) {
            e.printStackTrace();
            return response.setMsg(0, "查询失败");
        }
        return response;
    }
}

 src/main/resources/mapper/TestPlanMapper.xml

@@ -2,4 +2,8 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.whyc.mapper.TestPlanMapper" >

    <select id="searchArchiveExperimentData" resultType="com.whyc.pojo.TestPlan">
        SELECT plan_name,create_time,conclusion FROM db_experiment.tb_test_plan WHERE pro_id = #{proId}

    </select>
</mapper>