Преглед изворни кода

订单最大公出值开发

anderx пре 1 година
родитељ
комит
9280315571

+ 25 - 27
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -2512,23 +2512,25 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	 * @return
 	 */
 	public Map checkOrderNoDuration( InputPublicRelease in,AdminListBo a,int type) {
-		List<PublicRelease> list = publicReleaseMapper.selectByOrderNo(in.getOrderNo());
+		CheckOrderNoOut data= new CheckOrderNoOut();
 		TOrderNewBo t = tOrderNewMapper.getOrderNewDetail(in.getOrderNo());
-		OutPublicRelease outPublicRelease=null;
-		//实际公出
+		Map map=new HashMap();
 		BigDecimal actualDuration = BigDecimal.ZERO;
-		//公出次数
-		int frequency=0;
-		List<String> peopleList = new ArrayList<>();
-		//判定是不是新增获取原数据,是新增数量加1
-		if (in.getId()!=null){
-			outPublicRelease= publicReleaseMapper.selectDtails(in.getId());
-		}else {
-			peopleList.add(TokenManager.getAdminId());
-			actualDuration=actualDuration.add(BigDecimal.valueOf(in.getDuration()));
-			frequency++;
-		}
-		for (PublicRelease e : list) {
+		if (type==1||type==2){
+			List<PublicRelease> list = publicReleaseMapper.selectByOrderNo(in.getOrderNo());
+			OutPublicRelease outPublicRelease=null;
+			//公出次数
+			int frequency=0;
+			List<String> peopleList = new ArrayList<>();
+			//判定是不是新增获取原数据,是新增数量加1
+			if (in.getId()!=null){
+				outPublicRelease= publicReleaseMapper.selectDtails(in.getId());
+			}else {
+				peopleList.add(TokenManager.getAdminId());
+				actualDuration=actualDuration.add(BigDecimal.valueOf(in.getDuration()));
+				frequency++;
+			}
+			for (PublicRelease e : list) {
 				//新增直接计算
 				if (in.getId()==null){
 					if (e.getDuration()!=null){
@@ -2558,28 +2560,24 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 						}
 					}
 				}
-		}
-		Map map=new HashMap();
-		CheckOrderNoOut data= new CheckOrderNoOut();
-		if (outPublicRelease!=null){
-			data.setPublicReleaseName(outPublicRelease.getAname());
-		}
-		//新增与修改,需要重新获取实际公出与人数与次数
-		if (type==1||type==2){
+			}
+			if (outPublicRelease!=null){
+				data.setPublicReleaseName(outPublicRelease.getAname());
+			}
+			//新增与修改,需要重新获取实际公出与人数与次数
 			TOrderPublicReleaseCount update=new TOrderPublicReleaseCount();
 			update.setOrderNo(in.getOrderNo());
 			update.setFrequency(frequency);
 			update.setActualDuration(actualDuration.doubleValue());
 			update.setPeopleCount(peopleList.size());
 			tOrderPublicReleaseCountMapper.updateByOrderNo(update);
+			data.setTimesCount(frequency);
+			data.setPeopleCount(peopleList.size());
+			data.setDurationCount(actualDuration);
 		}
-		data.setTimesCount(frequency);
-		data.setPeopleCount(peopleList.size());
 		data.setUserName(t.getUserName());
 		data.setContractNo(t.getContractNo());
 		data.setAdminName(t.getSalesmanName());
-		data.setDurationCount(actualDuration);
-		//获取年份
 		TOrderPublicReleaseCount releaseCount = tOrderPublicReleaseCountMapper.selectByOrderNo(in.getOrderNo());
 		data.setDurationMax(BigDecimal.valueOf(releaseCount.getMaxDuration()));
 		TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(in.getOrderNo());