From 8c031cc58fdce2af4bf0a95f36b89666672c4586 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 23 Jan 2024 13:02:30 +0800
Subject: [PATCH] 社区民警修改
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 4 +-
src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java | 52 ++++++++++++++-----------
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 2
src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml | 8 ++--
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml | 2
5 files changed, 37 insertions(+), 31 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
index 742a216..7fedafe 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -390,7 +390,7 @@
jczz_doorplate_address jda
LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
WHERE
- jc.res_police_user_id = #{userId})
+ jc.res_police_user_id like concat('%',#{userId},'%'))
)
</if>
) a
@@ -444,7 +444,7 @@
jczz_doorplate_address jda
LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
WHERE
- jc.res_police_user_id = #{userId})
+ jc.res_police_user_id like concat('%',#{userId},'%'))
)
</if>
) a
@@ -494,7 +494,7 @@
jczz_doorplate_address jda
LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
WHERE
- jc.res_police_user_id = #{userId})
+ jc.res_police_user_id like concat('%',#{userId},'%'))
)
</if>
</select>
@@ -545,7 +545,7 @@
jczz_doorplate_address jda
LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
WHERE
- jc.res_police_user_id = #{userId})
+ jc.res_police_user_id like concat('%',#{userId},'%'))
)
</if>
) a
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
index ecf8219..6e9472a 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -543,7 +543,7 @@
jczz_doorplate_address jda
LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
WHERE
- jc.res_police_user_id = #{userId})
+ jc.res_police_user_id like concat('%',#{userId},'%'))
)
</if>
) a
@@ -595,7 +595,7 @@
jczz_doorplate_address jda
LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
WHERE
- jc.res_police_user_id = #{userId})
+ jc.res_police_user_id like concat('%',#{userId},'%'))
)
</if>
GROUP BY age
diff --git a/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java b/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java
index 407d5c8..9ae7509 100644
--- a/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java
+++ b/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java
@@ -19,9 +19,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xxl.job.core.util.NetUtil;
import org.flowable.engine.RepositoryService;
import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.engine.repository.ProcessDefinitionQuery;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springblade.common.cache.SysCache;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.utils.SpringUtils;
@@ -65,7 +68,7 @@
*/
@Service
public class PropertyCapitalApplyServiceImpl extends ServiceImpl<PropertyCapitalApplyMapper, PropertyCapitalApplyEntity> implements IPropertyCapitalApplyService {
-
+ private static Logger logger = LoggerFactory.getLogger(NetUtil.class);
@Autowired
private IDeptService deptService;
@@ -73,7 +76,7 @@
@Override
public IPage<PropertyCapitalApplyVO> selectPropertyCapitalApplyPage(IPage<PropertyCapitalApplyVO> page, PropertyCapitalApplyVO propertyCapitalApply) {
List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
- Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
+ Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
// 判断角色，物业角色只能查询当前小区的
String userRole = AuthUtil.getUserRole();
if (userRole.contains("wygly")) {
@@ -85,7 +88,7 @@
return page.setRecords(new ArrayList<PropertyCapitalApplyVO>());
}
}
- return page.setRecords(baseMapper.selectPropertyCapitalApplyPage(page, propertyCapitalApply,regionChildCodesList,isAdministrator));
+ return page.setRecords(baseMapper.selectPropertyCapitalApplyPage(page, propertyCapitalApply, regionChildCodesList, isAdministrator));
}
@Autowired
@@ -125,39 +128,42 @@
User one4 = null;
// 查询街道责人
try {
- Region one2 = region.getOne(Wrappers.<Region>lambdaQuery().eq(Region::getCode, one1.getCommunityCode().substring(0, 9)));
+ Region one2 = region.getOne(Wrappers.<Region>lambdaQuery().eq(Region::getCode, one1.getCommunityCode().substring(0, 9) + "000"));
Dept one3 = dept.getOne(Wrappers.<Dept>lambdaQuery().eq(Dept::getDeptName, one2.getName()));
one4 = user.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, one3.getId())
.eq(User::getRoleId, "1729814500990304258")
.eq(User::getIsDeleted, 0)
.last("limit 1"));
} catch (Exception e) {
+ logger.error("街道信息不存在", e);
throw new ServiceException("街道信息不存在");
}
// 查询信州区住建局负责人
- User user4 = null;
- try {
-// Region region2 = region.getOne(Wrappers.<Region>lambdaQuery().eq(Region::getCode, one1.getCommunityCode().substring(0, 6)));
- Dept dept3 = dept.getOne(Wrappers.<Dept>lambdaQuery().eq(Dept::getDeptName, "信州区" + "住建局").last("limit 1"));
- user4 = user.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, dept3.getId())
- .eq(User::getRoleId, "1738072768615333890")
- .eq(User::getIsDeleted, 0)
- .last("limit 1"));
- } catch (Exception e) {
- throw new ServiceException("住建局信息不存在");
- }
-
- // 查询上饶市住建局负责人
User user5 = null;
try {
// Region region2 = region.getOne(Wrappers.<Region>lambdaQuery().eq(Region::getCode, one1.getCommunityCode().substring(0, 6)));
- Dept dept3 = dept.getOne(Wrappers.<Dept>lambdaQuery().eq(Dept::getDeptName, "上饶市" + "住建局").last("limit 1"));
+ Dept dept3 = dept.getOne(Wrappers.<Dept>lambdaQuery().eq(Dept::getDeptName, "信州区" + "住建局").last("limit 1"));
user5 = user.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, dept3.getId())
.eq(User::getRoleId, "1738072768615333890")
.eq(User::getIsDeleted, 0)
.last("limit 1"));
} catch (Exception e) {
- throw new ServiceException("住建局信息不存在");
+ logger.error("信州区住建局信息不存在", e);
+ throw new ServiceException("信州区住建局信息不存在");
+ }
+
+ // 查询上饶市住建局负责人
+ User user6 = null;
+ try {
+// Region region2 = region.getOne(Wrappers.<Region>lambdaQuery().eq(Region::getCode, one1.getCommunityCode().substring(0, 6)));
+ Dept dept3 = dept.getOne(Wrappers.<Dept>lambdaQuery().eq(Dept::getDeptName, "上饶市" + "住建局").last("limit 1"));
+ user6 = user.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, dept3.getId())
+ .eq(User::getRoleId, "1738072768615333890")
+ .eq(User::getIsDeleted, 0)
+ .last("limit 1"));
+ } catch (Exception e) {
+ logger.error("上饶市住建局信息不存在", e);
+ throw new ServiceException("上饶市住建局信息不存在");
}
Kv variables = null;
ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery().latestVersion().orderByProcessDefinitionKey().asc();
@@ -171,8 +177,8 @@
.set(ProcessConstant.TASK_VARIABLE_CREATE_USER, AuthUtil.getUserName())
.set("ownersCommitteeUser", TaskUtil.getTaskUser(one.getPrincipalId().toString()))
.set("streetUser", TaskUtil.getTaskUser(one4.getId().toString()))
- .set("constructionUser", TaskUtil.getTaskUser(user4.getId().toString()))
- .set("srConstructionUser", TaskUtil.getTaskUser(user5.getId().toString()))
+ .set("constructionUser", TaskUtil.getTaskUser(user5.getId().toString()))
+ .set("srConstructionUser", TaskUtil.getTaskUser(user6.getId().toString()))
.set("applyUser", TaskUtil.getTaskUser(AuthUtil.getUserId().toString()))
.set("ownersCommitteeFlag", ownersCommitteeFlag);
} else {
@@ -189,8 +195,8 @@
variables = Kv.create()
.set(ProcessConstant.TASK_VARIABLE_CREATE_USER, AuthUtil.getUserName())
.set("streetUser", TaskUtil.getTaskUser(one4.getId().toString()))
- .set("constructionUser", TaskUtil.getTaskUser(user4.getId().toString()))
- .set("srConstructionUser", TaskUtil.getTaskUser(user5.getId().toString()))
+ .set("constructionUser", TaskUtil.getTaskUser(user5.getId().toString()))
+ .set("srConstructionUser", TaskUtil.getTaskUser(user6.getId().toString()))
.set("applyUser", TaskUtil.getTaskUser(AuthUtil.getUserId().toString()))
.set("ownersCommitteeFlag", ownersCommitteeFlag);
}
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
index 96da614..f720301 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -216,7 +216,7 @@
AND jt.report_type in (2,3,6)
</if>
<if test="task.userId != null and task.userId != ''">
- AND jc.res_police_user_id = #{task.userId}
+ AND jc.res_police_user_id like concat('%',#{task.userId},'%')
</if>
<if test="isAdministrator==2">
<choose>
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
index 3037f1a..8fcc846 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
@@ -258,7 +258,7 @@
jczz_doorplate_address jda
LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
WHERE
- jc.res_police_user_id = #{userId})
+ jc.res_police_user_id like concat('%',#{userId},'%'))
)
</if>
</select>
--
Gitblit v1.9.3