zjugis-business/src/main/java/com/zjugis/business/enums/ErrorCodeConstants.java

@@ -38,6 +38,8 @@ public interface ErrorCodeConstants {
     ErrorCode SEAL_NOT_EXISTS = new ErrorCode(3-001-006-000, "公章申请记录不存在");
 
     ErrorCode CONTRACT_F_NOT_EXISTS = new ErrorCode(3-001-007-001, "合同记录不存在");
+
+    ErrorCode INTERN_NOT_EXISTS = new ErrorCode(1001, "录用申请记录不存在");
     // ========== ATTENDANCE_NOTE 考勤说明条模块 3-001-006-000 ==========
 
 }

zjugis-business/src/main/java/com/zjugis/business/flow/intern/controller/vo/InternPageVO.java

@@ -1,5 +1,7 @@
 package com.zjugis.business.flow.intern.controller.vo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.zjugis.framework.common.pojo.PageParam;
 import lombok.Data;
 
@@ -15,6 +17,7 @@ public class InternPageVO extends PageParam {
     /**
      * 主键ID
      */
+    @TableId(type = IdType.ASSIGN_UUID)
     private String id;
 
     /**
@@ -62,213 +65,58 @@ public class InternPageVO extends PageParam {
 
 
     /**
-     * 面试时间
+     * 开始实习日期
      */
-    private LocalDateTime mssj;
+    private LocalDateTime ssxrq;
 
     /**
-     * 仪容仪表分值
+     * 结束实习日期
      */
-    private Integer yrybf;
+    private LocalDateTime esxrq;
 
     /**
-     * 仪容仪表评语
+     * 实习期  月
      */
-    private String yrybp;
+    private BigDecimal sxq;
 
     /**
-     * 说服力分值
+     * 申请录用日期
      */
-    private Integer sflf;
+    private LocalDateTime applyTime;
 
     /**
-     * 说服力评语
+     * 实习期工作报告
      */
-    private String sflp;
+    private String report;
 
     /**
-     * 商务礼仪分值
+     * 部门经理录用意见 是否同意
      */
-    private Integer swlyf;
+    private String bmjlly;
 
     /**
-     * 商务礼仪评语
+     * 综合管理部录用意见 是否同意
      */
-    private String swlyp;
+    private String zhglly;
 
     /**
-     * 抗压性分值
+     * 试用期 录用薪资
      */
-    private Integer kyxf;
+    private BigDecimal syxz;
 
     /**
-     * 抗压性评语
+     * 转正录用薪资
      */
-    private String kyxp;
+    private BigDecimal zzxz;
 
     /**
-     * 沟通分值
+     * 等级
      */
-    private Integer gtf;
+    private String nldj;
 
     /**
-     * 沟通评语
+     * 实习期抵消试用期
      */
-    private String gtp;
-
-    /**
-     * 出差分值
-     */
-    private Integer ccf;
-
-    /**
-     * 出差评语
-     */
-    private String ccp;
-
-    /**
-     * 态度分值
-     */
-    private Integer tdf;
-
-    /**
-     * 态度评语
-     */
-    private String tdp;
-
-    /**
-     * 学习力分值
-     */
-    private Integer xxlf;
-
-    /**
-     * 学习力评语
-     */
-    private String xxlp;
-
-    /**
-     * 证件交验情况
-     */
-    private String zjjy;
-
-    /**
-     * 初试意见
-     */
-    private String csyj;
-
-    /**
-     * 部门意见-结论
-     */
-    private String bmyjjl;
-
-    /**
-     * 部门意见-建议等级
-     */
-    private String bmyjjydj;
-
-    /**
-     * 部门意见-试用期工资
-     */
-    private BigDecimal bmyjsyxz;
-
-    /**
-     * 部门意见-转正工资
-     */
-    private BigDecimal bmyjzzxz;
-
-    /**
-     * 用工性质
-     */
-    private String ygxz;
-
-    /**
-     * 等级初定
-     */
-    private String djcd;
-
-    /**
-     * 试用期基本工资
-     */
-    private BigDecimal syjbyx;
-
-    /**
-     * 试用期基本绩效
-     */
-    private BigDecimal syjx;
-
-    /**
-     * 转正基本工资
-     */
-    private BigDecimal zzjbyx;
-
-    /**
-     * 转正基本绩效
-     */
-    private BigDecimal zzjx;
-
-    /**
-     * 拟定劳务期 （年）
-     */
-    private Integer lwq;
-
-    /**
-     * 试用期（月）
-     */
-    private Integer syq;
-
-    /**
-     * 分配岗位
-     */
-    private String fpgw;
-
-    /**
-     * 报到日期
-     */
-    private LocalDateTime bdrq;
-    /**
-     * 登录名称
-     */
-    private String loginName;
-    /**
-     * 身份证号
-     */
-    private String sfzh;
-    /**
-     * 性别
-     */
-    private Integer sex;
-    /**
-     * 手机号
-     */
-    private String mobile;
-    /**
-     * 业务技术
-     */
-    private String ywjs;
-
-    /**
-     * 项目能力
-     */
-    private String xmnl;
-
-    /**
-     * 沟通表达
-     */
-    private String gtbd;
-
-    /**
-     * 综合评价
-     */
-    private String zhpj;
-
-    /**
-     * 面试官id
-     */
-    private String msgid;
-
-    /**
-     * 面试官姓名
-     */
-    private String msgxm;
+    private BigDecimal dxsyq;
 
 }

zjugis-business/src/main/java/com/zjugis/business/flow/intern/controller/vo/InternVO.java

@@ -1,5 +1,7 @@
 package com.zjugis.business.flow.intern.controller.vo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.zjugis.framework.common.validation.IdCard;
 import com.zjugis.framework.common.validation.Mobile;
 import lombok.Data;
@@ -16,6 +18,7 @@ public class InternVO {
     /**
      * 主键ID
      */
+    @TableId(type = IdType.ASSIGN_UUID)
     private String id;
 
     /**
@@ -63,215 +66,59 @@ public class InternVO {
 
 
     /**
-     * 面试时间
+     * 开始实习日期
      */
-    private LocalDateTime mssj;
+    private LocalDateTime ssxrq;
 
     /**
-     * 仪容仪表分值
+     * 结束实习日期
      */
-    private Integer yrybf;
+    private LocalDateTime esxrq;
 
     /**
-     * 仪容仪表评语
+     * 实习期  月
      */
-    private String yrybp;
+    private BigDecimal sxq;
 
     /**
-     * 说服力分值
+     * 申请录用日期
      */
-    private Integer sflf;
+    private LocalDateTime applyTime;
 
     /**
-     * 说服力评语
+     * 实习期工作报告
      */
-    private String sflp;
+    private String report;
 
     /**
-     * 商务礼仪分值
+     * 部门经理录用意见 是否同意
      */
-    private Integer swlyf;
+    private String bmjlly;
 
     /**
-     * 商务礼仪评语
+     * 综合管理部录用意见 是否同意
      */
-    private String swlyp;
+    private String zhglly;
 
     /**
-     * 抗压性分值
+     * 试用期 录用薪资
      */
-    private Integer kyxf;
+    private BigDecimal syxz;
 
     /**
-     * 抗压性评语
+     * 转正录用薪资
      */
-    private String kyxp;
+    private BigDecimal zzxz;
 
     /**
-     * 沟通分值
+     * 等级
      */
-    private Integer gtf;
+    private String nldj;
 
     /**
-     * 沟通评语
+     * 实习期抵消试用期
      */
-    private String gtp;
+    private BigDecimal dxsyq;
 
-    /**
-     * 出差分值
-     */
-    private Integer ccf;
-
-    /**
-     * 出差评语
-     */
-    private String ccp;
-
-    /**
-     * 态度分值
-     */
-    private Integer tdf;
-
-    /**
-     * 态度评语
-     */
-    private String tdp;
-
-    /**
-     * 学习力分值
-     */
-    private Integer xxlf;
-
-    /**
-     * 学习力评语
-     */
-    private String xxlp;
-
-    /**
-     * 证件交验情况
-     */
-    private String zjjy;
-
-    /**
-     * 初试意见
-     */
-    private String csyj;
-
-    /**
-     * 部门意见-结论
-     */
-    private String bmyjjl;
-
-    /**
-     * 部门意见-建议等级
-     */
-    private String bmyjjydj;
-
-    /**
-     * 部门意见-试用期工资
-     */
-    private BigDecimal bmyjsyxz;
-
-    /**
-     * 部门意见-转正工资
-     */
-    private BigDecimal bmyjzzxz;
-
-    /**
-     * 用工性质
-     */
-    private String ygxz;
-
-    /**
-     * 等级初定
-     */
-    private String djcd;
-
-    /**
-     * 试用期基本工资
-     */
-    private BigDecimal syjbyx;
-
-    /**
-     * 试用期基本绩效
-     */
-    private BigDecimal syjx;
-
-    /**
-     * 转正基本工资
-     */
-    private BigDecimal zzjbyx;
-
-    /**
-     * 转正基本绩效
-     */
-    private BigDecimal zzjx;
-
-    /**
-     * 拟定劳务期 （年）
-     */
-    private Integer lwq;
-
-    /**
-     * 试用期（月）
-     */
-    private Integer syq;
-
-    /**
-     * 分配岗位
-     */
-    private String fpgw;
-    /**
-     * 报到日期
-     */
-    private LocalDateTime bdrq;
-
-    /**
-     * 登录名称
-     */
-    private String loginName;
-    /**
-     * 身份证号
-     */
-    @IdCard
-    private String sfzh;
-    /**
-     * 性别
-     */
-    private Integer sex;
-    /**
-     * 手机号
-     */
-    @Mobile
-    private String mobile;
-    /**
-     * 业务技术
-     */
-    private String ywjs;
-
-    /**
-     * 项目能力
-     */
-    private String xmnl;
-
-    /**
-     * 沟通表达
-     */
-    private String gtbd;
-
-    /**
-     * 综合评价
-     */
-    private String zhpj;
-
-    /**
-     * 面试官id
-     */
-    private String msgid;
-
-    /**
-     * 面试官姓名
-     */
-    private String msgxm;
 
 }

zjugis-business/src/main/java/com/zjugis/business/flow/intern/entity/InternDO.java

@@ -76,7 +76,7 @@ public class InternDO extends BaseEntity {
     /**
      * 实习期  月
      */
-    private Integer sxq;
+    private BigDecimal sxq;
 
     /**
      * 申请录用日期
@@ -116,7 +116,7 @@ public class InternDO extends BaseEntity {
     /**
      * 实习期抵消试用期
      */
-    private Integer dxsyq;
+    private BigDecimal dxsyq;
 
 
 }

zjugis-business/src/main/java/com/zjugis/business/flow/intern/service/InternServiceImpl.java

@@ -1,31 +1,23 @@
 package com.zjugis.business.flow.intern.service;
 
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zjugis.business.constants.DictConstants;
 import com.zjugis.business.constants.FlowStatusConstants;
 import com.zjugis.business.converter.common.SelectConvert;
 import com.zjugis.business.converter.intern.InternConvert;
-import com.zjugis.business.converter.interview.InterviewConvert;
 import com.zjugis.business.flow.intern.controller.dto.InternPageDTO;
 import com.zjugis.business.flow.intern.controller.vo.InternVO;
 import com.zjugis.business.flow.intern.dao.InternDAO;
 import com.zjugis.business.flow.intern.entity.InternDO;
-import com.zjugis.business.flow.staff.controller.dto.StaffDictDTO;
-import com.zjugis.business.utils.IdCardUtil;
 import com.zjugis.framework.common.pojo.CommonResult;
 import com.zjugis.framework.common.pojo.PageResult;
 import com.zjugis.framework.common.util.date.LocalDateTimeUtils;
-import com.zjugis.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zjugis.framework.security.core.util.SecurityFrameworkUtils;
 import com.zjugis.framework.workflow.model.IFlowInstance;
 import com.zjugis.framework.workflow.rpc.remote.WorkflowClient;
 import com.zjugis.module.adm.api.staff.StaffApi;
 import com.zjugis.module.adm.api.staff.dto.StaffDeptPostDTO;
-import com.zjugis.module.adm.api.staff.dto.StaffReportDTO;
-import com.zjugis.module.adm.api.staff.dto.StaffStateDTO;
 import com.zjugis.module.system.api.dict.DictDataApi;
 import com.zjugis.module.system.api.dict.dto.DictDataRespDTO;
 import com.zjugis.module.system.api.user.AdminUserApi;
@@ -37,7 +29,7 @@ import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.*;
 
-import static com.zjugis.business.enums.ErrorCodeConstants.INTERVIEW_NOT_EXISTS;
+import static com.zjugis.business.enums.ErrorCodeConstants.INTERN_NOT_EXISTS;
 import static com.zjugis.business.enums.ErrorCodeConstants.MOBILE_EXIST;
 import static com.zjugis.framework.common.exception.util.ServiceExceptionUtil.exception;
 
@@ -99,7 +91,7 @@ public class InternServiceImpl implements InternService {
 
     private void validateExists(String id) {
         if (internDAO.selectById(id) == null) {
-            throw exception(INTERVIEW_NOT_EXISTS);
+            throw exception(INTERN_NOT_EXISTS);
         }
     }
 

zjugis-business/src/main/resources/templates/Intern/index.ftl

@@ -14,6 +14,7 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
                 <div class="z-form-row" style="display: none;">
                     <input type="text" value="${formEntity.instanceId!}" name="createReqVO$instanceId">
                     <input type="text" value="${formEntity.id!}" name="createReqVO$id">
+                    <input type="text" value="${formEntity.userId!}" name="createReqVO$userId">
                 </div>
                 <div class="form-title" style="margin-top: 0;">
                     <div class="form-icon">
@@ -129,35 +130,6 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
 
                         </tr>
 
-
-                        <tr>
-                            <td class="th">
-                                <div class="form-label">正常转正时间：</div>
-                            </td>
-                            <td>
-                                <div class="form-group">
-                                    <div class="form-item">
-                                        <div class="z-comp-date" name="createReqVO$zzsj">
-                                            <input type="text" value="${(formEntity.zzsj?date)!}">
-                                        </div>
-                                    </div>
-                                </div>
-                            </td>
-
-
-                            <td class="th">
-                                <div class="form-label"></div>
-                            </td>
-                            <td>
-                                <div class="form-group">
-                                    <div class="form-item">
-
-                                    </div>
-                                </div>
-                            </td>
-
-                        </tr>
-
                     </table>
                 </div>
 
@@ -209,12 +181,12 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
                                         <td>
                                             <div class="form-group">
                                                 <div class="form-item" style="margin: 10px 0;">
-                                                    <div class="z-comp-radio" name="createReqVO$rztb">
-                                                        <div class="z-radio-item <#if (formEntity.rztb!)? contains("1")>checked</#if>"
+                                                    <div class="z-comp-radio" name="createReqVO$bmjlly">
+                                                        <div class="z-radio-item <#if (formEntity.bmjlly!)? contains("1")>checked</#if>"
                                                              value="1"><i></i>是
                                                         </div>
-                                                        <div class="z-radio-item <#if (formEntity.rztb!)? contains("2")>checked</#if>"
-                                                             value="2"><i></i>否
+                                                        <div class="z-radio-item <#if (formEntity.bmjlly!)? contains("0")>checked</#if>"
+                                                             value="0"><i></i>否
                                                         </div>
                                                     </div>
                                                 </div>
@@ -247,12 +219,12 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
                                         <td>
                                             <div class="form-group">
                                                 <div class="form-item" style="margin: 10px 0;">
-                                                    <div class="z-comp-radio" name="createReqVO$rztb">
-                                                        <div class="z-radio-item <#if (formEntity.rztb!)? contains("1")>checked</#if>"
+                                                    <div class="z-comp-radio" name="createReqVO$zhglly">
+                                                        <div class="z-radio-item <#if (formEntity.zhglly!)? contains("1")>checked</#if>"
                                                              value="1"><i></i>是
                                                         </div>
-                                                        <div class="z-radio-item <#if (formEntity.rztb!)? contains("2")>checked</#if>"
-                                                             value="2"><i></i>否
+                                                        <div class="z-radio-item <#if (formEntity.zhglly!)? contains("0")>checked</#if>"
+                                                             value="0"><i></i>否
                                                         </div>
                                                     </div>
                                                 </div>
@@ -261,20 +233,43 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
                                     </tr>
 
                                     <tr>
-                                        <td style="background-color: #e6e9ef">试用期录用薪酬：</td>
+                                        <td style="background-color: #e6e9ef">录用薪酬：</td>
                                         <td class="th">
                                             <div class="zdr-table-info" style="display: flex; align-items: center;">
-                                                缴纳至
-                                                <div class="z-comp-input" name="createReqVO$clfscb9"
-                                                     style="width: 60px; display: inline-block; margin: 10px;">
-                                                    <input type="number" value="${formEntity.clfscb9!}">
+                                                试用期：
+                                                <div class="z-comp-input" name="createReqVO$syxz"
+                                                     style="width: 100px; display: inline-block; margin: 10px;">
+                                                    <input type="number" value="${formEntity.syxz!}">
+                                                </div>
+                                                元
+                                            </div>
+                                            <div class="zdr-table-info" style="display: flex; align-items: center;">
+                                                转正：
+                                                <div class="z-comp-input" name="createReqVO$zzxz"
+                                                     style="width: 100px; display: inline-block; margin: 10px;">
+                                                    <input type="number" value="${formEntity.zzxz!}">
                                                 </div>
-                                                月底，
-                                                <div class="z-comp-input" name="createReqVO$clfscb10"
-                                                     style="width: 60px; display: inline-block; margin: 10px;">
-                                                    <input type="number" value="${formEntity.clfscb10!}">
+                                                元
+                                            </div>
+
+                                            <div class="zdr-table-info" style="display: flex; align-items: center;">
+                                                等级：
+                                                <div class="z-comp-select" name="createReqVO$nldj"
+                                                     data='${ABILITY_LEVEL!}' value="${formEntity.nldj!}"
+                                                     style="width: 100px; display: inline-block; margin: 10px;">
+                                                    <div class="z-inputselect-bar">
+                                                        <span></span><i></i>
+                                                    </div>
+                                                </div>
+                                            </div>
+
+                                            <div class="zdr-table-info" style="display: flex; align-items: center;">
+                                                实习期抵消
+                                                <div class="z-comp-input" name="createReqVO$dxsyq"
+                                                     style="width: 80px; display: inline-block; margin: 10px;">
+                                                    <input type="number" value="${formEntity.dxsyq!}">
                                                 </div>
-                                                月初停止缴纳
+                                                个月试用期
                                             </div>
                                         </td>
                                     </tr>

zjugis-business/src/main/resources/templates/Intern/js/index.js

@@ -1,11 +1,6 @@
 (function () {
-    let list = []
-    let read = z.ui.comm.getUrlParam("read");
 
     window.onload = function (ex) {
-
-        initStaff();//获取所有员工
-        getStaff();
         bindEvents();
     }
 
@@ -16,21 +11,7 @@
     }
 
 
-    //新员工姓名查询
-    function initStaff() {
-        z.ui.ajax({
-            type: "get",
-            url: "/common/user-tree",
-            data: {},
-            success: function (res) {
-                if (res && res.length > 0) {
-                    selecttree("[name='nickname']", res, clickUser)
-                }
-            },
-            error: function () {
-            }
-        })
-    }
+
 
 
     /*
@@ -47,15 +28,15 @@
         //将string类型的时间转换成时间戳
         for (let key of Object.keys(postData)) {
             let mealName = postData[key];
-            mealName.rgssj = Date.parse(mealName.rgssj + "");
+            mealName.applyTime = Date.parse(mealName.applyTime + "");
+            mealName.ssxrq = Date.parse(mealName.ssxrq + "");
             mealName.zzsj = Date.parse(mealName.zzsj + "");
-            mealName.txsj = Date.parse(mealName.txsj + "");
             postData.createReqVO = mealName;
         }
 
         z.ui.ajax({
             type: "post",
-            url: "/regular/update",
+            url: "/intern/update",
             data: JSON.stringify(postData.createReqVO),
             contentType: "application/json",
             success: function (res) {
@@ -73,44 +54,5 @@
         })
     }
 
-
-    function clickUser(even, treeId, treeNode) {
-        $("[name='createReqVO$nickname']").val(treeNode.name);
-        $("[name='createReqVO$userId']").val(treeNode.id);
-        getStaff();
-    }
-
-
-    function getStaff() {
-        var userId = $("input[name='createReqVO$userId']").val();
-        if (userId) {
-            selectUser(userId, function (userData) {
-                var staff = userData.data;
-                // 在成功获取到用户数据后，将用户名赋值给 createReqVO$nickname
-
-                z.ui.input("[name='createReqVO$deptName']").setValue(staff.deptName); //部门
-                $("[name='createReqVO$deptId']").val(staff.deptId);//部门id
-                z.ui.select("[name='createReqVO$ypgw']").setValue(staff.postName); //岗位
-            });
-        }
-    }
-
-
-    function selectUser(userId, callback) {
-        $.ajax({
-            type: "GET",
-            url: "/staff/getStaff",
-            data: {userId: userId}, // 请求参数应该以对象形式传递
-            contentType: "application/json",
-            success: function (res) {
-                // 在这里处理成功获取到的数据，你可以根据需要调用回调函数
-                callback(res);
-            },
-            error: function () {
-
-            }
-        });
-    }
-
 }());