增加批量操作功能

eladmin-common/src/main/java/me/zhengjie/base/ResultCode.java

@@ -108,6 +108,7 @@ public enum ResultCode {
     SUCC_ALREADY_EXISTED(30050,"社会统一信用代码已存在，请确认输入是否正确！"),
     SUCC_NEED_INPUT(30051,"请输入社会统一信用代码！"),
     ORDER_OCR_SERVICE_UNAVAILABLE(30052,"订单扫描录入功能尚未开通，请联系平台开通后使用！"),
+    JOB_NO_ALREADY_EXISTS(30053,"此工号已存在，请重新输入!"),
     
     /* 系统错误：40001-49999 */
     SYSTEM_INNER_ERROR(40001, "系统繁忙，请稍后重试"),

eladmin-system/src/main/java/me/zhengjie/application/admin/controller/ModelController.java

@@ -38,6 +38,21 @@ public class ModelController {
         return modelService.update(model);
     }
 
+    @RequestMapping(value = "/batchInvocation")
+    public AppBaseResponse batchInvocation(@RequestBody ModelReq model) {
+        return modelService.batchInvocation(model);
+    }
+
+    @RequestMapping(value = "/batchForbidden")
+    public AppBaseResponse batchForbidden(@RequestBody ModelReq model) {
+        return modelService.batchForbidden(model);
+    }
+
+//    @RequestMapping(value = "/batchDelete")
+//    public AppBaseResponse batchDelete(@RequestBody ModelReq model) {
+//        return modelService.batchForbidden(model);
+//    }
+
     @AnonymousGetMapping(value="/redisMessage")
     public AppBaseResponse redisMessage(@RequestParam String businessNo){
         // 推送创建订单文档任务消息

eladmin-system/src/main/java/me/zhengjie/application/admin/controller/vo/ModelReq.java

@@ -31,4 +31,5 @@ public class ModelReq extends BaseRequest {
 	//    小额贷款【ZH02001】
     private String productType;
     private Integer contractType;
+    private List<Integer> ids;
 }

eladmin-system/src/main/java/me/zhengjie/application/admin/controller/vo/NotaryOfficeCreateReq.java

@@ -30,6 +30,7 @@ public class NotaryOfficeCreateReq extends BaseRequest {
      * 公证处名称
      */
     private String name;
+    private String notaryOfficeCode;
     private String subjectColor;
     private String logo;
     private String address;

eladmin-system/src/main/java/me/zhengjie/application/admin/controller/vo/NotaryOfficeQueryRsp.java

@@ -41,6 +41,10 @@ public class NotaryOfficeQueryRsp {
      * 公证处名称
      */
     private String name;
+    /**
+     * 公证处编码
+     */
+    private String notaryOfficeCode;
 
     private String address;
 

eladmin-system/src/main/java/me/zhengjie/application/admin/controller/vo/UserEditReqVO.java

@@ -21,6 +21,8 @@ public class UserEditReqVO {
 	@NotBlank
 	private String username;
 	@NotBlank
+	private String jobNo;
+	@NotBlank
 	private String nickName;
 	@Email
 	private String email;

eladmin-system/src/main/java/me/zhengjie/application/admin/service/ModelNotarizationService.java

@@ -1,5 +1,6 @@
 package me.zhengjie.application.admin.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import me.zhengjie.base.AppBaseResponse;
 import me.zhengjie.application.admin.controller.vo.ModelReq;
 
@@ -13,4 +14,8 @@ public interface ModelNotarizationService{
     AppBaseResponse create(ModelReq req);
 
     AppBaseResponse update(ModelReq req);
+
+    AppBaseResponse batchInvocation(ModelReq req);
+
+    AppBaseResponse batchForbidden(ModelReq req);
 }

eladmin-system/src/main/java/me/zhengjie/application/admin/service/dto/UserDto.java

@@ -36,6 +36,8 @@ public class UserDto extends BaseDTO implements Serializable {
 
     private Long userId;
 
+    private String jobNo;
+
     private Set<RoleSmallDto> roles;
 
     private String roleNames;

eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/ModelNotarizationServiceImpl.java

@@ -1,6 +1,7 @@
 package me.zhengjie.application.admin.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
@@ -262,4 +263,45 @@ public class ModelNotarizationServiceImpl implements ModelNotarizationService {
 		}
 		return response;
 	}
+
+	/**
+	 * 公证书模板-批量启用
+	 *
+	 * @param req
+	 * @return
+	 */
+	@Transactional(rollbackFor = Exception.class)
+	public AppBaseResponse batchInvocation(ModelReq req) {
+		AppBaseResponse response = new AppBaseResponse();
+		req.getIds().stream()
+						.forEach(ele -> {
+							ModelEntity entity = modelMapper.selectById(ele);
+							if (entity != null && entity.getStatus() == 0) {
+								entity.setStatus(1);
+								modelMapper.updateById(entity);
+							}
+						});
+		return response;
+	}
+
+	/**
+	 * 公证书模板-批量禁用
+	 *
+	 * @param req
+	 * @return
+	 */
+	@Transactional(rollbackFor = Exception.class)
+	public AppBaseResponse batchForbidden(ModelReq req) {
+		AppBaseResponse response = new AppBaseResponse();
+		req.getIds().stream()
+				.forEach(ele -> {
+					ModelEntity entity = modelMapper.selectById(ele);
+					if (entity != null && entity.getStatus() == 1) {
+						entity.setStatus(0);
+						modelMapper.updateById(entity);
+					}
+				});
+		return response;
+	}
+
 }

eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/NotaryOfficeServiceImpl.java

@@ -224,6 +224,7 @@ public class NotaryOfficeServiceImpl extends ServiceImpl<NotaryOfficeMapper, Not
 		NotaryOfficeEntity entity = NotaryOfficeEntity.builder().areaCodesStr(req.getAreaCodesStr())
 				.areaCodeStr(req.getAreaCodeStr()).areaCode(req.getAreaCode()).name(req.getName())
 				.subjectColor(req.getSubjectColor()).imageId(req.getImageId()).address(req.getAddress()).phone(req.getPhone())
+				.notaryOfficeCode(req.getNotaryOfficeCode())
 				.createTime(LocalDateTime.now()).build();
 		int insert = notaryOfficeMapper.insert(entity);
 		if (insert == 0) {
@@ -237,6 +238,7 @@ public class NotaryOfficeServiceImpl extends ServiceImpl<NotaryOfficeMapper, Not
 		AppBaseResponse response = new AppBaseResponse();
 		NotaryOfficeEntity entity = NotaryOfficeEntity.builder().id(req.getId()).areaCodesStr(req.getAreaCodesStr())
 				.areaCodeStr(req.getAreaCodeStr()).areaCode(req.getAreaCode()).name(req.getName())
+				.notaryOfficeCode(req.getNotaryOfficeCode())
 				.subjectColor(req.getSubjectColor()).imageId(req.getImageId()).address(req.getAddress()).phone(req.getPhone())
 				.build();
 		int update = notaryOfficeMapper.updateById(entity);

eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/UserServiceImpl.java

@@ -267,6 +267,10 @@ public class UserServiceImpl implements UserService {
             response.fail(ResultCode.PHONE_HAS_EXISTED);
             return response;
         }
+        if (userRepository.findByDeptIdAndJobNo(resources.getDept().getName(), resources.getJobNo()) > 0) {
+            response.fail(ResultCode.JOB_NO_ALREADY_EXISTS);
+            return response;
+        }
         if(!TencentServiceUtil.isNameMatchedWithCardNo(resources.getIdCard(), resources.getNickName())){
             response.fail(ResultCode.NAME_IDCARD_UNMATCHED);
             return response;
@@ -399,6 +403,7 @@ public class UserServiceImpl implements UserService {
             }
         }
         user.setUsername(resources.getUsername());
+        user.setJobNo(resources.getJobNo());
         user.setEmail(resources.getEmail());
         user.setEnabled(resources.getEnabled());
         user.setRoles(resources.getRoles());

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/entity/NotaryOfficeEntity.java

@@ -58,6 +58,12 @@ public class NotaryOfficeEntity implements Serializable {
     private String name;
 
     /**
+     * 公证处编码
+     */
+    @TableField("notary_office_code")
+    private String notaryOfficeCode;
+
+    /**
      * 公证处地址
      */
     @TableField("address")

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/entity/SysUserEntity.java

@@ -45,6 +45,12 @@ public class SysUserEntity implements Serializable {
 	private String username;
 
 	/**
+	 * 工号
+	 */
+	@TableField("job_no")
+	private String jobNo;
+
+	/**
 	 * 昵称
 	 */
 	@TableField("nick_name")

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/entity/User.java

@@ -75,6 +75,10 @@ public class User extends BaseEntity implements Serializable {
 	private String username;
 
 	@NotBlank
+	@ApiModelProperty(value = "工号")
+	private String jobNo;
+
+	@NotBlank
 	@ApiModelProperty(value = "用户昵称")
 	private String nickName;
 

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/mapper/UserRepository.java

@@ -52,6 +52,15 @@ public interface UserRepository extends JpaRepository<User, Long>, JpaSpecificat
     User findByPhone(String phone);
 
     /**
+     * 根据部门id和工号查询
+     * @param deptId 手机号
+     * @param jobNo 工号
+     * @return /
+     */
+    @Query(value = "SELECT count(1) FROM sys_user WHERE dept_id = ?1 AND job_no = ?2", nativeQuery = true)
+    int findByDeptIdAndJobNo(String deptId, String jobNo);
+
+    /**
      * 修改密码
      * @param username 用户名
      * @param pass 密码