guowenhao/ProjectInformation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

安全风险清单更改，台账排序优化

Browse Source
This commit is contained in:
郭文豪 2024-08-20 17:50:51 +08:00
parent ccaf0dbeae
commit 3a2a9e1740
6 changed files with 125 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
projectinformationboot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectstart/entity/BusPlanning.java
View File

@ -47,6 +47,9 @@ public class BusPlanning implements Serializable {
@Excel(name = "部门code", width = 15)
@ApiModelProperty(value = "部门code")
private String departmentCode;
/**风险安全清单*/
@ApiModelProperty(value = "风险安全清单")
private String busAqfxqd;
/**创建人*/
@Excel(name = "创建人", width = 15)
@ApiModelProperty(value = "创建人")

3
projectinformationboot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectstart/entity/BusPlanningMain.java
View File

@ -83,4 +83,7 @@ public class BusPlanningMain implements Serializable {
private List<BusAqfxqd> busAqfxqdList;
/**风险安全清单*/
private String busAqfxqd;
}

20
projectinformationboot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectstart/service/impl/BusPlanningServiceImpl.java
View File

@ -34,8 +34,10 @@ public class BusPlanningServiceImpl extends ServiceImpl<BusPlanningMapper, BusPl
private BusAqfxqdMapper busAqfxqdMapper;
@Autowired
private BusImplementZybzchMapper busImplementZybzchMapper;
/**
* 项目实施策划分页
*
* @param page
* @param busPlanning
* @return
@ -68,6 +70,7 @@ public class BusPlanningServiceImpl extends ServiceImpl<BusPlanningMapper, BusPl
}
return this.baseMapper.pageByParams(page, busPlanning, whereSql);
}
@Autowired
private IBusUserResponsibleDepartmentService userResponsibleDepartmentService;
@ -97,6 +100,7 @@ public class BusPlanningServiceImpl extends ServiceImpl<BusPlanningMapper, BusPl
/**
* 主副表存值 更新
*
* @param busPlanningMain
*/
public void updateBusPlanningMainById(BusPlanningMain busPlanningMain) {
@ -109,6 +113,7 @@ public class BusPlanningServiceImpl extends ServiceImpl<BusPlanningMapper, BusPl
busPlanningMain.setId(busPlanning.getId());
this.insertBase(projectId, busPlanningMain, byId);
}
private void deleteSon(String projectId, String id) {
busImplementGoalsMapper.deleteByProjectId(projectId);
busQualityPlanningMapper.deleteByProjectId(projectId);
@ -124,8 +129,10 @@ public class BusPlanningServiceImpl extends ServiceImpl<BusPlanningMapper, BusPl
busAqfxqdMapper.deleteByProjectId(projectId);
busImplementZybzchMapper.deleteByProjectId(projectId);
}
/**
* 主副表存值
*
* @param busPlanningMain
*/
public BusPlanning saveMain(BusPlanningMain busPlanningMain) {
@ -292,7 +299,7 @@ public class BusPlanningServiceImpl extends ServiceImpl<BusPlanningMapper, BusPl
}
List<BusAqfxqd> busAqfxqdList = busPlanningMain.getBusAqfxqdList();
/*List<BusAqfxqd> busAqfxqdList = busPlanningMain.getBusAqfxqdList();
if(busAqfxqdList!=null&&busAqfxqdList.size()>0){
BusAqfxqd busAqfxqd =null;
for (int i = 0; i < busAqfxqdList.size(); i++) {
@ -303,9 +310,7 @@ public class BusPlanningServiceImpl extends ServiceImpl<BusPlanningMapper, BusPl
busAqfxqd.setCreateUser(LoginUtil.getLoginUserId());
busAqfxqdMapper.insert(busAqfxqd);
}
}
}*/
/**实施目标*/
BusImplementZybzch busImplementZybzch = new BusImplementZybzch();
@ -319,13 +324,16 @@ public class BusPlanningServiceImpl extends ServiceImpl<BusPlanningMapper, BusPl
/**
* 删除子表
*
* @param projectId
*/
public void removeSonByProject(String projectId, String id) {
this.deleteSon(projectId, id);
}
/**
* 查询项目实施策划 查询是否可更改 为0 的值
*
* @param loginUserOrgCode
* @return
*/
@ -357,8 +365,10 @@ public class BusPlanningServiceImpl extends ServiceImpl<BusPlanningMapper, BusPl
}
return this.baseMapper.queryPlanning(loginUserOrgCode, whereSql);
}
/**
* 查询 项目实施策划的项目
*
* @param loginUserOrgCode
* @return
*/
@ -390,8 +400,10 @@ public class BusPlanningServiceImpl extends ServiceImpl<BusPlanningMapper, BusPl
}
return this.baseMapper.queryPlanningAll(loginUserOrgCode, whereSql);
}
/**
* 根据项目id 查询 项目实施策划的项目
*
* @param projectId
* @return
*/

1
projectinformationboot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/standingBook/mapper/xml/ProjectAccountMapper.xml
View File

@ -70,6 +70,7 @@
and ${whereSql}
</if>
</where>
order by itemNo asc
</select>
<!--根据合同id 查询 合同节点明细-->