Browse Source

咨询进度表开发

anderx 1 year ago
parent
commit
9ea132dc9a

+ 19 - 8
src/main/java/com/goafanti/common/mapper/TaskDetailsSupplementMapper.xml

@@ -30,10 +30,11 @@
         <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
+        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>
 
     <!--查询单个-->
@@ -52,12 +53,12 @@
                                             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)
+                                            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})
+                #{reviewCountry}, #{reviewProvinceNumber}, #{reviewCountryNumber}, #{remarks})
     </insert>
 
     <insert id="insertBatch">
@@ -65,7 +66,7 @@
         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)
+        review_country_number, remarks)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.ipDeclare}, #{entity.ipAuthorize}, #{entity.ipHt}, #{entity.ipHtI}, #{entity.ipHtIi},
@@ -74,7 +75,7 @@
             #{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.reviewProvinceNumber}, #{entity.reviewCountryNumber}, #{entity.remarks})
         </foreach>
     </insert>
 
@@ -83,7 +84,7 @@
         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)
+        review_country_number, remarks)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.ipDeclare}, #{entity.ipAuthorize}, #{entity.ipHt}, #{entity.ipHtI}, #{entity.ipHtIi},
@@ -92,7 +93,7 @@
             #{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.reviewProvinceNumber}, #{entity.reviewCountryNumber}, #{entity.remarks})
         </foreach>
         on duplicate key update
         ip_declare = values(ip_declare),
@@ -120,7 +121,8 @@
         review_province = values(review_province),
         review_country = values(review_country),
         review_province_number = values(review_province_number),
-        review_country_number = values(review_country_number)
+        review_country_number = values(review_country_number),
+        remarks = values(remarks)
     </insert>
 
     <!--通过主键修改数据-->
@@ -205,6 +207,9 @@
             <if test="reviewCountryNumber != null">
                 review_country_number = #{reviewCountryNumber},
             </if>
+            <if test="remarks != null and remarks != ''">
+                remarks = #{remarks},
+            </if>
         </set>
         where id = #{id}
     </update>
@@ -297,6 +302,9 @@
             <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}
@@ -389,6 +397,9 @@
             <if test="reviewCountryNumber != null">
                 and review_country_number = #{reviewCountryNumber}
             </if>
+            <if test="remarks != null and remarks != ''">
+                and remarks = #{remarks}
+            </if>
         </where>
     </select>
 

+ 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-27 09:58:09
+ * @since 2024-12-27 10:11:14
  */
 public class TaskDetailsSupplement implements Serializable {
-    private static final long serialVersionUID = -98159325620556474L;
+    private static final long serialVersionUID = 628044648930394619L;
 
     private Integer id;
     /**
@@ -117,6 +117,10 @@ public class TaskDetailsSupplement implements Serializable {
      * 评审国家级高企编号
      */
     private Integer reviewCountryNumber;
+    /**
+     * 备注说明
+     */
+    private String remarks;
 
 
     public Integer getId() {
@@ -335,5 +339,13 @@ public class TaskDetailsSupplement implements Serializable {
         this.reviewCountryNumber = reviewCountryNumber;
     }
 
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
 }