diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java index 74e4bee..78ece48 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java @@ -1,5 +1,10 @@ package com.glxp.api.controller.purchase; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.extra.pinyin.PinyinUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; @@ -8,36 +13,47 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.dao.basic.BasicCorpDao; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.auth.AuthRoleAdmin; import com.glxp.api.entity.auth.CustomerInfoEntity; -import com.glxp.api.entity.purchase.SupCertEntity; -import com.glxp.api.entity.purchase.SupCompanyEntity; -import com.glxp.api.entity.purchase.SupManufacturerEntity; -import com.glxp.api.entity.purchase.SupProductEntity; -import com.glxp.api.req.purchase.FilterImageRequest; +import com.glxp.api.entity.basic.BasicCorpEntity; +import com.glxp.api.entity.purchase.*; +import com.glxp.api.exception.JsonException; +import com.glxp.api.req.purchase.FilterCertSetsRequest; import com.glxp.api.req.purchase.FilterSupCertRequest; import com.glxp.api.req.purchase.FilterSupCompanyRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.purchase.SupProductResponse; +import com.glxp.api.service.auth.AuthAdminService; +import com.glxp.api.service.auth.AuthRoleAdminService; import com.glxp.api.service.auth.CustomerInfoService; -import com.glxp.api.service.purchase.SupCertService; -import com.glxp.api.service.purchase.SupCompanyService; -import com.glxp.api.service.purchase.SupManufacturerService; -import com.glxp.api.service.purchase.SupProductService; -import com.glxp.api.service.system.CompanyService; +import com.glxp.api.service.basic.BasicCorpService; +import com.glxp.api.service.purchase.*; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import javax.servlet.http.HttpServletRequest; +import java.util.*; @RestController public class SupCompanyController { + @Resource + BasicCorpDao basicCorpDao; + @Resource + private CustomerContactService customerContactService; + @Resource + AuthRoleAdminService authRoleAdminService; + @Resource + private AuthAdminService authAdminService; + @Resource + SupCertSetService supCertSetService; @Resource SupProductService supProductService; @Resource @@ -50,6 +66,8 @@ public class SupCompanyController { private SupCompanyService companyService; @Resource CustomerInfoService customerInfoService; + @Resource + BasicCorpService basicCorpService; @AuthRuleAnnotation("") @GetMapping("/api/pur/getSupComapnys") public BaseResponse getSupComapnys(FilterSupCompanyRequest companyRequest) { @@ -68,6 +86,11 @@ public class SupCompanyController { return ResultVOUtils.success(customerInfoEntity); } + @AuthRuleAnnotation("") + @PostMapping("/api/pur/auditCompany") + @Log(title = "资质证书", businessType = BusinessType.UPDATE) + public BaseResponse auditCompany(@RequestBody SupCompanyEntity companyEntity) { + // @AuthRuleAnnotation("") // @GetMapping("/sup/company/cert/filter") @@ -117,7 +140,121 @@ public class SupCompanyController { // return ResultVOUtils.success("成功"); // } + if (companyEntity.getAuditStatus() == 1) { + //查询用户上传的证书 + FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); + filterSupCertRequest.setCustomerId(companyEntity.getCustomerId()); + filterSupCertRequest.setType(ConstantStatus.CERT_COMPANY); + List supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest); + + //查询用户该上传的证书 + FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest(); + filterCertSetsRequest.setType(ConstantStatus.CERT_COMPANY); + filterCertSetsRequest.setNeed(1); + List supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest); + //验证 + ListIterator iterable1 = supCertSetEntities.listIterator(); + while (iterable1.hasNext()) { + SupCertSetEntity supCertSetEntity = iterable1.next(); + if (supCertSetEntity.isNeed()) { + for (SupCertEntity supCertEntity : supCertEntityList) { + if (supCertEntity.getName().equals(supCertSetEntity.getName())) { + if (StrUtil.isNotEmpty(supCertEntity.getFilePath())) { + iterable1.remove(); + break; + } + } + } + } + } + String errMsg = ""; + if (supCertSetEntities.size() > 0) { + return ResultVOUtils.error(500, "必传证书不齐全！"); + } + } + String msg = ""; + //查询是否包含审核未通过的证书 + if (companyEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS + || companyEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS) { + FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); + filterSupCertRequest.setAuditStatus(24); + filterSupCertRequest.setCustomerId(companyEntity.getCustomerId()); + filterSupCertRequest.setType(ConstantStatus.CERT_COMPANY); + List supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest); + if (CollUtil.isNotEmpty(supCertEntityList)) { + for (SupCertEntity supCertEntity : supCertEntityList) { + msg += supCertEntity.getName() + ","; + } + return ResultVOUtils.error(500, "审核失败,还有必须提交证书未确认(" + msg.substring(0, msg.length() - 1) + ")"); + } + } + + //修改用户角色 + if (companyEntity.getRoleId() != null) { + CustomerInfoEntity customerInfoEntity = customerInfoService.findByCustomerId(companyEntity.getCustomerId()); + customerInfoEntity.setCustomerId(Long.valueOf(companyEntity.getCustomerId())); + customerInfoEntity.setRoleId(companyEntity.getRoleId()); + customerInfoEntity.setCompanyName(companyEntity.getCompanyName()); + customerInfoEntity.setCustomerName(companyEntity.getCompanyName()); + customerInfoService.updateCustomerInfo(customerInfoEntity); + //获取该供应商下面的用户 + List authAdmin = authAdminService.findByCustomerld(companyEntity.getCustomerId()); + for (AuthAdmin obj : authAdmin) { + AuthRoleAdmin authRoleAdmin = new AuthRoleAdmin(); + authRoleAdmin.setUser_id(obj.getId()); + authRoleAdmin.setRole_id(Long.valueOf(companyEntity.getRoleId())); + authRoleAdminService.updateAuthRoleAdmin(authRoleAdmin); + } + } + + + AuthAdmin authAdmin = getUser(); + companyEntity.setAuditor(authAdmin.getId() + ""); + companyEntity.setAuditTime(new Date()); + companyEntity.setUpdateTime(new Date()); + if (companyEntity.getAuditComment() == null) { + companyEntity.setAuditComment(""); + } + boolean b = companyService.modifyCompany(companyEntity); + CustomerContactEntity customerContactEntity = new CustomerContactEntity(); + customerContactEntity.setTel(companyEntity.getTel()); + customerContactEntity.setMobile(companyEntity.getMobile()); + customerContactEntity.setEmail(companyEntity.getEmail()); + customerContactEntity.setContacts(companyEntity.getContacts()); + customerContactEntity.setCustomerId(companyEntity.getCustomerId()); + customerContactService.updateCustomerContact(customerContactEntity); + + BasicCorpEntity basicCorpEntity = new BasicCorpEntity(); + basicCorpEntity.setErpId(companyEntity.getCustomerId()); + basicCorpEntity.setName(companyEntity.getCompanyName()); + basicCorpEntity.setSpell(PinyinUtil.getFirstLetter(companyEntity.getCompanyName(), "")); + basicCorpEntity.setAddr(companyEntity.getArea() + companyEntity.getDetailAddr()); + basicCorpEntity.setCreditNo(companyEntity.getCreditNum()); + basicCorpEntity.setContact(companyEntity.getContacts()); + basicCorpEntity.setMobile(companyEntity.getMobile()); + basicCorpEntity.setCorpType(ConstantStatus.CORP_SP); + basicCorpEntity.setUpdateTime(new Date()); + if (!basicCorpDao.exists(new QueryWrapper().eq("erpId", companyEntity.getCustomerId()))) { + basicCorpEntity.setId(IdUtil.getSnowflakeNextId()); + basicCorpService.insert(basicCorpEntity); + }else { + } + + + return ResultVOUtils.success("修改成功"); + } + + public AuthAdmin getUser() { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + HttpServletRequest request = attributes.getRequest(); + String userId = request.getHeader("ADMIN_ID"); + AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); + return authAdmin; + } } diff --git a/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java b/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java index e496b29..6e29eb7 100644 --- a/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java +++ b/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java @@ -20,6 +20,7 @@ public interface AuthAdminDao extends BaseMapperPlus findByCustomerld(String CustomerId); /** * 根据id查询 * diff --git a/src/main/java/com/glxp/api/dao/auth/AuthRoleAdminDao.java b/src/main/java/com/glxp/api/dao/auth/AuthRoleAdminDao.java new file mode 100644 index 0000000..bdb75d9 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/auth/AuthRoleAdminDao.java @@ -0,0 +1,58 @@ +package com.glxp.api.dao.auth; + + +import com.glxp.api.entity.auth.AuthRoleAdmin; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + + +@Mapper +public interface AuthRoleAdminDao { + +// /** +// * 根据 adminId 查询 +// * +// * @param adminId 传入的 adminId +// * @return +// */ +// List listByAdminId(Long adminId); +// +// /** +// * 根据 多个 adminId 查询 +// * +// * @param adminIds 传入的 adminIds +// * @return +// */ +// List listByAdminIdIn(List adminIds); +// +// /** +// * 根据 role_id 查询 admin_id +// * +// * @param roleId 传入的 roleId +// * @return +// */ +// List listByRoleId(Long roleId); +// +// /** +// * 批量插入 +// * +// * @param authRoleAdminList +// * @return +// */ +// int insertAuthRoleAdminAll(List authRoleAdminList); +// +// +// /** +// * 根据 adminId 删除 +// * +// * @param adminId +// * @return +// */ +// boolean deleteByAdminId(Long adminId); + + boolean updateAuthRoleAdmin(AuthRoleAdmin authRoleAdmin); + +// +// List listAdminRole(Long adminId); +} diff --git a/src/main/java/com/glxp/api/dao/auth/CustomerInfoDao.java b/src/main/java/com/glxp/api/dao/auth/CustomerInfoDao.java index 7f30363..88fdfa1 100644 --- a/src/main/java/com/glxp/api/dao/auth/CustomerInfoDao.java +++ b/src/main/java/com/glxp/api/dao/auth/CustomerInfoDao.java @@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Mapper; public interface CustomerInfoDao { + boolean updateCustomerInfo(CustomerInfoEntity customerInfoEntity); CustomerInfoEntity selectById(String customerId); diff --git a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java new file mode 100644 index 0000000..1ef7ce2 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java @@ -0,0 +1,67 @@ +package com.glxp.api.dao.basic; + + +import com.glxp.api.dao.BaseMapperPlus; +import com.glxp.api.entity.basic.BasicCorpEntity; +import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; + +import com.glxp.api.res.thrsys.ThrUnitMaintainResponse; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface BasicCorpDao extends BaseMapperPlus { + List filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); + + boolean insertBasicUnitMaintain(BasicCorpEntity basicUnitMaintainEntity); + + boolean insertThrUnitMaintainignore(ThrUnitMaintainResponse thrUnitMaintainResponse); + + int insertEntity(BasicCorpEntity basicUnitMaintainEntity); + + int updateEntityById(BasicCorpEntity basicUnitMaintainSaveRequest); + + BasicCorpEntity selectByThirdId(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); + + boolean deleteById(@Param("id") String id); + + BasicCorpEntity selectEntityById(@Param("id") String id); + + List batchSelectByIds(@Param("ids") List id); + + List batchSelectByErpIds(@Param("erpIds") List erpIds); + + BasicCorpEntity selectByName(@Param("name") String name); + + + boolean importBasicUnitMaintain(BasicCorpEntity basicUnitMaintainEntity); + + List batchSelectByErpIdsAndName(@Param("erpIds") List erpIds, @Param("name") String name); + + /** + * 根据往来单位名称和社会信用号查询列表 + * + * @param name + * @param creditNo + * @return + */ + List selectByNameAndCreditNo(@Param("name") String name, @Param("creditNo") String creditNo); + + /** + * 根据erpId查询往来单位信息 + * + * @param erpId + * @return + */ + BasicCorpEntity selectByErpId(@Param("erpId") String erpId); + + /** + * 根据erpId查询往来单位名称 + * + * @param supId + * @return + */ + String selectNameByErpId(@Param("supId") String supId); +} diff --git a/src/main/java/com/glxp/api/entity/auth/AuthRoleAdmin.java b/src/main/java/com/glxp/api/entity/auth/AuthRoleAdmin.java new file mode 100644 index 0000000..c8453e1 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/auth/AuthRoleAdmin.java @@ -0,0 +1,13 @@ +package com.glxp.api.entity.auth; + +import lombok.Data; + +/** + * 用户角色对应表 + */ +@Data +public class AuthRoleAdmin { + private Long role_id; + private Long user_id; + +} diff --git a/src/main/java/com/glxp/api/res/thrsys/ThrUnitMaintainResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrUnitMaintainResponse.java new file mode 100644 index 0000000..92a74d7 --- /dev/null +++ b/src/main/java/com/glxp/api/res/thrsys/ThrUnitMaintainResponse.java @@ -0,0 +1,47 @@ +package com.glxp.api.res.thrsys; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.Date; + +@Data +public class ThrUnitMaintainResponse { + + private Integer id; + private String erpId; + + @NotBlank(message = "往来单位名称不能为空！") + private String name; + private String spell; + private String addr; + private String status; + private String type; + + @NotBlank(message = "社会信用号不能为空！") + private String creditNo; + private String contact; + private String mobile; + + private String thirdId; + private String thirdId1; + private String thirdId2; + private String thirdId3; + private String thirdId4; + + private String thirdName; + private String thirdName1; + private String thirdName2; + private String thirdName3; + private String thirdName4; + + private String createUser; + private Date createTime; + private String updateUser; + private Date updateTime; + private String remark; + private Integer corpType; + + private Integer outType; + +} diff --git a/src/main/java/com/glxp/api/service/auth/AuthAdminService.java b/src/main/java/com/glxp/api/service/auth/AuthAdminService.java index 9ecd12e..0c77b14 100644 --- a/src/main/java/com/glxp/api/service/auth/AuthAdminService.java +++ b/src/main/java/com/glxp/api/service/auth/AuthAdminService.java @@ -10,6 +10,8 @@ import java.util.List; public interface AuthAdminService extends IService { + List findByCustomerld(String customerld); + List listAdminPage(FilterAuthUserRequest filterAuthUserRequest); AuthAdmin findByUserName(String userName); diff --git a/src/main/java/com/glxp/api/service/auth/AuthRoleAdminService.java b/src/main/java/com/glxp/api/service/auth/AuthRoleAdminService.java new file mode 100644 index 0000000..b763871 --- /dev/null +++ b/src/main/java/com/glxp/api/service/auth/AuthRoleAdminService.java @@ -0,0 +1,24 @@ +package com.glxp.api.service.auth; + + +import com.glxp.api.entity.auth.AuthRoleAdmin; + +import java.util.List; + +public interface AuthRoleAdminService { + +// List listByAdminId(Long adminId); +// +// List listByAdminIdIn(List adminIds); +// +// List listByRoleId(Long roleId); +// +// int insertAuthRoleAdminAll(List authRoleAdminList); +// +// int insertRolesAdminIdAll(List roles, Long adminId); +// +// boolean deleteByAdminId(Long adminId); + boolean updateAuthRoleAdmin(AuthRoleAdmin authRoleAdmin); + +// List listAdminRole(Long adminId); +} diff --git a/src/main/java/com/glxp/api/service/auth/CustomerInfoService.java b/src/main/java/com/glxp/api/service/auth/CustomerInfoService.java index 949d85f..0fd5c94 100644 --- a/src/main/java/com/glxp/api/service/auth/CustomerInfoService.java +++ b/src/main/java/com/glxp/api/service/auth/CustomerInfoService.java @@ -6,8 +6,15 @@ import com.glxp.api.entity.auth.CustomerInfoEntity; public interface CustomerInfoService { - + boolean updateCustomerInfo(CustomerInfoEntity customerInfoEntity); CustomerInfoEntity selectById(String customerId); + /** + * 根据客户ID查询客户信息 + * + * @param customerId + * @return + */ + CustomerInfoEntity findByCustomerId(String customerId); } diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java index 14057b6..65d3207 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java @@ -44,7 +44,10 @@ public class AuthAdminServiceImpl extends ServiceImpl i return authAdminDao.listAdminPage(filterAuthUserRequest); } - + @Override + public List findByCustomerld(String customerld) { + return authAdminDao.findByCustomerld(customerld); + } @Override public AuthAdmin findByUserName(String userName) { return authAdminDao.findByUserName(userName); diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthRoleAdminServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthRoleAdminServiceImpl.java new file mode 100644 index 0000000..33d9703 --- /dev/null +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthRoleAdminServiceImpl.java @@ -0,0 +1,122 @@ +package com.glxp.api.service.auth.impl; + +import com.glxp.api.dao.auth.AuthRoleAdminDao; + +import com.glxp.api.entity.auth.AuthRoleAdmin; +import com.glxp.api.service.auth.AuthRoleAdminService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +@Service +@Transactional(rollbackFor = Exception.class) +public class AuthRoleAdminServiceImpl implements AuthRoleAdminService { + + @Resource + private AuthRoleAdminDao authRoleAdminDao; + +// /** +// * 根据 adminid 获取角色id +// * +// * @param adminId +// * @return +// */ +// @Override +// public List listByAdminId(Long adminId) { +// return authRoleAdminDao.listByAdminId(adminId); +// } +// +// /** +// * 根据多个 adminId 查询角色列表 +// * +// * @param adminIds +// * @return +// */ +// @Override +// public List listByAdminIdIn(List adminIds) { +// if (adminIds.isEmpty()) { +// return Collections.emptyList(); +// } +// return authRoleAdminDao.listByAdminIdIn(adminIds); +// } +// +// /** +// * 根据 roleId 获取 管理员id +// * +// * @param roleId +// * @return +// */ +// @Override +// public List listByRoleId(Long roleId) { +// return authRoleAdminDao.listByRoleId(roleId); +// } +// +// /** +// * 批量插入 +// * +// * @param authRoleAdminList +// * @return +// */ +// @Override +// public int insertAuthRoleAdminAll(List authRoleAdminList) { +// +// if (authRoleAdminList == null || authRoleAdminList.isEmpty()) { +// return 0; +// } +// +// return authRoleAdminDao.insertAuthRoleAdminAll(authRoleAdminList); +// } +// +// /** +// * 根据 角色ids 和 管理员 adminId 批量插入 +// * +// * @param roles +// * @param adminId +// * @return +// */ +// @Override +// public int insertRolesAdminIdAll(List roles, Long adminId) { +// +// List authRoleAdminList = roles.stream().map(aLong -> { +// AuthRoleAdmin authRoleAdmin = new AuthRoleAdmin(); +// authRoleAdmin.setRole_id(aLong); +// authRoleAdmin.setUser_id(adminId); +// return authRoleAdmin; +// }).collect(Collectors.toList()); +// if (!authRoleAdminList.isEmpty()) { +// return insertAuthRoleAdminAll(authRoleAdminList); +// } +// +// return 0; +// } +// +// /** +// * 根据 adminId 删除对应的权限 +// * +// * @param adminId +// * @return +// */ +// @Override +// public boolean deleteByAdminId(Long adminId) { +// +//// // 删除之前缓存权限规则 +//// String aarKey = String.format(CacheConstant.ADMIN_AUTH_RULES, adminId); +//// CacheUtils.delete(aarKey); +// +// return authRoleAdminDao.deleteByAdminId(adminId); +// } + + @Override + public boolean updateAuthRoleAdmin(AuthRoleAdmin authRoleAdmin) { + return authRoleAdminDao.updateAuthRoleAdmin(authRoleAdmin); + } + +// @Override +// public List listAdminRole(Long adminId) { +// return authRoleAdminDao.listAdminRole(adminId); +// } +} diff --git a/src/main/java/com/glxp/api/service/auth/impl/CustomerInfoServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/CustomerInfoServiceImpl.java index 4268549..c020ffc 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/CustomerInfoServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/CustomerInfoServiceImpl.java @@ -20,10 +20,17 @@ public class CustomerInfoServiceImpl implements CustomerInfoService { @Resource private CustomerInfoDao customerInfoDao; - + @Override + public boolean updateCustomerInfo(CustomerInfoEntity customerInfoEntity) { + return customerInfoDao.updateCustomerInfo(customerInfoEntity); + } @Override public CustomerInfoEntity selectById(String customerId) { return customerInfoDao.selectById(customerId); } + @Override + public CustomerInfoEntity findByCustomerId(String customerId) { + return customerInfoDao.selectById(customerId); + } } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java new file mode 100644 index 0000000..3056743 --- /dev/null +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java @@ -0,0 +1,153 @@ +package com.glxp.api.service.basic.impl; + +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.basic.BasicCorpDao; +import com.glxp.api.entity.basic.BasicCorpEntity; +import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.res.thrsys.ThrUnitMaintainResponse; +import com.glxp.api.service.basic.BasicCorpService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.Objects; + +@Service +@Transactional(rollbackFor = Exception.class) +public class BasicCorpServiceImpl extends ServiceImpl implements BasicCorpService { + + @Resource + BasicCorpDao basicCorpDao; + + @Override + public List filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest) { + if (basicUnitMaintainFilterRequest == null) { + return Collections.emptyList(); + } + if (basicUnitMaintainFilterRequest.getPage() != null) { + int offset = (basicUnitMaintainFilterRequest.getPage() - 1) * basicUnitMaintainFilterRequest.getLimit(); + PageHelper.offsetPage(offset, basicUnitMaintainFilterRequest.getLimit()); + } + + List data = basicCorpDao.filterList(basicUnitMaintainFilterRequest); + return data; + } + +// @Override +// public boolean insertThrUnitMaintainignore(ThrUnitMaintainResponse thrUnitMaintainResponse) { +// thrUnitMaintainResponse.setUpdateTime(new Date()); +// return basicCorpDao.insertThrUnitMaintainignore(thrUnitMaintainResponse); +// } + + @Override + public boolean insertBasicUnitMaintain(BasicCorpEntity basicUnitMaintainEntity) { + return basicCorpDao.insertBasicUnitMaintain(basicUnitMaintainEntity); + } + + @Override + public boolean insert(BasicCorpEntity basicUnitMaintainEntity) { + return basicCorpDao.insert(basicUnitMaintainEntity) == 0 ? false : true; + } + + @Override + public boolean updateById(BasicCorpEntity basicUnitMaintainSaveRequest) { + basicUnitMaintainSaveRequest.setUpdateTime(new Date()); + return basicCorpDao.updateEntityById(basicUnitMaintainSaveRequest) == 0 ? false : true; + } + + @Override + public boolean deleteById(String id) { + return basicCorpDao.deleteById(id); + } + + @Override + public BasicCorpEntity selectByThirdId(String thirdId, String thirdSys) { + + + BasicUnitMaintainFilterRequest filterUdiInfoRequest = new BasicUnitMaintainFilterRequest(); + if ("thirdId".equals(thirdSys)) { + filterUdiInfoRequest.setThirdId(thirdId); + } else if ("thirdId1".equals(thirdSys)) { + filterUdiInfoRequest.setThirdId1(thirdId); + } else if ("thirdId2".equals(thirdSys)) { + filterUdiInfoRequest.setThirdId2(thirdId); + } else if ("thirdId3".equals(thirdSys)) { + filterUdiInfoRequest.setThirdId3(thirdId); + } else if ("thirdId4".equals(thirdSys)) { + filterUdiInfoRequest.setThirdId4(thirdId); + } + return basicCorpDao.selectByThirdId(filterUdiInfoRequest); + } + + @Override + public List batchSelectByIds(List ids) { + return basicCorpDao.batchSelectByIds(ids); + } + + @Override + public List batchSelectByErpIds(List erpIds) { + return basicCorpDao.batchSelectByErpIds(erpIds); + } + + @Override + public List batchSelectByErpIdsAndName(List erpIds, String name) { + return basicCorpDao.batchSelectByErpIdsAndName(erpIds, name); + } + + @Override + public boolean verifyExists(BasicCorpEntity basicCorpEntity) { + List list = basicCorpDao.selectByNameAndCreditNo(basicCorpEntity.getName(), basicCorpEntity.getCreditNo()); + if (CollUtil.isNotEmpty(list)) { + if (null != basicCorpEntity.getId()) { + for (BasicCorpEntity corpEntity : list) { + if (!Objects.equals(corpEntity.getId(), basicCorpEntity.getId())) { + return true; + } + } + } else { + return true; + } + } + return false; + } + + @Override + public BasicCorpEntity selectById(String id) { + return basicCorpDao.selectEntityById(id); + } + + @Override + public BasicCorpEntity selectByErpId(String id) { + if (id == null) { + return null; + } + BasicUnitMaintainFilterRequest filterUdiInfoRequest = new BasicUnitMaintainFilterRequest(); + filterUdiInfoRequest.setErpId(id); + List basicUnitMaintainEntities = basicCorpDao.filterList(filterUdiInfoRequest); + if (basicUnitMaintainEntities != null && basicUnitMaintainEntities.size() > 0) + return basicUnitMaintainEntities.get(0); + return null; + } + + @Override + public BasicCorpEntity selectByName(String name) { + return basicCorpDao.selectByName(name); + } + + @Override + public boolean isExit() { + BasicUnitMaintainFilterRequest filterUdiInfoRequest = new BasicUnitMaintainFilterRequest(); + filterUdiInfoRequest.setPage(1); + filterUdiInfoRequest.setLimit(1); + List data = filterList(filterUdiInfoRequest); + if (data != null && data.size() > 0) { + return true; + } + return false; + } +} diff --git a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml index 43d2815..dc62167 100644 --- a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml +++ b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -234,4 +234,13 @@ + + + diff --git a/src/main/resources/mybatis/mapper/auth/AuthRoleAdminDao.xml b/src/main/resources/mybatis/mapper/auth/AuthRoleAdminDao.xml new file mode 100644 index 0000000..7199837 --- /dev/null +++ b/src/main/resources/mybatis/mapper/auth/AuthRoleAdminDao.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UPDATE auth_user_role + + + role_id=#{role_id}, + + + WHERE user_id = #{user_id} + + diff --git a/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml b/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml index c019057..15ad9b0 100644 --- a/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml +++ b/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml @@ -12,6 +12,22 @@ - + + UPDATE customer_info + + customerName=#{customerName}, + creditNum=#{creditNum}, + `area`=#{area}, + detailAddr=#{detailAddr}, + `bussinessStatus`=#{bussinessStatus}, + userFlag=#{userFlag}, + isInfoLink=#{isInfoLink}, + infoLink=#{infoLink}, + roleId=#{roleId}, + userMax=#{userMax}, + companyName=#{companyName}, + + WHERE customerId=#{customerId} + diff --git a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml new file mode 100644 index 0000000..00cd539 --- /dev/null +++ b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml @@ -0,0 +1,318 @@ + + + + + + + + + + REPLACE + INTO basic_corp + (thirdId,erpId,name,spell, + addr,status,type,creditNo,contact,mobile,thirdId1,thirdId2,thirdId3,thirdId4, + thirdName,thirdName1,thirdName2,thirdName3,thirdName4,updateTime,corpType,outType,createUser,createTime,updateUser,remark) + values + ( + #{thirdId}, + #{erpId}, + #{name}, + #{spell}, + #{addr}, + #{status}, + #{type}, + #{creditNo}, + #{contact}, + #{mobile}, + #{thirdId1}, + #{thirdId2}, + #{thirdId3}, + #{thirdId4}, + #{thirdName}, + #{thirdName1}, + #{thirdName2}, + #{thirdName3}, + #{thirdName4}, + #{updateTime}, + #{corpType}, + #{outType}, + #{createUser}, + #{createTime}, + #{updateUser}, + #{remark} + ) + + + + insert + ignore + INTO basic_corp + (thirdId,erpId,name,spell, + addr,status,type,creditNo,contact,mobile,thirdId1,thirdId2,thirdId3,thirdId4, + thirdName,thirdName1,thirdName2,thirdName3,thirdName4,updateTime,corpType,outType,createUser,createTime,updateUser,remark) + values + ( + #{thirdId}, + #{erpId}, + #{name}, + #{spell}, + #{addr}, + #{status}, + #{type}, + #{creditNo}, + #{contact}, + #{mobile}, + #{thirdId1}, + #{thirdId2}, + #{thirdId3}, + #{thirdId4}, + #{thirdName}, + #{thirdName1}, + #{thirdName2}, + #{thirdName3}, + #{thirdName4}, + #{updateTime}, + #{corpType}, + #{outType}, + #{createUser}, + #{createTime}, + #{updateUser}, + #{remark} + ) + + + + insert INTO basic_corp(thirdId, erpId, name, spell, addr, + status, type, creditNo, contact, mobile, thirdId1, thirdId2, thirdId3, thirdId4, + thirdName, thirdName1, thirdName2, thirdName3, thirdName4, updateTime, corpType, outType,createUser,createTime,updateUser,remark) + values (#{thirdId}, + #{erpId}, + #{name}, + #{spell}, + #{addr}, + #{status}, + #{type}, + #{creditNo}, + #{contact}, + #{mobile}, + #{thirdId1}, #{thirdId2}, #{thirdId3}, #{thirdId4}, + #{thirdName}, #{thirdName1}, #{thirdName2}, #{thirdName3}, #{thirdName4}, #{updateTime}, #{corpType}, + #{outType},#{createUser}, + #{createTime}, + #{updateUser}, + #{remark}) + + + + + UPDATE basic_corp + + thirdId=#{thirdId}, + erpId=#{erpId}, + name=#{name}, + spell=#{spell}, + addr=#{addr}, + status=#{status}, + type=#{type}, + creditNo=#{creditNo}, + contact=#{contact}, + mobile=#{mobile}, + thirdId1=#{thirdId1}, + thirdId2=#{thirdId2}, + thirdId3=#{thirdId3}, + thirdId4=#{thirdId4}, + thirdName=#{thirdName}, + thirdName1=#{thirdName1}, + thirdName2=#{thirdName2}, + thirdName3=#{thirdName3}, + thirdName4=#{thirdName4}, + updateTime=#{updateTime}, + corpType=#{corpType}, + outType=#{outType}, + createUser=#{createUser}, + createTime=#{createTime}, + updateUser=#{updateUser}, + remark=#{remark}, + + WHERE id=#{id} + + + + DELETE + FROM basic_corp + WHERE id = #{id} + + + + + + + + + + + + + + REPLACE + INTO basic_corp + ( thirdId, erpId, `name`, spell, + addr, status, `type`, creditNo, contact, mobile, thirdId1, thirdId2, thirdId3, thirdId4, + thirdName, thirdName1, thirdName2, thirdName3, thirdName4, updateTime, corpType,outType,createUser,createTime,updateUser,remark) + values ( + #{thirdId}, + #{erpId}, + #{name}, + #{spell}, + #{addr}, + #{status}, + #{type}, + #{creditNo}, + #{contact}, + #{mobile}, + #{thirdId1}, + #{thirdId2}, + #{thirdId3}, + #{thirdId4}, + #{thirdName}, + #{thirdName1}, + #{thirdName2}, + #{thirdName3}, + #{thirdName4}, + #{updateTime}, + #{corpType}, + #{outType}, + #{createUser}, + #{createTime}, + #{updateUser}, + #{remark} + ) + + + + + + + + + +