Просмотр исходного кода

技术发起公出情况查询修改

anderx 1 год назад
Родитель
Сommit
09fea8d128

+ 19 - 2
src/main/java/com/goafanti/weChat/bo/CheckOrderNoOut.java

@@ -13,9 +13,26 @@ public class CheckOrderNoOut {
 
         private Integer amountType;
 
-        private String adminName;
+    /**
+     * 审核人
+     */
+    private String adminName;
 
-        public BigDecimal getDurationMax() {
+    /**
+     * 发起人
+     */
+    private String publicReleaseName;
+
+
+    public String getPublicReleaseName() {
+        return publicReleaseName;
+    }
+
+    public void setPublicReleaseName(String publicReleaseName) {
+        this.publicReleaseName = publicReleaseName;
+    }
+
+    public BigDecimal getDurationMax() {
             return durationMax;
         }
 

+ 16 - 7
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -81,7 +81,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		}
 		Map checkOrderNo =null;
 		if (in.getType() == 1) {
-			checkOrderNo = checkOrderNoDuration(in);
+			checkOrderNo = checkOrderNoDuration(in,my);
 			boolean isValid = (boolean) checkOrderNo.get("code");
 			if (isValid){
 				in.setTechStartProcess(0);
@@ -1667,9 +1667,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 		return map;
 	}
-
-	@Override
-	public Map checkOrderNoDuration( InputPublicRelease in) {
+	public Map checkOrderNoDuration( InputPublicRelease in,AdminListBo a) {{
+		OutPublicRelease outPublicRelease = publicReleaseMapper.selectDtails(in.getId());
 		List<PublicRelease> list = publicReleaseMapper.selectByOrderNo(in.getOrderNo());
 		TOrderNewBo t = tOrderNewMapper.getOrderNewDetail(in.getOrderNo());
 		BigDecimal count = BigDecimal.ZERO;
@@ -1688,6 +1687,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		}
 		Map map=new HashMap();
 		CheckOrderNoOut data= new CheckOrderNoOut();
+		data.setPublicReleaseName(outPublicRelease.getAname());
 		data.setTimesCount(timesCount);
 		data.setPeopleCount(peopleList.size());
 		data.setUserName(t.getUserName());
@@ -1695,12 +1695,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		data.setAdminName(t.getSalesmanName());
 		data.setDurationCount(count);
 		// 0=0-1 1=1-3 2=3-5 3=5-10 4=10以上
-        if (t.getTotalAmount().compareTo(BigDecimal.valueOf(1)) < 0) {
+		if (t.getTotalAmount().compareTo(BigDecimal.valueOf(1)) < 0) {
 			data.setAmountType(0);
 			data.setDurationMax(BigDecimal.ZERO);
 			map.put("code",false);
 			map.put("data",data);
-        } else if (t.getTotalAmount().compareTo(BigDecimal.valueOf(3))<0) {
+		} else if (t.getTotalAmount().compareTo(BigDecimal.valueOf(3))<0) {
 			data.setAmountType(1);
 			data.setDurationMax(BigDecimal.valueOf(15));
 			if (count.compareTo(data.getDurationMax())<1){
@@ -1735,7 +1735,16 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			map.put("code",true);
 			map.put("data",null);
 		}
-	return map;
+		return map;
+
+	}
 
 	}
+	@Override
+	public Map checkOrderNoDuration( InputPublicRelease in){
+		if (in.getId()==null){
+			throw new BusinessException("公出id不能为空");
+		}
+		return checkOrderNoDuration(in,null);
+	}
 }