Merge branch 'dev-lqc' into test

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

@@ -9,8 +9,14 @@ import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.interceptor.AuthUser;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashScheduleTaskList;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashScheduleTaskMobile;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxMobile;
+import com.mokamrp.privates.mapper.pojo.Corp;
 import com.mokamrp.privates.mapper.pojo.User;
-import com.mokamrp.privates.service.pangu.*;
+import com.mokamrp.privates.service.CorpService;
+import com.mokamrp.privates.service.pangu.FosterwxCashScheduleTaskListService;
+import com.mokamrp.privates.service.pangu.FosterwxCashScheduleTaskMobileService;
+import com.mokamrp.privates.service.pangu.FosterwxCashWorkwxTaskListService;
+import com.mokamrp.privates.service.pangu.FosterwxMobileService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,6 +56,9 @@ public class FosterwxCashScheduleTaskListController extends BaseController<Foste
     @Autowired
     public FosterwxMobileService fosterwxMobileService;
 
+    @Autowired
+    public CorpService corpService;
+
     /*
      * @fast
      * 默认生成的控制器所继承的父类中有index/add/edit/del四个基础方法,均为post json请求
@@ -130,8 +139,15 @@ public class FosterwxCashScheduleTaskListController extends BaseController<Foste
         });
 
         fosterwxCashScheduleTaskMobiles.forEach(fosterwxCashScheduleTaskMobile -> {
-            fosterwxCashScheduleTaskMobile.setFosterwxCashScheduleTaskList(fosterwxCashScheduleTaskListService.getById(fosterwxCashScheduleTaskMobile.getTaskId()));
-            fosterwxCashScheduleTaskMobile.setFosterwxMobile(fosterwxMobileService.getById(fosterwxCashScheduleTaskMobile.getMobileId()));
+            FosterwxCashScheduleTaskList taskList = fosterwxCashScheduleTaskListService.getById(fosterwxCashScheduleTaskMobile.getTaskId());
+            fosterwxCashScheduleTaskMobile.setFosterwxCashScheduleTaskList(taskList);
+            FosterwxMobile fosterwxMobile = fosterwxMobileService.getById(fosterwxCashScheduleTaskMobile.getMobileId());
+            if (null != fosterwxMobile) {
+                Corp corp = corpService.getById(fosterwxMobile.getWorkWxCorpId());
+                fosterwxMobile.setWorkWxCorp(null != corp ? corp.getName() : "");
+            }
+            fosterwxCashScheduleTaskMobile.setFosterwxMobile(fosterwxMobile);
+            fosterwxCashScheduleTaskMobile.setFosterwxCashWorkwxTaskList(fosterwxCashWorkwxTaskListService.getById(taskList.getChildTaskId()));
         });
 
         return AjaxResult.success(fosterwxCashScheduleTaskMobiles);

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

@@ -65,6 +65,9 @@ public class FosterwxCashScheduleTaskMobile extends Model<FosterwxCashScheduleTa
     private FosterwxMobile fosterwxMobile;
 
     @TableField(exist = false)
+    private FosterwxCashWorkwxTaskList fosterwxCashWorkwxTaskList;
+
+    @TableField(exist = false)
     private String ids;
 
     public Integer getId() {
@@ -164,4 +167,12 @@ public class FosterwxCashScheduleTaskMobile extends Model<FosterwxCashScheduleTa
     public void setFosterwxMobile(FosterwxMobile fosterwxMobile) {
         this.fosterwxMobile = fosterwxMobile;
     }
+
+    public FosterwxCashWorkwxTaskList getFosterwxCashWorkwxTaskList() {
+        return fosterwxCashWorkwxTaskList;
+    }
+
+    public void setFosterwxCashWorkwxTaskList(FosterwxCashWorkwxTaskList fosterwxCashWorkwxTaskList) {
+        this.fosterwxCashWorkwxTaskList = fosterwxCashWorkwxTaskList;
+    }
 }