liux
/
gs_sub_evaluate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

分包管理除法人姓名和分包商名称外，其他的不做必填

This commit is contained in:
liang.chao 2025-07-16 16:02:36 +08:00
parent 7bad0d8681
commit 0a8dd92f3c
2 changed files with 81 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/service/ViolationServiceImpl.java
View File

@ -5,6 +5,7 @@ import com.bonus.gs.sub.evaluate.manager.utils.RegularCheckUtils;
import com.bonus.gs.sub.evaluate.outsourceEnterprise.beans.ImportUserDataVo; import com.bonus.gs.sub.evaluate.outsourceEnterprise.beans.ImportUserDataVo;
import com.bonus.gs.sub.evaluate.outsourceEnterprise.beans.ViolationBean; import com.bonus.gs.sub.evaluate.outsourceEnterprise.beans.ViolationBean;
import com.bonus.gs.sub.evaluate.outsourceEnterprise.dao.ViolationDao; import com.bonus.gs.sub.evaluate.outsourceEnterprise.dao.ViolationDao;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -28,13 +29,20 @@ public class ViolationServiceImpl implements ViolationService {
@Override @Override
public AjaxRes addOutsourceEnterprise(ViolationBean o) { public AjaxRes addOutsourceEnterprise(ViolationBean o) {
AjaxRes ar = new AjaxRes(); AjaxRes ar = new AjaxRes();
if (!isValidChineseMobileNumber(o.getPhone()) || !isValidChineseMobileNumber(o.getPreSalesPhone())) { if (StringUtils.isNotBlank(o.getPhone())) {
ar.setFailMsg("手机号码格式不正确!"); if (!isValidChineseMobileNumber(o.getPhone())) {
return ar; ar.setFailMsg("法人手机号码格式不正确!");
return ar;
}
}
if ( StringUtils.isNotBlank(o.getPreSalesPhone())) {
if (!isValidChineseMobileNumber(o.getPreSalesPhone())) {
ar.setFailMsg("售前委托人手机号码不正确!");
return ar;
}
} }
ViolationBean selected = new ViolationBean(); ViolationBean selected = new ViolationBean();
selected.setIdCard(o.getIdCard()); selected.setIdCard(o.getIdCard());
int isAc = dao.getOutSourceNumById(selected); int isAc = dao.getOutSourceNumById(selected);
/*if(isAc>0){ /*if(isAc>0){
@ -50,19 +58,24 @@ public class ViolationServiceImpl implements ViolationService {
return ar; return ar;
} }
selected = new ViolationBean(); if (StringUtils.isNotBlank(o.getSocialCreditCode())) {
selected.setSocialCreditCode(o.getSocialCreditCode()); selected = new ViolationBean();
isAc = dao.getOutSourceNumById(selected); selected.setSocialCreditCode(o.getSocialCreditCode());
if (isAc > 0) { isAc = dao.getOutSourceNumById(selected);
ar.setFailMsg("统一社会信用代码已存在!"); if (isAc > 0) {
return ar; ar.setFailMsg("统一社会信用代码已存在!");
return ar;
}
} }
selected = new ViolationBean();
selected.setPhone(o.getPhone()); if (StringUtils.isNotBlank(o.getPhone())) {
isAc = dao.getOutSourceNumById(selected); selected = new ViolationBean();
if (isAc > 0) { selected.setPhone(o.getPhone());
ar.setFailMsg("手机号码已存在!"); isAc = dao.getOutSourceNumById(selected);
return ar; if (isAc > 0) {
ar.setFailMsg("手机号码已存在!");
return ar;
}
} }
int num = dao.addOutsourceEnterprise(o); int num = dao.addOutsourceEnterprise(o);
@ -96,9 +109,17 @@ public class ViolationServiceImpl implements ViolationService {
@Override @Override
public AjaxRes updateOutsourceEnterprise(ViolationBean o) { public AjaxRes updateOutsourceEnterprise(ViolationBean o) {
AjaxRes ar = new AjaxRes(); AjaxRes ar = new AjaxRes();
if (!isValidChineseMobileNumber(o.getPhone()) || !isValidChineseMobileNumber(o.getPreSalesPhone())) { if (StringUtils.isNotBlank(o.getPhone())) {
ar.setFailMsg("手机号码格式不正确!"); if (!isValidChineseMobileNumber(o.getPhone())) {
return ar; ar.setFailMsg("法人手机号码格式不正确!");
return ar;
}
}
if ( StringUtils.isNotBlank(o.getPreSalesPhone())) {
if (!isValidChineseMobileNumber(o.getPreSalesPhone())) {
ar.setFailMsg("售前委托人手机号码不正确!");
return ar;
}
} }
ViolationBean selected = new ViolationBean(); ViolationBean selected = new ViolationBean();
@ -119,21 +140,25 @@ public class ViolationServiceImpl implements ViolationService {
return ar; return ar;
} }
selected = new ViolationBean(); if (StringUtils.isNotBlank(o.getSocialCreditCode())) {
selected.setId(o.getId()); selected = new ViolationBean();
selected.setSocialCreditCode(o.getSocialCreditCode()); selected.setId(o.getId());
isAc = dao.getOutSourceNumById(selected); selected.setSocialCreditCode(o.getSocialCreditCode());
if (isAc > 0) { isAc = dao.getOutSourceNumById(selected);
ar.setFailMsg("统一社会信用代码已存在!"); if (isAc > 0) {
return ar; ar.setFailMsg("统一社会信用代码已存在!");
return ar;
}
} }
selected = new ViolationBean(); if (StringUtils.isNotBlank(o.getPhone())) {
selected.setId(o.getId()); selected = new ViolationBean();
selected.setPhone(o.getPhone()); selected.setId(o.getId());
isAc = dao.getOutSourceNumById(selected); selected.setPhone(o.getPhone());
if (isAc > 0) { isAc = dao.getOutSourceNumById(selected);
ar.setFailMsg("手机号码已存在!"); if (isAc > 0) {
return ar; ar.setFailMsg("手机号码已存在!");
return ar;
}
} }
int num = dao.updateOutsourceEnterprise(o); int num = dao.updateOutsourceEnterprise(o);
@ -173,9 +198,6 @@ public class ViolationServiceImpl implements ViolationService {
/** /**
* 导入数据校验 * 导入数据校验
* *
* @param socialCreditCode
* @param idCard
* @param phone
* @return * @return
*/ */
@Override @Override

42
src/main/resources/static/pages/evaluate/outsourceEnterprise/outsourceEnterpriseFrom.html
View File

@ -45,21 +45,21 @@
<label class="layui-form-label" style="width: 150px"><span style="color: red">*</span>企业名称：</label> <label class="layui-form-label" style="width: 150px"><span style="color: red">*</span>企业名称：</label>
<div class="layui-input-inline" style="width: 60%"> <div class="layui-input-inline" style="width: 60%">
<input type="text" lay-affix="clear" id="enterpriseName" name="enterpriseName" autocomplete="off" <input type="text" lay-affix="clear" id="enterpriseName" name="enterpriseName" autocomplete="off"
class="layui-input" lay-verify="required" maxlength="20"> lay-verify="required" class="layui-input" maxlength="20">
</div> </div>
</div> </div>
<div class="layui-inline" style="width: 50%"> <div class="layui-inline" style="width: 50%">
<label class="layui-form-label" style="width: 150px"><span style="color: red">*</span>统一社会信用代码：</label> <label class="layui-form-label" style="width: 150px"><span style="color: red"></span>统一社会信用代码：</label>
<div class="layui-input-inline" style="width: 60%"> <div class="layui-input-inline" style="width: 60%">
<input type="text" lay-affix="clear" id="socialCreditCode" name="socialCreditCode" <input type="text" lay-affix="clear" id="socialCreditCode" name="socialCreditCode"
autocomplete="off" class="layui-input" lay-verify="required" maxlength="30"> autocomplete="off" class="layui-input" maxlength="30">
</div> </div>
</div> </div>
<div class="layui-inline" style="width: 50%"> <div class="layui-inline" style="width: 50%">
<label class="layui-form-label" style="width: 150px"><span style="color: red">*</span>成立日期：</label> <label class="layui-form-label" style="width: 150px"><span style="color: red"></span>成立日期：</label>
<div class="layui-input-inline" style="width: 60%"> <div class="layui-input-inline" style="width: 60%">
<input type="text" lay-affix="clear" class="layui-input" id="setTime" name="setTime" <input type="text" lay-affix="clear" class="layui-input" id="setTime" name="setTime"
lay-verify="required" autocomplete="off" > autocomplete="off" >
</div> </div>
</div> </div>
<div class="layui-inline" style="width: 50%"> <div class="layui-inline" style="width: 50%">
@ -79,32 +79,32 @@
<!-- </div>--> <!-- </div>-->
<div class="layui-inline" style="width: 50%"> <div class="layui-inline" style="width: 50%">
<label class="layui-form-label" style="width: 150px"><span <label class="layui-form-label" style="width: 150px"><span
style="color: red">*</span>法人手机号码：</label> style="color: red"></span>法人手机号码：</label>
<div class="layui-input-inline" style="width: 60%"> <div class="layui-input-inline" style="width: 60%">
<input type="text" maxlength="11" lay-affix="clear" id="phone" name="phone" autocomplete="off" <input type="text" maxlength="11" lay-affix="clear" id="phone" name="phone" autocomplete="off"
class="layui-input" lay-verify="required|phone"> class="layui-input">
</div> </div>
</div> </div>
<div class="layui-inline" style="width: 50%"> <div class="layui-inline" style="width: 50%">
<label class="layui-form-label" style="width: 150px"><span style="color: red">*</span>单位地址：</label> <label class="layui-form-label" style="width: 150px"><span style="color: red"></span>单位地址：</label>
<div class="layui-input-inline" style="width: 60%"> <div class="layui-input-inline" style="width: 60%">
<input type="text" maxlength="30" lay-affix="clear" id="address" name="address" <input type="text" maxlength="30" lay-affix="clear" id="address" name="address"
autocomplete="off" class="layui-input" lay-verify="required"> autocomplete="off" class="layui-input" >
</div> </div>
</div> </div>
<div class="layui-inline" style="width: 50%"> <div class="layui-inline" style="width: 50%">
<label class="layui-form-label" style="width: 150px"><span style="color: red">*</span>售前委托人：</label> <label class="layui-form-label" style="width: 150px"><span style="color: red"></span>售前委托人：</label>
<div class="layui-input-inline" style="width: 60%"> <div class="layui-input-inline" style="width: 60%">
<input type="text" maxlength="10" lay-affix="clear" id="preSalesMan" name="preSalesMan" <input type="text" maxlength="10" lay-affix="clear" id="preSalesMan" name="preSalesMan"
autocomplete="off" class="layui-input" lay-verify="required"> autocomplete="off" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-inline" style="width: 50%"> <div class="layui-inline" style="width: 50%">
<label class="layui-form-label" style="width: 150px"><span style="color: red">*</span>售前委托人电话：</label> <label class="layui-form-label" style="width: 150px"><span style="color: red"></span>售前委托人电话：</label>
<div class="layui-input-inline" style="width: 60%"> <div class="layui-input-inline" style="width: 60%">
<input type="text" maxlength="11" lay-affix="clear" id="preSalesPhone" name="preSalesPhone" <input type="text" maxlength="11" lay-affix="clear" id="preSalesPhone" name="preSalesPhone"
autocomplete="off" class="layui-input" lay-verify="required"> autocomplete="off" class="layui-input">
</div> </div>
</div> </div>
</div> </div>
@ -191,13 +191,17 @@
// layer.msg("身份证号码格式不正确", {icon: 2, time: 2000}); // layer.msg("身份证号码格式不正确", {icon: 2, time: 2000});
// return false; // return false;
// } // }
if (!phone_reg($("#phone").val())) { if ($("#phone").val()){
layer.msg("法人手机号码格式不正确", {icon: 2, time: 2000}); if (!phone_reg($("#phone").val())) {
return false; layer.msg("法人手机号码格式不正确", {icon: 2, time: 2000});
return false;
}
} }
if (!phone_reg($("#preSalesPhone").val())) { if ($("#preSalesPhone").val()){
layer.msg("售前委托人手机号码格式不正确", {icon: 2, time: 2000}); if (!phone_reg($("#preSalesPhone").val())) {
return false; layer.msg("售前委托人手机号码格式不正确", {icon: 2, time: 2000});
return false;
}
} }
checkLoginNameIsExist($("#enterpriseName").val(),data); checkLoginNameIsExist($("#enterpriseName").val(),data);
return false; return false;