Merge branch 'master' of http://git.mokasz.com/marketing/moka-private

# Conflicts:
#	src/main/java/com/mokamrp/privates/controller/pangu/FosterwxMobileController.java

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxMobileController.java

@@ -17,10 +17,7 @@ import com.mokamrp.privates.mapper.pangu.pojo.FosterwxMobile;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxMobileWxfriend;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxStation;
 import com.mokamrp.privates.mapper.pojo.User;
-import com.mokamrp.privates.service.pangu.FosterwxMobileService;
-import com.mokamrp.privates.service.pangu.FosterwxMobileWxfriendService;
-import com.mokamrp.privates.service.pangu.FosterwxStationService;
-import com.mokamrp.privates.service.pangu.FosterwxTaskScheduleService;
+import com.mokamrp.privates.service.pangu.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
@@ -30,6 +27,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.validation.Valid;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -208,10 +206,22 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
 
     @PostMapping("/getTaskList")
     public Object getTaskList(@Valid @RequestBody GetForsterwxMobileHandle getForsterwxMobileHandle) {
-        Integer StationId = getForsterwxMobileHandle.getStationId();
+        Integer stationId = getForsterwxMobileHandle.getStationId();
         Integer mobileCode = getForsterwxMobileHandle.getMobileCode();
 
-        return AjaxResult.success(fosterwxTaskScheduleService.getTaskListByMobileCode(StationId, mobileCode));
+        Calendar c = Calendar.getInstance();
+        c.set(Integer.valueOf(getForsterwxMobileHandle.getYear()), Integer.valueOf(getForsterwxMobileHandle.getMonth()), 0);
+        int dayOfMonth = c.get(Calendar.DAY_OF_MONTH);
+
+        Map<String, Object> res = new HashMap<>();
+        for (int i = 1; i <= dayOfMonth; i++) {
+            String date = getForsterwxMobileHandle.getYear() + "-" + String.format("%02d", Integer.valueOf(getForsterwxMobileHandle.getMonth())) + "-" + String.format("%02d", i);
+
+            res.put(date, fosterwxTaskScheduleService.getTaskListByMobileCode(stationId, mobileCode, date));
+        }
+
+
+        return AjaxResult.success(res);
     }
 
     @PostMapping("/editMobile")

src/main/java/com/mokamrp/privates/entity/pangu/GetForsterwxMobileHandle.java

@@ -12,8 +12,12 @@ public class GetForsterwxMobileHandle {
     private String mobileNo;
     private Integer workWxStatus;
     private Integer mobileOperator;
+    private String mobileUnioCode;
     private Integer wxStatus;
     private Integer status;
+    private String year;
+    private String month;
+
     public Integer getPage() {
         return page;
     }

src/main/java/com/mokamrp/privates/service/pangu/FosterwxTaskScheduleService.java

@@ -39,4 +39,12 @@ public interface FosterwxTaskScheduleService extends IService<FosterwxTaskSchedu
     public AjaxResult deleteByDate(FosterwxMobile fosterwxMobile, User authUser);
 
     public FosterwxTaskSchedule getInfo(FosterwxTaskScheduleHandle handle);
+
+    /**
+     * 根据站点 手机号获取账号任务详情
+     * @param stationId
+     * @param mobileCode
+     * @param date
+     */
+    List<FosterwxTaskSchedule> getTaskListByMobileCode(Integer stationId, Integer mobileCode, String date);
 }

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxTaskScheduleServiceImpl.java

@@ -241,4 +241,16 @@ public class FosterwxTaskScheduleServiceImpl extends ServiceImpl<FosterwxTaskSch
         fosterwxTaskSchedule.setComment(mobileCode.endsWith("、") ? mobileCode.substring(0, mobileCode.length() - 1) : mobileCode);
         return fosterwxTaskSchedule;
     }
+
+    @Override
+    public List<FosterwxTaskSchedule> getTaskListByMobileCode(Integer stationId, Integer mobileCode, String date) {
+        LambdaQueryWrapper<FosterwxTaskSchedule> fosterwxTaskScheduleLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getStationId, stationId);
+        fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getMobileCode, mobileCode);
+        fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getSendDate, date);
+        fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getDelFlg, 1);
+        fosterwxTaskScheduleLambdaQueryWrapper.orderByAsc(FosterwxTaskSchedule::getSendDate);
+
+        return fosterwxTaskScheduleMapper.selectList(fosterwxTaskScheduleLambdaQueryWrapper);
+    }
 }