Browse Source

部门统计表修改

anderx 11 months ago
parent
commit
88e5aea029

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

@@ -96,8 +96,8 @@
         <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="reviewProvinceNumber" column="review_province_number" jdbcType="VARCHAR"/>
+        <result property="reviewCountryNumber" column="review_country_number" jdbcType="VARCHAR"/>
         <result property="remarks" column="remarks" jdbcType="VARCHAR"/>
         <result property="aid" column="aid" jdbcType="VARCHAR"/>
         <result property="aname" column="aname" jdbcType="VARCHAR"/>
@@ -533,10 +533,10 @@ feature_other = values(feature_other)
             <if test="reviewCountry != null">
                 review_country = #{reviewCountry},
             </if>
-            <if test="reviewProvinceNumber != null">
+            <if test="reviewProvinceNumber != null and reviewProvinceNumber != ''">
                 review_province_number = #{reviewProvinceNumber},
             </if>
-            <if test="reviewCountryNumber != null">
+            <if test="reviewCountryNumber != null and reviewCountryNumber != ''">
                 review_country_number = #{reviewCountryNumber},
             </if>
             <if test="remarks != null and remarks != ''">
@@ -865,10 +865,10 @@ feature_other = values(feature_other)
             <if test="reviewCountry != null">
                 and review_country = #{reviewCountry}
             </if>
-            <if test="reviewProvinceNumber != null">
+            <if test="reviewProvinceNumber != null and reviewProvinceNumber != ''">
                 and review_province_number = #{reviewProvinceNumber}
             </if>
-            <if test="reviewCountryNumber != null">
+            <if test="reviewCountryNumber != null and reviewCountryNumber != ''">
                 and review_country_number = #{reviewCountryNumber}
             </if>
             <if test="remarks != null and remarks != ''">
@@ -1197,10 +1197,10 @@ feature_other = values(feature_other)
             <if test="reviewCountry != null">
                 and review_country = #{reviewCountry}
             </if>
-            <if test="reviewProvinceNumber != null">
+            <if test="reviewProvinceNumber != null and reviewProvinceNumber != ''">
                 and review_province_number = #{reviewProvinceNumber}
             </if>
-            <if test="reviewCountryNumber != null">
+            <if test="reviewCountryNumber != null and reviewCountryNumber != ''">
                 and review_country_number = #{reviewCountryNumber}
             </if>
             <if test="remarks != null and remarks != ''">

+ 10 - 9
src/main/java/com/goafanti/common/mapper/TaskDetailsMapper.xml

@@ -96,8 +96,8 @@
         <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="reviewProvinceNumber" column="review_province_number" jdbcType="VARCHAR"/>
+        <result property="reviewCountryNumber" column="review_country_number" jdbcType="VARCHAR"/>
         <result property="remarks" column="remarks" jdbcType="VARCHAR"/>
         <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
         <result property="downloadTime" column="download_time" jdbcType="TIMESTAMP"/>
@@ -533,10 +533,10 @@ feature_other = values(feature_other)
             <if test="reviewCountry != null">
                 review_country = #{reviewCountry},
             </if>
-            <if test="reviewProvinceNumber != null">
+            <if test="reviewProvinceNumber != null and reviewProvinceNumber != ''">
                 review_province_number = #{reviewProvinceNumber},
             </if>
-            <if test="reviewCountryNumber != null">
+            <if test="reviewCountryNumber != null and reviewCountryNumber != ''">
                 review_country_number = #{reviewCountryNumber},
             </if>
             <if test="remarks != null and remarks != ''">
@@ -865,10 +865,10 @@ feature_other = values(feature_other)
             <if test="reviewCountry != null">
                 and review_country = #{reviewCountry}
             </if>
-            <if test="reviewProvinceNumber != null">
+            <if test="reviewProvinceNumber != null and reviewProvinceNumber != ''">
                 and review_province_number = #{reviewProvinceNumber}
             </if>
-            <if test="reviewCountryNumber != null">
+            <if test="reviewCountryNumber != null and reviewCountryNumber != ''">
                 and review_country_number = #{reviewCountryNumber}
             </if>
             <if test="remarks != null and remarks != ''">
@@ -1197,10 +1197,10 @@ feature_other = values(feature_other)
             <if test="reviewCountry != null">
                 and review_country = #{reviewCountry}
             </if>
-            <if test="reviewProvinceNumber != null">
+            <if test="reviewProvinceNumber != null and reviewProvinceNumber != ''">
                 and review_province_number = #{reviewProvinceNumber}
             </if>
-            <if test="reviewCountryNumber != null">
+            <if test="reviewCountryNumber != null and reviewCountryNumber != ''">
                 and review_country_number = #{reviewCountryNumber}
             </if>
             <if test="remarks != null and remarks != ''">
@@ -1363,4 +1363,5 @@ feature_other = values(feature_other)
         from task_details a
         <include refid="selectTaskDetailsSql"/>
     </select>
-</mapper>
+</mapper>
+

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

@@ -11,10 +11,10 @@ import java.util.Date;
  * 项目申报详情(TaskDetails)实体类
  *
  * @author makejava
- * @since 2025-02-10 13:40:30
+ * @since 2025-02-14 15:11:25
  */
 public class TaskDetails implements Serializable {
-    private static final long serialVersionUID = -18595029675046156L;
+    private static final long serialVersionUID = 378389592122062421L;
 
     private Integer id;
 /**
@@ -388,11 +388,11 @@ public class TaskDetails implements Serializable {
 /**
      * 评审省级序号
      */
-    private Integer reviewProvinceNumber;
+    private String reviewProvinceNumber;
 /**
      * 评审国家级高企编号
      */
-    private Integer reviewCountryNumber;
+    private String reviewCountryNumber;
 /**
      * 备注说明
      */
@@ -1187,19 +1187,19 @@ public class TaskDetails implements Serializable {
         this.reviewCountry = reviewCountry;
     }
 
-    public Integer getReviewProvinceNumber() {
+    public String getReviewProvinceNumber() {
         return reviewProvinceNumber;
     }
 
-    public void setReviewProvinceNumber(Integer reviewProvinceNumber) {
+    public void setReviewProvinceNumber(String reviewProvinceNumber) {
         this.reviewProvinceNumber = reviewProvinceNumber;
     }
 
-    public Integer getReviewCountryNumber() {
+    public String getReviewCountryNumber() {
         return reviewCountryNumber;
     }
 
-    public void setReviewCountryNumber(Integer reviewCountryNumber) {
+    public void setReviewCountryNumber(String reviewCountryNumber) {
         this.reviewCountryNumber = reviewCountryNumber;
     }
 

+ 8 - 10
src/main/java/com/goafanti/common/model/TaskDetailsLog.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;
  * 项目申报详情日志(TaskDetailsLog)实体类
  *
  * @author makejava
- * @since 2025-02-10 13:40:38
+ * @since 2025-02-14 15:11:32
  */
 public class TaskDetailsLog implements Serializable {
-    private static final long serialVersionUID = 150301662953278272L;
+    private static final long serialVersionUID = 419965485945349856L;
 
     private Integer id;
 /**
@@ -388,11 +386,11 @@ public class TaskDetailsLog implements Serializable {
 /**
      * 评审省级序号
      */
-    private Integer reviewProvinceNumber;
+    private String reviewProvinceNumber;
 /**
      * 评审国家级高企编号
      */
-    private Integer reviewCountryNumber;
+    private String reviewCountryNumber;
 /**
      * 备注说明
      */
@@ -1187,19 +1185,19 @@ public class TaskDetailsLog implements Serializable {
         this.reviewCountry = reviewCountry;
     }
 
-    public Integer getReviewProvinceNumber() {
+    public String getReviewProvinceNumber() {
         return reviewProvinceNumber;
     }
 
-    public void setReviewProvinceNumber(Integer reviewProvinceNumber) {
+    public void setReviewProvinceNumber(String reviewProvinceNumber) {
         this.reviewProvinceNumber = reviewProvinceNumber;
     }
 
-    public Integer getReviewCountryNumber() {
+    public String getReviewCountryNumber() {
         return reviewCountryNumber;
     }
 
-    public void setReviewCountryNumber(Integer reviewCountryNumber) {
+    public void setReviewCountryNumber(String reviewCountryNumber) {
         this.reviewCountryNumber = reviewCountryNumber;
     }