合同续签钉钉端+实习生录用申请部分前端页面

zjugis-business/src/main/java/com/zjugis/business/flow/contractRenew/controller/vo/ContractRenewVO.java

@@ -99,4 +99,10 @@ public class ContractRenewVO {
      */
     private LocalDateTime rgssj;
 
+    /**
+     * 申请时间
+     */
+    private LocalDateTime createTime;
+
+
 }

zjugis-business/src/main/java/com/zjugis/business/flow/contractRenew/event/ContractRenewEvent.java

@@ -302,6 +302,7 @@ public class ContractRenewEvent extends BaseController {
                 DeptRespDTO partLeader = deptApi.getSecondDeptByDeptId(entity.getDeptId()).getCheckedData();
                 if (partLeader != null && StringUtils.isNotBlank(partLeader.getLeaderUserId())) {
 
+                    //去重 板块领导跟分管领导为同一个人就不用转件两次
                     if (deptLeader != null && deptLeader.getUserId() != null && ! deptLeader.getUserId().equals(partLeader.getLeaderUserId())) {
                         HashMap<String, String> map = new HashMap<>();
                         map.put("id", partLeader.getLeaderUserId());

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

@@ -131,7 +131,6 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
 
 
                         <tr>
-
                             <td class="th">
                                 <div class="form-label">正常转正时间：</div>
                             </td>
@@ -192,11 +191,10 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
                 </div>
 
 
-
                 <div class="form-title" style="margin-top: 0;">
                     <div class="form-icon">
                         <img src="/imgs/titleIcon.png" alt="">
-                        <span>用人部门经理</span>
+                        <span>用人部门评价</span>
                     </div>
                     <div class="form-btn">
                     </div>
@@ -204,23 +202,88 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
                 <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-textarea" name="createReqVO$report" style="height: 300px">
-                                            <textarea>${formEntity.report!}</textarea>
-                                        </div>
-                                    </div>
-                                </div>
+                            <td class="form-td-table-two" colspan="3">
+                                <table>
+                                    <tr>
+                                        <td style="background-color: #e6e9ef">同意录用</td>
+                                        <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>"
+                                                             value="1"><i></i>是
+                                                        </div>
+                                                        <div class="z-radio-item <#if (formEntity.rztb!)? contains("2")>checked</#if>"
+                                                             value="2"><i></i>否
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </table>
                             </td>
                         </tr>
 
                     </table>
                 </div>
 
+
+                <div class="form-title" style="margin-top: 0;">
+                    <div class="form-icon">
+                        <img src="/imgs/titleIcon.png" alt="">
+                        <span>综合管理部</span>
+                    </div>
+                    <div class="form-btn">
+                    </div>
+                </div>
+                <div class="jbxx-box jbxx-box-flex">
+                    <table class="jbxx-table-info">
+                        <tr>
+                            <td class="form-td-table-two" colspan="3">
+                                <table>
+                                    <tr>
+                                        <td style="background-color: #e6e9ef">同意录用</td>
+                                        <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>"
+                                                             value="1"><i></i>是
+                                                        </div>
+                                                        <div class="z-radio-item <#if (formEntity.rztb!)? contains("2")>checked</#if>"
+                                                             value="2"><i></i>否
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </td>
+                                    </tr>
+
+                                    <tr>
+                                        <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>
+                                                月底，
+                                                <div class="z-comp-input" name="createReqVO$clfscb10"
+                                                     style="width: 60px; display: inline-block; margin: 10px;">
+                                                    <input type="number" value="${formEntity.clfscb10!}">
+                                                </div>
+                                                月初停止缴纳
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+
             </div>
 
             <#if WORKFLOW.OPINION! !="">