Tenlion/btxtgxq-system-population
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

丢了个字段,补上

Browse Source
This commit is contained in:
wans 2020-11-26 18:23:25 +08:00
parent f7d3ae04bc
commit 4f1f6c8c64
22 changed files with 298 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/cm/population/controller/app/apis/addicts/AddictsAppController.java
View File

@ -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<String, Object> params = requestParams();
params.put("idCardNumber",idCardNumber);
return addictsService.getAddictsInfo(params);
}
@ApiOperation(value = "特殊人群-吸毒人员列表", notes = "特殊人群-吸毒人员列表接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", paramType = "header")

13
src/main/java/com/cm/population/controller/app/apis/aids/AidsAppController.java
View File

@ -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<String, Object> params = requestParams();
params.put("idCardNumber",idCardNumber);
return aidsService.getAidsInfo(params);
}
@ApiOperation(value = "特殊人群-艾滋病危险人员列表", notes = "特殊人群-艾滋病危险人员列表接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", paramType = "header")

14
src/main/java/com/cm/population/controller/app/apis/communitycorrection/CommunityCorrectionAppController.java
View File

@ -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<String, Object> params = requestParams();
params.put("idCardNumber",idCardNumber);
return communityCorrectionService.getCommunityCorrectionInfo(params);
}
@ApiOperation(value = "特殊人群-社区矫正人员列表", notes = "特殊人群-社区矫正人员列表接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", paramType = "header")

13
src/main/java/com/cm/population/controller/app/apis/mentaldisorders/MentalDisordersAppController.java
View File

@ -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<String, Object> params = requestParams();
params.put("idCardNumber",idCardNumber);
return mentalDisordersService.getMentalDisordersInfo(params);
}
@ApiOperation(value = "肇事肇祸等严重精神障碍患者列表", notes = "肇事肇祸等严重精神障碍患者列表接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", paramType = "header")

13
src/main/java/com/cm/population/controller/app/apis/releaseaftersentence/ReleaseAfterSentenceAppController.java
View File

@ -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<String, Object> params = requestParams();
params.put("idCardNumber",idCardNumber);
return releaseAfterSentenceService.getReleaseAfterSentenceInfo(params);
}
@ApiOperation(value = "特殊人群-刑满释放人员列表", notes = "特殊人群-刑满释放人员列表接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", paramType = "header")

20
src/main/java/com/cm/population/pojo/dtos/addicts/AddictsDTO.java
View File

@ -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;
}
}

20
src/main/java/com/cm/population/pojo/dtos/aids/AidsDTO.java
View File

@ -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;
}
}

20
src/main/java/com/cm/population/pojo/dtos/communitycorrection/CommunityCorrectionDTO.java
View File

@ -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;
}
}

30
src/main/java/com/cm/population/pojo/dtos/mentaldisorders/MentalDisordersDTO.java
View File

@ -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;
}
}

41
src/main/java/com/cm/population/pojo/dtos/releaseaftersentence/ReleaseAfterSentenceDTO.java
View File

@ -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;
}
}

10
src/main/java/com/cm/population/pojo/vos/mentaldisorders/MentalDisordersVO.java
View File

@ -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();
}

36
src/main/java/com/cm/population/pojo/vos/releaseaftersentence/ReleaseAfterSentenceVO.java
View File

@ -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;
}
}

6
src/main/resources/mybatis/mapper/addicts/addicts-mapper.xml
View File

@ -22,6 +22,8 @@
<result column="full_name" property="fullName"/>
<result column="gender" property="gender"/>
<result column="telephone" property="telephone"/>
<result column="native_place" property="nativePlace"/>
<result column="current_residence" property="currentResidence"/>
</resultMap>
<!-- 新增特殊人群-吸毒人员 -->
@ -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'

6
src/main/resources/mybatis/mapper/aids/aids-mapper.xml
View File

@ -22,6 +22,8 @@
<result column="full_name" property="fullName"/>
<result column="gender" property="gender"/>
<result column="telephone" property="telephone"/>
<result column="native_place" property="nativePlace"/>
<result column="current_residence" property="currentResidence"/>
</resultMap>
<!-- 新增特殊人群-艾滋病危险人员 -->
@ -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'

6
src/main/resources/mybatis/mapper/communitycorrection/communitycorrection-mapper.xml
View File

@ -46,6 +46,8 @@
<result column="full_name" property="fullName"/>
<result column="gender" property="gender"/>
<result column="telephone" property="telephone"/>
<result column="native_place" property="nativePlace"/>
<result column="current_residence" property="currentResidence"/>
</resultMap>
<!-- 新增特殊人群-社区矫正人员 -->
@ -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'

14
src/main/resources/mybatis/mapper/mentaldisorders/mentaldisorders-mapper.xml
View File

@ -9,6 +9,7 @@
<result column="manage_user_dictionary_name" property="manageUserDictionaryName"/>
<result column="treatment" property="treatment"/>
<result column="last_trouble_date" property="lastTroubleDate"/>
<result column="trouble_number" property="troubleNumber"/>
<result column="first_onset_date" property="firstOnsetDate"/>
<result column="family_economy" property="familyEconomy"/>
<result column="is_subsistence" property="isSubsistence"/>
@ -29,6 +30,8 @@
<result column="full_name" property="fullName"/>
<result column="gender" property="gender"/>
<result column="telephone" property="telephone"/>
<result column="native_place" property="nativePlace"/>
<result column="current_residence" property="currentResidence"/>
</resultMap>
<!-- 新增肇事肇祸等严重精神障碍患者 -->
@ -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 @@
<if test="lastTroubleDate != null and lastTroubleDate != ''">
last_trouble_date = #{lastTroubleDate},
</if>
<if test="troubleNumber != null and troubleNumber != ''">
trouble_number = #{troubleNumber},
</if>
<if test="firstOnsetDate != null and firstOnsetDate != ''">
first_onset_date = #{firstOnsetDate},
</if>
@ -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'

20
src/main/resources/mybatis/mapper/releaseaftersentence/releaseaftersentence-mapper.xml
View File

@ -4,9 +4,6 @@
<resultMap id="releaseAfterSentenceDTO" type="com.cm.population.pojo.dtos.releaseaftersentence.ReleaseAfterSentenceDTO">
<id column="release_after_sentence_id" property="releaseAfterSentenceId"/>
<result column="full_name" property="fullName"/>
<result column="gender" property="gender"/>
<result column="telephone" property="telephone"/>
<result column="id_card_number" property="idCardNumber"/>
<result column="is_cumulative_crime" property="isCumulativeCrime"/>
<result column="name_of_original_sin" property="nameOfOriginalSin"/>
@ -26,7 +23,12 @@
<result column="help_and_educate" property="helpAndEducate"/>
<result column="is_crime_again" property="isCrimeAgain"/>
<result column="is_crime_again_dictionary_name" property="isCrimeAgainDictionaryName"/>
<result column="crime_again_charge" property="CrimeAgainCharge"/>
<result column="crime_again_charge" property="crimeAgainCharge"/>
<result column="full_name" property="fullName"/>
<result column="gender" property="gender"/>
<result column="telephone" property="telephone"/>
<result column="native_place" property="nativePlace"/>
<result column="current_residence" property="currentResidence"/>
</resultMap>
<!-- 新增特殊人群-刑满释放人员 -->
@ -69,7 +71,7 @@
#{unPlacementReason},
#{helpAndEducate},
#{isCrimeAgain},
#{CrimeAgainCharge},
#{crimeAgainCharge},
#{creator},
#{gmtCreate},
#{modifier},
@ -151,8 +153,8 @@
<if test="isCrimeAgain != null and isCrimeAgain != ''">
is_crime_again = #{isCrimeAgain},
</if>
<if test="CrimeAgainCharge != null and CrimeAgainCharge != ''">
crime_again_charge = #{CrimeAgainCharge},
<if test="crimeAgainCharge != null and crimeAgainCharge != ''">
crime_again_charge = #{crimeAgainCharge},
</if>
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'

9
src/main/resources/static/route/mentaldisorders/list-mentaldisorders.html
View File

@ -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];

13
src/main/resources/static/route/mentaldisorders/save-mentaldisorders.html
View File

@ -162,6 +162,15 @@
</div>
</div>
</div>
<div class="layui-col-md4">
<div class="layui-form-item">
<label class="layui-form-label" style="width: 130px;">肇事肇祸次数</label>
<div class="layui-input-block">
<input type="number" id="troubleNumber" name="troubleNumber" class="layui-input" style="width: 94%"
autocomplete="off" value="" maxlength="3" placeholder="请输入肇事肇祸次数">
</div>
</div>
</div>
<div class="layui-col-md4">
<div class="layui-form-item" pane>
<label class="layui-form-label" style="width: 130px"><span style="color: red">*</span>是否纳入低保</label>
@ -207,8 +216,8 @@
</div>
<div class="layui-col-md4">
<div class="layui-form-item" pane>
<label class="layui-form-label" style="width: 130px;"><span style="color: red">*</span>有无肇事肇祸史</label>
<div class="layui-input-block layui-form" style="margin-left: 130px">
<label class="layui-form-label" style="width: 140px;"><span style="color: red">*</span>有无肇事肇祸史</label>
<div class="layui-input-block layui-form" style="margin-left: 140px">
<input type="radio" name="hasCausTrouble" value="0" title="否" checked>
<input type="radio" name="hasCausTrouble" value="1" title="是">
</div>

13
src/main/resources/static/route/mentaldisorders/update-mentaldisorders.html
View File

@ -149,6 +149,15 @@
</div>
</div>
</div>
<div class="layui-col-md4">
<div class="layui-form-item">
<label class="layui-form-label" style="width: 130px;">肇事肇祸次数</label>
<div class="layui-input-block">
<input type="number" id="troubleNumber" name="troubleNumber" class="layui-input" style="width: 94%"
autocomplete="off" value="" maxlength="3" placeholder="请输入肇事肇祸次数">
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-col-md4">
@ -185,8 +194,8 @@
</div>
<div class="layui-col-md4">
<div class="layui-form-item" pane>
<label class="layui-form-label" style="width: 130px;"><span style="color: red">*</span>有无肇事肇祸史</label>
<div class="layui-input-block layui-form" style="margin-left: 130px">
<label class="layui-form-label" style="width: 140px;"><span style="color: red">*</span>有无肇事肇祸史</label>
<div class="layui-input-block layui-form" style="margin-left: 140px">
<input type="radio" name="hasCausTrouble" value="0" title="否" checked>
<input type="radio" name="hasCausTrouble" value="1" title="是">
</div>

2
src/main/resources/static/route/releaseaftersentence/save-releaseaftersentence.html
View File

@ -222,7 +222,7 @@
<div class="layui-form-item">
<label class="layui-form-label" style="width: 140px;">重新犯罪罪名</label>
<div class="layui-input-block">
<input type="text" style="width: 93%" id="CrimeAgainCharge" name="CrimeAgainCharge" class="layui-input"
<input type="text" style="width: 93%" id="crimeAgainCharge" name="crimeAgainCharge" class="layui-input"
autocomplete="off" maxlength="100" value="" placeholder="请输入重新犯罪罪名" >
</div>
</div>

2
src/main/resources/static/route/releaseaftersentence/update-releaseaftersentence.html
View File

@ -201,7 +201,7 @@
<div class="layui-form-item">
<label class="layui-form-label" style="width: 140px;">重新犯罪罪名</label>
<div class="layui-input-block">
<input type="text" style="width: 93%" id="CrimeAgainCharge" name="CrimeAgainCharge" class="layui-input"
<input type="text" style="width: 93%" id="crimeAgainCharge" name="crimeAgainCharge" class="layui-input"
autocomplete="off" maxlength="100" value="" placeholder="请输入重新犯罪罪名" >
</div>
</div>