fdd 代码修改

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

@@ -346,4 +346,20 @@ public class TEmployeeProject extends BaseEntity {
 	@ExcelAttribute(name = "合同状态", isDataId = true,dataType = ExcelAttributeConstants.PERSONNEL_STATE)
 	private Integer contractStatus;
 
+	@Schema(description = "社保状态多个")
+	@TableField(exist = false)
+	private String[] socialStatusArray;
+	@Schema(description = "公积金状态多个")
+	@TableField(exist = false)
+	private String[] fundStatusArray;
+	@Schema(description = "商险状态多个")
+	@TableField(exist = false)
+	private String[] insuranceStatusArray;
+	@Schema(description = "合同状态多个")
+	@TableField(exist = false)
+	private String[] contractStatusArray;
+	@Schema(description = "员工类型多个")
+	@TableField(exist = false)
+	private String[] empNatureArray;
+
 }

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

@@ -383,6 +383,41 @@
 			<if test="tEmployeeProject.fileTown != null">
 				AND a.SOCIAL_TOWN = #{tEmployeeProject.socialTown}
 			</if>
+			<if test="tEmployeeProject.empNatureArray != null">
+				AND a.EMP_NATRUE in
+				<foreach item="idStr" index="index" collection="tEmployeeProject.empNatureArray" open="(" separator=","
+						 close=")">
+					#{idStr}
+				</foreach>
+			</if>
+			<if test="tEmployeeProject.contractStatusArray != null">
+				AND a.CONTRACT_STATUS in
+				<foreach item="idStr" index="index" collection="tEmployeeProject.contractStatusArray" open="("
+						 separator="," close=")">
+					#{idStr}
+				</foreach>
+			</if>
+			<if test="tEmployeeProject.insuranceStatusArray != null">
+				AND a.INSURANCE_STATUS in
+				<foreach item="idStr" index="index" collection="tEmployeeProject.insuranceStatusArray" open="("
+						 separator="," close=")">
+					#{idStr}
+				</foreach>
+			</if>
+			<if test="tEmployeeProject.socialStatusArray != null">
+				AND a.SOCIAL_STATUS in
+				<foreach item="idStr" index="index" collection="tEmployeeProject.socialStatusArray" open="("
+						 separator="," close=")">
+					#{idStr}
+				</foreach>
+			</if>
+			<if test="tEmployeeProject.fundStatusArray != null">
+				AND a.FUND_STATUS in
+				<foreach item="idStr" index="index" collection="tEmployeeProject.fundStatusArray" open="("
+						 separator="," close=")">
+					#{idStr}
+				</foreach>
+			</if>
 		</if>
 	</sql>
 
@@ -505,6 +540,41 @@
 					#{idStr}
 				</foreach>
 			</if>
+			<if test="tEmployeeProject.empNatureArray != null">
+				AND a.EMP_NATRUE in
+				<foreach item="idStr" index="index" collection="tEmployeeProject.empNatureArray" open="(" separator=","
+						 close=")">
+					#{idStr}
+				</foreach>
+			</if>
+			<if test="tEmployeeProject.contractStatusArray != null">
+				AND a.CONTRACT_STATUS in
+				<foreach item="idStr" index="index" collection="tEmployeeProject.contractStatusArray" open="("
+						 separator="," close=")">
+					#{idStr}
+				</foreach>
+			</if>
+			<if test="tEmployeeProject.insuranceStatusArray != null">
+				AND a.INSURANCE_STATUS in
+				<foreach item="idStr" index="index" collection="tEmployeeProject.insuranceStatusArray" open="("
+						 separator="," close=")">
+					#{idStr}
+				</foreach>
+			</if>
+			<if test="tEmployeeProject.socialStatusArray != null">
+				AND a.SOCIAL_STATUS in
+				<foreach item="idStr" index="index" collection="tEmployeeProject.socialStatusArray" open="("
+						 separator="," close=")">
+					#{idStr}
+				</foreach>
+			</if>
+			<if test="tEmployeeProject.fundStatusArray != null">
+				AND a.FUND_STATUS in
+				<foreach item="idStr" index="index" collection="tEmployeeProject.fundStatusArray" open="("
+						 separator="," close=")">
+					#{idStr}
+				</foreach>
+			</if>
 		</if>
 	</sql>
 

yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/UpmsDaprUtils.java

 package com.yifu.cloud.plus.v1.yifu.common.dapr.util;
 
 import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysArea;
+import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AreaVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
@@ -23,7 +24,7 @@ import java.util.List;
 public class UpmsDaprUtils {
 
 	@Autowired
-	private static DaprUpmsProperties daprUpmsProperties;
+	private DaprUpmsProperties daprUpmsProperties;
 
 	/**
 	 * 获取所有区域数据
@@ -31,8 +32,8 @@ public class UpmsDaprUtils {
 	 * @Date 2022-07-18
 	 * @return
 	 **/
-	public static R<List<SysArea>> getAreaListR() {
-		R<List<SysArea>> areaListR = HttpDaprUtil.invokeMethodPost(daprUpmsProperties.getAppUrl(),daprUpmsProperties.getAppId(),"/area/inner/getSysAreaList","", SysArea.class, SecurityConstants.FROM_IN);
+	public R<AreaVo> getAreaListR() {
+		R<AreaVo> areaListR = HttpDaprUtil.invokeMethodPost(daprUpmsProperties.getAppUrl(),daprUpmsProperties.getAppId(),"/area/inner/getAreaVo","", AreaVo.class, SecurityConstants.FROM_IN);
 		if (Common.isEmpty(areaListR)){
 			return R.failed("获取所有区域数据失败！");
 		}

yifu-upms/yifu-upms-api/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/api/entity/SysArea.java

 package com.yifu.cloud.plus.v1.yifu.admin.api.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -23,6 +24,7 @@ public class SysArea {
 
     private Integer parentId;
 
+	@JsonFormat(pattern = "yyyy-MM-dd  HH:mm:ss")
     private LocalDateTime updateDate;
 
     private Integer status;

yifu-upms/yifu-upms-api/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/api/vo/AreaVo.java

+/*
+ * Copyright (c) 2020 yifu4cloud Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.yifu.cloud.plus.v1.yifu.admin.api.vo;
+
+import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysArea;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author lengleng
+ * @date 2020/2/10
+ */
+@Data
+@Schema(description = "区域Vo")
+public class AreaVo {
+
+	/**
+	 * 角色id
+	 */
+	private List<SysArea> sysAreaList;
+
+}

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

@@ -18,12 +18,14 @@ package com.yifu.cloud.plus.v1.yifu.admin.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysArea;
+import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AreaVo;
 import com.yifu.cloud.plus.v1.yifu.admin.service.SysAreaService;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -84,5 +86,20 @@ public class AreaController {
 		return sysAreaService.list(Wrappers.<SysArea>query().lambda()
 				.eq(SysArea::getStatus, CommonConstants.ZERO_INT).orderByAsc(SysArea::getParentId));
 	}
+	/**
+	 * @param
+	 * @Description: 获取所有区域list
+	 * @Author: hyc
+	 * @Date: 2022-7-21 19:45:24
+	 **/
+	@Inner
+	@PostMapping("/inner/getAreaVo")
+	public AreaVo getAreaVo() {
+		List<SysArea> aList = sysAreaService.list(Wrappers.<SysArea>query().lambda()
+				.eq(SysArea::getStatus, CommonConstants.ZERO_INT).orderByAsc(SysArea::getParentId));
+		AreaVo vo = new AreaVo();
+		vo.setSysAreaList(aList);
+		return vo;
+	}
 
 }