Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

zjugis-business/src/main/java/com/zjugis/business/constants/DictConstants.java

@@ -95,9 +95,14 @@ public class DictConstants {
     /**
      * 紧急联系人关系
      */
-    public static final String contact_type="contact_type";
+    public static final String contact_type = "contact_type";
     /**
      * 民族
      */
-    public static final String nation_type="nation_type";
+    public static final String nation_type = "nation_type";
+
+    /**
+     * 评分标准
+     */
+    public static final String point_standard = "point_standard";
 }

zjugis-business/src/main/java/com/zjugis/business/flow/interview/event/InterviewEvent.java

@@ -50,6 +50,8 @@ public class InterviewEvent extends BaseController {
 
     @Autowired
     DeptApi deptApi;
+    @Resource
+    private DeptLeaderApi deptLeaderApi;
 
     @Autowired
     AdminUserApi adminUserApi;
@@ -184,4 +186,62 @@ public class InterviewEvent extends BaseController {
             throw new BusinessException("执行事件出错，请联系管理员！");
         }
     }
+
+
+
+    /**
+     * 转到部门经理
+     */
+    @PostMapping("/to-dept-manager")
+    public String toDeptManager(String flowInstanceId) {
+        try {
+            if (StringUtils.isNotBlank(flowInstanceId)) {
+                InterviewDO entity = interviewService.findByInstanceId(flowInstanceId);
+                List<Map<String, String>> userMaps = new ArrayList<>();
+                if(StringUtils.isNotBlank(entity.getDeptId())){
+                    CommonResult<DeptRespDTO> result = deptApi.getDept(entity.getDeptId());
+                    DeptRespDTO dept = result.getCheckedData();
+                    if(dept != null && StringUtils.isNotBlank(dept.getLeaderUserId())){
+                        HashMap<String,String> map = new HashMap<>();
+                        map.put("id",dept.getLeaderUserId());
+                        userMaps.add(map);
+                    }
+                }
+                return ok(userMaps);
+            } else {
+                throw new BusinessException("找不到流程id");
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(),e);
+            throw new BusinessException("执行事件出错，请联系管理员！");
+        }
+    }
+
+
+    /**
+     * 转到分管领导
+     */
+    @PostMapping("/to-dept-manager-leader")
+    public String toDeptManagerLeader(String flowInstanceId) {
+        try {
+            if (StringUtils.isNotBlank(flowInstanceId)) {
+                InterviewDO entity = interviewService.findByInstanceId(flowInstanceId);
+                List<Map<String, String>> userMaps = new ArrayList<>();
+                if(StringUtils.isNotBlank(entity.getDeptId())){
+                    DeptLeaderRespDTO deptLeaderRespDTO = deptLeaderApi.getDeptLeaderByDeptId(entity.getDeptId()).getCheckedData();
+                    if (deptLeaderRespDTO != null && StringUtils.isNotBlank(deptLeaderRespDTO.getUserId())) {
+                        HashMap<String, String> map = new HashMap<>();
+                        map.put("id", deptLeaderRespDTO.getUserId());
+                        userMaps.add(map);
+                    }
+                }
+                return ok(userMaps);
+            } else {
+                throw new BusinessException("找不到流程id");
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(),e);
+            throw new BusinessException("执行事件出错，请联系管理员！");
+        }
+    }
 }

zjugis-business/src/main/java/com/zjugis/business/flow/interview/service/InterviewServiceImpl.java

@@ -166,8 +166,6 @@ public class InterviewServiceImpl implements InterviewService {
         }
 
         map.put("resign", JSON.toJSONString(dic));
-
-
         return map;
     }
 
@@ -175,6 +173,7 @@ public class InterviewServiceImpl implements InterviewService {
         List<String> res = new ArrayList<>();
         res.add(DictConstants.ABILITY_LEVEL);
         res.add(DictConstants.post_type);
+        res.add(DictConstants.point_standard);
         return res;
     }
 

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

@@ -34,6 +34,25 @@ styles=[ '/flow/css/formCommon.css' ]>
                     </td>
 
 
+
+
+                    <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$mssj">
+                                    <input type="text" value="${(formEntity.mssj?date)!}">
+                                </div>
+                            </div>
+                        </div>
+                    </td>
+
+                </tr>
+
+
+                <tr>
                     <td class="th">
                         <div class="form-label">应聘岗位：</div>
                     </td>
@@ -52,13 +71,15 @@ styles=[ '/flow/css/formCommon.css' ]>
 
 
                     <td class="th">
-                        <div class="form-label">面试时间：</div>
+                        <div class="form-label">应聘部门：</div>
                     </td>
                     <td>
                         <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-date" name="createReqVO$mssj">
-                                    <input type="text" value="${(formEntity.mssj?date)!}">
+                            <div class="z-comp-selecttree" name="deptName">
+                                <input type="hidden" name="createReqVO$deptName" value="${formEntity.deptName!}">
+                                <input type="hidden" name="createReqVO$deptId" value="${formEntity.deptId!}">
+                                <div class="z-inputselect-bar">
+                                    <span>${formEntity.deptName!}</span><i></i>
                                 </div>
                             </div>
                         </div>
@@ -66,6 +87,7 @@ styles=[ '/flow/css/formCommon.css' ]>
 
                 </tr>
 
+
                 <tr>
                     <td class="th">
                         <div class="form-label">证件交验情况：</div>
@@ -120,7 +142,7 @@ styles=[ '/flow/css/formCommon.css' ]>
         <div class="form-title">
             <div class="form-icon">
                 <img src="/imgs/titleIcon.png" alt="">
-                <span>初始测评结果</span>
+                <span>初始测评结果（分数）</span>
             </div>
         </div>
         <div class="jbxx-box jbxx-box-flex">
@@ -132,8 +154,11 @@ styles=[ '/flow/css/formCommon.css' ]>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$yrybf" style="width: 80px;">
-                                    <input type="number" placeholder="分值" value="${formEntity.yrybf!}">
+                                <div class="z-comp-select" name="createReqVO$yrybf"
+                                     data='${point_standard!}' value="${formEntity.yrybf!}" style="width: 80px;">
+                                    <div class="z-inputselect-bar">
+                                        <span></span><i></i>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -141,7 +166,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$yrybp" style="width: 500px;">
+                                <div class="z-comp-input" name="createReqVO$yrybp" style="width: 300px;">
                                     <input type="text" placeholder="评语" value="${formEntity.yrybp!}">
                                 </div>
                             </div>
@@ -155,8 +180,11 @@ styles=[ '/flow/css/formCommon.css' ]>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$sflf" style="width: 80px; ">
-                                    <input type="number" placeholder="分值" value="${formEntity.sflf!}">
+                                <div class="z-comp-select" name="createReqVO$sflf"
+                                     data='${point_standard!}' value="${formEntity.sflf!}" style="width: 80px;">
+                                    <div class="z-inputselect-bar">
+                                        <span></span><i></i>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -164,7 +192,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$sflp" style="width: 500px; ">
+                                <div class="z-comp-input" name="createReqVO$sflp" style="width: 300px; ">
                                     <input type="text" placeholder="评语" value="${formEntity.sflp!}">
                                 </div>
                             </div>
@@ -180,8 +208,11 @@ styles=[ '/flow/css/formCommon.css' ]>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$swlyf" style="width: 80px;">
-                                    <input type="number" placeholder="分值" value="${formEntity.swlyf!}">
+                                <div class="z-comp-select" name="createReqVO$swlyf"
+                                     data='${point_standard!}' value="${formEntity.swlyf!}" style="width: 80px;">
+                                    <div class="z-inputselect-bar">
+                                        <span></span><i></i>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -189,7 +220,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$swlyp" style="width: 500px;">
+                                <div class="z-comp-input" name="createReqVO$swlyp" style="width: 300px;">
                                     <input type="text" placeholder="评语" value="${formEntity.swlyp!}">
                                 </div>
                             </div>
@@ -203,8 +234,11 @@ styles=[ '/flow/css/formCommon.css' ]>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$kyxf" style="width: 80px; ">
-                                    <input type="number" placeholder="分值" value="${formEntity.kyxf!}">
+                                <div class="z-comp-select" name="createReqVO$kyxf"
+                                     data='${point_standard!}' value="${formEntity.kyxf!}" style="width: 80px;">
+                                    <div class="z-inputselect-bar">
+                                        <span></span><i></i>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -212,7 +246,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$kyxp" style="width: 500px; ">
+                                <div class="z-comp-input" name="createReqVO$kyxp" style="width: 300px; ">
                                     <input type="text" placeholder="评语" value="${formEntity.kyxp!}">
                                 </div>
                             </div>
@@ -228,8 +262,11 @@ styles=[ '/flow/css/formCommon.css' ]>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$gtf" style="width: 80px;">
-                                    <input type="number" placeholder="分值" value="${formEntity.gtf!}">
+                                <div class="z-comp-select" name="createReqVO$gtf"
+                                     data='${point_standard!}' value="${formEntity.gtf!}" style="width: 80px;">
+                                    <div class="z-inputselect-bar">
+                                        <span></span><i></i>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -237,7 +274,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$gtp" style="width: 500px;">
+                                <div class="z-comp-input" name="createReqVO$gtp" style="width: 300px;">
                                     <input type="text" placeholder="评语" value="${formEntity.gtp!}">
                                 </div>
                             </div>
@@ -251,8 +288,11 @@ styles=[ '/flow/css/formCommon.css' ]>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$ccf" style="width: 80px; ">
-                                    <input type="number" placeholder="分值" value="${formEntity.ccf!}">
+                                <div class="z-comp-select" name="createReqVO$ccf"
+                                     data='${point_standard!}' value="${formEntity.ccf!}" style="width: 80px;">
+                                    <div class="z-inputselect-bar">
+                                        <span></span><i></i>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -260,7 +300,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$ccp" style="width: 500px; ">
+                                <div class="z-comp-input" name="createReqVO$ccp" style="width: 300px; ">
                                     <input type="text" placeholder="评语" value="${formEntity.ccp!}">
                                 </div>
                             </div>
@@ -276,8 +316,11 @@ styles=[ '/flow/css/formCommon.css' ]>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$tdf" style="width: 80px;">
-                                    <input type="number" placeholder="分值" value="${formEntity.tdf!}">
+                                <div class="z-comp-select" name="createReqVO$tdf"
+                                     data='${point_standard!}' value="${formEntity.tdf!}" style="width: 80px;">
+                                    <div class="z-inputselect-bar">
+                                        <span></span><i></i>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -285,7 +328,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$tdp" style="width: 500px;">
+                                <div class="z-comp-input" name="createReqVO$tdp" style="width: 300px;">
                                     <input type="text" placeholder="评语" value="${formEntity.tdp!}">
                                 </div>
                             </div>
@@ -299,8 +342,11 @@ styles=[ '/flow/css/formCommon.css' ]>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$xxlf" style="width: 80px; ">
-                                    <input type="number" placeholder="分值" value="${formEntity.xxlf!}">
+                                <div class="z-comp-select" name="createReqVO$xxlf"
+                                     data='${point_standard!}' value="${formEntity.xxlf!}" style="width: 80px;" >
+                                    <div class="z-inputselect-bar">
+                                        <span></span><i></i>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -308,139 +354,19 @@ styles=[ '/flow/css/formCommon.css' ]>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$xxlp" style="width: 500px; ">
+                                <div class="z-comp-input" name="createReqVO$xxlp" style="width: 300px; ">
                                     <input type="text" placeholder="评语" value="${formEntity.xxlp!}">
                                 </div>
                             </div>
                         </div>
                     </td>
                 </tr>
-
-                <tr>
-                    <td>
-                        <br>
-                    </td>
-                </tr>
-
-
-                <tr>
-                    <td class="th">
-                        <div class="form-label">评分标准：</div>
-
-                    </td>
-                    <td class="th">
-                        <div class="form-label"> 5分：优秀并超出预期</div>
-
-                    </td>
-
-                    <td class="th">
-                        <div class="form-label"> 4分：较好</div>
-
-                    </td>
-
-                    <td class="th">
-                        <div class="form-label"> 3分：合格</div>
-
-                    </td>
-
-                    <td class="th">
-                        <div class="form-label"> 2分：不合格</div>
-
-                    </td>
-
-                    <td class="th">
-                        <div class="form-label">1分：极差</div>
-
-                    </td>
-                </tr>
             </table>
         </div>
-        <div class="form-title">
-            <div class="form-icon">
-                <img src="/imgs/titleIcon.png" alt="">
-                <span>事业部/部门意见</span>
-            </div>
-        </div>
-        <div class="jbxx-box jbxx-box-flex">
-            <table class="jbxx-table-info">
 
-                <tr>
-                    <td class="th">
-                        <div class="form-label">结论：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-radio" name="createReqVO$bmyjjl">
-                                    <div class="z-radio-item <#if (formEntity.bmyjjl!)? contains("1")>checked</#if>"
-                                         value="1"><i></i>录用
-                                    </div>
-                                    <div class="z-radio-item <#if (formEntity.bmyjjl!)? contains("2")>checked</#if>"
-                                         value="0"><i></i>可以复试
-                                    </div>
-                                    <div class="z-radio-item <#if (formEntity.bmyjjl!)? contains("3")>checked</#if>"
-                                         value="1"><i></i>不录用
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
 
 
-                <tr>
-                    <td class="th">
-                        <div class="form-label">建议薪资：</div>
-                    </td>
 
-                    <td class="th">
-                        <div class="form-label">试用期工资（元）：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$bmyjsyxz" style="width: 200px; ">
-                                    <input type="text" value="${formEntity.bmyjsyxz!}">
-                                </div>
-                            </div>
-                        </div>
-                    </td>
-
-                    <td class="th">
-                        <div class="form-label">转正工资（元）：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$bmyjzzxz" style="width: 200px; ">
-                                    <input type="text" value="${formEntity.bmyjzzxz!}">
-                                </div>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
-
-
-                <tr>
-                    <td class="th">
-                        <div class="form-label">建议等级：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-select" name="createReqVO$bmyjjydj"
-                                     data='${ABILITY_LEVEL!}' value="${formEntity.bmyjjydj!}" style="width: 200px; ">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
-
-            </table>
-        </div>
         <div class="form-title">
             <div class="form-icon">
                 <img src="/imgs/titleIcon.png" alt="">
@@ -449,41 +375,6 @@ styles=[ '/flow/css/formCommon.css' ]>
         </div>
         <div class="jbxx-box jbxx-box-flex">
             <table class="jbxx-table-info">
-                <tr>
-                    <td class="th">
-                        <div class="form-label">分配部门：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="z-comp-selecttree" name="deptName">
-                                <input type="hidden" name="createReqVO$deptName" value="${formEntity.deptName!}">
-                                <input type="hidden" name="createReqVO$deptId" value="${formEntity.deptId!}">
-                                <div class="z-inputselect-bar">
-                                    <span>${formEntity.deptName!}</span><i></i>
-                                </div>
-                            </div>
-                        </div>
-                    </td>
-
-
-                    <td class="th">
-                        <div class="form-label">分配岗位：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-select" name="createReqVO$fpgw"
-                                     data='${post_type!}' value="${formEntity.fpgw!}">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </td>
-
-                </tr>
-
                 <tr>
                     <td class="th">
                         <div class="form-label">用工性质：</div>
@@ -522,7 +413,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                     </td>
 
                     <td class="th">
-                        <div class="form-label">基本：</div>
+                        <div class="form-label">基本（元）：</div>
                     </td>
                     <td>
                         <div class="form-group">
@@ -536,7 +427,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                     </td>
 
                     <td class="th">
-                        <div class="form-label">绩效：</div>
+                        <div class="form-label">绩效（元）：</div>
                     </td>
                     <td>
                         <div class="form-group">
@@ -558,7 +449,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                     </td>
 
                     <td class="th">
-                        <div class="form-label">基本：</div>
+                        <div class="form-label">基本（元）：</div>
                     </td>
                     <td>
                         <div class="form-group">
@@ -572,7 +463,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                     </td>
 
                     <td class="th">
-                        <div class="form-label">绩效：</div>
+                        <div class="form-label">绩效（元）：</div>
                     </td>
                     <td>
                         <div class="form-group">

zjugis-workflow/src/main/resources/static/js/config.js

@@ -1268,6 +1268,7 @@
 			z.ui.alertSuccess(successTip, displayTime, function () {
 				z.ui.modal("transferModal").close();
 				$("[name='closeBtn']").click();//关闭当前TAB
+				z.webcontainer.closeCurrentTab();
 			});
 		},//转件成功提示信息
 		openCCModal: function (participants, dialogHtml) {