skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
@@ -44,7 +44,7 @@ <if test="dto.userId != null and dto.userId != ''"> and userR.user_id = #{dto.userId} </if> <if test="dto.approvalStatus != null and dto.approvalStatus != ''"> <if test="dto.approvalStatus != null"> and userR.approval_status = #{dto.approvalStatus} </if> </select> @@ -56,7 +56,7 @@ <if test="dto.userId != null and dto.userId != ''"> and userR.user_id = #{dto.userId} </if> <if test="dto.approvalStatus != null and dto.approvalStatus != ''"> <if test="dto.approvalStatus != null "> and userR.approval_status = #{dto.approvalStatus} </if> </select> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
@@ -46,6 +46,12 @@ de.STATUS as deviceStatus FROM ywxt.sg_project_info pro LEFT JOIN ywxt.sg_device de ON pro.id = de.program_id LEFT JOIN ywxt.sg_device de ON pro.id = de.program_id where 1=1 <if test="dto.status != null"> and pro.status = #{dto.status} </if> <if test="dto.projectName != null and dto.projectName != ''"> and pro.project_name like CONCAT(CONCAT('%',#{dto.projectName}),'%') </if> </select> </mapper> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
@@ -69,6 +69,7 @@ public void add(SgProgressReportDO sgProgressReportDO) { Date now = DateUtil.now(); sgProgressReportDO.setReportTime(now); sgProgressReportDO.setCreateTime(now); Long gxDeviceId = sgProgressReportDO.getGxDeviceId(); Long gxStepId = sgProgressReportDO.getGxStepId(); List<SgGxStepDO> list = sgGxStepMapper.selectByGxInfoId(gxDeviceId); @@ -280,7 +281,9 @@ public Map<String, Long> countList(ProjectSearchDTO searchDTO) { Long userId = AuthUtil.getUserId(); searchDTO.setUserId(userId); searchDTO.setApprovalStatus(0); Long pending = sgProgressReportMapper.countList(searchDTO); searchDTO.setApprovalStatus(1); Long over = sgProgressReportMapper.countList(searchDTO); Map<String, Long> map = new HashMap<>(); map.put("pending",pending);
