Commit 4771b616f5faead04e6ddffa1695ff36a2cd9ca8
1 parent
5507448b
Exists in
master
修改每日资金复核,复核了还能再复核
Showing
2 changed files
with
15 additions
and
11 deletions
Show diff stats
backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WCurrentReportManagerImpl.java
... | ... | @@ -11,6 +11,7 @@ import org.springframework.stereotype.Service; |
11 | 11 | import org.springframework.transaction.annotation.Transactional; |
12 | 12 | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
13 | 13 | |
14 | +import java.time.LocalDate; | |
14 | 15 | import java.time.LocalDateTime; |
15 | 16 | import java.util.List; |
16 | 17 | import javax.annotation.Resource; |
... | ... | @@ -44,11 +45,14 @@ public class WCurrentReportManagerImpl extends BaseManagerImpl<WCurrentReportDao |
44 | 45 | |
45 | 46 | @Override |
46 | 47 | public void updateInsp(LocalDateTime fDate, String fOrgId, String fInspStatusName, String fInspNotes) { |
47 | -// List<WCurrentReport> wCurrentReports = baseMapper.selectInspList(Wrappers.<WCurrentReport>lambdaQuery() | |
48 | +// List<WCurrentReport> wCurrentReports2 = baseMapper.selectInspList(Wrappers.<WCurrentReport>lambdaQuery() | |
48 | 49 | // .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)); |
49 | - | |
50 | +// String dtae2 = fDate.toLocalDate().toString(); | |
51 | +// QueryWrapper<WCurrentReport> wrapper = new QueryWrapper<>(); | |
52 | +// wrapper.apply("DATE_FORMAT(F_date, '%Y-%m-%d') = '{0}'",dtae2); | |
53 | +// List<WCurrentReport> wCurrentReports1 = baseMapper.selectList(wrapper); | |
54 | +// List<WCurrentReport> wCurrentReports2 = baseMapper.selectList(Wrappers.<WCurrentReport>lambdaQuery().apply("DATE_FORMAT(F_date, '%Y-%m-%d') = DATE('{0}')",dtae2)); | |
50 | 55 | List<WCurrentReport> wCurrentReports = baseMapper.selectInspList(fDate,fOrgId); |
51 | - | |
52 | 56 | for (WCurrentReport wCurrentReport : wCurrentReports) { |
53 | 57 | baseMapper.update(null,Wrappers.<WCurrentReport>lambdaUpdate() |
54 | 58 | .set(WCurrentReport::getFUpdateBy, scriptImpl.getCurrentUserName()) | ... | ... |
frontend/front/src/components/tableSlot/dailyFunds/updateInspBtn.vue
... | ... | @@ -74,13 +74,13 @@ export default { |
74 | 74 | }, |
75 | 75 | methods: { |
76 | 76 | onPlfh() { |
77 | - let d = this.selectRows.find(item => { | |
78 | - return item.wdailyfundsfinspstatusname != '待复核'; | |
79 | - }) | |
80 | - if (d) { | |
81 | - this.$message.warning("请勾选‘待复核’状态的记录进行审核!"); | |
82 | - return false; | |
83 | - } | |
77 | + // let d = this.selectRows.find(item => { | |
78 | + // return item.wdailyfundsfinspstatusname != '待复核'; | |
79 | + // }) | |
80 | + // if (d) { | |
81 | + // this.$message.warning("请勾选‘待复核’状态的记录进行审核!"); | |
82 | + // return false; | |
83 | + // } | |
84 | 84 | this.dialogVisible = !this.dialogVisible |
85 | 85 | }, |
86 | 86 | onSubmit() { |
... | ... | @@ -88,7 +88,7 @@ export default { |
88 | 88 | this.$message.error('请选择数据!'); |
89 | 89 | return false; |
90 | 90 | } else { |
91 | - this.$confirm('是否确认批量复核1?', '提示', { | |
91 | + this.$confirm('是否确认批量复核?', '提示', { | |
92 | 92 | confirmButtonText: '确定', |
93 | 93 | cancelButtonText: '取消', |
94 | 94 | type: 'warning' | ... | ... |