src/main/java/org/springblade/modules/policeAlarmRecords/entity/PoliceAlarmRecordsEntity.java
@@ -62,7 +62,7 @@ private String phone; /** (刑事案件、治安案件、纠纷、救助、举报) */ @ApiModelProperty(value = "(刑事案件、治安案件、纠纷、救助、举报)", example = "") @ApiModelProperty(value = "(1.刑事案件、2.治安案件、3.纠纷、4.救助、5.举报)", example = "") @TableField("alarm_type") private String alarmType; src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -284,7 +284,9 @@ <select id="getPoliceUser" resultType="org.springblade.modules.system.entity.User"> SELECT bu.* bu.id, bu.name, bu.phone FROM blade_user bu where 1 = 1 @@ -298,7 +300,7 @@ - (bu.lng * 3.1415) / 180)) * 6370.996 ), 2) <= 1 and bu.role_id like concat('%','1727864411451359233','%') and bu.is_deleted = 0 and bu.is_deleted = 0 and limit 1 </select> src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -831,16 +831,16 @@ @Override public List<User> getPoliceUser(String longitude, String latitude, String houseCode) { List<User> policeUser = baseMapper.getPoliceUser(longitude, latitude); // todo 自动生成警单 if (StringUtils.isNotBlank(houseCode)) { IPoliceAlarmRecordsService policeAlarmRecordsService = SpringUtil.getBean(IPoliceAlarmRecordsService.class); PoliceAlarmRecordsEntity policeAlarmRecordsEntity = new PoliceAlarmRecordsEntity(); policeAlarmRecordsEntity.setHouseCode(houseCode); if (policeUser != null && policeUser.size() == 1) { policeAlarmRecordsEntity.setPoliceId(policeUser.get(0).getId()); } policeAlarmRecordsService.save(policeAlarmRecordsEntity); } // 自动生成警单 // if (StringUtils.isNotBlank(houseCode)) { // IPoliceAlarmRecordsService policeAlarmRecordsService = SpringUtil.getBean(IPoliceAlarmRecordsService.class); // PoliceAlarmRecordsEntity policeAlarmRecordsEntity = new PoliceAlarmRecordsEntity(); // policeAlarmRecordsEntity.setHouseCode(houseCode); // if (policeUser != null && policeUser.size() == 1) { // policeAlarmRecordsEntity.setPoliceId(policeUser.get(0).getId()); // } // policeAlarmRecordsService.save(policeAlarmRecordsEntity); // } return policeUser; } } src/main/java/org/springblade/modules/task/controller/TaskResidencePermitApplyController.java
@@ -104,7 +104,7 @@ /** * 居住证申请 审核 */ @PostMapping("/update") @PostMapping("/auditing") @ApiOperationSupport(order = 5) @ApiOperation(value = "审核", notes = "传入taskResidencePermitApply") public R updateResidencePermitApply(@Valid @RequestBody TaskResidencePermitApplyEntity taskResidencePermitApply) {