diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WCurrentController.java b/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WCurrentController.java index 93455f6..5554956 100644 --- a/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WCurrentController.java +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WCurrentController.java @@ -66,8 +66,8 @@ public class WCurrentController extends BaseController data = baseService.getHistoricalDetail(); + public CommonResult getHistoricalDetail(String date) throws Exception { + List data = baseService.getHistoricalDetail(date); return new CommonResult(true, "成功", data); } diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/dao/WCurrentDao.java b/backend/chkpower/src/main/java/com/hotent/chkpower/dao/WCurrentDao.java index e3326cb..5302487 100644 --- a/backend/chkpower/src/main/java/com/hotent/chkpower/dao/WCurrentDao.java +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/dao/WCurrentDao.java @@ -17,7 +17,7 @@ import java.util.List; */ public interface WCurrentDao extends BaseMapper { - List getHistoricalDetail( @Param("orgIdList") ArrayList orgIdList); + List getHistoricalDetail( @Param("orgIdList") ArrayList orgIdList,@Param("fDate") String fDate); List> getCurrentAccountBalanceList( @Param("fOrgType") String fOrgType, @Param("fDate") String fDate); diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/WCurrentManager.java b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/WCurrentManager.java index 3dfa217..04422a6 100644 --- a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/WCurrentManager.java +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/WCurrentManager.java @@ -28,7 +28,7 @@ public interface WCurrentManager extends BaseManager { */ void createOrUpdate(WCurrent wCurrent); - List getHistoricalDetail(); + List getHistoricalDetail(String date); List> getCurrentAccountBalanceList(String fOrgType, String fDate); diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WCurrentManagerImpl.java b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WCurrentManagerImpl.java index ffc7113..2435c44 100644 --- a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WCurrentManagerImpl.java +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WCurrentManagerImpl.java @@ -42,9 +42,9 @@ public class WCurrentManagerImpl extends BaseManagerImpl } @Override - public List getHistoricalDetail() { + public List getHistoricalDetail(String date) { ArrayList orgIdList = script.getDataPermission("loginUserAllSubOrgs"); - List data= baseMapper.getHistoricalDetail(orgIdList); + List data= baseMapper.getHistoricalDetail(orgIdList,date); return data; } diff --git a/backend/chkpower/src/main/resources/mapper/WCurrentMapper.xml b/backend/chkpower/src/main/resources/mapper/WCurrentMapper.xml index 07977c5..6c9d9e2 100644 --- a/backend/chkpower/src/main/resources/mapper/WCurrentMapper.xml +++ b/backend/chkpower/src/main/resources/mapper/WCurrentMapper.xml @@ -89,6 +89,13 @@ ON c1.F_org_id = c2.F_org_id AND c1.F_bank_account = c2.F_bank_account AND c1.id_ = c2.id_ ) zh on zh.F_org_id = acc.F_org_id and zh.F_bank_account = acc.F_bank_account WHERE 1=1 AND ACC.F_use_status !='停用' + AND NOT EXISTS ( + SELECT A.F_org_name,A.F_bank_account + FROM w_current A + WHERE DATE(A.F_date) = DATE(#{fDate}) + AND A.F_org_name=org.NAME_ + AND A.F_bank_account = acc.F_bank_account + ) and org.ID_ in -- libgit2 0.21.2