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

zjugis-business/src/main/java/com/zjugis/business/bean/response/ProjectExcelResponse.java

@@ -1,6 +1,7 @@
 package com.zjugis.business.bean.response;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.NumberFormat;
 import com.zjugis.business.excel.ProjectConverter;
 import lombok.Data;
 
@@ -66,13 +67,13 @@ public class ProjectExcelResponse {
     @ExcelProperty("合同名称")
     private String contractName;
     @ExcelProperty("合同额")
-    private String contractAmount;
+    private BigDecimal contractAmount;
     @ExcelProperty("已回款")
-    private String returnAmount;
+    private BigDecimal returnAmount;
     @ExcelProperty("应收款")
-    private String receivableAmount;
+    private BigDecimal receivableAmount;
     @ExcelProperty("合同余额")
-    private String contractBalance;
+    private BigDecimal contractBalance;
 
     //总成本
     @ExcelProperty("至该阶段总成本(元)")

zjugis-business/src/main/java/com/zjugis/business/flow/interview/controller/InterviewController.java

@@ -118,6 +118,12 @@ public class InterviewController extends BaseController {
         return success(true);
     }
 
+
+    /**
+     * 根据身份证查询面试信息
+     * @param cardId 身份证号
+     * @return
+     */
     @GetMapping("/getByCardId")
     @Operation(summary = "根据身份证查询面试信息")
     public CommonResult<InterviewDO> getByCardId(@RequestParam("cardId") String cardId) {

zjugis-business/src/main/java/com/zjugis/business/flow/resign/service/impl/ResignServiceImpl.java

@@ -38,8 +38,7 @@ import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.zjugis.business.enums.ErrorCodeConstants.REGULAR_NOT_EXISTS;
-import static com.zjugis.business.enums.ErrorCodeConstants.RESIGN_NOT_EXISTS;
+import static com.zjugis.business.enums.ErrorCodeConstants.*;
 import static com.zjugis.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zjugis.framework.common.util.collection.CollectionUtils.convertSet;
 
@@ -114,7 +113,7 @@ public class ResignServiceImpl implements ResignService {
     public void update(ResignPageReqVO vo) {
         validateExists(vo.getId());
         if(CollectionUtil.isEmpty(vo.getFinishedList()) || CollectionUtil.isEmpty(vo.getUnfinishedList())){
-            throw exception(RESIGN_NOT_EXISTS);
+            throw exception(RESIGN_DETAIL_NOT_EXISTS);
         }
         ResignDO resignDO = ResignConvert.INSTANCE.convert(vo);
         resignDAO.updateById(resignDO);

zjugis-business/src/main/java/com/zjugis/business/flow/supplier/controller/vo/SupplierBaseVO.java

@@ -64,4 +64,37 @@ public class SupplierBaseVO {
 
     private String userNickname;
 
+    /**
+     * 是否提供增值税专用发票
+     */
+    private String invoice;
+    /**
+     * 税点
+     */
+    private String taxPoints;
+    /**
+     * 承担的业务类型
+     */
+    private String businessType;
+    /**
+     * 公司资质
+     */
+    private String companyQua;
+    /**
+     * 公司简介
+     */
+    private String companyIntro;
+    /**
+     * 联系人
+     */
+    private String contacts;
+    /**
+     * 联系电话
+     */
+    private String telephone;
+    /**
+     * 推荐人
+     */
+    private String reference;
+
 }

zjugis-business/src/main/java/com/zjugis/business/flow/supplier/entity/SupplierDO.java

@@ -64,8 +64,46 @@ public class SupplierDO extends BaseEntity {
      * 流程完成时间
      */
     private LocalDateTime flowFinishtime;
-
+    /**
+     * 流程完成时间
+     */
     private String userNickname;
-
+    /**
+     * 流程完成时间
+     */
     private String userId;
+    /**
+     * 是否提供增值税专用发票
+     */
+    private String invoice;
+    /**
+     * 税点
+     */
+    private String taxPoints;
+    /**
+     * 承担的业务类型
+     */
+    private String businessType;
+    /**
+     * 公司资质
+     */
+    private String companyQua;
+    /**
+     * 公司简介
+     */
+    private String companyIntro;
+    /**
+     * 联系人
+     */
+    private String contacts;
+    /**
+     * 联系电话
+     */
+    private String telephone;
+    /**
+     * 推荐人
+     */
+    private String reference;
+
+
 }

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

@@ -75,16 +75,41 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css','/OwCommon
                 </div>
               </td>
             </tr>
-
             <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-input" name="createReqVO$legalPerson">
-                      <input type="text" value="${formEntity.legalPerson!}">
+                    <div class="z-comp-input" name="createReqVO$contacts">
+                      <input type="text" value="${formEntity.contacts!}">
+                    </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$telephone">
+                      <input type="text" value="${formEntity.telephone!}">
+                    </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-input" name="createReqVO$bank">
+                      <input type="text" value="${formEntity.bank!}">
                     </div>
                   </div>
                 </div>
@@ -104,45 +129,105 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css','/OwCommon
             </tr>
             <tr>
               <td class="th">
-                <div class="form-label">行政区：</div>
+                <div class="form-label">推荐人：</div>
               </td>
               <td>
                 <div class="form-group">
-                  <div class="z-comp-selecttree" name="createReqVO$xzq">
-                    <input type="hidden" name="createReqVO$xzqdm" value="${formEntity.xzqdm!}">
-                    <div class="z-inputselect-bar">
-                      <span id="xzqmc">  </span><i></i>
+                  <div class="form-item">
+                    <div class="z-comp-input" name="createReqVO$reference">
+                      <input type="text" value="${formEntity.reference!}">
                     </div>
                   </div>
                 </div>
               </td>
               <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$taxNumber">
-                      <input type="text" value="${formEntity.taxNumber!}">
+                  <div class="z-comp-selecttree" name="createReqVO$xzq">
+                    <input type="hidden" name="createReqVO$xzqdm" value="${formEntity.xzqdm!}">
+                    <div class="z-inputselect-bar">
+                      <span id="xzqmc">  </span><i></i>
                     </div>
                   </div>
                 </div>
               </td>
+
             </tr>
               <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-radio" name="createReqVO$invoice">
+                        <div class="z-radio-item <#if formEntity.invoice! == '1'>checked</#if>" value="1"><i></i>是</div>
+                        <div class="z-radio-item <#if formEntity.invoice! == '0'>checked</#if>" value="0"><i></i>否</div>
+                      </div>
+                    </div>
+                  </div>
+                </td>
+                <td class="th">
+                  <div class="form-label">税点：</div>
                 </td>
-                <td colspan="3">
+                <td>
                   <div class="form-group">
                     <div class="form-item">
-                      <div class="z-comp-input" name="createReqVO$bank">
-                        <input type="text" value="${formEntity.bank!}">
+                      <div class="z-comp-radio" name="createReqVO$taxPoints">
+                        <div class="z-radio-item <#if formEntity.taxPoints! == '13%'>checked</#if>" value="13%"><i></i>13%</div>
+                        <div class="z-radio-item <#if formEntity.taxPoints! == '6%'>checked</#if>" value="6%"><i></i>6%</div>
+                        <div class="z-radio-item <#if formEntity.taxPoints! == '3%'>checked</#if>" value="3%"><i></i>3%</div>
+                        <div class="z-radio-item <#if formEntity.taxPoints! == '1%'>checked</#if>" value="1%"><i></i>1%</div>
+                        <div class="z-radio-item <#if formEntity.taxPoints! == '其他税点'>checked</#if>" value="其他税点"><i></i>其他税点</div>
                       </div>
                     </div>
                   </div>
                 </td>
               </tr>
+            <tr>
+              <td class="th">
+                <div class="form-label">承担的业务类型：</div>
+              </td>
+              <td colspan="3">
+                <div class="form-group">
+                  <div class="form-item" style="margin: 10px 0;">
+                    <div class="z-comp-textarea" name="createReqVO$businessType">
+                      <textarea>${formEntity.businessType!}</textarea>
+                    </div>
+                  </div>
+                </div>
+              </td>
+            </tr>
+            <tr>
+              <td class="th">
+                <div class="form-label">公司资质：</div>
+              </td>
+              <td colspan="3">
+                <div class="form-group">
+                  <div class="form-item" style="margin: 10px 0;">
+                    <div class="z-comp-textarea" name="createReqVO$companyQua">
+                      <textarea>${formEntity.companyQua!}</textarea>
+                    </div>
+                  </div>
+                </div>
+              </td>
+            </tr>
+            <tr>
+              <td class="th">
+                <div class="form-label">公司简介：</div>
+              </td>
+              <td colspan="3">
+                <div class="form-group">
+                  <div class="form-item" style="margin: 10px 0;">
+                    <div class="z-comp-textarea" name="createReqVO$companyIntro">
+                      <textarea>${formEntity.companyIntro!}</textarea>
+                    </div>
+                  </div>
+                </div>
+              </td>
+            </tr>
             <tr>
               <td class="th">
                 <div class="form-label">备注：</div>
@@ -188,5 +273,8 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css','/OwCommon
     .qjsjxx-box .form-table-info tr:nth-child(1){
       height: 63px;
     }
+    .form-label {
+      white-space: break-spaces;
+    }
   </style>
 </@w.workFlow>

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

@@ -164,7 +164,8 @@
         }
 
         //将string类型的时间转换成时间戳
-        var detail = []
+        var unfinished = []
+        var finished = []
         for (let key of Object.keys(postData)) {
             let mealName = postData[key];
             if (key.startsWith("createReqVO")) {
@@ -176,10 +177,15 @@
                 postData.createReqVO = mealName;
             }
             if (key.startsWith("ResignDetailDO")) {
-                detail.push(z.ui.form.childStringify(mealName));
+                unfinished.push(z.ui.form.childStringify(mealName));
+            }
+
+            if (key.startsWith("ResignFinishedDetailDO")) {
+                finished.push(z.ui.form.childStringify(mealName));
             }
         }
-        postData.createReqVO.unfinishedList = detail;
+        postData.createReqVO.unfinishedList = unfinished;
+        postData.createReqVO.finishedList = finished;
 
         z.ui.ajax({
             type: "post",
@@ -239,17 +245,17 @@
         trDom.innerHTML = '<td name="qjsj_seq">' + (i + 1) + '</td>'
             + '<td>'/*内容*/
             + '<div class="form-item" >'
-            + '<div class="z-comp-input" name="ResignDetailDO1[' + i + ']$content">'
+            + '<div class="z-comp-input" name="ResignFinishedDetailDO[' + i + ']$content">'
             + '<input type="text" value="">'
             + '</div>'
             + '</div>'
             + '</td>'
-            + '<input type="hidden" name="ResignDetailDO1[' + i + ']$state" value="2">'
+            + '<input type="hidden" name="ResignFinishedDetailDO[' + i + ']$state" value="2">'
             + '<td>'
             + '<div class="form-flex">'
             + '<div class="form-item" style="width: 100%;margin-right: 5px;">'
             + '<div class="z-comp-selecttree" name="receive1[' + i + ']">'
-            + '<input type="hidden" name="ResignDetailDO1[' + i + ']$receiver" value="' + finishedArray[i].receiver + '">'
+            + '<input type="hidden" name="ResignFinishedDetailDO[' + i + ']$receiver" value="' + finishedArray[i].receiver + '">'
             + '<div class="z-inputselect-bar">'
             + '<span></span><i></i>'
             + '</div>'
@@ -261,7 +267,7 @@
             // + '<div class="form-flex">'
             // + '<div class="form-item" style="width: 100%;margin-right: 5px;">'
             // + '<div class="z-comp-selecttree" name="review1[' + i + ']">'
-            // + '<input type="hidden" name="ResignDetailDO1[' + i + ']$reviewer" value="' + finishedArray[i].reviewer + '">'
+            // + '<input type="hidden" name="ResignFinishedDetailDO[' + i + ']$reviewer" value="' + finishedArray[i].reviewer + '">'
             // + '<div class="z-inputselect-bar">'
             // + '<span></span><i></i>'
             // + '</div>'
@@ -292,19 +298,19 @@
 
                 //初始化
                 res.forEach(obj => {
-                    obj.treeName = 'ResignDetailDO1[' + i + ']$receiver';
+                    obj.treeName = 'ResignFinishedDetailDO[' + i + ']$receiver';
                 })
                 selecttree("[name='receive1[" + i + "]']", res, clickReceive)
 
                 // res.forEach(obj => {
-                //     obj.treeName = 'ResignDetailDO1[' + i + ']$reviewer';
+                //     obj.treeName = 'ResignFinishedDetailDO[' + i + ']$reviewer';
                 // })
                 // selecttree("[name='review1[" + i + "]']", res, clickReview)
 
 
                 //赋值
                 if (!(!finishedArray[i].content || finishedArray[i].content.trim() === '')) {
-                    z.ui.input("[name='ResignDetailDO1[" + i + "]$content']").setValue(finishedArray[i].content);
+                    z.ui.input("[name='ResignFinishedDetailDO[" + i + "]$content']").setValue(finishedArray[i].content);
                 }
                 if (!(!finishedArray[i].receiver || finishedArray[i].receiver.trim() === '')) {
                     z.ui.selecttree("[name='receive1[" + i + "]']").setValue(finishedArray[i].receiver)
@@ -516,7 +522,7 @@
         $("#delBtn_" + i).css("display", "block");
         $("[name='receive1[" + i + "]']").removeClass("z-readonly").css("pointer-events", "auto");
         // $("[name='review1[" + i + "]']").removeClass("z-readonly").css("pointer-events", "auto");
-        $("[name='ResignDetailDO1[" + i + "]$content']").removeClass("z-readonly").css("pointer-events", "auto");
+        $("[name='ResignFinishedDetailDO[" + i + "]$content']").removeClass("z-readonly").css("pointer-events", "auto");
     }
 
     function detailReadonly(i) {
@@ -524,7 +530,7 @@
         $("#delBtn_" + i).css("display", "none");
         $("[name='receive1[" + i + "]']").addClass("z-readonly").css("pointer-events", "none");
         // $("[name='review1[" + i + "]']").addClass("z-readonly").css("pointer-events", "none");
-        $("[name='ResignDetailDO1[" + i + "]$content']").addClass("z-readonly").css("pointer-events", "none");
+        $("[name='ResignFinishedDetailDO[" + i + "]$content']").addClass("z-readonly").css("pointer-events", "none");
     }
 
 

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

@@ -24,124 +24,248 @@ public class StaffRecordsDTO {
     private String id;
 
 
+    /**
+     * 用户ID
+     */
     @Schema(description = "用户ID")
     private String userId;
 
+    /**
+     * 状态
+     */
     @Schema(description = "状态 1-实习;2-试用;3-正式;4-离职")
     private Integer state;
 
+
+    /**
+     * 政治面貌
+     */
     @Schema(description = "政治面貌")
     private Integer zzmm;
 
+
+    /**
+     * 户口性质
+     */
     @Schema(description = "户口性质")
     private Integer hkxz;
 
+    /**
+     * 毕业学校
+     */
     @Schema(description = "毕业学校")
     private String byxx;
 
+    /**
+     * 毕业时间
+     */
     @Schema(description = "毕业时间")
     private LocalDateTime bysj;
 
+
+    /**
+     * 最高学历
+     */
     @Schema(description = "最高学历")
     private Integer zgxl;
 
+
+    /**
+     * 专业
+     */
     @Schema(description = "专业")
     private String major;
 
+    /**
+     * 参加工作时间
+     */
     @Schema(description = "参加工作时间")
     private LocalDateTime cjgzsj;
 
+    /**
+     * 入公司时间
+     */
     @Schema(description = "入公司时间")
     private LocalDateTime rgssj;
 
+    /**
+     * 离职时间
+     */
     @Schema(description = "离职时间")
     private LocalDateTime lzsj;
 
+    /**
+     * 性别
+     */
     @Schema(description = "性别")
     private Integer sex;
 
+
+    /**
+     * 民族
+     */
     @Schema(description = "民族")
     private String nation;
 
+
+    /**
+     * 出生日期
+     */
     @Schema(description = "出生日期")
     private LocalDateTime birthday;
 
+
+    /**
+     * 身份证号码
+     */
     @Schema(description = "身份证号码")
     private String cardid;
 
 
-
+    /**
+     * 户口所在地
+     */
     @Schema(description = "户口所在地")
     private String hkszd;
 
+
+    /**
+     * 婚姻状况
+     */
     @Schema(description = "婚姻状况")
     private Integer hyzk;
 
 
+    /**
+     * 手机
+     */
     @Schema(description = "手机")
     private String mobilePhone;
 
+
+    /**
+     * 指导人ID
+     */
     @Schema(description = "指导人ID")
     private String zdr;
 
+
+    /**
+     * 紧急联系人号码
+     */
     @Schema(description = "紧急联系人号码")
     private String jjlxrhm;
 
+
+    /**
+     * 紧急联系人姓名
+     */
     @Schema(description = "紧急联系人姓名")
     private String jjlxrxm;
 
     /**
-     * 1父母 2夫妻 3子女 4兄弟姐妹 5其他
+     * 紧急联系人关系
      */
     @Schema(description = "紧急联系人关系")
     private Integer jjlxrgx;
 
 
+    /**
+     * 所属部门
+     */
     @Schema(description = "所属部门")
     private String ssbm;
 
+    /**
+     * 担任职务
+     */
     @Schema(description = "担任职务")
     private String drzw;
 
+    /**
+     * 职称
+     */
     @Schema(description = "职称")
     private String zc;
 
 
+    /**
+     * 转正时间
+     */
     @Schema(description = "转正时间")
     private LocalDateTime zzsj;
 
+
+    /**
+     * 合同到期时间
+     */
     @Schema(description = "合同到期时间")
     private LocalDateTime htdqs;
 
+
+    /**
+     * 签订公司ID
+     */
     @Schema(description = "签订公司ID")
     private String qdgsid;
 
+
+    /**
+     * 能力等级
+     */
     @Schema(description = "能力等级")
     private String nldj;
 
 
-
+    /**
+     * 员工姓名
+     */
     @Schema(description = "员工姓名")
     private String nickname;
 
+
+    /**
+     * 部门名称
+     */
     @Schema(description = "部门名称")
     private String deptName;
 
+
+    /**
+     * 部门Id
+     */
     @Schema(description = "部门Id")
     private String deptId;
 
+
+    /**
+     * 签订公司
+     */
     @Schema(description = "签订公司")
     private String qdgs;
 
+    /**
+     * 指导人名称
+     */
     @Schema(description = "指导人名称")
     private String zdrmc;
 
+    /**
+     * 登录名称(员工工号)
+     */
     @Schema(description = "登录名称(员工工号)")
     private String loginName;
 
+    /**
+     * 开户银行
+     */
     @Schema(description = "开户银行")
     private String khyh;
 
+
+    /**
+     * 银行账号
+     */
     @Schema(description = "银行账号")
     private String yhzh;
 

zjugis-module-infra/zjugis-module-infra-biz/src/main/java/com/zjugis/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogBaseVO.java

@@ -22,7 +22,7 @@ public class ApiErrorLogBaseVO {
 
     @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "666")
     @NotNull(message = "用户编号不能为空")
-    private Integer userId;
+    private String userId;
 
     @Schema(description = "用户类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "用户类型不能为空")

zjugis-module-infra/zjugis-module-infra-biz/src/main/java/com/zjugis/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogRespVO.java

@@ -1,6 +1,5 @@
 package com.zjugis.module.infra.controller.admin.logger.vo.apierrorlog;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -24,6 +23,6 @@ public class ApiErrorLogRespVO extends ApiErrorLogBaseVO {
     private LocalDateTime processTime;
 
     @Schema(description = "处理用户编号", example = "233")
-    private Integer processUserId;
+    private String processUserId;
 
 }