haozq
/
ah_sz_gqj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新需求

This commit is contained in:
hayu 2024-09-30 18:05:25 +08:00
parent 40b5307caf
commit 74d8064d6f
3 changed files with 79 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
src/main/resources/mappers/basis/HomeMapper.xml
View File

@ -83,32 +83,37 @@
</select>
<select id="getExpireData" resultType="com.bonus.aqgqj.basis.entity.dto.SamplesManageDto">
SELECT id,
dev_type_name as name,
dev_module as devModule,
'试验样品' as type,
next_exper_time as nextExperTime,
DATEDIFF(next_exper_time, CURDATE()) AS days
FROM tb_exper
WHERE next_exper_time = CURDATE() + INTERVAL 60 DAY
OR
next_exper_time = CURDATE() + INTERVAL 30 DAY
OR
next_exper_time = CURDATE() + INTERVAL 15 DAY
OR
next_exper_time = CURDATE() + INTERVAL 0 DAY
OR
next_exper_time BETWEEN CURDATE()
AND CURDATE() + INTERVAL 7 DAY
SELECT
te.dev_type_name as name,
te.dev_module as devModule,
'试验样品' as type,
te.next_exper_time as nextExperTime,
DATEDIFF(te.next_exper_time, CURDATE()) AS days,
ted.dev_code as devCode,
tsd.customer_code as customerCode
FROM
tb_exper_dev ted
LEFT JOIN tb_exper te on te.id=ted.exper_id and te.del_flag=0
LEFT JOIN tb_sample_device tsd on tsd.id=ted.dev_id and tsd.del_falg=0
WHERE
1=1
and (
next_exper_time = CURDATE() + INTERVAL 60 DAY
OR
next_exper_time = CURDATE() + INTERVAL 30 DAY
OR
next_exper_time = CURDATE() + INTERVAL 15 DAY
OR
next_exper_time = CURDATE() + INTERVAL 0 DAY
OR
next_exper_time BETWEEN CURDATE()
AND CURDATE() + INTERVAL 7 DAY
)
UNION
UNION ALL
SELECT dev_id,
dev_name as name,
dev_module as devModule,
'试验设备' as type,
contract_date as nextExperTime,
DATEDIFF(contract_date, CURDATE()) AS days
SELECT dev_name as name, dev_module as devModule, '试验设备' as type, contract_date as nextExperTime,
DATEDIFF(contract_date, CURDATE()) AS days,dev_code as devCode,'-' as customerCode
FROM tb_exper_device
WHERE contract_date = CURDATE() + INTERVAL 60 DAY
OR
@ -123,45 +128,56 @@
</select>
<select id="getExpireDataList" resultType="com.bonus.aqgqj.basis.entity.dto.SamplesManageDto">
select *
from (SELECT id,
dev_type_name as name,
dev_module as devModule,
'试验样品' as type,
next_exper_time as nextExperTime,
DATEDIFF(next_exper_time, CURDATE()) AS days
FROM tb_exper
WHERE next_exper_time = CURDATE() + INTERVAL 60 DAY
OR
next_exper_time = CURDATE() + INTERVAL 30 DAY
OR
next_exper_time = CURDATE() + INTERVAL 15 DAY
OR
next_exper_time = CURDATE() + INTERVAL 0 DAY
OR
next_exper_time BETWEEN CURDATE()
AND CURDATE() + INTERVAL 7 DAY
from (
SELECT
te.dev_type_name as name,
te.dev_module as devModule,
'试验样品' as type,
te.next_exper_time as nextExperTime,
DATEDIFF(te.next_exper_time, CURDATE()) AS days,
ted.dev_code as devCode,
tsd.customer_code as customerCode
FROM
tb_exper_dev ted
LEFT JOIN tb_exper te on te.id=ted.exper_id and te.del_flag=0
LEFT JOIN tb_sample_device tsd on tsd.id=ted.dev_id and tsd.del_falg=0
WHERE
1=1
and (
next_exper_time = CURDATE() + INTERVAL 60 DAY
OR
next_exper_time = CURDATE() + INTERVAL 30 DAY
OR
next_exper_time = CURDATE() + INTERVAL 15 DAY
OR
next_exper_time = CURDATE() + INTERVAL 0 DAY
OR
next_exper_time BETWEEN CURDATE()
AND CURDATE() + INTERVAL 7 DAY
)
UNION
UNION ALL
SELECT dev_id, dev_name as name, dev_module as devModule, '试验设备' as type, contract_date as nextExperTime, DATEDIFF(contract_date, CURDATE()) AS days
FROM tb_exper_device
WHERE contract_date = CURDATE() + INTERVAL 60 DAY
OR
contract_date = CURDATE() + INTERVAL 30 DAY
OR
contract_date = CURDATE() + INTERVAL 15 DAY
OR
contract_date = CURDATE() + INTERVAL 0 DAY
OR
contract_date BETWEEN CURDATE()
AND CURDATE() + INTERVAL 7 DAY) aa
SELECT dev_name as name, dev_module as devModule, '试验设备' as type, contract_date as nextExperTime,
DATEDIFF(contract_date, CURDATE()) AS days,dev_code as devCode,'-' as customerCode
FROM tb_exper_device
WHERE contract_date = CURDATE() + INTERVAL 60 DAY
OR
contract_date = CURDATE() + INTERVAL 30 DAY
OR
contract_date = CURDATE() + INTERVAL 15 DAY
OR
contract_date = CURDATE() + INTERVAL 0 DAY
OR
contract_date BETWEEN CURDATE()
AND CURDATE() + INTERVAL 7 DAY) aa
where 1=1
<if test="name != null and name != ''">
and (
name like concat('%',#{name},'%') or
devModule like concat('%',#{name},'%') or
type like concat('%',#{name},'%')
)
name like concat('%',#{name},'%') or
devModule like concat('%',#{name},'%') or
type like concat('%',#{name},'%')
)
</if>
order by days asc
</select>

6
src/main/resources/static/js/expireDataList.js
View File

@ -72,7 +72,7 @@ function initTable(dataList, limit, page) {
cols: [
[
//表头
{title: "序号", width: 80, unresize: true, align: "center",
{title: "序号", width: 70, unresize: true, align: "center",
templet: function (d) {
return (page - 1) * limit + d.LAY_INDEX;
}
@ -80,8 +80,10 @@ function initTable(dataList, limit, page) {
{field: "name", title: "名称", unresize: true, align: "center"},
{field: "devModule", title: "规格型号", unresize: true, align: "center"},
{field: "type", title: "类型", unresize: true, align: "center"},
{field: "devCode", title: "编号", unresize: true, align: "center"},
{field: "customerCode", title: "编码", unresize: true, align: "center"},
{field: "nextExperTime", title: "到期时间", unresize: true, align: "center"},
{field: "days", title: "到期天数", unresize: true, align: "center",templet: function (d) {
{field: "days", title: "到期天数", unresize: true,width: 110, align: "center",templet: function (d) {
var days = d.days;
return html='<span style="color: #FF5722;">'+days+'</span>';haode
}},

2
src/main/resources/static/js/main.js
View File

@ -22,7 +22,7 @@ function setExpireData(data){
console.log(data.length)
if (data.length>0){
openIframe2("expireDataList", '临期数据', "pages/expireDataList.html", '800px', '600px','');
openIframe2("expireDataList", '临期数据', "pages/expireDataList.html", '80%', '80%','');
// layer.open({