diff --git a/src/main/java/com/cm/population/controller/apis/addicts/AddictsController.java b/src/main/java/com/cm/population/controller/apis/addicts/AddictsController.java index 15df4e9..e8c32ce 100644 --- a/src/main/java/com/cm/population/controller/apis/addicts/AddictsController.java +++ b/src/main/java/com/cm/population/controller/apis/addicts/AddictsController.java @@ -79,6 +79,14 @@ public class AddictsController extends AbstractController { return addictsService.getAddictsById(addictsId); } + @ApiOperation(value = "特殊人群-吸毒人员详情", notes = "特殊人群-吸毒人员详情接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("getaddictsinfo") + public AddictsDTO getAddictsInfo() throws SearchException { + Map params = requestParams(); + return addictsService.getAddictsInfo(params); + } + @ApiOperation(value = "特殊人群-吸毒人员列表", notes = "特殊人群-吸毒人员列表接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("listaddicts") diff --git a/src/main/java/com/cm/population/controller/apis/aids/AidsController.java b/src/main/java/com/cm/population/controller/apis/aids/AidsController.java index 9071c8b..aa01945 100644 --- a/src/main/java/com/cm/population/controller/apis/aids/AidsController.java +++ b/src/main/java/com/cm/population/controller/apis/aids/AidsController.java @@ -79,6 +79,14 @@ public class AidsController extends AbstractController { return aidsService.getAidsById(aidsId); } + @ApiOperation(value = "特殊人群-艾滋病危险人员详情", notes = "特殊人群-艾滋病危险人员详情接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("getaidsinfo") + public AidsDTO getAidsInfo() throws SearchException { + Map params = requestParams(); + return aidsService.getAidsInfo(params); + } + @ApiOperation(value = "特殊人群-艾滋病危险人员列表", notes = "特殊人群-艾滋病危险人员列表接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("listaids") diff --git a/src/main/java/com/cm/population/controller/apis/communitycorrection/CommunityCorrectionController.java b/src/main/java/com/cm/population/controller/apis/communitycorrection/CommunityCorrectionController.java index 0e8c025..4e2bea7 100644 --- a/src/main/java/com/cm/population/controller/apis/communitycorrection/CommunityCorrectionController.java +++ b/src/main/java/com/cm/population/controller/apis/communitycorrection/CommunityCorrectionController.java @@ -79,6 +79,14 @@ public class CommunityCorrectionController extends AbstractController { return communityCorrectionService.getCommunityCorrectionById(communityCorrectionId); } + @ApiOperation(value = "特殊人群-社区矫正人员详情", notes = "特殊人群-社区矫正人员详情接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("getcommunitycorrectioninfo") + public CommunityCorrectionDTO getCommunityCorrectionInfo() throws SearchException { + Map params = requestParams(); + return communityCorrectionService.getCommunityCorrectionInfo(params); + } + @ApiOperation(value = "特殊人群-社区矫正人员列表", notes = "特殊人群-社区矫正人员列表接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("listcommunitycorrection") diff --git a/src/main/java/com/cm/population/controller/apis/mentaldisorders/MentalDisordersController.java b/src/main/java/com/cm/population/controller/apis/mentaldisorders/MentalDisordersController.java index 72dac77..0d48e55 100644 --- a/src/main/java/com/cm/population/controller/apis/mentaldisorders/MentalDisordersController.java +++ b/src/main/java/com/cm/population/controller/apis/mentaldisorders/MentalDisordersController.java @@ -78,6 +78,14 @@ public class MentalDisordersController extends AbstractController { return mentalDisordersService.getMentalDisordersById(mentalDisordersId); } + @ApiOperation(value = "肇事肇祸等严重精神障碍患者详情", notes = "肇事肇祸等严重精神障碍患者详情接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("getmentaldisordersinfo") + public MentalDisordersDTO getMentalDisordersInfo() throws SearchException { + Map params = requestParams(); + return mentalDisordersService.getMentalDisordersInfo(params); + } + @ApiOperation(value = "肇事肇祸等严重精神障碍患者列表", notes = "肇事肇祸等严重精神障碍患者列表接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("listmentaldisorders") diff --git a/src/main/java/com/cm/population/controller/apis/releaseaftersentence/ReleaseAfterSentenceController.java b/src/main/java/com/cm/population/controller/apis/releaseaftersentence/ReleaseAfterSentenceController.java index 595a679..a498f38 100644 --- a/src/main/java/com/cm/population/controller/apis/releaseaftersentence/ReleaseAfterSentenceController.java +++ b/src/main/java/com/cm/population/controller/apis/releaseaftersentence/ReleaseAfterSentenceController.java @@ -69,6 +69,14 @@ public class ReleaseAfterSentenceController extends AbstractController { return releaseAfterSentenceService.updateReleaseAfterSentence(releaseAfterSentenceId, releaseAfterSentenceVO); } + @ApiOperation(value = "特殊人群-刑满释放人员详情", notes = "特殊人群-刑满释放人员详情接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("getreleaseaftersentenceinfo") + public ReleaseAfterSentenceDTO getReleaseAfterSentenceInfo() throws SearchException { + Map params = requestParams(); + return releaseAfterSentenceService.getReleaseAfterSentenceInfo(params); + } + @ApiOperation(value = "特殊人群-刑满释放人员详情(通过ID)", notes = "特殊人群-刑满释放人员详情(通过ID)接口") @ApiImplicitParams({ @ApiImplicitParam(name = "releaseAfterSentenceId", value = "特殊人群-刑满释放人员ID", paramType = "path") diff --git a/src/main/java/com/cm/population/service/addicts/IAddictsService.java b/src/main/java/com/cm/population/service/addicts/IAddictsService.java index d917a4a..4047b93 100644 --- a/src/main/java/com/cm/population/service/addicts/IAddictsService.java +++ b/src/main/java/com/cm/population/service/addicts/IAddictsService.java @@ -153,4 +153,11 @@ public interface IAddictsService { */ SuccessResultData countAddicts(Map params) throws SearchException; + /** + * 特殊人群-吸毒人员详情 + * @param params + * @return + * @throws SearchException + */ + AddictsDTO getAddictsInfo(Map params) throws SearchException; } \ No newline at end of file diff --git a/src/main/java/com/cm/population/service/addicts/impl/AddictsServiceImpl.java b/src/main/java/com/cm/population/service/addicts/impl/AddictsServiceImpl.java index 88d4084..63ed6b7 100644 --- a/src/main/java/com/cm/population/service/addicts/impl/AddictsServiceImpl.java +++ b/src/main/java/com/cm/population/service/addicts/impl/AddictsServiceImpl.java @@ -161,6 +161,12 @@ public class AddictsServiceImpl extends AbstractService implements IAddictsServi return addictsDao.getAddicts(params); } + @Override + public AddictsDTO getAddictsInfo(Map params) throws SearchException { + AddictsDTO dto = addictsDao.getAddicts(params); + return dto == null ? new AddictsDTO() : dto; + } + @Override public List listAddicts(Map params) throws SearchException { return addictsDao.listAddicts(params); diff --git a/src/main/java/com/cm/population/service/aids/IAidsService.java b/src/main/java/com/cm/population/service/aids/IAidsService.java index 420093b..af682a6 100644 --- a/src/main/java/com/cm/population/service/aids/IAidsService.java +++ b/src/main/java/com/cm/population/service/aids/IAidsService.java @@ -153,4 +153,11 @@ public interface IAidsService { */ SuccessResultData countAids(Map params) throws SearchException; + /** + * 特殊人群-艾滋病危险人员详情 + * @param params + * @return + * @throws SearchException + */ + AidsDTO getAidsInfo(Map params) throws SearchException; } \ No newline at end of file diff --git a/src/main/java/com/cm/population/service/aids/impl/AidsServiceImpl.java b/src/main/java/com/cm/population/service/aids/impl/AidsServiceImpl.java index e65dc19..f1d469c 100644 --- a/src/main/java/com/cm/population/service/aids/impl/AidsServiceImpl.java +++ b/src/main/java/com/cm/population/service/aids/impl/AidsServiceImpl.java @@ -161,6 +161,12 @@ public class AidsServiceImpl extends AbstractService implements IAidsService { return aidsDao.getAids(params); } + @Override + public AidsDTO getAidsInfo(Map params) throws SearchException { + AidsDTO dto = aidsDao.getAids(params); + return dto == null ? new AidsDTO() : dto; + } + @Override public List listAids(Map params) throws SearchException { return aidsDao.listAids(params); diff --git a/src/main/java/com/cm/population/service/communitycorrection/ICommunityCorrectionService.java b/src/main/java/com/cm/population/service/communitycorrection/ICommunityCorrectionService.java index ee0d086..a7dba57 100644 --- a/src/main/java/com/cm/population/service/communitycorrection/ICommunityCorrectionService.java +++ b/src/main/java/com/cm/population/service/communitycorrection/ICommunityCorrectionService.java @@ -153,4 +153,11 @@ public interface ICommunityCorrectionService { */ SuccessResultData countCommunityCorrection(Map params) throws SearchException; + /** + * 特殊人群-社区矫正人员详情 + * @param params + * @return + * @throws SearchException + */ + CommunityCorrectionDTO getCommunityCorrectionInfo(Map params) throws SearchException; } \ No newline at end of file diff --git a/src/main/java/com/cm/population/service/communitycorrection/impl/CommunityCorrectionServiceImpl.java b/src/main/java/com/cm/population/service/communitycorrection/impl/CommunityCorrectionServiceImpl.java index 0e02f83..1d60e10 100644 --- a/src/main/java/com/cm/population/service/communitycorrection/impl/CommunityCorrectionServiceImpl.java +++ b/src/main/java/com/cm/population/service/communitycorrection/impl/CommunityCorrectionServiceImpl.java @@ -18,6 +18,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; import java.util.*; @@ -161,6 +162,12 @@ public class CommunityCorrectionServiceImpl extends AbstractService implements I return communityCorrectionDao.getCommunityCorrection(params); } + @Override + public CommunityCorrectionDTO getCommunityCorrectionInfo(Map params) throws SearchException { + CommunityCorrectionDTO dto = communityCorrectionDao.getCommunityCorrection(params); + return dto == null ? new CommunityCorrectionDTO(): dto; + } + @Override public List listCommunityCorrection(Map params) throws SearchException { return communityCorrectionDao.listCommunityCorrection(params); diff --git a/src/main/java/com/cm/population/service/mentaldisorders/IMentalDisordersService.java b/src/main/java/com/cm/population/service/mentaldisorders/IMentalDisordersService.java index 49633d8..15e5e7e 100644 --- a/src/main/java/com/cm/population/service/mentaldisorders/IMentalDisordersService.java +++ b/src/main/java/com/cm/population/service/mentaldisorders/IMentalDisordersService.java @@ -152,4 +152,11 @@ public interface IMentalDisordersService { */ SuccessResultData countMentalDisorders(Map params) throws SearchException; + /** + * 肇事肇祸等严重精神障碍患者详情 + * @param params + * @return + * @throws SearchException + */ + MentalDisordersDTO getMentalDisordersInfo(Map params) throws SearchException; } \ No newline at end of file diff --git a/src/main/java/com/cm/population/service/mentaldisorders/impl/MentalDisordersServiceImpl.java b/src/main/java/com/cm/population/service/mentaldisorders/impl/MentalDisordersServiceImpl.java index 3049252..cdf27d9 100644 --- a/src/main/java/com/cm/population/service/mentaldisorders/impl/MentalDisordersServiceImpl.java +++ b/src/main/java/com/cm/population/service/mentaldisorders/impl/MentalDisordersServiceImpl.java @@ -162,6 +162,12 @@ public class MentalDisordersServiceImpl extends AbstractService implements IMent return mentalDisordersDao.getMentalDisorders(params); } + @Override + public MentalDisordersDTO getMentalDisordersInfo(Map params) throws SearchException { + MentalDisordersDTO dto = mentalDisordersDao.getMentalDisorders(params); + return dto == null? new MentalDisordersDTO() : dto; + } + @Override public List listMentalDisorders(Map params) throws SearchException { return mentalDisordersDao.listMentalDisorders(params); diff --git a/src/main/java/com/cm/population/service/releaseaftersentence/IReleaseAfterSentenceService.java b/src/main/java/com/cm/population/service/releaseaftersentence/IReleaseAfterSentenceService.java index 0095466..28435bd 100644 --- a/src/main/java/com/cm/population/service/releaseaftersentence/IReleaseAfterSentenceService.java +++ b/src/main/java/com/cm/population/service/releaseaftersentence/IReleaseAfterSentenceService.java @@ -153,4 +153,11 @@ public interface IReleaseAfterSentenceService { */ SuccessResultData countReleaseAfterSentence(Map params) throws SearchException; + /** + * 根据条件查询数据(单条) + * @param params + * @return + * @throws SearchException + */ + ReleaseAfterSentenceDTO getReleaseAfterSentenceInfo(Map params) throws SearchException; } \ No newline at end of file diff --git a/src/main/java/com/cm/population/service/releaseaftersentence/impl/ReleaseAfterSentenceServiceImpl.java b/src/main/java/com/cm/population/service/releaseaftersentence/impl/ReleaseAfterSentenceServiceImpl.java index b5a3aa9..710f0b9 100644 --- a/src/main/java/com/cm/population/service/releaseaftersentence/impl/ReleaseAfterSentenceServiceImpl.java +++ b/src/main/java/com/cm/population/service/releaseaftersentence/impl/ReleaseAfterSentenceServiceImpl.java @@ -18,6 +18,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; import java.util.*; @@ -161,6 +162,12 @@ public class ReleaseAfterSentenceServiceImpl extends AbstractService implements return releaseAfterSentenceDao.getReleaseAfterSentence(params); } + @Override + public ReleaseAfterSentenceDTO getReleaseAfterSentenceInfo(Map params) throws SearchException { + ReleaseAfterSentenceDTO dto = releaseAfterSentenceDao.getReleaseAfterSentence(params); + return dto == null ? new ReleaseAfterSentenceDTO() : dto; + } + @Override public List listReleaseAfterSentence(Map params) throws SearchException { return releaseAfterSentenceDao.listReleaseAfterSentence(params); diff --git a/src/main/resources/static/route/addicts/save-addicts.html b/src/main/resources/static/route/addicts/save-addicts.html index 439e2f7..d19b243 100644 --- a/src/main/resources/static/route/addicts/save-addicts.html +++ b/src/main/resources/static/route/addicts/save-addicts.html @@ -274,7 +274,7 @@ var loadIndex = layer.load(1); top.restAjax.get(top.restAjax.path('api/basepopulationinfo/getbasepopulationinfo', []), {idCardNumber:idCardNumber}, null, function(code, data) { - if(typeof (data) == 'undefined' || data == ''){ + if(typeof (data) == 'undefined' || data.basePopulationInfoId == ''){ layer.msg('未查询到人员基础信息'); $('.submit-btn').hide(); $('.div-form-content').hide(); @@ -282,6 +282,7 @@ form.render(); return false; } + queryExistsData(idCardNumber); var dataFormData = {}; for(var i in data) { dataFormData[i] = data[i] +''; @@ -305,6 +306,18 @@ queryBasePopulationInfo($('#idCardNumber').val()); }); + function queryExistsData(idCardNumber){ + top.restAjax.get(top.restAjax.path('api/addicts/getaddictsinfo', []), + {idCardNumber:idCardNumber}, null, function(code, data) { + if(data.addictsId){ + window.location.href = 'route/addicts/update-addicts.html?addictsId=' + data.addictsId; + } + }, function(code, data) { + console.log(data); + } + ); + } + // 初始化发现日期日期 function initDiscoveryDateDate() { laydate.render({ diff --git a/src/main/resources/static/route/aids/save-aids.html b/src/main/resources/static/route/aids/save-aids.html index 5cd6c98..65db0bb 100644 --- a/src/main/resources/static/route/aids/save-aids.html +++ b/src/main/resources/static/route/aids/save-aids.html @@ -245,7 +245,7 @@ var loadIndex = layer.load(1); top.restAjax.get(top.restAjax.path('api/basepopulationinfo/getbasepopulationinfo', []), {idCardNumber:idCardNumber}, null, function(code, data) { - if(typeof (data) == 'undefined' || data == ''){ + if(typeof (data) == 'undefined' || data.basePopulationInfoId == ''){ layer.msg('未查询到人员基础信息'); $('.submit-btn').hide(); $('.div-form-content').hide(); @@ -253,6 +253,7 @@ form.render(); return false; } + queryExistsData(idCardNumber); var dataFormData = {}; for(var i in data) { dataFormData[i] = data[i] +''; @@ -276,6 +277,18 @@ queryBasePopulationInfo($('#idCardNumber').val()); }); + function queryExistsData(idCardNumber){ + top.restAjax.get(top.restAjax.path('api/aids/getaidsinfo', []), + {idCardNumber:idCardNumber}, null, function(code, data) { + if(data.aidsId){ + window.location.href = 'route/aids/update-aids.html?aidsId=' + data.aidsId; + } + }, function(code, data) { + console.log(data); + } + ); + } + function closeBox() { parent.layer.close(parent.layer.getFrameIndex(window.name)); } diff --git a/src/main/resources/static/route/aids/update-aids.html b/src/main/resources/static/route/aids/update-aids.html index d38ca71..bbe5f9c 100644 --- a/src/main/resources/static/route/aids/update-aids.html +++ b/src/main/resources/static/route/aids/update-aids.html @@ -22,6 +22,42 @@
+
人员基础信息
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
艾滋危险病人信息
diff --git a/src/main/resources/static/route/communitycorrection/save-communitycorrection.html b/src/main/resources/static/route/communitycorrection/save-communitycorrection.html index 9adf43a..1bbbc38 100644 --- a/src/main/resources/static/route/communitycorrection/save-communitycorrection.html +++ b/src/main/resources/static/route/communitycorrection/save-communitycorrection.html @@ -436,7 +436,7 @@ var loadIndex = layer.load(1); top.restAjax.get(top.restAjax.path('api/basepopulationinfo/getbasepopulationinfo', []), {idCardNumber:idCardNumber}, null, function(code, data) { - if(typeof (data) == 'undefined' || data == ''){ + if(typeof (data) == 'undefined' || data.basePopulationInfoId == ''){ layer.msg('未查询到人员基础信息'); $('.submit-btn').hide(); $('.div-form-content').hide(); @@ -444,6 +444,7 @@ form.render(); return false; } + queryExistsData(idCardNumber); var dataFormData = {}; for(var i in data) { dataFormData[i] = data[i] +''; @@ -467,6 +468,18 @@ queryBasePopulationInfo($('#idCardNumber').val()); }); + function queryExistsData(idCardNumber){ + top.restAjax.get(top.restAjax.path('api/communitycorrection/getcommunitycorrectioninfo', []), + {idCardNumber:idCardNumber}, null, function(code, data) { + if(data.communityCorrectionId){ + window.location.href = 'route/communitycorrection/update-communitycorrection.html?communityCorrectionId=' + data.communityCorrectionId; + } + }, function(code, data) { + console.log(data); + } + ); + } + // 初始化内容 function initData() { initCaseCategorySelect(); diff --git a/src/main/resources/static/route/mentaldisorders/save-mentaldisorders.html b/src/main/resources/static/route/mentaldisorders/save-mentaldisorders.html index de0f6ec..9589654 100644 --- a/src/main/resources/static/route/mentaldisorders/save-mentaldisorders.html +++ b/src/main/resources/static/route/mentaldisorders/save-mentaldisorders.html @@ -321,7 +321,7 @@ var loadIndex = layer.load(1); top.restAjax.get(top.restAjax.path('api/basepopulationinfo/getbasepopulationinfo', []), {idCardNumber:idCardNumber}, null, function(code, data) { - if(typeof (data) == 'undefined' || data == ''){ + if(typeof (data) == 'undefined' || data.basePopulationInfoId == ''){ layer.msg('未查询到人员基础信息'); $('.submit-btn').hide(); $('.div-form-content').hide(); @@ -329,6 +329,7 @@ form.render(); return false; } + queryExistsData(idCardNumber); var dataFormData = {}; for(var i in data) { dataFormData[i] = data[i] +''; @@ -352,6 +353,18 @@ queryBasePopulationInfo($('#idCardNumber').val()); }); + function queryExistsData(idCardNumber){ + top.restAjax.get(top.restAjax.path('api/mentaldisorders/getmentaldisordersinfo', []), + {idCardNumber:idCardNumber}, null, function(code, data) { + if(data.mentalDisordersId){ + window.location.href = 'route/mentaldisorders/update-mentaldisorders.html?mentalDisordersId=' + data.mentalDisordersId; + } + }, function(code, data) { + console.log(data); + } + ); + } + function closeBox() { parent.layer.close(parent.layer.getFrameIndex(window.name)); } diff --git a/src/main/resources/static/route/releaseaftersentence/save-releaseaftersentence.html b/src/main/resources/static/route/releaseaftersentence/save-releaseaftersentence.html index d98d3d8..f7a5ff1 100644 --- a/src/main/resources/static/route/releaseaftersentence/save-releaseaftersentence.html +++ b/src/main/resources/static/route/releaseaftersentence/save-releaseaftersentence.html @@ -21,7 +21,7 @@
- +
@@ -39,7 +39,7 @@
- + +