Skip to content

A
amos-boot-biz
Commit 6a09e0a4 authored by tangwei's avatar tangwei
Browse files
Options

解决冲突

parents 512fab2b f9fd27de
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 24 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/PersonAccountDto.java
View file @ 6a09e0a4
......@@ -52,10 +52,6 @@ public class PersonAccountDto extends BaseDto {
@JsonFormat(pattern = "yyyy-MM-dd")
private Date stationWorkTime;
@ApiModelProperty(value = "岗位")
private String postName;
@ApiModelProperty(value = "姓名")
private String name;
......
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/StationBasicDto.java
View file @ 6a09e0a4
......@@ -74,6 +74,12 @@ public class StationBasicDto extends BaseDto {
@ApiModelProperty(value = "所属地区名称")
private String areaName;
@ApiModelProperty(value = "组织机构")
private String orgCode;
@ApiModelProperty(value = "岗位")
private String postName;
private List<StationCoordinateDto> stationCoordinate;
......
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/StationBasic.java
View file @ 6a09e0a4
......@@ -123,8 +123,9 @@ public class StationBasic extends BaseEntity {
@TableField("area")
private String area;
@TableField("org_code")
private String orgCode;
@TableField(exist =false)
private List<StationCoordinate> stationCoordinate;
}
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/PersonBasicMapper.java
View file @ 6a09e0a4
......@@ -20,12 +20,12 @@ public interface PersonBasicMapper extends BaseMapper<PersonBasic> {
List<UserMapperDto> queryPage(Long current, Long size,
String name,
String accountName,
String projectName);
String projectName,String orgCode);
List<UserMapperDto> queryPagecount(
String name,
String accountName,
String projectName);
String projectName,String orgCode);
int deleteList(String[] ids);
......
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/StationBasicMapper.java
View file @ 6a09e0a4
......@@ -19,18 +19,21 @@ public interface StationBasicMapper extends BaseMapper<StationBasic> {
List<StationBasicDto> queryPage(Long current, Long size,
String stationMasterName,
String stationName,
String stationType);
String stationType,
String orgCode);
//统计
List<StationBasicDto> queryPagecount(
String stationMasterName,
String stationName,
String stationType);
String stationType,
String orgCode);
//删除
int deleteList(String[] ids);
//导出
List<ExStationBasicDto> getExStationBasicDto(String stationMasterName,
String stationName,
String stationType);
String stationType,
String orgCode);
}
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/PersonBasicMapper.xml
View file @ 6a09e0a4
......@@ -9,17 +9,20 @@
select
person_basic.sequence_nbr sequenceNbr,
person_basic.head_photo headphoto,
person_basic.`name` name,
person_account.`name` name,
person_basic.sex,
person_basic.phone phone,
person_account.project_name projectName,
person_account.post_name postName,
person_basic.post_name postName,
person_account.account_name accountName
from person_basic
LEFT JOIN person_account
on person_account.person_id=person_basic.sequence_nbr
<where>
person_basic.is_delete=0
<if test="orgCode != null and orgCode != ''">
AND person_basic.org_code like concat('%',#{orgCode},'%')
</if>
<if test="name != null and name != ''">
AND person_basic.name like concat('%',#{name},'%')
</if>
......@@ -43,6 +46,9 @@
on person_account.person_id=person_basic.sequence_nbr
<where>
person_basic.is_delete=0
<if test="orgCode != null and orgCode != ''">
AND person_basic.org_code like concat('%',#{orgCode},'%')
</if>
<if test="name != null and name != ''">
AND person_basic.name like concat('%',#{name},'%')
</if>
......
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/StationBasicMapper.xml
View file @ 6a09e0a4
......@@ -26,6 +26,9 @@
<if test="stationType != null and stationType != ''">
AND station_basic.station_type = #{stationType}
</if>
<if test="orgCoce != null and orgCoce != ''">
AND station_basic.org_code like concat('%',#{orgCoce},'%')
</if>
</where>
ORDER BY station_basic.rec_date DESC
limit #{current},#{size}
......@@ -47,6 +50,9 @@
<if test="stationType != null and stationType != ''">
AND station_basic.station_type = #{stationType}
</if>
<if test="orgCoce != null and orgCoce != ''">
AND station_basic.org_code like concat('%',#{orgCoce},'%')
</if>
</where>
</select>
......@@ -90,6 +96,9 @@
<if test="stationType != null and stationType != ''">
AND station_basic.station_type = #{stationType}
</if>
<if test="orgCoce != null and orgCoce != ''">
AND station_basic.org_code like concat('%',#{orgCoce},'%')
</if>
</where>
ORDER BY station_basic.rec_date DESC
</select>
......
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/PersonBasicController.java
View file @ 6a09e0a4
......@@ -132,7 +132,8 @@ public class PersonBasicController extends BaseController {
@RequestParam(value = "size") int size,
@RequestParam(value = "name",required = false) String name,
@RequestParam(value = "accountName",required = false)String accountName,
@RequestParam(value = "projectName",required = false)String projectName
@RequestParam(value = "projectName",required = false)String projectName,
@RequestParam(value = "orgCode",required = false)String orgCode
) {
Page<UserMapperDto> page = new Page<UserMapperDto>();
......@@ -140,7 +141,7 @@ public class PersonBasicController extends BaseController {
page.setSize(size);
return ResponseHelper.buildResponse(personBasicServiceImpl.queryPage(page, name,
accountName,
projectName));
projectName,orgCode));
}
......
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/StationBasicController.java
View file @ 6a09e0a4
......@@ -105,7 +105,8 @@ public class StationBasicController extends BaseController {
@RequestParam(value = "size") int size,
@RequestParam(value = "stationMasterName",required = false) String stationMasterName,
@RequestParam(value = "stationName",required = false)String stationName,
@RequestParam(value = "stationType",required = false)String stationType
@RequestParam(value = "stationType",required = false)String stationType,
@RequestParam(value = "orgCode",required = false)String orgCode
) {
Page<StationBasicDto> page = new Page<StationBasicDto>();
......@@ -113,7 +114,9 @@ public class StationBasicController extends BaseController {
page.setSize(size);
return ResponseHelper.buildResponse(stationBasicServiceImpl.queryPage(page, stationMasterName,
stationName,
stationType));
stationType,
orgCode
));
}
/**
......
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/ExcelServiceImpl.java
View file @ 6a09e0a4
......@@ -84,7 +84,7 @@ public class ExcelServiceImpl {
public List<ExStationBasicDto> getExStationBasicDto(Map<String,Object> map){
List<ExStationBasicDto> data=null;
if(!map.isEmpty()){
data=stationBasicMapper.getExStationBasicDto(map.get("stationMasterName").toString(),map.get("stationName").toString(),map.get("stationType").toString());
data=stationBasicMapper.getExStationBasicDto(map.get("stationMasterName").toString(),map.get("stationName").toString(),map.get("stationType").toString(),map.get("orgCode").toString());
}
return data;
......
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java
View file @ 6a09e0a4
......@@ -344,14 +344,14 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
public Page<UserMapperDto> queryPage(Page<UserMapperDto> page,
String name,
String accountName,
String projectName) {
String projectName,String orgCode) {
List<UserMapperDto> list=personBasicMapper.queryPage((page.getCurrent()-1) * page.getSize(),page.getSize(), name,
accountName,
projectName);
projectName,orgCode);
List<UserMapperDto> listcount=personBasicMapper.queryPagecount( name,
accountName,
projectName);
projectName,orgCode);
page.setTotal(listcount.size());
page.setRecords(list);
return page;
......
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/StationBasicServiceImpl.java
View file @ 6a09e0a4
......@@ -50,13 +50,16 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
public Page<StationBasicDto> queryPage(Page<StationBasicDto> page,
String stationMasterName,
String stationName,
String stationType) {
String stationType,
String orgCode
) {
List<StationBasicDto> list=stationBasicMapper.queryPage((page.getCurrent()-1) * page.getSize(),page.getSize(), stationMasterName,
stationName,
stationType);
stationType,orgCode);
List<StationBasicDto> listcount=stationBasicMapper.queryPagecount( stationMasterName,
stationName,
stationType);
stationType,
orgCode);
page.setTotal(listcount.size());
page.setRecords(list);
return page;
......@@ -85,6 +88,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
//单位
companyModel=personBasicServiceImpl.getCompanyModel(Long.parseLong(stationBasic.getArea()));
stationBasic.setAreaName(companyModel.getCompanyName());
stationBasic.setOrgCode(companyModel.getOrgCode());
//场站基本信息
this.save(stationBasic);
......@@ -111,6 +115,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
//单位
companyModel=personBasicServiceImpl.getCompanyModel(Long.parseLong(stationBasic.getArea()));
stationBasic.setAreaName(companyModel.getCompanyName());
stationBasic.setOrgCode(companyModel.getOrgCode());
//场站基本信息
stationBasicMapper.updateById(stationBasic);
......
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