添加系统接入模块

bill-manager/src/main/resources/sqlmap/module/pj/PjEvaluateStatMapperExt.xml

@@ -26,16 +26,38 @@
             where
             <trim prefixOverrides="and" prefix="">
                 <include refid="_condition_"/>
-                <if test="conditionParamRef.containsKey('timeStart') and conditionParamRef.timeStart != null and conditionParamRef.timeStart!=''">
-                    and 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!=''">
-                    and  STR_TO_DATE(CONCAT(`year`,'-',`month`,'-',`day`),'%Y-%m-%d')<![CDATA[ <= ]]>STR_TO_DATE(${_conditionParam_}.createTimeEnd},'%Y-%m-%d')
-               </if>
+                <include refid="_condition_param_">
+                    <property name="_conditionParam_" value="condition"/>
+                    <property name="_conditionType_" value="and"/>
+                </include>
+                <bind name="conditionParamRef" value="${_conditionParam_}"/>
+
 
             </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/test/java/com/mortals/httpclient/http-client.env.json

@@ -4,7 +4,7 @@
     "baseLogin": "http://127.0.0.1:18222/m"
   },
   "test": {
-    "baseUrl": "http://192.168.0.98:11019/bill",
+    "baseUrl": "http://8.136.255.30:11078/bill",
     "baseLogin": "http://192.168.0.98:11078/base"
   },