Merge remote-tracking branch 'origin/MVP1.6.10' into MVP1.6.10

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

@@ -34,4 +34,18 @@ public class TCompleteMonitorInfoVo implements Serializable {
 	@Schema(description = "人员档案id")
 	private String empInfoId;
 
+	@Schema(description = "项目编码")
+	private String deptNo;
+
+	/**
+	 * 开始时间（查询专用）
+	 */
+	@Schema(description = "进项目时间开始")
+	private LocalDateTime inTimeStart;
+	/**
+	 * 截止时间（查询专用）
+	 */
+	@Schema(description = "进项目时间结束")
+	private LocalDateTime inTimeEnd;
+
 }

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

@@ -70,13 +70,13 @@ public class TCompleteMonitorController {
 	/**
 	 * 查询人员明细
 	 * @param page 分页对象
-	 * @param deptNo 查询人员明细
+	 * @param completeMonitorInfoVo
 	 * @return
 	 */
 	@Operation(description = "根据项目查询人员明细")
 	@GetMapping("/empPage")
-	public R<IPage<TCompleteMonitorInfoVo>> getMonitorEmpInfoListPage(Page<TCompleteMonitorInfoVo> page, String deptNo) {
-		return new R<>(tCompleteMonitorService.getMonitorEmpInfoListPage(page,deptNo));
+	public R<IPage<TCompleteMonitorInfoVo>> getMonitorEmpInfoListPage(Page<TCompleteMonitorInfoVo> page, TCompleteMonitorInfoVo completeMonitorInfoVo) {
+		return new R<>(tCompleteMonitorService.getMonitorEmpInfoListPage(page,completeMonitorInfoVo));
 	}
 
     /**

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TCompleteMonitorMapper.java

@@ -60,10 +60,10 @@ public interface TCompleteMonitorMapper extends BaseMapper<TCompleteMonitor> {
 
 	/**
 	 * 查询人员明细
-	 * @param deptNo 项目编码
+	 * @param completeMonitorInfoVo
 	 * @return
 	 */
-	IPage<TCompleteMonitorInfoVo> getMonitorEmpInfoList(Page<TCompleteMonitorInfoVo> page,@Param("deptNo") String deptNo);
+	IPage<TCompleteMonitorInfoVo> getMonitorEmpInfoList(Page<TCompleteMonitorInfoVo> page,@Param("completeMonitorInfoVo") TCompleteMonitorInfoVo completeMonitorInfoVo);
 
 	/**
 	 * 获取所有监控数据

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

@@ -55,10 +55,10 @@ public interface TCompleteMonitorService extends IService<TCompleteMonitor> {
 
 	/**
 	 * 档案完整度监控简单分页查询
-	 * @param deptNo 项目编码
+	 * @param completeMonitorInfoVo
 	 * @return
 	 */
-	IPage<TCompleteMonitorInfoVo> getMonitorEmpInfoListPage(Page<TCompleteMonitorInfoVo> page, String deptNo);
+	IPage<TCompleteMonitorInfoVo> getMonitorEmpInfoListPage(Page<TCompleteMonitorInfoVo> page, TCompleteMonitorInfoVo completeMonitorInfoVo);
 
 	// 导出全量
 	void exportAll(HttpServletResponse response, TCompleteMonitorSearchVo searchVo);

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

@@ -180,12 +180,12 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
 
 	/**
 	 * 档案完整度监控简单分页查询
-	 * @param deptNo 项目编码
+	 * @param completeMonitorInfoVo
 	 * @return
 	 */
 	@Override
-	public IPage<TCompleteMonitorInfoVo> getMonitorEmpInfoListPage(Page<TCompleteMonitorInfoVo> page, String deptNo){
-		return baseMapper.getMonitorEmpInfoList(page,deptNo);
+	public IPage<TCompleteMonitorInfoVo> getMonitorEmpInfoListPage(Page<TCompleteMonitorInfoVo> page, TCompleteMonitorInfoVo completeMonitorInfoVo){
+		return baseMapper.getMonitorEmpInfoList(page,completeMonitorInfoVo);
 	}
 
 	@Override

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

@@ -150,7 +150,27 @@
 		from
 			t_employee_project a
 			left join t_employee_info b on a.EMP_ID = b.id
-		where a.DELETE_FLAG = '0' and a.project_status = 0 and a.dept_no = #{deptNo} order by a.CREATE_TIME desc
+		where a.DELETE_FLAG = '0'
+		  and a.project_status = 0
+		<if test="completeMonitorInfoVo.deptNo != null and completeMonitorInfoVo.deptNo.trim() != ''">
+			and a.dept_no = #{completeMonitorInfoVo.deptNo}
+		</if>
+		<if test="completeMonitorInfoVo.empName != null and completeMonitorInfoVo.empName.trim() != ''">
+			and a.EMP_NAME = #{completeMonitorInfoVo.empName}
+		</if>
+		<if test="completeMonitorInfoVo.phone != null and completeMonitorInfoVo.phone.trim() != ''">
+			and a.EMP_PHONE = #{completeMonitorInfoVo.phone}
+		</if>
+		<if test="completeMonitorInfoVo.isComplete != null and completeMonitorInfoVo.isComplete.trim() != ''">
+			and a.IS_COMPLETE = #{completeMonitorInfoVo.isComplete}
+		</if>
+		<if test="completeMonitorInfoVo.inTimeStart != null">
+			AND a.CREATE_TIME <![CDATA[ >= ]]> #{completeMonitorInfoVo.inTimeStart}
+		</if>
+		<if test="completeMonitorInfoVo.inTimeEnd != null">
+			AND a.CREATE_TIME <![CDATA[ <= ]]> #{completeMonitorInfoVo.inTimeEnd}
+		</if>
+		order by a.CREATE_TIME desc
 	</select>
 
 	<!--生成数据封装-->

yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/QiWeiServiceImpl.java

@@ -1025,10 +1025,23 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
 		JSONArray options;
 		if (Common.isNotNull(value)) {
 			options = (JSONArray) value.get("departments");
+			StringBuilder deptName = new StringBuilder();
 			if (Common.isNotNull(options)) {
-				options0 = (JSONObject) options.get(0);
-				if (Common.isNotNull(options0)) {
-					return options0.getString("name");
+				for (int i = 0; i < options.size(); i++) {
+					options0 = (JSONObject) options.get(i);
+					if (Common.isNotNull(options0)) {
+						if (i > 0) {
+							deptName.append("；");
+						}
+						deptName.append(options0.getString("name"));
+					}
+				}
+				if (Common.isNotNull(deptName)) {
+					if (deptName.length() > 200) {
+						return deptName.substring(0, 200);
+					} else {
+						return deptName.toString();
+					}
 				}
 			}
 		}