提交代码

cweb/src/main/java/com/cweb/controller/BsBankActivityController.java

@@ -70,9 +70,10 @@ public class BsBankActivityController {
                 bankActivity.setRegistrationEnd(activity.getDate("registrationEnd"));
                 bankActivity.setDetails(activity.getString("details"));
                 bankActivity.setComments(activity.getString("comments"));
+                bankActivity.setStatus(1);
                 bankActivityService.editData(bankActivity);
             }
-            return ResponseMsgUtil.success(null);
+            return ResponseMsgUtil.success("操作成功");
 
         } catch (Exception e) {
             log.error(e.getMessage(), e);
@@ -87,10 +88,15 @@ public class BsBankActivityController {
     public ResponseData queryActivityList(@RequestParam(value = "merId" , required = true) Long merId) {
         try {
 
-            JSONArray activityList = saasActivityService.queryAgentActivityList();
+            Map<String, Object> param = new HashMap<>();
-            for (Object obj : activityList) {
+            param.put("", "");
+            param.put("", "");
+            param.put("", "");
 
-            }
+            List<BsBankActivity> activityList = bankActivityService.getBankActivityList(param);
+  /*          for (BsBankActivity bankActivity : activityList) {
+                bankActivity.setBankActivityRoster();
+            }*/
             return ResponseMsgUtil.success(activityList);
 
         } catch (Exception e) {

service/src/main/java/com/hfkj/entity/BsBankActivity.java

@@ -89,6 +89,16 @@ public class BsBankActivity implements Serializable {
 
     private String ext3;
 
+    private BsBankActivityRoster bankActivityRoster;
+
+    public BsBankActivityRoster getBankActivityRoster() {
+        return bankActivityRoster;
+    }
+
+    public void setBankActivityRoster(BsBankActivityRoster bankActivityRoster) {
+        this.bankActivityRoster = bankActivityRoster;
+    }
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {