Przeglądaj źródła

科德系统投资列表修改

anderx 3 lat temu
rodzic
commit
4f6282c506

+ 22 - 5
src/main/java/com/goafanti/ambSystem/bo/InputInvestList.java

@@ -8,10 +8,19 @@ public class InputInvestList {
      * 0 巴主发起列表 1财务审核列表 2部门投资出 3获取投资
      */
     private Integer roleType;
-    private Long ambId;
+    private Long initiateAmbId;
+    private Long acceptAmbId;
     private String startTime;
     private String endTime;
+    private String operator;
 
+    public String getOperator() {
+        return operator;
+    }
+
+    public void setOperator(String operator) {
+        this.operator = operator;
+    }
 
     public Integer getStatus() {
         return status;
@@ -21,12 +30,20 @@ public class InputInvestList {
         this.status = status;
     }
 
-    public Long getAmbId() {
-        return ambId;
+    public Long getInitiateAmbId() {
+        return initiateAmbId;
+    }
+
+    public void setInitiateAmbId(Long initiateAmbId) {
+        this.initiateAmbId = initiateAmbId;
+    }
+
+    public Long getAcceptAmbId() {
+        return acceptAmbId;
     }
 
-    public void setAmbId(Long ambId) {
-        this.ambId = ambId;
+    public void setAcceptAmbId(Long acceptAmbId) {
+        this.acceptAmbId = acceptAmbId;
     }
 
     public String getStartTime() {

+ 9 - 0
src/main/java/com/goafanti/ambSystem/bo/OutInvestList.java

@@ -14,6 +14,15 @@ public class OutInvestList {
     private String operator;
     private String comment;
     private String createTimes;
+    private String ambRole;
+
+    public String getAmbRole() {
+        return ambRole;
+    }
+
+    public void setAmbRole(String ambRole) {
+        this.ambRole = ambRole;
+    }
 
     public BigDecimal getCountAmount() {
         return countAmount;

+ 4 - 3
src/main/java/com/goafanti/ambSystem/service/Impl/AmbInvestServiceImpl.java

@@ -138,12 +138,13 @@ public class AmbInvestServiceImpl extends BaseMybatisDao<AmbInvestMapper> implem
             params.put("roleType",in.getRoleType());
             params.put("aid",TokenManager.getAdminId());
         }
+        if (in.getOperator()!=null)params.put("operator",in.getOperator());
         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());
-        }
+        params.put("initiateAmbId",in.getInitiateAmbId());
+        params.put("acceptAmbId",in.getAcceptAmbId());
+
 
         return findPage("selectInvestList","selectInvestCount",params,in.getPageNo(),in.getPageSize());
     }

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

@@ -135,7 +135,7 @@
   <select id="selectInvestList" resultType="com.goafanti.ambSystem.bo.OutInvestList">
     select a.id,a.initiate_amb_id initiateAmbId,b.name initiateName,a.accept_amb_id acceptAmbId,
     c.name acceptName,a.amount ,a.status ,d.name operator,a.comment ,a.count_amount countAmount,
-    date_format(a.create_time,'%Y-%m-%d %H:%i:%S') createTimes
+    date_format(a.create_time,'%Y-%m-%d %H:%i:%S') createTimes,d.amb_role ambRole
     from amb_invest a  left join amb_system b on a.initiate_amb_id =b.id
     left join amb_system c on a.accept_amb_id =c.id
     left join admin d on a.operator =d.id
@@ -147,11 +147,14 @@
       and a.status in (1,2,3)
       and b.accountant =#{aid}
     </if>
-    <if test="roleType==2 ">
-      and a.initiate_amb_id= #{ambId}
+    <if test="initiateAmbId != null ">
+      and a.initiate_amb_id= #{initiateAmbId}
     </if>
-    <if test="roleType==3">
-      and a.accept_amb_id = #{ambId}
+    <if test="acceptAmbId !=null">
+      and a.accept_amb_id = #{acceptAmbId}
+    </if>
+    <if test="operator !=null">
+      and a.operator= #{operator}
     </if>
     <if test="startTime!=null and endTime !=null">
       and a.create_time between #{startTime} and #{endTime}
@@ -183,11 +186,14 @@
     <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 test="initiateAmbId != null ">
+      and a.initiate_amb_id= #{initiateAmbId}
+    </if>
+    <if test="acceptAmbId !=null">
+      and a.accept_amb_id = #{acceptAmbId}
     </if>
-    <if test="roleType==3">
-      and a.accept_amb_id = #{ambId}
+    <if test="operator !=null">
+      and a.operator= #{operator}
     </if>
     <if test="status !=null">
       and a.status= #{status}