From 4771b616f5faead04e6ddffa1695ff36a2cd9ca8 Mon Sep 17 00:00:00 2001
From: chenwei <timeless646@163.com>
Date: Wed, 17 Jul 2024 14:40:10 +0800
Subject: [PATCH] 修改每日资金复核，复核了还能再复核

---
 backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WCurrentReportManagerImpl.java | 10 +++++++---
 frontend/front/src/components/tableSlot/dailyFunds/updateInspBtn.vue                           | 16 ++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WCurrentReportManagerImpl.java b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WCurrentReportManagerImpl.java
index 8f10bf6..b85df49 100644
--- a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WCurrentReportManagerImpl.java
+++ b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WCurrentReportManagerImpl.java
@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 import javax.annotation.Resource;
@@ -44,11 +45,14 @@ public class WCurrentReportManagerImpl extends BaseManagerImpl<WCurrentReportDao
 
 	@Override
 	public void updateInsp(LocalDateTime fDate, String fOrgId, String fInspStatusName, String fInspNotes) {
-//		List<WCurrentReport> wCurrentReports = baseMapper.selectInspList(Wrappers.<WCurrentReport>lambdaQuery()
+//		List<WCurrentReport> wCurrentReports2 = baseMapper.selectInspList(Wrappers.<WCurrentReport>lambdaQuery()
 //				.apply("DATE(F_date) = DATE('{0}') and  id_ in (SELECT a.ref_id_ FROM w_current a WHERE  DATE(a.F_date) = DATE('{1}')  and a.F_org_id ='{2}')", fDate, fDate, fOrgId));
-
+//		String dtae2 = fDate.toLocalDate().toString();
+//		QueryWrapper<WCurrentReport> wrapper = new QueryWrapper<>();
+//		wrapper.apply("DATE_FORMAT(F_date, '%Y-%m-%d') = '{0}'",dtae2);
+//		List<WCurrentReport> wCurrentReports1 = baseMapper.selectList(wrapper);
+//		List<WCurrentReport> wCurrentReports2 = baseMapper.selectList(Wrappers.<WCurrentReport>lambdaQuery().apply("DATE_FORMAT(F_date, '%Y-%m-%d') =  DATE('{0}')",dtae2));
 		List<WCurrentReport> wCurrentReports = baseMapper.selectInspList(fDate,fOrgId);
-
 		for (WCurrentReport wCurrentReport : wCurrentReports) {
 				baseMapper.update(null,Wrappers.<WCurrentReport>lambdaUpdate()
 						.set(WCurrentReport::getFUpdateBy, scriptImpl.getCurrentUserName())
diff --git a/frontend/front/src/components/tableSlot/dailyFunds/updateInspBtn.vue b/frontend/front/src/components/tableSlot/dailyFunds/updateInspBtn.vue
index acca411..a75d41e 100644
--- a/frontend/front/src/components/tableSlot/dailyFunds/updateInspBtn.vue
+++ b/frontend/front/src/components/tableSlot/dailyFunds/updateInspBtn.vue
@@ -74,13 +74,13 @@ export default {
   },
   methods: {
     onPlfh() {
-      let d = this.selectRows.find(item => {
-        return item.wdailyfundsfinspstatusname != '待复核';
-      })
-      if (d) {
-        this.$message.warning("请勾选‘待复核’状态的记录进行审核！");
-        return false;
-      }
+      // let d = this.selectRows.find(item => {
+      //   return item.wdailyfundsfinspstatusname != '待复核';
+      // })
+      // if (d) {
+      //   this.$message.warning("请勾选‘待复核’状态的记录进行审核！");
+      //   return false;
+      // }
       this.dialogVisible = !this.dialogVisible
     },
     onSubmit() {
@@ -88,7 +88,7 @@ export default {
         this.$message.error('请选择数据！');
         return false;
       } else {
-        this.$confirm('是否确认批量复核1？', '提示', {
+        this.$confirm('是否确认批量复核？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
--
libgit2 0.21.2