Merge remote-tracking branch 'origin/main'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -64,6 +64,17 @@ public class SysUserController extends BaseController
         List<SysUser> list = userService.selectUserList(user);
         return getDataTable(list);
     }
+    /**
+     * 获取领导账号列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @GetMapping("/ldUserlist")
+    public TableDataInfo ldUserlist(SysUser user)
+    {
+        startPage();
+        List<SysUser> list = userService.selectldUserlist(user);
+        return getDataTable(list);
+    }
 
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:user:export')")
@@ -154,7 +165,12 @@ public class SysUserController extends BaseController
         List<SysUser> userList = new ArrayList();
         Integer num = user.getNum();
         if(num!=null&&num>0){
-            Long[] roleIds = {100L};  //固定的评分账号角色id
+            Long[] roleIds ;  //固定的评分账号角色id
+            if(user.getPcIds()!=null){
+                roleIds= new Long[]{103L};  //领导评分账号
+            }else{
+                roleIds = new Long[]{100L};  //普通评分账号
+            }
             HashSet<String> accounts = new HashSet<>();
             while (accounts.size() < num) {
                 String randomUserName = RandomStringUtils.randomAlphanumeric(8);
@@ -171,12 +187,25 @@ public class SysUserController extends BaseController
                 nuser.setPassword(SecurityUtils.encryptPassword("111111"));
                 nuser.setUserName(account);
                 nuser.setNickName(account);
+
+                if(user.getPcId()!=null){
                     nuser.setPcId(user.getPcId());
+                }
+                if(user.getPcIds()!=null){
                     nuser.setPcIds(String.join(",",user.getPcIds()));
+                }
+                if(user.getPcNames()!=null){
                     nuser.setPcNames(String.join(",",user.getPcNames()));
-                nuser.setVoteIds(String.join(",",user.getVoteIds()));
+                }
+                if(user.getItemIds()!=null){
                     nuser.setItemIds(String.join(",",user.getItemIds()));
+                }
+                if(user.getVoteIds()!=null){
+                    nuser.setVoteIds(String.join(",",user.getVoteIds()));
+                }
+                if(user.getItemNames()!=null){
                     nuser.setItemNames(String.join(",",user.getItemNames()));
+                }
                 nuser.setCreateBy(getUsername());
                 nuser.setRoleIds(roleIds);
                 nuser.setDeptId(user.getDeptId());
@@ -236,7 +265,7 @@ public class SysUserController extends BaseController
      * 根据考核任务id删除用户
      */
     @PreAuthorize("@ss.hasPermi('system:user:remove')")
-    @Log(title = "用户管理", businessType = BusinessType.DELETE)
+    @Log(title = "评分账号", businessType = BusinessType.DELETE)
     @DeleteMapping("/pcIds/{pcIds}")
     public AjaxResult removeBypcIds(@PathVariable Long[] pcIds)
     {

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhTemplateController.java

@@ -1,13 +1,13 @@
 package com.ruoyi.kaohe.controller;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.kaohe.domain.KhItems;
+import com.ruoyi.kaohe.domain.*;
-import com.ruoyi.kaohe.domain.KhTemItem;
-import com.ruoyi.kaohe.domain.KhVote;
 import com.ruoyi.kaohe.service.IKhTemItemService;
 import com.ruoyi.kaohe.service.IKhVoteService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,7 +18,6 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.kaohe.domain.KhTemplate;
 import com.ruoyi.kaohe.service.IKhTemplateService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -76,8 +75,7 @@ public class KhTemplateController extends BaseController
     }
 
     /**
-     * 根据模板查询出考核项及考核项对应的投票
+     * 考核任务生成评分账号时，根据模板查询出考核项及考核项对应的投票
-     * @param id
      * @return
      */
     @GetMapping(value = "/getItemVote")
@@ -96,6 +94,35 @@ public class KhTemplateController extends BaseController
         }
         return success(khTemplate);
     }
+    /**
+     * 生成领导评分账号时，根据模板查询出考核项及考核项对应的投票
+     * 参数具体（id,templateId,pcTitle）
+     * @return
+     */
+    @PostMapping(value = "/pcItemVotes")
+    public AjaxResult getInfo(@RequestBody List<KhPingce> pingces)
+    {
+        List<PcItems> pcItems = new ArrayList<>();
+        for (KhPingce pingce : pingces) {
+            KhTemplate khTemplate = khTemplateService.selectKhTemplateById(pingce.getTemplateId());
+            List<KhItems> items = khTemplate.getItems();
+            for(KhItems item:items){
+                KhVote query = new KhVote();
+                query.setPingceId(pingce.getId());
+                query.setKhitemId(item.getId());
+                List<KhVote> khVotes = voteService.selectKhVoteList(query);
+                if(khVotes!=null&&khVotes.size()>0){
+                    item.setVote(khVotes.get(0));
+                }
+            }
+            PcItems pcitem = new PcItems();
+            pcitem.setPcName(pingce.getPcTitle());
+            pcitem.setItems(khTemplate.getItems());
+            pcItems.add(pcitem);
+        }
+
+        return success(pcItems);
+    }
 
     /**
      * 新增考核模板

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/PcItems.java

@@ -0,0 +1,24 @@
+package com.ruoyi.kaohe.domain;
+
+import java.util.List;
+
+public class PcItems {
+    private String pcName;
+    private List<KhItems>  items;
+
+    public String getPcName() {
+        return pcName;
+    }
+
+    public void setPcName(String pcName) {
+        this.pcName = pcName;
+    }
+
+    public List<KhItems> getItems() {
+        return items;
+    }
+
+    public void setItems(List<KhItems> items) {
+        this.items = items;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -126,4 +126,6 @@ public interface SysUserMapper
     public SysUser checkEmailUnique(String email);
 
     int deleteUserByPcIds(Long[] pcIds);
+
+    List<SysUser> selectldUserlist(SysUser user);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -205,4 +205,6 @@ public interface ISysUserService
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
 
     int deleteUserByPcIds(Long[] pcIds);
+
+    List<SysUser> selectldUserlist(SysUser user);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -78,6 +78,12 @@ public class SysUserServiceImpl implements ISysUserService
         return userMapper.selectUserList(user);
     }
 
+    @Override
+    @DataScope(deptAlias = "d", userAlias = "u")
+    public List<SysUser> selectldUserlist(SysUser user) {
+        return userMapper.selectldUserlist(user);
+    }
+
     /**
      * 根据条件分页查询已分配用户角色列表
      * 
@@ -482,6 +488,7 @@ public class SysUserServiceImpl implements ISysUserService
             param.setPcId(pcId);
             List<SysUser> sysUsers = userMapper.selectUserList(param);
             List<Long> userIds = sysUsers.stream().map(SysUser::getUserId).collect(Collectors.toList());
+            if(userIds!=null&&userIds.size()>0){
                 for (Long userId : userIds)
                 {
                     checkUserAllowed(new SysUser(userId));
@@ -492,6 +499,7 @@ public class SysUserServiceImpl implements ISysUserService
                 // 删除用户与岗位关联
                 userPostMapper.deleteUserPost(userIds.stream().toArray(Long[]::new));
             }
+        }
         return userMapper.deleteUserByPcIds(pcIds);
 
     }

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -75,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND u.user_name like concat('%', #{userName}, '%')
 		</if>
 		<if test="pcId != null "> AND u.pc_id = #{pcId}</if>
+		<!--<if test="pcIds != null "> AND u.pc_ids = #{pcIds}</if>-->
 		<if test="status != null and status != ''">
 			AND u.status = #{status}
 		</if>
@@ -94,6 +95,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		${params.dataScope}
 	</select>
 
+	<!--仅查询领导账号使用-->
+    <select id="selectldUserlist" parameterType="SysUser" resultMap="SysUserResult">
+		select u.user_id, u.dept_id, u.nick_name, u.user_name,u.pc_id,u.pc_ids,u.pc_names,u.vote_ids, u.item_ids, u.item_names,u.uid, u.sex, u.email, u.avatar, u.phonenumber, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		left join sys_dept d on u.dept_id = d.dept_id
+		where u.del_flag = '0'
+		<if test="pcIds != null "> AND u.pc_ids = #{pcIds}</if>
+		<if test="pcIds == null "> AND u.pc_ids IS NOT NULL</if>
+		<!-- 数据范围过滤 -->
+		${params.dataScope}
+	</select>
+
+
+	
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name,u.pc_id,u.pc_ids,u.pc_names,u.vote_ids,u.item_ids, u.item_names,u.uid, u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u
@@ -242,17 +256,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		update sys_user set del_flag = '2' where user_id = #{userId}
  	</delete>
  	
- 	<delete id="deleteUserByIds" parameterType="Long">
+ 	<!--<delete id="deleteUserByIds" parameterType="Long">
  		update sys_user set del_flag = '2' where user_id in
  		<foreach collection="array" item="userId" open="(" separator="," close=")">
  			#{userId}
         </foreach> 
+ 	</delete>-->
+ 	<delete id="deleteUserByIds" parameterType="Long">
+		delete from sys_user where user_id in
+ 		<foreach collection="array" item="userId" open="(" separator="," close=")">
+ 			#{userId}
+        </foreach>
  	</delete>
+
  	<delete id="deleteUserByPcIds" parameterType="Long">
- 		update sys_user set del_flag = '2' where pc_id in
+ 		delete from sys_user  where pc_id in
  		<foreach collection="array" item="pcId" open="(" separator="," close=")">
  			#{pcId}
         </foreach>
  	</delete>
-
 </mapper>