经营报表修改

mec-biz/src/main/java/com/ym/mec/biz/dal/page/OperatingReportQueryInfo.java

@@ -7,6 +7,9 @@ import java.util.Date;
 
 public class OperatingReportQueryInfo extends QueryInfo {
 
+    @ApiModelProperty(value = "类型 organ-分部 school-学校", required = false)
+    private String type;
+
     @ApiModelProperty(value = "分部id", required = false)
     private String organIdList;
 
@@ -59,4 +62,12 @@ public class OperatingReportQueryInfo extends QueryInfo {
     public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
 }

mec-biz/src/main/resources/config/mybatis/OperatingReportMapper.xml

@@ -129,6 +129,12 @@
             <if test="organIdList != null and organIdList != ''">
                 AND FIND_IN_SET(opr.organ_id_,#{organIdList})
             </if>
+            <if test="type != null and type=='organ'.toString()">
+                AND opr.cooperation_organ_id_ IS NULL
+            </if>
+            <if test="type != null and type=='school'.toString()">
+                AND opr.cooperation_organ_id_ IS NOT NULL
+            </if>
             <if test="cooperationOrganId != null">
                 AND opr.cooperation_organ_id_ = #{cooperationOrganId}
             </if>