From 4f1f6c8c64dc1dc849219869dec4cace0842c2d9 Mon Sep 17 00:00:00 2001 From: wans <747101512@qq.com> Date: Thu, 26 Nov 2020 18:23:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=A2=E4=BA=86=E4=B8=AA=E5=AD=97=E6=AE=B5,?= =?UTF-8?q?=E8=A1=A5=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apis/addicts/AddictsAppController.java | 13 ++++++ .../app/apis/aids/AidsAppController.java | 13 ++++++ .../CommunityCorrectionAppController.java | 14 +++++++ .../MentalDisordersAppController.java | 13 ++++++ .../ReleaseAfterSentenceAppController.java | 13 ++++++ .../pojo/dtos/addicts/AddictsDTO.java | 20 +++++++++ .../cm/population/pojo/dtos/aids/AidsDTO.java | 20 +++++++++ .../CommunityCorrectionDTO.java | 20 +++++++++ .../mentaldisorders/MentalDisordersDTO.java | 30 ++++++++++++++ .../ReleaseAfterSentenceDTO.java | 41 ++++++++++++++----- .../mentaldisorders/MentalDisordersVO.java | 10 +++++ .../ReleaseAfterSentenceVO.java | 36 ++++++++++++---- .../mybatis/mapper/addicts/addicts-mapper.xml | 6 ++- .../mybatis/mapper/aids/aids-mapper.xml | 6 ++- .../communitycorrection-mapper.xml | 6 ++- .../mentaldisorders-mapper.xml | 14 ++++++- .../releaseaftersentence-mapper.xml | 20 +++++---- .../mentaldisorders/list-mentaldisorders.html | 9 ++++ .../mentaldisorders/save-mentaldisorders.html | 13 +++++- .../update-mentaldisorders.html | 13 +++++- .../save-releaseaftersentence.html | 2 +- .../update-releaseaftersentence.html | 2 +- 22 files changed, 298 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/cm/population/controller/app/apis/addicts/AddictsAppController.java b/src/main/java/com/cm/population/controller/app/apis/addicts/AddictsAppController.java index 47ef07f..362eb7a 100644 --- a/src/main/java/com/cm/population/controller/app/apis/addicts/AddictsAppController.java +++ b/src/main/java/com/cm/population/controller/app/apis/addicts/AddictsAppController.java @@ -81,6 +81,19 @@ public class AddictsAppController extends AbstractController { return addictsService.getAddictsById(addictsId); } + @ApiOperation(value = "特殊人群-吸毒人员详情", notes = "特殊人群-吸毒人员详情接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "身份证ID", value = "idCardNumber", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("getaddictsinfo/{idCardNumber}") + public AddictsDTO getAddictsInfo(@PathVariable("idCardNumber") String idCardNumber) throws SearchException { + Map params = requestParams(); + params.put("idCardNumber",idCardNumber); + return addictsService.getAddictsInfo(params); + } + @ApiOperation(value = "特殊人群-吸毒人员列表", notes = "特殊人群-吸毒人员列表接口") @ApiImplicitParams({ @ApiImplicitParam(name = "token", value = "token", paramType = "header") diff --git a/src/main/java/com/cm/population/controller/app/apis/aids/AidsAppController.java b/src/main/java/com/cm/population/controller/app/apis/aids/AidsAppController.java index cdc2dbf..228cff5 100644 --- a/src/main/java/com/cm/population/controller/app/apis/aids/AidsAppController.java +++ b/src/main/java/com/cm/population/controller/app/apis/aids/AidsAppController.java @@ -81,6 +81,19 @@ public class AidsAppController extends AbstractController { return aidsService.getAidsById(aidsId); } + @ApiOperation(value = "特殊人群-艾滋病危险人员详情", notes = "特殊人群-艾滋病危险人员详情接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "身份证ID", value = "idCardNumber", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("getaidsinfo/{idCardNumber}") + public AidsDTO getAidsById(@PathVariable("idCardNumber") String idCardNumber) throws SearchException { + Map params = requestParams(); + params.put("idCardNumber",idCardNumber); + return aidsService.getAidsInfo(params); + } + @ApiOperation(value = "特殊人群-艾滋病危险人员列表", notes = "特殊人群-艾滋病危险人员列表接口") @ApiImplicitParams({ @ApiImplicitParam(name = "token", value = "token", paramType = "header") diff --git a/src/main/java/com/cm/population/controller/app/apis/communitycorrection/CommunityCorrectionAppController.java b/src/main/java/com/cm/population/controller/app/apis/communitycorrection/CommunityCorrectionAppController.java index 97e6718..b1319ce 100644 --- a/src/main/java/com/cm/population/controller/app/apis/communitycorrection/CommunityCorrectionAppController.java +++ b/src/main/java/com/cm/population/controller/app/apis/communitycorrection/CommunityCorrectionAppController.java @@ -11,6 +11,7 @@ import com.cm.common.result.SuccessResult; import com.cm.common.result.SuccessResultData; import com.cm.common.result.SuccessResultList; import com.cm.population.pojo.dtos.communitycorrection.CommunityCorrectionDTO; +import com.cm.population.pojo.dtos.releaseaftersentence.ReleaseAfterSentenceDTO; import com.cm.population.pojo.vos.communitycorrection.CommunityCorrectionVO; import com.cm.population.service.communitycorrection.ICommunityCorrectionService; import io.swagger.annotations.*; @@ -81,6 +82,19 @@ public class CommunityCorrectionAppController extends AbstractController { return communityCorrectionService.getCommunityCorrectionById(communityCorrectionId); } + @ApiOperation(value = "特殊人群-社区矫正人员详情", notes = "特殊人群-社区矫正人员详情") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "身份证ID", value = "idCardNumber", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("getcommunitycorrectioninfo/{idCardNumber}") + public CommunityCorrectionDTO getCommunityCorrectionInfo(@PathVariable("idCardNumber") String idCardNumber) throws SearchException { + Map params = requestParams(); + params.put("idCardNumber",idCardNumber); + return communityCorrectionService.getCommunityCorrectionInfo(params); + } + @ApiOperation(value = "特殊人群-社区矫正人员列表", notes = "特殊人群-社区矫正人员列表接口") @ApiImplicitParams({ @ApiImplicitParam(name = "token", value = "token", paramType = "header") diff --git a/src/main/java/com/cm/population/controller/app/apis/mentaldisorders/MentalDisordersAppController.java b/src/main/java/com/cm/population/controller/app/apis/mentaldisorders/MentalDisordersAppController.java index f0f1b5c..4ab36eb 100644 --- a/src/main/java/com/cm/population/controller/app/apis/mentaldisorders/MentalDisordersAppController.java +++ b/src/main/java/com/cm/population/controller/app/apis/mentaldisorders/MentalDisordersAppController.java @@ -80,6 +80,19 @@ public class MentalDisordersAppController extends AbstractController { return mentalDisordersService.getMentalDisordersById(mentalDisordersId); } + @ApiOperation(value = "肇事肇祸等严重精神障碍患者详情", notes = "肇事肇祸等严重精神障碍患者详情接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "身份证ID", value = "idCardNumber", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("getmentaldisordersinfo/{idCardNumber}") + public MentalDisordersDTO getMentalDisordersInfo(@PathVariable("idCardNumber") String idCardNumber) throws SearchException { + Map params = requestParams(); + params.put("idCardNumber",idCardNumber); + return mentalDisordersService.getMentalDisordersInfo(params); + } + @ApiOperation(value = "肇事肇祸等严重精神障碍患者列表", notes = "肇事肇祸等严重精神障碍患者列表接口") @ApiImplicitParams({ @ApiImplicitParam(name = "token", value = "token", paramType = "header") diff --git a/src/main/java/com/cm/population/controller/app/apis/releaseaftersentence/ReleaseAfterSentenceAppController.java b/src/main/java/com/cm/population/controller/app/apis/releaseaftersentence/ReleaseAfterSentenceAppController.java index f598ac1..9c21537 100644 --- a/src/main/java/com/cm/population/controller/app/apis/releaseaftersentence/ReleaseAfterSentenceAppController.java +++ b/src/main/java/com/cm/population/controller/app/apis/releaseaftersentence/ReleaseAfterSentenceAppController.java @@ -81,6 +81,19 @@ public class ReleaseAfterSentenceAppController extends AbstractController { return releaseAfterSentenceService.getReleaseAfterSentenceById(releaseAfterSentenceId); } + @ApiOperation(value = "特殊人群-刑满释放人员详情", notes = "特殊人群-刑满释放人员详情接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "身份证ID", value = "idCardNumber", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("getreleaseaftersentenceinfo/{idCardNumber}") + public ReleaseAfterSentenceDTO getReleaseAfterSentenceInfo(@PathVariable("idCardNumber") String idCardNumber) throws SearchException { + Map params = requestParams(); + params.put("idCardNumber",idCardNumber); + return releaseAfterSentenceService.getReleaseAfterSentenceInfo(params); + } + @ApiOperation(value = "特殊人群-刑满释放人员列表", notes = "特殊人群-刑满释放人员列表接口") @ApiImplicitParams({ @ApiImplicitParam(name = "token", value = "token", paramType = "header") diff --git a/src/main/java/com/cm/population/pojo/dtos/addicts/AddictsDTO.java b/src/main/java/com/cm/population/pojo/dtos/addicts/AddictsDTO.java index 7fdba75..aa68003 100644 --- a/src/main/java/com/cm/population/pojo/dtos/addicts/AddictsDTO.java +++ b/src/main/java/com/cm/population/pojo/dtos/addicts/AddictsDTO.java @@ -52,6 +52,10 @@ public class AddictsDTO { private String gender; @ApiModelProperty(name = "telephone", value = "联系方式") private String telephone; + @ApiModelProperty(name = "nativePlace", value = "籍贯") + private String nativePlace; + @ApiModelProperty(name = "currentResidence", value = "籍贯") + private String currentResidence; public String getAddictsId() { return addictsId == null ? "" : addictsId.trim(); @@ -202,4 +206,20 @@ public class AddictsDTO { public void setTelephone(String telephone) { this.telephone = telephone; } + + public String getNativePlace() { + return nativePlace == null ? "" : nativePlace; + } + + public void setNativePlace(String nativePlace) { + this.nativePlace = nativePlace; + } + + public String getCurrentResidence() { + return currentResidence == null ? "" : currentResidence; + } + + public void setCurrentResidence(String currentResidence) { + this.currentResidence = currentResidence; + } } diff --git a/src/main/java/com/cm/population/pojo/dtos/aids/AidsDTO.java b/src/main/java/com/cm/population/pojo/dtos/aids/AidsDTO.java index 3cd8c66..f3750cc 100644 --- a/src/main/java/com/cm/population/pojo/dtos/aids/AidsDTO.java +++ b/src/main/java/com/cm/population/pojo/dtos/aids/AidsDTO.java @@ -52,6 +52,10 @@ public class AidsDTO { private String gender; @ApiModelProperty(name = "telephone", value = "联系方式") private String telephone; + @ApiModelProperty(name = "nativePlace", value = "籍贯") + private String nativePlace; + @ApiModelProperty(name = "currentResidence", value = "籍贯") + private String currentResidence; public String getAidsId() { return aidsId == null ? "" : aidsId.trim(); @@ -201,4 +205,20 @@ public class AidsDTO { public void setTelephone(String telephone) { this.telephone = telephone; } + + public String getNativePlace() { + return nativePlace == null ? "" : nativePlace; + } + + public void setNativePlace(String nativePlace) { + this.nativePlace = nativePlace; + } + + public String getCurrentResidence() { + return currentResidence == null ? "" : currentResidence; + } + + public void setCurrentResidence(String currentResidence) { + this.currentResidence = currentResidence; + } } diff --git a/src/main/java/com/cm/population/pojo/dtos/communitycorrection/CommunityCorrectionDTO.java b/src/main/java/com/cm/population/pojo/dtos/communitycorrection/CommunityCorrectionDTO.java index 7acb0ab..899180f 100644 --- a/src/main/java/com/cm/population/pojo/dtos/communitycorrection/CommunityCorrectionDTO.java +++ b/src/main/java/com/cm/population/pojo/dtos/communitycorrection/CommunityCorrectionDTO.java @@ -100,6 +100,10 @@ public class CommunityCorrectionDTO { private String gender; @ApiModelProperty(name = "telephone", value = "联系方式") private String telephone; + @ApiModelProperty(name = "nativePlace", value = "籍贯") + private String nativePlace; + @ApiModelProperty(name = "currentResidence", value = "籍贯") + private String currentResidence; public String getCommunityCorrectionId() { return communityCorrectionId == null ? "" : communityCorrectionId.trim(); @@ -435,4 +439,20 @@ public class CommunityCorrectionDTO { public void setTelephone(String telephone) { this.telephone = telephone; } + + public String getNativePlace() { + return nativePlace == null ? "" : nativePlace; + } + + public void setNativePlace(String nativePlace) { + this.nativePlace = nativePlace; + } + + public String getCurrentResidence() { + return currentResidence == null ? "" : currentResidence; + } + + public void setCurrentResidence(String currentResidence) { + this.currentResidence = currentResidence; + } } diff --git a/src/main/java/com/cm/population/pojo/dtos/mentaldisorders/MentalDisordersDTO.java b/src/main/java/com/cm/population/pojo/dtos/mentaldisorders/MentalDisordersDTO.java index e1493ee..705278f 100644 --- a/src/main/java/com/cm/population/pojo/dtos/mentaldisorders/MentalDisordersDTO.java +++ b/src/main/java/com/cm/population/pojo/dtos/mentaldisorders/MentalDisordersDTO.java @@ -26,6 +26,8 @@ public class MentalDisordersDTO { private String treatment; @ApiModelProperty(name = "lastTroubleDate", value = "上次肇事肇祸日期") private String lastTroubleDate; + @ApiModelProperty(name = "troubleNumber", value = "肇事肇祸次数") + private String troubleNumber; @ApiModelProperty(name = "firstOnsetDate", value = "初次发病日期") private String firstOnsetDate; @ApiModelProperty(name = "familyEconomy", value = "家庭经济情况") @@ -66,6 +68,10 @@ public class MentalDisordersDTO { private String gender; @ApiModelProperty(name = "telephone", value = "联系方式") private String telephone; + @ApiModelProperty(name = "nativePlace", value = "籍贯") + private String nativePlace; + @ApiModelProperty(name = "currentResidence", value = "籍贯") + private String currentResidence; public String getMentalDisordersId() { return mentalDisordersId == null ? "" : mentalDisordersId.trim(); @@ -114,6 +120,14 @@ public class MentalDisordersDTO { this.lastTroubleDate = lastTroubleDate; } + public String getTroubleNumber() { + return troubleNumber == null ? "" : troubleNumber; + } + + public void setTroubleNumber(String troubleNumber) { + this.troubleNumber = troubleNumber; + } + public String getFirstOnsetDate() { return firstOnsetDate == null ? "" : firstOnsetDate.trim(); } @@ -269,4 +283,20 @@ public class MentalDisordersDTO { public void setTelephone(String telephone) { this.telephone = telephone; } + + public String getNativePlace() { + return nativePlace == null ? "" : nativePlace; + } + + public void setNativePlace(String nativePlace) { + this.nativePlace = nativePlace; + } + + public String getCurrentResidence() { + return currentResidence == null ? "" : currentResidence; + } + + public void setCurrentResidence(String currentResidence) { + this.currentResidence = currentResidence; + } } diff --git a/src/main/java/com/cm/population/pojo/dtos/releaseaftersentence/ReleaseAfterSentenceDTO.java b/src/main/java/com/cm/population/pojo/dtos/releaseaftersentence/ReleaseAfterSentenceDTO.java index 48439a9..9357268 100644 --- a/src/main/java/com/cm/population/pojo/dtos/releaseaftersentence/ReleaseAfterSentenceDTO.java +++ b/src/main/java/com/cm/population/pojo/dtos/releaseaftersentence/ReleaseAfterSentenceDTO.java @@ -16,12 +16,6 @@ public class ReleaseAfterSentenceDTO { @ApiModelProperty(name = "releaseAfterSentenceId", value = "主键") private String releaseAfterSentenceId; - @ApiModelProperty(name = "fullName", value = "姓名") - private String fullName; - @ApiModelProperty(name = "gender", value = "性别") - private String gender; - @ApiModelProperty(name = "telephone", value = "联系方式") - private String telephone; @ApiModelProperty(name = "idCardNumber", value = "公民身份证") private String idCardNumber; @ApiModelProperty(name = "isCumulativeCrime", value = "是否累犯") @@ -60,8 +54,18 @@ public class ReleaseAfterSentenceDTO { private String isCrimeAgain; @ApiModelProperty(name = "isCrimeAgainDictionaryName", value = "是否重新犯罪字典名称") private String isCrimeAgainDictionaryName; - @ApiModelProperty(name = "CrimeAgainCharge", value = "重新犯罪罪名") - private String CrimeAgainCharge; + @ApiModelProperty(name = "crimeAgainCharge", value = "重新犯罪罪名") + private String crimeAgainCharge; + @ApiModelProperty(name = "fullName", value = "姓名") + private String fullName; + @ApiModelProperty(name = "gender", value = "性别") + private String gender; + @ApiModelProperty(name = "telephone", value = "联系方式") + private String telephone; + @ApiModelProperty(name = "nativePlace", value = "籍贯") + private String nativePlace; + @ApiModelProperty(name = "currentResidence", value = "籍贯") + private String currentResidence; public String getReleaseAfterSentenceId() { return releaseAfterSentenceId == null ? "" : releaseAfterSentenceId.trim(); @@ -242,13 +246,28 @@ public class ReleaseAfterSentenceDTO { public void setIsCrimeAgainDictionaryName(String isCrimeAgainDictionaryName) { this.isCrimeAgainDictionaryName = isCrimeAgainDictionaryName; } + public String getCrimeAgainCharge() { - return CrimeAgainCharge == null ? "" : CrimeAgainCharge.trim(); + return crimeAgainCharge == null ? "" : crimeAgainCharge; } - public void setCrimeAgainCharge(String CrimeAgainCharge) { - this.CrimeAgainCharge = CrimeAgainCharge; + public void setCrimeAgainCharge(String crimeAgainCharge) { + this.crimeAgainCharge = crimeAgainCharge; } + public String getNativePlace() { + return nativePlace == null ? "" : nativePlace; + } + public void setNativePlace(String nativePlace) { + this.nativePlace = nativePlace; + } + + public String getCurrentResidence() { + return currentResidence == null ? "" : currentResidence; + } + + public void setCurrentResidence(String currentResidence) { + this.currentResidence = currentResidence; + } } diff --git a/src/main/java/com/cm/population/pojo/vos/mentaldisorders/MentalDisordersVO.java b/src/main/java/com/cm/population/pojo/vos/mentaldisorders/MentalDisordersVO.java index b26c9a7..960f26c 100644 --- a/src/main/java/com/cm/population/pojo/vos/mentaldisorders/MentalDisordersVO.java +++ b/src/main/java/com/cm/population/pojo/vos/mentaldisorders/MentalDisordersVO.java @@ -26,6 +26,8 @@ public class MentalDisordersVO { private String treatment; @ApiModelProperty(name = "lastTroubleDate", value = "上次肇事肇祸日期") private String lastTroubleDate; + @ApiModelProperty(name = "troubleNumber", value = "肇事肇祸次数") + private String troubleNumber; @ApiModelProperty(name = "firstOnsetDate", value = "初次发病日期") private String firstOnsetDate; @ApiModelProperty(name = "familyEconomy", value = "家庭经济情况") @@ -94,6 +96,14 @@ public class MentalDisordersVO { this.lastTroubleDate = lastTroubleDate; } + public String getTroubleNumber() { + return troubleNumber == null ? "" : troubleNumber; + } + + public void setTroubleNumber(String troubleNumber) { + this.troubleNumber = troubleNumber; + } + public String getFirstOnsetDate() { return firstOnsetDate == null ? "" : firstOnsetDate.trim(); } diff --git a/src/main/java/com/cm/population/pojo/vos/releaseaftersentence/ReleaseAfterSentenceVO.java b/src/main/java/com/cm/population/pojo/vos/releaseaftersentence/ReleaseAfterSentenceVO.java index 3c9bc97..c136fec 100644 --- a/src/main/java/com/cm/population/pojo/vos/releaseaftersentence/ReleaseAfterSentenceVO.java +++ b/src/main/java/com/cm/population/pojo/vos/releaseaftersentence/ReleaseAfterSentenceVO.java @@ -53,8 +53,8 @@ public class ReleaseAfterSentenceVO { private String helpAndEducate; @ApiModelProperty(name = "isCrimeAgain", value = "是否重新犯罪") private String isCrimeAgain; - @ApiModelProperty(name = "CrimeAgainCharge", value = "重新犯罪罪名") - private String CrimeAgainCharge; + @ApiModelProperty(name = "crimeAgainCharge", value = "重新犯罪罪名") + private String crimeAgainCharge; public String getIdCardNumber() { return idCardNumber == null ? "" : idCardNumber.trim(); @@ -168,13 +168,35 @@ public class ReleaseAfterSentenceVO { this.isCrimeAgain = isCrimeAgain; } + public String getFullName() { + return fullName == null ? "" : fullName; + } + + public void setFullName(String fullName) { + this.fullName = fullName; + } + + public String getGender() { + return gender == null ? "" : gender; + } + + public void setGender(String gender) { + this.gender = gender; + } + + public String getTelephone() { + return telephone == null ? "" : telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + public String getCrimeAgainCharge() { - return CrimeAgainCharge == null ? "" : CrimeAgainCharge.trim(); + return crimeAgainCharge == null ? "" : crimeAgainCharge; } - public void setCrimeAgainCharge(String CrimeAgainCharge) { - this.CrimeAgainCharge = CrimeAgainCharge; + public void setCrimeAgainCharge(String crimeAgainCharge) { + this.crimeAgainCharge = crimeAgainCharge; } - - } diff --git a/src/main/resources/mybatis/mapper/addicts/addicts-mapper.xml b/src/main/resources/mybatis/mapper/addicts/addicts-mapper.xml index 246ff5a..fd076df 100644 --- a/src/main/resources/mybatis/mapper/addicts/addicts-mapper.xml +++ b/src/main/resources/mybatis/mapper/addicts/addicts-mapper.xml @@ -22,6 +22,8 @@ + + @@ -190,7 +192,9 @@ t1.addicts_id, t2.full_name, t2.gender, - t2.telephone + t2.telephone, + t2.native_place, + CONCAT(t2.current_residence,t2.current_residence_addr) current_residence FROM gen_addicts t1 LEFT JOIN gen_base_population_info t2 ON t1.id_card_number = t2.id_card_number AND t2.is_delete = '0' diff --git a/src/main/resources/mybatis/mapper/aids/aids-mapper.xml b/src/main/resources/mybatis/mapper/aids/aids-mapper.xml index 00ba2ef..1997eb9 100644 --- a/src/main/resources/mybatis/mapper/aids/aids-mapper.xml +++ b/src/main/resources/mybatis/mapper/aids/aids-mapper.xml @@ -22,6 +22,8 @@ + + @@ -183,7 +185,9 @@ t1.id_card_number, t2.full_name, t2.gender, - t2.telephone + t2.telephone, + t2.native_place, + CONCAT(t2.current_residence,t2.current_residence_addr) current_residence FROM gen_aids t1 LEFT JOIN gen_base_population_info t2 ON t1.id_card_number = t2.id_card_number AND t2.is_delete = '0' diff --git a/src/main/resources/mybatis/mapper/communitycorrection/communitycorrection-mapper.xml b/src/main/resources/mybatis/mapper/communitycorrection/communitycorrection-mapper.xml index c31d921..6c9e4d2 100644 --- a/src/main/resources/mybatis/mapper/communitycorrection/communitycorrection-mapper.xml +++ b/src/main/resources/mybatis/mapper/communitycorrection/communitycorrection-mapper.xml @@ -46,6 +46,8 @@ + + @@ -341,7 +343,9 @@ t1.community_correction_id, t2.full_name, t2.gender, - t2.telephone + t2.telephone, + t2.native_place, + CONCAT(t2.current_residence,t2.current_residence_addr) current_residence FROM gen_community_correction t1 LEFT JOIN gen_base_population_info t2 ON t1.id_card_number = t2.id_card_number AND t2.is_delete = '0' diff --git a/src/main/resources/mybatis/mapper/mentaldisorders/mentaldisorders-mapper.xml b/src/main/resources/mybatis/mapper/mentaldisorders/mentaldisorders-mapper.xml index f38bc29..ac91a74 100644 --- a/src/main/resources/mybatis/mapper/mentaldisorders/mentaldisorders-mapper.xml +++ b/src/main/resources/mybatis/mapper/mentaldisorders/mentaldisorders-mapper.xml @@ -9,6 +9,7 @@ + @@ -29,6 +30,8 @@ + + @@ -39,6 +42,7 @@ manage_user, treatment, last_trouble_date, + trouble_number, first_onset_date, family_economy, is_subsistence, @@ -63,6 +67,7 @@ #{manageUser}, #{treatment}, #{lastTroubleDate}, + #{troubleNumber}, #{firstOnsetDate}, #{familyEconomy}, #{isSubsistence}, @@ -127,6 +132,9 @@ last_trouble_date = #{lastTroubleDate}, + + trouble_number = #{troubleNumber}, + first_onset_date = #{firstOnsetDate}, @@ -179,6 +187,7 @@ t1.manage_user, t1.treatment, t1.last_trouble_date, + t1.trouble_number, t1.first_onset_date, t1.family_economy, t1.is_subsistence, @@ -217,6 +226,7 @@ t1.manage_user, t1.treatment, t1.last_trouble_date, + t1.trouble_number, t1.first_onset_date, t1.family_economy, t1.is_subsistence, @@ -233,7 +243,9 @@ t1.mental_disorders_id, t2.full_name, t2.gender, - t2.telephone + t2.telephone, + t2.native_place, + CONCAT(t2.current_residence,t2.current_residence_addr) current_residence FROM gen_mental_disorders t1 LEFT JOIN gen_base_population_info t2 ON t1.id_card_number = t2.id_card_number AND t2.is_delete = '0' diff --git a/src/main/resources/mybatis/mapper/releaseaftersentence/releaseaftersentence-mapper.xml b/src/main/resources/mybatis/mapper/releaseaftersentence/releaseaftersentence-mapper.xml index efbc6c5..841317a 100644 --- a/src/main/resources/mybatis/mapper/releaseaftersentence/releaseaftersentence-mapper.xml +++ b/src/main/resources/mybatis/mapper/releaseaftersentence/releaseaftersentence-mapper.xml @@ -4,9 +4,6 @@ - - - @@ -26,7 +23,12 @@ - + + + + + + @@ -69,7 +71,7 @@ #{unPlacementReason}, #{helpAndEducate}, #{isCrimeAgain}, - #{CrimeAgainCharge}, + #{crimeAgainCharge}, #{creator}, #{gmtCreate}, #{modifier}, @@ -151,8 +153,8 @@ is_crime_again = #{isCrimeAgain}, - - crime_again_charge = #{CrimeAgainCharge}, + + crime_again_charge = #{crimeAgainCharge}, modifier = #{modifier}, gmt_modified = #{gmtModified} @@ -216,7 +218,9 @@ t1.release_after_sentence_id, t2.full_name, t2.gender, - t2.telephone + t2.telephone, + t2.native_place, + CONCAT(t2.current_residence,t2.current_residence_addr) current_residence FROM gen_release_after_sentence t1 LEFT JOIN gen_base_population_info t2 ON t1.id_card_number = t2.id_card_number AND t2.is_delete = '0' diff --git a/src/main/resources/static/route/mentaldisorders/list-mentaldisorders.html b/src/main/resources/static/route/mentaldisorders/list-mentaldisorders.html index ab19e7d..c616d90 100644 --- a/src/main/resources/static/route/mentaldisorders/list-mentaldisorders.html +++ b/src/main/resources/static/route/mentaldisorders/list-mentaldisorders.html @@ -133,6 +133,15 @@ return rowData; } }, + {field: 'troubleNumber', width: 150, title: '肇事肇祸次数', align:'center', + templet: function(row) { + var rowData = row[this.field]; + if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { + return '-'; + } + return rowData; + } + }, {field: 'riskLevel', width: 180, title: '目前危险性评估等级', align:'center', templet: function(row) { var rowData = row[this.field]; diff --git a/src/main/resources/static/route/mentaldisorders/save-mentaldisorders.html b/src/main/resources/static/route/mentaldisorders/save-mentaldisorders.html index fbc8295..e0c32ee 100644 --- a/src/main/resources/static/route/mentaldisorders/save-mentaldisorders.html +++ b/src/main/resources/static/route/mentaldisorders/save-mentaldisorders.html @@ -162,6 +162,15 @@ +
+
+ +
+ +
+
+
@@ -207,8 +216,8 @@
- -
+ +
diff --git a/src/main/resources/static/route/mentaldisorders/update-mentaldisorders.html b/src/main/resources/static/route/mentaldisorders/update-mentaldisorders.html index b991837..26a6704 100644 --- a/src/main/resources/static/route/mentaldisorders/update-mentaldisorders.html +++ b/src/main/resources/static/route/mentaldisorders/update-mentaldisorders.html @@ -149,6 +149,15 @@
+
+
+ +
+ +
+
+
@@ -185,8 +194,8 @@
- -
+ +
diff --git a/src/main/resources/static/route/releaseaftersentence/save-releaseaftersentence.html b/src/main/resources/static/route/releaseaftersentence/save-releaseaftersentence.html index dafff7c..5a0692c 100644 --- a/src/main/resources/static/route/releaseaftersentence/save-releaseaftersentence.html +++ b/src/main/resources/static/route/releaseaftersentence/save-releaseaftersentence.html @@ -222,7 +222,7 @@
-
diff --git a/src/main/resources/static/route/releaseaftersentence/update-releaseaftersentence.html b/src/main/resources/static/route/releaseaftersentence/update-releaseaftersentence.html index 2025a9f..6ea7397 100644 --- a/src/main/resources/static/route/releaseaftersentence/update-releaseaftersentence.html +++ b/src/main/resources/static/route/releaseaftersentence/update-releaseaftersentence.html @@ -201,7 +201,7 @@
-