diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java index b156d73..00f80f1 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.base.response.ResponseData; import com.casic.missiles.core.common.constant.Const; import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.core.common.constant.state.Order; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageInfoBT; @@ -858,7 +859,7 @@ */ @RequestMapping(value = "/export") public void export(QueryCondition queryCondition, HttpServletResponse httpServletResponse) throws IOException { - List> results = queryExportByCondition(caseQueryConditionByState(queryCondition)); + List> results = cwsCaseService.queryExportByCondition(caseQueryConditionByState(queryCondition)); FileInputStream fileInputStream = null; if (ToolUtil.isEmpty(results)) { fileInputStream = new FileInputStream(templatePath + "/temp/accessEmpty.xlsx"); @@ -915,23 +916,26 @@ return dataScope; } - /** - * 导出数据检索条件 - * - * @param queryCondition - * @return - */ - public List> queryExportByCondition(QueryCondition queryCondition) { - List> results = null; - Page> page = new PageFactory>().defaultPage(); - page.setLimit(maxRowsExcel); - page.setSize(maxRowsExcel); - page.setOffset(0); - page.setSearchCount(false); - results = cwsCaseService.queryByCondition(page, caseDataScope(queryCondition), queryCondition); - new CwsCaseWarpper(results).warp(); - return results; - } +// /** +// * 导出数据检索条件 +// * +// * @param queryCondition +// * @return +// */ +// public List> queryExportByCondition(QueryCondition queryCondition) { +// List> results = null; +//// Page> page = new PageFactory>().defaultPage(); +//// page.setLimit(maxRowsExcel); +//// page.setSize(maxRowsExcel); +// +//// page.setOffset(0); +//// page.setSearchCount(false); +// Page> page = new Page<>(0, maxRowsExcel); +// +// results = cwsCaseService.queryByCondition(page, caseDataScope(queryCondition), queryCondition); +// new CwsCaseWarpper(results).warp(); +// return results; +// } /** * 根据案卷状态统计 diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java index b156d73..00f80f1 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.base.response.ResponseData; import com.casic.missiles.core.common.constant.Const; import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.core.common.constant.state.Order; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageInfoBT; @@ -858,7 +859,7 @@ */ @RequestMapping(value = "/export") public void export(QueryCondition queryCondition, HttpServletResponse httpServletResponse) throws IOException { - List> results = queryExportByCondition(caseQueryConditionByState(queryCondition)); + List> results = cwsCaseService.queryExportByCondition(caseQueryConditionByState(queryCondition)); FileInputStream fileInputStream = null; if (ToolUtil.isEmpty(results)) { fileInputStream = new FileInputStream(templatePath + "/temp/accessEmpty.xlsx"); @@ -915,23 +916,26 @@ return dataScope; } - /** - * 导出数据检索条件 - * - * @param queryCondition - * @return - */ - public List> queryExportByCondition(QueryCondition queryCondition) { - List> results = null; - Page> page = new PageFactory>().defaultPage(); - page.setLimit(maxRowsExcel); - page.setSize(maxRowsExcel); - page.setOffset(0); - page.setSearchCount(false); - results = cwsCaseService.queryByCondition(page, caseDataScope(queryCondition), queryCondition); - new CwsCaseWarpper(results).warp(); - return results; - } +// /** +// * 导出数据检索条件 +// * +// * @param queryCondition +// * @return +// */ +// public List> queryExportByCondition(QueryCondition queryCondition) { +// List> results = null; +//// Page> page = new PageFactory>().defaultPage(); +//// page.setLimit(maxRowsExcel); +//// page.setSize(maxRowsExcel); +// +//// page.setOffset(0); +//// page.setSearchCount(false); +// Page> page = new Page<>(0, maxRowsExcel); +// +// results = cwsCaseService.queryByCondition(page, caseDataScope(queryCondition), queryCondition); +// new CwsCaseWarpper(results).warp(); +// return results; +// } /** * 根据案卷状态统计 diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/ICwsCaseService.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/ICwsCaseService.java index 825f990..a527757 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/ICwsCaseService.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/ICwsCaseService.java @@ -52,5 +52,5 @@ Map statisticByState(String isShopCase); Map statisticShop(); - + List> queryExportByCondition(QueryCondition queryCondition); } diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java index b156d73..00f80f1 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.base.response.ResponseData; import com.casic.missiles.core.common.constant.Const; import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.core.common.constant.state.Order; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageInfoBT; @@ -858,7 +859,7 @@ */ @RequestMapping(value = "/export") public void export(QueryCondition queryCondition, HttpServletResponse httpServletResponse) throws IOException { - List> results = queryExportByCondition(caseQueryConditionByState(queryCondition)); + List> results = cwsCaseService.queryExportByCondition(caseQueryConditionByState(queryCondition)); FileInputStream fileInputStream = null; if (ToolUtil.isEmpty(results)) { fileInputStream = new FileInputStream(templatePath + "/temp/accessEmpty.xlsx"); @@ -915,23 +916,26 @@ return dataScope; } - /** - * 导出数据检索条件 - * - * @param queryCondition - * @return - */ - public List> queryExportByCondition(QueryCondition queryCondition) { - List> results = null; - Page> page = new PageFactory>().defaultPage(); - page.setLimit(maxRowsExcel); - page.setSize(maxRowsExcel); - page.setOffset(0); - page.setSearchCount(false); - results = cwsCaseService.queryByCondition(page, caseDataScope(queryCondition), queryCondition); - new CwsCaseWarpper(results).warp(); - return results; - } +// /** +// * 导出数据检索条件 +// * +// * @param queryCondition +// * @return +// */ +// public List> queryExportByCondition(QueryCondition queryCondition) { +// List> results = null; +//// Page> page = new PageFactory>().defaultPage(); +//// page.setLimit(maxRowsExcel); +//// page.setSize(maxRowsExcel); +// +//// page.setOffset(0); +//// page.setSearchCount(false); +// Page> page = new Page<>(0, maxRowsExcel); +// +// results = cwsCaseService.queryByCondition(page, caseDataScope(queryCondition), queryCondition); +// new CwsCaseWarpper(results).warp(); +// return results; +// } /** * 根据案卷状态统计 diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/ICwsCaseService.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/ICwsCaseService.java index 825f990..a527757 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/ICwsCaseService.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/ICwsCaseService.java @@ -52,5 +52,5 @@ Map statisticByState(String isShopCase); Map statisticShop(); - + List> queryExportByCondition(QueryCondition queryCondition); } diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java index 463ff7d..193aeb7 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.core.common.constant.Const; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.common.service.IExpandComponentService; import com.casic.missiles.core.datascope.DataScope; @@ -18,6 +19,7 @@ import com.casic.missiles.modular.cwscase.service.ICwsCaseService; import com.casic.missiles.modular.cwscase.service.IProcessDetailService; import com.casic.missiles.modular.cwscase.service.IStatusService; +import com.casic.missiles.modular.cwscase.warpper.CwsCaseWarpper; import com.casic.missiles.modular.dictexpand.service.IDictExpandService; import com.casic.missiles.modular.enums.CaseStateEnum; import com.casic.missiles.modular.enums.CwsRoleEnums; @@ -28,6 +30,7 @@ import com.casic.missiles.modular.flowable.service.ICommonWorkflowService; import com.casic.missiles.modular.system.model.Area; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -35,10 +38,7 @@ import java.math.BigDecimal; import java.text.DecimalFormat; import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** *

@@ -611,4 +611,54 @@ return resultMap; } + @Value("${casic.office.maxRowsExcel}") + private int maxRowsExcel; + @Transactional + @Override + public List> queryExportByCondition(QueryCondition queryCondition) { + List> results = null; +// Page> page = new PageFactory>().defaultPage(); +// page.setLimit(maxRowsExcel); +// page.setSize(maxRowsExcel); + +// page.setOffset(0); +// page.setSearchCount(false); + Page> page = new Page<>(0, maxRowsExcel); + + results = this.queryByCondition(page, caseDataScope(queryCondition), queryCondition); + new CwsCaseWarpper(results).warp(); + return results; + } + /** + * 案卷查询权限判定 + * + * @param queryCondition + * @return + */ + private DataScope caseDataScope(QueryCondition queryCondition) { + DataScope dataScope = null; + try { + if (queryCondition.isDataScope() == true) { + dataScope = service.getCurrUserDataScope(); + dataScope.setScopeName("ONEDEPTID"); + } else { + String isRevisit = queryCondition.getIsRevisit(); + String isOvertime = queryCondition.getIsOvertime(); + String caseLevel = queryCondition.getCaseLevel(); + //回访、超时、紧急案件的查询需要判断是否有数据权限 + if ((isRevisit != null && isRevisit.equals(Const.ONE)) || (isOvertime != null && isOvertime.equals(Const.ONE)) || (caseLevel != null && caseLevel.equals(Const.ONE))) { + ShiroUser shiroUser = service.getCurrLoginUser(); + List roles = shiroUser.getRoleTips(); + if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) { + dataScope = service.getCurrUserDataScope(); + dataScope.setScopeName("ONEDEPTID"); + } + } + } + } catch (Exception e) { + e.printStackTrace(); + } + return dataScope; + } + } diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java index b156d73..00f80f1 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.base.response.ResponseData; import com.casic.missiles.core.common.constant.Const; import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.core.common.constant.state.Order; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageInfoBT; @@ -858,7 +859,7 @@ */ @RequestMapping(value = "/export") public void export(QueryCondition queryCondition, HttpServletResponse httpServletResponse) throws IOException { - List> results = queryExportByCondition(caseQueryConditionByState(queryCondition)); + List> results = cwsCaseService.queryExportByCondition(caseQueryConditionByState(queryCondition)); FileInputStream fileInputStream = null; if (ToolUtil.isEmpty(results)) { fileInputStream = new FileInputStream(templatePath + "/temp/accessEmpty.xlsx"); @@ -915,23 +916,26 @@ return dataScope; } - /** - * 导出数据检索条件 - * - * @param queryCondition - * @return - */ - public List> queryExportByCondition(QueryCondition queryCondition) { - List> results = null; - Page> page = new PageFactory>().defaultPage(); - page.setLimit(maxRowsExcel); - page.setSize(maxRowsExcel); - page.setOffset(0); - page.setSearchCount(false); - results = cwsCaseService.queryByCondition(page, caseDataScope(queryCondition), queryCondition); - new CwsCaseWarpper(results).warp(); - return results; - } +// /** +// * 导出数据检索条件 +// * +// * @param queryCondition +// * @return +// */ +// public List> queryExportByCondition(QueryCondition queryCondition) { +// List> results = null; +//// Page> page = new PageFactory>().defaultPage(); +//// page.setLimit(maxRowsExcel); +//// page.setSize(maxRowsExcel); +// +//// page.setOffset(0); +//// page.setSearchCount(false); +// Page> page = new Page<>(0, maxRowsExcel); +// +// results = cwsCaseService.queryByCondition(page, caseDataScope(queryCondition), queryCondition); +// new CwsCaseWarpper(results).warp(); +// return results; +// } /** * 根据案卷状态统计 diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/ICwsCaseService.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/ICwsCaseService.java index 825f990..a527757 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/ICwsCaseService.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/ICwsCaseService.java @@ -52,5 +52,5 @@ Map statisticByState(String isShopCase); Map statisticShop(); - + List> queryExportByCondition(QueryCondition queryCondition); } diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java index 463ff7d..193aeb7 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.core.common.constant.Const; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.common.service.IExpandComponentService; import com.casic.missiles.core.datascope.DataScope; @@ -18,6 +19,7 @@ import com.casic.missiles.modular.cwscase.service.ICwsCaseService; import com.casic.missiles.modular.cwscase.service.IProcessDetailService; import com.casic.missiles.modular.cwscase.service.IStatusService; +import com.casic.missiles.modular.cwscase.warpper.CwsCaseWarpper; import com.casic.missiles.modular.dictexpand.service.IDictExpandService; import com.casic.missiles.modular.enums.CaseStateEnum; import com.casic.missiles.modular.enums.CwsRoleEnums; @@ -28,6 +30,7 @@ import com.casic.missiles.modular.flowable.service.ICommonWorkflowService; import com.casic.missiles.modular.system.model.Area; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -35,10 +38,7 @@ import java.math.BigDecimal; import java.text.DecimalFormat; import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** *

@@ -611,4 +611,54 @@ return resultMap; } + @Value("${casic.office.maxRowsExcel}") + private int maxRowsExcel; + @Transactional + @Override + public List> queryExportByCondition(QueryCondition queryCondition) { + List> results = null; +// Page> page = new PageFactory>().defaultPage(); +// page.setLimit(maxRowsExcel); +// page.setSize(maxRowsExcel); + +// page.setOffset(0); +// page.setSearchCount(false); + Page> page = new Page<>(0, maxRowsExcel); + + results = this.queryByCondition(page, caseDataScope(queryCondition), queryCondition); + new CwsCaseWarpper(results).warp(); + return results; + } + /** + * 案卷查询权限判定 + * + * @param queryCondition + * @return + */ + private DataScope caseDataScope(QueryCondition queryCondition) { + DataScope dataScope = null; + try { + if (queryCondition.isDataScope() == true) { + dataScope = service.getCurrUserDataScope(); + dataScope.setScopeName("ONEDEPTID"); + } else { + String isRevisit = queryCondition.getIsRevisit(); + String isOvertime = queryCondition.getIsOvertime(); + String caseLevel = queryCondition.getCaseLevel(); + //回访、超时、紧急案件的查询需要判断是否有数据权限 + if ((isRevisit != null && isRevisit.equals(Const.ONE)) || (isOvertime != null && isOvertime.equals(Const.ONE)) || (caseLevel != null && caseLevel.equals(Const.ONE))) { + ShiroUser shiroUser = service.getCurrLoginUser(); + List roles = shiroUser.getRoleTips(); + if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) { + dataScope = service.getCurrUserDataScope(); + dataScope.setScopeName("ONEDEPTID"); + } + } + } + } catch (Exception e) { + e.printStackTrace(); + } + return dataScope; + } + } diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/VideoCaseServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/VideoCaseServiceImpl.java index 982c4a3..9e9b2f2 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/VideoCaseServiceImpl.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/VideoCaseServiceImpl.java @@ -120,7 +120,6 @@ throw error; } covertCase(cwsCase, videoCase); - cwsCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId); videoCase.setRegCaseId(cwsCase.getId()); videoCase.setCaseStatus(1); @@ -152,7 +151,6 @@ cwsCase.setFieldintro(busDeviceInfo.getDetailLocation()); cwsCase.setLat(busDeviceInfo.getLatitude()); cwsCase.setLng(busDeviceInfo.getLongitude()); - } private void wrapVideoCase(VideoCase videoCase) { @@ -174,4 +172,4 @@ casePage.getRecords().forEach(this::wrapVideoCase); return casePage; } -} +} \ No newline at end of file