Browse Source

删除社区自组织时存在未完成的服务不能删除

feature/teamB_zz_wgh
yinzuomei 3 years ago
parent
commit
b2ae5d0206
  1. 7
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java
  2. 4
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
  3. 13
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml

7
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java

@ -140,4 +140,11 @@ public interface IcUserDemandRecDao extends BaseDao<IcUserDemandRecEntity> {
List<ServicePointDTO> getServicePoint(@Param("customerId")String customerId, @Param("serviceType")String serviceType);
List<DemandRecResultDTO> queryServiceList(ServiceListFormDTO formDTO);
/**
* 根据服务方id查询已派单的服务记录数
* @param serverId
* @return
*/
Integer selectCountByServerId(String serverId);
}

4
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java

@ -362,6 +362,10 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
@Transactional(rollbackFor = Exception.class)
@Override
public void delCommunitySelfOrganization(DelCommunitySelfOrganizationFormDTO formDTO) {
//存在未完成的需求,不能删除
if (icUserDemandRecDao.selectCountByServerId(formDTO.getOrgId()) > NumConstant.ZERO) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "存在未完成的服务", "存在未完成的服务,不能删除");
}
baseDao.deleteById(formDTO.getOrgId());
personnelService.deleteByOrgId(formDTO.getOrgId());
}

13
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml

@ -664,4 +664,17 @@
</foreach>
order by r.REPORT_TIME desc
</select>
<select id="selectCountByServerId" parameterType="java.lang.String" resultType="java.lang.Integer">
SELECT
count( s.ID ) as total
FROM
ic_user_demand_service s
INNER JOIN ic_user_demand_rec r ON ( s.DEMAND_REC_ID = r.ID )
WHERE
s.DEL_FLAG = '0'
AND r.DEL_FLAG = '0'
AND s.SERVER_ID = #{serverId}
AND r.`STATUS` = 'assigned'
</select>
</mapper>

Loading…
Cancel
Save