huyc 项目档案代码提交

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/FddContractAttachInfo.java

@@ -24,6 +24,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -55,25 +56,25 @@ public class FddContractAttachInfo extends BaseEntity {
      * 合同试用期开始时间
      */
     @Schema(description ="合同试用期开始时间")
-    private LocalDateTime periodStart;
+    private LocalDate periodStart;
 
     /**
      * 合同试用期结束时间
      */
     @Schema(description ="合同试用期结束时间")
-    private LocalDateTime periodEnd;
+    private LocalDate periodEnd;
 
     /**
      * 合同起始时间
      */
     @Schema(description ="合同起始时间")
-    private LocalDateTime contractStart;
+    private LocalDate contractStart;
 
     /**
      * 合同到期时间
      */
     @Schema(description ="合同到期时间")
-    private LocalDateTime contractEnd;
+    private LocalDate contractEnd;
 
     /**
      * 试用期工资 元/月

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/FddTemplateFieldInfo.java

@@ -17,6 +17,7 @@
 package com.yifu.cloud.plus.v1.yifu.archives.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
@@ -61,5 +62,10 @@ public class FddTemplateFieldInfo extends BaseEntity {
     @Schema(description ="模板ID")
     private String templateId;
 
-
+	/**
+	 * 对应法大大模板字段值
+	 */
+	@Schema(description ="对应法大大模板字段值")
+	@TableField(exist = false)
+	private String fieldValue;
 }

yifu-archives/yifu-archives-biz/pom.xml

@@ -67,6 +67,11 @@
 			<version>1.8.0</version>
 			<artifactId>fadada-java-sdk-api3</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>cn.hutool</groupId>
+			<version>5.8.0</version>
+			<artifactId>hutool-all</artifactId>
+		</dependency>
     </dependencies>
 
 	<build>

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/FddContractInfoController.java

@@ -19,6 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fadada.api.exception.ApiException;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.FddContractInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.service.FddContractInfoService;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
@@ -111,4 +112,17 @@ public class FddContractInfoController {
         return R.ok(fddContractInfoService.removeById(id));
     }
 
+	/**
+	 * @param fddContractInfo
+	 * @Author: huyc
+	 * @Date: 2022/6/30
+	 * @Description: 发送法大大电子合同定稿任务
+	 * @return: com.yifu.cloud.v1.common.core.util.R<java.lang.String>
+	 **/
+	@Operation(summary = "发送法大大电子合同定稿任务", description = "发送法大大电子合同定稿任务")
+	@SysLog("发送法大大电子合同定稿任务" )
+	@PostMapping("/send")
+	public R<String> send(FddContractInfo fddContractInfo) throws ApiException {
+		return fddContractInfoService.saveEmpContract(fddContractInfo);
+	}
 }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/FddContractInfoService.java

@@ -19,7 +19,9 @@ package com.yifu.cloud.plus.v1.yifu.archives.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fadada.api.exception.ApiException;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.FddContractInfo;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 
 /**
  * 法大大合同与员工合同信息
@@ -29,4 +31,5 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.FddContractInfo;
  */
 public interface FddContractInfoService extends IService<FddContractInfo> {
 
+	R<String> saveEmpContract(FddContractInfo fddContractInfo) throws ApiException;
 }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/FddTemplateFieldInfoService.java

@@ -21,6 +21,8 @@ package com.yifu.cloud.plus.v1.yifu.archives.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.FddTemplateFieldInfo;
 
+import java.util.List;
+
 /**
  * 法大大字段对应信息表
  *
@@ -28,5 +30,6 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.FddTemplateFieldInfo;
  * @date 2022-06-28 16:24:12
  */
 public interface FddTemplateFieldInfoService extends IService<FddTemplateFieldInfo> {
+	List<FddTemplateFieldInfo> getFddFields(String templateId, String type);
 
 }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/FddTemplateFieldInfoServiceImpl.java

@@ -16,6 +16,7 @@
  */
 package com.yifu.cloud.plus.v1.yifu.archives.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.FddTemplateFieldInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.mapper.FddTemplateFieldInfoMapper;
@@ -23,6 +24,8 @@ import com.yifu.cloud.plus.v1.yifu.archives.service.FddTemplateFieldInfoService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 法大大字段对应信息表
  *
@@ -33,4 +36,17 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor
 public class FddTemplateFieldInfoServiceImpl extends ServiceImpl<FddTemplateFieldInfoMapper, FddTemplateFieldInfo> implements FddTemplateFieldInfoService {
 
+	/**
+	 * @ClassName: com.yifu.cloud.v1.hr.basicArchives.service.impl.FddTemplateFieldInfoServiceImpl.java
+	 * @author huyc
+	 * @date 2022/6/30
+	 * @Description 按模板和角色获取具体字段参数
+	 * @param templateId： 模板ID type：0 个人角色 1 公司角色
+	 */
+	@Override
+	public List<FddTemplateFieldInfo> getFddFields(String templateId, String type) {
+		return baseMapper.selectList(Wrappers.<FddTemplateFieldInfo>query().lambda()
+				.eq(FddTemplateFieldInfo::getType,type)
+				.eq(FddTemplateFieldInfo::getTemplateId,templateId));
+	}
 }