Browse Source

开发董事长投资

anderx 3 years ago
parent
commit
a0c7bd49dc

+ 9 - 1
src/main/java/com/goafanti/ambSystem/bo/InputInvestList.java

@@ -4,12 +4,20 @@ public class InputInvestList {
     private Integer pageSize;
     private Integer pageNo;
     /**
-     * 0 巴主发起列表 1财务审核列表
+     * 0 巴主发起列表 1财务审核列表 2部门投资出 3获取投资
      */
     private Integer roleType;
+    private Long ambId;
     private String startTime;
     private String endTime;
 
+    public Long getAmbId() {
+        return ambId;
+    }
+
+    public void setAmbId(Long ambId) {
+        this.ambId = ambId;
+    }
 
     public String getStartTime() {
         return startTime;

+ 8 - 5
src/main/java/com/goafanti/ambSystem/controller/AmbInvestApiController.java

@@ -42,11 +42,17 @@ public class AmbInvestApiController extends CertifyApiController {
 			return res;
 		}
 		if(!TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)&&!TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_AUDITOR)){
-			in.setRoleType(1);
+			in.setRoleType(0);
 			if (in.getMyAmbId()==null){
 				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"发起部门","发起部门"));
 				return res;
 			}
+			if (ambInvestService.checkMyAmb(in.getMyAmbId())){
+				res.getError().add(buildError("只有当前阿米巴负责人可以发起投资划拨。"));
+				return res;
+			}
+		}else {
+			in.setRoleType(1);
 		}
 		if (in.getStatus()==null){
 			in.setStatus(0);
@@ -54,10 +60,7 @@ public class AmbInvestApiController extends CertifyApiController {
 			res.getError().add(buildError("状态不可大于发起。"));
 			return res;
 		}
-		if (ambInvestService.checkMyAmb(in.getMyAmbId())){
-			res.getError().add(buildError("只有当前阿米巴负责人可以发起投资划拨。"));
-			return res;
-		}
+
 		res.data(ambInvestService.pushInvestTransfer(in));
 		return res;
 	}

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

@@ -47,10 +47,9 @@ public class AmbInvestServiceImpl extends BaseMybatisDao<AmbInvestMapper> implem
     public int pushInvestTransfer(InputAmbInvest in) {
         AmbSystem myAmb =null;
         if (in.getRoleType()==1){
-            myAmb= ambSystemMapper.selectByPrimaryKey(in.getMyAmbId());
+            myAmb= ambSystemMapper.selectByPrimaryKey(1l);
         }else {
             myAmb=ambSystemMapper.selectByPrimaryKey(in.getMyAmbId());
-
         }
         AmbSystem other=ambSystemMapper.selectByPrimaryKey(in.getOtherAmbId());
         AmbInvest ambInvest=new AmbInvest();
@@ -116,7 +115,9 @@ public class AmbInvestServiceImpl extends BaseMybatisDao<AmbInvestMapper> implem
         }
         params.put("startTime",in.getStartTime());
         params.put("endTime",in.getEndTime()+" 23:59:59");
-
+        if (in.getRoleType()==2||in.getRoleType()==3){
+            params.put("ambId",in.getAmbId());
+        }
 
         return findPage("selectInvestList","selectInvestCount",params,in.getPageNo(),in.getPageSize());
     }

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

@@ -149,7 +149,12 @@
     <if test="startTime!=null and endTime !=null">
       and a.create_time between #{startTime} and #{endTime}
     </if>
-
+    <if test="type==2 ">
+      and a.initiate_amb_id= #{ambId}
+    </if>
+    <if test="type==3">
+      and a.accept_amb_id = #{ambId}
+    </if>
     order by a.create_time desc
     <if test="page_sql !=null">
       ${page_sql}

+ 3 - 1
src/main/java/com/goafanti/common/utils/AsyncUtils.java

@@ -85,7 +85,9 @@ public class AsyncUtils {
 		AdminListBo a = adminMapper.getDeptNameByAid(n.getAid());
 		EmailBo bo=new EmailBo(NoticeStatus.getStatus(n.getNoticeType()).getDesc(),a.getEmail(),n.getContent()) ;
 		noticeMapper.insertSelective(n);
-		send(bo);
+		if (StringUtils.isNotBlank(bo.getAddress())){
+			send(bo);
+		}
 	}
 
 	/**

+ 1 - 0
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -1126,6 +1126,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	}
 
 	@Override
+	@Transactional
 	public int pushOrderImg(String orderNo, String imageUrl,String sign) {
 		TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(orderNo);
 		TOrderNew newOrder=new TOrderNew();