diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/ProofingInformationController.java b/src/main/java/com/xujie/sys/modules/pms/controller/ProofingInformationController.java index 7af0b21f..a3f36e68 100644 --- a/src/main/java/com/xujie/sys/modules/pms/controller/ProofingInformationController.java +++ b/src/main/java/com/xujie/sys/modules/pms/controller/ProofingInformationController.java @@ -199,7 +199,8 @@ public class ProofingInformationController { public R searchAllConfirmProgressList(@RequestBody ProjectProductionValidationDocumentData inData) { String userId = String.valueOf(((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUserId()); PageUtils page = proofingInformationService.getAllConfirmations(userId,inData); - return R.ok().put("page", page); + List list = proofingInformationService.getAllConfirmationsList(userId,inData); + return R.ok().put("page", page).put("list", list); } @PostMapping(value = "/searchOverConfirmProgressList") diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/ProofingInformationMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/ProofingInformationMapper.java index c25ab51c..02f6324d 100644 --- a/src/main/java/com/xujie/sys/modules/pms/mapper/ProofingInformationMapper.java +++ b/src/main/java/com/xujie/sys/modules/pms/mapper/ProofingInformationMapper.java @@ -90,4 +90,6 @@ public interface ProofingInformationMapper extends BaseMapper getAllUploadsList(String userId,@Param("query") ProofDocumentData data); + + List getAllConfirmationsList(String userId,@Param("query") ProjectProductionValidationDocumentData inData); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/ProofingInformationServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/ProofingInformationServiceImpl.java index 6d7b2ede..b2dda20b 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/ProofingInformationServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/ProofingInformationServiceImpl.java @@ -373,6 +373,11 @@ public class ProofingInformationServiceImpl implements ProofingInformationServic return new PageUtils(allConfirmations); } + @Override + public List getAllConfirmationsList(String userId, ProjectProductionValidationDocumentData inData) { + return proofingInformationMapper.getAllConfirmationsList(userId, inData); + } + @Override public boolean saveBatch(Collection entityList, int batchSize) { return false; diff --git a/src/main/java/com/xujie/sys/modules/pms/service/ProofingInformationService.java b/src/main/java/com/xujie/sys/modules/pms/service/ProofingInformationService.java index 8d16670e..6f6f602c 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/ProofingInformationService.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/ProofingInformationService.java @@ -54,5 +54,7 @@ public interface ProofingInformationService extends IService getAllConfirmationsList(String userId, ProjectProductionValidationDocumentData inData); + List getAllUploadsList(String userId, ProofDocumentData data); } diff --git a/src/main/resources/mapper/pms/ProofingInformationMapper.xml b/src/main/resources/mapper/pms/ProofingInformationMapper.xml index 63d88d2d..dff6c579 100644 --- a/src/main/resources/mapper/pms/ProofingInformationMapper.xml +++ b/src/main/resources/mapper/pms/ProofingInformationMapper.xml @@ -637,6 +637,53 @@ order by project_id +