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

jsk 检验预警 权限改造-数字

This commit is contained in:
jiask 2026-01-09 14:28:48 +08:00
parent abe03bef05
commit dbf9e35923
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bonus-modules/bonus-material/src/main/java/com/bonus/material/expectations/service/impl/ExpectationsServiceImpl.java
View File

@ -59,6 +59,11 @@ public class ExpectationsServiceImpl implements ExpectationsService {
@Override @Override
public AjaxResult getCountExpectations(ExpectationsEntity entity) { public AjaxResult getCountExpectations(ExpectationsEntity entity) {
try { try {
/**
* jsk
*/
Long companyId=iTypeService.getUserDeptId();
entity.setCompanyId(companyId);
Map<String, Objects> countExpectations = mapper.getCountExpectations(entity); Map<String, Objects> countExpectations = mapper.getCountExpectations(entity);
if (entity != null && "2".equals(entity.getUseStatus())) { if (entity != null && "2".equals(entity.getUseStatus())) {
//在用设备量 //在用设备量

5
bonus-modules/bonus-material/src/main/resources/mapper/material/expectations/ExpectationsMapper.xml
View File

@ -33,7 +33,7 @@
) )
</if> </if>
<if test="companyId != null and companyId != ''"> <if test="companyId != null and companyId != ''">
AND mm.company_id=#{companyId} AND mt1.company_id=#{companyId}
</if> </if>
GROUP BY GROUP BY
mm.type_id, mm.type_id,
@ -55,6 +55,9 @@
WHERE mm.ma_status = #{useStatus} WHERE mm.ma_status = #{useStatus}
AND mm.next_check_time &lt; DATE_ADD(CURDATE(), INTERVAL 30 DAY) AND mm.next_check_time &lt; DATE_ADD(CURDATE(), INTERVAL 30 DAY)
AND mt2.type_id not in (6032,6008,6270) AND mt2.type_id not in (6032,6008,6270)
<if test="companyId != null and companyId != ''">
AND mt.company_id=#{companyId}
</if>
GROUP BY name; GROUP BY name;
</select> </select>
<select id="getListDetails" resultType="com.bonus.material.expectations.domain.ExpectationsEntity"> <select id="getListDetails" resultType="com.bonus.material.expectations.domain.ExpectationsEntity">