Browse Source

修改项目进度计算逻辑修改,新增判空

anderx 1 year ago
parent
commit
9dcc40d30b

+ 4 - 4
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -83,7 +83,7 @@
         <result property="days" column="days" jdbcType="INTEGER"/>
         <result property="scheme" column="scheme" jdbcType="INTEGER"/>
         <result property="unilateralService" column="unilateral_service" jdbcType="INTEGER"/>
-        <result property="progressTid" column="progress_tid" jdbcType="VARCHAR"/>
+        <result property="progressTid" column="progress_tid" jdbcType="INTEGER"/>
     </resultMap>
     
     <sql id="TOrderTaskAllSql">
@@ -442,7 +442,7 @@ progress_tid = values(progress_tid)
             <if test="unilateralService != null">
                 unilateral_service = #{unilateralService},
             </if>
-            <if test="progressTid != null and progressTid != ''">
+            <if test="progressTid != null">
                 progress_tid = #{progressTid},
             </if>
         </set>
@@ -696,7 +696,7 @@ progress_tid = values(progress_tid)
             <if test="unilateralService != null">
                 and unilateral_service = #{unilateralService}
             </if>
-            <if test="progressTid != null and progressTid != ''">
+            <if test="progressTid != null">
                 and progress_tid = #{progressTid}
             </if>
         </where>
@@ -950,7 +950,7 @@ progress_tid = values(progress_tid)
             <if test="unilateralService != null">
                 and unilateral_service = #{unilateralService}
             </if>
-            <if test="progressTid != null and progressTid != ''">
+            <if test="progressTid != null">
                 and progress_tid = #{progressTid}
             </if>
         </where>

+ 5 - 5
src/main/java/com/goafanti/common/model/TOrderTask.java

@@ -9,10 +9,10 @@ import java.util.Date;
  * 订单任务表(TOrderTask)实体类
  *
  * @author makejava
- * @since 2025-01-09 11:08:21
+ * @since 2025-01-09 11:18:49
  */
 public class TOrderTask implements Serializable {
-    private static final long serialVersionUID = -90237952395642901L;
+    private static final long serialVersionUID = -42016156639024626L;
 /**
      * 任务编号
      */
@@ -336,7 +336,7 @@ public class TOrderTask implements Serializable {
 /**
      * 项目进度编号
      */
-    private String progressTid;
+    private Integer progressTid;
 
 
     public Integer getId() {
@@ -979,11 +979,11 @@ public class TOrderTask implements Serializable {
         this.unilateralService = unilateralService;
     }
 
-    public String getProgressTid() {
+    public Integer getProgressTid() {
         return progressTid;
     }
 
-    public void setProgressTid(String progressTid) {
+    public void setProgressTid(Integer progressTid) {
         this.progressTid = progressTid;
     }