Merge remote-tracking branch 'origin/main'

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

@@ -109,6 +109,31 @@ public class SysDeptController extends BaseController
         dept.setUpdateBy(getUsername());
         return toAjax(deptService.updateDept(dept));
     }
+    /**
+     * 修改部门附件专用接口
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:edit')")
+    @Log(title = "部门管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/editDocs")
+    public AjaxResult editDocs(@Validated @RequestBody SysDept dept)
+    {
+        /*Long deptId = dept.getDeptId();
+        deptService.checkDeptDataScope(deptId);
+        if (!deptService.checkDeptNameUnique(dept))
+        {
+            return error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+        }
+        else if (dept.getParentId().equals(deptId))
+        {
+            return error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
+        }
+        else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0)
+        {
+            return error("该部门包含未停用的子部门！");
+        }*/
+        dept.setUpdateBy(getUsername());
+        return toAjax(deptService.updateDept(dept));
+    }
 
     /**
      * 删除部门

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -42,6 +42,11 @@ public class SysDept extends BaseEntity
 
     /** 邮箱 */
     private String email;
+    /** 附件 */
+    private String docs;
+
+    /** 附件简介 */
+    private String docDiscrip;
 
     /** 部门状态:0正常,1停用 */
     private String status;
@@ -85,6 +90,22 @@ public class SysDept extends BaseEntity
         this.ancestors = ancestors;
     }
 
+    public String getDocs() {
+        return docs;
+    }
+
+    public void setDocs(String docs) {
+        this.docs = docs;
+    }
+
+    public String getDocDiscrip() {
+        return docDiscrip;
+    }
+
+    public void setDocDiscrip(String docDiscrip) {
+        this.docDiscrip = docDiscrip;
+    }
+
     @NotBlank(message = "部门名称不能为空")
     @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
     public String getDeptName()
@@ -192,6 +213,8 @@ public class SysDept extends BaseEntity
             .append("leader", getLeader())
             .append("phone", getPhone())
             .append("email", getEmail())
+                .append("docs", getDocs())
+                .append("docDiscrip", getDocDiscrip())
             .append("status", getStatus())
             .append("delFlag", getDelFlag())
             .append("createBy", getCreateBy())

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

@@ -112,7 +112,17 @@ public class KhEmployeeController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody KhEmployee khEmployee)
     {
-        return toAjax(khEmployeeService.updateKhEmployee(khEmployee));
+        return khEmployeeService.updateKhEmployee(khEmployee);
+    }
+    /**
+     * 修改职工附件专用接口
+     */
+    @PreAuthorize("@ss.hasPermi('kaohe:employee:docs')")
+    @Log(title = "职工信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/editDocs")
+    public AjaxResult editDocs(@RequestBody KhEmployee khEmployee)
+    {
+        return khEmployeeService.updateKhEmployeeDocs(khEmployee);
     }
 
     /**

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

@@ -3,12 +3,9 @@ package com.ruoyi.kaohe.controller;
 import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
-import com.ruoyi.kaohe.domain.KhPcEmp;
+
-import com.ruoyi.kaohe.domain.KhPingce;
+import com.ruoyi.kaohe.domain.*;
-import com.ruoyi.kaohe.domain.KhVoteEmp;
+import com.ruoyi.kaohe.service.*;
-import com.ruoyi.kaohe.service.IKhPcEmpService;
-import com.ruoyi.kaohe.service.IKhPingceService;
-import com.ruoyi.kaohe.service.IKhVoteEmpService;
 import org.springframework.scheduling.annotation.Scheduled;
 import java.math.BigDecimal;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -26,8 +23,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.KhVote;
-import com.ruoyi.kaohe.service.IKhVoteService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -48,6 +43,8 @@ public class KhVoteController extends BaseController {
     private IKhVoteEmpService voteEmpService;
     @Autowired
     private IKhPingceService khPingceService;
+    @Autowired
+    private IKhTemItemService khTemItemService;
 
     @Scheduled(cron = "0 * * * * ?") // 每分钟的第0秒执行一次   监测时间修改评分状态
     public void performTask() {
@@ -78,9 +75,15 @@ public class KhVoteController extends BaseController {
         List<KhPingce> pingces = khPingceService.selectKhPingceList(param);
         for (KhPingce pingce : pingces) {
             boolean finishflag=true;
+            //查询考核任务下面有几个考核项
+            KhTemItem  temItem = new KhTemItem();
+            temItem.setTemId(pingce.getTemplateId());
+            int itemNo = khTemItemService.selectKhTemItemList(temItem).size();
+            //查询考核任务已有评测任务
             KhVote khVote = new KhVote();
             khVote.setPingceId(pingce.getId());
             List<KhVote> khVotes = khVoteService.selectKhVoteList(khVote);
+            if(khVotes.size()==itemNo){ //任务下所有考核项都已经发布
                 for (KhVote vote : khVotes) {
                     if(!vote.getState().equals("2")){
                         finishflag=false;
@@ -95,6 +98,8 @@ public class KhVoteController extends BaseController {
 
         }
 
+    }
+
     /**
      * 查询投票评测列表
      */

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

@@ -98,9 +98,13 @@ public class KhEmployee extends BaseEntity {
     private String education;
 
     /** 文档 */
-    @Excel(name = "文档")
+   // @Excel(name = "文档")
     private String docs;
 
+    /** 附件简介 */
+    @Excel(name = "附件简介")
+    private String docDiscrip;
+
     /**
      * 家庭住址
      */
@@ -119,6 +123,14 @@ public class KhEmployee extends BaseEntity {
     @Excel(name = "紧急联系人电话")
     private String contactPhone;
 
+    public String getDocDiscrip() {
+        return docDiscrip;
+    }
+
+    public void setDocDiscrip(String docDiscrip) {
+        this.docDiscrip = docDiscrip;
+    }
+
     public String getWordId() {
         return wordId;
     }
@@ -281,6 +293,7 @@ public class KhEmployee extends BaseEntity {
                 .append("openingBank", getOpeningBank())
                 .append("education", getEducation())
                 .append("docs", getDocs())
+                .append("docDiscrip", getDocDiscrip())
                 .append("address", getAddress())
                 .append("contact", getContact())
                 .append("contactPhone", getContactPhone())

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/IKhEmployeeService.java

@@ -43,7 +43,7 @@ public interface IKhEmployeeService
      * @param khEmployee 职工信息
      * @return 结果
      */
-    public int updateKhEmployee(KhEmployee khEmployee);
+    public AjaxResult updateKhEmployee(KhEmployee khEmployee);
 
     /**
      * 批量删除职工信息
@@ -62,4 +62,6 @@ public interface IKhEmployeeService
     public int deleteKhEmployeeById(Long id);
 
     String importEmp(List<KhEmployee> empList, boolean updateSupport, String operName);
+
+    AjaxResult updateKhEmployeeDocs(KhEmployee khEmployee);
 }

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhEmployeeServiceImpl.java

@@ -90,7 +90,7 @@ public class KhEmployeeServiceImpl implements IKhEmployeeService {
                 user.setNickName(khEmployee.getEmpName());
                 user.setPassword(SecurityUtils.encryptPassword("111111"));
                 user.setDeptId(khEmployee.getDeptId());
-                Long[] roleIds = {102L};  //固定的评分账号角色id
+                Long[] roleIds = {102L};  //固定的职工账号角色id
                 user.setRoleIds(roleIds);
                 userService.insertUser(user);
             }
@@ -108,9 +108,40 @@ public class KhEmployeeServiceImpl implements IKhEmployeeService {
      * @return 结果
      */
     @Override
-    public int updateKhEmployee(KhEmployee khEmployee) {
+    public AjaxResult updateKhEmployee(KhEmployee khEmployee) {
+        //如果修改了工号，验证工号不能已存在其他职工上面
+        KhEmployee param = new KhEmployee();
+        param.setWordId(khEmployee.getWordId());
+        List<KhEmployee> e = khEmployeeMapper.selectKhEmployeeList(param);
+        if (e!=null&& e.size() == 1) {
+            if(e.get(0).getId()!=khEmployee.getId()){
+                return AjaxResult.error("修改失败，工号已存在！");
+            }else{//没有修改员工工号  则直接修改
+                return khEmployeeMapper.updateKhEmployee(khEmployee)>0 ? AjaxResult.success() : AjaxResult.error();
+            }
+        }else{ //给当前员工，修改了一个新的工号
             khEmployee.setUpdateTime(DateUtils.getNowDate());
-        return khEmployeeMapper.updateKhEmployee(khEmployee);
+            int r =khEmployeeMapper.updateKhEmployee(khEmployee);
+            ///生成对应的用户账号，工号为账号
+            SysUser user= new SysUser();
+            user.setUserName(khEmployee.getWordId());
+            if (userService.checkUserNameUnique(user))
+            {
+                user.setCreateBy(getUsername());
+                user.setNickName(khEmployee.getEmpName());
+                user.setPassword(SecurityUtils.encryptPassword("111111"));
+                user.setDeptId(khEmployee.getDeptId());
+                Long[] roleIds = {102L};  //固定的职工账号角色id
+                user.setRoleIds(roleIds);
+                userService.insertUser(user);
+            }
+            return r>0 ? AjaxResult.success() : AjaxResult.error();
+        }
+    }
+
+    @Override
+    public AjaxResult updateKhEmployeeDocs(KhEmployee khEmployee) {
+        return khEmployeeMapper.updateKhEmployee(khEmployee)>0 ? AjaxResult.success() : AjaxResult.error();
     }
 
     /**

ruoyi-kaohe/src/main/resources/mapper/kaohe/KhEmployeeMapper.xml

@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="openingBank"    column="opening_bank"    />
         <result property="education"    column="education"    />
         <result property="docs"    column="docs"    />
+        <result property="docDiscrip"    column="doc_discrip"    />
         <result property="address"    column="address"    />
         <result property="contact"    column="contact"    />
         <result property="contactPhone"    column="contact_phone"    />
@@ -31,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectKhEmployeeVo">
-        select id, user_id, dept_id, dept_name, emp_name,word_id, `position`, sex, age, phone, idcard, bank_card_number, opening_bank, education,docs, address, contact, contact_phone, create_by, create_time, update_by, update_time, remark from kh_employee
+        select id, user_id, dept_id, dept_name, emp_name,word_id, `position`, sex, age, phone, idcard, bank_card_number, opening_bank, education,docs,doc_discrip, address, contact, contact_phone, create_by, create_time, update_by, update_time, remark from kh_employee
     </sql>
 
     <select id="selectKhEmployeeList" parameterType="KhEmployee" resultMap="KhEmployeeResult">
@@ -51,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="openingBank != null  and openingBank != ''"> and opening_bank = #{openingBank}</if>
             <if test="education != null  and education != ''"> and education = #{education}</if>
             <if test="docs != null  and docs != ''"> and docs = #{docs}</if>
+            <if test="docDiscrip != null  and docDiscrip != ''"> and doc_discrip = #{docDiscrip}</if>
             <if test="address != null  and address != ''"> and address = #{address}</if>
             <if test="contact != null  and contact != ''"> and contact = #{contact}</if>
             <if test="contactPhone != null  and contactPhone != ''"> and contact_phone = #{contactPhone}</if>
@@ -79,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="openingBank != null">opening_bank,</if>
             <if test="education != null">education,</if>
             <if test="docs != null">docs,</if>
+            <if test="docDiscrip != null">doc_discrip,</if>
             <if test="address != null">address,</if>
             <if test="contact != null">contact,</if>
             <if test="contactPhone != null">contact_phone,</if>
@@ -103,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="openingBank != null">#{openingBank},</if>
             <if test="education != null">#{education},</if>
             <if test="docs != null">#{docs},</if>
+            <if test="docDiscrip != null">#{docDiscrip},</if>
             <if test="address != null">#{address},</if>
             <if test="contact != null">#{contact},</if>
             <if test="contactPhone != null">#{contactPhone},</if>
@@ -131,6 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="openingBank != null">opening_bank = #{openingBank},</if>
             <if test="education != null">education = #{education},</if>
             <if test="docs != null">docs = #{docs},</if>
+            <if test="docDiscrip != null">doc_discrip = #{docDiscrip},</if>
             <if test="address != null">address = #{address},</if>
             <if test="contact != null">contact = #{contact},</if>
             <if test="contactPhone != null">contact_phone = #{contactPhone},</if>

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

@@ -1,29 +1,44 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysDeptMapper">
 
     <resultMap type="SysDept" id="SysDeptResult">
-		<id     property="deptId"     column="dept_id"     />
+        <id property="deptId" column="dept_id"/>
-		<result property="parentId"   column="parent_id"   />
+        <result property="parentId" column="parent_id"/>
-		<result property="ancestors"  column="ancestors"   />
+        <result property="ancestors" column="ancestors"/>
-		<result property="deptName"   column="dept_name"   />
+        <result property="deptName" column="dept_name"/>
-		<result property="orderNum"   column="order_num"   />
+        <result property="orderNum" column="order_num"/>
-		<result property="leader"     column="leader"      />
+        <result property="leader" column="leader"/>
-		<result property="phone"      column="phone"       />
+        <result property="phone" column="phone"/>
-		<result property="email"      column="email"       />
+        <result property="email" column="email"/>
-		<result property="status"     column="status"      />
+        <result property="docs" column="docs"/>
-		<result property="delFlag"    column="del_flag"    />
+        <result property="docDiscrip" column="doc_discrip"/>
-		<result property="parentName" column="parent_name" />
+        <result property="status" column="status"/>
-		<result property="createBy"   column="create_by"   />
+        <result property="delFlag" column="del_flag"/>
-		<result property="createTime" column="create_time" />
+        <result property="parentName" column="parent_name"/>
-		<result property="updateBy"   column="update_by"   />
+        <result property="createBy" column="create_by"/>
-		<result property="updateTime" column="update_time" />
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectDeptVo">
-        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time 
+        select d.dept_id,
+               d.parent_id,
+               d.ancestors,
+               d.dept_name,
+               d.order_num,
+               d.leader,
+               d.phone,
+               d.email,
+               d.docs,
+               d.doc_discrip,
+               d.status,
+               d.del_flag,
+               d.create_by,
+               d.create_time
         from sys_dept d
     </sql>
 
@@ -39,6 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="deptName != null and deptName != ''">
             AND dept_name like concat('%', #{deptName}, '%')
         </if>
+        <!--<if test="docs != null  and docs != ''"> and docs = #{docs}</if>
+        <if test="docDiscrip != null  and docDiscrip != ''"> and doc_discrip = #{docDiscrip}</if>-->
         <if test="status != null and status != ''">
             AND status = #{status}
         </if>
@@ -53,33 +70,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sys_role_dept rd on d.dept_id = rd.dept_id
         where rd.role_id = #{roleId}
         <if test="deptCheckStrictly">
-              and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})
+            and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id =
+            rd.dept_id and rd.role_id = #{roleId})
         </if>
         order by d.parent_id, d.order_num
     </select>
 
     <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
-		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
+        select d.dept_id,
+               d.parent_id,
+               d.ancestors,
+               d.dept_name,
+               d.order_num,
+               d.leader,
+               d.phone,
+               d.email,
+               d.docs,
+               d.doc_discrip,
+               d.status,
                (select dept_name from sys_dept where dept_id = d.parent_id) parent_name
         from sys_dept d
         where d.dept_id = #{deptId}
     </select>
 
     <select id="checkDeptExistUser" parameterType="Long" resultType="int">
-		select count(1) from sys_user where dept_id = #{deptId} and del_flag = '0'
+        select count(1)
+        from sys_user
+        where dept_id = #{deptId}
+          and del_flag = '0'
     </select>
 
     <select id="hasChildByDeptId" parameterType="Long" resultType="int">
-		select count(1) from sys_dept
+        select count(1)
-		where del_flag = '0' and parent_id = #{deptId} limit 1
+        from sys_dept
+        where del_flag = '0'
+          and parent_id = #{deptId} limit 1
     </select>
 
     <select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
-		select * from sys_dept where find_in_set(#{deptId}, ancestors)
+        select *
+        from sys_dept
+        where find_in_set(#{deptId}, ancestors)
     </select>
 
     <select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
-		select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors)
+        select count(*)
+        from sys_dept
+        where status = 0
+          and del_flag = '0'
+          and find_in_set(#{deptId}, ancestors)
     </select>
 
     <select id="checkDeptNameUnique" resultMap="SysDeptResult">
@@ -97,6 +136,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="leader != null and leader != ''">leader,</if>
         <if test="phone != null and phone != ''">phone,</if>
         <if test="email != null and email != ''">email,</if>
+        <if test="docs != null">docs,</if>
+        <if test="docDiscrip != null">doc_discrip,</if>
         <if test="status != null">status,</if>
         <if test="createBy != null and createBy != ''">create_by,</if>
         create_time
@@ -109,6 +150,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="leader != null and leader != ''">#{leader},</if>
         <if test="phone != null and phone != ''">#{phone},</if>
         <if test="email != null and email != ''">#{email},</if>
+        <if test="docs != null">#{docs},</if>
+        <if test="docDiscrip != null">#{docDiscrip},</if>
         <if test="status != null">#{status},</if>
         <if test="createBy != null and createBy != ''">#{createBy},</if>
         sysdate()
@@ -125,6 +168,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="leader != null">leader = #{leader},</if>
             <if test="phone != null">phone = #{phone},</if>
             <if test="email != null">email = #{email},</if>
+			<if test="docs != null">docs = #{docs},</if>
+			<if test="docDiscrip != null">doc_discrip = #{docDiscrip},</if>
             <if test="status != null and status != ''">status = #{status},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             update_time = sysdate()
@@ -153,7 +198,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteDeptById" parameterType="Long">
-		update sys_dept set del_flag = '2' where dept_id = #{deptId}
+        update sys_dept
+        set del_flag = '2'
+        where dept_id = #{deptId}
     </delete>
 
 </mapper>