合同续签新增入职时间

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

@@ -93,4 +93,9 @@ public class ContractRenewPageVO extends PageParam {
      * 新合同到期时间
      */
     private LocalDateTime xhtdqs;
+
+    /**
+     * 入职时间
+     */
+    private LocalDateTime rgssj;
 }

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

@@ -94,4 +94,9 @@ public class ContractRenewVO {
      */
     private LocalDateTime xhtdqs;
 
+    /**
+     * 入职时间
+     */
+    private LocalDateTime rgssj;
+
 }

zjugis-business/src/main/java/com/zjugis/business/flow/contractRenew/entity/ContractRenewDO.java

@@ -97,4 +97,9 @@ public class ContractRenewDO extends BaseEntity {
      */
     private LocalDateTime xhtdqs;
 
+    /**
+     * 入职时间
+     */
+    private LocalDateTime rgssj;
+
 }

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

@@ -261,10 +261,11 @@ public class ContractRenewEvent extends BaseController {
                 ContractRenewDO entity = contractRenewService.findByInstanceId(flowInstanceId);
                 List<Map<String, String>> userMaps = new ArrayList<>();
                 if (StringUtils.isNotBlank(entity.getDeptId())) {
-                    AdminUserRespDTO dept = adminUserApi.getNextLeader(entity.getUserId()).getCheckedData();
-                    if (dept != null && StringUtils.isNotBlank(dept.getId())) {
+                    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.getId());
+                        map.put("id", dept.getLeaderUserId());
                         userMaps.add(map);
                     }
                 }
@@ -279,6 +280,39 @@ public class ContractRenewEvent extends BaseController {
     }
 
 
+    /**
+     * 查询分管领导和板块领导
+     */
+    @PostMapping("/to-dept-manager-leader")
+    public String toLeader(String flowInstanceId) {
+        if (StringUtils.isNotBlank(flowInstanceId)) {
+            ContractRenewDO entity = contractRenewService.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);
+                    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);
+                    }
+                }
+
+            }
+            return ok(userMaps);
+        } else {
+            throw new BusinessException("找不到流程id");
+        }
+    }
+
+
     /**
      * 根据所在地查询hr
      */

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

@@ -19,9 +19,11 @@ 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;
@@ -116,6 +118,7 @@ public class InternServiceImpl implements InternService {
 
     @Override
     public Map<String, Object> getFormParams(String flowInstanceId) {
+        String userId = SecurityFrameworkUtils.getLoginUserId();
         CommonResult<IFlowInstance> flowResult = workflowClient.flowInstance(flowInstanceId);
         if (flowResult.isSuccess()) {
             InternDO entity = internDAO.findByInstanceId(flowInstanceId);
@@ -125,6 +128,14 @@ public class InternServiceImpl implements InternService {
                 entity.setCreateTime(LocalDateTime.now());
                 entity.setApplyTime(LocalDateTime.now());
                 entity.setFlowStatus(FlowStatusConstants.FLOW_NOT_START);
+
+                //远程调用获取用户相关信息
+                CommonResult<StaffDeptPostDTO> result = staffApi.getUser(userId);
+                StaffDeptPostDTO dto = result.getCheckedData();
+                entity.setUserId(userId);
+                entity.setNickname(dto.getNickname());
+                entity.setDeptId(dto.getDeptId());
+                entity.setDeptName(dto.getDeptName());
                 internDAO.insert(entity);
             }
             return createMap(entity);

zjugis-business/src/main/java/com/zjugis/business/flow/jobTransfer/service/impl/JobTransferServiceImpl.java

@@ -69,6 +69,7 @@ public class JobTransferServiceImpl implements JobTransferService {
                 //远程调用获取用户相关信息
                 CommonResult<StaffDeptPostDTO> result = staffApi.getUser(userId);
                 StaffDeptPostDTO dto = result.getCheckedData();
+                entity.setPost(dto.getPostName());
                 entity.setNickname(dto.getNickname());
                 entity.setDeptId(dto.getDeptId());
                 entity.setDeptName(dto.getDeptName());

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

@@ -96,6 +96,19 @@ styles=['/flow/css/formCommon.css','/timeSelector/TimeSelector.css','/OwCommon/O
                         </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 z-readonly" name="createReqVO$rgssj">
+                                            <input type="text" value="${(formEntity.rgssj?date)!}">
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
+
                             <td class="th">
                                 <div class="form-label">旧合同到期时间：</div>
                             </td>
@@ -108,7 +121,9 @@ styles=['/flow/css/formCommon.css','/timeSelector/TimeSelector.css','/OwCommon/O
                                     </div>
                                 </div>
                             </td>
+                        </tr>
 
+                        <tr>
                             <td class="th">
                                 <div class="form-label">续签次数：</div>
                             </td>
@@ -123,9 +138,6 @@ styles=['/flow/css/formCommon.css','/timeSelector/TimeSelector.css','/OwCommon/O
                             </td>
 
 
-                        </tr>
-
-                        <tr>
                             <td class="th">
                                 <div class="form-label">续签年限：</div>
                             </td>
@@ -139,6 +151,9 @@ styles=['/flow/css/formCommon.css','/timeSelector/TimeSelector.css','/OwCommon/O
                                 </div>
                             </td>
 
+                        </tr>
+
+                        <tr>
                             <td class="th">
                                 <div class="form-label ">员工所在地：</div>
                             </td>
@@ -155,9 +170,6 @@ styles=['/flow/css/formCommon.css','/timeSelector/TimeSelector.css','/OwCommon/O
                                 </div>
                             </td>
 
-                        </tr>
-
-                        <tr>
                             <td class="th">
                                 <div class="form-label">新合同续签时间：</div>
                             </td>
@@ -174,11 +186,7 @@ styles=['/flow/css/formCommon.css','/timeSelector/TimeSelector.css','/OwCommon/O
                                 </div>
                             </td>
 
-                            <td class="th">
-                                <div class="form-label "></div>
-                            </td>
-                            <td>
-                            </td>
+
 
                         </tr>
                     </table>

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

@@ -43,12 +43,12 @@
             selectUser(userId, function (userData) {
                 var staff = userData.data;
                 // 在成功获取到用户数据后，将用户名赋值给 createReqVO$nickname
-
+                $("[name='createReqVO$userId']").val(staff.userId);//部门id
                 z.ui.input("[name='createReqVO$deptName']").setValue(staff.deptName); //部门
                 $("[name='createReqVO$deptId']").val(staff.deptId);//部门id
                 z.ui.select("[name='createReqVO$drzw']").setValue(staff.drzw); //岗位
                 z.ui.laydate("[name='createReqVO$htdqs']").setValue(moment(staff.htdqs).format('YYYY-MM-DD')); //合同到期时
-                // z.ui.laydate("[name='createReqVO$htqdsj']").setValue(moment(staff.htqdsj).format('YYYY-MM-DD')); //合同签订时
+                z.ui.laydate("[name='createReqVO$rgssj']").setValue(moment(staff.rgssj).format('YYYY-MM-DD')); //合同签订时
                 z.ui.input("[name='createReqVO$xqcs']").setValue(staff.xqcs); //续签次数
                 z.ui.input("[name='createReqVO$xqnx']").setValue(staff.xqnx); //续签年限
             });
@@ -92,6 +92,7 @@
             mealName.htdqs = Date.parse(mealName.htdqs + "");
             mealName.xhtdqs = Date.parse(mealName.xhtdqs + "");
             mealName.htqdsj = Date.parse(mealName.htqdsj + "");
+            mealName.rgssj=Date.parse(mealName.rgssj + "");
             postData.createReqVO = mealName;
         }
 

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

@@ -33,12 +33,11 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
                             </td>
                             <td>
                                 <div class="form-group">
-                                    <div class="z-comp-selecttree" name="nickname">
-                                        <input type="hidden" name="createReqVO$nickname"
-                                               value="${formEntity.nickname!}">
-                                        <input type="hidden" name="createReqVO$userId" value="${formEntity.userId!}">
-                                        <div class="z-inputselect-bar">
-                                            <span>${formEntity.nickname!}</span><i></i>
+                                    <div class="form-item">
+                                        <div class="z-comp-input z-readonly" name="createReqVO$nickname">
+                                            <label>
+                                                <input type="text" value="${formEntity.nickname!}">
+                                            </label>
                                         </div>
                                     </div>
                                 </div>
@@ -163,7 +162,7 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
                             <td>
                                 <div class="form-group">
                                     <div class="form-item">
-                                        <div class="z-comp-textarea" name="createReqVO$report">
+                                        <div class="z-comp-textarea" name="createReqVO$report" style="height: 300px">
                                             <textarea>${formEntity.report!}</textarea>
                                         </div>
                                     </div>

zjugis-module-adm/zjugis-module-adm-api/src/main/java/com/zjugis/module/adm/api/staff/dto/StaffRecordsDTO.java

@@ -143,6 +143,10 @@ public class StaffRecordsDTO {
      */
     private String xqqk;
 
+    /**
+     * 入职时间
+     */
+    private LocalDateTime rgssj;
 
 
 }