ganzi/ganzi-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

报表

Browse Source
This commit is contained in:
韩国东 2023-01-05 17:25:33 +08:00
parent 338b699d14
commit ad01bea72a
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
inventory-dao/src/main/java/com/rzyc/mapper/check/BookEntCheckMapper.java
View File

@ -100,6 +100,7 @@ public interface BookEntCheckMapper {
/*街道检查情况*/ /*街道检查情况*/
List<StreetCheckMsg> streetCheckMsg(@Param("startTime") String startTime, List<StreetCheckMsg> streetCheckMsg(@Param("startTime") String startTime,
@Param("endTime") String endTime, @Param("endTime") String endTime,
@Param("superiorOrgCode") String superiorOrgCode,
@Param("streetCode") String streetCode, @Param("streetCode") String streetCode,
@Param("inherentRisks") List<Integer> inherentRisks); @Param("inherentRisks") List<Integer> inherentRisks);

2
inventory-dao/src/main/resources/mapper/check/BookEntCheckMapper.xml
View File

@ -928,7 +928,7 @@
</if> </if>
)rectifyedingNum )rectifyedingNum
from SysOrg so from SysOrg so
where so.SuperiorOrgCode = '510114' where so.SuperiorOrgCode = #{superiorOrgCode}
<if test="null != streetCode and '' != streetCode"> <if test="null != streetCode and '' != streetCode">
and so.OrgCode = #{streetCode} and so.OrgCode = #{streetCode}
</if> </if>

2
inventory-gov/src/main/java/com/rzyc/controller/BaseController.java
View File

@ -2797,6 +2797,8 @@ public class BaseController {
SysUser sysUser = sysUserMapper.findById(userId); SysUser sysUser = sysUserMapper.findById(userId);
if(null != sysUser){ if(null != sysUser){
areaCode = sysUser.getAreaCode(); areaCode = sysUser.getAreaCode();
}else{
areaCode = constantsConfigure.getSuperiorOrgCode();
} }
return areaCode; return areaCode;
} }

10
inventory-gov/src/main/java/com/rzyc/controller/ExportContorller.java
View File

@ -705,7 +705,8 @@ public class ExportContorller extends com.rzyc.controller.BaseController {
SysUser sysUser = getUser(streetCheckMsgDto.getUserId()); SysUser sysUser = getUser(streetCheckMsgDto.getUserId());
String streetCode = sysUser.getStreetCode(); String streetCode = "";
String areaCode = getUserArea(sysUser.getSysuserid());
String startTime = DateUtils.getHandleTime(streetCheckMsgDto.getStartTime(),1); String startTime = DateUtils.getHandleTime(streetCheckMsgDto.getStartTime(),1);
String entTime = DateUtils.getHandleTime(streetCheckMsgDto.getEndTime(),2); String entTime = DateUtils.getHandleTime(streetCheckMsgDto.getEndTime(),2);
@ -719,7 +720,7 @@ public class ExportContorller extends com.rzyc.controller.BaseController {
} }
List<StreetCheckMsg> checkMsgs = bookEntCheckMapper.streetCheckMsg(startTime,entTime,streetCode,inherentRisks); List<StreetCheckMsg> checkMsgs = bookEntCheckMapper.streetCheckMsg(startTime,entTime,areaCode,streetCode,inherentRisks);
if(null != checkMsgs && checkMsgs.size() > 0){ if(null != checkMsgs && checkMsgs.size() > 0){
StreetCheckMsg streetCheckMsg = new StreetCheckMsg(); StreetCheckMsg streetCheckMsg = new StreetCheckMsg();
@ -769,7 +770,8 @@ public class ExportContorller extends com.rzyc.controller.BaseController {
SysUser sysUser = getUser(streetCheckMsgDto.getUserId()); SysUser sysUser = getUser(streetCheckMsgDto.getUserId());
String streetCode = sysUser.getStreetCode(); String streetCode = "";
String areaCode = getUserArea(sysUser.getSysuserid());
List<Integer> inherentRisks = new ArrayList<>(); List<Integer> inherentRisks = new ArrayList<>();
@ -781,7 +783,7 @@ public class ExportContorller extends com.rzyc.controller.BaseController {
} }
List<StreetCheckMsg> checkMsgs = bookEntCheckMapper.streetCheckMsg(startTime,entTime,streetCode,inherentRisks); List<StreetCheckMsg> checkMsgs = bookEntCheckMapper.streetCheckMsg(startTime,entTime,areaCode,streetCode,inherentRisks);
if(null != checkMsgs && checkMsgs.size() > 0){ if(null != checkMsgs && checkMsgs.size() > 0){
StreetCheckMsg streetCheckMsg = new StreetCheckMsg(); StreetCheckMsg streetCheckMsg = new StreetCheckMsg();