bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: bonus:0ea29f9ceb0f2ed7431aeb4f6c13ff18c41bdaec
Branches Tags
bonus:master
bonus:ah-simple-test
bonus:ah-simple-test-cq
bonus:ah-simple
bonus:gz-simple
bonus:sx-simple
bonus:ah-simple-old
bonus:matype1211
bonus:maprop1210
..
compare: bonus:d5125993c0f670dab7dcb502b57bc9b0337dbe92
Branches Tags
bonus:ah-simple-test
bonus:ah-simple-test-cq
bonus:ah-simple
bonus:gz-simple
bonus:sx-simple
bonus:ah-simple-old
bonus:master
bonus:matype1211
bonus:maprop1210

No commits in common. "0ea29f9ceb0f2ed7431aeb4f6c13ff18c41bdaec" and "d5125993c0f670dab7dcb502b57bc9b0337dbe92" have entirely different histories.
0ea29f9ceb ... d5125993c0

4 changed files with 12 additions and 109 deletions
Show Stats Expand all files Collapse all files

1
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/domain/DeptEquipmentConfig.java
View File

@ -17,7 +17,6 @@ public class DeptEquipmentConfig extends BaseEntity {
private String equipmentId;
private List<ConfigEntity> configs;
private String configStatus;
private String jijuType;
@Excel(name = "配置值")
private String configValue;

2
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/equipment/DeptEquipmentConfigMapper.xml
View File

@ -64,7 +64,6 @@
config_value,
config_rate,
config_description,
jiju_type,
remark
)
VALUES
@ -76,7 +75,6 @@
#{item.basicConfig},
#{item.configurationRate},
#{item.configurationDescription},
#{jijuType},
#{remark}
)
</foreach>

93
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/equipment/SysDeptMapper.xml
View File

@ -99,44 +99,16 @@
mt.type_id AS equipmentId,
mt2.type_name AS equipmentName,
mt.type_name AS equipmenttype,
mt.jiju_type as jijuType,
CASE
WHEN MAX( mdc.config_value ) IS NOT NULL
AND MAX( mdc.config_value ) != '' THEN
'已配置' ELSE '未配置'
WHEN MAX(mdc.config_value) IS NOT NULL AND MAX(mdc.config_value) != '' THEN '已配置'
ELSE '未配置'
END AS configStatus
FROM
ma_type mt
FROM ma_type mt
LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id
LEFT JOIN ma_dept_config mdc ON mdc.type_id = mt.type_id
LEFT JOIN ma_dept_config mdc
ON mdc.type_id = mt.type_id
AND mdc.dept_id = #{deptId}
WHERE
mt.LEVEL =5
GROUP BY
mt.type_id,
mt2.type_name,
mt.type_name
UNION
SELECT
mt.type_id AS equipmentId,
mt2.type_name AS equipmentName,
mt.type_name AS equipmenttype,
mt.jiju_type as jijuType,
CASE
WHEN MAX( mdc.config_value ) IS NOT NULL
AND MAX( mdc.config_value ) != '' THEN
'已配置' ELSE '未配置'
END AS configStatus
FROM
tool_type mt
LEFT JOIN tool_type mt2 ON mt.parent_id = mt2.type_id
LEFT JOIN ma_dept_config mdc ON mdc.type_id = mt.type_id
AND mdc.dept_id = #{deptId}
WHERE
mt.LEVEL =4
WHERE mt.level = 3
<if test="equipmentName != null and equipmentName != ''">
AND mt.type_name LIKE CONCAT('%', #{equipmentName}, '%')
</if>
@ -187,7 +159,6 @@
SUM(config_value) AS config_value,
SUM(if(config_rate='/',0,config_rate)) AS config_rate
FROM ma_dept_config
where jiju_type =1
GROUP BY dept_id, type_id, config_type
) grouped
LEFT JOIN sys_dept sd ON sd.dept_id = grouped.dept_id
@ -197,8 +168,8 @@
LEFT JOIN (
SELECT
sd.dept_id AS dept_id,
mt.type_id AS parent_type_id,
COUNT(md.num) AS order_count
mt2.type_id AS parent_type_id,
COUNT(md.ma_id) AS order_count
FROM
ma_order_details md
LEFT JOIN ma_order_info moi ON md.order_id = moi.order_id
@ -206,56 +177,10 @@
LEFT JOIN ma_type mt ON mdi.type_id = mt.type_id
LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id
LEFT JOIN sys_dept sd ON moi.buyer_company = sd.dept_id
where devType =0
GROUP BY sd.dept_id, mt.type_id
GROUP BY sd.dept_id, mt2.type_id
) order_stat
ON order_stat.dept_id = grouped.dept_id
AND order_stat.parent_type_id = grouped.type_id
UNION
SELECT
my.type_name AS deptName,
my.type_id AS typeId,
sd.dept_name AS companyName,
grouped.dept_id AS companyId,
grouped.config_type AS configType,
grouped.config_value AS configValue,
if(grouped.config_rate='/',0,grouped.config_rate) AS configRate,
IFNULL(order_stat.order_count, 0) AS orderCount
FROM
(
SELECT
dept_id,
type_id,
config_type,
SUM(config_value) AS config_value,
SUM(if(config_rate='/',0,config_rate)) AS config_rate
FROM ma_dept_config
where jiju_type =2
GROUP BY dept_id, type_id, config_type
) grouped
LEFT JOIN sys_dept sd ON sd.dept_id = grouped.dept_id
LEFT JOIN tool_type my ON my.type_id = grouped.type_id
-- 设备订单数量子查询
LEFT JOIN (
SELECT
sd.dept_id AS dept_id,
mt.type_id AS parent_type_id,
COUNT(md.num) AS order_count
FROM
ma_order_details md
LEFT JOIN ma_order_info moi ON md.order_id = moi.order_id
LEFT JOIN ma_dev_info mdi ON md.ma_id = mdi.ma_id
LEFT JOIN tool_type mt ON mdi.type_id = mt.type_id
LEFT JOIN tool_type mt2 ON mt.parent_id = mt2.type_id
LEFT JOIN sys_dept sd ON moi.buyer_company = sd.dept_id
where devType =1
GROUP BY sd.dept_id, mt.type_id
) order_stat
ON order_stat.dept_id = grouped.dept_id
AND order_stat.parent_type_id = grouped.type_id;
</select>
<select id="selectDeptConfigTypeSummary" resultType="com.bonus.material.equipment.domain.DeptConfigTypeSummary">

25
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/owner/OwnerMapper.xml
View File

@ -92,9 +92,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
md.on_company AS companyId,
sd.dept_name as companyName,
mt.type_name AS maName,
mt.type_id as typeId,
mt2.type_name AS maName,
mt2.type_id as typeId,
COUNT(*) AS maNum
FROM
ma_dev_info md
@ -105,25 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
md.is_active = '1'
GROUP BY
md.on_company,
mt.type_id
UNION
SELECT
md.company_id AS companyId,
sd.dept_name as companyName,
mt2.type_name AS maName,
mt2.type_id as typeId,
COUNT(*) AS maNum
FROM
tool_ledger md
LEFT JOIN tool_type mt ON mt.type_id = md.type_id
LEFT JOIN sys_dept sd ON sd.dept_id = md.company_id
LEFT JOIN tool_type mt2 on mt.parent_id = mt2.type_id
WHERE
md.`status` in (0,1,2)
GROUP BY
md.company_id,
mt2.type_id;
mt2.type_id
</select>
</mapper>