修改查询条件

whycrzg

2021-03-31 d132fff555c03c097a8810d5b78a69da8d369353

修改查询条件

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

@@ -35,4 +35,6 @@
    //科技成果
    List<ProjectArchiveManage> searchArchiveTechnologicalAchievements(ProjectArchiveManage projectArchiveManage);

    //归档时间更新
    int updateProjectProgress(ProjectManage progress);
}

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

@@ -37,9 +37,10 @@
//    项目归档管理-条件查询 开始日期 OR 归档日期 根据筛选条件,如果无参数为all
    List<ProjectManage> searchArchiveByCondition(ProjectManage projectManage);

    //项目概况信息
    //项目概况信息 pro_progress = 6 归档状态
    ProjectManage searchArchiveProjectInfo(ProjectManage pm);


    //归档时间更新，progress标识更新
    int updateProjectProgress(ProjectManage progress);
}

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

@@ -82,6 +82,7 @@
            if (bl) {
                ArrayList<String> list = pm.getFileList();
                if (null != list) {
                    Date proUploadDate = new Date();
                    for (int i = 0; i < list.size(); i++) {
                        ProjectArchiveManage pam = new ProjectArchiveManage();
                        pam.setProNum(pm.getProNum());
@@ -94,7 +95,7 @@
                        int rexIdex = split[1].lastIndexOf(".");
                        pam.setProDocumentName(split[1].substring(0, rexIdex));
                        pam.setProDocumentFormat(split[1].substring(rexIdex + 1));
                        pam.setProUploadDate(new Date());
                        pam.setProUploadDate(proUploadDate);
                        projectArchiveManageMapper.insert(pam);
                    }
                }
@@ -200,10 +201,17 @@
     */
    public Response updateProjectProgress(ProjectManage progress) {
        Response<Object> response = new Response<>();
        boolean b = projectManageMapper.updateProjectProgress(progress) > 0;
        if (b) {
        TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
        progress.setProArchiveDate(new Date());
        boolean bl = projectManageMapper.updateProjectProgress(progress) > 0;
        if (bl) {
            bl = projectArchiveManageMapper.updateProjectProgress(progress) > 0;
        }
        if (bl) {
            dataSourceTransactionManager.commit(transactionStatus);
            response.setMsg(1, "更新成功");
        } else {
            dataSourceTransactionManager.rollback(transactionStatus);
            response.setMsg(0, "更新失败");
        }
        return response;

 src/main/resources/mapper/ProjectArchiveManageMapper.xml

@@ -196,6 +196,12 @@
      note = #{note,jdbcType=VARCHAR}
    where num = #{num,jdbcType=INTEGER}
  </update>
  <update id="updateProjectProgress">
    update tb_project_archive_manage
    set pro_archive_date = #{proArchiveDate,jdbcType=DATE}
    where pro_num = #{proNum}
      and pro_name_code = #{proNameCode}
  </update>

  <select id="searchByCondition" resultType="com.whyc.pojo.ProjectArchiveManage">
    SELECT *
@@ -225,13 +231,17 @@
  </select>

  <select id="searchArchiveTechnologicalAchievements" resultType="com.whyc.pojo.ProjectArchiveManage">
    SELECT achievement_name,
           achievement_type,
           gain_date,
           pro_archive_date
    FROM db_experiment.tb_project_archive_manage
    WHERE pro_num = #{proNum}
      and pro_name_code = #{proNameCode}
    SELECT pam.achievement_name as achievement_name,
           pam.achievement_type as achievement_type,
           pam.gain_date as gain_date,
           pam.pro_archive_date as pro_archive_date
    FROM db_experiment.tb_project_archive_manage pam,
         db_experiment.tb_project_manage pm
    WHERE pam.pro_name_code=pm.pro_name_code
      and pam.pro_num = #{proNum}
      and pam.pro_name_code = #{proNameCode}
      and pm.pro_progress = 6
      AND pam.achievement_name IS NOT NULL
  </select>

  <delete id="delDocumentation">

 src/main/resources/mapper/ProjectManageMapper.xml

@@ -354,12 +354,13 @@
               pro_execution_date1,
               pro_admin
        FROM db_experiment.tb_project_manage
        where pro_num = #{proNum}
        where pro_progress = 6
          and pro_num = #{proNum}
          and pro_name_code = #{proNameCode} limit 1
    </select>
    <update id="updateProjectProgress">
        update tb_project_manage
        set pro_progress = #{proProgress,jdbcType=VARCHAR}
        set pro_progress = #{proProgress,jdbcType=VARCHAR},pro_archive_date = #{proArchiveDate,jdbcType=DATE}
        where pro_num = #{proNum}
          and pro_name_code = #{proNameCode}
    </update>