陈威 / MarketBasedPricingProgram

Download as
Browse Code »

Commit 37aa498a4ce61f9f8c8640aa93ca806ddd75db09

Authored by 陈威
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
  Diff comments   View file @37aa498
@@ -77,4 +77,7 @@ public interface McBasicCmtyMapper @@ -77,4 +77,7 @@ public interface McBasicCmtyMapper
77 77
78 List<McBasicCmty> selectMcBasicCmtyByData(McBasicCmty mcBasicCmty); 78 List<McBasicCmty> selectMcBasicCmtyByData(McBasicCmty mcBasicCmty);
79 79
  80 + List<McBasicCmty> selectVisitDeptList(McBasicCmtyVo mcBasicCmtyVo);
  81 +
  82 +
80 } 83 }
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcBasicCmtyService.java
  Diff comments   View file @37aa498
1 package com.chinagas.modules.schsf.service; 1 package com.chinagas.modules.schsf.service;
2 2
3 import com.chinagas.modules.schsf.domain.McBasicCmty; 3 import com.chinagas.modules.schsf.domain.McBasicCmty;
  4 +import com.chinagas.modules.schsf.domain.McVisit;
4 import com.chinagas.modules.schsf.domain.dto.CompanyDto; 5 import com.chinagas.modules.schsf.domain.dto.CompanyDto;
5 import com.chinagas.modules.schsf.domain.vo.McBasicCmtyVo; 6 import com.chinagas.modules.schsf.domain.vo.McBasicCmtyVo;
6 7
@@ -76,4 +77,9 @@ public interface IMcBasicCmtyService @@ -76,4 +77,9 @@ public interface IMcBasicCmtyService
76 * @return 77 * @return
77 */ 78 */
78 List<McBasicCmty> selectVlgOrCmtyList(McBasicCmtyVo mcBasicCmtyVo); 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
  Diff comments   View file @37aa498
@@ -4,8 +4,10 @@ import com.chinagas.common.core.utils.DateUtils; @@ -4,8 +4,10 @@ import com.chinagas.common.core.utils.DateUtils;
4 import com.chinagas.common.datascope.annotation.DataScope; 4 import com.chinagas.common.datascope.annotation.DataScope;
5 import com.chinagas.common.security.utils.SecurityUtils; 5 import com.chinagas.common.security.utils.SecurityUtils;
6 import com.chinagas.modules.schsf.domain.McBasicCmty; 6 import com.chinagas.modules.schsf.domain.McBasicCmty;
  7 +import com.chinagas.modules.schsf.domain.McVisit;
7 import com.chinagas.modules.schsf.domain.dto.CompanyDto; 8 import com.chinagas.modules.schsf.domain.dto.CompanyDto;
8 import com.chinagas.modules.schsf.domain.vo.McBasicCmtyVo; 9 import com.chinagas.modules.schsf.domain.vo.McBasicCmtyVo;
  10 +import com.chinagas.modules.schsf.domain.vo.McVisitVo;
9 import com.chinagas.modules.schsf.mapper.McBasicCmtyMapper; 11 import com.chinagas.modules.schsf.mapper.McBasicCmtyMapper;
10 import com.chinagas.modules.schsf.service.IMcBasicCmtyService; 12 import com.chinagas.modules.schsf.service.IMcBasicCmtyService;
11 import com.chinagas.modules.schsf.service.IMcConstructionService; 13 import com.chinagas.modules.schsf.service.IMcConstructionService;
@@ -13,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; @@ -13,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
13 import org.springframework.stereotype.Service; 15 import org.springframework.stereotype.Service;
14 16
15 import java.util.ArrayList; 17 import java.util.ArrayList;
  18 +import java.util.Collections;
16 import java.util.HashMap; 19 import java.util.HashMap;
17 import java.util.List; 20 import java.util.List;
18 21
@@ -142,6 +145,22 @@ public class McBasicCmtyServiceImpl implements IMcBasicCmtyService { @@ -142,6 +145,22 @@ public class McBasicCmtyServiceImpl implements IMcBasicCmtyService {
142 return mcBasicCmtyMapper.selectVlgOrCmtyList(mcBasicCmtyVo); 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 private List<CompanyDto> loadDistinctGroups(McBasicCmtyVo mcBasicCmtyVo, CompanyDto parent) { 164 private List<CompanyDto> loadDistinctGroups(McBasicCmtyVo mcBasicCmtyVo, CompanyDto parent) {
146 mcBasicCmtyVo.setRegionName(parent.getValue()); 165 mcBasicCmtyVo.setRegionName(parent.getValue());
147 return mcBasicCmtyMapper.getDistinctGroupList(mcBasicCmtyVo); 166 return mcBasicCmtyMapper.getDistinctGroupList(mcBasicCmtyVo);
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java
  Diff comments   View file @37aa498
@@ -4,10 +4,12 @@ import cn.hutool.core.bean.BeanUtil; @@ -4,10 +4,12 @@ import cn.hutool.core.bean.BeanUtil;
4 import com.alibaba.fastjson2.JSON; 4 import com.alibaba.fastjson2.JSON;
5 import com.alibaba.fastjson2.JSONObject; 5 import com.alibaba.fastjson2.JSONObject;
6 import com.chinagas.api.system.domain.SysUser; 6 import com.chinagas.api.system.domain.SysUser;
  7 +import com.chinagas.common.core.exceptions.ServiceException;
7 import com.chinagas.common.core.utils.DateUtils; 8 import com.chinagas.common.core.utils.DateUtils;
8 import com.chinagas.common.core.utils.StringUtils; 9 import com.chinagas.common.core.utils.StringUtils;
9 import com.chinagas.common.datascope.annotation.DataScope; 10 import com.chinagas.common.datascope.annotation.DataScope;
10 import com.chinagas.common.security.utils.SecurityUtils; 11 import com.chinagas.common.security.utils.SecurityUtils;
  12 +import com.chinagas.modules.schsf.domain.McBasicCmty;
11 import com.chinagas.modules.schsf.domain.McOperationLog; 13 import com.chinagas.modules.schsf.domain.McOperationLog;
12 import com.chinagas.modules.schsf.domain.McVisit; 14 import com.chinagas.modules.schsf.domain.McVisit;
13 import com.chinagas.modules.schsf.domain.McVisitStatusNodeInfo; 15 import com.chinagas.modules.schsf.domain.McVisitStatusNodeInfo;
@@ -17,6 +19,7 @@ import com.chinagas.modules.schsf.domain.vo.McVisitVo; @@ -17,6 +19,7 @@ import com.chinagas.modules.schsf.domain.vo.McVisitVo;
17 import com.chinagas.modules.schsf.enums.*; 19 import com.chinagas.modules.schsf.enums.*;
18 import com.chinagas.modules.schsf.mapper.McFileMapper; 20 import com.chinagas.modules.schsf.mapper.McFileMapper;
19 import com.chinagas.modules.schsf.mapper.McVisitMapper; 21 import com.chinagas.modules.schsf.mapper.McVisitMapper;
  22 +import com.chinagas.modules.schsf.service.IMcBasicCmtyService;
20 import com.chinagas.modules.schsf.service.IMcIgnitionService; 23 import com.chinagas.modules.schsf.service.IMcIgnitionService;
21 import com.chinagas.modules.schsf.service.IMcOperationLogService; 24 import com.chinagas.modules.schsf.service.IMcOperationLogService;
22 import com.chinagas.modules.schsf.service.IMcVisitService; 25 import com.chinagas.modules.schsf.service.IMcVisitService;
@@ -54,6 +57,8 @@ public class McVisitServiceImpl implements IMcVisitService { @@ -54,6 +57,8 @@ public class McVisitServiceImpl implements IMcVisitService {
54 private IMcIgnitionService iMcIgnitionService; 57 private IMcIgnitionService iMcIgnitionService;
55 @Autowired 58 @Autowired
56 private McFileMapper mcFileMapper; 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,7 +139,10 @@ public class McVisitServiceImpl implements IMcVisitService {
134 @Transactional 139 @Transactional
135 @Override 140 @Override
136 public int insertMcVisit(McVisit mcVisit) { 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 String userId = SecurityUtils.getUserId().toString(); 146 String userId = SecurityUtils.getUserId().toString();
139 String userAccount = SecurityUtils.getUsername(); 147 String userAccount = SecurityUtils.getUsername();
140 String userName = SecurityUtils.getLoginUser().getSysUser().getNickName(); 148 String userName = SecurityUtils.getLoginUser().getSysUser().getNickName();
@@ -262,6 +270,10 @@ public class McVisitServiceImpl implements IMcVisitService { @@ -262,6 +270,10 @@ public class McVisitServiceImpl implements IMcVisitService {
262 @Transactional 270 @Transactional
263 @Override 271 @Override
264 public int updateMcVisit(McVisit mcVisit_old) throws CloneNotSupportedException { 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 McVisit mcVisit = mcVisitMapper.selectMcVisitById(mcVisit_old.getId()); 278 McVisit mcVisit = mcVisitMapper.selectMcVisitById(mcVisit_old.getId());
267 if (mcVisit == null) { 279 if (mcVisit == null) {
zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicCmtyMapper.xml
  Diff comments   View file @37aa498
@@ -359,4 +359,14 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -359,4 +359,14 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
359 and m.street = #{street} 359 and m.street = #{street}
360 and m.vlg_or_cmty = #{vlgOrCmty} 360 and m.vlg_or_cmty = #{vlgOrCmty}
361 </select> 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 </mapper> 372 </mapper>