From 98e7a2012204a3ff7f93388d4e7766ebd01db03b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=81=A5?= Date: Mon, 25 Oct 2021 15:56:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=91=E6=BB=A1=E9=87=8A=E6=94=BE=E4=BA=BA?= =?UTF-8?q?=E5=91=98.=E6=88=B7=E7=B1=8D=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baselib/constant/PathConfig.java | 1 + .../adapters/CensusCriminalAdapter.java | 57 +++ .../adapters/CensusRegisterAdapter.java | 57 +++ .../beans/CensusCrimeDetailBean.java | 329 ++++++++---------- .../beans/CensusCriminalListBean.java | 232 ++++++++++++ .../beans/CensusRegisterDetailBean.java | 83 +---- .../beans/CensusRegisterListBean.java | 142 ++++++++ .../commonmodule/beans/CensusmsgBean.java | 37 +- .../commonmodule/beans/SaveCrimeBean.java | 35 +- .../holders/CensusCriminalHolder.java | 40 +++ .../holders/CensusPersonRegisterHolder.java | 37 ++ .../tengshisoft/commonmodule/nets/Apis.java | 23 +- .../main/res/layout/item_person_criminal.xml | 105 ++++++ .../main/res/layout/item_person_register.xml | 105 ++++++ gridmodule/src/main/AndroidManifest.xml | 17 +- .../CensusExpandableMainActivity.java | 9 +- .../normal/CensusRegisterAddActivity.java | 79 +++-- .../normal/CensusRegisterDetailActivity.java | 18 +- .../normal/CensusRegisterListActivity.java | 24 +- .../CensusSpecialCriminalAddActivity.java | 89 ++--- ... CensusSpecialCriminalDetailActivity.java} | 20 +- .../CensusSpecialCriminalListActivity.java | 24 +- .../layout/activity_census_register_add.xml | 23 +- .../activity_census_register_detail.xml | 11 +- .../layout/activity_census_register_list.xml | 3 +- .../activity_census_special_criminal_list.xml | 3 +- 26 files changed, 1155 insertions(+), 448 deletions(-) create mode 100644 commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/CensusCriminalAdapter.java create mode 100644 commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/CensusRegisterAdapter.java create mode 100644 commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CensusCriminalListBean.java create mode 100644 commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CensusRegisterListBean.java create mode 100644 commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/CensusCriminalHolder.java create mode 100644 commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/CensusPersonRegisterHolder.java create mode 100644 commonmodule/src/main/res/layout/item_person_criminal.xml create mode 100644 commonmodule/src/main/res/layout/item_person_register.xml rename gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/{CensusSpecialCrimianlDetailActivity.java => CensusSpecialCriminalDetailActivity.java} (91%) diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java b/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java index 5c6dc53..d90932d 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java @@ -64,6 +64,7 @@ public class PathConfig { //=========================字典ID=================================== public static final String DIC_RELATION = "4c21d91a-d5e1-4cfc-a18a-d63272763cdb";//与户主关系 + public static final String DIC_ACCORD = "2156b4da-0be5-46d5-81c5-f1dcf0b30359";//人户是否一致 public static final String DIC_CARD_TYPE = "76c5044f-805a-4313-b1e8-79e966b97c0d";//证件类型 // public static final String DIC_CARD_TYPE = "35c6e331-9dd4-425c-be0c-ce570a0a768d";//TODO 证件类型 public static final String DIC_HOUSE_TYPE = "bd3ceeb7-a523-4532-901d-5ab4046ebae3";//住所类型 diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/CensusCriminalAdapter.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/CensusCriminalAdapter.java new file mode 100644 index 0000000..c1be0cb --- /dev/null +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/CensusCriminalAdapter.java @@ -0,0 +1,57 @@ +package com.tengshisoft.commonmodule.adapters; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.tengshisoft.commonmodule.R; +import com.tengshisoft.commonmodule.beans.CensusCriminalListBean; +import com.tengshisoft.commonmodule.beans.CensusRegisterListBean; +import com.tengshisoft.commonmodule.holders.CensusCriminalHolder; +import com.tengshisoft.commonmodule.holders.CensusPersonRegisterHolder; +import com.tenlionsoft.baselib.core.widget.base.BaseRecyclerAdapter; +import com.tenlionsoft.baselib.utils.IDCard; + +import java.util.List; + +/** + * 作者: adam + * 日期: 2020/11/17 - 1:22 PM + * 邮箱: itgaojian@163.com + * 描述: 人口 刑满释放人员 + */ +public class CensusCriminalAdapter extends BaseRecyclerAdapter { + public CensusCriminalAdapter(Context ctx, List list) { + super(ctx, list); + } + + @Override + public CensusCriminalHolder createHolder(ViewGroup parent, int viewType) { + View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_person_criminal, parent, false); + return new CensusCriminalHolder(itemView); + } + + @Override + public void bindHolder(CensusCriminalHolder censusPersonHolder, int i) { + CensusCriminalListBean.RowsBean bean = mData.get(i); + censusPersonHolder.mTvName.setText(bean.getFullName()); + censusPersonHolder.mTvCharge.setText("罪名:" + bean.getNameOfOriginalSinDict()); + censusPersonHolder.mTvIdCard.setText("身份证号:" + IDCard.idMask(bean.getIdCardNumber(), 10, 4)); + censusPersonHolder.mTvTime.setText("释放日期:" + bean.getReleaseDate()); + censusPersonHolder.mBtnEdit.setOnClickListener(v -> mEditListener.onEdit(bean, i)); + censusPersonHolder.mBtnDel.setOnClickListener(v -> mEditListener.onDel(bean, i)); + } + + private OnEditListener mEditListener; + + public void addOnEditListener(OnEditListener mListener) { + this.mEditListener = mListener; + } + + public interface OnEditListener { + void onDel(CensusCriminalListBean.RowsBean bean, int pos); + + void onEdit(CensusCriminalListBean.RowsBean bean, int pos); + } +} diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/CensusRegisterAdapter.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/CensusRegisterAdapter.java new file mode 100644 index 0000000..16e8cee --- /dev/null +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/CensusRegisterAdapter.java @@ -0,0 +1,57 @@ +package com.tengshisoft.commonmodule.adapters; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.tengshisoft.commonmodule.R; +import com.tengshisoft.commonmodule.beans.CensusPersonBean; +import com.tengshisoft.commonmodule.beans.CensusRegisterListBean; +import com.tengshisoft.commonmodule.holders.CensusPersonHolder; +import com.tengshisoft.commonmodule.holders.CensusPersonRegisterHolder; +import com.tenlionsoft.baselib.core.widget.base.BaseRecyclerAdapter; +import com.tenlionsoft.baselib.utils.IDCard; + +import java.util.List; + +/** + * 作者: adam + * 日期: 2020/11/17 - 1:22 PM + * 邮箱: itgaojian@163.com + * 描述: 人口 户籍信息 + */ +public class CensusRegisterAdapter extends BaseRecyclerAdapter { + public CensusRegisterAdapter(Context ctx, List list) { + super(ctx, list); + } + + @Override + public CensusPersonRegisterHolder createHolder(ViewGroup parent, int viewType) { + View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_person_register, parent, false); + return new CensusPersonRegisterHolder(itemView); + } + + @Override + public void bindHolder(CensusPersonRegisterHolder censusPersonHolder, int i) { + CensusRegisterListBean.RowsBean bean = mData.get(i); + censusPersonHolder.mTvName.setText(bean.getFullName()); + censusPersonHolder.mTvLocation.setText("户号:" + bean.getCensusNumber()); + censusPersonHolder.mTvIdCard.setText("身份证号:" + IDCard.idMask(bean.getIdCardNumber(), 10, 4)); + censusPersonHolder.mTvHandUser.setText("户主:" + bean.getNameOfHouseholder()); + censusPersonHolder.mBtnEdit.setOnClickListener(v -> mEditListener.onEdit(bean, i)); + censusPersonHolder.mBtnDel.setOnClickListener(v -> mEditListener.onDel(bean, i)); + } + + private OnEditListener mEditListener; + + public void addOnEditListener(OnEditListener mListener) { + this.mEditListener = mListener; + } + + public interface OnEditListener { + void onDel(CensusRegisterListBean.RowsBean bean, int pos); + + void onEdit(CensusRegisterListBean.RowsBean bean, int pos); + } +} diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CensusCrimeDetailBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CensusCrimeDetailBean.java index 0fc7c12..934d61c 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CensusCrimeDetailBean.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CensusCrimeDetailBean.java @@ -8,96 +8,27 @@ package com.tengshisoft.commonmodule.beans; */ public class CensusCrimeDetailBean { - private String releaseAfterSentenceId; - private String idCardNumber; - private String isCumulativeCrime; - private String nameOfOriginalSin; - private String nameOfOriginalSinDictionaryName; - private String originalSentenceData; - private String servingSentencePlace; - private String releaseDate; private String assessmentRiskType; - private String assessmentRiskTypeDictionaryName; - private String linkUpDate; - private String linkUpSituation; - private String linkUpSituationDictionaryName; - private String placementDate; - private String placementSituation; - private String placementSituationDictionaryName; - private String unPlacementReason; - private String helpAndEducate; - private String isCrimeAgain; - private String isCrimeAgainDictionaryName; + private String assessmentRiskTypeDict; private String crimeAgainCharge; private String fullName; - private String gender; - private String telephone; - private String nativePlace; - private String currentResidence; - - public String getReleaseAfterSentenceId() { - return releaseAfterSentenceId; - } - - public void setReleaseAfterSentenceId(String releaseAfterSentenceId) { - this.releaseAfterSentenceId = releaseAfterSentenceId; - } - - public String getIdCardNumber() { - return idCardNumber; - } - - public void setIdCardNumber(String idCardNumber) { - this.idCardNumber = idCardNumber; - } - - public String getIsCumulativeCrime() { - return isCumulativeCrime; - } - - public void setIsCumulativeCrime(String isCumulativeCrime) { - this.isCumulativeCrime = isCumulativeCrime; - } - - public String getNameOfOriginalSin() { - return nameOfOriginalSin; - } - - public void setNameOfOriginalSin(String nameOfOriginalSin) { - this.nameOfOriginalSin = nameOfOriginalSin; - } - - public String getNameOfOriginalSinDictionaryName() { - return nameOfOriginalSinDictionaryName; - } - - public void setNameOfOriginalSinDictionaryName(String nameOfOriginalSinDictionaryName) { - this.nameOfOriginalSinDictionaryName = nameOfOriginalSinDictionaryName; - } - - public String getOriginalSentenceData() { - return originalSentenceData; - } - - public void setOriginalSentenceData(String originalSentenceData) { - this.originalSentenceData = originalSentenceData; - } - - public String getServingSentencePlace() { - return servingSentencePlace; - } - - public void setServingSentencePlace(String servingSentencePlace) { - this.servingSentencePlace = servingSentencePlace; - } - - public String getReleaseDate() { - return releaseDate; - } - - public void setReleaseDate(String releaseDate) { - this.releaseDate = releaseDate; - } + private String helpAndEducate; + private String idCardNumber; + private String isCrimeAgain; + private String isCumulativeCrime; + private String linkUpDate; + private String linkUpSituation; + private String linkUpSituationDict; + private String nameOfOriginalSin; + private String nameOfOriginalSinDict; + private String originalSentenceData; + private String placementDate; + private String placementSituation; + private String placementSituationDict; + private String releaseAfterSentenceId; + private String releaseDate; + private String servingSentencePlace; + private String unPlacementReason; public String getAssessmentRiskType() { return assessmentRiskType; @@ -107,92 +38,12 @@ public class CensusCrimeDetailBean { this.assessmentRiskType = assessmentRiskType; } - public String getAssessmentRiskTypeDictionaryName() { - return assessmentRiskTypeDictionaryName; + public String getAssessmentRiskTypeDict() { + return assessmentRiskTypeDict; } - public void setAssessmentRiskTypeDictionaryName(String assessmentRiskTypeDictionaryName) { - this.assessmentRiskTypeDictionaryName = assessmentRiskTypeDictionaryName; - } - - public String getLinkUpDate() { - return linkUpDate; - } - - public void setLinkUpDate(String linkUpDate) { - this.linkUpDate = linkUpDate; - } - - public String getLinkUpSituation() { - return linkUpSituation; - } - - public void setLinkUpSituation(String linkUpSituation) { - this.linkUpSituation = linkUpSituation; - } - - public String getLinkUpSituationDictionaryName() { - return linkUpSituationDictionaryName; - } - - public void setLinkUpSituationDictionaryName(String linkUpSituationDictionaryName) { - this.linkUpSituationDictionaryName = linkUpSituationDictionaryName; - } - - public String getPlacementDate() { - return placementDate; - } - - public void setPlacementDate(String placementDate) { - this.placementDate = placementDate; - } - - public String getPlacementSituation() { - return placementSituation; - } - - public void setPlacementSituation(String placementSituation) { - this.placementSituation = placementSituation; - } - - public String getPlacementSituationDictionaryName() { - return placementSituationDictionaryName; - } - - public void setPlacementSituationDictionaryName(String placementSituationDictionaryName) { - this.placementSituationDictionaryName = placementSituationDictionaryName; - } - - public String getUnPlacementReason() { - return unPlacementReason; - } - - public void setUnPlacementReason(String unPlacementReason) { - this.unPlacementReason = unPlacementReason; - } - - public String getHelpAndEducate() { - return helpAndEducate; - } - - public void setHelpAndEducate(String helpAndEducate) { - this.helpAndEducate = helpAndEducate; - } - - public String getIsCrimeAgain() { - return isCrimeAgain; - } - - public void setIsCrimeAgain(String isCrimeAgain) { - this.isCrimeAgain = isCrimeAgain; - } - - public String getIsCrimeAgainDictionaryName() { - return isCrimeAgainDictionaryName; - } - - public void setIsCrimeAgainDictionaryName(String isCrimeAgainDictionaryName) { - this.isCrimeAgainDictionaryName = isCrimeAgainDictionaryName; + public void setAssessmentRiskTypeDict(String assessmentRiskTypeDict) { + this.assessmentRiskTypeDict = assessmentRiskTypeDict; } public String getCrimeAgainCharge() { @@ -211,35 +62,139 @@ public class CensusCrimeDetailBean { this.fullName = fullName; } - public String getGender() { - return gender; + public String getHelpAndEducate() { + return helpAndEducate; } - public void setGender(String gender) { - this.gender = gender; + public void setHelpAndEducate(String helpAndEducate) { + this.helpAndEducate = helpAndEducate; } - public String getTelephone() { - return telephone; + public String getIdCardNumber() { + return idCardNumber; } - public void setTelephone(String telephone) { - this.telephone = telephone; + public void setIdCardNumber(String idCardNumber) { + this.idCardNumber = idCardNumber; } - public String getNativePlace() { - return nativePlace; + public String getIsCrimeAgain() { + return isCrimeAgain; } - public void setNativePlace(String nativePlace) { - this.nativePlace = nativePlace; + public void setIsCrimeAgain(String isCrimeAgain) { + this.isCrimeAgain = isCrimeAgain; } - public String getCurrentResidence() { - return currentResidence; + public String getIsCumulativeCrime() { + return isCumulativeCrime; } - public void setCurrentResidence(String currentResidence) { - this.currentResidence = currentResidence; + public void setIsCumulativeCrime(String isCumulativeCrime) { + this.isCumulativeCrime = isCumulativeCrime; + } + + public String getLinkUpDate() { + return linkUpDate; + } + + public void setLinkUpDate(String linkUpDate) { + this.linkUpDate = linkUpDate; + } + + public String getLinkUpSituation() { + return linkUpSituation; + } + + public void setLinkUpSituation(String linkUpSituation) { + this.linkUpSituation = linkUpSituation; + } + + public String getLinkUpSituationDict() { + return linkUpSituationDict; + } + + public void setLinkUpSituationDict(String linkUpSituationDict) { + this.linkUpSituationDict = linkUpSituationDict; + } + + public String getNameOfOriginalSin() { + return nameOfOriginalSin; + } + + public void setNameOfOriginalSin(String nameOfOriginalSin) { + this.nameOfOriginalSin = nameOfOriginalSin; + } + + public String getNameOfOriginalSinDict() { + return nameOfOriginalSinDict; + } + + public void setNameOfOriginalSinDict(String nameOfOriginalSinDict) { + this.nameOfOriginalSinDict = nameOfOriginalSinDict; + } + + public String getOriginalSentenceData() { + return originalSentenceData; + } + + public void setOriginalSentenceData(String originalSentenceData) { + this.originalSentenceData = originalSentenceData; + } + + public String getPlacementDate() { + return placementDate; + } + + public void setPlacementDate(String placementDate) { + this.placementDate = placementDate; + } + + public String getPlacementSituation() { + return placementSituation; + } + + public void setPlacementSituation(String placementSituation) { + this.placementSituation = placementSituation; + } + + public String getPlacementSituationDict() { + return placementSituationDict; + } + + public void setPlacementSituationDict(String placementSituationDict) { + this.placementSituationDict = placementSituationDict; + } + + public String getReleaseAfterSentenceId() { + return releaseAfterSentenceId; + } + + public void setReleaseAfterSentenceId(String releaseAfterSentenceId) { + this.releaseAfterSentenceId = releaseAfterSentenceId; + } + + public String getReleaseDate() { + return releaseDate; + } + + public void setReleaseDate(String releaseDate) { + this.releaseDate = releaseDate; + } + + public String getServingSentencePlace() { + return servingSentencePlace; + } + + public void setServingSentencePlace(String servingSentencePlace) { + this.servingSentencePlace = servingSentencePlace; + } + + public String getUnPlacementReason() { + return unPlacementReason; + } + + public void setUnPlacementReason(String unPlacementReason) { + this.unPlacementReason = unPlacementReason; } } diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CensusCriminalListBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CensusCriminalListBean.java new file mode 100644 index 0000000..886ad79 --- /dev/null +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CensusCriminalListBean.java @@ -0,0 +1,232 @@ +package com.tengshisoft.commonmodule.beans; + +import java.util.List; + +/** + * 作者: adam + * 日期: 2021/10/25 - 3:20 下午 + * 邮箱: itgaojian@163.com + * 描述: 人口 刑满释放人员 + */ +public class CensusCriminalListBean { + + private int page; + private int total; + private List rows; + + public int getPage() { + return page; + } + + public void setPage(int page) { + this.page = page; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + private String assessmentRiskType; + private String assessmentRiskTypeDict; + private String crimeAgainCharge; + private String fullName; + private String helpAndEducate; + private String idCardNumber; + private String isCrimeAgain; + private String isCumulativeCrime; + private String linkUpDate; + private String linkUpSituation; + private String linkUpSituationDict; + private String nameOfOriginalSin; + private String nameOfOriginalSinDict; + private String originalSentenceData; + private String placementDate; + private String placementSituation; + private String placementSituationDict; + private String releaseAfterSentenceId; + private String releaseDate; + private String servingSentencePlace; + private String unPlacementReason; + + public String getAssessmentRiskType() { + return assessmentRiskType; + } + + public void setAssessmentRiskType(String assessmentRiskType) { + this.assessmentRiskType = assessmentRiskType; + } + + public String getAssessmentRiskTypeDict() { + return assessmentRiskTypeDict; + } + + public void setAssessmentRiskTypeDict(String assessmentRiskTypeDict) { + this.assessmentRiskTypeDict = assessmentRiskTypeDict; + } + + public String getCrimeAgainCharge() { + return crimeAgainCharge; + } + + public void setCrimeAgainCharge(String crimeAgainCharge) { + this.crimeAgainCharge = crimeAgainCharge; + } + + public String getFullName() { + return fullName; + } + + public void setFullName(String fullName) { + this.fullName = fullName; + } + + public String getHelpAndEducate() { + return helpAndEducate; + } + + public void setHelpAndEducate(String helpAndEducate) { + this.helpAndEducate = helpAndEducate; + } + + public String getIdCardNumber() { + return idCardNumber; + } + + public void setIdCardNumber(String idCardNumber) { + this.idCardNumber = idCardNumber; + } + + public String getIsCrimeAgain() { + return isCrimeAgain; + } + + public void setIsCrimeAgain(String isCrimeAgain) { + this.isCrimeAgain = isCrimeAgain; + } + + public String getIsCumulativeCrime() { + return isCumulativeCrime; + } + + public void setIsCumulativeCrime(String isCumulativeCrime) { + this.isCumulativeCrime = isCumulativeCrime; + } + + public String getLinkUpDate() { + return linkUpDate; + } + + public void setLinkUpDate(String linkUpDate) { + this.linkUpDate = linkUpDate; + } + + public String getLinkUpSituation() { + return linkUpSituation; + } + + public void setLinkUpSituation(String linkUpSituation) { + this.linkUpSituation = linkUpSituation; + } + + public String getLinkUpSituationDict() { + return linkUpSituationDict; + } + + public void setLinkUpSituationDict(String linkUpSituationDict) { + this.linkUpSituationDict = linkUpSituationDict; + } + + public String getNameOfOriginalSin() { + return nameOfOriginalSin; + } + + public void setNameOfOriginalSin(String nameOfOriginalSin) { + this.nameOfOriginalSin = nameOfOriginalSin; + } + + public String getNameOfOriginalSinDict() { + return nameOfOriginalSinDict; + } + + public void setNameOfOriginalSinDict(String nameOfOriginalSinDict) { + this.nameOfOriginalSinDict = nameOfOriginalSinDict; + } + + public String getOriginalSentenceData() { + return originalSentenceData; + } + + public void setOriginalSentenceData(String originalSentenceData) { + this.originalSentenceData = originalSentenceData; + } + + public String getPlacementDate() { + return placementDate; + } + + public void setPlacementDate(String placementDate) { + this.placementDate = placementDate; + } + + public String getPlacementSituation() { + return placementSituation; + } + + public void setPlacementSituation(String placementSituation) { + this.placementSituation = placementSituation; + } + + public String getPlacementSituationDict() { + return placementSituationDict; + } + + public void setPlacementSituationDict(String placementSituationDict) { + this.placementSituationDict = placementSituationDict; + } + + public String getReleaseAfterSentenceId() { + return releaseAfterSentenceId; + } + + public void setReleaseAfterSentenceId(String releaseAfterSentenceId) { + this.releaseAfterSentenceId = releaseAfterSentenceId; + } + + public String getReleaseDate() { + return releaseDate; + } + + public void setReleaseDate(String releaseDate) { + this.releaseDate = releaseDate; + } + + public String getServingSentencePlace() { + return servingSentencePlace; + } + + public void setServingSentencePlace(String servingSentencePlace) { + this.servingSentencePlace = servingSentencePlace; + } + + public String getUnPlacementReason() { + return unPlacementReason; + } + + public void setUnPlacementReason(String unPlacementReason) { + this.unPlacementReason = unPlacementReason; + } + } +} diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CensusRegisterDetailBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CensusRegisterDetailBean.java index 0cd8492..a220f44 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CensusRegisterDetailBean.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CensusRegisterDetailBean.java @@ -8,48 +8,17 @@ package com.tengshisoft.commonmodule.beans; */ public class CensusRegisterDetailBean { - - /** - * baseId : string - * censusMsgId : string - * censusNumber : string - * contact : string - * currentResidence : string - * fullName : string - * gender : string - * idCardNumber : string - * idCardOfHouseholder : string - * nameOfHouseholder : string - * nativePlace : string - * peopleSameCensus : string - * relationshipWithHouseholder : string - * relationshipWithHouseholderDictionaryName : string - * telephone : string - */ - - private String baseId; private String censusMsgId; private String censusNumber; private String contact; - private String currentResidence; private String fullName; - private String gender; private String idCardNumber; private String idCardOfHouseholder; private String nameOfHouseholder; - private String nativePlace; private String peopleSameCensus; + private String peopleSameCensusDict; private String relationshipWithHouseholder; - private String relationshipWithHouseholderDictionaryName; - private String telephone; - - public String getBaseId() { - return baseId; - } - - public void setBaseId(String baseId) { - this.baseId = baseId; - } + private String relationshipWithHouseholderDict; public String getCensusMsgId() { return censusMsgId; @@ -75,14 +44,6 @@ public class CensusRegisterDetailBean { this.contact = contact; } - public String getCurrentResidence() { - return currentResidence; - } - - public void setCurrentResidence(String currentResidence) { - this.currentResidence = currentResidence; - } - public String getFullName() { return fullName; } @@ -91,14 +52,6 @@ public class CensusRegisterDetailBean { this.fullName = fullName; } - public String getGender() { - return gender; - } - - public void setGender(String gender) { - this.gender = gender; - } - public String getIdCardNumber() { return idCardNumber; } @@ -123,14 +76,6 @@ public class CensusRegisterDetailBean { this.nameOfHouseholder = nameOfHouseholder; } - public String getNativePlace() { - return nativePlace; - } - - public void setNativePlace(String nativePlace) { - this.nativePlace = nativePlace; - } - public String getPeopleSameCensus() { return peopleSameCensus; } @@ -139,6 +84,14 @@ public class CensusRegisterDetailBean { this.peopleSameCensus = peopleSameCensus; } + public String getPeopleSameCensusDict() { + return peopleSameCensusDict; + } + + public void setPeopleSameCensusDict(String peopleSameCensusDict) { + this.peopleSameCensusDict = peopleSameCensusDict; + } + public String getRelationshipWithHouseholder() { return relationshipWithHouseholder; } @@ -147,19 +100,11 @@ public class CensusRegisterDetailBean { this.relationshipWithHouseholder = relationshipWithHouseholder; } - public String getRelationshipWithHouseholderDictionaryName() { - return relationshipWithHouseholderDictionaryName; + public String getRelationshipWithHouseholderDict() { + return relationshipWithHouseholderDict; } - public void setRelationshipWithHouseholderDictionaryName(String relationshipWithHouseholderDictionaryName) { - this.relationshipWithHouseholderDictionaryName = relationshipWithHouseholderDictionaryName; - } - - public String getTelephone() { - return telephone; - } - - public void setTelephone(String telephone) { - this.telephone = telephone; + public void setRelationshipWithHouseholderDict(String relationshipWithHouseholderDict) { + this.relationshipWithHouseholderDict = relationshipWithHouseholderDict; } } diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CensusRegisterListBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CensusRegisterListBean.java new file mode 100644 index 0000000..b43518c --- /dev/null +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CensusRegisterListBean.java @@ -0,0 +1,142 @@ +package com.tengshisoft.commonmodule.beans; + +import java.util.List; + +/** + * 作者: adam + * 日期: 2021/10/25 - 2:19 下午 + * 邮箱: itgaojian@163.com + * 描述: 人口系统---户籍信息 + */ +public class CensusRegisterListBean { + + private int page; + private int total; + private List rows; + + public int getPage() { + return page; + } + + public void setPage(int page) { + this.page = page; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + private String censusMsgId; + private String censusNumber; + private String contact; + private String fullName; + private String idCardNumber; + private String idCardOfHouseholder; + private String nameOfHouseholder; + private String peopleSameCensus; + private String peopleSameCensusDict; + private String relationshipWithHouseholder; + private String relationshipWithHouseholderDict; + + public String getCensusMsgId() { + return censusMsgId; + } + + public void setCensusMsgId(String censusMsgId) { + this.censusMsgId = censusMsgId; + } + + public String getCensusNumber() { + return censusNumber; + } + + public void setCensusNumber(String censusNumber) { + this.censusNumber = censusNumber; + } + + public String getContact() { + return contact; + } + + public void setContact(String contact) { + this.contact = contact; + } + + public String getFullName() { + return fullName; + } + + public void setFullName(String fullName) { + this.fullName = fullName; + } + + public String getIdCardNumber() { + return idCardNumber; + } + + public void setIdCardNumber(String idCardNumber) { + this.idCardNumber = idCardNumber; + } + + public String getIdCardOfHouseholder() { + return idCardOfHouseholder; + } + + public void setIdCardOfHouseholder(String idCardOfHouseholder) { + this.idCardOfHouseholder = idCardOfHouseholder; + } + + public String getNameOfHouseholder() { + return nameOfHouseholder; + } + + public void setNameOfHouseholder(String nameOfHouseholder) { + this.nameOfHouseholder = nameOfHouseholder; + } + + public String getPeopleSameCensus() { + return peopleSameCensus; + } + + public void setPeopleSameCensus(String peopleSameCensus) { + this.peopleSameCensus = peopleSameCensus; + } + + public String getPeopleSameCensusDict() { + return peopleSameCensusDict; + } + + public void setPeopleSameCensusDict(String peopleSameCensusDict) { + this.peopleSameCensusDict = peopleSameCensusDict; + } + + public String getRelationshipWithHouseholder() { + return relationshipWithHouseholder; + } + + public void setRelationshipWithHouseholder(String relationshipWithHouseholder) { + this.relationshipWithHouseholder = relationshipWithHouseholder; + } + + public String getRelationshipWithHouseholderDict() { + return relationshipWithHouseholderDict; + } + + public void setRelationshipWithHouseholderDict(String relationshipWithHouseholderDict) { + this.relationshipWithHouseholderDict = relationshipWithHouseholderDict; + } + } +} diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CensusmsgBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CensusmsgBean.java index aef1e7b..e408f84 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CensusmsgBean.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CensusmsgBean.java @@ -8,30 +8,23 @@ package com.tengshisoft.commonmodule.beans; */ public class CensusmsgBean { - /** - * baseId : string - * censusNumber : string - * contact : string - * idCardOfHouseholder : string - * nameOfHouseholder : string - * peopleSameCensus : string - * relationshipWithHouseholder : string - */ - private String baseId; + private String censusMsgId; private String censusNumber; private String contact; + private String fullName; + private String idCardNumber; private String idCardOfHouseholder; private String nameOfHouseholder; private String peopleSameCensus; private String relationshipWithHouseholder; - public String getBaseId() { - return baseId; + public String getCensusMsgId() { + return censusMsgId; } - public void setBaseId(String baseId) { - this.baseId = baseId; + public void setCensusMsgId(String censusMsgId) { + this.censusMsgId = censusMsgId; } public String getCensusNumber() { @@ -50,6 +43,22 @@ public class CensusmsgBean { this.contact = contact; } + public String getFullName() { + return fullName; + } + + public void setFullName(String fullName) { + this.fullName = fullName; + } + + public String getIdCardNumber() { + return idCardNumber; + } + + public void setIdCardNumber(String idCardNumber) { + this.idCardNumber = idCardNumber; + } + public String getIdCardOfHouseholder() { return idCardOfHouseholder; } diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveCrimeBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveCrimeBean.java index 2a8482e..b270eec 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveCrimeBean.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveCrimeBean.java @@ -8,26 +8,10 @@ package com.tengshisoft.commonmodule.beans; */ public class SaveCrimeBean { - /** - * assessmentRiskType : string - * crimeAgainCharge : string - * helpAndEducate : string - * idCardNumber : string - * isCrimeAgain : string - * isCumulativeCrime : string - * linkUpDate : string - * linkUpSituation : string - * nameOfOriginalSin : string - * originalSentenceData : string - * placementDate : string - * placementSituation : string - * releaseDate : string - * servingSentencePlace : string - * unPlacementReason : string - */ private String assessmentRiskType; private String crimeAgainCharge; + private String fullName; private String helpAndEducate; private String idCardNumber; private String isCrimeAgain; @@ -38,6 +22,7 @@ public class SaveCrimeBean { private String originalSentenceData; private String placementDate; private String placementSituation; + private String releaseAfterSentenceId; private String releaseDate; private String servingSentencePlace; private String unPlacementReason; @@ -58,6 +43,14 @@ public class SaveCrimeBean { this.crimeAgainCharge = crimeAgainCharge; } + public String getFullName() { + return fullName; + } + + public void setFullName(String fullName) { + this.fullName = fullName; + } + public String getHelpAndEducate() { return helpAndEducate; } @@ -138,6 +131,14 @@ public class SaveCrimeBean { this.placementSituation = placementSituation; } + public String getReleaseAfterSentenceId() { + return releaseAfterSentenceId; + } + + public void setReleaseAfterSentenceId(String releaseAfterSentenceId) { + this.releaseAfterSentenceId = releaseAfterSentenceId; + } + public String getReleaseDate() { return releaseDate; } diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/CensusCriminalHolder.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/CensusCriminalHolder.java new file mode 100644 index 0000000..7781f37 --- /dev/null +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/CensusCriminalHolder.java @@ -0,0 +1,40 @@ +package com.tengshisoft.commonmodule.holders; + +import android.view.View; +import android.widget.Button; +import android.widget.TextView; + +import com.tengshisoft.commonmodule.R; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + + +/** + * 作者: adam + * 日期: 2020/11/17 - 1:19 PM + * 邮箱: itgaojian@163.com + * 描述: 人口 刑满释放人员 + */ +public class CensusCriminalHolder extends RecyclerView.ViewHolder { + public TextView mTvName; + public TextView mTvIdCard; + + + public TextView mTvCharge; + public TextView mTvTime; + + + public Button mBtnDel; + public Button mBtnEdit; + + public CensusCriminalHolder(@NonNull View itemView) { + super(itemView); + mTvName = itemView.findViewById(R.id.tv_name); + mTvCharge = itemView.findViewById(R.id.tv_charge); + mBtnDel = itemView.findViewById(R.id.btn_del); + mBtnEdit = itemView.findViewById(R.id.btn_edit); + mTvTime = itemView.findViewById(R.id.tv_time); + mTvIdCard = itemView.findViewById(R.id.tv_id_card); + } +} diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/CensusPersonRegisterHolder.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/CensusPersonRegisterHolder.java new file mode 100644 index 0000000..058dc68 --- /dev/null +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/CensusPersonRegisterHolder.java @@ -0,0 +1,37 @@ +package com.tengshisoft.commonmodule.holders; + +import android.view.View; +import android.widget.Button; +import android.widget.TextView; + +import com.tengshisoft.commonmodule.R; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + + +/** + * 作者: adam + * 日期: 2020/11/17 - 1:19 PM + * 邮箱: itgaojian@163.com + * 描述: 人口 户籍信息 + */ +public class CensusPersonRegisterHolder extends RecyclerView.ViewHolder { + public TextView mTvName; + public TextView mTvLocation; + public TextView mTvHandUser; + public TextView mTvIdCard; + + public Button mBtnDel; + public Button mBtnEdit; + + public CensusPersonRegisterHolder(@NonNull View itemView) { + super(itemView); + mTvName = itemView.findViewById(R.id.tv_name); + mTvLocation = itemView.findViewById(R.id.tv_location); + mBtnDel = itemView.findViewById(R.id.btn_del); + mBtnEdit = itemView.findViewById(R.id.btn_edit); + mTvHandUser = itemView.findViewById(R.id.tv_hand_user); + mTvIdCard = itemView.findViewById(R.id.tv_id_card); + } +} diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/Apis.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/Apis.java index ec3a2fb..e030f4b 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/Apis.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/Apis.java @@ -8,9 +8,11 @@ import com.tengshisoft.commonmodule.beans.BuildingManagerListBean; import com.tengshisoft.commonmodule.beans.CaseComponentListBean; import com.tengshisoft.commonmodule.beans.CaseTypeBean; import com.tengshisoft.commonmodule.beans.CensusCrimeDetailBean; +import com.tengshisoft.commonmodule.beans.CensusCriminalListBean; import com.tengshisoft.commonmodule.beans.CensusPersonBean; import com.tengshisoft.commonmodule.beans.CensusRearDetailBean; import com.tengshisoft.commonmodule.beans.CensusRegisterDetailBean; +import com.tengshisoft.commonmodule.beans.CensusRegisterListBean; import com.tengshisoft.commonmodule.beans.ChoosePersonListBean; import com.tengshisoft.commonmodule.beans.CommunityListBean; import com.tengshisoft.commonmodule.beans.ComponentDetailBean; @@ -360,6 +362,7 @@ public interface Apis { @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/basepopulationinfo/getbasepopulationinfobyid/{basePopulationInfoId}") Observable getBaseInfoDetailById(@Path("basePopulationInfoId") String id, @Header("token") String token); + /*===============================================户籍信息================================================*/ /** * 删除人员户籍信息 @@ -373,21 +376,21 @@ public interface Apis { */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/censusmsg/listpagecensusmsg") - Observable getCensusRegister(@Query("page") String page, @Query("keywords") String key, @Header("token") String token); + Observable getCensusRegister(@Query("page") String page, @Query("keywords") String key, @Header("token") String token); /** * 户籍信息详情 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) - @GET("app/censusmsg/getcensusmsgbyid/{censusMsgId}") - Observable getCensusRegisterDetail(@Path("censusMsgId") String id, @Header("token") String token); + @GET("app/censusmsg/getcensusmsg") + Observable getCensusRegisterDetail(@Query("censusMsgId") String id, @Header("token") String token); /** * 户籍信息详情-身份证 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) - @GET("app/censusmsg/hasmsg/{idCardNumber}") - Observable getCensusRegisterDetailByIdCard(@Path("idCardNumber") String idCard, @Header("token") String token); + @GET("app/censusmsg/getcensusmsg") + Observable getCensusRegisterDetailByIdCard(@Query("idCardNumber") String idCard, @Header("token") String token); /** * 编辑户籍信息 @@ -400,7 +403,7 @@ public interface Apis { * 保存人员户籍信息 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) - @POST("app/censusmsg/savecensusmsg") + @POST("app/censusmsg/save-census-msg") Observable doSaveCensusRegister(@Body RequestBody body, @Header("token") String token); @@ -631,7 +634,7 @@ public interface Apis { Observable doEditCrime(@Path("releaseAfterSentenceId") String id, @Body RequestBody body, @Header("token") String token); /** - * 删除出租房 + * 删除刑满释放人员信息 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @DELETE("app/releaseaftersentence/removereleaseaftersentence/{ids}") @@ -641,8 +644,8 @@ public interface Apis { * 根据ID获取详情 */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) - @GET("app/releaseaftersentence/getreleaseaftersentencebyid/{releaseAfterSentenceId}") - Observable getCrimeDetailById(@Path("releaseAfterSentenceId") String id, @Header("token") String token); + @GET("app/releaseaftersentence/getreleaseaftersentenceinfo") + Observable getCrimeDetailById(@Query("releaseAfterSentenceId") String id, @Header("token") String token); /** * 根据身份证号码获取详情 @@ -656,7 +659,7 @@ public interface Apis { */ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/releaseaftersentence/listpagereleaseaftersentence") - Observable getCrimeList(@Query("page") String page, @Query("keywords") String key, @Header("token") String token); + Observable getCrimeList(@Query("page") String page, @Query("keywords") String key, @Header("token") String token); /*===========================================肇事===========================================*/ diff --git a/commonmodule/src/main/res/layout/item_person_criminal.xml b/commonmodule/src/main/res/layout/item_person_criminal.xml new file mode 100644 index 0000000..609a2cb --- /dev/null +++ b/commonmodule/src/main/res/layout/item_person_criminal.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + +