diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmMainProjectController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmMainProjectController.java index 2fa77ee..aa950fa 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmMainProjectController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmMainProjectController.java @@ -100,7 +100,7 @@ public class PmMainProjectController extends BaseController { @SysLog(title = "总包工程", businessType = OperaType.QUERY, logType = 0, module = "总包工程->总包工程下拉框") public TableDataInfo listAll(PmMainProject pmMainProject) { try { - List list = pmMainProjectService.selectMainProjectList(pmMainProject); + List list = pmMainProjectService.selectMainProjectListAll(pmMainProject); return getDataTable(list); } catch (Exception e) { log.error(e.toString(), e); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmPostTypeController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmPostTypeController.java index 1de4f9e..bc822b0 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmPostTypeController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmPostTypeController.java @@ -85,13 +85,13 @@ public class PmPostTypeController extends BaseController{ } /** - * 工种类型列表 + * 工种类型下拉框 */ @GetMapping("/listAll") @SysLog(title = "工种类型管理", businessType = OperaType.QUERY, logType = 0, module = "工种类型管理->工种类型列表") public TableDataInfo listAll(PmPostType pmPostType) { try { - List list = pmPostTypeService.selectPostTypeList(pmPostType); + List list = pmPostTypeService.selectPostTypeListAll(pmPostType); return getDataTable(list); } catch (Exception e) { log.error(e.toString(), e); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmProjectController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmProjectController.java index a4134f8..aab8f40 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmProjectController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmProjectController.java @@ -110,13 +110,13 @@ public class PmProjectController extends BaseController { } /** - * 标段工程列表 + * 标段工程下拉框 */ @GetMapping("/listAll") @SysLog(title = "标段工程", businessType = OperaType.QUERY, logType = 0, module = "标段工程->标段工程列表") public TableDataInfo listAll(PmProject pmProject) { try { - List list = pmProjectService.selectProjectList(pmProject); + List list = pmProjectService.selectProjectListAll(pmProject); return getDataTable(list); } catch (Exception e) { log.error(e.toString(), e); @@ -125,7 +125,7 @@ public class PmProjectController extends BaseController { } /** - * 标段工程列表 + * 根据分包商id获取标段工程列表 */ @GetMapping("/listAllBySubId") @SysLog(title = "标段工程", businessType = OperaType.QUERY, logType = 0, module = "标段工程->标段工程列表") diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubController.java index 73a941b..2a62808 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubController.java @@ -97,14 +97,13 @@ public class PmSubController extends BaseController { } /** - * 分包商列表 + * 分包商下拉框 */ - @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("pm:sub:list")) @GetMapping("/listAll") @SysLog(title = "分包商管理", businessType = OperaType.QUERY, logType = 0, module = "分包商管理->分包商列表") public TableDataInfo listAll(PmSub pmSub) { try { - List list = pmSubService.selectSubList(pmSub); + List list = pmSubService.selectSubListAll(pmSub); return getDataTable(list); } catch (Exception e) { log.error(e.toString(), e); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmMainProjectMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmMainProjectMapper.java index 72659ee..25b5169 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmMainProjectMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmMainProjectMapper.java @@ -38,4 +38,11 @@ public interface PmMainProjectMapper { * @return */ int delMainProject(PmMainProject pmMainProject); + + /** + * 总包工程下拉框 + * @param pmMainProject + * @return + */ + List selectMainProjectListAll(PmMainProject pmMainProject); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmPostTypeMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmPostTypeMapper.java index 18995af..38b03d0 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmPostTypeMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmPostTypeMapper.java @@ -30,4 +30,11 @@ public interface PmPostTypeMapper { * @return */ PmPostType selectPostTypeByPostName(PmPostType pmPostType); + + /** + * 工种类型下拉框 + * @param pmPostType + * @return + */ + List selectPostTypeListAll(PmPostType pmPostType); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmProjectMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmProjectMapper.java index f689ea4..d6b268d 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmProjectMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmProjectMapper.java @@ -53,5 +53,17 @@ public interface PmProjectMapper { void updateMainProject(@Param("mainProId") Integer mainProId, @Param("proStatus")char proStatus); + /** + * 根据分包商id获取标段工程列表 + * @param bmSubContract + * @return + */ List listAllBySubId(BmSubContract bmSubContract); + + /** + * 标段工程下拉框 + * @param pmProject + * @return + */ + List selectProjectListAll(PmProject pmProject); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubMapper.java index 309f03a..7ef5c5e 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubMapper.java @@ -6,13 +6,40 @@ import java.util.List; public interface PmSubMapper { + /** + * 分包商列表 + * @param pmSub + * @return + */ List selectSubList(PmSub pmSub); + /** + * 根据分包商名称获取分包商信息 + * @param pmSub + * @return + */ PmSub getSubBySubName(PmSub pmSub); + /** + * 修改分包商 + * @param pmSub + * @return + */ int updateSub(PmSub pmSub); + /** + * 新增分包商 + * @param pmSub + * @return + */ int addSub(PmSub pmSub); + /** + * 删除分包商 + * @param pmSub + * @return + */ int delSub(PmSub pmSub); + + List selectSubListAll(PmSub pmSub); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmMainProjectService.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmMainProjectService.java index 84e956c..148f6bc 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmMainProjectService.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmMainProjectService.java @@ -20,4 +20,11 @@ public interface PmMainProjectService { * 删除总工程 */ int delMainProject(PmMainProject pmMainProject); + + /** + * 总包工程下拉框 + * @param pmMainProject + * @return + */ + List selectMainProjectListAll(PmMainProject pmMainProject); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmPostTypeService.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmPostTypeService.java index d831538..652b280 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmPostTypeService.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmPostTypeService.java @@ -20,4 +20,11 @@ public interface PmPostTypeService { * 删除工种类型 */ int delPostType(PmPostType pmPostType); + + /** + * 工种类型下拉框 + * @param pmPostType + * @return + */ + List selectPostTypeListAll(PmPostType pmPostType); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmProjectService.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmProjectService.java index 7f2547c..104c490 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmProjectService.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmProjectService.java @@ -22,5 +22,17 @@ public interface PmProjectService { */ int delProject(PmProject pmProject); + /** + * 根据分包商id获取标段工程列表 + * @param bmSubContract + * @return + */ List listAllBySubId(BmSubContract bmSubContract); + + /** + * 标段工程下拉框 + * @param pmProject + * @return + */ + List selectProjectListAll(PmProject pmProject); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmSubService.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmSubService.java index 824df28..c27cb85 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmSubService.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmSubService.java @@ -6,9 +6,32 @@ import com.bonus.bmw.domain.po.PmSub; import java.util.List; public interface PmSubService { + /** + * 分包商列表 + * @param pmSub + * @return + */ List selectSubList(PmSub pmSub); + /** + * 新增和修改分包商 + * @param pmSub + * @param fileBasicMsgDto + * @return + */ int addOrUpdateSub(PmSub pmSub, FileBasicMsgDto fileBasicMsgDto); + /** + * 删除分包商 + * @param pmSub + * @return + */ int delSub(PmSub pmSub); + + /** + * 分包商下拉框 + * @param pmSub + * @return + */ + List selectSubListAll(PmSub pmSub); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmMainProjectServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmMainProjectServiceImpl.java index f2c424d..e943c83 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmMainProjectServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmMainProjectServiceImpl.java @@ -88,4 +88,14 @@ public class PmMainProjectServiceImpl implements PmMainProjectService { } return pmMainProjectMapper.delMainProject(pmMainProject); } + + /** + * 总包工程下拉框 + * @param pmMainProject + * @return + */ + @Override + public List selectMainProjectListAll(PmMainProject pmMainProject) { + return pmMainProjectMapper.selectMainProjectListAll(pmMainProject); + } } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmPostTypeServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmPostTypeServiceImpl.java index d7dc88c..3e5b224 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmPostTypeServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmPostTypeServiceImpl.java @@ -64,4 +64,14 @@ public class PmPostTypeServiceImpl implements PmPostTypeService { public int delPostType(PmPostType pmPostType) { return pmPostTypeMapper.delPostType(pmPostType); } + + /** + * 工种类型下拉框 + * @param pmPostType + * @return + */ + @Override + public List selectPostTypeListAll(PmPostType pmPostType) { + return pmPostTypeMapper.selectPostTypeListAll(pmPostType); + } } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmProjectServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmProjectServiceImpl.java index c63f43a..ffce8ba 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmProjectServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmProjectServiceImpl.java @@ -104,8 +104,23 @@ public class PmProjectServiceImpl implements PmProjectService { return pmProjectMapper.delProject(pmProject); } + /** + * 根据分包商id获取标段工程列表 + * @param bmSubContract + * @return + */ @Override public List listAllBySubId(BmSubContract bmSubContract) { return pmProjectMapper.listAllBySubId(bmSubContract); } + + /** + * 标段工程下拉框 + * @param pmProject + * @return + */ + @Override + public List selectProjectListAll(PmProject pmProject) { + return pmProjectMapper.selectProjectListAll(pmProject); + } } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubServiceImpl.java index 17bc01d..2a66902 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubServiceImpl.java @@ -37,6 +37,11 @@ public class PmSubServiceImpl implements PmSubService { @Resource private BmSubContractMapper bmSubContractMapper; + /** + * 分包商列表 + * @param pmSub + * @return + */ @Override public List selectSubList(PmSub pmSub) { List pmSubList = pmSubMapper.selectSubList(pmSub); @@ -49,6 +54,12 @@ public class PmSubServiceImpl implements PmSubService { return pmSubList; } + /** + * 新增和修改分包商 + * @param pmSub + * @param fileBasicMsgDto + * @return + */ @Override @Transactional public int addOrUpdateSub(PmSub pmSub, FileBasicMsgDto fileBasicMsgDto) { @@ -92,6 +103,11 @@ public class PmSubServiceImpl implements PmSubService { return res; } + /** + * 删除分包商 + * @param pmSub + * @return + */ @Override @Transactional public int delSub(PmSub pmSub) { @@ -109,4 +125,14 @@ public class PmSubServiceImpl implements PmSubService { return res; } + + /** + * 分包商下拉框 + * @param pmSub + * @return + */ + @Override + public List selectSubListAll(PmSub pmSub) { + return pmSubMapper.selectSubListAll(pmSub); + } } diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmMainProjectMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmMainProjectMapper.xml index ed71f8e..197af76 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmMainProjectMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmMainProjectMapper.xml @@ -45,4 +45,8 @@ select id,main_pro_name,vol_level,create_user,update_user,create_time,update_time,pro_status from pm_main_project where is_active='1' and main_pro_name = #{mainProName} + diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmPostTypeMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmPostTypeMapper.xml index 1fb6018..a6dec9a 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmPostTypeMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmPostTypeMapper.xml @@ -41,4 +41,11 @@ select id,post_name,is_special,is_enable,create_user,update_user,create_time,update_time from pm_post_type where is_active='1' and post_name=#{postName} + diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmProjectMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmProjectMapper.xml index f6d26b2..95beb22 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmProjectMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmProjectMapper.xml @@ -169,4 +169,10 @@ left join bm_sub_contract bsc on bsc.pro_id = pp.id where pp.is_active = '1' and bsc.id = #{subId} + diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubMapper.xml index 76c7d0e..9673894 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubMapper.xml @@ -81,4 +81,8 @@ id_card_front,id_card_reverse,corporate_seal,sub_ein_status from pm_sub where is_active='1' and sub_name= #{subName} +