添加工作组列表

jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java

@@ -32,7 +32,6 @@ import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -59,9 +58,9 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	/**
 	 * 分页列表查询
 	 * (管理端查询dataSource = 1的数据；报名查询全部的数据)
-	 * @param payCompanyManagement
-	 * @param pageNo
-	 * @param pageSize
+	 * @param payCompanyManagement 企业管理
+	 * @param pageNo 页数
+	 * @param pageSize 条数
 	 * @param req
 	 * @return
 	 */
@@ -96,7 +95,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	/**
 	 *   添加
 	 *
-	 * @param payCompanyManagement
+	 * @param payCompanyManagement 企业管理
 	 * @return
 	 */
 	@ApiOperation(value="企业管理-添加", notes="企业管理-添加")
@@ -143,7 +142,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	/**
 	 *  编辑
 	 *
-	 * @param payCompanyManagement
+	 * @param payCompanyManagement 企业管理
 	 * @return
 	 */
 	@ApiOperation(value="企业管理-编辑", notes="企业管理-编辑")
@@ -180,12 +179,12 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	/**
 	 *   通过id删除
 	 *
-	 * @param id
+	 * @param id 企业管理id
 	 * @return
 	 */
 	@ApiOperation(value="企业管理-通过id删除", notes="企业管理-通过id删除")
 	@GetMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+	public Result<?> delete(@RequestParam(name="id") String id) {
 		if(StringUtils.isBlank(id)){
 			return Result.error("id不能为空!");
 		}
@@ -196,12 +195,12 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	/**
 	 *  批量删除
 	 *
-	 * @param ids
+	 * @param ids 企业管理ids 逗号分隔
 	 * @return
 	 */
 	@ApiOperation(value="企业管理-批量删除", notes="企业管理-批量删除")
 	@GetMapping(value = "/deleteBatch")
-	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+	public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
 		if(StringUtils.isBlank(ids)){
 			return Result.error("id不能为空!");
 		}
@@ -223,7 +222,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	*/
 	@ApiOperation(value="企业管理-通过企业名称查询", notes="企业管理-通过企业名称查询")
 	@GetMapping(value = "/queryByCompanyName")
-	public Result<?> queryByCompanyName(@RequestParam(name="companyName",required=true) String companyName) {
+	public Result<?> queryByCompanyName(@RequestParam(name="companyName") String companyName) {
 		if(StringUtils.isBlank(companyName)){
 			return Result.error("企业名称不能为空！");
 		}else{
@@ -249,12 +248,12 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	/**
 	 * 通过id查询
 	 *
-	 * @param id
+	 * @param id 企业管理id
 	 * @return
 	 */
 	@ApiOperation(value="企业管理-通过id查询", notes="企业管理-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+	public Result<?> queryById(@RequestParam(name="id") String id) {
 		PayCompanyManagement payCompanyManagement = payCompanyManagementService.getById(id);
 		if(payCompanyManagement==null) {
 			return Result.error("未找到对应数据");
@@ -266,7 +265,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
     * 导出excel
     *
     * @param request
-    * @param payCompanyManagement
+    * @param payCompanyManagement 企业管理
     */
 	@ApiOperation(value="企业管理-导出excel", notes="企业管理-导出excel")
     @GetMapping(value = "/exportXls")
@@ -277,7 +276,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 
 		// Step.2 获取导出数据
 		List<PayCompanyManagement> pageList = payCompanyManagementService.list(queryWrapper);
-		List<PayCompanyManagement> exportList = null;
+		List<PayCompanyManagement> exportList;
 
 		// 过滤选中数据
 		String selections = request.getParameter("selections");
@@ -322,12 +321,11 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
       * 通过excel导入数据
     *
     * @param request
-    * @param response
     * @return
     */
 	@ApiOperation(value="企业管理-excel导入数据", notes="企业管理-excel导入数据")
     @PostMapping(value = "/importExcel")
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+    public Result<?> importExcel(HttpServletRequest request) {
 		MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
 		Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
 		for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {

jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java

@@ -30,7 +30,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecgframework.poi.excel.ExcelImportCheckUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -69,18 +68,16 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	/**
 	 * 分页列表查询
 	 *
-	 * @param payContactsManagement
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
+	 * @param payContactsManagement 联系人管理
+	 * @param pageNo 页数
+	 * @param pageSize 条数
 	 * @return
 	 */
 	@ApiOperation(value="联系人管理-分页列表查询", notes="联系人管理-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<?> queryPageList(PayContactsManagement payContactsManagement,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
 		if(!StringUtils.isBlank(payContactsManagement.getName()) && payContactsManagement.getName().length() > 20){
 			return Result.error("姓名长度不能大于20个字符！");
 		}
@@ -90,7 +87,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 		if(!StringUtils.isBlank(payContactsManagement.getPhone()) && payContactsManagement.getPhone().length() > 11){
 			return Result.error("手机号长度不能大于11个字符！");
 		}
-		Page<PayContactsManagement> page = new Page<PayContactsManagement>(pageNo, pageSize);
+		Page<PayContactsManagement> page = new Page<>(pageNo, pageSize);
 		IPage<PayContactsManagement> pageList = payContactsManagementService.queryPageList(page, payContactsManagement);
 		List<PayContactsManagement> listPayContactsManagement = pageList.getRecords();
 		if(!CollectionUtils.isEmpty(listPayContactsManagement)){
@@ -114,7 +111,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	/**
 	 *   添加
 	 *
-	 * @param payContactsManagement
+	 * @param payContactsManagement 联系人管理
 	 * @return
 	 */
 	@ApiOperation(value="联系人管理-添加", notes="联系人管理-添加")
@@ -129,29 +126,22 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 			return Result.error("企业不存在！");
 		}
 		payContactsManagement.setCompanyName(payCompanyManagement.getCompanyName());
-		PayContactsManagement payContactsManagementNew = null;
+		PayContactsManagement payContactsManagementNew;
 		try {
+			String phone = PasswordUtil.encrypt(payContactsManagement.getPhone());
 			// 新增联系人前在次校验手机号是否存在
 			LambdaQueryWrapper<PayContactsManagement> queryWrapper = new LambdaQueryWrapper<>();
-			queryWrapper.eq(PayContactsManagement::getPhone,payContactsManagement.getPhone());
+			queryWrapper.eq(PayContactsManagement::getPhone,phone);
 			payContactsManagementNew = payContactsManagementService.getOne(queryWrapper);
+			// 手机号存在，并且编辑id与查询不同，则校验不通过
+			if(!Objects.isNull(payContactsManagementNew)) {
+				return Result.error("手机号已存在！");
+			}
 		}catch (Exception e){
 			log.info("联系人管理-添加异常",e);
 			return Result.error("手机号已存在！");
 		}
 		// 存在数据
-		if(!Objects.isNull(payContactsManagementNew)){
-			// 如果是管理新增 && 已存在数据来源是报名，更新数据，变更来源为管理端
-			if(Objects.equals(payContactsManagement.getDataSource(), PayContactsManagementCommon.DATA_SOURCE1)
-					&& Objects.equals(payContactsManagementNew.getDataSource(),PayContactsManagementCommon.DATA_SOURCE2)){
-				payContactsManagement.setId(payContactsManagementNew.getId());
-				payContactsManagement.setDataSource(PayCompanyManagementCommon.DATA_SOURCE1);
-				payContactsManagement.setSigningUp(payContactsManagementNew.getSigningUp());
-				payContactsManagementService.updateById(payContactsManagement);
-				return Result.OK("添加成功！");
-			}
-			return Result.error("手机号已存在！");
-		}
 		try {
 			if (!StringUtils.isBlank(payContactsManagement.getPhone())){
 				payContactsManagement.setPhone(PasswordUtil.encrypt(payContactsManagement.getPhone()));
@@ -185,9 +175,10 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 		}
 		payContactsManagement.setCompanyName(payCompanyManagement.getCompanyName());
 		try {
+			String phone = PasswordUtil.encrypt(payContactsManagement.getPhone());
 			// 编辑保存联系人前再次校验手机号是否存在
 			LambdaQueryWrapper<PayContactsManagement> queryWrapper = new LambdaQueryWrapper<>();
-			queryWrapper.eq(PayContactsManagement::getPhone,payContactsManagement.getPhone());
+			queryWrapper.eq(PayContactsManagement::getPhone,phone);
 			PayContactsManagement payContactsManagementNew = payContactsManagementService.getOne(queryWrapper);
 			// 手机号存在，并且编辑id与查询不同，则校验不通过
 			if(!Objects.isNull(payContactsManagementNew) && !Objects.equals(payContactsManagementNew.getId(),payContactsManagement.getId())) {
@@ -219,7 +210,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	 */
 	@ApiOperation(value="联系人管理-通过id删除", notes="联系人管理-通过id删除")
 	@GetMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+	public Result<?> delete(@RequestParam(name="id") String id) {
 		if(StringUtils.isBlank(id)){
 			return Result.error("id不能为空!");
 		}
@@ -235,7 +226,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	 */
 	@ApiOperation(value="联系人管理-批量删除", notes="联系人管理-批量删除")
 	@GetMapping(value = "/deleteBatch")
-	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+	public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
 		if(StringUtils.isBlank(ids)){
 			return Result.error("id不能为空!");
 		}
@@ -257,7 +248,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	  */
 	 @ApiOperation(value="联系人管理-通过手机号查询", notes="联系人管理-通过手机号查询")
 	 @GetMapping(value = "/queryByCompanyName")
-	 public Result<?> queryByCompanyName(@RequestParam(name="phone",required=true) String phone) {
+	 public Result<?> queryByCompanyName(@RequestParam(name="phone") String phone) {
 		 if(StringUtils.isBlank(phone)){
 			 return Result.error("手机号不能为空！");
 		 }else{
@@ -268,8 +259,9 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 			 }
 		 }
 		 try {
+			 String phoneNew = PasswordUtil.encrypt(phone);
 			 LambdaQueryWrapper<PayContactsManagement> queryWrapper = new LambdaQueryWrapper<>();
-			 queryWrapper.eq(PayContactsManagement::getPhone,phone);
+			 queryWrapper.eq(PayContactsManagement::getPhone,phoneNew);
 			 queryWrapper.eq(PayContactsManagement::getDataSource,PayContactsManagementCommon.DATA_SOURCE1);
 			 PayContactsManagement payContactsManagement = payContactsManagementService.getOne(queryWrapper);
 			 if(Objects.isNull(payContactsManagement)) {
@@ -290,9 +282,9 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	 */
 	@ApiOperation(value="联系人管理-通过id查询", notes="联系人管理-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+	public Result<?> queryById(@RequestParam(name="id") String id) {
 		PayContactsManagement payContactsManagement = payContactsManagementService.getById(id);
-		if(payContactsManagement==null) {
+		if(payContactsManagement == null) {
 			return Result.error("未找到对应数据");
 		}
 		return Result.OK(payContactsManagement);
@@ -306,7 +298,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	  */
 	 @ApiOperation(value="联系人管理-通过企业id查询用户", notes="联系人管理-通过企业id查询用户")
 	 @GetMapping(value = "/queryByCompany")
-	 public Result<?> queryByCompany(@RequestParam(name="companyId",required=true) String companyId) {
+	 public Result<?> queryByCompany(@RequestParam(name="companyId") String companyId) {
 		 LambdaQueryWrapper<PayContactsManagement> queryWrapper = new LambdaQueryWrapper<>();
 		 queryWrapper.eq(PayContactsManagement::getCompanyId,companyId);
 		 List<PayContactsManagement> list = payContactsManagementService.list(queryWrapper);
@@ -317,14 +309,13 @@ public class PayContactsManagementController extends JeroController<PayContactsM
     * 导出excel
     *
     * @param request
-    * @param payContactsManagement
+    * @param payContactsManagement 联系人管理
     */
 	@ApiOperation(value="联系人管理-导出excel", notes="联系人管理-导出excel")
     @GetMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, PayContactsManagement payContactsManagement) {
 		// Step.1 组装查询条件
 		QueryWrapper<PayContactsManagement> queryWrapper = QueryGenerator.initQueryWrapper(payContactsManagement, request.getParameterMap());
-		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
 		// Step.2 获取导出数据
 		List<PayContactsManagement> pageList = payContactsManagementService.list(queryWrapper);

jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java

@@ -53,8 +53,6 @@ public class PayContactsManagement implements Serializable {
 	/**性别（1:男，2:女）*/
 	@Excel(name = "性别", width = 15,dicCode="sex")
     @ApiModelProperty(value = "性别")
-    @Max(2)
-    @Min(1)
     @Dict(dicCode = "sex")
     private Integer gender;
 	/**职务*/