Commit 37aa498a4ce61f9f8c8640aa93ca806ddd75db09
1 parent
8c8b6130
Exists in
dev
1：验证
Showing
5 changed files
with
51 additions
and
1 deletions
Show diff stats
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McBasicCmtyMapper.java
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcBasicCmtyService.java
| 1 | 1 | package com.chinagas.modules.schsf.service; |
| 2 | 2 | |
| 3 | 3 | import com.chinagas.modules.schsf.domain.McBasicCmty; |
| 4 | +import com.chinagas.modules.schsf.domain.McVisit; | |
| 4 | 5 | import com.chinagas.modules.schsf.domain.dto.CompanyDto; |
| 5 | 6 | import com.chinagas.modules.schsf.domain.vo.McBasicCmtyVo; |
| 6 | 7 | |
| ... | ... | @@ -76,4 +77,9 @@ public interface IMcBasicCmtyService |
| 76 | 77 | * @return |
| 77 | 78 | */ |
| 78 | 79 | List<McBasicCmty> selectVlgOrCmtyList(McBasicCmtyVo mcBasicCmtyVo); |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + List<McBasicCmty> selectVisitDeptList(McVisit mcVisit); | |
| 84 | + | |
| 79 | 85 | } | ... | ... |
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McBasicCmtyServiceImpl.java
| ... | ... | @@ -4,8 +4,10 @@ import com.chinagas.common.core.utils.DateUtils; |
| 4 | 4 | import com.chinagas.common.datascope.annotation.DataScope; |
| 5 | 5 | import com.chinagas.common.security.utils.SecurityUtils; |
| 6 | 6 | import com.chinagas.modules.schsf.domain.McBasicCmty; |
| 7 | +import com.chinagas.modules.schsf.domain.McVisit; | |
| 7 | 8 | import com.chinagas.modules.schsf.domain.dto.CompanyDto; |
| 8 | 9 | import com.chinagas.modules.schsf.domain.vo.McBasicCmtyVo; |
| 10 | +import com.chinagas.modules.schsf.domain.vo.McVisitVo; | |
| 9 | 11 | import com.chinagas.modules.schsf.mapper.McBasicCmtyMapper; |
| 10 | 12 | import com.chinagas.modules.schsf.service.IMcBasicCmtyService; |
| 11 | 13 | import com.chinagas.modules.schsf.service.IMcConstructionService; |
| ... | ... | @@ -13,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; |
| 13 | 15 | import org.springframework.stereotype.Service; |
| 14 | 16 | |
| 15 | 17 | import java.util.ArrayList; |
| 18 | +import java.util.Collections; | |
| 16 | 19 | import java.util.HashMap; |
| 17 | 20 | import java.util.List; |
| 18 | 21 | |
| ... | ... | @@ -142,6 +145,22 @@ public class McBasicCmtyServiceImpl implements IMcBasicCmtyService { |
| 142 | 145 | return mcBasicCmtyMapper.selectVlgOrCmtyList(mcBasicCmtyVo); |
| 143 | 146 | } |
| 144 | 147 | |
| 148 | + /** | |
| 149 | + * 验证所选组织是否存在 | |
| 150 | + * @param mcVisitVo | |
| 151 | + * @return | |
| 152 | + */ | |
| 153 | + @Override | |
| 154 | + public List<McBasicCmty> selectVisitDeptList(McVisit mcVisit) { | |
| 155 | + McBasicCmtyVo mcBasicCmtyVo=new McBasicCmtyVo(); | |
| 156 | + mcBasicCmtyVo.setRegionName(mcVisit.getRegionName()); | |
| 157 | + mcBasicCmtyVo.setGroupName(mcVisit.getGroupName()); | |
| 158 | + mcBasicCmtyVo.setCompanyName(mcVisit.getCompanyName()); | |
| 159 | + mcBasicCmtyVo.setCompanyCode(mcVisit.getCompanyCode()); | |
| 160 | + mcBasicCmtyVo.setVlgOrCmty(mcVisit.getVlgOrCmty()); | |
| 161 | + return mcBasicCmtyMapper.selectVisitDeptList(mcBasicCmtyVo); | |
| 162 | + } | |
| 163 | + | |
| 145 | 164 | private List<CompanyDto> loadDistinctGroups(McBasicCmtyVo mcBasicCmtyVo, CompanyDto parent) { |
| 146 | 165 | mcBasicCmtyVo.setRegionName(parent.getValue()); |
| 147 | 166 | return mcBasicCmtyMapper.getDistinctGroupList(mcBasicCmtyVo); | ... | ... |
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java
| ... | ... | @@ -4,10 +4,12 @@ import cn.hutool.core.bean.BeanUtil; |
| 4 | 4 | import com.alibaba.fastjson2.JSON; |
| 5 | 5 | import com.alibaba.fastjson2.JSONObject; |
| 6 | 6 | import com.chinagas.api.system.domain.SysUser; |
| 7 | +import com.chinagas.common.core.exceptions.ServiceException; | |
| 7 | 8 | import com.chinagas.common.core.utils.DateUtils; |
| 8 | 9 | import com.chinagas.common.core.utils.StringUtils; |
| 9 | 10 | import com.chinagas.common.datascope.annotation.DataScope; |
| 10 | 11 | import com.chinagas.common.security.utils.SecurityUtils; |
| 12 | +import com.chinagas.modules.schsf.domain.McBasicCmty; | |
| 11 | 13 | import com.chinagas.modules.schsf.domain.McOperationLog; |
| 12 | 14 | import com.chinagas.modules.schsf.domain.McVisit; |
| 13 | 15 | import com.chinagas.modules.schsf.domain.McVisitStatusNodeInfo; |
| ... | ... | @@ -17,6 +19,7 @@ import com.chinagas.modules.schsf.domain.vo.McVisitVo; |
| 17 | 19 | import com.chinagas.modules.schsf.enums.*; |
| 18 | 20 | import com.chinagas.modules.schsf.mapper.McFileMapper; |
| 19 | 21 | import com.chinagas.modules.schsf.mapper.McVisitMapper; |
| 22 | +import com.chinagas.modules.schsf.service.IMcBasicCmtyService; | |
| 20 | 23 | import com.chinagas.modules.schsf.service.IMcIgnitionService; |
| 21 | 24 | import com.chinagas.modules.schsf.service.IMcOperationLogService; |
| 22 | 25 | import com.chinagas.modules.schsf.service.IMcVisitService; |
| ... | ... | @@ -54,6 +57,8 @@ public class McVisitServiceImpl implements IMcVisitService { |
| 54 | 57 | private IMcIgnitionService iMcIgnitionService; |
| 55 | 58 | @Autowired |
| 56 | 59 | private McFileMapper mcFileMapper; |
| 60 | + @Autowired | |
| 61 | + private IMcBasicCmtyService iMcBasicCmtyService; | |
| 57 | 62 | |
| 58 | 63 | /** |
| 59 | 64 | * 查询拜访工单 |
| ... | ... | @@ -134,7 +139,10 @@ public class McVisitServiceImpl implements IMcVisitService { |
| 134 | 139 | @Transactional |
| 135 | 140 | @Override |
| 136 | 141 | public int insertMcVisit(McVisit mcVisit) { |
| 137 | - | |
| 142 | + List<McBasicCmty> mcBasicCmties = iMcBasicCmtyService.selectVisitDeptList(mcVisit); | |
| 143 | + if (mcBasicCmties==null || mcBasicCmties.size()==0){ | |
| 144 | + throw new ServiceException("选择的组织不存在！"); | |
| 145 | + } | |
| 138 | 146 | String userId = SecurityUtils.getUserId().toString(); |
| 139 | 147 | String userAccount = SecurityUtils.getUsername(); |
| 140 | 148 | String userName = SecurityUtils.getLoginUser().getSysUser().getNickName(); |
| ... | ... | @@ -262,6 +270,10 @@ public class McVisitServiceImpl implements IMcVisitService { |
| 262 | 270 | @Transactional |
| 263 | 271 | @Override |
| 264 | 272 | public int updateMcVisit(McVisit mcVisit_old) throws CloneNotSupportedException { |
| 273 | + List<McBasicCmty> mcBasicCmties = iMcBasicCmtyService.selectVisitDeptList(mcVisit_old); | |
| 274 | + if (mcBasicCmties==null || mcBasicCmties.size()==0){ | |
| 275 | + throw new ServiceException("选择的组织或小区不存在！"); | |
| 276 | + } | |
| 265 | 277 | //判断修改前数据是否有文件 |
| 266 | 278 | McVisit mcVisit = mcVisitMapper.selectMcVisitById(mcVisit_old.getId()); |
| 267 | 279 | if (mcVisit == null) { | ... | ... |
zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicCmtyMapper.xml
| ... | ... | @@ -359,4 +359,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
| 359 | 359 | and m.street = #{street} |
| 360 | 360 | and m.vlg_or_cmty = #{vlgOrCmty} |
| 361 | 361 | </select> |
| 362 | + | |
| 363 | + <select id="selectVisitDeptList" resultMap="McBasicCmtyResult" parameterType="com.chinagas.modules.schsf.domain.vo.McBasicCmtyVo"> | |
| 364 | + <include refid="selectMcBasicCmtyVo"/> | |
| 365 | + WHERE 1 = 1 | |
| 366 | + and m.group_name = #{groupName} | |
| 367 | + and m.region_name = #{regionName} | |
| 368 | + and m.company_name = #{companyName} | |
| 369 | + and m.company_code = #{companyCode} | |
| 370 | + and m.vlg_or_cmty = #{vlgOrCmty} | |
| 371 | + </select> | |
| 362 | 372 | </mapper> | ... | ... |