bugfix

src/main/java/com/caimei/modules/user/service/ClubPortraitService.java

@@ -558,12 +558,7 @@ public class ClubPortraitService {
         }
         // 新注册机构
         if (0 == clubSales.getType() || 3 == clubSales.getType()) {
-            if ((0 == clubSales.getDateType() || 1 == clubSales.getDateType()) && expty) {
-                clubSales.setEndTime(dateFormat.format(date));
-            }
-            if (clubSales.getEndTime().equals(endTime)) {
-                clubSales.setEndTime(dateFormat.format(date));
-            }
+
             int spClub = 0, unSpClub = 0;
             ArrayList<OrderPortrait> orderPortraits = new ArrayList<>();
             OrderPortrait orderPortrait = new OrderPortrait();
@@ -728,9 +723,11 @@ public class ClubPortraitService {
             clubSales.setValues(active);
             clubSales.setValues1(unActive);
         }
-        if (!expty && 2 != clubSales.getType()) {
-            clubSales.setStartTime(time1);
-            clubSales.setEndTime(time2);
+        try {
+            clubSales.setStartTime(dateFormat.format(dateFormat.parse(clubSales.getStartTime())));;
+            clubSales.setEndTime(dateFormat.format(dateFormat.parse(clubSales.getEndTime())));;
+        } catch ( Exception e) {
+                e.printStackTrace();
         }
         return clubSales;
     }

src/main/java/com/caimei/modules/user/web/newUser/AgencyController.java

@@ -1882,6 +1882,7 @@ public class AgencyController extends BaseController {
             } else {
                 map.put("active", active);
             }
+            map.put("clubSales", clubSales);
             map.put("code", 0);
         } catch (Exception e) {
             map.put("code", -1);

src/main/webapp/static/modules/cmClubSales/cmClubSalesEachs.js

@@ -138,8 +138,8 @@ const  getClubSalesEacthsData = function (type,dateType) {
                         if(!data.newClub){
                             $('#clubEchartsNone').show();
                             $('#clubEcharts').hide();
-                            $('#clubEndTime').val(data.newClub.endTime);
-                            $('#clubStartTime').val(data.newClub.startTime);
+                            $('#clubEndTime').val(data.clubSales.endTime);
+                            $('#clubStartTime').val(data.clubSales.startTime);
                             $('#newClubScopeNum').text('0个');
                         }else{
                             setClubData(type,data)
@@ -149,8 +149,8 @@ const  getClubSalesEacthsData = function (type,dateType) {
                         if(!data.remarks){
                             $('#clubRemarkEacthsNone').show();
                             $('#clubRemarkEacths').hide();
-                            $('#remarkEndTime').val(data.remarks.endTime);
-                            $('#remarkStartTime').val(data.remarks.startTime);
+                            $('#remarkEndTime').val(data.clubSales.endTime);
+                            $('#remarkStartTime').val(data.clubSales.startTime);
                             $('#clubRemarkScopeNum').text('0个');
                         }else{
                             getClubRemarkData(type,data)
@@ -160,8 +160,8 @@ const  getClubSalesEacthsData = function (type,dateType) {
                         if(!data.active){
                             $('#clubActiveEacthsNone').show();
                             $('#clubActiveEacths').hide();
-                            $('#clubActiveEndTime').val(data.active.endTime);
-                            $('#clubActiveStartTime').val(data.active.startTime);
+                            $('#clubActiveEndTime').val(data.clubSales.endTime);
+                            $('#clubActiveStartTime').val(data.clubSales.startTime);
                         }else{
                             setClubActiveData(type,data)
                         }
@@ -184,8 +184,8 @@ const setClubData = function (type,data) {
                 $('.eachts-total').show();
                 $('#clubEcharts').show();
                 $('#clubEchartsNone').hide();
-                $('#clubEndTime').val(data.newClub.endTime);
-                $('#clubStartTime').val(data.newClub.startTime);
+                $('#clubEndTime').val(data.clubSales.endTime);
+                $('#clubStartTime').val(data.clubSales.startTime);
                 $('#newClubScopeNum').text(`${data.newClub.total}个`);
             },
             id:'clubEcharts',
@@ -206,8 +206,8 @@ const getClubRemarkData = function (type,data) {
                 $('.eachts-total').show();
                 $('#clubRemarkEacths').show();
                 $('#clubRemarkEacthsNone').hide();
-                $('#remarkEndTime').val(data.remarks.endTime);
-                $('#remarkStartTime').val(data.remarks.startTime);
+                $('#remarkEndTime').val(data.clubSales.endTime);
+                $('#remarkStartTime').val(data.clubSales.startTime);
                 $('#clubRemarkScopeNum').text(`${data.remarks.total}个`);
             },
             id:'clubRemarkEacths',
@@ -233,8 +233,8 @@ const setClubActiveData = function (type,data) {
                 $('.eachts-total').show();
                 $('#clubActiveEacths').show();
                 $('#clubActiveEacthsNone').hide();
-                $('#clubActiveEndTime').val(data.active.endTime);
-                $('#clubActiveStartTime').val(data.active.startTime);
+                $('#clubActiveEndTime').val(data.clubSales.endTime);
+                $('#clubActiveStartTime').val(data.clubSales.startTime);
             },
             id:'clubActiveEacths',
             name:{