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-08-03 09:43:07 +08:00
parent 63f3d1cd39
commit 94022be3d7
3 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,12 +41,6 @@ public class EngineeringMain implements Serializable {
@Excel(name = "企业sn", width = 15) @Excel(name = "企业sn", width = 15)
@ApiModelProperty(value = "企业sn") @ApiModelProperty(value = "企业sn")
private String enterpriseSn; private String enterpriseSn;
/**
* 项目sn
*/
@Excel(name = "项目sn", width = 15)
@ApiModelProperty(value = "项目sn")
private String projectSn;
/** /**
* 工程sn * 工程sn
*/ */

2
src/main/java/com/zhgd/xmgl/modules/safety/mapper/EnterpriseScoreMapper.java
View File

@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.annotation.DataScope;
import com.zhgd.xmgl.modules.safety.dto.EnterpriseScoreDto; import com.zhgd.xmgl.modules.safety.dto.EnterpriseScoreDto;
import com.zhgd.xmgl.modules.safety.entity.EnterpriseScore; import com.zhgd.xmgl.modules.safety.entity.EnterpriseScore;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@ -19,7 +18,6 @@ import java.util.List;
* @version： V1.0 * @version： V1.0
*/ */
@Mapper @Mapper
@DataScope
public interface EnterpriseScoreMapper extends BaseMapper<EnterpriseScore> { public interface EnterpriseScoreMapper extends BaseMapper<EnterpriseScore> {
Page<EnterpriseScoreDto> pageList(Page page, @Param(Constants.WRAPPER)Wrapper<EnterpriseScore> wrapper); Page<EnterpriseScoreDto> pageList(Page page, @Param(Constants.WRAPPER)Wrapper<EnterpriseScore> wrapper);

7
src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreServiceImpl.java
View File

@ -7,11 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.jeecg.common.util.PageUtil;
import com.zhgd.xmgl.handler.exception.CustomException; import com.zhgd.xmgl.handler.exception.CustomException;
import com.zhgd.xmgl.modules.basicdata.entity.Engineering;
import com.zhgd.xmgl.modules.basicdata.entity.EngineeringMain; import com.zhgd.xmgl.modules.basicdata.entity.EngineeringMain;
import com.zhgd.xmgl.modules.basicdata.entity.SystemDictData; import com.zhgd.xmgl.modules.basicdata.entity.SystemDictData;
import com.zhgd.xmgl.modules.basicdata.service.IEngineeringMainService; import com.zhgd.xmgl.modules.basicdata.service.IEngineeringMainService;
import com.zhgd.xmgl.modules.basicdata.service.IEngineeringService;
import com.zhgd.xmgl.modules.basicdata.service.ISystemDictDataService; import com.zhgd.xmgl.modules.basicdata.service.ISystemDictDataService;
import com.zhgd.xmgl.modules.safety.dto.EnterpriseScoreDto; import com.zhgd.xmgl.modules.safety.dto.EnterpriseScoreDto;
import com.zhgd.xmgl.modules.safety.entity.EnterpriseScore; import com.zhgd.xmgl.modules.safety.entity.EnterpriseScore;
@ -41,9 +39,6 @@ public class EnterpriseScoreServiceImpl extends ServiceImpl<EnterpriseScoreMappe
@Autowired @Autowired
private IEngineeringMainService engineeringMainService; private IEngineeringMainService engineeringMainService;
@Autowired
private IEngineeringService engineeringService;
@Autowired @Autowired
private ISystemDictDataService systemDictDataService; private ISystemDictDataService systemDictDataService;
@ -83,8 +78,6 @@ public class EnterpriseScoreServiceImpl extends ServiceImpl<EnterpriseScoreMappe
if (StringUtils.isNotBlank(enterpriseScore.getEnterpriseSn())) { if (StringUtils.isNotBlank(enterpriseScore.getEnterpriseSn())) {
EngineeringMain engineeringMain = new EngineeringMain(); EngineeringMain engineeringMain = new EngineeringMain();
engineeringMain.setEnterpriseSn(enterpriseScore.getEnterpriseSn()); engineeringMain.setEnterpriseSn(enterpriseScore.getEnterpriseSn());
engineeringMain.setProjectSn(engineeringService.getOne(Wrappers.<Engineering>lambdaQuery()
.eq(Engineering::getEngineeringSn, enterpriseScore.getEngineeringSn())).getProjectSn());
engineeringMain.setType(enterpriseScore.getEnterpriseType()); engineeringMain.setType(enterpriseScore.getEnterpriseType());
engineeringMainService.save(engineeringMain); engineeringMainService.save(engineeringMain);
} }