Explorar el Código

新增技术公出判定接口

anderx hace 1 año
padre
commit
04c9ef0785

+ 5 - 2
src/main/java/com/goafanti/weChat/controller/AdminReleaseApiController.java

@@ -418,8 +418,11 @@ public class AdminReleaseApiController extends CertifyApiController{
 	}
 
 
-	@RequestMapping(value = "/deleteAssistant",method = RequestMethod.GET)
-	public Result deleteAssistant (InputPublicRelease in){
+	/**
+	 * 技术发起公出查询发起情况
+	 */
+	@RequestMapping(value = "/checkOrderNoDuration",method = RequestMethod.GET)
+	public Result checkOrderNoDuration (InputPublicRelease in){
 		Result res =new Result();
 		return res.data(publicReleaseService.checkOrderNoDuration(in));
 	}

+ 9 - 0
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1501,16 +1501,25 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		TOrderNewBo t = tOrderNewMapper.getOrderNewDetail(in.getOrderNo());
 		BigDecimal count = BigDecimal.ZERO;
 		count=count.add(BigDecimal.valueOf(in.getDuration()));
+		List<String> peopleList = new ArrayList<>();
+		int timesCount=0;
 		for (PublicRelease e : list) {
 			if (e.getDuration()!=null){
 				count=count.add(BigDecimal.valueOf(e.getDuration()));
+				if (!peopleList.contains(e.getAid())){
+					peopleList.add(e.getAid());
+				}
+				timesCount++;
 			}
 		}
 		Map map=new HashMap();
 		CheckOrderNoOut data= new CheckOrderNoOut();
+		data.setTimesCount(timesCount);
+		data.setPeopleCount(peopleList.size());
 		data.setUserName(t.getUserName());
 		data.setContractNo(t.getContractNo());
 		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) {
 			data.setAmountType(0);