Commit 7b467d17 authored by 赵啸非's avatar 赵啸非

事项添加区域字段

parent 4f61fc70
...@@ -289,3 +289,10 @@ ALTER TABLE mortals_sys_workman ADD COLUMN `deleted` tinyint(2) DEFAULT '0' ...@@ -289,3 +289,10 @@ ALTER TABLE mortals_sys_workman ADD COLUMN `deleted` tinyint(2) DEFAULT '0'
-- ---------------------------- -- ----------------------------
ALTER TABLE mortals_sys_window ADD COLUMN `fileName` varchar (256) default "" COMMENT '附件名称' AFTER englishNameDesc; ALTER TABLE mortals_sys_window ADD COLUMN `fileName` varchar (256) default "" COMMENT '附件名称' AFTER englishNameDesc;
ALTER TABLE mortals_sys_window ADD COLUMN `filePath` varchar (256) default "" COMMENT '附件地址' AFTER fileName; ALTER TABLE mortals_sys_window ADD COLUMN `filePath` varchar (256) default "" COMMENT '附件地址' AFTER fileName;
-- ----------------------------
-- 2025-3-17
-- ----------------------------
ALTER TABLE mortals_sys_matter ADD COLUMN `areaName` varchar(255) COMMENT '区域名称';
ALTER TABLE mortals_sys_matter ADD COLUMN `areaLevel` tinyint(2) COMMENT '区域等级(1.省,2.地市州,3.区县,4.街道,5.社区)';
...@@ -23,6 +23,8 @@ import com.mortals.xhx.common.code.SourceEnum; ...@@ -23,6 +23,8 @@ import com.mortals.xhx.common.code.SourceEnum;
import com.mortals.xhx.common.code.YesNoEnum; import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.utils.BeanUtil; import com.mortals.xhx.common.utils.BeanUtil;
import com.mortals.xhx.common.utils.MatterDetailHtmlParseUtil; import com.mortals.xhx.common.utils.MatterDetailHtmlParseUtil;
import com.mortals.xhx.module.area.model.AreaEntity;
import com.mortals.xhx.module.area.service.AreaService;
import com.mortals.xhx.module.base.model.BaseAreaEntity; import com.mortals.xhx.module.base.model.BaseAreaEntity;
import com.mortals.xhx.module.base.model.BaseAreaQuery; import com.mortals.xhx.module.base.model.BaseAreaQuery;
import com.mortals.xhx.module.base.service.BaseAreaService; import com.mortals.xhx.module.base.service.BaseAreaService;
...@@ -120,6 +122,8 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter ...@@ -120,6 +122,8 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
private BaseAreaService baseAreaService; private BaseAreaService baseAreaService;
@Autowired @Autowired
private BusinessMatterService businessMatterService; private BusinessMatterService businessMatterService;
@Autowired
private AreaService areaService;
@Override @Override
...@@ -134,9 +138,21 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter ...@@ -134,9 +138,21 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
} }
} }
updateAreaInfo(entity);
super.saveBefore(entity, context); super.saveBefore(entity, context);
} }
private void updateAreaInfo(MatterEntity entity) {
if (!ObjectUtils.isEmpty(entity.getAreaCode())) {
AreaEntity areCache = areaService.getExtCache(entity.getAreaCode());
if (!ObjectUtils.isEmpty(areCache)) {
entity.setAreaLevel(areCache.getAreaLevel());
entity.setAreaName(areCache.getName());
}
}
}
/** /**
* @param entity * @param entity
* @param context * @param context
...@@ -161,11 +177,13 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter ...@@ -161,11 +177,13 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
siteThemeMatterService.save(siteThemeMatterEntity, context); siteThemeMatterService.save(siteThemeMatterEntity, context);
} }
super.saveAfter(entity, context); super.saveAfter(entity, context);
} }
@Override @Override
protected void updateBefore(MatterEntity entity, Context context) throws AppException { protected void updateBefore(MatterEntity entity, Context context) throws AppException {
updateAreaInfo(entity);
if (SourceEnum.自定义.getValue().equals(entity.getSource())) { if (SourceEnum.自定义.getValue().equals(entity.getSource())) {
if (!ObjectUtils.isEmpty(entity.getSiteId())) { if (!ObjectUtils.isEmpty(entity.getSiteId())) {
SiteEntity siteEntity = siteService.get(entity.getSiteId(), context); SiteEntity siteEntity = siteService.get(entity.getSiteId(), context);
...@@ -1763,8 +1781,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter ...@@ -1763,8 +1781,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
public static void main(String[] args) { public static void main(String[] args) {
String sss = "实施主体性质:法定机关 是否进驻政务大厅:是 村居社区名称:无 权力来源:法定本级行使 村居社区代码:无 法定时限办结说明:自受理之日起,在法定期限内办结 行使层级:县级 到办事现场次数:0 网办类型:全程网办 实施主体:邛崃市司法局 是否网办:是 监督投诉方式:投诉电话:028-12345,028-88794281; 事项类型:公共服务 行使方式:依申请行使 承诺时限办结说明:自受理之日起,在承诺期限内办结 是否支持全省就近取件:否 是否支持预约办理:否 事项版本:16 联办机构:无 办件类型:即办件 通办范围:全省 是否支持上门收取申请材料:无 是否支持自助终端办理:否";
String sss="实施主体性质:法定机关 是否进驻政务大厅:是 村居社区名称:无 权力来源:法定本级行使 村居社区代码:无 法定时限办结说明:自受理之日起,在法定期限内办结 行使层级:县级 到办事现场次数:0 网办类型:全程网办 实施主体:邛崃市司法局 是否网办:是 监督投诉方式:投诉电话:028-12345,028-88794281; 事项类型:公共服务 行使方式:依申请行使 承诺时限办结说明:自受理之日起,在承诺期限内办结 是否支持全省就近取件:否 是否支持预约办理:否 事项版本:16 联办机构:无 办件类型:即办件 通办范围:全省 是否支持上门收取申请材料:无 是否支持自助终端办理:否";
String s = StrUtil.replaceChars(sss, ",", ","); String s = StrUtil.replaceChars(sss, ",", ",");
System.out.println(s); System.out.println(s);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment