添加系统接入模块

bill-manager/src/main/java/com/mortals/xhx/module/ph/model/vo/PhQueueStatVo.java

@@ -28,49 +28,10 @@ public class PhQueueStatVo extends BaseEntityLong {
 
     private List<String> hallNameList;
 
-    /** 开始 年 */
-    private Integer yearStart;
+    /** 开始 评价时间 */
+    private String timeStart;
 
-    /** 结束 年 */
-    private Integer yearEnd;
-
-    /** 增加 年 */
-    private Integer yearIncrement;
-
-    /** 年列表 */
-    private List <Integer> yearList;
-
-    /** 年排除列表 */
-    private List <Integer> yearNotList;
-
-    /** 开始 月 */
-    private Integer monthStart;
-
-    /** 结束 月 */
-    private Integer monthEnd;
-
-    /** 增加 月 */
-    private Integer monthIncrement;
-
-    /** 月列表 */
-    private List <Integer> monthList;
-
-    /** 月排除列表 */
-    private List <Integer> monthNotList;
-
-    /** 开始 日 */
-    private Integer dayStart;
-
-    /** 结束 日 */
-    private Integer dayEnd;
-
-    /** 增加 日 */
-    private Integer dayIncrement;
-
-    /** 日列表 */
-    private List <Integer> dayList;
-
-    /** 日排除列表 */
-    private List <Integer> dayNotList;
+    /** 结束 评价时间 */
+    private String timeEnd;
 
 }
\ No newline at end of file

bill-manager/src/main/java/com/mortals/xhx/module/ph/model/vo/PhQueueVo.java

@@ -33,4 +33,6 @@ public class PhQueueVo extends BaseEntityLong {
     @MobileDesensitize
     private String peoplePhone;
 
+
+
 }
\ No newline at end of file

bill-manager/src/main/java/com/mortals/xhx/module/stat/model/vo/StatVo.java

@@ -24,47 +24,10 @@ public class StatVo extends BaseEntityLong {
     /** 结束 创建时间 */
     private String createTimeEnd;
 
-    /** 开始 年 */
-    private Integer yearStart;
+    /** 开始 评价时间 */
+    private String timeStart;
 
-    /** 结束 年 */
-    private Integer yearEnd;
-
-    /** 增加 年 */
-    private Integer yearIncrement;
-
-    /** 年列表 */
-    private List <Integer> yearList;
-
-    /** 年排除列表 */
-    private List <Integer> yearNotList;
-
-    /** 开始 月 */
-    private Integer monthStart;
-
-    /** 结束 月 */
-    private Integer monthEnd;
-
-    /** 增加 月 */
-    private Integer monthIncrement;
-
-    /** 月列表 */
-    private List <Integer> monthList;
-
-    /** 月排除列表 */
-    private List <Integer> monthNotList;
-
-    /** 开始 日 */
-    private Integer dayStart;
-
-    /** 结束 日 */
-    private Integer dayEnd;
-
-
-    /** 日列表 */
-    private List <Integer> dayList;
-
-    /** 日排除列表 */
-    private List <Integer> dayNotList;
+    /** 结束 评价时间 */
+    private String timeEnd;
 
 }
\ No newline at end of file

bill-manager/src/main/resources/sqlmap/module/ph/PhQueueStatMapperExt.xml

@@ -27,9 +27,31 @@
             where
             <trim prefixOverrides="and" prefix="">
                 <include refid="_condition_"/>
+                <include refid="_condition_two_"/>
             </trim>
         </trim>
         <include refid="_group_by_"/>
         <include refid="_orderCols_"/>
     </select>
+
+    <!-- 条件映射 -->
+    <sql id="_condition_two_">
+        <if test="condition != null and !condition.isEmpty()">
+            <!-- 条件映射-普通条件 -->
+            <include refid="_condition_param_two_">
+                <property name="_conditionParam_" value="condition"/>
+                <property name="_conditionType_" value="and"/>
+            </include>
+        </if>
+    </sql>
+
+    <sql id="_condition_param_two_">
+        <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="conditionParamRef.containsKey('timeStart') and conditionParamRef.timeStart != null and conditionParamRef.timeStart!=''">
+            ${_conditionType_} STR_TO_DATE(CONCAT(`year`,'-',`month`,'-',`day`),'%Y-%m-%d')<![CDATA[ >= ]]>STR_TO_DATE(#{${_conditionParam_}.timeStart},'%Y-%m-%d')
+        </if>
+        <if test="conditionParamRef.containsKey('timeEnd') and conditionParamRef.timeEnd != null and conditionParamRef.timeEnd!=''">
+            ${_conditionType_}  STR_TO_DATE(CONCAT(`year`,'-',`month`,'-',`day`),'%Y-%m-%d')<![CDATA[ <= ]]>STR_TO_DATE(#{${_conditionParam_}.timeEnd},'%Y-%m-%d')
+        </if>
+    </sql>
 </mapper>
\ No newline at end of file

bill-manager/src/main/resources/sqlmap/module/stat/StatMapperExt.xml

@@ -22,9 +22,31 @@
             where
             <trim prefixOverrides="and" prefix="">
                 <include refid="_condition_"/>
+                <include refid="_condition_two_"/>
             </trim>
         </trim>
         <include refid="_group_by_"/>
         <include refid="_orderCols_"/>
     </select>
+
+    <!-- 条件映射 -->
+    <sql id="_condition_two_">
+        <if test="condition != null and !condition.isEmpty()">
+            <!-- 条件映射-普通条件 -->
+            <include refid="_condition_param_two_">
+                <property name="_conditionParam_" value="condition"/>
+                <property name="_conditionType_" value="and"/>
+            </include>
+        </if>
+    </sql>
+
+    <sql id="_condition_param_two_">
+        <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="conditionParamRef.containsKey('timeStart') and conditionParamRef.timeStart != null and conditionParamRef.timeStart!=''">
+            ${_conditionType_} STR_TO_DATE(CONCAT(`year`,'-',`month`,'-',`day`),'%Y-%m-%d')<![CDATA[ >= ]]>STR_TO_DATE(#{${_conditionParam_}.timeStart},'%Y-%m-%d')
+        </if>
+        <if test="conditionParamRef.containsKey('timeEnd') and conditionParamRef.timeEnd != null and conditionParamRef.timeEnd!=''">
+            ${_conditionType_}  STR_TO_DATE(CONCAT(`year`,'-',`month`,'-',`day`),'%Y-%m-%d')<![CDATA[ <= ]]>STR_TO_DATE(#{${_conditionParam_}.timeEnd},'%Y-%m-%d')
+        </if>
+    </sql>
 </mapper>
\ No newline at end of file