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

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

@@ -123,8 +123,8 @@ public class TCompleteMonitorController {
 	 * @return R
 	 */
 	@Operation(summary = "通过id查询", description = "通过id查询")
-	@GetMapping("/{infoId}")
-	public R<EmpMainDetailVo> getInfoById(@PathVariable("infoId") String infoId) {
+	@GetMapping("/infoId/{id}")
+	public R<EmpMainDetailVo> getInfoById(@PathVariable("id") String infoId) {
 		return tCompleteMonitorService.getInfoById(infoId);
 	}
 

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

@@ -165,16 +165,16 @@
 			a.BUSINESS_SECOND_TYPE,
 			a.BUSINESS_THIRD_TYPE,
 			count(a.EMP_IDCARD) as INUSE_PERSON_NUM,
-			if(sum(if(a.PROJECT_STATUS = 0 and a.IS_COMPLETE = '0',0,1)) > 0,1,0) as IS_COMPLETE,
+			if(sum(if(a.IS_COMPLETE = '0',0,1)) > 0,1,0) as IS_COMPLETE,
 			sum(if(a.IS_COMPLETE = '0',0,1)) as INCOMPLETE_NUM,
 			concat(ROUND((count(a.EMP_IDCARD) - sum(if(a.IS_COMPLETE = '0',0,1)))/count(a.EMP_IDCARD)),'%') as COMPLETE_PER,
-			sum(if(a.PROJECT_STATUS = 0 and DATE_FORMAT(a.CREATE_TIME,'%Y-%m-%d') >= '2024-06-01',1,0)) as AFTER_EMPLOYMENT,
-			if(sum(if(a.PROJECT_STATUS = 0 and DATE_FORMAT(a.CREATE_TIME,'%Y-%m-%d') >= '2024-06-01' and a.IS_COMPLETE = '0',0,1)) > 0,1,0) AFTER_IS_COMPLETE,
-			sum(if(a.PROJECT_STATUS = 0 and DATE_FORMAT(a.CREATE_TIME,'%Y-%m-%d') >= '2024-06-01' and a.IS_COMPLETE = '1',1,0)) as AFTER_INCOMPLETE_NUM,
+			sum(if(DATE_FORMAT(a.CREATE_TIME,'%Y-%m-%d') >= '2024-06-01',1,0)) as AFTER_EMPLOYMENT,
+			if(sum(if(DATE_FORMAT(a.CREATE_TIME,'%Y-%m-%d') >= '2024-06-01' and a.IS_COMPLETE = '0',0,1)) > 0,1,0) AFTER_IS_COMPLETE,
+			sum(if(DATE_FORMAT(a.CREATE_TIME,'%Y-%m-%d') >= '2024-06-01' and a.IS_COMPLETE = '1',1,0)) as AFTER_INCOMPLETE_NUM,
 			a.CREATE_NAME as ALERT_USER
 		from
 			t_employee_project a
-		where DELETE_FLAG = '0'
+		where DELETE_FLAG = '0' and PROJECT_STATUS = 0
 		<if test="deptNo != null and deptNo.trim() != ''">
 			and a.DEPT_NO = #{deptNo}
 		</if>