|
@@ -22,6 +22,7 @@ import com.tianhu.system.api.model.LoginUser;
|
|
|
import com.tianhu.system.domain.*;
|
|
|
import com.tianhu.system.mapper.SysProductMenuMapper;
|
|
|
import com.tianhu.system.service.*;
|
|
|
+import com.tianhu.system.utils.RegularUtil;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -553,6 +554,25 @@ public class OwnSysUserController extends BaseController
|
|
|
if(sqsList.size()==0){
|
|
|
throw new Exception("【请上传相应附件】");
|
|
|
}
|
|
|
+
|
|
|
+ //身份证人脸面
|
|
|
+ String face = CommonUtil.objToString(map.get("jsfzzList"));
|
|
|
+ if(CommonUtil.isEmpty(face)){
|
|
|
+ throw new Exception("【请上传身份证人像面】");
|
|
|
+ }
|
|
|
+ //身份证国徽面
|
|
|
+ String nationalEmblem = CommonUtil.objToString(map.get("jsfzfList"));
|
|
|
+ if(CommonUtil.isEmpty(nationalEmblem)){
|
|
|
+ throw new Exception("【请上传身份证国徽面】");
|
|
|
+ }
|
|
|
+ //获取身份证
|
|
|
+ String cardId = CommonUtil.objToString(map.get("card"));
|
|
|
+ if(CommonUtil.isEmpty(cardId)){
|
|
|
+ throw new Exception("【身份证号不能为空】");
|
|
|
+ }
|
|
|
+ if(!RegularUtil.cardId(cardId)){
|
|
|
+ throw new Exception("身份证号格式错误!");
|
|
|
+ }
|
|
|
//查询经办人
|
|
|
LambdaQueryWrapper<SysUserCompanyRel> sysUserCompanyRel = new LambdaQueryWrapper<>();
|
|
|
sysUserCompanyRel.eq(SysUserCompanyRel::getSucrUserId,use.getUserId());
|
|
@@ -573,6 +593,12 @@ public class OwnSysUserController extends BaseController
|
|
|
zcHandlerChange.setZhcStatus("00");
|
|
|
zcHandlerChange.setCreateBy(use.getUserId()+"");
|
|
|
zcHandlerChange.setCreateTime(DateUtils.getNowDate());
|
|
|
+ //身份证号
|
|
|
+ zcHandlerChange.setZhcCardNumber(cardId);
|
|
|
+ //人面像
|
|
|
+ zcHandlerChange.setZhcCardFile(face);
|
|
|
+ //国徽像
|
|
|
+ zcHandlerChange.setZhcCardBackFile(nationalEmblem);
|
|
|
zcHandlerChangeService.createZcHandlerChange(zcHandlerChange);
|
|
|
return AjaxResult.success();
|
|
|
}
|
|
@@ -629,13 +655,13 @@ public class OwnSysUserController extends BaseController
|
|
|
sysUserRole1.setUserId(Long.valueOf(CommonUtil.objToString(map.get("userId"))));
|
|
|
sysUserRoleService.insertSysUserRole(sysUserRole1);
|
|
|
//变更经办人状态
|
|
|
- SysUserCompanyRel sysUserCompanyRel2 =new SysUserCompanyRel();
|
|
|
+ /*SysUserCompanyRel sysUserCompanyRel2 =new SysUserCompanyRel();
|
|
|
sysUserCompanyRel2.setSucrHandler("1");
|
|
|
LambdaQueryWrapper<SysUserCompanyRel> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
|
|
|
lambdaQueryWrapper1.eq(SysUserCompanyRel::getSucrUserId,Long.valueOf(CommonUtil.objToString(map.get("userId"))));
|
|
|
lambdaQueryWrapper1.eq(SysUserCompanyRel::getSucrCompanyId,CommonUtil.objToString(map.get("scyId")));
|
|
|
lambdaQueryWrapper1.orderByAsc(SysUserCompanyRel::getCreateTime);
|
|
|
- sysUserCompanyRelService.update(sysUserCompanyRel2,lambdaQueryWrapper1);
|
|
|
+ sysUserCompanyRelService.update(sysUserCompanyRel2,lambdaQueryWrapper1);*/
|
|
|
//查询经办人
|
|
|
LambdaQueryWrapper<ZcHandlerChange> zchand = new LambdaQueryWrapper<>();
|
|
|
zchand.eq(ZcHandlerChange::getZhcToUserId,Long.valueOf(CommonUtil.objToString(map.get("userId"))));
|
|
@@ -652,6 +678,24 @@ public class OwnSysUserController extends BaseController
|
|
|
zcHandlerChanges.setUpdateBy(use.getUserId()+"");
|
|
|
zcHandlerChanges.setUpdateTime(DateUtils.getNowDate());
|
|
|
zcHandlerChangeService.updateZcHandlerChange(zcHandlerChanges);
|
|
|
+ //获取经办人信息
|
|
|
+ String handleId = handlerChanges.get(0).getZhcId();
|
|
|
+ ZcHandlerChange change = zcHandlerChangeService.getById(handleId);
|
|
|
+ LambdaQueryWrapper<SysUserCompanyRel> relLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ //公司编号
|
|
|
+ relLambdaQueryWrapper.eq(SysUserCompanyRel::getSucrCompanyId,change.getZhcCompanyId());
|
|
|
+ //人员编号
|
|
|
+ relLambdaQueryWrapper.eq(SysUserCompanyRel::getSucrUserId,change.getZhcUserId());
|
|
|
+ SysUserCompanyRel rel = new SysUserCompanyRel();
|
|
|
+ //身份证号
|
|
|
+ rel.setSucrCard(change.getZhcCardNumber());
|
|
|
+ //人脸面
|
|
|
+ rel.setSucrCardFile(change.getZhcCardFile());
|
|
|
+ //国徽面
|
|
|
+ rel.setSucrCardBackFile(change.getZhcCardBackFile());
|
|
|
+ //经办人
|
|
|
+ rel.setSucrHandler("1");
|
|
|
+ sysUserCompanyRelService.update(rel,relLambdaQueryWrapper);
|
|
|
return R.ok();
|
|
|
}
|
|
|
/**
|