Explorar o código

投资成功修改

anderx %!s(int64=3) %!d(string=hai) anos
pai
achega
68f9b849d6

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

@@ -7,6 +7,25 @@ public class InputInvestList {
      * 0 巴主发起列表 1财务审核列表
      */
     private Integer roleType;
+    private String startTime;
+    private String endTime;
+
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
 
     public Integer getRoleType() {
         return roleType;

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

@@ -4,6 +4,8 @@ import java.math.BigDecimal;
 
 public class OutInvestList {
     private Long id;
+    private Long initiateAmbId;
+    private Long acceptAmbId;
     private String initiateName;
     private String acceptName;
     private BigDecimal amount;
@@ -12,6 +14,22 @@ public class OutInvestList {
     private String comment;
     private String createTimes;
 
+    public Long getInitiateAmbId() {
+        return initiateAmbId;
+    }
+
+    public void setInitiateAmbId(Long initiateAmbId) {
+        this.initiateAmbId = initiateAmbId;
+    }
+
+    public Long getAcceptAmbId() {
+        return acceptAmbId;
+    }
+
+    public void setAcceptAmbId(Long acceptAmbId) {
+        this.acceptAmbId = acceptAmbId;
+    }
+
     public Long getId() {
         return id;
     }

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

@@ -114,6 +114,9 @@ public class AmbInvestServiceImpl extends BaseMybatisDao<AmbInvestMapper> implem
             params.put("roleType",in.getRoleType());
             params.put("aid",TokenManager.getAdminId());
         }
+        params.put("startTime",in.getStartTime());
+        params.put("endTime",in.getEndTime()+" 23:59:59");
+
 
         return findPage("selectInvestList","selectInvestCount",params,in.getPageNo(),in.getPageSize());
     }

+ 3 - 1
src/main/java/com/goafanti/common/controller/BaseController.java

@@ -156,7 +156,7 @@ public class BaseController {
 	/**
 	 *	获取权利列表
 	 * @return String  返回权限列表 逗号隔开 1=营销员,2=营销经理,3=营销管理员,4=营销总监,5=财务专员,6=财务经理,7=财务管理员,
-	 * 					8=技术员,9=技术经理,10=技术管理员,11=运营管理,12=总裁助理,13=总裁
+	 * 					8=技术员,9=技术经理,10=技术管理员,11=运营管理,12=总裁助理,13=总裁,14=董事长助理,15=董事长
 	 */
 	public String shiroAddRedis() {
 		redisUtil.deleteString("shiroList");
@@ -174,6 +174,8 @@ public class BaseController {
 		if (TokenManager.hasRole(AFTConstants.OPERATION_MANAGER))str=str.append(11).append(",");
 		if (TokenManager.hasRole(AFTConstants.CED_ASSISTANT))str=str.append(12).append(",");
 		if (TokenManager.hasRole(AFTConstants.CED))str=str.append(13).append(",");
+		if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_AUDITOR))str=str.append(14).append(",");
+		if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION))str=str.append(15).append(",");
 		if (str.length()<1)return "";
 		String shiroList=str.substring(0,str.length()-1);
 		redisUtil.setString("shiroList",shiroList);

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

@@ -133,7 +133,8 @@
   </update>
 
   <select id="selectInvestList" resultType="com.goafanti.ambSystem.bo.OutInvestList">
-    select a.id,b.name initiateName,c.name acceptName,a.amount ,a.status ,d.name operator,a.comment ,
+    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 ,
     date_format(a.create_time,'%Y-%m-%d %H:%i:%S') createTimes
     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
@@ -145,6 +146,10 @@
     <if test="roleType==2">
       and a.status in (1,2,3)
     </if>
+    <if test="startTime!=null and endTime !=null">
+      and a.create_time between #{startTime} and #{endTime}
+    </if>
+
     order by a.create_time desc
     <if test="page_sql !=null">
       ${page_sql}
@@ -161,6 +166,9 @@
     <if test="roleType==2">
       and a.status in (1,2,3)
     </if>
+    <if test="startTime!=null and endTime !=null">
+      and a.create_time between #{startTime} and #{endTime}
+    </if>
   </select>
   <select id="selectCountAmountById" resultType="java.lang.Integer">
     select sum(amount)amount