Merge branch 'refs/heads/test-renyuan' into test

# Conflicts:
#	src/main/resources/mapper/modules/admin/SysUserMapper.xml

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

@@ -8,12 +8,14 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum UserWorkStatus {
 
-    UWS_0(0,"在职"),
-    UWS_1(1,"正常"),
-    UWS_2(2,"入司待审核"),
-    UWS_3(3,"入司审核驳回"),
-    UWS_4(4,"离司待审核"),
-    UWS_5(5,"离司审核驳回");
+    UWS_0(0, "离司"),
+    UWS_1(1, "在职"),
+    UWS_2(2, "入司待审核"),
+    UWS_3(3, "入司审核驳回"),
+    UWS_4(4, "离司待审核"),
+    UWS_5(5, "离司审核驳回"),
+    UWS_6(6, "修改待审核"),
+    UWS_7(7, "修改审核驳回");
 
     private final Integer code;
 

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

@@ -452,7 +452,6 @@ public class SysUserController extends BaseController {
         return HttpResult.ok("", sysUserService.getQuTeamByCompany(quTeamNumDto));
     }
 
-
     @ApiOperation(value = "（重构）审批通过")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "userId", value = "用户ID")
@@ -460,16 +459,16 @@ public class SysUserController extends BaseController {
     @GetMapping(value = "/approvalPass")
     public HttpResult approvalPass(@RequestParam String userId) {
         SysUser sysUser = sysUserService.getById(userId);
-        if (sysUser.getStatus() == UserWorkStatus.UWS_2.getCode()) {
+        if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_2.getCode())) {
             sysUser.setStatus(UserWorkStatus.UWS_1.getCode());
-        } else if (sysUser.getStatus() == UserWorkStatus.UWS_4.getCode()) {
+        } else if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_4.getCode())) {
             sysUser.setStatus(UserWorkStatus.UWS_0.getCode());
+        } else if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_6.getCode())) {
+            sysUser.setStatus(UserWorkStatus.UWS_1.getCode());
         }
-        SysUserTrack sysUserTrack = new SysUserTrack();
-        sysUserTrack.setUserId(userId);
-        sysUserTrack.setApproveBy(getUserName());
-        sysUserTrack.setStatus(sysUser.getStatus());
-        sysUserTrack.setApproveTime(new Date());
+
+        SysUserTrack sysUserTrack = new SysUserTrack(sysUser);
+
         sysUserTrackService.save(sysUserTrack);
         return HttpResult.ok(sysUserService.updateById(sysUser));
 
@@ -484,21 +483,19 @@ public class SysUserController extends BaseController {
     @GetMapping(value = "/approvalNotPass")
     public HttpResult<Boolean> approvalNotPass(@RequestParam String userId, @RequestParam String reason) {
 
-
         SysUser sysUser = sysUserService.getById(userId);
         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());
+        } else if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_6.getCode())) {
+            sysUser.setStatus(UserWorkStatus.UWS_7.getCode());
         }
-        sysUser.setApprovalOpinion(reason);
-        SysUserTrack sysUserTrack = new SysUserTrack();
-        sysUserTrack.setUserId(userId);
-        sysUserTrack.setApproveBy(getUserName());
-        sysUserTrack.setStatus(sysUser.getStatus());
+
+        SysUserTrack sysUserTrack = new SysUserTrack(sysUser);
         sysUserTrack.setApproveMess(reason);
-        sysUserTrack.setApproveTime(new Date());
         sysUserTrackService.save(sysUserTrack);
+
         return HttpResult.ok(sysUserService.updateById(sysUser));
 
     }
@@ -921,11 +918,10 @@ public class SysUserController extends BaseController {
         return sysUserService.departApply(sysUserVO) ? HttpResult.ok("离职申请提交成功") : HttpResult.error("离职申请提交失败");
     }
 
-
     @ApiOperation(value = "离职恢复")
-    @PostMapping("/separationReinstatement/{id}")
-    public HttpResult separationReinstatement(@PathVariable String id) {
-        sysUserService.separationReinstatement(id);
+    @GetMapping("/separationReinstatement/{userId}")
+    public HttpResult separationReinstatement(@PathVariable String userId) {
+        sysUserService.separationReinstatement(userId);
         return HttpResult.ok("恢复成功");
     }
 

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

@@ -112,9 +112,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     @Select(internalUserByDeptIdSql)
     SysUserVO gainInternalUserByDeptId(@Param("deptId") String deptId);
 
-    @Select("SELECT u.id,u.name,r.id roleId,r.name roleName FROM sys_user u " +
-            "LEFT JOIN sys_user_role sur ON sur.user_id = u.id " +
-            "LEFT JOIN sys_role r ON r.id = sur.role_id WHERE r.id IN ('21') and u.status=1 and u.dept_id=#{deptId}")
+
     List<SysUserVO> findByReferrerId(@Param("deptId") String deptId);
 
 

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

@@ -1,47 +1,80 @@
 package com.ydtech.modules.admin.model;
 
-import cn.dev33.satoken.stp.StpUtil;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.ydtech.modules.base.controller.BaseController;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.Date;
-
-@Data
+/**
+ * 系统用户审核轨迹表
+ * @TableName sys_user_track
+ */
 @AllArgsConstructor
 @NoArgsConstructor
-public class SysUserTrack {
+@TableName(value ="sys_user_track")
+@Data
+public class SysUserTrack implements Serializable {
     /**
-     * id
+     * 主键id
      */
-    private Integer id;
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
     /**
      * 用户id
      */
+    @TableField(value = "user_id")
     private String userId;
+
     /**
-     * 用户状态 0,"离司",1,"正常",2,"入司待审核",3,"入司审核驳回",4,"离司待审核",5,"离司审核驳回"
+     * 状态  1：正常   0：删除 2：审批中  3：审批不通过
      */
+    @TableField(value = "status")
     private Integer status;
+
     /**
      * 审核人
      */
+    @TableField(value = "approve_by")
     private String approveBy;
+
+    /**
+     * 审核人id
+     */
+    @TableField(value = "approve_by_id")
+    private String approveById;
+
     /**
      * 审核时间
      */
+    @TableField(value = "approve_time")
     private Date approveTime;
+
     /**
      * 审核信息
      */
+    @TableField(value = "approve_mess")
     private String approveMess;
 
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
 
     public SysUserTrack(SysUser sysUser) {
         this.userId = sysUser.getId();
         this.status = sysUser.getStatus();
-        this.approveBy = StpUtil.getLoginId().toString();
+        SysUser user = BaseController.getUser();
+        this.approveBy = user.getName();
+        this.approveById = user.getId();
         this.approveTime = new Date();
     }
 
+
 }

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

@@ -33,6 +33,7 @@ import com.ydtech.modules.esm.model.EsmUserReferrer;
 import com.ydtech.modules.esm.model.vo.EsmUserImageVo;
 import com.ydtech.modules.esm.service.EsmUserImageService;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
+import com.ydtech.modules.ins.model.yc.ruote.Base;
 import com.ydtech.security.utils.PasswordUtils;
 import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.idgen.IdGenerate;
@@ -638,13 +639,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         List<EsmUserImageVo> esmUserImageVo = sysUserVo.getEsmUserImageVo();
         List<EsmUserImage> esmUserImages = esmUserImageVo.stream().map(x -> new EsmUserImage(x, userId)).collect(Collectors.toList());
         esmUserImageService.saveBatch(esmUserImages);
-        //添加轨迹
-        SysUserTrack sysUserTrack = new SysUserTrack();
-        sysUserTrack.setUserId(sysUser.getId());
-        sysUserTrack.setApproveBy(StpUtil.getLoginId().toString());
-        sysUserTrack.setStatus(sysUser.getStatus());
-        sysUserTrack.setApproveTime(new Date());
-        sysUserTrackService.save(sysUserTrack);
 
         return HttpResult.ok("新增成功");
     }
@@ -687,14 +681,19 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysUser sysUser = sysUserVo.getSysUser();
         int beStatus = sysUser.getStatus();
         //如果审核驳回则 重新修改为 审核状态
-        if(sysUserVo.getSysUser().getStatus() == UserWorkStatus.UWS_3.getCode()){
+        if (sysUserVo.getSysUser().getStatus().equals(UserWorkStatus.UWS_3.getCode())) {
             sysUserVo.getSysUser().setStatus(UserWorkStatus.UWS_2.getCode());
         }
 
-        if(sysUserVo.getSysUser().getStatus() == UserWorkStatus.UWS_5.getCode()){
+        if (Objects.equals(sysUserVo.getSysUser().getStatus(), UserWorkStatus.UWS_5.getCode())) {
             sysUserVo.getSysUser().setStatus(UserWorkStatus.UWS_4.getCode());
         }
 
+        if (Objects.equals(sysUserVo.getSysUser().getStatus(), UserWorkStatus.UWS_7.getCode())
+                || Objects.equals(sysUserVo.getSysUser().getStatus(), UserWorkStatus.UWS_1.getCode())) {
+            sysUserVo.getSysUser().setStatus(UserWorkStatus.UWS_6.getCode());
+        }
+
         //修改用户不能修改密码
         if (StringUtils.isEmpty(sysUser.getPassword())) {
             return HttpResult.error("密码不能为空");
@@ -716,7 +715,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             String pwd = PasswordUtils.encode(sysUser.getPassword(), salt);
             sysUser.setPassword(pwd);
             sysUser.setSalt(salt);
-        }else {
+        } else {
             sysUser.setPassword(sysUser_org.getPassword());
             sysUser.setSalt(sysUser_org.getSalt());
         }
@@ -724,6 +723,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if ("19".equals(sysUser.getRoleId())) {//19 出单员 校验机构和业务员机构是否一致
             return checkChuDanUser(sysUser);
         }
+
+        sysUser.setStatus(sysUserVo.getSysUser().getStatus());
         updateById(sysUser);
 
         //角色配置
@@ -755,15 +756,19 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         esmUserImageService.saveBatch(esmUserImages);
 
         if (UserWorkStatus.UWS_5.getCode() == beStatus ||
-                UserWorkStatus.UWS_3.getCode() == beStatus) {
+                UserWorkStatus.UWS_3.getCode() == beStatus ||
+                UserWorkStatus.UWS_7.getCode() == beStatus) {
             //添加轨迹
             SysUserTrack sysUserTrack = new SysUserTrack();
             sysUserTrack.setUserId(sysUser.getId());
-            sysUserTrack.setApproveBy(StpUtil.getLoginId().toString());
+            SysUser user = BaseController.getUser();
+            sysUserTrack.setApproveBy(user.getName());
+            sysUserTrack.setApproveById(user.getId());
             sysUserTrack.setStatus(sysUserVo.getSysUser().getStatus());
             sysUserTrack.setApproveTime(new Date());
             sysUserTrackService.save(sysUserTrack);
         }
+
         return HttpResult.ok("修改成功");
     }
 
@@ -1488,10 +1493,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/7/11 16:08
-     *  @Description:  查询所有的后线人员
+     * @version
+     * @author: hxl
+     * @Date: 2024/7/11 16:08
+     * @Description: 查询所有的后线人员
      */
     @Override
     public List<SysUser> findHxUserList() {
@@ -1500,16 +1505,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     /**
      * 离职申请
+     *
      * @param sysUserVO
      * @return
      */
     @Override
     @Transactional
     public boolean departApply(SysUser2Vo sysUserVO) {
-        if(Objects.isNull(sysUserVO.getSysUser().getLogoutTime())){
+        if (Objects.isNull(sysUserVO.getSysUser().getLogoutTime())) {
             throw new SystemException("请填写离职时间");
         }
-        if(Objects.isNull(sysUserVO.getEsmUserImageVo()) &&  sysUserVO.getEsmUserImageVo().isEmpty()){
+        if (Objects.isNull(sysUserVO.getEsmUserImageVo()) && sysUserVO.getEsmUserImageVo().isEmpty()) {
             throw new SystemException("请上传离职证明");
         }
         SysUser byId = this.getById(sysUserVO.getSysUser().getId());
@@ -1520,15 +1526,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         //添加离职证明
         EsmUserImageVo esmUserImageVo = sysUserVO.getEsmUserImageVo().get(0);
         esmUserImageVo.setType(InsuranceImageEnum.LZ_01.getCode());
-        EsmUserImage esmUserImage = new EsmUserImage(esmUserImageVo,sysUserVO.getSysUser().getId());
+        EsmUserImage esmUserImage = new EsmUserImage(esmUserImageVo, sysUserVO.getSysUser().getId());
         esmUserImageService.save(esmUserImage);
 
         //添加轨迹
-        SysUserTrack sysUserTrack = new SysUserTrack();
-        sysUserTrack.setUserId(byId.getId());
-        sysUserTrack.setApproveBy(StpUtil.getLoginId().toString());
-        sysUserTrack.setStatus(byId.getStatus());
-        sysUserTrack.setApproveTime(new Date());
+        SysUserTrack sysUserTrack = new SysUserTrack(byId);
         sysUserTrackService.save(sysUserTrack);
         return true;
     }

src/main/java/com/ydtech/modules/order/entity/vo/OrderQueryVo.java

@@ -153,6 +153,9 @@ public class OrderQueryVo {
     @ApiModelProperty(value = "非车保单号")
     private String noPolicyNo;
 
+    @ApiModelProperty(value = "业务来源")
+    private String source;
+
     public LocalDate getEndDatePlusOneDay() {
         if(ObjectUtils.isEmpty(endDate)){
             return endDate;

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

@@ -88,16 +88,14 @@
         psd.name as pDeptName,
         t4.id as roleId,
         t4.name as roleName,
-        su.create_time as submitTime,
-        sut.approveTime as approveTime
+        (select approve_by from sys_user_track  where user_id = su.id ORDER BY approve_time desc LIMIT 1) as approveBy,
+        (select approve_time from sys_user_track  where user_id = su.id ORDER BY approve_time desc LIMIT 1) as approveTime
         from sys_user su
         left join sys_dept sd on su.dept_id=sd.id
         left join sys_dept psd on sd.parent_id=psd.id
         left join sys_user_info info on info.id=su.id
         left join sys_user_role t3 on su.id=t3.user_id
         left join sys_role t4 on t3.role_id=t4.id
-        left join (select user_id,MAX(approve_time) approveTime
-        from sys_user_track group by user_id ) sut on sut.user_id = su.id
         where 1=1
         AND sd.id <> ''
         <if test='user !=null  '>
@@ -248,8 +246,8 @@
         psd.id as pDeptId,
         psd.name as pDeptName,
         su.create_time as submitTime,
-        sut.approveTime as approveTime,
-        sut.approve_by as approvBy
+        (select approve_by from sys_user_track  where user_id = su.id ORDER BY approve_time desc LIMIT 1) as approveBy,
+        (select approve_time from sys_user_track  where user_id = su.id ORDER BY approve_time desc LIMIT 1) as approveTime
         FROM
         sys_user su
         LEFT JOIN sys_user_info info ON info.id = su.id
@@ -257,8 +255,6 @@
         left join sys_dept psd on psd.id = sd.parent_id
         LEFT JOIN sys_user_role t3 ON su.id = t3.user_id
         LEFT JOIN sys_role t4 ON t3.role_id = t4.id
-        left join (select user_id, approve_by, MAX(approve_time) approveTime
-        from sys_user_track group by user_id, approve_by ) sut on sut.user_id = su.id
         AND sd.del_flag = '0'
         WHERE
         1=1
@@ -1374,6 +1370,7 @@
             </if>
         </where>
     </select>
+
     <select id="getByUserId" resultType="com.ydtech.modules.admin.model.SysUser">
         select t.id id,t.name name,t.mobile mobile,t2.management_source managementSource
         from sys_user t left join sys_dept t2 on t.dept_id=t2.id

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

@@ -6,16 +6,14 @@
         <result column="user_id" property="userId" javaType="java.lang.String"/>
         <result column="status" property="status" javaType="java.lang.Integer"/>
         <result column="approve_by" property="approveBy" javaType="java.lang.String"/>
+        <result column="approve_by_id" property="approveById" javaType="java.lang.String"/>
         <result column="approve_time" property="approveTime" javaType="java.util.Date"/>
         <result column="approve_mess" property="approveMess" javaType="java.lang.String"/>
     </resultMap>
-    <insert id="insert">
-        insert into sys_user_track (user_id,status,approve_by,approve_time,approve_mess)
-        values (#{userId},#{status},#{approveBy}, #{approveTime},#{approveMess})
-    </insert>
 
     <select id="getLastTime" resultMap="sysUserTrackMap">
         select  approve_by,approve_time from sys_user_track
         where user_id = #{userId} order by approve_time desc limit 1
     </select>
+
 </mapper>

src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -950,6 +950,11 @@
             <if test="orderQueryVo.orderNo != null and orderQueryVo.orderNo != ''">
                 and iac.id = #{orderQueryVo.orderNo}
             </if>
+
+            <if test="orderQueryVo.source != null and orderQueryVo.source != ''">
+                and dept.management_source = #{orderQueryVo.orderNo.source}
+            </if>
+
             <if test="orderQueryVo.deptId != null and orderQueryVo.deptId != ''">
                 and io.deptid like "${orderQueryVo.deptId}%"
             </if>
@@ -1072,6 +1077,11 @@
             <if test="orderQueryVo.orderNo != null and orderQueryVo.orderNo != ''">
                 and iac.id = #{orderQueryVo.orderNo}
             </if>
+
+            <if test="orderQueryVo.source != null and orderQueryVo.source != ''">
+                and dept.management_source = #{orderQueryVo.orderNo.source}
+            </if>
+
             <if test="orderQueryVo.deptId != null and orderQueryVo.deptId != ''">
                 and io.deptid like "${orderQueryVo.deptId}%"
             </if>