xd
/
JNBusinessTest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'123'

This commit is contained in:
xd 2024-08-08 08:04:44 +08:00
parent b6472c4649
commit 253fadb97c
3 changed files with 47 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
.idea/workspace.xml
View File

@ -97,7 +97,7 @@
<workItem from="1722902153713" duration="25139000" /> <workItem from="1722902153713" duration="25139000" />
<workItem from="1722934128238" duration="2182000" /> <workItem from="1722934128238" duration="2182000" />
<workItem from="1722988626839" duration="17971000" /> <workItem from="1722988626839" duration="17971000" />
<workItem from="1723017804486" duration="1282000" /> <workItem from="1723017804486" duration="1336000" />
</task> </task>
<servers /> <servers />
</component> </component>
@ -128,46 +128,46 @@
</state> </state>
<state x="740" y="274" key="FileChooserDialogImpl/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722996900988" /> <state x="740" y="274" key="FileChooserDialogImpl/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722996900988" />
<state x="2475" y="237" key="FileChooserDialogImpl/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723017044285" /> <state x="2475" y="237" key="FileChooserDialogImpl/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723017044285" />
<state width="1396" height="200" key="GridCell.Tab.0.bottom" timestamp="1723018787238"> <state width="1396" height="200" key="GridCell.Tab.0.bottom" timestamp="1723019145589">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>
<state width="1876" height="272" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224731" /> <state width="1876" height="272" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224731" />
<state width="1396" height="200" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723018787238" /> <state width="1396" height="200" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723019145589" />
<state width="1396" height="200" key="GridCell.Tab.0.center" timestamp="1723018787238"> <state width="1396" height="200" key="GridCell.Tab.0.center" timestamp="1723019145588">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>
<state width="1876" height="272" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224730" /> <state width="1876" height="272" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224730" />
<state width="1396" height="200" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723018787238" /> <state width="1396" height="200" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723019145588" />
<state width="1396" height="200" key="GridCell.Tab.0.left" timestamp="1723018787237"> <state width="1396" height="200" key="GridCell.Tab.0.left" timestamp="1723019145588">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>
<state width="1876" height="272" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224730" /> <state width="1876" height="272" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224730" />
<state width="1396" height="200" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723018787237" /> <state width="1396" height="200" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723019145588" />
<state width="1396" height="200" key="GridCell.Tab.0.right" timestamp="1723018787238"> <state width="1396" height="200" key="GridCell.Tab.0.right" timestamp="1723019145588">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>
<state width="1876" height="272" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224731" /> <state width="1876" height="272" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224731" />
<state width="1396" height="200" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723018787238" /> <state width="1396" height="200" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723019145588" />
<state width="1396" height="200" key="GridCell.Tab.1.bottom" timestamp="1723018787238"> <state width="1396" height="200" key="GridCell.Tab.1.bottom" timestamp="1723019145589">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>
<state width="1876" height="272" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224731" /> <state width="1876" height="272" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224731" />
<state width="1396" height="200" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723018787238" /> <state width="1396" height="200" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723019145589" />
<state width="1396" height="200" key="GridCell.Tab.1.center" timestamp="1723018787238"> <state width="1396" height="200" key="GridCell.Tab.1.center" timestamp="1723019145589">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>
<state width="1876" height="272" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224731" /> <state width="1876" height="272" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224731" />
<state width="1396" height="200" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723018787238" /> <state width="1396" height="200" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723019145589" />
<state width="1396" height="200" key="GridCell.Tab.1.left" timestamp="1723018787238"> <state width="1396" height="200" key="GridCell.Tab.1.left" timestamp="1723019145589">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>
<state width="1876" height="272" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224731" /> <state width="1876" height="272" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224731" />
<state width="1396" height="200" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723018787238" /> <state width="1396" height="200" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723019145589" />
<state width="1396" height="200" key="GridCell.Tab.1.right" timestamp="1723018787238"> <state width="1396" height="200" key="GridCell.Tab.1.right" timestamp="1723019145589">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>
<state width="1876" height="272" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224731" /> <state width="1876" height="272" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722999224731" />
<state width="1396" height="200" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723018787238" /> <state width="1396" height="200" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723019145589" />
<state width="1876" height="288" key="GridCell.Tab.2.bottom" timestamp="1723017774091"> <state width="1876" height="288" key="GridCell.Tab.2.bottom" timestamp="1723017774091">
<screen x="1920" y="0" width="1440" height="900" /> <screen x="1920" y="0" width="1440" height="900" />
</state> </state>

43
ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml
View File

@ -587,26 +587,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectHandleTime" resultType="String"> <select id="selectHandleTime" resultType="String">
select ROUND(sum(secDiff)/ 3600.00 /count(1), 2) diff from ( select ROUND(sum(secDiff)/ 3600.00 /count(1), 2) diff from (
select case when a.dayDiff = 0 then a.secDiff select a.quot_code,
<!--询价时间不超过11:30 并且 报价时间超过13:00 报价时间-询价时间-1.5h -->
case when a.dayDiff = 0 and a.secDiff1 <![CDATA[>=]]> 0 and a.secDiff2 <![CDATA[>=]]> 0 then a.secDiff1+a.secDiff2
<!--询价时间超过11:30 并且 不超过13:00 并且 报价时间超过13:00 报价时间-1点 -->
when a.dayDiff = 0 and a.secDiff1 <![CDATA[<]]> 0 and a.secDiff3 <![CDATA[<]]> 0 and a.secDiff2 <![CDATA[>=]]> 0 then a.secDiff2
<!--报价时间不超过11:30 报价时间-询价时间-->
<!--询价时间超过13:00 报价时间-询价时间 -->
when a.dayDiff = 0 then a.secDiff
<!--跨一天 减14个小时 -->
when a.dayDiff = 1 then a.secDiff-14*3600 when a.dayDiff = 1 then a.secDiff-14*3600
when a.dayDiff > 1 then a.secDiff-(a.dayDiff-1)*24*3600 <!--跨n,n>1天 减(n-1)*24个小时 -->
when a.dayDiff <![CDATA[>]]> 1 then a.secDiff-(a.dayDiff-1)*24*3600
else 0 end secDiff else 0 end secDiff
from ( from (
select quot_inquiry_date, quot_quotation_date, select quot_code,quot_inquiry_date, quot_quotation_date,
<!-- 询价时间与11:30的差值 -->
datediff(second,quot_inquiry_date,CONVERT(DATETIME, CONVERT(VARCHAR(10),quot_inquiry_date,111) + ' ' + '11:30:00')) secDiff1,
<!-- 报价时间与13:00的差值 -->
datediff(second,CONVERT(DATETIME, CONVERT(VARCHAR(10),quot_quotation_date,111) + ' ' + '13:00:00'),quot_quotation_date) secDiff2,
<!-- 询价时间与13:00的差值 -->
datediff(second,CONVERT(DATETIME, CONVERT(VARCHAR(10),quot_inquiry_date,111) + ' ' + '13:00:00'),quot_inquiry_date) secDiff3,
datediff(day,quot_inquiry_date,quot_quotation_date) dayDiff, datediff(day,quot_inquiry_date,quot_quotation_date) dayDiff,
datediff(second,quot_inquiry_date,quot_quotation_date) secDiff datediff(second,quot_inquiry_date,quot_quotation_date) secDiff
from quot a from quot a
<where> <where>
and quot_approval_status = '2' and quot_jsxz_approval_status='0' and quot_approval_status = '2' and quot_jsxz_approval_status='0'
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 --> <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
and datediff(d, quot_quotation_date, #{params.beginTime}) <![CDATA[<=]]> 0 and datediff(d, quot_quotation_date, #{params.beginTime}) <![CDATA[<=]]> 0
</if> </if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 --> <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
and datediff(d, quot_quotation_date, #{params.endTime}) <![CDATA[>=]]> 0 and datediff(d, quot_quotation_date, #{params.endTime}) <![CDATA[>=]]> 0
</if> </if>
</where> </where>
)a
)a )a
)a
</select> </select>

2
ruoyi-ui/src/views/quot/quot/index.vue
View File

@ -249,7 +249,7 @@
<!-- 添加或修改报价对话框 --> <!-- 添加或修改报价对话框 -->
<el-dialog :visible.sync="open" width="1050px" v-el-drag-dialog append-to-body> <el-dialog :visible.sync="open" width="1050px" v-el-drag-dialog append-to-body>
<template slot="title"> <template slot="title">
<div>询价单信息</div><div style="color:red;">(注：1、如厂价金额低于10万,不得特批; 2、此报价单数据，型号规格电压等如需下单或签订合同引用，请再次自行核对，责任自负)</div> <div>询价单信息</div><div style="color:red;">(注：1、如特批金额低于10万,不得特批; 2、此报价单数据，型号规格电压等如需下单或签订合同引用，请再次自行核对，责任自负)</div>
</template> </template>
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-divider content-position="left" class="customer_divider_text">当前协助情况</el-divider> <el-divider content-position="left" class="customer_divider_text">当前协助情况</el-divider>