From 3222d83845148e2479af6aeb0f029def5f28f8b2 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 25 Mar 2024 12:34:53 +0800
Subject: [PATCH] Merge branch 'jc' of http://s16s652780.51mypc.cn:49896/r/zhba_management_w_bf into jc
---
src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java | 49 +++++++++++++++++++++++++++++--------------------
1 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java b/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
index a858a58..d176141 100644
--- a/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
+++ b/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
@@ -29,6 +29,7 @@
import org.springblade.modules.dispatcher.service.IDispatcherUnitService;
import org.springblade.modules.dispatcher.vo.DispatcherUnitVO;
import org.springblade.modules.dispatcher.vo.DispatcherVO;
+import org.springblade.modules.jurisdiction.service.JurisdictionService;
import org.springblade.modules.system.service.IUserDeptService;
import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.stereotype.Service;
@@ -54,7 +55,7 @@
private final IDispatcherService dispatcherService;
private final IUserDeptService userDeptService;
- private final MyAsyncService myAsyncService;
+ private final JurisdictionService jurisdictionService;
@Override
public IPage<DispatcherUnitVO> selectDispatcherUnitPage(IPage<DispatcherUnitVO> page, DispatcherUnitVO dispatcherUnitVO) {
@@ -64,6 +65,16 @@
dispatcherUnitVO1.setSnum(dispatcherService.getDispatcherCount(dispatcherUnitVO1));
});
return page.setRecords(dispatcherUnitVOS);
+ }
+
+ @Override
+ public List<DispatcherUnitVO> getAll(DispatcherUnitVO dispatcherUnit) {
+ List<DispatcherUnitVO> dispatcherUnitVOS = baseMapper.getAll(dispatcherUnit);
+ dispatcherUnitVOS.forEach(dispatcherUnitVO1 -> {
+ //查询派遣记录条数
+ dispatcherUnitVO1.setSnum(dispatcherService.getDispatcherCount(dispatcherUnitVO1));
+ });
+ return dispatcherUnitVOS;
}
/**
@@ -106,6 +117,11 @@
dispatcherUnit.setDeptId(Long.parseLong(deptId));
}
+ if (dispatcherUnitExcel.getJurisdiction() != null && dispatcherUnitExcel.getJurisdiction() != ""){
+ String jurisdiction = jurisdictionService.selectIn(dispatcherUnitExcel.getJurisdiction());
+ dispatcherUnit.setJurisdiction(jurisdiction);
+ }
+
if (dispatcherUnitExcel.getName() != null && dispatcherUnitExcel.getName() != "") {
//仅中文
// String chinese = "^[\\u4E00-\\u9FA5\\uF900-\\uFA2D]+$";
@@ -137,6 +153,18 @@
if (dispatcherUnitExcel.getNum() != null) {
dispatcherUnit.setNum(dispatcherUnitExcel.getNum());
}
+
+ if (dispatcherUnitExcel.getProfession() != null && dispatcherUnitExcel.getProfession() != ""){
+ dispatcherUnit.setProfession(dispatcherUnitExcel.getProfession());
+ }
+
+ if (dispatcherUnitExcel.getDistrict() != null && dispatcherUnitExcel.getDistrict() != ""){
+ dispatcherUnit.setDistrict(dispatcherUnitExcel.getDistrict());
+ }
+
+ dispatcherUnit.setLongitude(dispatcherUnitExcel.getLongitude());
+ dispatcherUnit.setLatitude(dispatcherUnitExcel.getLatitude());
+ dispatcherUnit.setAddress(dispatcherUnitExcel.getAddress());
dispatcherUnit.setStartTime(dispatcherUnitExcel.getStartTime());
dispatcherUnit.setEndTime(dispatcherUnitExcel.getEndTime());
@@ -171,25 +199,6 @@
//新增
this.save(dispatcherUnit);
-
- //数据同步
- String s1 =
- "insert into sys_dispatcher_unit(id,name,dept_id,linkman,phone,create_time,start_time,end_time," +
- "serve_type,security_linkman,cell,num,district) " +
- "values(" + "'" + dispatcherUnit.getId() + "'" + "," +
- "'" + dispatcherUnit.getName() + "'" + "," +
- "'" + dispatcherUnit.getDeptId() + "'" + "," +
- "'" + dispatcherUnit.getLinkman() + "'" + "," +
- "'" + dispatcherUnit.getPhone() + "'" + "," +
- "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(dispatcherUnit.getCreateTime()) + "'" + "," +
- "'" + new SimpleDateFormat("yyyy/MM/dd").format(dispatcherUnit.getStartTime()) + "'" + "," +
- "'" + new SimpleDateFormat("yyyy/MM/dd").format(dispatcherUnit.getEndTime()) + "'" + "," +
- "'" + dispatcherUnit.getServeType() + "'" + "," +
- "'" + dispatcherUnit.getSecurityLinkman() + "'" + "," +
- "'" + dispatcherUnit.getCell() + "'" + "," +
- "'" + dispatcherUnit.getNum() + "'" + "," +
- "'" + dispatcherUnit.getDistrict() + "'" + ")";
- myAsyncService.dataSync(s1);
});
}
}
--
Gitblit v1.9.3