From 42bb1af755a8879bd27b267a2e813a3e847f4275 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Wed, 29 Mar 2023 18:22:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/MyWebMvcConfigurerAdapter.java | 11 ++- .../government/GovEngineeringController.java | 9 ++- .../project/EngineeringController.java | 18 +++-- .../controller/project/ProjectController.java | 9 +-- .../modules/basicdata/entity/Engineering.java | 15 ++-- .../basicdata/entity/EngineeringMain.java | 7 ++ .../entity/EngineeringMainPerson.java | 8 +- .../mapper/EngineeringMainMapper.java | 2 + .../basicdata/mapper/EngineeringMapper.java | 3 + .../mapper/EnterpriseMainMapper.java | 3 - .../mapper/xml/EngineeringMainMapper.xml | 6 ++ .../mapper/xml/EngineeringMapper.xml | 4 + .../mapper/xml/EnterpriseMainMapper.xml | 7 -- .../service/IEngineeringMainService.java | 2 + .../service/IEngineeringService.java | 4 +- .../service/IEngineeringSingleService.java | 5 ++ .../service/IEnterpriseMainService.java | 4 - .../impl/EngineeringMainServiceImpl.java | 5 ++ .../service/impl/EngineeringServiceImpl.java | 78 ++++++++++--------- .../impl/EngineeringSingleServiceImpl.java | 61 +++++++++++++++ .../impl/EnterpriseMainServiceImpl.java | 7 -- .../service/impl/EnterpriseServiceImpl.java | 3 +- 22 files changed, 182 insertions(+), 89 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/config/MyWebMvcConfigurerAdapter.java b/src/main/java/com/zhgd/xmgl/config/MyWebMvcConfigurerAdapter.java index 45547f9..d371e46 100644 --- a/src/main/java/com/zhgd/xmgl/config/MyWebMvcConfigurerAdapter.java +++ b/src/main/java/com/zhgd/xmgl/config/MyWebMvcConfigurerAdapter.java @@ -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"); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringController.java index 42d808e..5e99212 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringController.java @@ -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 queryDetailById(@RequestBody Engineering engineeringEntity) { - Result result = new Result(); + public Result queryDetailById(@RequestBody Engineering engineeringEntity) { + Result result = new Result(); 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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EngineeringController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EngineeringController.java index a0a2f96..eb9edde 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EngineeringController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EngineeringController.java @@ -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 edit(@RequestBody Engineering engineering) { + public Result edit(@RequestBody EngineeringVo engineeringVo) { Result result = new Result(); - 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; } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/ProjectController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/ProjectController.java index cd7c500..9223a04 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/ProjectController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/ProjectController.java @@ -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 queryBySelf() { Result result = new Result(); SecurityUser user = SecurityUtil.getUser(); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Engineering.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Engineering.java index 60a62b6..d9d51d7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Engineering.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Engineering.java @@ -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; + /** * 单体工程 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringMain.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringMain.java index af7fb63..b1dcd7a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringMain.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringMain.java @@ -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 engineeringMainPersonList; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringMainPerson.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringMainPerson.java index b80ee22..c802c81 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringMainPerson.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringMainPerson.java @@ -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; /** * 姓名 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EngineeringMainMapper.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EngineeringMainMapper.java index d09e5b0..91efc8b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EngineeringMainMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EngineeringMainMapper.java @@ -16,4 +16,6 @@ import java.util.List; public interface EngineeringMainMapper extends BaseMapper { List getByEngineeringSn(List engineeringSns); + + List getList(String engineeringSn); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EngineeringMapper.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EngineeringMapper.java index db127ae..4b39e5d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EngineeringMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EngineeringMapper.java @@ -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 { Page pageListForSuperior(Page page, @Param(Constants.WRAPPER) Wrapper wrapper); Page engineeringStat(Page page, @Param(Constants.WRAPPER) Wrapper wrapper); + + EngineeringVo getDetail(Long engineeringId); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EnterpriseMainMapper.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EnterpriseMainMapper.java index abfc047..9e19a2d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EnterpriseMainMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EnterpriseMainMapper.java @@ -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 { - List getList(String enterpriseSn); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMainMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMainMapper.xml index d4bd8cb..e0e6130 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMainMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMainMapper.xml @@ -9,4 +9,10 @@ #{item} + + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMapper.xml index 6a7da32..e5e0cab 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMapper.xml @@ -21,4 +21,8 @@ FROM engineering e ${ew.customSqlSegment} + + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EnterpriseMainMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EnterpriseMainMapper.xml index 27fc17a..c5db846 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EnterpriseMainMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EnterpriseMainMapper.xml @@ -1,11 +1,4 @@ - - \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEngineeringMainService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEngineeringMainService.java index 106c382..9bd8b0f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEngineeringMainService.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEngineeringMainService.java @@ -15,4 +15,6 @@ public interface IEngineeringMainService extends IService { List getByEngineeringSn(List engineeringSn); + + List getList(String engineeringSn); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEngineeringService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEngineeringService.java index 8dd5587..c1e5c36 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEngineeringService.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEngineeringService.java @@ -30,11 +30,11 @@ public interface IEngineeringService extends IService { List getSnListByEnterprise(String enterpriseSn); - Engineering queryDetailById(Engineering engineering); + EngineeringVo queryDetailById(Long engineeringId); Page pageListForSuperior(Map map); - boolean updateInfo(Engineering engineering); + boolean updateInfo(EngineeringVo engineeringVo); Page engineeringStat(Page page, Wrapper wrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEngineeringSingleService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEngineeringSingleService.java index fbe9bb6..e4a2efd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEngineeringSingleService.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEngineeringSingleService.java @@ -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 { + + boolean saveDetail(EngineeringVo engineeringVo); + + boolean delDetail(String engineeringSn); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEnterpriseMainService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEnterpriseMainService.java index 5a77f28..276929a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEnterpriseMainService.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEnterpriseMainService.java @@ -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 { - - List getList(String enterpriseSn); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringMainServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringMainServiceImpl.java index ecbbd5d..78c6fb9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringMainServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringMainServiceImpl.java @@ -22,4 +22,9 @@ public class EngineeringMainServiceImpl extends ServiceImpl getByEngineeringSn(List engineeringSn) { return baseMapper.getByEngineeringSn(engineeringSn); } + + @Override + public List getList(String engineeringSn) { + return baseMapper.getList(engineeringSn); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java index c0ce7b4..afcb656 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java @@ -44,15 +44,18 @@ public class EngineeringServiceImpl extends ServiceImpl getPageList(Page page, Wrapper wrapper) { Page pageList = this.page(page, wrapper); @@ -83,12 +86,14 @@ public class EngineeringServiceImpl extends ServiceImpl wrapper = Wrappers.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 wrapper = Wrappers.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 engineeringSingles = engineeringSingleService.list(Wrappers.lambdaQuery().eq(EngineeringSingle::getEngineeringSn, engineering.getEngineeringSn())); - engineering.setEngineeringSingleList(engineeringSingles); - return engineering; + public EngineeringVo queryDetailById(Long engineeringId) { + EngineeringVo engineeringVo = baseMapper.getDetail(engineeringId); + List engineeringSingles = engineeringSingleService.list(Wrappers.lambdaQuery().eq(EngineeringSingle::getEngineeringSn, engineeringVo.getEngineeringSn())); + List engineeringMains = engineeringMainService.getList(engineeringVo.getEngineeringSn()); + List engineeringMainPersons = engineeringMainPersonService.list(Wrappers.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 diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringSingleServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringSingleServiceImpl.java index 3f6aeec..c710978 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringSingleServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringSingleServiceImpl.java @@ -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 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.lambdaQuery() + .eq(EngineeringSingle::getEngineeringSn, engineeringSn)); + annexFileService.remove(Wrappers.lambdaQuery() + .eq(AnnexFile::getRelevanceId, engineeringSn)); + List engineeringMains = engineeringMainService.list(Wrappers.lambdaQuery() + .eq(EngineeringMain::getEngineeringSn, engineeringSn)); + List mainIds = engineeringMains.stream().map(m -> m.getId()).collect(Collectors.toList()); + engineeringMainPersonService.remove(Wrappers.lambdaQuery() + .in(EngineeringMainPerson::getMainId, mainIds)); + engineeringMainService.removeByIds(mainIds); + return true; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EnterpriseMainServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EnterpriseMainServiceImpl.java index 5ed8096..cf50dc2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EnterpriseMainServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EnterpriseMainServiceImpl.java @@ -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 implements IEnterpriseMainService { - - @Override - public List getList(String enterpriseSn) { - return baseMapper.getList(enterpriseSn); - } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EnterpriseServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EnterpriseServiceImpl.java index 1247aa5..fda59c2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EnterpriseServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EnterpriseServiceImpl.java @@ -127,7 +127,8 @@ public class EnterpriseServiceImpl extends ServiceImpl enterpriseMains = enterpriseMainService.getList(enterpriseVo.getEnterpriseSn()); + List enterpriseMains = enterpriseMainService.list(Wrappers.lambdaQuery() + .eq(EnterpriseMain::getEnterpriseSn, enterpriseVo.getEnterpriseSn())); List enterpriseMainLicenses = enterpriseMainLicenseService.list(Wrappers.lambdaQuery() .eq(EnterpriseMainLicense::getEnterpriseSn, enterpriseVo.getEnterpriseSn())); for (EnterpriseMain enterpriseMain : enterpriseMains) {