Commit bde81f310c98aa5f8cbce58e564783b33f79691b
1 parent
51695bf9
Exists in
master
update
Showing
5 changed files
with
13 additions
and
6 deletions
Show diff stats
backend/chkpower/src/main/java/com/hotent/chkpower/controller/WCurrentController.java
| @@ -66,8 +66,8 @@ public class WCurrentController extends BaseController<WCurrentManager, WCurrent | @@ -66,8 +66,8 @@ public class WCurrentController extends BaseController<WCurrentManager, WCurrent | ||
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | @GetMapping(value = "/getHistoricalDetail") | 68 | @GetMapping(value = "/getHistoricalDetail") |
| 69 | - public CommonResult getHistoricalDetail() throws Exception { | ||
| 70 | - List<WCurrent> data = baseService.getHistoricalDetail(); | 69 | + public CommonResult getHistoricalDetail(String date) throws Exception { |
| 70 | + List<WCurrent> data = baseService.getHistoricalDetail(date); | ||
| 71 | return new CommonResult(true, "成功", data); | 71 | return new CommonResult(true, "成功", data); |
| 72 | } | 72 | } |
| 73 | 73 |
backend/chkpower/src/main/java/com/hotent/chkpower/dao/WCurrentDao.java
| @@ -17,7 +17,7 @@ import java.util.List; | @@ -17,7 +17,7 @@ import java.util.List; | ||
| 17 | */ | 17 | */ |
| 18 | public interface WCurrentDao extends BaseMapper<WCurrent> { | 18 | public interface WCurrentDao extends BaseMapper<WCurrent> { |
| 19 | 19 | ||
| 20 | - List<WCurrent> getHistoricalDetail( @Param("orgIdList") ArrayList<String> orgIdList); | 20 | + List<WCurrent> getHistoricalDetail( @Param("orgIdList") ArrayList<String> orgIdList,@Param("fDate") String fDate); |
| 21 | 21 | ||
| 22 | 22 | ||
| 23 | List<HashMap<String, String>> getCurrentAccountBalanceList( @Param("fOrgType") String fOrgType, @Param("fDate") String fDate); | 23 | List<HashMap<String, String>> getCurrentAccountBalanceList( @Param("fOrgType") String fOrgType, @Param("fDate") String fDate); |
backend/chkpower/src/main/java/com/hotent/chkpower/manager/WCurrentManager.java
| @@ -28,7 +28,7 @@ public interface WCurrentManager extends BaseManager<WCurrent> { | @@ -28,7 +28,7 @@ public interface WCurrentManager extends BaseManager<WCurrent> { | ||
| 28 | */ | 28 | */ |
| 29 | void createOrUpdate(WCurrent wCurrent); | 29 | void createOrUpdate(WCurrent wCurrent); |
| 30 | 30 | ||
| 31 | - List<WCurrent> getHistoricalDetail(); | 31 | + List<WCurrent> getHistoricalDetail(String date); |
| 32 | 32 | ||
| 33 | 33 | ||
| 34 | List<HashMap<String, String>> getCurrentAccountBalanceList(String fOrgType, String fDate); | 34 | List<HashMap<String, String>> getCurrentAccountBalanceList(String fOrgType, String fDate); |
backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WCurrentManagerImpl.java
| @@ -42,9 +42,9 @@ public class WCurrentManagerImpl extends BaseManagerImpl<WCurrentDao, WCurrent> | @@ -42,9 +42,9 @@ public class WCurrentManagerImpl extends BaseManagerImpl<WCurrentDao, WCurrent> | ||
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | @Override | 44 | @Override |
| 45 | - public List<WCurrent> getHistoricalDetail() { | 45 | + public List<WCurrent> getHistoricalDetail(String date) { |
| 46 | ArrayList<String> orgIdList = script.getDataPermission("loginUserAllSubOrgs"); | 46 | ArrayList<String> orgIdList = script.getDataPermission("loginUserAllSubOrgs"); |
| 47 | - List<WCurrent> data= baseMapper.getHistoricalDetail(orgIdList); | 47 | + List<WCurrent> data= baseMapper.getHistoricalDetail(orgIdList,date); |
| 48 | 48 | ||
| 49 | return data; | 49 | return data; |
| 50 | } | 50 | } |
backend/chkpower/src/main/resources/mapper/WCurrentMapper.xml
| @@ -89,6 +89,13 @@ | @@ -89,6 +89,13 @@ | ||
| 89 | ON c1.F_org_id = c2.F_org_id AND c1.F_bank_account = c2.F_bank_account AND c1.id_ = c2.id_ | 89 | ON c1.F_org_id = c2.F_org_id AND c1.F_bank_account = c2.F_bank_account AND c1.id_ = c2.id_ |
| 90 | ) zh on zh.F_org_id = acc.F_org_id and zh.F_bank_account = acc.F_bank_account | 90 | ) zh on zh.F_org_id = acc.F_org_id and zh.F_bank_account = acc.F_bank_account |
| 91 | WHERE 1=1 AND ACC.F_use_status !='停用' | 91 | WHERE 1=1 AND ACC.F_use_status !='停用' |
| 92 | + AND NOT EXISTS ( | ||
| 93 | + SELECT A.F_org_name,A.F_bank_account | ||
| 94 | + FROM w_current A | ||
| 95 | + WHERE DATE(A.F_date) = DATE(#{fDate}) | ||
| 96 | + AND A.F_org_name=org.NAME_ | ||
| 97 | + AND A.F_bank_account = acc.F_bank_account | ||
| 98 | + ) | ||
| 92 | <if test="orgIdList != null and orgIdList.size() > 0"> | 99 | <if test="orgIdList != null and orgIdList.size() > 0"> |
| 93 | and org.ID_ in | 100 | and org.ID_ in |
| 94 | <foreach collection="orgIdList" separator="," item="orgId" open="(" close=")"> | 101 | <foreach collection="orgIdList" separator="," item="orgId" open="(" close=")"> |