Browse Source

项目进度详情开发

anderx 1 year ago
parent
commit
54f650aff8

+ 0 - 85
src/main/java/com/goafanti/common/dao/TaskDetailsExtendMapper.java

@@ -1,85 +0,0 @@
-package com.goafanti.common.dao;
-
-import com.goafanti.common.model.TaskDetailsExtend;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.data.domain.Pageable;
-
-import java.util.List;
-
-/**
- * 项目申报详情扩展表(TaskDetailsExtend)表数据库访问层
- *
- * @author makejava
- * @since 2024-12-26 17:12:02
- */
-public interface TaskDetailsExtendMapper {
-
-    /**
-     * 通过ID查询单条数据
-     *
-     * @param id 主键
-     * @return 实例对象
-     */
-    TaskDetailsExtend selectById(Integer id);
-
-
-    /**
-     * 查询指定行数据
-     *
-     * @param taskDetailsExtend 查询条件
-     * @param pageable          分页对象
-     * @return 对象列表
-     */
-    List<TaskDetailsExtend> findTaskDetailsExtendList(TaskDetailsExtend taskDetailsExtend, @Param("pageable") Pageable pageable);
-
-    /**
-     * 统计总行数
-     *
-     * @param taskDetailsExtend 查询条件
-     * @return 总行数
-     */
-    int findTaskDetailsExtendCount(TaskDetailsExtend taskDetailsExtend);
-
-    /**
-     * 新增数据
-     *
-     * @param taskDetailsExtend 实例对象
-     * @return 影响行数
-     */
-    int insert(TaskDetailsExtend taskDetailsExtend);
-
-    /**
-     * 批量新增数据(MyBatis原生foreach方法)
-     *
-     * @param entities List<TaskDetailsExtend> 实例对象列表
-     * @return 影响行数
-     */
-    int insertBatch(@Param("entities") List<TaskDetailsExtend> entities);
-
-    /**
-     * 批量新增或按主键更新数据(MyBatis原生foreach方法)
-     *
-     * @param entities List<TaskDetailsExtend> 实例对象列表
-     * @return 影响行数
-     * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常,请自行校验入参
-     */
-    int insertOrUpdateBatch(@Param("entities") List<TaskDetailsExtend> entities);
-
-    /**
-     * 修改数据
-     *
-     * @param taskDetailsExtend 实例对象
-     * @return 影响行数
-     */
-    int update(TaskDetailsExtend taskDetailsExtend);
-
-    /**
-     * 通过主键删除数据
-     *
-     * @param id 主键
-     * @return 影响行数
-     */
-    int deleteById(Integer id);
-
-}
-

+ 0 - 85
src/main/java/com/goafanti/common/dao/TaskDetailsSupplementMapper.java

@@ -1,85 +0,0 @@
-package com.goafanti.common.dao;
-
-import com.goafanti.common.model.TaskDetailsSupplement;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.data.domain.Pageable;
-
-import java.util.List;
-
-/**
- * 项目申报详情补充表(TaskDetailsSupplement)表数据库访问层
- *
- * @author makejava
- * @since 2024-12-26 17:12:11
- */
-public interface TaskDetailsSupplementMapper {
-
-    /**
-     * 通过ID查询单条数据
-     *
-     * @param id 主键
-     * @return 实例对象
-     */
-    TaskDetailsSupplement selectById(Integer id);
-
-
-    /**
-     * 查询指定行数据
-     *
-     * @param taskDetailsSupplement 查询条件
-     * @param pageable              分页对象
-     * @return 对象列表
-     */
-    List<TaskDetailsSupplement> findTaskDetailsSupplementList(TaskDetailsSupplement taskDetailsSupplement, @Param("pageable") Pageable pageable);
-
-    /**
-     * 统计总行数
-     *
-     * @param taskDetailsSupplement 查询条件
-     * @return 总行数
-     */
-    int findTaskDetailsSupplementCount(TaskDetailsSupplement taskDetailsSupplement);
-
-    /**
-     * 新增数据
-     *
-     * @param taskDetailsSupplement 实例对象
-     * @return 影响行数
-     */
-    int insert(TaskDetailsSupplement taskDetailsSupplement);
-
-    /**
-     * 批量新增数据(MyBatis原生foreach方法)
-     *
-     * @param entities List<TaskDetailsSupplement> 实例对象列表
-     * @return 影响行数
-     */
-    int insertBatch(@Param("entities") List<TaskDetailsSupplement> entities);
-
-    /**
-     * 批量新增或按主键更新数据(MyBatis原生foreach方法)
-     *
-     * @param entities List<TaskDetailsSupplement> 实例对象列表
-     * @return 影响行数
-     * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常,请自行校验入参
-     */
-    int insertOrUpdateBatch(@Param("entities") List<TaskDetailsSupplement> entities);
-
-    /**
-     * 修改数据
-     *
-     * @param taskDetailsSupplement 实例对象
-     * @return 影响行数
-     */
-    int update(TaskDetailsSupplement taskDetailsSupplement);
-
-    /**
-     * 通过主键删除数据
-     *
-     * @param id 主键
-     * @return 影响行数
-     */
-    int deleteById(Integer id);
-
-}
-

File diff suppressed because it is too large
+ 0 - 374
src/main/java/com/goafanti/common/mapper/TaskDetailsExtendMapper.xml


File diff suppressed because it is too large
+ 626 - 7
src/main/java/com/goafanti/common/mapper/TaskDetailsMapper.xml


+ 0 - 414
src/main/java/com/goafanti/common/mapper/TaskDetailsSupplementMapper.xml

@@ -1,414 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.goafanti.common.dao.TaskDetailsSupplementMapper">
-
-    <resultMap type="com.goafanti.common.model.TaskDetailsSupplement" id="TaskDetailsSupplementMap">
-        <result property="id" column="id" jdbcType="INTEGER"/>
-        <result property="ipDeclare" column="ip_declare" jdbcType="INTEGER"/>
-        <result property="ipAuthorize" column="ip_authorize" jdbcType="INTEGER"/>
-        <result property="ipHt" column="ip_ht" jdbcType="INTEGER"/>
-        <result property="ipHtI" column="ip_ht_i" jdbcType="INTEGER"/>
-        <result property="ipHtIi" column="ip_ht_ii" jdbcType="INTEGER"/>
-        <result property="outsourcingDev" column="outsourcing_dev" jdbcType="INTEGER"/>
-        <result property="contractRegistration" column="contract_registration" jdbcType="INTEGER"/>
-        <result property="publicReleaseStipulation" column="public_release_stipulation" jdbcType="INTEGER"/>
-        <result property="publicReleaseActual" column="public_release_actual" jdbcType="INTEGER"/>
-        <result property="trainingStipulation" column="training_stipulation" jdbcType="INTEGER"/>
-        <result property="trainingActual" column="training_actual" jdbcType="INTEGER"/>
-        <result property="trainingOther" column="training_other" jdbcType="VARCHAR"/>
-        <result property="specialInspect" column="special_inspect" jdbcType="INTEGER"/>
-        <result property="simulatedAudit" column="simulated_audit" jdbcType="INTEGER"/>
-        <result property="featuredWorkOther" column="featured_work_other" jdbcType="VARCHAR"/>
-        <result property="htScore" column="ht_score" jdbcType="INTEGER"/>
-        <result property="htBatch" column="ht_batch" jdbcType="INTEGER"/>
-        <result property="htFocus" column="ht_focus" jdbcType="INTEGER"/>
-        <result property="webSubmit" column="web_submit" jdbcType="INTEGER"/>
-        <result property="webSubmitOther" column="web_submit_other" jdbcType="VARCHAR"/>
-        <result property="paperSubmit" column="paper_submit" jdbcType="INTEGER"/>
-        <result property="paperSubmitOther" column="paper_submit_other" jdbcType="VARCHAR"/>
-        <result property="reviewProvince" column="review_province" jdbcType="INTEGER"/>
-        <result property="reviewCountry" column="review_country" jdbcType="INTEGER"/>
-        <result property="reviewProvinceNumber" column="review_province_number" jdbcType="INTEGER"/>
-        <result property="reviewCountryNumber" column="review_country_number" jdbcType="INTEGER"/>
-        <result property="remarks" column="remarks" jdbcType="VARCHAR"/>
-    </resultMap>
-
-    <sql id="TaskDetailsSupplementAllSql">
-        id, ip_declare, ip_authorize, ip_ht, ip_ht_i, ip_ht_ii, outsourcing_dev, contract_registration, public_release_stipulation, public_release_actual, training_stipulation, training_actual, training_other, special_inspect, simulated_audit, featured_work_other, ht_score, ht_batch, ht_focus, web_submit, web_submit_other, paper_submit, paper_submit_other, review_province, review_country, review_province_number, review_country_number, remarks
-    </sql>
-
-    <!--查询单个-->
-    <select id="selectById" resultMap="TaskDetailsSupplementMap">
-        select
-        <include refid="TaskDetailsSupplementAllSql"/>
-        from task_details_supplement
-        where id = #{id}
-    </select>
-
-    <!--新增所有列-->
-    <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into task_details_supplement(id,ip_declare, ip_authorize, ip_ht, ip_ht_i, ip_ht_ii, outsourcing_dev,
-                                            contract_registration, public_release_stipulation, public_release_actual,
-                                            training_stipulation, training_actual, training_other, special_inspect,
-                                            simulated_audit, featured_work_other, ht_score, ht_batch, ht_focus,
-                                            web_submit, web_submit_other, paper_submit, paper_submit_other,
-                                            review_province, review_country, review_province_number,
-                                            review_country_number, remarks)
-        values (#{id},#{ipDeclare}, #{ipAuthorize}, #{ipHt}, #{ipHtI}, #{ipHtIi}, #{outsourcingDev}, #{contractRegistration},
-                #{publicReleaseStipulation}, #{publicReleaseActual}, #{trainingStipulation}, #{trainingActual},
-                #{trainingOther}, #{specialInspect}, #{simulatedAudit}, #{featuredWorkOther}, #{htScore}, #{htBatch},
-                #{htFocus}, #{webSubmit}, #{webSubmitOther}, #{paperSubmit}, #{paperSubmitOther}, #{reviewProvince},
-                #{reviewCountry}, #{reviewProvinceNumber}, #{reviewCountryNumber}, #{remarks})
-    </insert>
-
-    <insert id="insertBatch">
-        insert into task_details_supplement(ip_declare, ip_authorize, ip_ht, ip_ht_i, ip_ht_ii, outsourcing_dev,
-        contract_registration, public_release_stipulation, public_release_actual, training_stipulation, training_actual,
-        training_other, special_inspect, simulated_audit, featured_work_other, ht_score, ht_batch, ht_focus, web_submit,
-        web_submit_other, paper_submit, paper_submit_other, review_province, review_country, review_province_number,
-        review_country_number, remarks)
-        values
-        <foreach collection="entities" item="entity" separator=",">
-            (#{entity.ipDeclare}, #{entity.ipAuthorize}, #{entity.ipHt}, #{entity.ipHtI}, #{entity.ipHtIi},
-            #{entity.outsourcingDev}, #{entity.contractRegistration}, #{entity.publicReleaseStipulation},
-            #{entity.publicReleaseActual}, #{entity.trainingStipulation}, #{entity.trainingActual},
-            #{entity.trainingOther}, #{entity.specialInspect}, #{entity.simulatedAudit}, #{entity.featuredWorkOther},
-            #{entity.htScore}, #{entity.htBatch}, #{entity.htFocus}, #{entity.webSubmit}, #{entity.webSubmitOther},
-            #{entity.paperSubmit}, #{entity.paperSubmitOther}, #{entity.reviewProvince}, #{entity.reviewCountry},
-            #{entity.reviewProvinceNumber}, #{entity.reviewCountryNumber}, #{entity.remarks})
-        </foreach>
-    </insert>
-
-    <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into task_details_supplement(ip_declare, ip_authorize, ip_ht, ip_ht_i, ip_ht_ii, outsourcing_dev,
-        contract_registration, public_release_stipulation, public_release_actual, training_stipulation, training_actual,
-        training_other, special_inspect, simulated_audit, featured_work_other, ht_score, ht_batch, ht_focus, web_submit,
-        web_submit_other, paper_submit, paper_submit_other, review_province, review_country, review_province_number,
-        review_country_number, remarks)
-        values
-        <foreach collection="entities" item="entity" separator=",">
-            (#{entity.ipDeclare}, #{entity.ipAuthorize}, #{entity.ipHt}, #{entity.ipHtI}, #{entity.ipHtIi},
-            #{entity.outsourcingDev}, #{entity.contractRegistration}, #{entity.publicReleaseStipulation},
-            #{entity.publicReleaseActual}, #{entity.trainingStipulation}, #{entity.trainingActual},
-            #{entity.trainingOther}, #{entity.specialInspect}, #{entity.simulatedAudit}, #{entity.featuredWorkOther},
-            #{entity.htScore}, #{entity.htBatch}, #{entity.htFocus}, #{entity.webSubmit}, #{entity.webSubmitOther},
-            #{entity.paperSubmit}, #{entity.paperSubmitOther}, #{entity.reviewProvince}, #{entity.reviewCountry},
-            #{entity.reviewProvinceNumber}, #{entity.reviewCountryNumber}, #{entity.remarks})
-        </foreach>
-        on duplicate key update
-        ip_declare = values(ip_declare),
-        ip_authorize = values(ip_authorize),
-        ip_ht = values(ip_ht),
-        ip_ht_i = values(ip_ht_i),
-        ip_ht_ii = values(ip_ht_ii),
-        outsourcing_dev = values(outsourcing_dev),
-        contract_registration = values(contract_registration),
-        public_release_stipulation = values(public_release_stipulation),
-        public_release_actual = values(public_release_actual),
-        training_stipulation = values(training_stipulation),
-        training_actual = values(training_actual),
-        training_other = values(training_other),
-        special_inspect = values(special_inspect),
-        simulated_audit = values(simulated_audit),
-        featured_work_other = values(featured_work_other),
-        ht_score = values(ht_score),
-        ht_batch = values(ht_batch),
-        ht_focus = values(ht_focus),
-        web_submit = values(web_submit),
-        web_submit_other = values(web_submit_other),
-        paper_submit = values(paper_submit),
-        paper_submit_other = values(paper_submit_other),
-        review_province = values(review_province),
-        review_country = values(review_country),
-        review_province_number = values(review_province_number),
-        review_country_number = values(review_country_number),
-        remarks = values(remarks)
-    </insert>
-
-    <!--通过主键修改数据-->
-    <update id="update">
-        update task_details_supplement
-        <set>
-            <if test="ipDeclare != null">
-                ip_declare = #{ipDeclare},
-            </if>
-            <if test="ipAuthorize != null">
-                ip_authorize = #{ipAuthorize},
-            </if>
-            <if test="ipHt != null">
-                ip_ht = #{ipHt},
-            </if>
-            <if test="ipHtI != null">
-                ip_ht_i = #{ipHtI},
-            </if>
-            <if test="ipHtIi != null">
-                ip_ht_ii = #{ipHtIi},
-            </if>
-            <if test="outsourcingDev != null">
-                outsourcing_dev = #{outsourcingDev},
-            </if>
-            <if test="contractRegistration != null">
-                contract_registration = #{contractRegistration},
-            </if>
-            <if test="publicReleaseStipulation != null">
-                public_release_stipulation = #{publicReleaseStipulation},
-            </if>
-            <if test="publicReleaseActual != null">
-                public_release_actual = #{publicReleaseActual},
-            </if>
-            <if test="trainingStipulation != null">
-                training_stipulation = #{trainingStipulation},
-            </if>
-            <if test="trainingActual != null">
-                training_actual = #{trainingActual},
-            </if>
-            <if test="trainingOther != null and trainingOther != ''">
-                training_other = #{trainingOther},
-            </if>
-            <if test="specialInspect != null">
-                special_inspect = #{specialInspect},
-            </if>
-            <if test="simulatedAudit != null">
-                simulated_audit = #{simulatedAudit},
-            </if>
-            <if test="featuredWorkOther != null and featuredWorkOther != ''">
-                featured_work_other = #{featuredWorkOther},
-            </if>
-            <if test="htScore != null">
-                ht_score = #{htScore},
-            </if>
-            <if test="htBatch != null">
-                ht_batch = #{htBatch},
-            </if>
-            <if test="htFocus != null">
-                ht_focus = #{htFocus},
-            </if>
-            <if test="webSubmit != null">
-                web_submit = #{webSubmit},
-            </if>
-            <if test="webSubmitOther != null and webSubmitOther != ''">
-                web_submit_other = #{webSubmitOther},
-            </if>
-            <if test="paperSubmit != null">
-                paper_submit = #{paperSubmit},
-            </if>
-            <if test="paperSubmitOther != null and paperSubmitOther != ''">
-                paper_submit_other = #{paperSubmitOther},
-            </if>
-            <if test="reviewProvince != null">
-                review_province = #{reviewProvince},
-            </if>
-            <if test="reviewCountry != null">
-                review_country = #{reviewCountry},
-            </if>
-            <if test="reviewProvinceNumber != null">
-                review_province_number = #{reviewProvinceNumber},
-            </if>
-            <if test="reviewCountryNumber != null">
-                review_country_number = #{reviewCountryNumber},
-            </if>
-            <if test="remarks != null and remarks != ''">
-                remarks = #{remarks},
-            </if>
-        </set>
-        where id = #{id}
-    </update>
-
-    <!--查询指定行数据-->
-    <select id="findTaskDetailsSupplementList" resultMap="TaskDetailsSupplementMap">
-        select
-        <include refid="TaskDetailsSupplementAllSql"/>
-
-        from task_details_supplement
-        <where>
-            <if test="id != null">
-                and id = #{id}
-            </if>
-            <if test="ipDeclare != null">
-                and ip_declare = #{ipDeclare}
-            </if>
-            <if test="ipAuthorize != null">
-                and ip_authorize = #{ipAuthorize}
-            </if>
-            <if test="ipHt != null">
-                and ip_ht = #{ipHt}
-            </if>
-            <if test="ipHtI != null">
-                and ip_ht_i = #{ipHtI}
-            </if>
-            <if test="ipHtIi != null">
-                and ip_ht_ii = #{ipHtIi}
-            </if>
-            <if test="outsourcingDev != null">
-                and outsourcing_dev = #{outsourcingDev}
-            </if>
-            <if test="contractRegistration != null">
-                and contract_registration = #{contractRegistration}
-            </if>
-            <if test="publicReleaseStipulation != null">
-                and public_release_stipulation = #{publicReleaseStipulation}
-            </if>
-            <if test="publicReleaseActual != null">
-                and public_release_actual = #{publicReleaseActual}
-            </if>
-            <if test="trainingStipulation != null">
-                and training_stipulation = #{trainingStipulation}
-            </if>
-            <if test="trainingActual != null">
-                and training_actual = #{trainingActual}
-            </if>
-            <if test="trainingOther != null and trainingOther != ''">
-                and training_other = #{trainingOther}
-            </if>
-            <if test="specialInspect != null">
-                and special_inspect = #{specialInspect}
-            </if>
-            <if test="simulatedAudit != null">
-                and simulated_audit = #{simulatedAudit}
-            </if>
-            <if test="featuredWorkOther != null and featuredWorkOther != ''">
-                and featured_work_other = #{featuredWorkOther}
-            </if>
-            <if test="htScore != null">
-                and ht_score = #{htScore}
-            </if>
-            <if test="htBatch != null">
-                and ht_batch = #{htBatch}
-            </if>
-            <if test="htFocus != null">
-                and ht_focus = #{htFocus}
-            </if>
-            <if test="webSubmit != null">
-                and web_submit = #{webSubmit}
-            </if>
-            <if test="webSubmitOther != null and webSubmitOther != ''">
-                and web_submit_other = #{webSubmitOther}
-            </if>
-            <if test="paperSubmit != null">
-                and paper_submit = #{paperSubmit}
-            </if>
-            <if test="paperSubmitOther != null and paperSubmitOther != ''">
-                and paper_submit_other = #{paperSubmitOther}
-            </if>
-            <if test="reviewProvince != null">
-                and review_province = #{reviewProvince}
-            </if>
-            <if test="reviewCountry != null">
-                and review_country = #{reviewCountry}
-            </if>
-            <if test="reviewProvinceNumber != null">
-                and review_province_number = #{reviewProvinceNumber}
-            </if>
-            <if test="reviewCountryNumber != null">
-                and review_country_number = #{reviewCountryNumber}
-            </if>
-            <if test="remarks != null and remarks != ''">
-                and remarks = #{remarks}
-            </if>
-        </where>
-        <if test="page_sql != null">
-            ${page_sql}
-        </if>
-    </select>
-
-    <!--统计总行数-->
-    <select id="findTaskDetailsSupplementCount" resultType="java.lang.Integer">
-        select count(1)
-        from task_details_supplement
-        <where>
-            <if test="id != null">
-                and id = #{id}
-            </if>
-            <if test="ipDeclare != null">
-                and ip_declare = #{ipDeclare}
-            </if>
-            <if test="ipAuthorize != null">
-                and ip_authorize = #{ipAuthorize}
-            </if>
-            <if test="ipHt != null">
-                and ip_ht = #{ipHt}
-            </if>
-            <if test="ipHtI != null">
-                and ip_ht_i = #{ipHtI}
-            </if>
-            <if test="ipHtIi != null">
-                and ip_ht_ii = #{ipHtIi}
-            </if>
-            <if test="outsourcingDev != null">
-                and outsourcing_dev = #{outsourcingDev}
-            </if>
-            <if test="contractRegistration != null">
-                and contract_registration = #{contractRegistration}
-            </if>
-            <if test="publicReleaseStipulation != null">
-                and public_release_stipulation = #{publicReleaseStipulation}
-            </if>
-            <if test="publicReleaseActual != null">
-                and public_release_actual = #{publicReleaseActual}
-            </if>
-            <if test="trainingStipulation != null">
-                and training_stipulation = #{trainingStipulation}
-            </if>
-            <if test="trainingActual != null">
-                and training_actual = #{trainingActual}
-            </if>
-            <if test="trainingOther != null and trainingOther != ''">
-                and training_other = #{trainingOther}
-            </if>
-            <if test="specialInspect != null">
-                and special_inspect = #{specialInspect}
-            </if>
-            <if test="simulatedAudit != null">
-                and simulated_audit = #{simulatedAudit}
-            </if>
-            <if test="featuredWorkOther != null and featuredWorkOther != ''">
-                and featured_work_other = #{featuredWorkOther}
-            </if>
-            <if test="htScore != null">
-                and ht_score = #{htScore}
-            </if>
-            <if test="htBatch != null">
-                and ht_batch = #{htBatch}
-            </if>
-            <if test="htFocus != null">
-                and ht_focus = #{htFocus}
-            </if>
-            <if test="webSubmit != null">
-                and web_submit = #{webSubmit}
-            </if>
-            <if test="webSubmitOther != null and webSubmitOther != ''">
-                and web_submit_other = #{webSubmitOther}
-            </if>
-            <if test="paperSubmit != null">
-                and paper_submit = #{paperSubmit}
-            </if>
-            <if test="paperSubmitOther != null and paperSubmitOther != ''">
-                and paper_submit_other = #{paperSubmitOther}
-            </if>
-            <if test="reviewProvince != null">
-                and review_province = #{reviewProvince}
-            </if>
-            <if test="reviewCountry != null">
-                and review_country = #{reviewCountry}
-            </if>
-            <if test="reviewProvinceNumber != null">
-                and review_province_number = #{reviewProvinceNumber}
-            </if>
-            <if test="reviewCountryNumber != null">
-                and review_country_number = #{reviewCountryNumber}
-            </if>
-            <if test="remarks != null and remarks != ''">
-                and remarks = #{remarks}
-            </if>
-        </where>
-    </select>
-
-    <!--通过主键删除-->
-    <delete id="deleteById">
-        delete
-        from task_details_supplement
-        where id = #{id}
-    </delete>
-
-</mapper>
-

+ 605 - 7
src/main/java/com/goafanti/common/model/TaskDetails.java

@@ -1,7 +1,5 @@
 package com.goafanti.common.model;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -11,10 +9,10 @@ import java.util.Date;
  * 项目申报详情(TaskDetails)实体类
  *
  * @author makejava
- * @since 2024-12-27 13:49:02
+ * @since 2024-12-27 17:01:08
  */
 public class TaskDetails implements Serializable {
-    private static final long serialVersionUID = 979884539912577184L;
+    private static final long serialVersionUID = 667573208234219056L;
 
     private Integer id;
     /**
@@ -126,6 +124,206 @@ public class TaskDetails implements Serializable {
      */
     private BigDecimal reportRdAmount;
     /**
+     * 研发准备金备案 0=其他,1=待完成,2=已完成,3=合同无此项
+     */
+    private Integer rdReservesStatus;
+    /**
+     * 研发准备金备其他说明
+     */
+    private String rdReservesOther;
+    /**
+     * 研发奖补申请 0=其他,1=待完成,2=已完成,3=合同无此项
+     */
+    private Integer rdAwardCompensationStatus;
+    /**
+     * 研发准备金备其他说明
+     */
+    private String rdAwardCompensationOther;
+    /**
+     * 研发奖补-申请金额
+     */
+    private BigDecimal rdApplicationFee;
+    /**
+     * 研发奖补-公示金额
+     */
+    private BigDecimal rdAnnouncementAmount;
+    /**
+     * 研发奖补-公示金额-其他
+     */
+    private String rdAnnouncementOther;
+    /**
+     * 加扣备查交付 0=其他,1=待完成,2=已完成,3=合同无此项
+     */
+    private Integer adDeliverStatus;
+    /**
+     * 加扣备查交付其他说明
+     */
+    private String adDeliverOther;
+    /**
+     * 加扣备查交付归档 0=否,1=是
+     */
+    private Integer adDeliverFinish;
+    /**
+     * 高新备查交付 0=其他,1=待完成,2=已完成,3=合同无此项
+     */
+    private Integer htDeliverStatus;
+    /**
+     * 高新加扣备查交付其他说明
+     */
+    private String htDeliverOther;
+    /**
+     * 高新加扣备查交付归档 0=否,1=是
+     */
+    private Integer htDeliverFinish;
+    /**
+     * 召开上年度总结与本年工作计划会议 0=其他,1=待完成,2=已完成,3=合同无此项
+     */
+    private Integer closeMeetingStatus;
+    /**
+     * 召开上年度总结与本年工作计划会议其他说明
+     */
+    private String closeMeeting_Other;
+    /**
+     * 阶段性汇报 1=月度,2=季度
+     */
+    private Integer phasedType;
+    /**
+     * 阶段性汇报 1,2,3=选取1月到3月
+     */
+    private String phasedContent;
+    /**
+     * 立项资料编写数
+     */
+    private Integer projectApprovalWriteNumber;
+    /**
+     * 立项资料编写完成率
+     */
+    private Double projectApprovalWriteRate;
+    /**
+     * 加扣预申报七月 0=其他,1=待完成,2=已完成,3=合同无此项
+     */
+    private Integer adPrepareJulyStatus;
+    /**
+     * 加扣预申报七月其他说明
+     */
+    private String adPrepareJulyOther;
+    /**
+     * 加扣预申报七月 0=其他,1=待完成,2=已完成,3=合同无此项
+     */
+    private Integer adPrepareOctoberStatus;
+    /**
+     * 加扣预申报十月其他说明
+     */
+    private String adPrepareOctoberOther;
+    /**
+     * 知识产权申报数
+     */
+    private Integer ipDeclare;
+    /**
+     * 知识产权授权数
+     */
+    private Integer ipAuthorize;
+    /**
+     * 知识产权高新数
+     */
+    private Integer ipHt;
+    /**
+     * 知识产权高新I数
+     */
+    private Integer ipHtI;
+    /**
+     * 知识产权高新II数
+     */
+    private Integer ipHtIi;
+    /**
+     * 委外开发项目数
+     */
+    private Integer outsourcingDev;
+    /**
+     * 技术开发合同登记数
+     */
+    private Integer contractRegistration;
+    /**
+     * 公出约定次数
+     */
+    private Integer publicReleaseStipulation;
+    /**
+     * 公出实际次数
+     */
+    private Integer publicReleaseActual;
+    /**
+     * 培训约定次数
+     */
+    private Integer trainingStipulation;
+    /**
+     * 培训实际次数
+     */
+    private Integer trainingActual;
+    /**
+     * 培训其他说明
+     */
+    private String trainingOther;
+    /**
+     * 专项检查数
+     */
+    private Integer specialInspect;
+    /**
+     * 模拟稽查数
+     */
+    private Integer simulatedAudit;
+    /**
+     * 特色工作-其他
+     */
+    private String featuredWorkOther;
+    /**
+     * 高新认定评价估分
+     */
+    private Integer htScore;
+    /**
+     * 高新认定评申报批次
+     */
+    private Integer htBatch;
+    /**
+     * 高新认定重点关注 0=否,1=是
+     */
+    private Integer htFocus;
+    /**
+     * 网上系统提交 0=其他,1=待完成,2=已完成,3=合同无此项
+     */
+    private Integer webSubmit;
+    /**
+     * 网上系统提交其他说明
+     */
+    private String webSubmitOther;
+    /**
+     * 纸质材料提交 0=其他,1=待完成,2=已完成,3=合同无此项
+     */
+    private Integer paperSubmit;
+    /**
+     * 纸质材料提交其他说明
+     */
+    private String paperSubmitOther;
+    /**
+     * 评审省级 0=淘汰,1=公示
+     */
+    private Integer reviewProvince;
+    /**
+     * 评审国家级 0=淘汰,1=公示
+     */
+    private Integer reviewCountry;
+    /**
+     * 评审省级序号
+     */
+    private Integer reviewProvinceNumber;
+    /**
+     * 评审国家级高企编号
+     */
+    private Integer reviewCountryNumber;
+    /**
+     * 备注说明
+     */
+    private String remarks;
+    /**
      * 更新时间
      */
     private Date updateTime;
@@ -362,7 +560,407 @@ public class TaskDetails implements Serializable {
     public void setReportRdAmount(BigDecimal reportRdAmount) {
         this.reportRdAmount = reportRdAmount;
     }
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+
+    public Integer getRdReservesStatus() {
+        return rdReservesStatus;
+    }
+
+    public void setRdReservesStatus(Integer rdReservesStatus) {
+        this.rdReservesStatus = rdReservesStatus;
+    }
+
+    public String getRdReservesOther() {
+        return rdReservesOther;
+    }
+
+    public void setRdReservesOther(String rdReservesOther) {
+        this.rdReservesOther = rdReservesOther;
+    }
+
+    public Integer getRdAwardCompensationStatus() {
+        return rdAwardCompensationStatus;
+    }
+
+    public void setRdAwardCompensationStatus(Integer rdAwardCompensationStatus) {
+        this.rdAwardCompensationStatus = rdAwardCompensationStatus;
+    }
+
+    public String getRdAwardCompensationOther() {
+        return rdAwardCompensationOther;
+    }
+
+    public void setRdAwardCompensationOther(String rdAwardCompensationOther) {
+        this.rdAwardCompensationOther = rdAwardCompensationOther;
+    }
+
+    public BigDecimal getRdApplicationFee() {
+        return rdApplicationFee;
+    }
+
+    public void setRdApplicationFee(BigDecimal rdApplicationFee) {
+        this.rdApplicationFee = rdApplicationFee;
+    }
+
+    public BigDecimal getRdAnnouncementAmount() {
+        return rdAnnouncementAmount;
+    }
+
+    public void setRdAnnouncementAmount(BigDecimal rdAnnouncementAmount) {
+        this.rdAnnouncementAmount = rdAnnouncementAmount;
+    }
+
+    public String getRdAnnouncementOther() {
+        return rdAnnouncementOther;
+    }
+
+    public void setRdAnnouncementOther(String rdAnnouncementOther) {
+        this.rdAnnouncementOther = rdAnnouncementOther;
+    }
+
+    public Integer getAdDeliverStatus() {
+        return adDeliverStatus;
+    }
+
+    public void setAdDeliverStatus(Integer adDeliverStatus) {
+        this.adDeliverStatus = adDeliverStatus;
+    }
+
+    public String getAdDeliverOther() {
+        return adDeliverOther;
+    }
+
+    public void setAdDeliverOther(String adDeliverOther) {
+        this.adDeliverOther = adDeliverOther;
+    }
+
+    public Integer getAdDeliverFinish() {
+        return adDeliverFinish;
+    }
+
+    public void setAdDeliverFinish(Integer adDeliverFinish) {
+        this.adDeliverFinish = adDeliverFinish;
+    }
+
+    public Integer getHtDeliverStatus() {
+        return htDeliverStatus;
+    }
+
+    public void setHtDeliverStatus(Integer htDeliverStatus) {
+        this.htDeliverStatus = htDeliverStatus;
+    }
+
+    public String getHtDeliverOther() {
+        return htDeliverOther;
+    }
+
+    public void setHtDeliverOther(String htDeliverOther) {
+        this.htDeliverOther = htDeliverOther;
+    }
+
+    public Integer getHtDeliverFinish() {
+        return htDeliverFinish;
+    }
+
+    public void setHtDeliverFinish(Integer htDeliverFinish) {
+        this.htDeliverFinish = htDeliverFinish;
+    }
+
+    public Integer getCloseMeetingStatus() {
+        return closeMeetingStatus;
+    }
+
+    public void setCloseMeetingStatus(Integer closeMeetingStatus) {
+        this.closeMeetingStatus = closeMeetingStatus;
+    }
+
+    public String getCloseMeeting_Other() {
+        return closeMeeting_Other;
+    }
+
+    public void setCloseMeeting_Other(String closeMeeting_Other) {
+        this.closeMeeting_Other = closeMeeting_Other;
+    }
+
+    public Integer getPhasedType() {
+        return phasedType;
+    }
+
+    public void setPhasedType(Integer phasedType) {
+        this.phasedType = phasedType;
+    }
+
+    public String getPhasedContent() {
+        return phasedContent;
+    }
+
+    public void setPhasedContent(String phasedContent) {
+        this.phasedContent = phasedContent;
+    }
+
+    public Integer getProjectApprovalWriteNumber() {
+        return projectApprovalWriteNumber;
+    }
+
+    public void setProjectApprovalWriteNumber(Integer projectApprovalWriteNumber) {
+        this.projectApprovalWriteNumber = projectApprovalWriteNumber;
+    }
+
+    public Double getProjectApprovalWriteRate() {
+        return projectApprovalWriteRate;
+    }
+
+    public void setProjectApprovalWriteRate(Double projectApprovalWriteRate) {
+        this.projectApprovalWriteRate = projectApprovalWriteRate;
+    }
+
+    public Integer getAdPrepareJulyStatus() {
+        return adPrepareJulyStatus;
+    }
+
+    public void setAdPrepareJulyStatus(Integer adPrepareJulyStatus) {
+        this.adPrepareJulyStatus = adPrepareJulyStatus;
+    }
+
+    public String getAdPrepareJulyOther() {
+        return adPrepareJulyOther;
+    }
+
+    public void setAdPrepareJulyOther(String adPrepareJulyOther) {
+        this.adPrepareJulyOther = adPrepareJulyOther;
+    }
+
+    public Integer getAdPrepareOctoberStatus() {
+        return adPrepareOctoberStatus;
+    }
+
+    public void setAdPrepareOctoberStatus(Integer adPrepareOctoberStatus) {
+        this.adPrepareOctoberStatus = adPrepareOctoberStatus;
+    }
+
+    public String getAdPrepareOctoberOther() {
+        return adPrepareOctoberOther;
+    }
+
+    public void setAdPrepareOctoberOther(String adPrepareOctoberOther) {
+        this.adPrepareOctoberOther = adPrepareOctoberOther;
+    }
+
+    public Integer getIpDeclare() {
+        return ipDeclare;
+    }
+
+    public void setIpDeclare(Integer ipDeclare) {
+        this.ipDeclare = ipDeclare;
+    }
+
+    public Integer getIpAuthorize() {
+        return ipAuthorize;
+    }
+
+    public void setIpAuthorize(Integer ipAuthorize) {
+        this.ipAuthorize = ipAuthorize;
+    }
+
+    public Integer getIpHt() {
+        return ipHt;
+    }
+
+    public void setIpHt(Integer ipHt) {
+        this.ipHt = ipHt;
+    }
+
+    public Integer getIpHtI() {
+        return ipHtI;
+    }
+
+    public void setIpHtI(Integer ipHtI) {
+        this.ipHtI = ipHtI;
+    }
+
+    public Integer getIpHtIi() {
+        return ipHtIi;
+    }
+
+    public void setIpHtIi(Integer ipHtIi) {
+        this.ipHtIi = ipHtIi;
+    }
+
+    public Integer getOutsourcingDev() {
+        return outsourcingDev;
+    }
+
+    public void setOutsourcingDev(Integer outsourcingDev) {
+        this.outsourcingDev = outsourcingDev;
+    }
+
+    public Integer getContractRegistration() {
+        return contractRegistration;
+    }
+
+    public void setContractRegistration(Integer contractRegistration) {
+        this.contractRegistration = contractRegistration;
+    }
+
+    public Integer getPublicReleaseStipulation() {
+        return publicReleaseStipulation;
+    }
+
+    public void setPublicReleaseStipulation(Integer publicReleaseStipulation) {
+        this.publicReleaseStipulation = publicReleaseStipulation;
+    }
+
+    public Integer getPublicReleaseActual() {
+        return publicReleaseActual;
+    }
+
+    public void setPublicReleaseActual(Integer publicReleaseActual) {
+        this.publicReleaseActual = publicReleaseActual;
+    }
+
+    public Integer getTrainingStipulation() {
+        return trainingStipulation;
+    }
+
+    public void setTrainingStipulation(Integer trainingStipulation) {
+        this.trainingStipulation = trainingStipulation;
+    }
+
+    public Integer getTrainingActual() {
+        return trainingActual;
+    }
+
+    public void setTrainingActual(Integer trainingActual) {
+        this.trainingActual = trainingActual;
+    }
+
+    public String getTrainingOther() {
+        return trainingOther;
+    }
+
+    public void setTrainingOther(String trainingOther) {
+        this.trainingOther = trainingOther;
+    }
+
+    public Integer getSpecialInspect() {
+        return specialInspect;
+    }
+
+    public void setSpecialInspect(Integer specialInspect) {
+        this.specialInspect = specialInspect;
+    }
+
+    public Integer getSimulatedAudit() {
+        return simulatedAudit;
+    }
+
+    public void setSimulatedAudit(Integer simulatedAudit) {
+        this.simulatedAudit = simulatedAudit;
+    }
+
+    public String getFeaturedWorkOther() {
+        return featuredWorkOther;
+    }
+
+    public void setFeaturedWorkOther(String featuredWorkOther) {
+        this.featuredWorkOther = featuredWorkOther;
+    }
+
+    public Integer getHtScore() {
+        return htScore;
+    }
+
+    public void setHtScore(Integer htScore) {
+        this.htScore = htScore;
+    }
+
+    public Integer getHtBatch() {
+        return htBatch;
+    }
+
+    public void setHtBatch(Integer htBatch) {
+        this.htBatch = htBatch;
+    }
+
+    public Integer getHtFocus() {
+        return htFocus;
+    }
+
+    public void setHtFocus(Integer htFocus) {
+        this.htFocus = htFocus;
+    }
+
+    public Integer getWebSubmit() {
+        return webSubmit;
+    }
+
+    public void setWebSubmit(Integer webSubmit) {
+        this.webSubmit = webSubmit;
+    }
+
+    public String getWebSubmitOther() {
+        return webSubmitOther;
+    }
+
+    public void setWebSubmitOther(String webSubmitOther) {
+        this.webSubmitOther = webSubmitOther;
+    }
+
+    public Integer getPaperSubmit() {
+        return paperSubmit;
+    }
+
+    public void setPaperSubmit(Integer paperSubmit) {
+        this.paperSubmit = paperSubmit;
+    }
+
+    public String getPaperSubmitOther() {
+        return paperSubmitOther;
+    }
+
+    public void setPaperSubmitOther(String paperSubmitOther) {
+        this.paperSubmitOther = paperSubmitOther;
+    }
+
+    public Integer getReviewProvince() {
+        return reviewProvince;
+    }
+
+    public void setReviewProvince(Integer reviewProvince) {
+        this.reviewProvince = reviewProvince;
+    }
+
+    public Integer getReviewCountry() {
+        return reviewCountry;
+    }
+
+    public void setReviewCountry(Integer reviewCountry) {
+        this.reviewCountry = reviewCountry;
+    }
+
+    public Integer getReviewProvinceNumber() {
+        return reviewProvinceNumber;
+    }
+
+    public void setReviewProvinceNumber(Integer reviewProvinceNumber) {
+        this.reviewProvinceNumber = reviewProvinceNumber;
+    }
+
+    public Integer getReviewCountryNumber() {
+        return reviewCountryNumber;
+    }
+
+    public void setReviewCountryNumber(Integer reviewCountryNumber) {
+        this.reviewCountryNumber = reviewCountryNumber;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
     public Date getUpdateTime() {
         return updateTime;
     }
@@ -370,7 +968,7 @@ public class TaskDetails implements Serializable {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+
     public Date getDownloadTime() {
         return downloadTime;
     }
@@ -378,7 +976,7 @@ public class TaskDetails implements Serializable {
     public void setDownloadTime(Date downloadTime) {
         this.downloadTime = downloadTime;
     }
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+
     public Date getCreateTime() {
         return createTime;
     }

+ 0 - 304
src/main/java/com/goafanti/common/model/TaskDetailsExtend.java

@@ -1,304 +0,0 @@
-package com.goafanti.common.model;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-
-/**
- * 项目申报详情扩展表(TaskDetailsExtend)实体类
- *
- * @author makejava
- * @since 2024-12-27 09:57:05
- */
-public class TaskDetailsExtend implements Serializable {
-    private static final long serialVersionUID = 222104184372571998L;
-
-    private Integer id;
-    /**
-     * 研发准备金备案 0=其他,1=待完成,2=已完成,3=合同无此项
-     */
-    private Integer rdReservesStatus;
-    /**
-     * 研发准备金备其他说明
-     */
-    private String rdReservesOther;
-    /**
-     * 研发奖补申请 0=其他,1=待完成,2=已完成,3=合同无此项
-     */
-    private Integer rdAwardCompensationStatus;
-    /**
-     * 研发准备金备其他说明
-     */
-    private String rdAwardCompensationOther;
-    /**
-     * 研发奖补-申请金额
-     */
-    private BigDecimal rdApplicationFee;
-    /**
-     * 研发奖补-公示金额
-     */
-    private BigDecimal rdAnnouncementAmount;
-    /**
-     * 研发奖补-公示金额-其他
-     */
-    private String rdAnnouncementOther;
-    /**
-     * 加扣备查交付 0=其他,1=待完成,2=已完成,3=合同无此项
-     */
-    private Integer adDeliverStatus;
-    /**
-     * 加扣备查交付其他说明
-     */
-    private String adDeliverOther;
-    /**
-     * 加扣备查交付归档 0=否,1=是
-     */
-    private Integer adDeliverFinish;
-    /**
-     * 高新备查交付 0=其他,1=待完成,2=已完成,3=合同无此项
-     */
-    private Integer htDeliverStatus;
-    /**
-     * 高新加扣备查交付其他说明
-     */
-    private String htDeliverOther;
-    /**
-     * 高新加扣备查交付归档 0=否,1=是
-     */
-    private Integer htDeliverFinish;
-    /**
-     * 召开上年度总结与本年工作计划会议 0=其他,1=待完成,2=已完成,3=合同无此项
-     */
-    private Integer closeMeetingStatus;
-    /**
-     * 召开上年度总结与本年工作计划会议其他说明
-     */
-    private String closeMeeting_Other;
-    /**
-     * 阶段性汇报 1=月度,2=季度
-     */
-    private Integer phasedType;
-    /**
-     * 阶段性汇报 1,2,3=选取1月到3月
-     */
-    private String phasedContent;
-    /**
-     * 立项资料编写数
-     */
-    private Integer projectApprovalWriteNumber;
-    /**
-     * 立项资料编写完成率
-     */
-    private Double projectApprovalWriteRate;
-    /**
-     * 加扣预申报七月 0=其他,1=待完成,2=已完成,3=合同无此项
-     */
-    private Integer adPrepareJulyStatus;
-    /**
-     * 加扣预申报七月其他说明
-     */
-    private String adPrepareJulyOther;
-    /**
-     * 加扣预申报七月 0=其他,1=待完成,2=已完成,3=合同无此项
-     */
-    private Integer adPrepareOctoberStatus;
-    /**
-     * 加扣预申报十月其他说明
-     */
-    private String adPrepareOctoberOther;
-
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getRdReservesStatus() {
-        return rdReservesStatus;
-    }
-
-    public void setRdReservesStatus(Integer rdReservesStatus) {
-        this.rdReservesStatus = rdReservesStatus;
-    }
-
-    public String getRdReservesOther() {
-        return rdReservesOther;
-    }
-
-    public void setRdReservesOther(String rdReservesOther) {
-        this.rdReservesOther = rdReservesOther;
-    }
-
-    public Integer getRdAwardCompensationStatus() {
-        return rdAwardCompensationStatus;
-    }
-
-    public void setRdAwardCompensationStatus(Integer rdAwardCompensationStatus) {
-        this.rdAwardCompensationStatus = rdAwardCompensationStatus;
-    }
-
-    public String getRdAwardCompensationOther() {
-        return rdAwardCompensationOther;
-    }
-
-    public void setRdAwardCompensationOther(String rdAwardCompensationOther) {
-        this.rdAwardCompensationOther = rdAwardCompensationOther;
-    }
-
-    public BigDecimal getRdApplicationFee() {
-        return rdApplicationFee;
-    }
-
-    public void setRdApplicationFee(BigDecimal rdApplicationFee) {
-        this.rdApplicationFee = rdApplicationFee;
-    }
-
-    public BigDecimal getRdAnnouncementAmount() {
-        return rdAnnouncementAmount;
-    }
-
-    public void setRdAnnouncementAmount(BigDecimal rdAnnouncementAmount) {
-        this.rdAnnouncementAmount = rdAnnouncementAmount;
-    }
-
-    public String getRdAnnouncementOther() {
-        return rdAnnouncementOther;
-    }
-
-    public void setRdAnnouncementOther(String rdAnnouncementOther) {
-        this.rdAnnouncementOther = rdAnnouncementOther;
-    }
-
-    public Integer getAdDeliverStatus() {
-        return adDeliverStatus;
-    }
-
-    public void setAdDeliverStatus(Integer adDeliverStatus) {
-        this.adDeliverStatus = adDeliverStatus;
-    }
-
-    public String getAdDeliverOther() {
-        return adDeliverOther;
-    }
-
-    public void setAdDeliverOther(String adDeliverOther) {
-        this.adDeliverOther = adDeliverOther;
-    }
-
-    public Integer getAdDeliverFinish() {
-        return adDeliverFinish;
-    }
-
-    public void setAdDeliverFinish(Integer adDeliverFinish) {
-        this.adDeliverFinish = adDeliverFinish;
-    }
-
-    public Integer getHtDeliverStatus() {
-        return htDeliverStatus;
-    }
-
-    public void setHtDeliverStatus(Integer htDeliverStatus) {
-        this.htDeliverStatus = htDeliverStatus;
-    }
-
-    public String getHtDeliverOther() {
-        return htDeliverOther;
-    }
-
-    public void setHtDeliverOther(String htDeliverOther) {
-        this.htDeliverOther = htDeliverOther;
-    }
-
-    public Integer getHtDeliverFinish() {
-        return htDeliverFinish;
-    }
-
-    public void setHtDeliverFinish(Integer htDeliverFinish) {
-        this.htDeliverFinish = htDeliverFinish;
-    }
-
-    public Integer getCloseMeetingStatus() {
-        return closeMeetingStatus;
-    }
-
-    public void setCloseMeetingStatus(Integer closeMeetingStatus) {
-        this.closeMeetingStatus = closeMeetingStatus;
-    }
-
-    public String getCloseMeeting_Other() {
-        return closeMeeting_Other;
-    }
-
-    public void setCloseMeeting_Other(String closeMeeting_Other) {
-        this.closeMeeting_Other = closeMeeting_Other;
-    }
-
-    public Integer getPhasedType() {
-        return phasedType;
-    }
-
-    public void setPhasedType(Integer phasedType) {
-        this.phasedType = phasedType;
-    }
-
-    public String getPhasedContent() {
-        return phasedContent;
-    }
-
-    public void setPhasedContent(String phasedContent) {
-        this.phasedContent = phasedContent;
-    }
-
-    public Integer getProjectApprovalWriteNumber() {
-        return projectApprovalWriteNumber;
-    }
-
-    public void setProjectApprovalWriteNumber(Integer projectApprovalWriteNumber) {
-        this.projectApprovalWriteNumber = projectApprovalWriteNumber;
-    }
-
-    public Double getProjectApprovalWriteRate() {
-        return projectApprovalWriteRate;
-    }
-
-    public void setProjectApprovalWriteRate(Double projectApprovalWriteRate) {
-        this.projectApprovalWriteRate = projectApprovalWriteRate;
-    }
-
-    public Integer getAdPrepareJulyStatus() {
-        return adPrepareJulyStatus;
-    }
-
-    public void setAdPrepareJulyStatus(Integer adPrepareJulyStatus) {
-        this.adPrepareJulyStatus = adPrepareJulyStatus;
-    }
-
-    public String getAdPrepareJulyOther() {
-        return adPrepareJulyOther;
-    }
-
-    public void setAdPrepareJulyOther(String adPrepareJulyOther) {
-        this.adPrepareJulyOther = adPrepareJulyOther;
-    }
-
-    public Integer getAdPrepareOctoberStatus() {
-        return adPrepareOctoberStatus;
-    }
-
-    public void setAdPrepareOctoberStatus(Integer adPrepareOctoberStatus) {
-        this.adPrepareOctoberStatus = adPrepareOctoberStatus;
-    }
-
-    public String getAdPrepareOctoberOther() {
-        return adPrepareOctoberOther;
-    }
-
-    public void setAdPrepareOctoberOther(String adPrepareOctoberOther) {
-        this.adPrepareOctoberOther = adPrepareOctoberOther;
-    }
-
-}
-

+ 0 - 351
src/main/java/com/goafanti/common/model/TaskDetailsSupplement.java

@@ -1,351 +0,0 @@
-package com.goafanti.common.model;
-
-import java.io.Serializable;
-
-
-/**
- * 项目申报详情补充表(TaskDetailsSupplement)实体类
- *
- * @author makejava
- * @since 2024-12-27 10:11:14
- */
-public class TaskDetailsSupplement implements Serializable {
-    private static final long serialVersionUID = 628044648930394619L;
-
-    private Integer id;
-    /**
-     * 知识产权申报数
-     */
-    private Integer ipDeclare;
-    /**
-     * 知识产权授权数
-     */
-    private Integer ipAuthorize;
-    /**
-     * 知识产权高新数
-     */
-    private Integer ipHt;
-    /**
-     * 知识产权高新I数
-     */
-    private Integer ipHtI;
-    /**
-     * 知识产权高新II数
-     */
-    private Integer ipHtIi;
-    /**
-     * 委外开发项目数
-     */
-    private Integer outsourcingDev;
-    /**
-     * 技术开发合同登记数
-     */
-    private Integer contractRegistration;
-    /**
-     * 公出约定次数
-     */
-    private Integer publicReleaseStipulation;
-    /**
-     * 公出实际次数
-     */
-    private Integer publicReleaseActual;
-    /**
-     * 培训约定次数
-     */
-    private Integer trainingStipulation;
-    /**
-     * 培训实际次数
-     */
-    private Integer trainingActual;
-    /**
-     * 培训其他说明
-     */
-    private String trainingOther;
-    /**
-     * 专项检查数
-     */
-    private Integer specialInspect;
-    /**
-     * 模拟稽查数
-     */
-    private Integer simulatedAudit;
-    /**
-     * 特色工作-其他
-     */
-    private String featuredWorkOther;
-    /**
-     * 高新认定评价估分
-     */
-    private Integer htScore;
-    /**
-     * 高新认定评申报批次
-     */
-    private Integer htBatch;
-    /**
-     * 高新认定重点关注 0=否,1=是
-     */
-    private Integer htFocus;
-    /**
-     * 网上系统提交 0=其他,1=待完成,2=已完成,3=合同无此项
-     */
-    private Integer webSubmit;
-    /**
-     * 网上系统提交其他说明
-     */
-    private String webSubmitOther;
-    /**
-     * 纸质材料提交 0=其他,1=待完成,2=已完成,3=合同无此项
-     */
-    private Integer paperSubmit;
-    /**
-     * 纸质材料提交其他说明
-     */
-    private String paperSubmitOther;
-    /**
-     * 评审省级 0=淘汰,1=公示
-     */
-    private Integer reviewProvince;
-    /**
-     * 评审国家级 0=淘汰,1=公示
-     */
-    private Integer reviewCountry;
-    /**
-     * 评审省级序号
-     */
-    private Integer reviewProvinceNumber;
-    /**
-     * 评审国家级高企编号
-     */
-    private Integer reviewCountryNumber;
-    /**
-     * 备注说明
-     */
-    private String remarks;
-
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getIpDeclare() {
-        return ipDeclare;
-    }
-
-    public void setIpDeclare(Integer ipDeclare) {
-        this.ipDeclare = ipDeclare;
-    }
-
-    public Integer getIpAuthorize() {
-        return ipAuthorize;
-    }
-
-    public void setIpAuthorize(Integer ipAuthorize) {
-        this.ipAuthorize = ipAuthorize;
-    }
-
-    public Integer getIpHt() {
-        return ipHt;
-    }
-
-    public void setIpHt(Integer ipHt) {
-        this.ipHt = ipHt;
-    }
-
-    public Integer getIpHtI() {
-        return ipHtI;
-    }
-
-    public void setIpHtI(Integer ipHtI) {
-        this.ipHtI = ipHtI;
-    }
-
-    public Integer getIpHtIi() {
-        return ipHtIi;
-    }
-
-    public void setIpHtIi(Integer ipHtIi) {
-        this.ipHtIi = ipHtIi;
-    }
-
-    public Integer getOutsourcingDev() {
-        return outsourcingDev;
-    }
-
-    public void setOutsourcingDev(Integer outsourcingDev) {
-        this.outsourcingDev = outsourcingDev;
-    }
-
-    public Integer getContractRegistration() {
-        return contractRegistration;
-    }
-
-    public void setContractRegistration(Integer contractRegistration) {
-        this.contractRegistration = contractRegistration;
-    }
-
-    public Integer getPublicReleaseStipulation() {
-        return publicReleaseStipulation;
-    }
-
-    public void setPublicReleaseStipulation(Integer publicReleaseStipulation) {
-        this.publicReleaseStipulation = publicReleaseStipulation;
-    }
-
-    public Integer getPublicReleaseActual() {
-        return publicReleaseActual;
-    }
-
-    public void setPublicReleaseActual(Integer publicReleaseActual) {
-        this.publicReleaseActual = publicReleaseActual;
-    }
-
-    public Integer getTrainingStipulation() {
-        return trainingStipulation;
-    }
-
-    public void setTrainingStipulation(Integer trainingStipulation) {
-        this.trainingStipulation = trainingStipulation;
-    }
-
-    public Integer getTrainingActual() {
-        return trainingActual;
-    }
-
-    public void setTrainingActual(Integer trainingActual) {
-        this.trainingActual = trainingActual;
-    }
-
-    public String getTrainingOther() {
-        return trainingOther;
-    }
-
-    public void setTrainingOther(String trainingOther) {
-        this.trainingOther = trainingOther;
-    }
-
-    public Integer getSpecialInspect() {
-        return specialInspect;
-    }
-
-    public void setSpecialInspect(Integer specialInspect) {
-        this.specialInspect = specialInspect;
-    }
-
-    public Integer getSimulatedAudit() {
-        return simulatedAudit;
-    }
-
-    public void setSimulatedAudit(Integer simulatedAudit) {
-        this.simulatedAudit = simulatedAudit;
-    }
-
-    public String getFeaturedWorkOther() {
-        return featuredWorkOther;
-    }
-
-    public void setFeaturedWorkOther(String featuredWorkOther) {
-        this.featuredWorkOther = featuredWorkOther;
-    }
-
-    public Integer getHtScore() {
-        return htScore;
-    }
-
-    public void setHtScore(Integer htScore) {
-        this.htScore = htScore;
-    }
-
-    public Integer getHtBatch() {
-        return htBatch;
-    }
-
-    public void setHtBatch(Integer htBatch) {
-        this.htBatch = htBatch;
-    }
-
-    public Integer getHtFocus() {
-        return htFocus;
-    }
-
-    public void setHtFocus(Integer htFocus) {
-        this.htFocus = htFocus;
-    }
-
-    public Integer getWebSubmit() {
-        return webSubmit;
-    }
-
-    public void setWebSubmit(Integer webSubmit) {
-        this.webSubmit = webSubmit;
-    }
-
-    public String getWebSubmitOther() {
-        return webSubmitOther;
-    }
-
-    public void setWebSubmitOther(String webSubmitOther) {
-        this.webSubmitOther = webSubmitOther;
-    }
-
-    public Integer getPaperSubmit() {
-        return paperSubmit;
-    }
-
-    public void setPaperSubmit(Integer paperSubmit) {
-        this.paperSubmit = paperSubmit;
-    }
-
-    public String getPaperSubmitOther() {
-        return paperSubmitOther;
-    }
-
-    public void setPaperSubmitOther(String paperSubmitOther) {
-        this.paperSubmitOther = paperSubmitOther;
-    }
-
-    public Integer getReviewProvince() {
-        return reviewProvince;
-    }
-
-    public void setReviewProvince(Integer reviewProvince) {
-        this.reviewProvince = reviewProvince;
-    }
-
-    public Integer getReviewCountry() {
-        return reviewCountry;
-    }
-
-    public void setReviewCountry(Integer reviewCountry) {
-        this.reviewCountry = reviewCountry;
-    }
-
-    public Integer getReviewProvinceNumber() {
-        return reviewProvinceNumber;
-    }
-
-    public void setReviewProvinceNumber(Integer reviewProvinceNumber) {
-        this.reviewProvinceNumber = reviewProvinceNumber;
-    }
-
-    public Integer getReviewCountryNumber() {
-        return reviewCountryNumber;
-    }
-
-    public void setReviewCountryNumber(Integer reviewCountryNumber) {
-        this.reviewCountryNumber = reviewCountryNumber;
-    }
-
-    public String getRemarks() {
-        return remarks;
-    }
-
-    public void setRemarks(String remarks) {
-        this.remarks = remarks;
-    }
-
-}
-

+ 0 - 15
src/main/java/com/goafanti/techproject/controller/AdminTaskDetailsController.java

@@ -1,15 +0,0 @@
-package com.goafanti.techproject.controller;
-
-import com.goafanti.common.controller.CertifyApiController;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping(value = "/api/admin/taskDetails")
-public class AdminTaskDetailsController extends CertifyApiController {
-
-
-
-
-
-}

+ 4 - 6
src/main/java/com/goafanti/techproject/controller/TaskDetailsController.java

@@ -3,8 +3,6 @@ package com.goafanti.techproject.controller;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.controller.BaseController;
 import com.goafanti.common.model.TaskDetails;
-import com.goafanti.common.model.TaskDetailsExtend;
-import com.goafanti.common.model.TaskDetailsSupplement;
 import com.goafanti.techproject.bo.TaskDetailsBo;
 import com.goafanti.techproject.service.TaskDetailsService;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -37,8 +35,8 @@ public class TaskDetailsController extends BaseController {
      * @return 新增结果
      */
     @PostMapping("/add")
-    public Result<TaskDetailsBo> add(TaskDetails taskDetails, TaskDetailsExtend taskDetailsExtend, TaskDetailsSupplement taskDetailsSupp) {
-        return new Result<>().data(this.taskDetailsService.insert(taskDetails,taskDetailsExtend,taskDetailsSupp));
+    public Result<TaskDetailsBo> add(TaskDetails taskDetails) {
+        return new Result<>().data(this.taskDetailsService.insert(taskDetails));
     }
 
 
@@ -61,8 +59,8 @@ public class TaskDetailsController extends BaseController {
      * @return 编辑结果
      */
     @PostMapping("/update")
-    public Result edit(TaskDetails taskDetails, TaskDetailsExtend taskDetailsExtend, TaskDetailsSupplement taskDetailsSupp) {
-        return new Result<>().data(this.taskDetailsService.update(taskDetails, taskDetailsExtend, taskDetailsSupp));
+    public Result edit(TaskDetails taskDetails) {
+        return new Result<>().data(this.taskDetailsService.update(taskDetails));
     }
 
     /**

+ 3 - 6
src/main/java/com/goafanti/techproject/service/TaskDetailsService.java

@@ -1,9 +1,6 @@
 package com.goafanti.techproject.service;
 
 import com.goafanti.common.model.TaskDetails;
-import com.goafanti.common.model.TaskDetailsExtend;
-import com.goafanti.common.model.TaskDetailsSupplement;
-import com.goafanti.techproject.bo.TaskDetailsBo;
 
 /**
  * 项目申报详情(TaskDetails)表服务接口
@@ -19,7 +16,7 @@ public interface TaskDetailsService {
      * @param id 主键
      * @return 实例对象
      */
-    TaskDetailsBo queryById(Integer id);
+    TaskDetails queryById(Integer id);
 
 
     /**
@@ -28,7 +25,7 @@ public interface TaskDetailsService {
      * @param taskDetails 实例对象
      * @return 实例对象
      */
-    TaskDetailsBo insert(TaskDetails taskDetails, TaskDetailsExtend taskDetailsExtend, TaskDetailsSupplement taskDetailsSupp);
+    TaskDetails insert(TaskDetails taskDetails);
 
     /**
      * 修改数据
@@ -36,7 +33,7 @@ public interface TaskDetailsService {
      * @param taskDetails 实例对象
      * @return 实例对象
      */
-    TaskDetailsBo update(TaskDetails taskDetails, TaskDetailsExtend taskDetailsExtend, TaskDetailsSupplement taskDetailsSupp);
+    TaskDetails update(TaskDetails taskDetails);
 
     /**
      * 通过主键删除数据

+ 16 - 52
src/main/java/com/goafanti/techproject/service/impl/TaskDetailsServiceImpl.java

@@ -1,12 +1,14 @@
 package com.goafanti.techproject.service.impl;
 
-import com.goafanti.common.dao.*;
-import com.goafanti.common.model.*;
+import com.goafanti.common.dao.TOrderNewMapper;
+import com.goafanti.common.dao.TaskAnnualReportMapper;
+import com.goafanti.common.dao.TaskDetailsMapper;
+import com.goafanti.common.model.TOrderNew;
+import com.goafanti.common.model.TaskAnnualReport;
+import com.goafanti.common.model.TaskDetails;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.techproject.bo.TaskDetailsBo;
 import com.goafanti.techproject.service.TaskDetailsService;
-import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -28,10 +30,7 @@ import java.util.Map;
 public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> implements TaskDetailsService {
     @Resource
     private TaskDetailsMapper taskDetailsMapper;
-    @Resource
-    private TaskDetailsExtendMapper taskDetailsExtendMapper;
-    @Resource
-    private TaskDetailsSupplementMapper taskDetailsSupplementMapper;
+
     @Resource
     private TOrderNewMapper tOrderNewMapper;
     @Resource
@@ -53,21 +52,8 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
      * @return 实例对象
      */
     @Override
-    public TaskDetailsBo queryById(Integer id) {
-        TaskDetailsBo taskDetailsBo = new TaskDetailsBo();
-        TaskDetails taskDetails = this.taskDetailsMapper.selectById(id);
-        TaskDetailsExtend taskDetailsExtend = taskDetailsExtendMapper.selectById(id);
-        TaskDetailsSupplement taskDetailsSupplement = taskDetailsSupplementMapper.selectById(id);
-        if (taskDetails != null){
-            try {
-                BeanUtils.copyProperties(taskDetailsBo,taskDetails );
-                BeanUtils.copyProperties( taskDetailsBo,taskDetailsExtend);
-                BeanUtils.copyProperties( taskDetailsBo,taskDetailsSupplement);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        return taskDetailsBo;
+    public TaskDetails queryById(Integer id) {
+        return this.taskDetailsMapper.selectById(id);
     }
 
 
@@ -78,30 +64,16 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
      * @return 实例对象
      */
     @Override
-    public TaskDetailsBo insert(TaskDetails taskDetails, TaskDetailsExtend taskDetailsExtend, TaskDetailsSupplement taskDetailsSupp) {
+    public TaskDetails insert(TaskDetails taskDetails) {
         TOrderNew tOrderNew =tOrderNewMapper.selectByTid(taskDetails.getTid());
         taskDetails.setUid(tOrderNew.getBuyerId());
-        Date date = new Date();
-        taskDetails.setCreateTime(date);
-        taskDetails.setUpdateTime(date);
+        taskDetails.setCreateTime(new Date());
+        taskDetails.setUpdateTime(new Date());
         //数据计算
         countTaskDetails(taskDetails);
         this.taskDetailsMapper.insert(taskDetails);
-        if (taskDetails.getId() != null) {
-            taskDetailsExtend.setId(taskDetails.getId());
-            taskDetailsSupp.setId(taskDetails.getId());
-            taskDetailsExtendMapper.insert(taskDetailsExtend);
-            taskDetailsSupplementMapper.insert(taskDetailsSupp);
-        }
-        TaskDetailsBo taskDetailsBo = new TaskDetailsBo();
-        try {
-            BeanUtils.copyProperties(taskDetailsBo,taskDetails );
-            BeanUtils.copyProperties(taskDetailsBo,taskDetailsExtend);
-            BeanUtils.copyProperties(taskDetailsBo,taskDetailsSupp);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return taskDetailsBo;
+
+        return taskDetails;
     }
 
     private void countTaskDetails(TaskDetails taskDetails) {
@@ -165,14 +137,8 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
      * @return 实例对象
      */
     @Override
-    public TaskDetailsBo update(TaskDetails taskDetails, TaskDetailsExtend taskDetailsExtend, TaskDetailsSupplement taskDetailsSupp) {
-        if (taskDetails.getId()!=null){
-            taskDetailsExtend.setId(taskDetails.getId());
-            taskDetailsSupp.setId(taskDetails.getId());
-            this.taskDetailsMapper.update(taskDetails);
-            taskDetailsExtendMapper.update(taskDetailsExtend);
-            taskDetailsSupplementMapper.update(taskDetailsSupp);
-        }
+    public TaskDetails update(TaskDetails taskDetails) {
+        this.taskDetailsMapper.update(taskDetails);
         return this.queryById(taskDetails.getId());
     }
 
@@ -185,8 +151,6 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
     @Override
     public boolean deleteById(Integer id) {
         this.taskDetailsMapper.deleteById(id);
-        taskDetailsExtendMapper.deleteById(id);
-        taskDetailsSupplementMapper.deleteById(id);
         return true;
     }
 }