任务详情接口

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

@@ -103,63 +103,31 @@ public class FosterwxTaskScheduleController extends BaseController<FosterwxTaskS
         for (int i = 1; i <= dayOfMonth; i++) {
             String date = handle.getYear() + "-" + String.format("%02d", Integer.valueOf(handle.getMonth())) + "-" + String.format("%02d", i);
             handle.setDate(date);
-            res.put(date, fosterwxTaskScheduleService.getList(handle));
+            ResHandle<List<FosterwxTaskSchedule>> resHandle = fosterwxTaskScheduleService.getList(handle);
+            resHandle.getList().forEach(fosterwxTaskSchedule -> {
+                FosterwxTaskScheduleHandle fosterwxTaskScheduleHandle = new FosterwxTaskScheduleHandle();
+                fosterwxTaskScheduleHandle.setTaskId(fosterwxTaskSchedule.getTaskId());
+                fosterwxTaskScheduleHandle.setStationId(fosterwxTaskSchedule.getStationId());
+                FosterwxTaskSchedule mobileContent = fosterwxTaskScheduleService.getInfo(handle);
+                fosterwxTaskSchedule.setMobileCount(mobileContent.getMobileCount());
+                fosterwxTaskSchedule.setComment(mobileContent.getComment());
+            });
+
+
+            res.put(date, resHandle);
         }
         return AjaxResult.success(res);
     }
 
     @PostMapping("/getInfo")
     public Object getInfo(@Valid @RequestBody FosterwxTaskScheduleHandle handle) {
-        LambdaQueryWrapper<FosterwxTaskSchedule> fosterwxTaskScheduleLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getStationId, handle.getStationId());
-        fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getTaskId, handle.getTaskId());
-        fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getDelFlg, 1);
-        fosterwxTaskScheduleLambdaQueryWrapper.orderByAsc(FosterwxTaskSchedule::getMobileCode);
-
-        List<FosterwxTaskSchedule> fosterwxTaskScheduleList = fosterwxTaskScheduleService.list(fosterwxTaskScheduleLambdaQueryWrapper);
-
-        if (fosterwxTaskScheduleList.isEmpty()) return AjaxResult.error("无法获取任务排期详情！");
-
-        String mobileCode = "";
-        for (FosterwxTaskSchedule fosterwxTaskSchedule : fosterwxTaskScheduleList) {
-            Integer code = fosterwxTaskSchedule.getMobileCode();
-            // 第一条数据
-            if (mobileCode.isEmpty()) {
-                mobileCode = String.format("%03d", code);
-            } else {
-                // 按顿号分组数据
-                String[] mobileArry = mobileCode.split("、");
-                if (mobileArry[mobileArry.length - 1].contains("-")) {
-                    // 已经有组了
-                    String[] mobiles = mobileArry[mobileArry.length - 1].split("-");
-                    if (Integer.valueOf(mobiles[1]) + 1 == code) {
-                        mobileArry[mobileArry.length - 1] = mobiles[0] + "-" + String.format("%03d", code);
-                        mobileCode = "";
-                        for (int i = 0; i < mobileArry.length; i++) {
-                            mobileCode += mobileArry[i] + "、";
-                        }
-                    } else {
-                        mobileCode += String.format("%03d", code) + "、";
-                    }
-                } else {
-                    if (Integer.valueOf(mobileArry[mobileArry.length - 1]) + 1 == code) {
-                        mobileArry[mobileArry.length - 1] += "-" + String.format("%03d", code);
-                        mobileCode = "";
-                        for (int i = 0; i < mobileArry.length; i++) {
-                            mobileCode += mobileArry[i] + "、";
-                        }
-                    } else {
-                        mobileCode += String.format("%03d", code) + "、";
-                    }
-                }
-            }
-        }
+        FosterwxTaskSchedule fosterwxTaskSchedule = fosterwxTaskScheduleService.getInfo(handle);
 
         Map<String, Object> res = new HashMap<>();
 
         StringBuffer sb = new StringBuffer();
-        sb.append("手机编号：" + mobileCode + "<br><br>");
-        FosterwxTaskList fosterwxTaskList = fosterwxTaskListService.getById(fosterwxTaskScheduleList.get(0).getTaskId());
+        sb.append("手机编号：" + fosterwxTaskSchedule.getComment() + "<br><br>");
+        FosterwxTaskList fosterwxTaskList = fosterwxTaskListService.getById(fosterwxTaskSchedule.getTaskId());
         sb.append("任务内容：" + fosterwxTaskList.getTaskContent());
 
         res.put("content", sb);

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxTaskSchedule.java

@@ -1,6 +1,7 @@
 package com.mokamrp.privates.mapper.pangu.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -113,6 +114,12 @@ public class FosterwxTaskSchedule extends Model<FosterwxTaskSchedule> {
      */
     private LocalDateTime updateAt;
 
+    @TableField(exist = false)
+    private Integer mobileCount;
+
+    @TableField(exist = false)
+    private String comment;
+
 
     public Integer getId() {
         return id;
@@ -258,6 +265,22 @@ public class FosterwxTaskSchedule extends Model<FosterwxTaskSchedule> {
         this.updateAt = updateAt;
     }
 
+    public Integer getMobileCount() {
+        return mobileCount;
+    }
+
+    public void setMobileCount(Integer mobileCount) {
+        this.mobileCount = mobileCount;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;

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

@@ -1,9 +1,7 @@
 package com.mokamrp.privates.service.pangu;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-
 import com.mokamrp.privates.entity.ResHandle;
-import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.entity.pangu.FosterwxTaskScheduleHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxMobile;
@@ -39,4 +37,6 @@ public interface FosterwxTaskScheduleService extends IService<FosterwxTaskSchedu
      * @return
      */
     public AjaxResult deleteByDate(FosterwxMobile fosterwxMobile, User authUser);
+
+    public FosterwxTaskSchedule getInfo(FosterwxTaskScheduleHandle handle);
 }

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

@@ -177,4 +177,55 @@ public class FosterwxTaskScheduleServiceImpl extends ServiceImpl<FosterwxTaskSch
 
         return null;
     }
+
+    @Override
+    public FosterwxTaskSchedule getInfo(FosterwxTaskScheduleHandle handle) {
+        LambdaQueryWrapper<FosterwxTaskSchedule> fosterwxTaskScheduleLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getStationId, handle.getStationId());
+        fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getTaskId, handle.getTaskId());
+        fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getDelFlg, 1);
+        fosterwxTaskScheduleLambdaQueryWrapper.orderByAsc(FosterwxTaskSchedule::getMobileCode);
+
+        List<FosterwxTaskSchedule> fosterwxTaskScheduleList = fosterwxTaskScheduleMapper.selectList(fosterwxTaskScheduleLambdaQueryWrapper);
+
+        String mobileCode = "";
+        for (FosterwxTaskSchedule fosterwxTaskSchedule : fosterwxTaskScheduleList) {
+            Integer code = fosterwxTaskSchedule.getMobileCode();
+            // 第一条数据
+            if (mobileCode.isEmpty()) {
+                mobileCode = String.format("%03d", code);
+            } else {
+                // 按顿号分组数据
+                String[] mobileArry = mobileCode.split("、");
+                if (mobileArry[mobileArry.length - 1].contains("-")) {
+                    // 已经有组了
+                    String[] mobiles = mobileArry[mobileArry.length - 1].split("-");
+                    if (Integer.valueOf(mobiles[1]) + 1 == code) {
+                        mobileArry[mobileArry.length - 1] = mobiles[0] + "-" + String.format("%03d", code);
+                        mobileCode = "";
+                        for (int i = 0; i < mobileArry.length; i++) {
+                            mobileCode += mobileArry[i] + "、";
+                        }
+                    } else {
+                        mobileCode += String.format("%03d", code) + "、";
+                    }
+                } else {
+                    if (Integer.valueOf(mobileArry[mobileArry.length - 1]) + 1 == code) {
+                        mobileArry[mobileArry.length - 1] += "-" + String.format("%03d", code);
+                        mobileCode = "";
+                        for (int i = 0; i < mobileArry.length; i++) {
+                            mobileCode += mobileArry[i] + "、";
+                        }
+                    } else {
+                        mobileCode += String.format("%03d", code) + "、";
+                    }
+                }
+            }
+        }
+
+        FosterwxTaskSchedule fosterwxTaskSchedule = fosterwxTaskScheduleList.get(0);
+        fosterwxTaskSchedule.setMobileCount(fosterwxTaskScheduleList.size());
+        fosterwxTaskSchedule.setComment(mobileCode);
+        return fosterwxTaskSchedule;
+    }
 }