合同续签重复发送bug

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

@@ -290,21 +290,26 @@ public class ContractRenewEvent extends BaseController {
             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())) {
+                //查询分管领导
+                DeptLeaderRespDTO deptLeader = deptLeaderApi.getDeptLeaderByDeptId(entity.getDeptId()).getCheckedData();
+                if (deptLeader != null && StringUtils.isNotBlank(deptLeader.getUserId())) {
                     HashMap<String, String> map = new HashMap<>();
-                    map.put("id", dept.getLeaderUserId());
+                    map.put("id", deptLeader.getUserId());
                     userMaps.add(map);
-                    CommonResult<AdminUserRespDTO> userRes = adminUserApi.getUserLeader(dept.getLeaderUserId());
-                    AdminUserRespDTO userLeader = userRes.getCheckedData();
-                    if (userLeader != null) {
-                        HashMap<String, String> leaderMap = new HashMap<>();
-                        leaderMap.put("id", userLeader.getId());
-                        userMaps.add(leaderMap);
+                }
+
+                //查询板块领导
+                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());
+                        userMaps.add(map);
                     }
                 }
 
+
             }
             return ok(userMaps);
         } else {

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

@@ -49,10 +49,12 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
                             </td>
                             <td>
                                 <div class="form-group">
-                                    <div class="z-comp-input z-readonly" name="createReqVO$deptName">
-                                        <input type="text" value="${formEntity.deptName!}">
+                                    <div class="form-item">
+                                        <div class="z-comp-input z-readonly" name="createReqVO$deptName">
+                                            <input type="text" value="${formEntity.deptName!}">
+                                        </div>
+                                        <input type="hidden" name="createReqVO$deptId" value="${formEntity.deptId!}">
                                     </div>
-                                    <input type="hidden" name="createReqVO$deptId" value="${formEntity.deptId!}">
                                 </div>
                             </td>
 
@@ -80,34 +82,56 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
 
 
                             <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-input" name="createReqVO$sxq">
-                                            <input type="number" value="${formEntity.sxq!}">
+                                        <div class="z-comp-date z-readonly" name="createReqVO$applyTime">
+                                            <input type="text" value="${(formEntity.applyTime?date)!}">
                                         </div>
                                     </div>
                                 </div>
                             </td>
 
 
+
+
+
                         </tr>
 
                         <tr>
-
                             <td class="th">
                                 <div class="form-label">实习日期：</div>
                             </td>
                             <td>
                                 <div class="form-group">
-                                    <div class="z-comp-date" name="createReqVO$ssxrq">
-                                        <input type="text" value="${(formEntity.ssxrq?date)!}">
+                                    <div class="form-item">
+                                        <div class="z-comp-date" name="createReqVO$ssxrq">
+                                            <input type="text" value="${(formEntity.ssxrq?date)!}">
+                                        </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$sxq">
+                                            <input type="number" value="${formEntity.sxq!}">
+                                        </div>
                                     </div>
                                 </div>
                             </td>
 
+                        </tr>
+
+
+                        <tr>
+
                             <td class="th">
                                 <div class="form-label">正常转正时间：</div>
                             </td>
@@ -121,19 +145,43 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
                                 </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>
 
-                        <tr>
 
+                <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="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 z-readonly" name="createReqVO$applyTime">
-                                            <input type="text" value="${(formEntity.applyTime?date)!}">
+                                        <div class="z-comp-textarea" name="createReqVO$report" style="height: 300px">
+                                            <textarea>${formEntity.report!}</textarea>
                                         </div>
                                     </div>
                                 </div>
@@ -148,7 +196,7 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
                 <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>
@@ -157,7 +205,7 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
                     <table class="jbxx-table-info">
                         <tr>
                             <td class="th">
-                                <div class="form-label">工作总结：</div>
+                                <div class="form-label">理由阐述：</div>
                             </td>
                             <td>
                                 <div class="form-group">
@@ -203,6 +251,5 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
     <style type="text/css">
 
 
-
     </style>
 </@w.workFlow>