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

@@ -79,4 +79,9 @@ public class DictConstants {
      * 是否已调档
      */
     public static final String td_type = "td_type";
+
+    /**
+     * 紧急联系人关系
+     */
+    public static final String contact_type="contact_type";
 }

zjugis-business/src/main/java/com/zjugis/business/flow/commoncost/event/CommonCostEvent.java

@@ -97,7 +97,6 @@ public class CommonCostEvent extends BaseController {
                 });
                 String applyTime = LocalDateTimeUtils.format(entity.getApplyTime(), null);
                 String flowDesc = StringUtils.join(Arrays.asList(entity.getUserNickname(), applyTime, "¥"+entity.getTotalAmount(), projectName), "/");
-                flowDesc = flowDesc.length() > 1 ? flowDesc.substring(1) : flowDesc;
                 workflowClient.saveFlowDescribe(flowInstanceId, flowDesc);
                 return ok("true");
             } else {

zjugis-business/src/main/java/com/zjugis/business/flow/jobTransfer/event/JobTransferEvent.java

@@ -69,7 +69,6 @@ public class JobTransferEvent extends BaseController {
                 String flowDesc = StringUtils.join(Arrays.asList(entity.getNickname(), applyTime, entity.getDeptName()), "/");
                 entity.setFlowStatus(FLOW_PROCESS);
                 jobTransferDAO.updateById(entity);
-                flowDesc = flowDesc.length() > 1 ? flowDesc.substring(1) : flowDesc;
                 workflowClient.saveFlowDescribe(flowInstanceId, flowDesc);
                 return ok("true");
             } else {

zjugis-business/src/main/java/com/zjugis/business/flow/recruit/event/RecruitEvent.java

@@ -55,7 +55,6 @@ public class RecruitEvent extends BaseController {
                 String flowDesc = StringUtils.join(Arrays.asList(entity.getUserNickname(), applyTime, entity.getDeptName()), "/");
                 entity.setFlowStatus(FLOW_PROCESS);
                 recruitDemandService.updateRecruit(entity);
-                flowDesc = flowDesc.length() > 1 ? flowDesc.substring(1) : flowDesc;
                 workflowClient.saveFlowDescribe(flowInstanceId, flowDesc);
                 return ok("true");
             } else {

zjugis-business/src/main/java/com/zjugis/business/flow/regular/event/RegularEvent.java

@@ -64,7 +64,6 @@ public class RegularEvent extends BaseController {
                 String flowDesc = StringUtils.join(Arrays.asList(entity.getNickname(), applyTime, entity.getDeptName()), "/");
                 entity.setFlowStatus(FLOW_PROCESS);
                 regularDAO.updateById(entity);
-                flowDesc = flowDesc.length() > 1 ? flowDesc.substring(1) : flowDesc;
                 workflowClient.saveFlowDescribe(flowInstanceId, flowDesc);
                 return ok("true");
             } else {

zjugis-business/src/main/java/com/zjugis/business/flow/resign/event/ResignEvent.java

@@ -75,7 +75,6 @@ public class ResignEvent extends BaseController {
                 String flowDesc = StringUtils.join(Arrays.asList(entity.getNickname(), applyTime, entity.getDeptName()), "/");
                 entity.setFlowStatus(FLOW_PROCESS);
                 resignDAO.updateById(entity);
-                flowDesc = flowDesc.length() > 1 ? flowDesc.substring(1) : flowDesc;
                 workflowClient.saveFlowDescribe(flowInstanceId, flowDesc);
                 return ok("true");
             } else {

zjugis-business/src/main/java/com/zjugis/business/flow/staff/controller/vo/StaffVO.java

@@ -2,6 +2,7 @@ package com.zjugis.business.flow.staff.controller.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.zjugis.framework.common.validation.Mobile;
 import lombok.Data;
 
 import java.time.LocalDate;
@@ -170,6 +171,7 @@ public class StaffVO {
     /**
      * 手机
      */
+    @Mobile
     private String mobilePhone;
 
     /**
@@ -180,6 +182,7 @@ public class StaffVO {
     /**
      * 紧急联系人号码
      */
+    @Mobile
     private String jjlxrhm;
 
     /**

zjugis-business/src/main/java/com/zjugis/business/flow/staff/entity/StaffDO.java

@@ -3,6 +3,7 @@ package com.zjugis.business.flow.staff.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zjugis.business.mybatis.entity.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -80,6 +81,7 @@ public class StaffDO extends BaseEntity {
     /**
      * 出生日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime birthday;
 
     /**
@@ -135,6 +137,7 @@ public class StaffDO extends BaseEntity {
     /**
      * 毕业时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime bysj;
 
     /**
@@ -155,6 +158,7 @@ public class StaffDO extends BaseEntity {
     /**
      * 参加工作时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime cjgzsj;
 
     /**
@@ -220,16 +224,19 @@ public class StaffDO extends BaseEntity {
     /**
      * 入公司时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime rgssj;
 
     /**
      * 转正时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime zzsj;
 
     /**
      * 合同到期时
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime htdqs;
 
     /**
@@ -331,6 +338,7 @@ public class StaffDO extends BaseEntity {
     /**
      * 离职时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime lzsj;
 
     private String hz;

zjugis-business/src/main/java/com/zjugis/business/flow/staff/event/StaffEvent.java

@@ -69,7 +69,6 @@ public class StaffEvent extends BaseController {
                 String flowDesc = StringUtils.join(Arrays.asList(entity.getNickname(), applyTime, entity.getDeptName()), "/");
                 entity.setFlowStatus(FLOW_PROCESS);
                 staffService.updateStaff(entity);
-                flowDesc = flowDesc.length() > 1 ? flowDesc.substring(1) : flowDesc;
                 workflowClient.saveFlowDescribe(flowInstanceId, flowDesc);
                 return ok("true");
             } else {

zjugis-business/src/main/java/com/zjugis/business/flow/staff/service/impl/StaffServiceImpl.java

@@ -170,6 +170,7 @@ public class StaffServiceImpl implements StaffService {
         res.add(DictConstants.hy_type);
         res.add(DictConstants.xl_type);
         res.add(DictConstants.td_type);
+        res.add(DictConstants.contact_type);
         return res;
     }
 

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

@@ -23,7 +23,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                         <div class="form-group">
                             <div class="form-item">
                                 <div class="z-comp-input" name="createReqVO$nickname">
-                                    <input type="text">
+                                    <input type="text" value="${formEntity.nickname!}">
                                 </div>
                             </div>
                         </div>
@@ -52,7 +52,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                         <div class="form-group">
                             <div class="form-item">
                                 <div class="z-comp-input" name="createReqVO$mobilePhone">
-                                    <input type="text">
+                                    <input type="text" value="${formEntity.mobilePhone!}">
                                 </div>
                             </div>
                         </div>
@@ -86,7 +86,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                         <div class="form-group">
                             <div class="form-item">
                                 <div class="z-comp-input" name="createReqVO$drzw">
-                                    <input type="text">
+                                    <input type="text" value="${formEntity.drzw!}">
                                 </div>
                             </div>
                         </div>
@@ -100,7 +100,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                         <div class="form-group">
                             <div class="form-item">
                                 <div class="z-comp-input" name="createReqVO$nation">
-                                    <input type="text">
+                                    <input type="text" value="${formEntity.nation!}">
                                 </div>
                             </div>
                         </div>
@@ -116,7 +116,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                         <div class="form-group">
                             <div class="form-item btns-form-box">
                                 <div class="z-comp-input z-readonly" name="createReqVO$loginName">
-                                    <input type="text">
+                                    <input type="text" value="${formEntity.loginName!}">
                                     <div id="generateSerial" style="width: 50px; " name="generateSerial">
                                         <div class="btn btn-sm btn-primary">生成</div>
                                     </div>
@@ -132,10 +132,10 @@ styles=[ '/flow/css/formCommon.css' ]>
                     <td>
                         <div class="form-group">
                             <div class="z-comp-selecttree" name="deptName">
-                                <input type="hidden" name="createReqVO$deptName">
-                                <input type="hidden" name="createReqVO$deptId">
+                                <input type="hidden" name="createReqVO$deptName" value="${formEntity.deptName!}">
+                                <input type="hidden" name="createReqVO$deptId" value="${formEntity.deptId!}">
                                 <div class="z-inputselect-bar">
-                                    <span></span><i></i>
+                                    <span>${formEntity.deptName!}</span><i></i>
                                 </div>
                             </div>
                         </div>
@@ -149,7 +149,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                         <div class="form-group">
                             <div class="form-item">
                                 <div class="z-comp-input" name="createReqVO$qdgs">
-                                    <input type="text">
+                                    <input type="text" value="${formEntity.qdgs!}">
                                 </div>
                             </div>
                         </div>
@@ -164,8 +164,8 @@ styles=[ '/flow/css/formCommon.css' ]>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$birthday">
-                                    <input type="text">
+                                <div class="z-comp-date" name="createReqVO$birthday">
+                                    <input type="text" value="${(formEntity.birthday?date)!}">
                                 </div>
                             </div>
                         </div>
@@ -179,7 +179,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                         <div class="form-group">
                             <div class="form-item">
                                 <div class="z-comp-select" name="createReqVO$hyzk" data='${hy_type!}'
-                                        value="${formEntity.hyzk!}">
+                                     value="${formEntity.hyzk!}">
                                     <div class="z-inputselect-bar">
                                         <span></span><i></i>
                                     </div>
@@ -195,8 +195,8 @@ styles=[ '/flow/css/formCommon.css' ]>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-select" name="createReqVO$hkxz" data='${hk_type!}'
-                                     value="${formEntity.hkxz!}">
+                                <div class="z-comp-select" name="createReqVO$hkxz"
+                                     data='${hk_type!}' value="${formEntity.hkxz!}">
                                     <div class="z-inputselect-bar">
                                         <span></span><i></i>
                                     </div>
@@ -232,7 +232,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                         <div class="form-group">
                             <div class="form-item">
                                 <div class="z-comp-input" name="createReqVO$xjzdz">
-                                    <input type="text">
+                                    <input type="text" value="${formEntity.xjzdz!}">
                                 </div>
                             </div>
                         </div>
@@ -246,7 +246,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                         <div class="form-group">
                             <div class="form-item">
                                 <div class="z-comp-input" name="createReqVO$hkszd">
-                                    <input type="text">
+                                    <input type="text" value="${formEntity.hkszd!}">
                                 </div>
                             </div>
                         </div>
@@ -262,7 +262,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                         <div class="form-group">
                             <div class="form-item">
                                 <div class="z-comp-date" name="createReqVO$rgssj">
-                                    <input type="text">
+                                    <input type="text" value="${(formEntity.rgssj?date)!}">
                                 </div>
                             </div>
                         </div>
@@ -276,7 +276,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                         <div class="form-group">
                             <div class="form-item">
                                 <div class="z-comp-date" name="createReqVO$cjgzsj">
-                                    <input type="text">
+                                    <input type="text" value="${(formEntity.cjgzsj?date)!}">
                                 </div>
                             </div>
                         </div>
@@ -290,7 +290,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                         <div class="form-group">
                             <div class="form-item">
                                 <div class="z-comp-input" name="createReqVO$cssl">
-                                    <input type="number">
+                                    <input type="number" value="${formEntity.cssl!}">
                                 </div>
                             </div>
                         </div>
@@ -306,7 +306,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                         <div class="form-group">
                             <div class="form-item">
                                 <div class="z-comp-input" name="createReqVO$nj">
-                                    <input type="number">
+                                    <input type="number" value="${formEntity.nj!}">
                                 </div>
                             </div>
                         </div>
@@ -348,7 +348,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                         <div class="form-group">
                             <div class="form-item">
                                 <div class="z-comp-input" name="createReqVO$khyh">
-                                    <input type="text">
+                                    <input type="text" value="${formEntity.khyh!}">
                                 </div>
                             </div>
                         </div>
@@ -360,7 +360,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                         <div class="form-group">
                             <div class="form-item">
                                 <div class="z-comp-input" name="createReqVO$yhzh">
-                                    <input type="text">
+                                    <input type="text" value="${formEntity.yhzh!}">
                                 </div>
                             </div>
                         </div>
@@ -384,7 +384,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                         <div class="form-group">
                             <div class="form-item">
                                 <div class="z-comp-input" name="createReqVO$byxx">
-                                    <input type="text">
+                                    <input type="text" value="${formEntity.byxx!}">
                                 </div>
                             </div>
                         </div>
@@ -395,8 +395,8 @@ styles=[ '/flow/css/formCommon.css' ]>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$bysj">
-                                    <input type="text">
+                                <div class="z-comp-date" name="createReqVO$bysj">
+                                    <input type="text" value="${(formEntity.bysj?date)!}">
                                 </div>
                             </div>
                         </div>
@@ -407,8 +407,8 @@ styles=[ '/flow/css/formCommon.css' ]>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$zgxl"
-                                     data='${xl_type!}' value="${formEntity.xl_type!}">
+                                <div class="z-comp-select" name="createReqVO$zgxl"
+                                     data='${xl_type!}' value="${formEntity.zgxl!}">
                                     <div class="z-inputselect-bar">
                                         <span></span><i></i>
                                     </div>
@@ -425,7 +425,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                         <div class="form-group">
                             <div class="form-item">
                                 <div class="z-comp-input" name="createReqVO$major">
-                                    <input type="text">
+                                    <input type="text" value="${formEntity.major!}">
                                 </div>
                             </div>
                         </div>
@@ -449,7 +449,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                         <div class="form-group">
                             <div class="form-item">
                                 <div class="z-comp-input" name="createReqVO$jjlxrxm">
-                                    <input type="text">
+                                    <input type="text" value="${formEntity.jjlxrxm!}">
                                 </div>
                             </div>
                         </div>
@@ -461,7 +461,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                         <div class="form-group">
                             <div class="form-item">
                                 <div class="z-comp-input" name="createReqVO$jjlxrhm">
-                                    <input type="text">
+                                    <input type="text" value="${formEntity.jjlxrhm!}">
                                 </div>
                             </div>
                         </div>
@@ -472,8 +472,11 @@ styles=[ '/flow/css/formCommon.css' ]>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$jjlxrgx">
-                                    <input type="text">
+                                <div class="z-comp-select" name="createReqVO$jjlxrgx"
+                                     data='${contact_type!}' value="${formEntity.jjlxrgx!}">
+                                    <div class="z-inputselect-bar">
+                                        <span></span><i></i>
+                                    </div>
                                 </div>
                             </div>
                         </div>

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

@@ -12,7 +12,7 @@
         z.workflow.saveBtn.addListener("onSaveClick", saveForm);
     }
 
-    //部门列表
+    //部门列表查询
     function initDept() {
         z.ui.ajax({
             type: "get",
@@ -36,6 +36,16 @@
         var postData = z.ui.form.getFormFields($("[name=createReqVO]"));
         if (postData === false) return;
 
+        //将string类型的时间转换成时间戳
+        for (let key of Object.keys(postData)) {
+            let mealName = postData[key];
+            mealName.birthday = Date.parse(mealName.birthday + "");
+            mealName.bysj = Date.parse(mealName.bysj + "");
+            mealName.cjgzsj = Date.parse(mealName.cjgzsj + "");
+            mealName.rgssj = Date.parse(mealName.rgssj + "");
+            postData.createReqVO = mealName;
+        }
+
         z.ui.ajax({
             type: "post",
             url: "/staff/update",
@@ -82,7 +92,8 @@
     /**
      * 离职员工回归
      */
-    function backPerson(){}
+    function backPerson() {
+    }
 
     //部门
     function clickDeptName(even, treeId, treeNode) {