Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/analysis/index.vue

@@ -127,7 +127,7 @@ watchEffect(() => {
     ...(bulletinPrompt.date === ('ignore' as any)
       ? {
           startDate: dayjs(bulletinPrompt.sliceDate[0]).format('YYYY-MM-DD'),
-          endData: dayjs(bulletinPrompt.sliceDate[1]).format('YYYY-MM-DD')
+          endDate: dayjs(bulletinPrompt.sliceDate[1]).format('YYYY-MM-DD')
         }
       : { dateType: bulletinPrompt.date }),
     queryType: bulletinPrompt.permission
@@ -139,7 +139,7 @@ watchEffect(() => {
     ...(stagePrompt.date === ('ignore' as any)
       ? {
           startDate: dayjs(stagePrompt.sliceDate[0]).format('YYYY-MM-DD'),
-          endData: dayjs(stagePrompt.sliceDate[1]).format('YYYY-MM-DD')
+          endDate: dayjs(stagePrompt.sliceDate[1]).format('YYYY-MM-DD')
         }
       : { dateType: stagePrompt.date }),
     queryType: stagePrompt.permission
@@ -151,7 +151,7 @@ watchEffect(() => {
     ...(summaryPrompt.date === ('ignore' as any)
       ? {
           startDate: dayjs(summaryPrompt.sliceDate[0]).format('YYYY-MM-DD'),
-          endData: dayjs(summaryPrompt.sliceDate[1]).format('YYYY-MM-DD')
+          endDate: dayjs(summaryPrompt.sliceDate[1]).format('YYYY-MM-DD')
         }
       : { dateType: summaryPrompt.date }),
     queryType: summaryPrompt.permission

fhKeeper/formulahousekeeper/management-workshop/src/main/resources/mapper/ReportMapper.xml

@@ -219,7 +219,7 @@
         FROM prod_procedure_team ppt2
         LEFT JOIN plan_procedure_total ppt ON ppt.id=ppt2.plan_procedure_id
         LEFT JOIN plan ON plan.id=ppt.plan_id
-        LEFT JOIN report r ON r.user_procedure_team_id=ppt2.id
+        LEFT JOIN report r ON r.user_procedure_team_id=ppt2.id AND r.finish_num>0
         LEFT JOIN prod_procedure pp ON ppt.prod_procedure_id=pp.id
         LEFT JOIN product p ON p.id=plan.product_id
         LEFT JOIN user u ON r.checker_id=u.id