skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java
@@ -53,12 +53,12 @@ /** * 用户所在单位 */ private Long userUnit; private List<Long> userUnit; /** * 县单位位 */ private Long countryUnit; private List<Long> countryUnit; /** * 用户角色 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/VO/ResVO.java
@@ -32,4 +32,9 @@ * 工程规模 */ private String engScal; /** * 乡镇 */ private String townNm; } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java
@@ -166,4 +166,13 @@ IPage<ResVO> page= sgProjectInfoService.resList(Condition.getPage(query),dto); return R.data(page); } /** * 删除项目 */ @DeleteMapping("delete/{id}") public R delete(@PathVariable Integer id) { sgProjectInfoService.delete(id); return R.success("删除成功"); } } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
@@ -96,11 +96,17 @@ LEFT JOIN ywxt.sg_report_user userR ON report.id = userR.report_id WHERE 1 = 1 and report."STATUS" != 4 <if test="dto.userUnit != null and dto.userUnit != ''"> and si.CONTROL_UNIT=#{dto.userUnit} <if test="dto.userUnit != null and dto.userUnit.size>0"> and si.CONTROL_UNIT in <foreach collection="dto.userUnit" item="item" index="index" open="(" separator="," close=")"> #{item} </foreach> </if> <if test="dto.countryUnit != null and dto.countryUnit != ''"> and dria."county_cd"=#{dto.countryUnit} <if test="dto.countryUnit != null and dto.countryUnit.size>0"> and dria."county_cd" in <foreach collection="dto.countryUnit" item="item" index="index" open="(" separator="," close=")"> #{item} </foreach> </if> <if test="dto.roleUnit != null and dto.roleUnit != ''"> and userR.role_id=#{dto.roleUnit} skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/SgProjectInfoService.java
@@ -43,4 +43,6 @@ List<SgProjectTreeVO> projectTree(ProjectSearchDTO dto); IPage<ResVO> resList(IPage<ResVO> page, ProjectSearchDTO dto); void delete(Integer id); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
@@ -510,12 +510,7 @@ public List<SgProgressReportVO> queryList(ProjectSearchDTO searchDTO) { BladeUser user = AuthUtil.getUser(); Long roleId = getRoleId(); if(!roleId.equals(1811657352658042882L)){ searchDTO.setUserUnit(Long.parseLong(user.getDeptId())); }else{ searchDTO.setCountryUnit(Long.parseLong(user.getDeptId())); } setUnit(searchDTO,user,roleId); searchDTO.setRoleUnit(roleId); //searchDTO.setUserId(userId); List<SgProgressReportVO> list = sgProgressReportMapper.queryList(searchDTO); @@ -558,12 +553,7 @@ public Map<String, Long> countList(ProjectSearchDTO searchDTO) { BladeUser user = AuthUtil.getUser(); Long roleId = getRoleId(); if(!roleId.equals(1811657352658042882L)){ searchDTO.setUserUnit(Long.parseLong(user.getDeptId())); }else{ searchDTO.setCountryUnit(Long.parseLong(user.getDeptId())); } setUnit(searchDTO,user,roleId); searchDTO.setRoleUnit(roleId); //searchDTO.setUserId(userId); @@ -659,12 +649,7 @@ public IPage<SgProgressReportVO> progressPage(IPage<SgProgressReportVO> page, ProjectSearchDTO searchDTO) { BladeUser user = AuthUtil.getUser(); Long roleId = getRoleId(); //判断是不是县级建办 否的话就是监理单位下人员进行 if(!roleId.equals(1811657352658042882L)){ searchDTO.setUserUnit(Long.parseLong(user.getDeptId())); }else{ searchDTO.setCountryUnit(Long.parseLong(user.getDeptId())); } setUnit(searchDTO, user, roleId); searchDTO.setRoleUnit(roleId); // if (searchDTO.getApprovalStatus()!=null && searchDTO.getApprovalStatus() ==0){ // searchDTO.setAuditPerson(String.valueOf(userId)); @@ -705,6 +690,24 @@ return page.setRecords(list); } /** * 设置部门单位查询条件 */ private void setUnit(ProjectSearchDTO searchDTO, BladeUser user, Long roleId) { List<Long> longList = Arrays.stream(user.getDeptId().split(",")) .map(Long::parseLong) .collect(Collectors.toList()); //判断是不是省厅建办 否的话就不设置部门 if (!roleId.equals(1800820667082948610L)){ //判断是不是县级建办 否的话就是监理单位下人员进行 if(!roleId.equals(1811657352658042882L)){ searchDTO.setUserUnit(longList); }else{ searchDTO.setCountryUnit(longList); } } } @Override public String getDeviceReport(Long gxDeviceId, Long gxStepId) { QueryWrapper<SgProgressReportDO> wrapper = new QueryWrapper<>(); skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
@@ -15,8 +15,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jetbrains.annotations.NotNull; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.secure.utils.AuthUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -814,4 +816,13 @@ return page.setRecords(baseMapper.resList(page,dto)); } @Override @Transactional public void delete(Integer id) { if (CollectionUtils.isNotEmpty(new LambdaQueryChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getProframId,id).list())){ throw new ServiceException("该项目存在施工审批，无法删除！"); } sgProjectInfoMapper.deleteById(id); } }
