Kaynağa Gözat

投资列表修改

anderx 3 yıl önce
ebeveyn
işleme
c9569ca64b

+ 10 - 0
src/main/java/com/goafanti/ambSystem/bo/InputInvestList.java

@@ -3,6 +3,7 @@ package com.goafanti.ambSystem.bo;
 public class InputInvestList {
     private Integer pageSize;
     private Integer pageNo;
+    private Integer status;
     /**
      * 0 巴主发起列表 1财务审核列表 2部门投资出 3获取投资
      */
@@ -11,6 +12,15 @@ public class InputInvestList {
     private String startTime;
     private String endTime;
 
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
     public Long getAmbId() {
         return ambId;
     }

+ 2 - 0
src/main/java/com/goafanti/ambSystem/service/Impl/AmbInvestServiceImpl.java

@@ -137,6 +137,7 @@ public class AmbInvestServiceImpl extends BaseMybatisDao<AmbInvestMapper> implem
         }
         params.put("startTime",in.getStartTime());
         params.put("endTime",in.getEndTime()+" 23:59:59");
+        params.put("status",in.getStatus());
         if (in.getRoleType()==2||in.getRoleType()==3){
             params.put("ambId",in.getAmbId());
         }
@@ -188,6 +189,7 @@ public class AmbInvestServiceImpl extends BaseMybatisDao<AmbInvestMapper> implem
             if (myAmb.getId()==1L){
                 newMy.setForeign(myAmb.getForeign().add(ambInvest.getAmount()));
             }else {
+                newMy.setForeign(myAmb.getForeign().add(ambInvest.getAmount()));
                 newMy.setTotalAmount(myAmb.getTotalAmount().subtract(ambInvest.getAmount()));
                 newMy.setSurplus(myAmb.getSurplus().subtract(ambInvest.getAmount()));
             }

+ 9 - 3
src/main/java/com/goafanti/common/mapper/AmbInvestMapper.xml

@@ -147,15 +147,18 @@
       and a.status in (1,2,3)
       and b.accountant =#{aid}
     </if>
-    <if test="startTime!=null and endTime !=null">
-      and a.create_time between #{startTime} and #{endTime}
-    </if>
     <if test="roleType==2 ">
       and a.initiate_amb_id= #{ambId}
     </if>
     <if test="roleType==3">
       and a.accept_amb_id = #{ambId}
     </if>
+    <if test="startTime!=null and endTime !=null">
+      and a.create_time between #{startTime} and #{endTime}
+    </if>
+    <if test="status !=null">
+      and a.status= #{status}
+    </if>
     order by
     <if test="roleType==0 or roleType==1">
     a.status ,
@@ -186,6 +189,9 @@
     <if test="roleType==3">
       and a.accept_amb_id = #{ambId}
     </if>
+    <if test="status !=null">
+      and a.status= #{status}
+    </if>
   </select>
   <select id="selectCountAmountById" resultType="java.lang.Integer">
     select sum(amount)amount