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

+ 2 - 1
src/main/java/com/goafanti/common/dao/TOrderPublicReleaseCountMapper.java

@@ -1,6 +1,7 @@
 package com.goafanti.common.dao;
 package com.goafanti.common.dao;
 
 
 import com.goafanti.common.model.TOrderPublicReleaseCount;
 import com.goafanti.common.model.TOrderPublicReleaseCount;
+import org.apache.ibatis.annotations.Param;
 
 
 /**
 /**
 * @author Administrator
 * @author Administrator
@@ -22,7 +23,7 @@ public interface TOrderPublicReleaseCountMapper {
 
 
     int updateByPrimaryKey(TOrderPublicReleaseCount record);
     int updateByPrimaryKey(TOrderPublicReleaseCount record);
 
 
-    TOrderPublicReleaseCount selectByOrderNo(String orderNo);
+    TOrderPublicReleaseCount selectByOrderNo(@Param("orderNo") String orderNo, @Param("sumYear") String sumYear);
 
 
     void updateByOrderNo(TOrderPublicReleaseCount update);
     void updateByOrderNo(TOrderPublicReleaseCount update);
 }
 }

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

@@ -134,6 +134,6 @@
         select
         select
         <include refid="Base_Column_List" />
         <include refid="Base_Column_List" />
         from t_order_public_release_count
         from t_order_public_release_count
-        where  order_no =  #{orderNo,jdbcType=VARCHAR}
+        where  order_no =  #{orderNo,jdbcType=VARCHAR} and sum_year= #{sumYear,jdbcType=VARCHAR}
     </select>
     </select>
 </mapper>
 </mapper>

+ 3 - 1
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -46,6 +46,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.FileOutputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.*;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -1422,7 +1423,8 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             if (e.getOrderNo()!=null){
             if (e.getOrderNo()!=null){
                 List<ExpenseAccount> expenseAccounts = expenseAccountMapper.selectByOrderNo(e.getOrderNo());
                 List<ExpenseAccount> expenseAccounts = expenseAccountMapper.selectByOrderNo(e.getOrderNo());
                 if(!expenseAccounts.isEmpty()){
                 if(!expenseAccounts.isEmpty()){
-                    TOrderPublicReleaseCount out = tOrderPublicReleaseCountMapper.selectByOrderNo(e.getOrderNo());
+                    int year = LocalDate.now().getYear();
+                    TOrderPublicReleaseCount out = tOrderPublicReleaseCountMapper.selectByOrderNo(e.getOrderNo(), String.valueOf(year));
                     BigDecimal count = BigDecimal.ZERO;
                     BigDecimal count = BigDecimal.ZERO;
                     BigDecimal yxyCount = BigDecimal.ZERO;
                     BigDecimal yxyCount = BigDecimal.ZERO;
                     BigDecimal zxsCount = BigDecimal.ZERO;
                     BigDecimal zxsCount = BigDecimal.ZERO;

+ 5 - 4
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -53,7 +53,7 @@ import java.math.RoundingMode;
 import java.text.ParseException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
+import java.time.ZoneId;
 import java.util.*;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipEntry;
@@ -664,11 +664,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		int yearSum=1;
 		int yearSum=1;
 		List<String> peopleList = new ArrayList<>();
 		List<String> peopleList = new ArrayList<>();
 		LocalDate startDate = LocalDate.now().withMonth(1).withDayOfMonth(1);
 		LocalDate startDate = LocalDate.now().withMonth(1).withDayOfMonth(1);
+		String sumYear= String.valueOf(startDate.getYear());
 		LocalDate endDate = startDate.withYear(startDate.getYear()+1);
 		LocalDate endDate = startDate.withYear(startDate.getYear()+1);
 		//分成会员统计和非会员统计
 		//分成会员统计和非会员统计
 		if (!tTaskMembers.isEmpty()){
 		if (!tTaskMembers.isEmpty()){
 			for (PublicRelease e : list) {
 			for (PublicRelease e : list) {
-				LocalDate date = LocalDate.parse(e.getReleaseStart().toString(), DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+				LocalDate date = e.getReleaseStart().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
 				if (date.isAfter(startDate)&&date.isBefore(endDate)){
 				if (date.isAfter(startDate)&&date.isBefore(endDate)){
 					durationCount=durationCount.add(BigDecimal.valueOf(e.getDuration()));
 					durationCount=durationCount.add(BigDecimal.valueOf(e.getDuration()));
 					if (!peopleList.contains(e.getAid())){
 					if (!peopleList.contains(e.getAid())){
@@ -691,7 +692,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 					count++;
 					count++;
 			}
 			}
 		}
 		}
-		TOrderPublicReleaseCount out = tOrderPublicReleaseCountMapper.selectByOrderNo(orderNo);
+		TOrderPublicReleaseCount out = tOrderPublicReleaseCountMapper.selectByOrderNo(orderNo,sumYear);
 			if (out==null){
 			if (out==null){
 				out=new TOrderPublicReleaseCount();
 				out=new TOrderPublicReleaseCount();
 				out.setOrderNo(orderNo);
 				out.setOrderNo(orderNo);
@@ -699,7 +700,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				out.setActualDuration(durationCount.doubleValue());
 				out.setActualDuration(durationCount.doubleValue());
 				out.setPeopleCount(peopleList.size());
 				out.setPeopleCount(peopleList.size());
 				out.setFrequency(count);
 				out.setFrequency(count);
-				out.setSumYear(String.valueOf(startDate.getYear()));
+				out.setSumYear(sumYear);
 				pushMaxDuration(t,out,yearSum);
 				pushMaxDuration(t,out,yearSum);
 				tOrderPublicReleaseCountMapper.insertSelective(out);
 				tOrderPublicReleaseCountMapper.insertSelective(out);
 			}else {
 			}else {