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

大屏二级页面调试

This commit is contained in:
mashuai 2024-07-04 15:22:46 +08:00
parent d04f23454b
commit 8ae7cd430f
3 changed files with 7 additions and 1 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/domain/ParamsDto.java
View File

@ -19,6 +19,9 @@ public class ParamsDto {
/** 结束日期*/ /** 结束日期*/
private String endDate; private String endDate;
/** 结束日期*/
private String date;
/** 类型*/ /** 类型*/
private String type; private String type;

1
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java
View File

@ -199,6 +199,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
String month = date.substring(5, 7); String month = date.substring(5, 7);
// 验收数量 // 验收数量
dto.setType("1"); dto.setType("1");
dto.setDate(year + "-" + month);
dto.setStartDate(DateTimeHelper.getFisrtDayOfMonth(Integer.parseInt(year), Integer.parseInt(month))); dto.setStartDate(DateTimeHelper.getFisrtDayOfMonth(Integer.parseInt(year), Integer.parseInt(month)));
dto.setEndDate(DateTimeHelper.getLastDayOfMonth(Integer.parseInt(year), Integer.parseInt(month))); dto.setEndDate(DateTimeHelper.getLastDayOfMonth(Integer.parseInt(year), Integer.parseInt(month)));
List<Map<String, String>> checkList = mapper.getAcceptanceStorage(dto); List<Map<String, String>> checkList = mapper.getAcceptanceStorage(dto);

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

@ -52,7 +52,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN purchase_check_details pcd ON pci.task_id = pcd.task_id LEFT JOIN purchase_check_details pcd ON pci.task_id = pcd.task_id
LEFT JOIN ma_type mt ON pcd.type_id = mt.type_id AND mt.`level` = '4' LEFT JOIN ma_type mt ON pcd.type_id = mt.type_id AND mt.`level` = '4'
LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
WHERE pci.arrival_time BETWEEN CONCAT(#{startDate}, ' 00:00:00') AND CONCAT(#{endDate}, ' 23:59:59') WHERE DATE_FORMAT(pci.arrival_time, '%Y-%m') = #{date}
AND mt.del_flag = '0'
<if test="maType!=null and maType == 1"> <if test="maType!=null and maType == 1">
AND sd.dept_name = #{maTypeName} AND sd.dept_name = #{maTypeName}
</if> </if>
@ -68,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN ma_type mt ON iad.type_id = mt.type_id AND mt.`level` = '4' LEFT JOIN ma_type mt ON iad.type_id = mt.type_id AND mt.`level` = '4'
LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
WHERE iad.create_time BETWEEN CONCAT(#{startDate}, ' 00:00:00') AND CONCAT(#{endDate}, ' 23:59:59') AND iad.input_type = '1' WHERE iad.create_time BETWEEN CONCAT(#{startDate}, ' 00:00:00') AND CONCAT(#{endDate}, ' 23:59:59') AND iad.input_type = '1'
AND mt.del_flag = '0'
<if test="maType!=null and maType == 1"> <if test="maType!=null and maType == 1">
AND sd.dept_name = #{maTypeName} AND sd.dept_name = #{maTypeName}
</if> </if>