bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

大屏接口修改

This commit is contained in:
cwchen 2023-12-24 00:52:17 +08:00
parent 950f125032
commit a9c0ee9585
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/util/CommonUtil.java
View File

@ -113,6 +113,9 @@ public class CommonUtil {
BigDecimal jjValue = new BigDecimal(new Double(0).toString());
BigDecimal tsValue = new BigDecimal(new Double(0).toString());
for (int i = 0; i < list.size(); i++) {
if(Objects.isNull(list.get(i))){
continue;
}
if (Objects.equals(list.get(i).getCompanyName(), CommonConstants.JJ)) {
BigDecimal value = new BigDecimal(new Double(list.get(i).getNum()).toString());
jjValue = jjValue.add(value);

12
sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
View File

@ -16,13 +16,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<!--退料数据-->
<select id="getMaterialReturnData" resultType="com.bonus.sgzb.largeScreen.domain.MaTypeDo">
SELECT SUM(bcd.back_num) AS num,
bcd.company_id AS companyId,
SELECT bad.audit_num AS num,
mt.company_id AS companyId,
sd.dept_name AS companyName
FROM back_check_details bcd
LEFT JOIN sys_dept sd ON bcd.company_id = sd.dept_id
WHERE bcd.create_time BETWEEN CONCAT(#{nowDate}, ' 00:00:00') AND CONCAT(#{nowDate}, ' 23:59:59')
GROUP BY bcd.company_id
FROM back_apply_details bad
LEFT JOIN ma_type mt ON bad.type_id = mt.type_id AND mt.`level` = '4'
LEFT JOIN sys_dept sd ON mt.company_id = sd.dept_id
WHERE bad.create_time BETWEEN CONCAT(#{nowDate}, ' 00:00:00') AND CONCAT(#{nowDate}, ' 23:59:59')
</select>
<!--当月领料分析-->
<select id="getPickingAnalysisByMonth" resultType="com.bonus.sgzb.largeScreen.domain.MaTypeDo">