Commit 9626b9caad3c4010e81c5e9d596763c26fb79292
1 parent
c991d0be
Exists in
dev
同一个用户 全款的不能再提交记录
Showing
4 changed files
with
63 additions
and
1 deletions
Show diff stats
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicCmtyController.java
| ... | ... | @@ -48,7 +48,7 @@ public class McBasicCmtyController extends BaseController { |
| 48 | 48 | */ |
| 49 | 49 | @RequirePermission("schsf:mcBasicCmty:companyCascader") |
| 50 | 50 | @GetMapping("/companyCascader") |
| 51 | - public AjaxResult companyCascader(@RequestParam(value = "fiscalYear", required = true) Long fiscalYear) { | |
| 51 | + public AjaxResult companyCascader(Long fiscalYear) { | |
| 52 | 52 | McBasicCmtyVo mcBasicCmtyVo = new McBasicCmtyVo(); |
| 53 | 53 | mcBasicCmtyVo.setDefFlag("0"); |
| 54 | 54 | mcBasicCmtyVo.setFiscalYear(fiscalYear); | ... | ... |
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McVisitMapper.java
| ... | ... | @@ -73,4 +73,12 @@ public interface McVisitMapper |
| 73 | 73 | * @return |
| 74 | 74 | */ |
| 75 | 75 | List<SysUser> selectMcVisitStatusNodeUserList(@Param("id")String id,@Param("nodeType") String nodeType); |
| 76 | + | |
| 77 | + /** | |
| 78 | + * 条件验证 | |
| 79 | + * @param mcVisit | |
| 80 | + * @return | |
| 81 | + */ | |
| 82 | + List<McVisit> selectMcVisitByData(McVisit mcVisit); | |
| 83 | + | |
| 76 | 84 | } | ... | ... |
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java
| ... | ... | @@ -7,6 +7,7 @@ import com.chinagas.common.core.utils.DateUtils; |
| 7 | 7 | import com.chinagas.common.core.utils.StringUtils; |
| 8 | 8 | import com.chinagas.common.datascope.annotation.DataScope; |
| 9 | 9 | import com.chinagas.common.security.utils.SecurityUtils; |
| 10 | +import com.chinagas.modules.schsf.domain.McIgnition; | |
| 10 | 11 | import com.chinagas.modules.schsf.domain.McVisit; |
| 11 | 12 | import com.chinagas.modules.schsf.domain.McVisitStatusNodeInfo; |
| 12 | 13 | import com.chinagas.modules.schsf.domain.vo.McVisitAuditVo; |
| ... | ... | @@ -148,6 +149,41 @@ public class McVisitServiceImpl implements IMcVisitService { |
| 148 | 149 | //工单类型 |
| 149 | 150 | mcVisit.setTicketType(getTicketType(mcVisit.getIsCharged(), mcVisit.getIsVisited())); |
| 150 | 151 | getStatusNodeInfo(mcVisit, VisitlsEventEnums.PUBLISH); |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | +// McIgnition mcIgnition = new McIgnition(); | |
| 157 | +// mcIgnition.setRegionName(mcVisit.getRegionName()); | |
| 158 | +// mcIgnition.setGroupName(mcVisit.getGroupName()); | |
| 159 | +// mcIgnition.setCompanyCode(mcVisit.getCompanyCode()); | |
| 160 | +// mcIgnition.setCompanyName(mcVisit.getCompanyName()); | |
| 161 | +// | |
| 162 | +// mcIgnition.setUserProvince(mcVisit.getUserProvince()); | |
| 163 | +// mcIgnition.setUserCity(mcVisit.getUserCity()); | |
| 164 | +// mcIgnition.setUserDistrict(mcVisit.getUserDistrict()); | |
| 165 | +// mcIgnition.setUserStreet(mcVisit.getUserStreet()); | |
| 166 | +// mcIgnition.setVlgOrCmty(mcVisit.getVlgOrCmty()); | |
| 167 | +// mcIgnition.setUserName(mcVisit.getUserName()); | |
| 168 | +// mcIgnition.setUserPhone(mcVisit.getUserPhone()); | |
| 169 | + if (mcVisit.getIsCharged().equals(YesNoEnums.Y.getName())){ | |
| 170 | + McVisit mcVisit2=new McVisit(); | |
| 171 | + mcVisit2.setRegionName(mcVisit.getRegionName()); | |
| 172 | + mcVisit2.setGroupName(mcVisit.getGroupName()); | |
| 173 | + mcVisit2.setCompanyCode(mcVisit.getCompanyCode()); | |
| 174 | + mcVisit2.setCompanyName(mcVisit.getCompanyName()); | |
| 175 | + mcVisit2.setUserProvince(mcVisit.getUserProvince()); | |
| 176 | + mcVisit2.setUserCity(mcVisit.getUserCity()); | |
| 177 | + mcVisit2.setUserDistrict(mcVisit.getUserDistrict()); | |
| 178 | + mcVisit2.setUserStreet(mcVisit.getUserStreet()); | |
| 179 | + mcVisit2.setVlgOrCmty(mcVisit.getVlgOrCmty()); | |
| 180 | + mcVisit2.setUserName(mcVisit.getUserName()); | |
| 181 | + mcVisit2.setUserPhone(mcVisit.getUserPhone()); | |
| 182 | + List<McVisit> data= mcVisitMapper.selectMcVisitByData(mcVisit2); | |
| 183 | + if (data!=null && data.size()>0){ | |
| 184 | + throw new RuntimeException("当前用户已全款收费，不可再发起收费"); | |
| 185 | + } | |
| 186 | + } | |
| 151 | 187 | int i = mcVisitMapper.insertMcVisit(mcVisit); |
| 152 | 188 | //1:添加记录 |
| 153 | 189 | // iMcOperationLogService.insertMcOperationLog("mc_visit", mcVisit.getId(), "项目公司_收费员", | ... | ... |
zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml
| ... | ... | @@ -457,4 +457,22 @@ |
| 457 | 457 | WHERE menu.perms=#{nodeType,jdbcType=VARCHAR} |
| 458 | 458 | and role.data_scope='5' |
| 459 | 459 | </select> |
| 460 | + | |
| 461 | + | |
| 462 | + <select id="selectMcVisitByData" parameterType="com.chinagas.modules.schsf.domain.McVisit" resultMap="McVisitResult"> | |
| 463 | + <include refid="selectMcVisitVo"/> | |
| 464 | + where 1=1 | |
| 465 | + and t.region_name = #{regionName} | |
| 466 | + and t.group_name = #{groupName} | |
| 467 | + and t.company_name = #{companyName} | |
| 468 | + and t.company_code = #{companyCode} | |
| 469 | + and t.user_province = #{userProvince} | |
| 470 | + and t.user_city = #{userCity} | |
| 471 | + and t.user_district = #{userDistrict} | |
| 472 | + and t.user_street = #{userStreet} | |
| 473 | + and t.vlg_or_cmty = #{vlgOrCmty} | |
| 474 | + and t.user_name = #{userName} | |
| 475 | + and t.user_phone = #{userPhone} | |
| 476 | + and t.charge_type='2' | |
| 477 | + </select> | |
| 460 | 478 | </mapper> | ... | ... |