Merge remote-tracking branch 'origin/develop' into develop

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectExportVO.java

@@ -69,12 +69,14 @@ public class EmployeeProjectExportVO{
 	 * 身份证有效期起
 	 */
 	@ExcelProperty(value = "身份证开始日期")
+	@DateTimeFormat("yyyy-MM-dd")
 	private Date validityStart;
 
 	/**
 	 * 身份证有效期止
 	 */
 	@ExcelProperty(value = "身份证截止日期")
+	@DateTimeFormat("yyyy-MM-dd")
 	private Date validityEnd;
 
 	/**
@@ -217,14 +219,7 @@ public class EmployeeProjectExportVO{
 	 */
 	@ExcelProperty(value = "人员档案状态")
 	@ExcelAttribute(name = "人员档案状态", readConverterExp = "0=草稿,1=已审核")
-	private Integer proStatus;
-
-	/**
-	 * 档案状态（0正常；1已减档）
-	 */
-	@ExcelProperty(value = "档案状态")
-	@ExcelAttribute(name = "人员档案状态", readConverterExp = "0=正常,1=已减档")
-	private Integer fileStatus;
+	private String proStatus;
 
 	/**
 	 * 创建者-姓名
@@ -288,6 +283,7 @@ public class EmployeeProjectExportVO{
 	 * 入职日期
 	 */
 	@ExcelProperty(value ="入职日期")
+	@DateTimeFormat("yyyy-MM-dd")
 	@Past
 	private Date enjoinDate;
 
@@ -301,7 +297,7 @@ public class EmployeeProjectExportVO{
 	 * 项目员工类型
 	 */
 	@ExcelProperty(value ="项目员工类型")
-	@ExcelAttribute(name = "项目员工类型", isDataId = true,dataType = ExcelAttributeConstants.PERSONNEL_STATE)
+	@ExcelAttribute(name = "项目员工类型", isDataId = true,dataType = ExcelAttributeConstants.EMP_NATRUE)
 	private String empNatrue;
 
 	/**
@@ -333,7 +329,7 @@ public class EmployeeProjectExportVO{
 	 */
 	@ExcelProperty(value ="合同状态")
 	@ExcelAttribute(name = "合同状态", isDataId = true,dataType = ExcelAttributeConstants.PERSONNEL_STATE)
-	private Integer contractStatus;
+	private String contractStatus;
 
 	/**
 	 * 业务类型一级分类
@@ -358,28 +354,28 @@ public class EmployeeProjectExportVO{
 	 */
 	@ExcelProperty(value ="商险状态")
 	@ExcelAttribute(name = "商险状态", isDataId = true,dataType = ExcelAttributeConstants.COMMERCIAL_SATTE)
-	private Integer insuranceStatus;
+	private String insuranceStatus;
 
 	/**
 	 * 社保状态（字典）
 	 */
 	@ExcelProperty(value ="社保状态")
 	@ExcelAttribute(name = "社保状态", isDataId = true,dataType = ExcelAttributeConstants.SOCIAL_ECURITY_STATE)
-	private Integer socialStatus;
+	private String socialStatus;
 
 	/**
 	 * 公积金状态（字典）
 	 */
 	@ExcelProperty(value ="公积金状态")
 	@ExcelAttribute(name = "公积金状态", isDataId = true,dataType = ExcelAttributeConstants.FUND_STATUS)
-	private Integer fundStatus;
+	private String fundStatus;
 
 	/**
 	 * 近3个月发薪（0否；1是）
 	 */
 	@ExcelProperty(value ="近3个月发薪")
 	@ExcelAttribute(name = "近3个月发薪", readConverterExp = "0=无,1=是,2=否")
-	private Integer salaryStatus;
+	private String salaryStatus;
 
 	/**
 	 * 项目档案来源（字典：4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬）
@@ -391,8 +387,9 @@ public class EmployeeProjectExportVO{
 	/**
 	 * 项目档案状态（0草稿、1已审核）
 	 */
+	@ExcelAttribute(name ="项目档案状态", readConverterExp = "0=草稿,1=已审核")
 	@ExcelProperty(value ="项目档案状态")
-	private Integer status;
+	private String status;
 
 	 /**
 	 * 项目档案创建人

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml

@@ -80,7 +80,6 @@
 		<result property="remark" column="REMARK"/>
 		<result property="fileSource" column="FILE_SOURCE"/>
 		<result property="proStatus" column="PROSTATUS"/>
-		<result property="fileStatus" column="FILE_STATUS"/>
 		<result property="bankName" column="BANK_NAME"/>
 		<result property="bankSubName" column="BANK_SUB_NAME"/>
 		<result property="bankNo" column="BANK_NO"/>

yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/controller/DictController.java

@@ -345,7 +345,6 @@ public class DictController {
 	@PostMapping("/inner/getDictList")
 	public R<List<SysDictItem>> getDictList(@RequestParam(value = "itemType", required = false) String itemType) {
 		List<SysDictItem> allList = sysDictItemService.list(Wrappers.<SysDictItem>query().lambda()
-				.in(SysDictItem::getType,itemType)
 				.eq(SysDictItem::getDelFlag,CommonConstants.ZERO_STRING));
 		return new R<>(allList);
 	}