Browse Source

会员新增异常BUG修复

anderx 1 year ago
parent
commit
9a8874eb7a

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

@@ -1185,17 +1185,21 @@ create_time = values(create_time)
     <select id="selectTaskDetailsList" resultMap="TaskDetailsMap">
         select
             a.*
-        from task_details a left join t_order_task b on a.id =b.progress_tid
-        left join admin c on b.task_receiver=c.id
-        left join t_order_mid d on b.order_no=d.order_no
-        left join t_order_new e on b.order_no=e.order_no
-        where (c.superior_id= #{aid} or c.id= #{aid})
+        from task_details a
         <include refid="selectTaskDetailsSql"/>
         <if test="page_sql !=null">
             ${page_sql}
         </if>
     </select>
     <sql id="selectTaskDetailsSql">
+        left join t_order_task b on a.id =b.progress_tid
+        left join admin c on b.task_receiver=c.id
+        left join t_order_mid d on b.order_no=d.order_no
+        left join t_order_new e on b.order_no=e.order_no
+        <if test="serviceYear !=null">
+            left join t_task_member f on b.id=f.tid
+        </if>
+        where (c.superior_id= #{aid} or c.id= #{aid})
         <if test="userName != null and userName != ''">
             and d.buyer_name like concat('%',#{userName},'%')
         </if>
@@ -1206,14 +1210,58 @@ create_time = values(create_time)
         <if test="contractNo !=null">
             and e.contract_no like concat('%',#{contractNo},'%')
         </if>
-
+        <if test="serviceYear !=null">
+            and f.service_year like concat('%',#{serviceYear},'%')
+        </if>
+        <if test="projectDebtorId !=null">
+            and b.task_receiver = #{projectDebtorId}
+        </if>
+        <if test="projectStatus !=null">
+            and b.project_status = #{projectStatus}
+        </if>
+        <if test="outSourcingStatus !=null">
+            and b.outsource= #{outSourcingStatus}
+        </if>
+        <if test="updateTime !=null">
+            and b.update_time between #{updateTime} and #{updateTime} + interval 1 day
+        </if>
+        <if test="progress !=null">
+            and a.progress = #{progress}
+        </if>
+        <if test="applicationLevel !=null">
+            <if test="applicationLevel == '1'">
+                and e.total_amount &lt; 3
+            </if>
+            <if test="applicationLevel == '2'">
+                and a.application_level &gt; 3 and e.total_amount &lt; 8
+            </if>
+            <if test="applicationLevel == '3'">
+                and a.application_level &gt; 8
+            </if>
+        </if>
+        <if test="reviewProvince !=null">
+            and a.review_province = #{reviewProvince}
+        </if>
+        <if test="finalSettlementStatus !=null">
+            and a.final_settlement_status = #{finalSettlementStatus}
+        </if>
+        <if test="adDeliverStatus !=null">
+            and a.ad_deliver_status = #{adDeliverStatus}
+        </if>
+        <if test="torchStatus !=null">
+            and a.torch_status = #{torchStatus}
+        </if>
+        <if test="statisticsStatus !=null">
+            and a.statistics_status = #{statisticsStatus}
+        </if>
+        <if test="chStatus !=null">
+            and a.ch_status = #{chStatus}
+        </if>
     </sql>
     <select id="selectTaskDetailsCount" resultType="java.lang.Integer">
         select
             count(*)
-        from task_details a left join t_order_task b on a.id =b.progress_tid
-        left join admin c on b.task_receiver=c.id
-        where (c.superior_id= #{aid} or c.id= #{aid})
+        from task_details a
         <include refid="selectTaskDetailsSql"/>
     </select>
 </mapper>

+ 13 - 13
src/main/java/com/goafanti/techproject/bo/InputTaskDetailsBo.java

@@ -19,7 +19,7 @@ public class InputTaskDetailsBo {
     /**
      *  项目负责人
      */
-    private String projectDebtorName;
+    private String projectDebtorId;
     /**
      * 项目状态
      */
@@ -39,11 +39,11 @@ public class InputTaskDetailsBo {
     /**
      * 会员级别
      */
-    private String applicationLevel;
+    private Integer applicationLevel;
     /**
      *高新公示
      */
-    private String htStatus;
+    private Integer reviewProvince;
     /**
      * 汇算清缴 0=其他,1=待完成,2=已完成,3=合同无此项
      */
@@ -94,12 +94,12 @@ public class InputTaskDetailsBo {
         this.serviceYear = serviceYear;
     }
 
-    public String getProjectDebtorName() {
-        return projectDebtorName;
+    public String getProjectDebtorId() {
+        return projectDebtorId;
     }
 
-    public void setProjectDebtorName(String projectDebtorName) {
-        this.projectDebtorName = projectDebtorName;
+    public void setProjectDebtorId(String projectDebtorId) {
+        this.projectDebtorId = projectDebtorId;
     }
 
     public String getProjectStatus() {
@@ -134,20 +134,20 @@ public class InputTaskDetailsBo {
         this.progress = progress;
     }
 
-    public String getApplicationLevel() {
+    public Integer getApplicationLevel() {
         return applicationLevel;
     }
 
-    public void setApplicationLevel(String applicationLevel) {
+    public void setApplicationLevel(Integer applicationLevel) {
         this.applicationLevel = applicationLevel;
     }
 
-    public String getHtStatus() {
-        return htStatus;
+    public Integer getReviewProvince() {
+        return reviewProvince;
     }
 
-    public void setHtStatus(String htStatus) {
-        this.htStatus = htStatus;
+    public void setReviewProvince(Integer reviewProvince) {
+        this.reviewProvince = reviewProvince;
     }
 
     public Integer getFinalSettlementStatus() {