Skip to content

A
amos-boot-biz
Commit 9649611e authored by tangwei's avatar tangwei
Browse files
Options

修改bug

parent 710e493f
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 66 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/PersonBasicMapper.java
View file @ 9649611e
......@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.module.jxiop.api.dto.StationBasicDto;
import com.yeejoin.amos.boot.module.jxiop.api.dto.UserMapperDto;
import com.yeejoin.amos.boot.module.jxiop.api.entity.PersonBasic;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......@@ -17,27 +18,28 @@ import java.util.List;
public interface PersonBasicMapper extends BaseMapper<PersonBasic> {
List<UserMapperDto> queryPage(Long current, Long size,
String name,
String accountName,
String projectName,String orgCode);
List<UserMapperDto> queryPage(@Param("current") Long current, @Param("size") Long size,
@Param("name") String name,
@Param("accountName") String accountName,
@Param("projectName") String projectName,
@Param("orgCode") String orgCode);
List<UserMapperDto> queryPagecount(
String name,
String accountName,
String projectName,String orgCode);
@Param("name") String name,
@Param("accountName") String accountName,
@Param("projectName") String projectName,
@Param("orgCode") String orgCode);
int deleteList(String[] ids);
List<EXPersonUser> getEXPersonUser(String name,
String accountName,
String projectName,
String orgCode);
List<EXPersonUser> getEXPersonUser(@Param("name") String name,
@Param("accountName") String accountName,
@Param("projectName") String projectName,
@Param("orgCode") String orgCode);
List<EXPersonUser> getEXPersonUserAll(String name,
String accountName,
String projectName,
String orgCode);
List<EXPersonUser> getEXPersonUserAll(@Param("name") String name,
@Param("accountName") String accountName,
@Param("projectName") String projectName,
@Param("orgCode") String orgCode);
}
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/StationBasicMapper.java
View file @ 9649611e
......@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.module.jxiop.api.dto.ExStationBasicDto;
import com.yeejoin.amos.boot.module.jxiop.api.dto.StationBasicDto;
import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......@@ -16,24 +17,24 @@ import java.util.List;
*/
public interface StationBasicMapper extends BaseMapper<StationBasic> {
//分页
List<StationBasicDto> queryPage(Long current, Long size,
String stationMasterName,
String stationName,
String stationType,
String orgCode);
List<StationBasicDto> queryPage(@Param("current")Long current, @Param("size")Long size,
@Param("stationMasterName") String stationMasterName,
@Param("stationName") String stationName,
@Param("stationType")String stationType,
@Param("orgCode") String orgCode);
//统计
List<StationBasicDto> queryPagecount(
String stationMasterName,
String stationName,
String stationType,
String orgCode);
@Param("stationMasterName") String stationMasterName,
@Param("stationName")String stationName,
@Param("stationType")String stationType,
@Param("orgCode")String orgCode);
//删除
int deleteList(String[] ids);
//导出
List<ExStationBasicDto> getExStationBasicDto(String stationMasterName,
String stationName,
String stationType,
String orgCode);
List<ExStationBasicDto> getExStationBasicDto( @Param("stationMasterName") String stationMasterName,
@Param("stationName")String stationName,
@Param("stationType")String stationType,
@Param("orgCode")String orgCode);
}
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/StationBasicMapper.xml
View file @ 9649611e
......@@ -26,8 +26,8 @@
<if test="stationType != null and stationType != ''">
AND station_basic.station_type = #{stationType}
</if>
<if test="orgCoce != null and orgCoce != ''">
AND station_basic.project_org_code like concat('%',#{orgCoce},'%')
<if test="orgCode != null and orgCode != ''">
AND station_basic.project_org_code like concat('%',#{orgCode},'%')
</if>
</where>
ORDER BY station_basic.rec_date DESC
......@@ -50,8 +50,8 @@
<if test="stationType != null and stationType != ''">
AND station_basic.station_type = #{stationType}
</if>
<if test="orgCoce != null and orgCoce != ''">
AND station_basic.project_org_code like concat('%',#{orgCoce},'%')
<if test="orgCode != null and orgCode != ''">
AND station_basic.project_org_code like concat('%',#{orgCode},'%')
</if>
</where>
</select>
......@@ -96,8 +96,8 @@
<if test="stationType != null and stationType != ''">
AND station_basic.station_type = #{stationType}
</if>
<if test="orgCoce != null and orgCoce != ''">
AND station_basic.project_org_code like concat('%',#{orgCoce},'%')
<if test="orgCode != null and orgCode != ''">
AND station_basic.project_org_code like concat('%',#{orgCode},'%')
</if>
</where>
ORDER BY station_basic.rec_date DESC
......
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 @ 9649611e
......@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.jxiop.api.dto.ExStationBasicDto;
import com.yeejoin.amos.boot.module.jxiop.api.entity.*;
import com.yeejoin.amos.boot.module.jxiop.api.mapper.PersonBasicMapper;
import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -32,21 +33,21 @@ public class ExcelServiceImpl {
PersonBasicServiceImpl personBasicServiceImpl;
//
// @Autowired
// PersonBasicMapper personBasicMapper;
// @Autowired
// StationBasicMapper stationBasicMapper;
// //人员资质信息service
// @Autowired
// PersonCertificateServiceImpl personCertificateService;
// //人员教育信息
// @Autowired
// PersonSkillEducationServiceImpl personSkillEducationService;
// @Autowired
// PersonAccountServiceImpl personAccountServiceImpl;
@Autowired
PersonBasicMapper personBasicMapper;
@Autowired
StationBasicMapper stationBasicMapper;
//人员资质信息service
@Autowired
PersonCertificateServiceImpl personCertificateService;
//人员教育信息
@Autowired
PersonSkillEducationServiceImpl personSkillEducationService;
@Autowired
PersonAccountServiceImpl personAccountServiceImpl;
public void templateExport(HttpServletResponse response, ExcelDto excelDto, Map par) throws ClassNotFoundException {
String url = excelDto.getClassUrl();
......@@ -105,7 +106,11 @@ public class ExcelServiceImpl {
public List<ExStationBasicDto> getExStationBasicDto(Map<String,Object> map){
List<ExStationBasicDto> data=null;
if(!map.isEmpty()){
data=stationBasicServiceImpl.stationBasicMapper.getExStationBasicDto(map.get("stationMasterName").toString(),map.get("stationName").toString(),map.get("stationType").toString(),map.get("orgCode").toString());
data=stationBasicMapper.getExStationBasicDto(
map.containsKey("stationMasterName")? map.get("stationMasterName").toString():null,
map.containsKey("stationName")? map.get("stationName").toString():null,
map.containsKey("stationType")? map.get("stationType").toString():null,
map.containsKey("orgCode")? map.get("orgCode").toString():null);
}
return data;
......@@ -121,7 +126,11 @@ public class ExcelServiceImpl {
String[] type = fireChemical.getArea().split("@");
fireChemical.setAreaName(type[0]);
fireChemical.setArea(type[1]);
CompanyModel companyModel=personBasicServiceImpl.getCompanyModel(Long.parseLong(type[1]));
fireChemical.setProjectOrgCode(companyModel.getOrgCode());
}
excelEntityList.add(fireChemical);
});
stationBasicServiceImpl.saveBatch(excelEntityList);
......@@ -130,22 +139,22 @@ public class ExcelServiceImpl {
//获取人员数据
public List<EXPersonUser> getEXPersonUser(Map map){
List<EXPersonUser> listdata= personBasicServiceImpl.personBasicMapper.getEXPersonUser(
map.get("name").toString(),
map.get("accountName").toString(),
map.get("projectName").toString(),
map.get("orgCode").toString());
List<EXPersonUser> listdata= personBasicMapper.getEXPersonUser(
map.containsKey("name")? map.get("name").toString():null,
map.containsKey("accountName")? map.get("accountName").toString():null,
map.containsKey("projectName")?map.get("projectName").toString():null,
map.containsKey("orgCode")?map.get("orgCode").toString():null);
return listdata;
}
//人员导出
public List<EXPersonUser> getEXPersonUserAll(Map map){
List<EXPersonUser> listdata= personBasicServiceImpl.personBasicMapper.getEXPersonUserAll(
map.get("name").toString(),
map.get("accountName").toString(),
map.get("projectName").toString(),
map.get("orgCode").toString());
List<EXPersonUser> listdata= personBasicMapper.getEXPersonUserAll(
map.containsKey("name")? map.get("name").toString():null,
map.containsKey("accountName")? map.get("accountName").toString():null,
map.containsKey("projectName")?map.get("projectName").toString():null,
map.containsKey("orgCode")?map.get("orgCode").toString():null);
return listdata;
}
......@@ -167,27 +176,27 @@ private void updateEXPersonUser(MultipartFile multipartFile) throws Exception {
//根据平台账号获取用户id
QueryWrapper<PersonAccount> wrapper = new QueryWrapper();
wrapper.eq("account_name",exPersonUser.getAccountName());
PersonAccount personAccount=personBasicServiceImpl.personAccountService.getOne(wrapper);
PersonAccount personAccount=personAccountServiceImpl.getOne(wrapper);
//获取基本信息
PersonBasic personBasic = personBasicServiceImpl.personBasicMapper.selectById(personAccount.getPersonId());
PersonBasic personBasic = personBasicMapper.selectById(personAccount.getPersonId());
BeanUtils.copyProperties(exPersonUser, personBasic);
listPersonBasic.add(personBasic);
//人员技能
QueryWrapper<PersonSkillEducation> wrapper1 = new QueryWrapper();
wrapper1.eq("person_id",personAccount.getPersonId());
PersonSkillEducation personSkillEducation=personBasicServiceImpl.personSkillEducationService.getOne(wrapper1);
PersonSkillEducation personSkillEducation=personSkillEducationService.getOne(wrapper1);
BeanUtils.copyProperties(exPersonUser, personSkillEducation);
listPersonSkillEducation.add(personSkillEducation);
//人员资质
QueryWrapper<PersonCertificate> wrapper2 = new QueryWrapper();
wrapper2.eq("person_id",personAccount.getPersonId());
PersonCertificate personCertificate=personBasicServiceImpl.personCertificateService.getOne(wrapper2);
PersonCertificate personCertificate=personCertificateService.getOne(wrapper2);
BeanUtils.copyProperties(exPersonUser, personCertificate);
listPersonCertificate.add(personCertificate);
}
personBasicServiceImpl.saveOrUpdateBatch(listPersonBasic);
personBasicServiceImpl.personSkillEducationService.saveOrUpdateBatch(listPersonSkillEducation);
personBasicServiceImpl.personCertificateService.saveOrUpdateBatch(listPersonCertificate);
personSkillEducationService.saveOrUpdateBatch(listPersonSkillEducation);
personCertificateService.saveOrUpdateBatch(listPersonCertificate);
}
......
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