anderx 1 год назад
Родитель
Сommit
647f83cc5f

Разница между файлами не показана из-за своего большого размера
+ 36 - 22
src/main/java/com/goafanti/common/mapper/TaskDetailsExtendMapper.xml


+ 28 - 16
src/main/java/com/goafanti/common/mapper/TaskDetailsSupplementMapper.xml

@@ -18,6 +18,7 @@
         <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"/>
@@ -32,7 +33,7 @@
     </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, 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
+        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
     </sql>
 
     <!--查询单个-->
@@ -48,30 +49,31 @@
         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, 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)
+                                            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)
         values (#{id},#{ipDeclare}, #{ipAuthorize}, #{ipHt}, #{ipHtI}, #{ipHtIi}, #{outsourcingDev}, #{contractRegistration},
                 #{publicReleaseStipulation}, #{publicReleaseActual}, #{trainingStipulation}, #{trainingActual},
-                #{trainingOther}, #{specialInspect}, #{simulatedAudit}, #{htScore}, #{htBatch}, #{htFocus},
-                #{webSubmit}, #{webSubmitOther}, #{paperSubmit}, #{paperSubmitOther}, #{reviewProvince},
+                #{trainingOther}, #{specialInspect}, #{simulatedAudit}, #{featuredWorkOther}, #{htScore}, #{htBatch},
+                #{htFocus}, #{webSubmit}, #{webSubmitOther}, #{paperSubmit}, #{paperSubmitOther}, #{reviewProvince},
                 #{reviewCountry}, #{reviewProvinceNumber}, #{reviewCountryNumber})
     </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, ht_score, ht_batch, ht_focus, web_submit, web_submit_other,
-        paper_submit, paper_submit_other, review_province, review_country, review_province_number,
+        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)
         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.htScore},
-            #{entity.htBatch}, #{entity.htFocus}, #{entity.webSubmit}, #{entity.webSubmitOther}, #{entity.paperSubmit},
-            #{entity.paperSubmitOther}, #{entity.reviewProvince}, #{entity.reviewCountry},
+            #{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})
         </foreach>
     </insert>
@@ -79,17 +81,17 @@
     <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, ht_score, ht_batch, ht_focus, web_submit, web_submit_other,
-        paper_submit, paper_submit_other, review_province, review_country, review_province_number,
+        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)
         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.htScore},
-            #{entity.htBatch}, #{entity.htFocus}, #{entity.webSubmit}, #{entity.webSubmitOther}, #{entity.paperSubmit},
-            #{entity.paperSubmitOther}, #{entity.reviewProvince}, #{entity.reviewCountry},
+            #{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})
         </foreach>
         on duplicate key update
@@ -107,6 +109,7 @@
         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),
@@ -166,6 +169,9 @@
             <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>
@@ -255,6 +261,9 @@
             <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>
@@ -344,6 +353,9 @@
             <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>

+ 14 - 2
src/main/java/com/goafanti/common/model/TaskDetailsExtend.java

@@ -8,10 +8,10 @@ import java.math.BigDecimal;
  * 项目申报详情扩展表(TaskDetailsExtend)实体类
  *
  * @author makejava
- * @since 2024-12-26 17:12:02
+ * @since 2024-12-27 09:51:13
  */
 public class TaskDetailsExtend implements Serializable {
-    private static final long serialVersionUID = -68895241925046438L;
+    private static final long serialVersionUID = -26555157106962965L;
 
     private Integer id;
     /**
@@ -39,6 +39,10 @@ public class TaskDetailsExtend implements Serializable {
      */
     private BigDecimal rdAnnouncementAmount;
     /**
+     * 研发奖补-公示金额-其他
+     */
+    private String rdAnnouncementOther;
+    /**
      * 加扣备查交付 0=其他,1=待完成,2=已完成,3=合同无此项
      */
     private Integer adDeliverStatus;
@@ -160,6 +164,14 @@ public class TaskDetailsExtend implements Serializable {
         this.rdAnnouncementAmount = rdAnnouncementAmount;
     }
 
+    public String getRdAnnouncementOther() {
+        return rdAnnouncementOther;
+    }
+
+    public void setRdAnnouncementOther(String rdAnnouncementOther) {
+        this.rdAnnouncementOther = rdAnnouncementOther;
+    }
+
     public Integer getAdDeliverStatus() {
         return adDeliverStatus;
     }

+ 14 - 2
src/main/java/com/goafanti/common/model/TaskDetailsSupplement.java

@@ -7,10 +7,10 @@ import java.io.Serializable;
  * 项目申报详情补充表(TaskDetailsSupplement)实体类
  *
  * @author makejava
- * @since 2024-12-26 17:12:11
+ * @since 2024-12-27 09:51:42
  */
 public class TaskDetailsSupplement implements Serializable {
-    private static final long serialVersionUID = 799297636952880328L;
+    private static final long serialVersionUID = -49722716773918298L;
 
     private Integer id;
     /**
@@ -70,6 +70,10 @@ public class TaskDetailsSupplement implements Serializable {
      */
     private Integer simulatedAudit;
     /**
+     * 特色工作-其他
+     */
+    private String featuredWorkOther;
+    /**
      * 高新认定评价估分
      */
     private Integer htScore;
@@ -235,6 +239,14 @@ public class TaskDetailsSupplement implements Serializable {
         this.simulatedAudit = simulatedAudit;
     }
 
+    public String getFeaturedWorkOther() {
+        return featuredWorkOther;
+    }
+
+    public void setFeaturedWorkOther(String featuredWorkOther) {
+        this.featuredWorkOther = featuredWorkOther;
+    }
+
     public Integer getHtScore() {
         return htScore;
     }