Browse Source

开单列表BUG修复

anderx 1 year ago
parent
commit
a9efb53a33

+ 4 - 4
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1364,10 +1364,10 @@
         a.order_status as orderStatus, a.liquidation_status as liquidationStatus,a.approval,c.salesman_name as salesmanName,c.project_type projectType,
         dep.name as depName,c.finance_name as financeName,c.invoice_amount invoiceAmount,a.settlement_amount settlementAmount,
         a.sales_type salesType, a.channel_id channelId ,a.other,a.examine_name examineName,c.stop_project stopProject,toa.type,toa.type_explain typeExplain
-        <if test="specially == 0 or specially == 12 ">
-            ,toprc.max_status as maxStatus,toprc.actual_duration as actualDuration,toprc.max_type as maxType,
-            toprc.max_duration as maxDuration
-        </if>
+<!--        <if test="specially == 0 or specially == 12 ">-->
+<!--            ,toprc.max_status as maxStatus,toprc.actual_duration as actualDuration,toprc.max_type as maxType,-->
+<!--            toprc.max_duration as maxDuration-->
+<!--        </if>-->
         <if test="specially == 2">
             ,f.name as initiateName ,e.reason ,date_format(e.create_time,'%Y-%m-%d' ) as backDate,e.id as backId
         </if>

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -1,8 +1,8 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 
-#static.host=//static.jishutao.com/1.3.29
-static.host=//172.16.1.187/1.3.29
+static.host=//static.jishutao.com/1.3.29
+#static.host=//172.16.1.187/1.3.29
 
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20240430?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false