From 77e5fff71db526ce307da6ce6f6fa92dea04d88b Mon Sep 17 00:00:00 2001 From: "java_cuibaocheng@163.com" Date: Sat, 4 Nov 2023 15:07:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=81=E4=BB=B6?= =?UTF-8?q?=E5=8F=B7=E6=A0=A1=E9=AA=8C=20,=20=E4=BA=BA=E5=8F=A3=E5=BD=95?= =?UTF-8?q?=E5=85=A5=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80=20,=20=E5=B9=B4?= =?UTF-8?q?=E9=BE=84=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../populationinfo/PopulationInfoBaseDTO.java | 7 +- .../impl/PopulationInfoServiceImpl.java | 51 +- .../templates/populationinfo/save.html | 1401 ++++++++-------- .../templates/populationinfo/update.html | 1404 +++++++++-------- 4 files changed, 1477 insertions(+), 1386 deletions(-) diff --git a/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoBaseDTO.java b/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoBaseDTO.java index 5cd9a66..96e8b86 100644 --- a/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoBaseDTO.java +++ b/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoBaseDTO.java @@ -5,6 +5,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.StringUtils; +import java.time.LocalDate; +import java.time.Period; + @ApiModel public class PopulationInfoBaseDTO { @@ -90,7 +93,9 @@ public class PopulationInfoBaseDTO { } public Integer getAge() { - return IdCardVerifyUtil.getIdCardAge(idcard); + LocalDate birthDate = LocalDate.parse(this.birthday); + Period period = Period.between(birthDate, LocalDate.now()); + return period.getYears(); } public void setAge(Integer age) { diff --git a/src/main/java/com/cm/population/service/populationinfo/impl/PopulationInfoServiceImpl.java b/src/main/java/com/cm/population/service/populationinfo/impl/PopulationInfoServiceImpl.java index 3d31bff..70945b1 100644 --- a/src/main/java/com/cm/population/service/populationinfo/impl/PopulationInfoServiceImpl.java +++ b/src/main/java/com/cm/population/service/populationinfo/impl/PopulationInfoServiceImpl.java @@ -8,7 +8,6 @@ import com.cm.common.pojo.ListPage; import com.cm.common.result.SuccessResultList; import com.cm.common.token.app.AppTokenManager; import com.cm.common.token.app.entity.AppTokenUser; -import com.cm.common.utils.DateUtil; import com.cm.common.utils.HashMapUtil; import com.cm.common.utils.UUIDUtil; import com.cm.population.dao.areatree.IAreatreeDao; @@ -40,7 +39,6 @@ import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - import java.util.*; /** @@ -80,13 +78,12 @@ public class PopulationInfoServiceImpl extends AbstractService implements IPopul List list = iAreatreeDao.getAreaList(params); for (AreaZtreeDTO dto : list) { Integer count = iAreatreeDao.countByParentId(dto.getId()); - if (count > 0) { + if(count > 0) { dto.setIsParent(true); } } return list; } - @Autowired private ICorrectService iCorrectService; @Autowired @@ -101,7 +98,6 @@ public class PopulationInfoServiceImpl extends AbstractService implements IPopul private IReleaseService iReleaseService; @Autowired private ISecurityService iSecurityService; - @Override public PopulationInfoBaseDTO getBase(String populationInfoId) { Map query = new HashMap<>(); @@ -149,15 +145,17 @@ public class PopulationInfoServiceImpl extends AbstractService implements IPopul if (dto != null) { throw new SaveException("该证件号码已存在"); } - if (!IdCardVerifyUtil.isIDCard(populationInfoVO.getIdcard().trim())) { - throw new SaveException("该证件号码错误"); + if (populationInfoVO.getIdcardType().equals("身份证")) { + if(!IdCardVerifyUtil.isIDCard(populationInfoVO.getIdcard().trim())) { + throw new SaveException("该证件号码错误"); + } } String areaCode = populationInfoVO.getDomicileAreaCode(); - if (areaCode.startsWith("150271")) { //包头稀土高新技术产业开发区 + if(areaCode.startsWith("150271")) { //包头稀土高新技术产业开发区 populationInfoVO.setDomicileAddressType("3"); - } else if (areaCode.startsWith("1502")) { //包头市 + }else if(areaCode.startsWith("1502")) { //包头市 populationInfoVO.setDomicileAddressType("2"); - } else { //非包头市 + }else { //非包头市 populationInfoVO.setDomicileAddressType("1"); } Map params = HashMapUtil.objectToMap(populationInfoVO); @@ -176,9 +174,9 @@ public class PopulationInfoServiceImpl extends AbstractService implements IPopul public void remove(String token, List ids) { Map params = getHashMap(2); params.put("populationInfoIds", ids); - if (StringUtils.isEmpty(token)) { + if(StringUtils.isEmpty(token)) { setUpdateInfo(params); - } else { + }else{ setUpdateInfo(token, params); } populationInfoDao.remove(params); @@ -188,9 +186,9 @@ public class PopulationInfoServiceImpl extends AbstractService implements IPopul public void delete(String token, List ids) { Map params = getHashMap(2); params.put("populationInfoIds", ids); - if (StringUtils.isEmpty(token)) { + if(StringUtils.isEmpty(token)) { setUpdateInfo(params); - } else { + }else{ setUpdateInfo(token, params); } populationInfoDao.delete(params); @@ -208,21 +206,23 @@ public class PopulationInfoServiceImpl extends AbstractService implements IPopul if (dto != null && !dto.getPopulationInfoId().equals(populationInfoId)) { throw new SaveException("该证件号码已存在"); } - if (!IdCardVerifyUtil.isIDCard(populationInfoVO.getIdcard().trim())) { - throw new SaveException("该证件号码错误"); + if (populationInfoVO.getIdcardType().equals("身份证")) { + if(!IdCardVerifyUtil.isIDCard(populationInfoVO.getIdcard().trim())) { + throw new SaveException("该证件号码错误"); + } } String areaCode = populationInfoVO.getDomicileAreaCode(); - if (areaCode.startsWith("150271")) { //包头稀土高新技术产业开发区 + if(areaCode.startsWith("150271")) { //包头稀土高新技术产业开发区 populationInfoVO.setDomicileAddressType("3"); - } else if (areaCode.startsWith("1502")) { //包头市 + }else if(areaCode.startsWith("1502")) { //包头市 populationInfoVO.setDomicileAddressType("2"); - } else { //非包头市 + }else { //非包头市 populationInfoVO.setDomicileAddressType("1"); } params.put("populationInfoId", populationInfoId); - if (StringUtils.isEmpty(token)) { + if(StringUtils.isEmpty(token)) { setUpdateInfo(params); - } else { + }else{ setUpdateInfo(token, params); } populationInfoDao.update(params); @@ -273,14 +273,7 @@ public class PopulationInfoServiceImpl extends AbstractService implements IPopul @Override public List list(Map params) { - List populationInfoDTOS = populationInfoDao.list(params); - populationInfoDTOS.forEach(populationInfoDTO -> { - if (StringUtils.isBlank(populationInfoDTO.getBirthday())) { - return; - } - populationInfoDTO.setAge(DateUtil.getAgeByBirthday(populationInfoDTO.getBirthday())); - }); - return populationInfoDTOS; + return populationInfoDao.list(params); } @Override diff --git a/src/main/resources/templates/populationinfo/save.html b/src/main/resources/templates/populationinfo/save.html index 671858d..edb8ff9 100644 --- a/src/main/resources/templates/populationinfo/save.html +++ b/src/main/resources/templates/populationinfo/save.html @@ -14,11 +14,11 @@ @@ -34,586 +34,243 @@
-
-
- -
- +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+ +
+ +
-
-
-
- -
- -
-
-
-
- -
- +
+
+
+ +
+ +
+
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- +
+
+
+ +
+ +
-
-
-
-
- -
- +
+
+ +
+ +
-
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- - - +
+
+ +
+ +
-
-
-
-
- -
- +
+
+ +
+ +
+
-
-
-
-
- -
- +
+
+ +
+ +
+
-
-
-
-
- -
- +
+
+ +
+ +
-
-
-
-
- -
- +
+
+ +
+ +
-
-
- -
-
-
-
- -
- - +
+
+ +
+ + + +
+
-
-
-
-
- -
- +
+
+ +
+ +
+
-
-
-
-
- -
- +
+
+ +
+ +
+
-
-
-
-
- - -
-
-
-
-
-
- -
- - +
+
+ +
+ +
+
-
-
-
-
- -
- +
+
+ +
+ +
+
-
-
-
-
- -
- +
+
+ +
+ +
+
-
-
-
-
- - -
-
-
-
-
- -
- - -
-
-
- -
- -
-
-
- -
- -
-
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
-
-

老年人

-
-
-
-
- -
- - -
-
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
-

残疾人

-
-
-
-
- -
- - -
-
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
- -
- - -
-
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
-
- -
-
-
-
-
-

服役/退役

-
-
-
-
- -
- - +
+
+
+ +
+ + +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ + +
+
+
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ + +
+
+
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
-
-
- -
- +
+
+
+
+
    +
  • 老年人
    • +
  • 残疾人
    • +
  • 服役/退役
    • +
  • 社会救助
    • +
+
+
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+ +
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+ +
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ + +
+
+
+
+
+ +
+
-
-
-
- -
- -
-
-
-
-

社会救助

-
-
-
-
- -
- - +
+
+
+
    +
  • 党员
    • +
  • 其他
    • +
+
+
+ +
+
+
+ +
+ + +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
-
-
- -
- - -
-
-
-
-
- -
- - -
-
-
-
-
- -
- - -
-
-
-
-
- -
- - -
-
-
-
-
-

党员

-
-
-
-
- -
- - -
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
- -
- -
diff --git a/src/main/resources/templates/populationinfo/update.html b/src/main/resources/templates/populationinfo/update.html index 52f38f6..547500a 100644 --- a/src/main/resources/templates/populationinfo/update.html +++ b/src/main/resources/templates/populationinfo/update.html @@ -33,586 +33,243 @@
-
-
- -
- +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+ +
+ +
-
-
-
- -
- -
-
-
-
- -
- +
+
+
+ +
+ +
+
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- +
+
+
+ +
+ +
-
-
-
-
- -
- +
+
+ +
+ +
-
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- - - +
+
+ +
+ +
-
-
-
-
- -
- +
+
+ +
+ +
+
-
-
-
-
- -
- +
+
+ +
+ +
+
-
-
-
-
- -
- +
+
+ +
+ +
-
-
-
-
- -
- +
+
+ +
+ +
-
-
- -
-
-
-
- -
- - +
+
+ +
+ + + +
+
-
-
-
-
- -
- +
+
+ +
+ +
+
-
-
-
-
- -
- +
+
+ +
+ +
+
-
-
-
-
- - -
-
-
-
-
-
- -
- - +
+
+ +
+ +
+
-
-
-
-
- -
- +
+
+ +
+ +
+
-
-
-
-
- -
- +
+
+ +
+ +
+
-
-
-
-
- - -
-
-
-
-
- -
- - -
-
-
- -
- -
-
-
- -
- -
-
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
-
-

老年人

-
-
-
-
- -
- - -
-
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
-

残疾人

-
-
-
-
- -
- - -
-
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
- -
- - -
-
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
-
- -
-
-
-
-
-

服役/退役

-
-
-
-
- -
- - +
+
+
+ +
+ + +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ + +
+
+
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ + +
+
+
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
-
-
- -
- +
+
+
+
+
    +
  • 老年人
    • +
  • 残疾人
    • +
  • 服役/退役
    • +
  • 社会救助
    • +
+
+
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+ +
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+ +
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ + +
+
+
+
+
+ +
+
-
-
-
- -
- -
-
-
-
-

社会救助

-
-
-
-
- -
- - -
-
-
-
-
- -
- - -
-
-
-
-
- -
- - -
-
-
-
-
- -
- - -
-
-
-
-
- -
- - +
+
+
+
    +
  • 党员
    • +
  • 其他
    • +
+
+
+ +
+
+
+ +
+ + +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
-
-

党员

-
-
-
-
- -
- - -
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
+ + + + + + +
From e528a85aa9f2a179017dafa37319757a53752564 Mon Sep 17 00:00:00 2001 From: "java_cuibaocheng@163.com" Date: Sat, 4 Nov 2023 15:26:01 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=81=E4=BB=B6?= =?UTF-8?q?=E5=8F=B7=E6=A0=A1=E9=AA=8C=20,=20=E4=BA=BA=E5=8F=A3=E5=BD=95?= =?UTF-8?q?=E5=85=A5=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80=20,=20=E5=B9=B4?= =?UTF-8?q?=E9=BE=84=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/areatree/AreaTreeController.java | 2 +- .../app/api/areatree/AreaTreeAppController.java | 12 ++++++++++-- src/main/resources/templates/cult/save.html | 2 +- src/main/resources/templates/cult/update.html | 2 +- src/main/resources/templates/dispute/save.html | 2 +- src/main/resources/templates/dispute/update.html | 2 +- .../resources/templates/populationinfo/save.html | 6 +++--- .../resources/templates/populationinfo/update.html | 8 ++++---- src/main/resources/templates/security/save.html | 2 +- src/main/resources/templates/security/update.html | 2 +- 10 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/cm/population/controller/api/areatree/AreaTreeController.java b/src/main/java/com/cm/population/controller/api/areatree/AreaTreeController.java index 04096a8..24c56f7 100644 --- a/src/main/java/com/cm/population/controller/api/areatree/AreaTreeController.java +++ b/src/main/java/com/cm/population/controller/api/areatree/AreaTreeController.java @@ -133,7 +133,7 @@ public class AreaTreeController extends AbstractController { for(AreaZtreeDTO dto : list) { ArrayList names = new ArrayList<>(); names.add(dto.getName()); - getParent(names, dto.getpId()); + getParentBaoTou(names, dto.getpId()); dto.setTitle(StringUtils.join(names, "/")); } return list; diff --git a/src/main/java/com/cm/population/controller/app/api/areatree/AreaTreeAppController.java b/src/main/java/com/cm/population/controller/app/api/areatree/AreaTreeAppController.java index 98af0da..fdf6522 100644 --- a/src/main/java/com/cm/population/controller/app/api/areatree/AreaTreeAppController.java +++ b/src/main/java/com/cm/population/controller/app/api/areatree/AreaTreeAppController.java @@ -91,7 +91,7 @@ public class AreaTreeAppController extends AbstractController { * @return */ @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("tree") + @PostMapping("tree") public List tree(String id) { String parentId = id; if (StringUtils.isEmpty(id)) { @@ -101,7 +101,7 @@ public class AreaTreeAppController extends AbstractController { for(AreaZtreeDTO dto : list) { ArrayList names = new ArrayList<>(); names.add(dto.getName()); - getParent(names, dto.getpId()); + getParentBaoTou(names, dto.getpId()); dto.setTitle(StringUtils.join(names, "/")); } return list; @@ -137,4 +137,12 @@ public class AreaTreeAppController extends AbstractController { } } + public void getParentBaoTou(ArrayList names, String pId) { + DataAreaDTO areaDTO = iPopulationInfoService.getAreaById(pId); + if(areaDTO != null && !areaDTO.getAreaLevel().equals("1") && !areaDTO.getAreaLevel().equals("0") ) { + names.add(0, areaDTO.getAreaName()); + getParentBaoTou(names, areaDTO.getAreaParentId()); + } + } + } \ No newline at end of file diff --git a/src/main/resources/templates/cult/save.html b/src/main/resources/templates/cult/save.html index b100f61..612d700 100644 --- a/src/main/resources/templates/cult/save.html +++ b/src/main/resources/templates/cult/save.html @@ -166,7 +166,7 @@ callback : { onClick : function (e, treeId, treeNode) { var count = treeNode.title.split('/').length -1; - if (count > 1) { + if (count > 0) { $('#' + name + "AreaName").val(treeNode.title); $('#' + name + "AreaCode").val(treeNode.areaCode); hideMenu(); diff --git a/src/main/resources/templates/cult/update.html b/src/main/resources/templates/cult/update.html index bff8ca3..0660ac0 100644 --- a/src/main/resources/templates/cult/update.html +++ b/src/main/resources/templates/cult/update.html @@ -162,7 +162,7 @@ callback : { onClick : function (e, treeId, treeNode) { var count = treeNode.title.split('/').length -1; - if (count > 1) { + if (count > 0) { $('#' + name + "AreaName").val(treeNode.title); $('#' + name + "AreaCode").val(treeNode.areaCode); hideMenu(); diff --git a/src/main/resources/templates/dispute/save.html b/src/main/resources/templates/dispute/save.html index 4d489f2..ed9e3ad 100644 --- a/src/main/resources/templates/dispute/save.html +++ b/src/main/resources/templates/dispute/save.html @@ -750,7 +750,7 @@ callback : { onClick : function (e, treeId, treeNode) { var count = treeNode.title.split('/').length -1; - if (count > 1) { + if (count > 0) { $('#' + name + "AreaName").val(treeNode.title); $('#' + name + "AreaCode").val(treeNode.areaCode); hideMenu(); diff --git a/src/main/resources/templates/dispute/update.html b/src/main/resources/templates/dispute/update.html index d914918..3cbc5b4 100644 --- a/src/main/resources/templates/dispute/update.html +++ b/src/main/resources/templates/dispute/update.html @@ -754,7 +754,7 @@ callback : { onClick : function (e, treeId, treeNode) { var count = treeNode.title.split('/').length -1; - if (count > 1) { + if (count > 0) { $('#' + name + "AreaName").val(treeNode.title); $('#' + name + "AreaCode").val(treeNode.areaCode); hideMenu(); diff --git a/src/main/resources/templates/populationinfo/save.html b/src/main/resources/templates/populationinfo/save.html index edb8ff9..64c6d58 100644 --- a/src/main/resources/templates/populationinfo/save.html +++ b/src/main/resources/templates/populationinfo/save.html @@ -345,7 +345,7 @@
-
+
@@ -362,7 +362,7 @@
-
+
@@ -933,7 +933,7 @@ callback : { onClick : function (e, treeId, treeNode) { var count = treeNode.title.split('/').length -1; - if (count > 1) { + if (count > 0) { $('#' + name + "AreaName").val(treeNode.title); $('#' + name + "AreaCode").val(treeNode.areaCode); hideMenu(); diff --git a/src/main/resources/templates/populationinfo/update.html b/src/main/resources/templates/populationinfo/update.html index 547500a..6f8f25f 100644 --- a/src/main/resources/templates/populationinfo/update.html +++ b/src/main/resources/templates/populationinfo/update.html @@ -344,7 +344,7 @@
-
+
@@ -361,7 +361,7 @@
-
+
@@ -877,7 +877,7 @@ callback : { onClick : function (e, treeId, treeNode) { var count = treeNode.title.split('/').length -1; - if (count > 1) { + if (count > 0) { $('#' + name + "AreaName").val(treeNode.title); $('#' + name + "AreaCode").val(treeNode.areaCode); hideMenu(); @@ -908,7 +908,7 @@ callback : { onClick : function (e, treeId, treeNode) { var count = treeNode.title.split('/').length -1; - if (count > 1) { + if (count > 0) { $('#' + name + "AreaName").val(treeNode.title); $('#' + name + "AreaCode").val(treeNode.areaCode); hideMenu(); diff --git a/src/main/resources/templates/security/save.html b/src/main/resources/templates/security/save.html index 5e64e69..3c2be45 100644 --- a/src/main/resources/templates/security/save.html +++ b/src/main/resources/templates/security/save.html @@ -243,7 +243,7 @@ callback : { onClick : function (e, treeId, treeNode) { var count = treeNode.title.split('/').length -1; - if (count > 1) { + if (count > 0) { $('#' + name + "AreaName").val(treeNode.title); $('#' + name + "AreaCode").val(treeNode.areaCode); hideMenu(); diff --git a/src/main/resources/templates/security/update.html b/src/main/resources/templates/security/update.html index 18a0170..775e6e2 100644 --- a/src/main/resources/templates/security/update.html +++ b/src/main/resources/templates/security/update.html @@ -245,7 +245,7 @@ callback : { onClick : function (e, treeId, treeNode) { var count = treeNode.title.split('/').length -1; - if (count > 1) { + if (count > 0) { $('#' + name + "AreaName").val(treeNode.title); $('#' + name + "AreaCode").val(treeNode.areaCode); hideMenu(); From 38af70dc8bd30d85bcb1d3045c6d2b97b9d2a89e Mon Sep 17 00:00:00 2001 From: "java_cuibaocheng@163.com" Date: Sat, 4 Nov 2023 15:37:24 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=81=E4=BB=B6?= =?UTF-8?q?=E5=8F=B7=E6=A0=A1=E9=AA=8C=20,=20=E4=BA=BA=E5=8F=A3=E5=BD=95?= =?UTF-8?q?=E5=85=A5=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80=20,=20=E5=B9=B4?= =?UTF-8?q?=E9=BE=84=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../population/controller/api/areatree/AreaTreeController.java | 2 +- .../controller/app/api/areatree/AreaTreeAppController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/cm/population/controller/api/areatree/AreaTreeController.java b/src/main/java/com/cm/population/controller/api/areatree/AreaTreeController.java index 24c56f7..04096a8 100644 --- a/src/main/java/com/cm/population/controller/api/areatree/AreaTreeController.java +++ b/src/main/java/com/cm/population/controller/api/areatree/AreaTreeController.java @@ -133,7 +133,7 @@ public class AreaTreeController extends AbstractController { for(AreaZtreeDTO dto : list) { ArrayList names = new ArrayList<>(); names.add(dto.getName()); - getParentBaoTou(names, dto.getpId()); + getParent(names, dto.getpId()); dto.setTitle(StringUtils.join(names, "/")); } return list; diff --git a/src/main/java/com/cm/population/controller/app/api/areatree/AreaTreeAppController.java b/src/main/java/com/cm/population/controller/app/api/areatree/AreaTreeAppController.java index fdf6522..fae5242 100644 --- a/src/main/java/com/cm/population/controller/app/api/areatree/AreaTreeAppController.java +++ b/src/main/java/com/cm/population/controller/app/api/areatree/AreaTreeAppController.java @@ -101,7 +101,7 @@ public class AreaTreeAppController extends AbstractController { for(AreaZtreeDTO dto : list) { ArrayList names = new ArrayList<>(); names.add(dto.getName()); - getParentBaoTou(names, dto.getpId()); + getParent(names, dto.getpId()); dto.setTitle(StringUtils.join(names, "/")); } return list; From 9d24b9e6ce4e09bc76dcde0a6a7c2d4c97f5dd8b Mon Sep 17 00:00:00 2001 From: "java_cuibaocheng@163.com" Date: Sat, 4 Nov 2023 15:48:05 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=81=E4=BB=B6?= =?UTF-8?q?=E5=8F=B7=E6=A0=A1=E9=AA=8C=20,=20=E4=BA=BA=E5=8F=A3=E5=BD=95?= =?UTF-8?q?=E5=85=A5=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80=20,=20=E5=B9=B4?= =?UTF-8?q?=E9=BE=84=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../populationinfo/PopulationInfoBaseDTO.java | 10 +++ .../populationinfo/PopulationInfoDTO.java | 10 +++ .../mybatis/mapper/dispute/dispute-mapper.xml | 3 +- .../mybatis/mapper/drug/drug-mapper.xml | 34 +++++----- .../mapper/petition/petition-mapper.xml | 3 +- .../populationinfo/population-info-mapper.xml | 8 ++- .../mybatis/mapper/release/release-mapper.xml | 64 +++++++++---------- .../mapper/security/security-mapper.xml | 53 +++++++-------- 8 files changed, 106 insertions(+), 79 deletions(-) diff --git a/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoBaseDTO.java b/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoBaseDTO.java index 96e8b86..28977ef 100644 --- a/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoBaseDTO.java +++ b/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoBaseDTO.java @@ -61,6 +61,16 @@ public class PopulationInfoBaseDTO { private String phone; @ApiModelProperty(name = "age", value = "年龄") private Integer age; + @ApiModelProperty(name = "创建人", value = "创建人") + private String creator; + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } public String getHealthStatus() { return healthStatus; diff --git a/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoDTO.java b/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoDTO.java index 9eafef8..ce4039e 100644 --- a/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoDTO.java +++ b/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoDTO.java @@ -168,6 +168,16 @@ public class PopulationInfoDTO { @ApiModelProperty(name = "age", value = "年龄") @CheckEmptyAnnotation(name = "年龄") private Integer age; + @ApiModelProperty(name = "创建人", value = "创建人") + private String creator; + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } public String getDepartmentType() { return departmentType == null ? "" : departmentType; diff --git a/src/main/resources/mybatis/mapper/dispute/dispute-mapper.xml b/src/main/resources/mybatis/mapper/dispute/dispute-mapper.xml index c2cc571..b89f062 100644 --- a/src/main/resources/mybatis/mapper/dispute/dispute-mapper.xml +++ b/src/main/resources/mybatis/mapper/dispute/dispute-mapper.xml @@ -831,7 +831,8 @@ t1.partyb_idcard, t1.partyb_name, t1.partyb_phone, - t1.dispute_id + t1.dispute_id, + t1.creator FROM population_dispute t1 LEFT JOIN diff --git a/src/main/resources/mybatis/mapper/drug/drug-mapper.xml b/src/main/resources/mybatis/mapper/drug/drug-mapper.xml index 06a5d6b..165ed2d 100644 --- a/src/main/resources/mybatis/mapper/drug/drug-mapper.xml +++ b/src/main/resources/mybatis/mapper/drug/drug-mapper.xml @@ -79,23 +79,23 @@ gmt_modified, is_delete ) VALUES( - #{drugId}, - #{populationInfoId}, - #{startTime}, - #{control}, - #{controlPhone}, - #{help}, - #{helpPhone}, - #{charge}, - #{reason}, - #{reasonOther}, - #{consequence}, - #{creator}, - #{gmtCreate}, - #{modifier}, - #{gmtModified}, - #{isDelete} - ) + #{drugId}, + #{populationInfoId}, + #{startTime}, + #{control}, + #{controlPhone}, + #{help}, + #{helpPhone}, + #{charge}, + #{reason}, + #{reasonOther}, + #{consequence}, + #{creator}, + #{gmtCreate}, + #{modifier}, + #{gmtModified}, + #{isDelete} + ) diff --git a/src/main/resources/mybatis/mapper/petition/petition-mapper.xml b/src/main/resources/mybatis/mapper/petition/petition-mapper.xml index 67a7849..1ef85e4 100644 --- a/src/main/resources/mybatis/mapper/petition/petition-mapper.xml +++ b/src/main/resources/mybatis/mapper/petition/petition-mapper.xml @@ -311,7 +311,8 @@ t2.dictionary_name AS coordinate_name, t1.talk, t3.dictionary_name AS talk_name, - t1.petition_id + t1.petition_id, + t1.creator FROM population_petition t1 LEFT JOIN diff --git a/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml b/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml index 23d6a75..290ae5f 100644 --- a/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml +++ b/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml @@ -18,6 +18,7 @@ + @@ -95,6 +96,7 @@ + @@ -663,7 +665,8 @@ t1.is_disability, t1.is_military, t1.is_succour, - t1.is_party + t1.is_party, + t1.creator FROM population_population_info t1 WHERE @@ -1004,7 +1007,8 @@ t1.is_party, t1.party_organization, t1.party_time, - t1.othertext + t1.othertext, + t1.creator FROM population_population_info t1 WHERE diff --git a/src/main/resources/mybatis/mapper/release/release-mapper.xml b/src/main/resources/mybatis/mapper/release/release-mapper.xml index 35dce31..7c91950 100644 --- a/src/main/resources/mybatis/mapper/release/release-mapper.xml +++ b/src/main/resources/mybatis/mapper/release/release-mapper.xml @@ -71,21 +71,21 @@ gmt_modified, is_delete ) VALUES( - #{releaseId}, - #{populationInfoId}, - #{charge}, - #{prisonTerm}, - #{type}, - #{organization}, - #{superviseTime}, - #{isRelease}, - #{releaseTime}, - #{creator}, - #{gmtCreate}, - #{modifier}, - #{gmtModified}, - #{isDelete} - ) + #{releaseId}, + #{populationInfoId}, + #{charge}, + #{prisonTerm}, + #{type}, + #{organization}, + #{superviseTime}, + #{isRelease}, + #{releaseTime}, + #{creator}, + #{gmtCreate}, + #{modifier}, + #{gmtModified}, + #{isDelete} + ) @@ -229,25 +229,25 @@ SELECT - t1.security_id, - t1.population_info_id, - t1.charge, - t1.time, - t1.security_address, - t1.security_area_code, - t1.security_area_name, - t1.lat, - t1.lng, - t1.map_address, - t1.degree, - t1.creator, - t1.gmt_create, - t1.modifier, - t1.gmt_modified, - t1.is_delete, - t1.acceptance_population_info_id, - t1.acceptance_name, - t1.acceptance_idcard, - t1.acceptance_phone, - t1.handle_population_info_id, - t1.handle_name, - t1.handle_idcard, - t1.handle_phone + t1.security_id, + t1.population_info_id, + t1.charge, + t1.time, + t1.security_address, + t1.security_area_code, + t1.security_area_name, + t1.lat, + t1.lng, + t1.map_address, + t1.degree, + t1.creator, + t1.gmt_create, + t1.modifier, + t1.gmt_modified, + t1.is_delete, + t1.acceptance_population_info_id, + t1.acceptance_name, + t1.acceptance_idcard, + t1.acceptance_phone, + t1.handle_population_info_id, + t1.handle_name, + t1.handle_idcard, + t1.handle_phone, + t1.creator FROM - population_security t1 + population_security t1 WHERE - t1.is_delete = 0 + t1.is_delete = 0 AND t1.degree = #{degree}