admin/wisdomisitezw_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

接口调整

Browse Source
This commit is contained in:
pengjie 2023-03-29 18:22:55 +08:00
parent f5c7dcefce
commit 42bb1af755
22 changed files with 182 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/zhgd/xmgl/config/MyWebMvcConfigurerAdapter.java
View File

@ -4,10 +4,7 @@ import com.license.entity.dto.LicenseCheckInterceptor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.Ordered;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import org.springframework.web.servlet.config.annotation.*;
/**
* @program: diseaseManage
@ -28,6 +25,7 @@ class MyWebMvcConfigurerAdapter implements WebMvcConfigurer {
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
// 文件路径映射
//log.info("+++++++++++++++++++++++++++++++++++++++++++++++++++:"+env.getProperty("basePath"));
String staticMapping = "/image/**";
String localDirectory = "file:" + path;
@ -35,6 +33,11 @@ class MyWebMvcConfigurerAdapter implements WebMvcConfigurer {
//WebMvcConfigurer.super.addResourceHandlers(registry);
}
// @Override
// public void configurePathMatch(PathMatchConfigurer configurer) {
// configurer.addPathPrefix("/v1", c -> c.getPackage().getName().contains("modules.basicdata.controller"));
// }
@Override
public void addViewControllers(ViewControllerRegistry registry) {
registry.addViewController("/document/").setViewName("forward:/document/index.html");

9
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringController.java
View File

@ -10,6 +10,7 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.jeecg.common.util.PageUtil;
import com.zhgd.xmgl.modules.basicdata.entity.Engineering;
import com.zhgd.xmgl.modules.basicdata.service.IEngineeringService;
import com.zhgd.xmgl.modules.basicdata.vo.EngineeringVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@ -136,14 +137,14 @@ public class GovEngineeringController {
@ApiOperation(value = "通过id查询项目工程详细信息", notes = "通过id查询项目工程详细信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "项目工程表ID", paramType = "query", required = true, dataType = "Integer")
@PostMapping(value = "/queryDetailById")
public Result<Engineering> queryDetailById(@RequestBody Engineering engineeringEntity) {
Result<Engineering> result = new Result<Engineering>();
public Result<EngineeringVo> queryDetailById(@RequestBody Engineering engineeringEntity) {
Result<EngineeringVo> result = new Result<EngineeringVo>();
Engineering engineering = engineeringService.getById(engineeringEntity.getId());
if (engineering == null) {
result.error500("未找到对应实体");
} else {
engineering = engineeringService.queryDetailById(engineering);
result.setResult(engineering);
EngineeringVo engineeringVo = engineeringService.queryDetailById(engineeringEntity.getId());
result.setResult(engineeringVo);
result.setSuccess(true);
}
return result;

18
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EngineeringController.java
View File

@ -80,17 +80,21 @@ public class EngineeringController {
/**
* 再次申请
*
* @param engineering
* @return
*/
@OperLog(operModul = "工程管理", operType = "修改", operDesc = "再次申请")
@ApiOperation(value = " 再次申请", notes = "再次申请", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "工程ID", paramType = "query", required = true, dataType = "Integer")
@OperLog(operModul = "工程管理", operType = "修改", operDesc = "重新提交申请")
@ApiOperation(value = " 重新提交申请", notes = "重新提交申请", httpMethod = "POST")
@PostMapping(value = "/edit")
public Result<Engineering> edit(@RequestBody Engineering engineering) {
public Result<Engineering> edit(@RequestBody EngineeringVo engineeringVo) {
Result<Engineering> result = new Result<Engineering>();
engineeringService.updateInfo(engineering);
result.success("添加成功！");
Engineering engineering = engineeringService.getById(engineeringVo.getId());
if(engineering==null) {
result.error500("未找到对应实体");
}else {
engineeringVo.setExamineState(engineering.getExamineState());
engineeringService.updateInfo(engineeringVo);
result.success("操作成功！");
}
return result;
}

9
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/ProjectController.java
View File

@ -18,10 +18,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.Map;
@ -168,8 +165,8 @@ public class ProjectController {
* @return
*/
@OperLog(operModul = "项目管理", operType = "列表查询", operDesc = "查询当前账号对应的项目信息")
@ApiOperation(value = " 查询当前账号对应的项目信息", notes = "查询当前账号对应的项目信息", httpMethod = "POST")
@PostMapping(value = "/queryBySelf")
@ApiOperation(value = " 查询当前账号对应的项目信息", notes = "查询当前账号对应的项目信息", httpMethod = "GET")
@GetMapping(value = "/queryBySelf")
public Result<Project> queryBySelf() {
Result<Project> result = new Result<Project>();
SecurityUser user = SecurityUtil.getUser();

15
src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Engineering.java
View File

@ -47,13 +47,6 @@ public class Engineering implements Serializable {
@ApiModelProperty(value = "工程sn")
private String engineeringSn;
/**
* 项目名称
*/
@Excel(name = "项目名称", width = 15)
@ApiModelProperty(value = "项目名称")
private String projectName;
/**
* 工程名称
*/
@ -155,7 +148,9 @@ public class Engineering implements Serializable {
/**
* 施工许可发放时间
*/
@Excel(name = "施工许可发放时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "施工许可发放时间", width = 20, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "施工许可发放时间")
private Date licenseCreateTime;
/**
@ -262,6 +257,10 @@ public class Engineering implements Serializable {
@ApiModelProperty(value = "驳回原因")
private String rejectReason;
@TableField(exist = false)
@ApiModelProperty(value = "项目名称")
private String projectName;
/**
* 单体工程
*/

7
src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringMain.java
View File

@ -49,6 +49,13 @@ public class EngineeringMain implements Serializable {
@ApiModelProperty(value = "类型(1:建设;2:监理;3:施工;4:勘察;5:设计;)")
private Integer type;
/**
* 承包类型
*/
@Excel(name = "承包类型", width = 15)
@ApiModelProperty(value = "承包类型")
private String contractType;
@TableField(exist = false)
@ApiModelProperty(value = "项目主体责任人")
private List<EngineeringMainPerson> engineeringMainPersonList;

8
src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringMainPerson.java
View File

@ -33,7 +33,13 @@ public class EngineeringMainPerson implements Serializable {
*/
@Excel(name = "工程责任主体id", width = 15)
@ApiModelProperty(value = "工程责任主体id")
private Long engineeringMainId;
private Long mainId;
/**
* 工程sn
*/
@Excel(name = "工程sn", width = 15)
@ApiModelProperty(value = "工程sn")
private String engineeringSn;
/**
* 姓名
*/

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EngineeringMainMapper.java
View File

@ -16,4 +16,6 @@ import java.util.List;
public interface EngineeringMainMapper extends BaseMapper<EngineeringMain> {
List<EngineeringMain> getByEngineeringSn(List<String> engineeringSns);
List<EngineeringMain> getList(String engineeringSn);
}

3
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EngineeringMapper.java
View File

@ -8,6 +8,7 @@ import com.zhgd.annotation.DataScope;
import com.zhgd.xmgl.modules.basicdata.dto.EngineeringDeviceDto;
import com.zhgd.xmgl.modules.basicdata.entity.Engineering;
import com.zhgd.xmgl.modules.basicdata.statistics.EngineeringStat;
import com.zhgd.xmgl.modules.basicdata.vo.EngineeringVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -30,4 +31,6 @@ public interface EngineeringMapper extends BaseMapper<Engineering> {
Page<EngineeringDeviceDto> pageListForSuperior(Page page, @Param(Constants.WRAPPER) Wrapper<Engineering> wrapper);
Page<EngineeringStat> engineeringStat(Page page, @Param(Constants.WRAPPER) Wrapper<Engineering> wrapper);
EngineeringVo getDetail(Long engineeringId);
}

3
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EnterpriseMainMapper.java
View File

@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zhgd.xmgl.modules.basicdata.entity.EnterpriseMain;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* @Description: 企业主体
* @author： pds
@ -15,5 +13,4 @@ import java.util.List;
@Mapper
public interface EnterpriseMainMapper extends BaseMapper<EnterpriseMain> {
List<EnterpriseMain> getList(String enterpriseSn);
}

6
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMainMapper.xml
View File

@ -9,4 +9,10 @@
#{item}
</foreach>
</select>
<select id="getList" resultType="com.zhgd.xmgl.modules.basicdata.entity.EngineeringMain">
SELECT m.*, e.enterprise_name, e.credit_code, e.legal_person, e.legal_person_tel FROM engineering_main m
LEFT JOIN enterprise e ON m.enterprise_sn = e.enterprise_sn
WHERE m.enterprise_sn = #{enterpriseSn}
</select>
</mapper>

4
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMapper.xml
View File

@ -21,4 +21,8 @@
FROM engineering e
${ew.customSqlSegment}
</select>
<select id="getDetail" resultType="com.zhgd.xmgl.modules.basicdata.vo.EngineeringVo">
SELECT e.*, p.project_name FROM engineering e left join project p on e.project_sn = p.project_sn where e.engineering_id = #{engineeringId}
</select>
</mapper>

7
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EnterpriseMainMapper.xml
View File

@ -1,11 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.EnterpriseMainMapper">
<select id="getList" resultType="com.zhgd.xmgl.modules.basicdata.entity.EnterpriseMain">
SELECT m.*, e.enterprise_ame, e.credit_code, e.legal_person, e.legal_person_tel FROM enterprise_main m
LEFT JOIN enterprise e
ON m.enterprise_sn = e.enterprise_sn
WHERE m.enterprise_sn = #{enterpriseSn}
</select>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEngineeringMainService.java
View File

@ -15,4 +15,6 @@ public interface IEngineeringMainService extends IService<EngineeringMain> {
List<EngineeringMain> getByEngineeringSn(List<String> engineeringSn);
List<EngineeringMain> getList(String engineeringSn);
}

4
src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEngineeringService.java
View File

@ -30,11 +30,11 @@ public interface IEngineeringService extends IService<Engineering> {
List<String> getSnListByEnterprise(String enterpriseSn);
Engineering queryDetailById(Engineering engineering);
EngineeringVo queryDetailById(Long engineeringId);
Page<EngineeringDeviceDto> pageListForSuperior(Map<String, Object> map);
boolean updateInfo(Engineering engineering);
boolean updateInfo(EngineeringVo engineeringVo);
Page<EngineeringStat> engineeringStat(Page page, Wrapper<Engineering> wrapper);
}

5
src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEngineeringSingleService.java
View File

@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.basicdata.service;
import com.zhgd.xmgl.modules.basicdata.entity.EngineeringSingle;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zhgd.xmgl.modules.basicdata.vo.EngineeringVo;
/**
* @Description: 单体工程表
@ -11,4 +12,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IEngineeringSingleService extends IService<EngineeringSingle> {
boolean saveDetail(EngineeringVo engineeringVo);
boolean delDetail(String engineeringSn);
}

4
src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEnterpriseMainService.java
View File

@ -3,8 +3,6 @@ package com.zhgd.xmgl.modules.basicdata.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zhgd.xmgl.modules.basicdata.entity.EnterpriseMain;
import java.util.List;
/**
* @Description: 企业主体
* @author： pds
@ -12,6 +10,4 @@ import java.util.List;
* @version： V1.0
*/
public interface IEnterpriseMainService extends IService<EnterpriseMain> {
List<EnterpriseMain> getList(String enterpriseSn);
}

5
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringMainServiceImpl.java
View File

@ -22,4 +22,9 @@ public class EngineeringMainServiceImpl extends ServiceImpl<EngineeringMainMappe
public List<EngineeringMain> getByEngineeringSn(List<String> engineeringSn) {
return baseMapper.getByEngineeringSn(engineeringSn);
}
@Override
public List<EngineeringMain> getList(String engineeringSn) {
return baseMapper.getList(engineeringSn);
}
}

78
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java
View File

@ -44,15 +44,18 @@ public class EngineeringServiceImpl extends ServiceImpl<EngineeringMapper, Engin
@Autowired
private IEngineeringSingleService engineeringSingleService;
@Autowired
private IAnnexFileService engineeringFileService;
@Autowired
private IEngineeringMainService engineeringMainService;
@Autowired
private IEngineeringMainPersonService engineeringMainPersonService;
@Autowired
private IAnnexFileService annexFileService;
@Autowired
private ISystemUserService systemUserService;
@Override
public Page<Engineering> getPageList(Page page, Wrapper<Engineering> wrapper) {
Page<Engineering> pageList = this.page(page, wrapper);
@ -83,12 +86,14 @@ public class EngineeringServiceImpl extends ServiceImpl<EngineeringMapper, Engin
}
@Override
public boolean updateInfo(Engineering engineering) {
LambdaUpdateWrapper<Engineering> wrapper = Wrappers.<Engineering>lambdaUpdate();
wrapper.set(Engineering::getExamineState, 1);
wrapper.set(Engineering::getRejectReason, "");
wrapper.eq(Engineering::getId, engineering.getId());
return this.update(wrapper);
public boolean updateInfo(EngineeringVo engineeringVo) {
if (engineeringVo.getExamineState() != 3) {
engineeringVo.setExamineState(1);
engineeringVo.setRejectReason("");
}
this.updateById(engineeringVo);
engineeringSingleService.delDetail(engineeringVo.getEngineeringSn());
return engineeringSingleService.saveDetail(engineeringVo);
}
@Override
@ -99,23 +104,7 @@ public class EngineeringServiceImpl extends ServiceImpl<EngineeringMapper, Engin
engineeringVo.setProjectSn(user.getSn());
engineeringVo.setEngineeringSn(CommonUtil.getUUid());
this.save(engineeringVo);
for (EngineeringSingle engineeringSingle : engineeringVo.getEngineeringSingles()) {
engineeringSingle.setEngineeringSn(engineeringVo.getEngineeringSn());
}
engineeringSingleService.saveBatch(engineeringVo.getEngineeringSingles());
for (AnnexFile annexFile : engineeringVo.getAnnexFiles()) {
annexFile.setRelevanceId(engineeringVo.getEngineeringSn());
}
engineeringFileService.saveBatch(engineeringVo.getAnnexFiles());
for (EngineeringMain engineeringMain : engineeringVo.getEngineeringMains()) {
engineeringMain.setEngineeringSn(engineeringVo.getEngineeringSn());
engineeringMainService.save(engineeringMain);
for (EngineeringMainPerson engineeringMainPerson : engineeringMain.getEngineeringMainPersonList()) {
engineeringMainPerson.setEngineeringMainId(engineeringMain.getId());
}
engineeringMainPersonService.saveBatch(engineeringMain.getEngineeringMainPersonList());
}
return true;
return engineeringSingleService.saveDetail(engineeringVo);
}
@Override
@ -126,16 +115,25 @@ public class EngineeringServiceImpl extends ServiceImpl<EngineeringMapper, Engin
LambdaUpdateWrapper<Engineering> wrapper = Wrappers.<Engineering>lambdaUpdate();
wrapper.set(Engineering::getExamineState, examineState);
wrapper.set(Engineering::getRejectReason, rejectReason);
wrapper.eq(Engineering::getId, id);
// 项目报监审核通过
if (examineState == 3) {
wrapper.set(Engineering::getState, 1);
// 生成五方主体账号
Engineering engineering = this.getById(id);
SystemUser systemUser = new SystemUser();
systemUser.setAccount(engineering.getEngineeringName());
systemUser.setPassword("123456");
systemUser.setShowPassword("123456");
systemUser.setIsManager(false);
systemUser.setState(1);
systemUser.setSn(engineering.getProjectSn());
systemUser.setAccountType(4);
systemUser.setEngineeringSn(engineering.getEngineeringSn());
systemUser.setCreateTime(new Date());
systemUserService.save(systemUser);
}
this.update(wrapper);
return true;
wrapper.eq(Engineering::getId, id);
return this.update(wrapper);
}
@Override
@ -149,10 +147,20 @@ public class EngineeringServiceImpl extends ServiceImpl<EngineeringMapper, Engin
}
@Override
public Engineering queryDetailById(Engineering engineering) {
List<EngineeringSingle> engineeringSingles = engineeringSingleService.list(Wrappers.<EngineeringSingle>lambdaQuery().eq(EngineeringSingle::getEngineeringSn, engineering.getEngineeringSn()));
engineering.setEngineeringSingleList(engineeringSingles);
return engineering;
public EngineeringVo queryDetailById(Long engineeringId) {
EngineeringVo engineeringVo = baseMapper.getDetail(engineeringId);
List<EngineeringSingle> engineeringSingles = engineeringSingleService.list(Wrappers.<EngineeringSingle>lambdaQuery().eq(EngineeringSingle::getEngineeringSn, engineeringVo.getEngineeringSn()));
List<EngineeringMain> engineeringMains = engineeringMainService.getList(engineeringVo.getEngineeringSn());
List<EngineeringMainPerson> engineeringMainPersons = engineeringMainPersonService.list(Wrappers.<EngineeringMainPerson>lambdaQuery()
.eq(EngineeringMainPerson::getEngineeringSn, engineeringVo.getEngineeringSn()));
for (EngineeringMain engineeringMain : engineeringMains) {
engineeringMain.setEngineeringMainPersonList(engineeringMainPersons.stream().filter(l -> l
.getMainId().equals(engineeringMain.getId()))
.collect(Collectors.toList()));
}
engineeringVo.setEngineeringMains(engineeringMains);
engineeringVo.setEngineeringSingles(engineeringSingles);
return engineeringVo;
}
@Override

61
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringSingleServiceImpl.java
View File

@ -1,11 +1,25 @@
package com.zhgd.xmgl.modules.basicdata.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.zhgd.xmgl.modules.basicdata.entity.AnnexFile;
import com.zhgd.xmgl.modules.basicdata.entity.EngineeringMain;
import com.zhgd.xmgl.modules.basicdata.entity.EngineeringMainPerson;
import com.zhgd.xmgl.modules.basicdata.entity.EngineeringSingle;
import com.zhgd.xmgl.modules.basicdata.mapper.EngineeringSingleMapper;
import com.zhgd.xmgl.modules.basicdata.service.IAnnexFileService;
import com.zhgd.xmgl.modules.basicdata.service.IEngineeringMainPersonService;
import com.zhgd.xmgl.modules.basicdata.service.IEngineeringMainService;
import com.zhgd.xmgl.modules.basicdata.service.IEngineeringSingleService;
import com.zhgd.xmgl.modules.basicdata.vo.EngineeringVo;
import com.zhgd.xmgl.util.ParamEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.stream.Collectors;
/**
* @Description: 单体工程表
@ -14,6 +28,53 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
* @version： V1.0
*/
@Service
@Transactional(rollbackFor = Exception.class)
public class EngineeringSingleServiceImpl extends ServiceImpl<EngineeringSingleMapper, EngineeringSingle> implements IEngineeringSingleService {
@Autowired
private IAnnexFileService annexFileService;
@Autowired
private IEngineeringMainService engineeringMainService;
@Autowired
private IEngineeringMainPersonService engineeringMainPersonService;
@Override
public boolean saveDetail(EngineeringVo engineeringVo) {
for (EngineeringSingle engineeringSingle : engineeringVo.getEngineeringSingles()) {
engineeringSingle.setEngineeringSn(engineeringVo.getEngineeringSn());
}
this.saveBatch(engineeringVo.getEngineeringSingles());
for (AnnexFile annexFile : engineeringVo.getAnnexFiles()) {
annexFile.setRelevanceId(engineeringVo.getEngineeringSn());
annexFile.setFileType(ParamEnum.AnnexFileType.ENGINEERING.getValue());
}
annexFileService.saveBatch(engineeringVo.getAnnexFiles());
for (EngineeringMain engineeringMain : engineeringVo.getEngineeringMains()) {
engineeringMain.setEngineeringSn(engineeringVo.getEngineeringSn());
engineeringMainService.save(engineeringMain);
for (EngineeringMainPerson engineeringMainPerson : engineeringMain.getEngineeringMainPersonList()) {
engineeringMainPerson.setMainId(engineeringMain.getId());
engineeringMainPerson.setEngineeringSn(engineeringVo.getEngineeringSn());
}
engineeringMainPersonService.saveBatch(engineeringMain.getEngineeringMainPersonList());
}
return true;
}
@Override
public boolean delDetail(String engineeringSn) {
this.remove(Wrappers.<EngineeringSingle>lambdaQuery()
.eq(EngineeringSingle::getEngineeringSn, engineeringSn));
annexFileService.remove(Wrappers.<AnnexFile>lambdaQuery()
.eq(AnnexFile::getRelevanceId, engineeringSn));
List<EngineeringMain> engineeringMains = engineeringMainService.list(Wrappers.<EngineeringMain>lambdaQuery()
.eq(EngineeringMain::getEngineeringSn, engineeringSn));
List<Long> mainIds = engineeringMains.stream().map(m -> m.getId()).collect(Collectors.toList());
engineeringMainPersonService.remove(Wrappers.<EngineeringMainPerson>lambdaQuery()
.in(EngineeringMainPerson::getMainId, mainIds));
engineeringMainService.removeByIds(mainIds);
return true;
}
}

7
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EnterpriseMainServiceImpl.java
View File

@ -6,8 +6,6 @@ import com.zhgd.xmgl.modules.basicdata.mapper.EnterpriseMainMapper;
import com.zhgd.xmgl.modules.basicdata.service.IEnterpriseMainService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @Description: 企业主体
* @author： pds
@ -16,9 +14,4 @@ import java.util.List;
*/
@Service
public class EnterpriseMainServiceImpl extends ServiceImpl<EnterpriseMainMapper, EnterpriseMain> implements IEnterpriseMainService {
@Override
public List<EnterpriseMain> getList(String enterpriseSn) {
return baseMapper.getList(enterpriseSn);
}
}

3
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EnterpriseServiceImpl.java
View File

@ -127,7 +127,8 @@ public class EnterpriseServiceImpl extends ServiceImpl<EnterpriseMapper, Enterpr
@Override
public EnterpriseVo getDetailById(Long enterpriseId) {
EnterpriseVo enterpriseVo = baseMapper.getDetailById(enterpriseId);
List<EnterpriseMain> enterpriseMains = enterpriseMainService.getList(enterpriseVo.getEnterpriseSn());
List<EnterpriseMain> enterpriseMains = enterpriseMainService.list(Wrappers.<EnterpriseMain>lambdaQuery()
.eq(EnterpriseMain::getEnterpriseSn, enterpriseVo.getEnterpriseSn()));
List<EnterpriseMainLicense> enterpriseMainLicenses = enterpriseMainLicenseService.list(Wrappers.<EnterpriseMainLicense>lambdaQuery()
.eq(EnterpriseMainLicense::getEnterpriseSn, enterpriseVo.getEnterpriseSn()));
for (EnterpriseMain enterpriseMain : enterpriseMains) {