人员调整

src/main/java/com/ydtech/constants/InsuranceImageEnum.java

@@ -41,7 +41,9 @@ public enum InsuranceImageEnum {
 
     C04("C04", "被保人身份证正面"),
     D04("D04", "被保人身份证反面"),
-    Y04("Y04", "被保人营业执照");
+    Y04("Y04", "被保人营业执照"),
+
+    LZ_01("LZ_01","离职表");
 
 
 //    C0500("C0500", "验车照（车架）"),

src/main/java/com/ydtech/modules/admin/constants/UserWorkStatus.java

@@ -0,0 +1,21 @@
+package com.ydtech.modules.admin.constants;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum UserWorkStatus {
+
+    UWS_0(0,"离司"),
+    UWS_1(1,"正常"),
+    UWS_2(2,"入司待审核"),
+    UWS_3(3,"入司审核驳回"),
+    UWS_4(4,"离司待审核"),
+    UWS_5(5,"离司审核驳回");
+
+    private final Integer code;
+
+    private final String desc;
+}

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -12,11 +12,13 @@ import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.constants.RoleConstants;
+import com.ydtech.modules.admin.constants.UserWorkStatus;
 import com.ydtech.modules.admin.model.*;
 import com.ydtech.modules.admin.model.dto.AgentUserDto;
 import com.ydtech.modules.admin.model.dto.QuTeamNumDto;
 import com.ydtech.modules.admin.model.dto.QuUserNumDto;
 import com.ydtech.modules.admin.model.dto.SysUserDto;
+import com.ydtech.modules.admin.model.po.SysUserBankCard;
 import com.ydtech.modules.admin.model.po.SysUserIsDial;
 import com.ydtech.modules.admin.model.po.SysUserTreeShowLevel;
 import com.ydtech.modules.admin.model.vo.*;
@@ -37,11 +39,9 @@ import com.ydtech.modules.protocol.utils.AssertionUtils;
 import com.ydtech.security.utils.PasswordUtils;
 import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.idgen.IdGenerate;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
@@ -50,6 +50,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 import static com.ydtech.constants.RedisConstant.PHONE_VERIFICATION_CODE_KEY;
 
@@ -202,10 +203,7 @@ public class SysUserController extends BaseController {
     @ApiOperation(value = "获取用户综合信息")
     @PostMapping(value = "/gainUserSynthesisInfo/{userId}")
     public HttpResult gainUserSynthesisInfo(@PathVariable String userId) {
-
         return HttpResult.ok(sysUserService.gainUserSynthesisInfo(userId));
-
-
     }
 
     /**
@@ -451,7 +449,11 @@ public class SysUserController extends BaseController {
     @GetMapping(value = "/approvalPass")
     public HttpResult approvalPass(@RequestParam String userId) {
         SysUser sysUser = sysUserService.getById(userId);
-        sysUser.setStatus(1);
+        if(sysUser.getStatus() == UserWorkStatus.UWS_2.getCode()){
+            sysUser.setStatus(UserWorkStatus.UWS_1.getCode());
+        }else if(sysUser.getStatus() == UserWorkStatus.UWS_4.getCode()){
+            sysUser.setStatus(UserWorkStatus.UWS_0.getCode());
+        }
         return HttpResult.ok(sysUserService.updateById(sysUser));
 
 
@@ -467,13 +469,19 @@ public class SysUserController extends BaseController {
 
 
         SysUser sysUser = sysUserService.getById(userId);
-        sysUser.setStatus(3);
+        if(Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_2.getCode())) {
+            sysUser.setStatus(UserWorkStatus.UWS_3.getCode());
+        }else if(Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_4.getCode())){
+            sysUser.setStatus(UserWorkStatus.UWS_5.getCode());
+        }
         sysUser.setApprovalOpinion(reason);
 
         return HttpResult.ok(sysUserService.updateById(sysUser));
 
     }
 
+    @Autowired
+    private SysUserBankCardService sysUserBankCardService;
 
     @ApiOperation(value = "（重构）获取用户")
     @ApiImplicitParams({
@@ -490,6 +498,9 @@ public class SysUserController extends BaseController {
         if (!ObjectUtils.isEmpty(sysUserRole)) {
             sysUser.setRoleId(StringUtils.toString(sysUserRole.getRoleId()));
         }
+        //查询 机构的上级
+        SysDept sysDept = sysDeptService.getById(sysUser.getDeptId());
+        sysUser.setPdeptId(sysDept.getParentId());
         if ("19".equals(sysUser.getRoleId())) {
             SysUser operator = sysUserService.getById(sysUser.getOperatorCode());
             sysUser.setReferrerId(operator != null ? operator.getId() : "");
@@ -508,6 +519,20 @@ public class SysUserController extends BaseController {
         }
         //查询详情信息
         SysUserInfo userInfo = sysUserInfoService.getById(userId);
+        //查询用户绑定的银行卡信息
+        SysUserBankCard queryBank = new SysUserBankCard();
+        queryBank.setUserId(userId);
+        queryBank.setAuditStatus("1");
+        HttpResult<List<SysUserBankCard>> userBankList = sysUserBankCardService.getUserBankListByQueryParam(queryBank);
+        if(!Objects.isNull(userInfo)) {
+            if (userBankList.getData().isEmpty()) {
+                userInfo.setBankName(null);
+                userInfo.setAccountno(null);
+            } else {
+                userInfo.setBankName(userBankList.getData().get(0).getBankAccount());
+                userInfo.setAccountno(userBankList.getData().get(0).getBankNumber());
+            }
+        }
 
 
         List<EsmUserImageQueryVo> esmUserImageQueryVo = esmUserImageService.getEsmUserImageQueryVo(userId);
@@ -847,4 +872,11 @@ public class SysUserController extends BaseController {
     public HttpResult findHxUserList() {
         return HttpResult.ok(sysUserService.findHxUserList());
     }
+
+
+    @ApiOperation(value = "离职申请")
+    @PostMapping("/departApply")
+    public HttpResult departApply(@RequestBody SysUser2Vo sysUserVO) {
+        return sysUserService.departApply(sysUserVO) ? HttpResult.ok("离职申请提交成功") : HttpResult.error("离职申请提交失败");
+    }
 }

src/main/java/com/ydtech/modules/admin/dao/SysUserBankCardMapper.java

@@ -27,6 +27,7 @@ public interface SysUserBankCardMapper extends BaseMapper<SysUserBankCard> {
     List<SysUserBankCard> queryUsableCard(@Param("sysUserBankCard") SysUserBankCard sysUserBankCard);
 
     List<SysUserBankCardHistory> getUserBankCardHistoryList(@Param("sysUserBankCardHistory") SysUserBankCardHistory sysUserBankCardHistory);
+
 }
 
 

src/main/java/com/ydtech/modules/admin/model/SysUser.java

@@ -150,6 +150,10 @@ public class SysUser extends BaseEntity {
     @TableField(exist = false)
     private String deptName;
 
+    @ApiModelProperty(value = "")
+    @TableField(exist = false)
+    private String pdeptId;
+
 
     @TableField(exist = false)
     @Excel(name = "状态")

src/main/java/com/ydtech/modules/admin/service/SysUserBankCardService.java

@@ -41,5 +41,7 @@ public interface SysUserBankCardService extends IService<SysUserBankCard> {
 
     HttpResult<List<SysUserBankCard>> getUserBankList(SysUserBankCard sysUserBankCard);
 
+    HttpResult<List<SysUserBankCard>> getUserBankListByQueryParam(SysUserBankCard sysUserBankCard);
+
     HttpResult<List<SysUserBankCardHistory>> getUserBankCardHistoryList(SysUserBankCardHistory sysUserBankCardHistory);
 }

src/main/java/com/ydtech/modules/admin/service/SysUserService.java

@@ -192,6 +192,13 @@ public interface SysUserService extends IService<SysUser> {
      *  @Description: 查询所有的后线人员
      */
     List<SysUser> findHxUserList();
+
+    /**
+     * 离职申请
+     * @param sysUserVO
+     * @return
+     */
+    boolean departApply(SysUser2Vo sysUserVO);
 }
 
 

src/main/java/com/ydtech/modules/admin/service/impl/SysUserBankCardServiceImpl.java

@@ -222,6 +222,12 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
         return HttpResult.ok("success", sysUserBankCardList);
     }
 
+    public HttpResult<List<SysUserBankCard>> getUserBankListByQueryParam(SysUserBankCard sysUserBankCard) {
+        sysUserBankCard.setUserId(sysUserBankCard.getUserId());
+        List<SysUserBankCard> sysUserBankCardList = baseMapper.getUserBankList(sysUserBankCard);
+        return HttpResult.ok("success", sysUserBankCardList);
+    }
+
     @Override
     public HttpResult<List<SysUserBankCardHistory>> getUserBankCardHistoryList(SysUserBankCardHistory sysUserBankCardHistory) {
         List<SysUserBankCardHistory> sysUserBankCardHistoryList = baseMapper.getUserBankCardHistoryList(sysUserBankCardHistory);

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -7,12 +7,14 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.constants.InsuranceImageEnum;
 import com.ydtech.constants.SysConstants;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.constants.QuMarks;
 import com.ydtech.modules.admin.constants.RoleConstants;
+import com.ydtech.modules.admin.constants.UserWorkStatus;
 import com.ydtech.modules.admin.dao.SysUserMapper;
 import com.ydtech.modules.admin.model.*;
 import com.ydtech.modules.admin.model.dto.QuTeamNumDto;
@@ -670,6 +672,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Transactional
     public HttpResult updateUserInfo(String userId, SysUser2Vo sysUserVo) {
         SysUser sysUser = sysUserVo.getSysUser();
+        //如果审核驳回则 重新修改为 审核状态
+        if(sysUserVo.getSysUser().getStatus() == UserWorkStatus.UWS_3.getCode()){
+            sysUserVo.getSysUser().setStatus(UserWorkStatus.UWS_2.getCode());
+        }
+
+        if(sysUserVo.getSysUser().getStatus() == UserWorkStatus.UWS_5.getCode()){
+            sysUserVo.getSysUser().setStatus(UserWorkStatus.UWS_4.getCode());
+        }
 
         //修改用户不能修改密码
         if (StringUtils.isEmpty(sysUser.getPassword())) {
@@ -1462,6 +1472,33 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public List<SysUser> findHxUserList() {
         return sysUserMapper.findHxUserList();
     }
+
+    /**
+     * 离职申请
+     * @param sysUserVO
+     * @return
+     */
+    @Override
+    @Transactional
+    public boolean departApply(SysUser2Vo sysUserVO) {
+        if(Objects.isNull(sysUserVO.getSysUser().getLogoutTime())){
+            throw new SystemException("请填写离职时间");
+        }
+        if(Objects.isNull(sysUserVO.getEsmUserImageVo()) &&  sysUserVO.getEsmUserImageVo().isEmpty()){
+            throw new SystemException("请上传离职证明");
+        }
+        SysUser byId = this.getById(sysUserVO.getSysUser().getId());
+        byId.setLogoutTime(sysUserVO.getSysUser().getLogoutTime());
+        byId.setStatus(UserWorkStatus.UWS_4.getCode());
+        this.updateById(byId);
+
+        //添加离职证明
+        EsmUserImageVo esmUserImageVo = sysUserVO.getEsmUserImageVo().get(0);
+        esmUserImageVo.setType(InsuranceImageEnum.LZ_01.getCode());
+        EsmUserImage esmUserImage = new EsmUserImage(esmUserImageVo,sysUserVO.getSysUser().getId());
+        esmUserImageService.save(esmUserImage);
+        return true;
+    }
 }
 
 

src/main/java/com/ydtech/modules/protocol/entity/dto/PtlAgreementDto.java

@@ -28,6 +28,12 @@ public class PtlAgreementDto implements Serializable {
     @ApiModelProperty("承保描述")
     private String underwritingDescription;
 
+    @ApiModelProperty("业务描述")
+    private String businessDescription;
+
+    @ApiModelProperty("工号描述")
+    private String jobDescription;
+
     @ApiModelProperty("是否是税源")
     private String isTaxSource;
 

src/main/resources/mapper/modules/admin/SysUserBankCardMapper.xml

@@ -76,6 +76,9 @@
                 <if test="sysUserBankCard.delFlag !=null and  sysUserBankCard.delFlag  !=''">
                     and a.del_flag =#{sysUserBankCard.delFlag}
                 </if>
+                <if test="sysUserBankCard.auditStatus !=null and  sysUserBankCard.auditStatus  !=''">
+                    and a.audit_status =#{sysUserBankCard.auditStatus}
+                </if>
             </where>
     </select>
 

src/main/resources/mapper/modules/protocol/PtlAgreementMapper.xml

@@ -50,6 +50,8 @@
             <id property="id" column="agreement_id"/>
             <result property="agreementName" column="agreement_name"/>
             <result property="underwritingDescription" column="underwriting_description"/>
+            <result property="businessDescription" column="business_description"/>
+            <result property="jobDescription" column="job_description"/>
             <result property="apiType" column="api_type"/>
             <result property="productsCode" column="products_code"/>
         </collection>
@@ -68,7 +70,8 @@
     </sql>
 
     <select id="getAgreementCompany" resultMap="AgreementCompanyResultMap">
-        select eic.*, pa.id as agreement_id, pa.agreement_name,pa.products_code, paa.api_type, pa.underwriting_description
+        select eic.*, pa.id as agreement_id, pa.agreement_name,pa.products_code, paa.api_type, pa.underwriting_description,
+               pa.business_description,pa.job_description
         from esm_ins_company as eic
                  left join ptl_agreement as pa on pa.insurance_company_id = eic.id
                  left join ptl_agreement_attribution as paa on paa.id = pa.id