人员花名册

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

@@ -21,6 +21,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * @author fxj
@@ -52,5 +53,14 @@ public class TPersonnelRosterSearchVo extends TPersonnelRoster {
 	 **/
 	@Schema(description = "查询limit  数据条数")
 	private int limitEnd;
-
+	/**
+	 * @Author fxj
+	 * 业务类型
+	 **/
+	private List<String> businessTypes;
+	/**
+	 * @Author fxj
+	 * BU归属
+	 **/
+	private List<String> buBelongs;
 }

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

@@ -130,7 +130,6 @@ public class TPersonnelRosterController {
      **/
     @Operation(description = "导出 hasPermission('demo_tpersonnelroster-export')")
     @PostMapping("/export")
-    @PreAuthorize("@pms.hasPermission('demo_tpersonnelroster-export')")
     public void export(HttpServletResponse response, @RequestBody TPersonnelRosterSearchVo searchVo) {
             tPersonnelRosterService.listExport(response,searchVo);
     }

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

@@ -46,6 +46,7 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URLEncoder;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -179,6 +180,7 @@ public class TPersonnelRosterServiceImpl extends ServiceImpl<TPersonnelRosterMap
 								r.setBankNameSub(rosterVo.getBankSubName());
 								r.setBankProvince(rosterVo.getBankProvince());
 							}
+							r.setDataCreateMonth(DateUtil.getYearAndMonth(LocalDateTime.now(),0));
 						}
 						this.saveBatch(list);
 					}

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

@@ -240,6 +240,20 @@
                         AND a.DATA_CREATE_MONTH = #{tPersonnelRoster.dataCreateMonth}
                     </if>
 
+					<if test="tPersonnelRoster.businessTypes != null and tPersonnelRoster.businessTypes.size() > 0">
+						AND a.BUSINESS_TYPE in
+						<foreach item="item" index="index" collection="tPersonnelRoster.businessTypes" open="(" separator="," close=")">
+							#{item}
+						</foreach>
+					</if>
+
+					<if test="tPersonnelRoster.buBelongs != null and tPersonnelRoster.buBelongs.size() > 0">
+						AND a.BU_BELONG in
+						<foreach item="item" index="index" collection="tPersonnelRoster.buBelongs" open="(" separator="," close=")">
+							#{item}
+						</foreach>
+					</if>
+
         </if>
     </sql>
     <!--tPersonnelRoster简单分页查询-->
@@ -260,7 +274,7 @@
 				e.EMP_PHONE as 'EMP_PHONE',c1.FILE_PROVINCE as 'EMP_PROVINCE',c1.FILE_CITY as 'EMP_CITY',c1.FILE_TOWN as 'EMP_TOWN',
 				p.SOCIAL_PROVINCE as 'SOCIAL_PROVINCE',p.SOCIAL_CITY as 'SOCIAL_CITY',p.SOCIAL_TOWN as 'SOCIAL_TOWN',c1.APPLY_NO as 'CONTRACT_APPLY_NO',
 				c1.CONTRACT_START as 'CONTRACT_START',c1.CONTRACT_END as 'CONTRACT_END',c1.CONTRACT_NAME as 'CONTRACT_TYPE',c1.CONTRACT_SUB_NAME as 'BUSINESS_DETAIL',
-				c1.SITUATION as 'SIGN_TERM',c1.CONTRACT_TYPE as 'SIGN_TYPE',
+				c1.SITUATION as 'SIGN_TYPE',c1.CONTRACT_TYPE as 'SIGN_TERM',
 				c1.CONTRACT_PARTY as 'CONTRACT_PARTY_A',c1.POST as 'CONTRACT_POST',c1.WORKING_HOURS as 'CONTRACT_TASK_TIME',
 				c1.CONTRACT_NO as 'CONTRACT_CODE',c1.CREATE_NAME as 'CONTRACT_CREATER',c1.CREATE_TIME as 'CONTRACT_CREATE_TIME'
 		from
@@ -302,7 +316,7 @@
 		<include refid="Base_Column_List"/>
 		from t_personnel_roster a
 		<where>
-			a.DELETE_FLAG = '0'
+			1=1
 			<include refid="tPersonnelRoster_where"/>
 		</where>
 		order by a.CREATE_TIME desc