diff --git a/ruoyi-ui/src/views/project/surProjectInsurance/index.vue b/ruoyi-ui/src/views/project/surProjectInsurance/index.vue index 069449da..153eae24 100644 --- a/ruoyi-ui/src/views/project/surProjectInsurance/index.vue +++ b/ruoyi-ui/src/views/project/surProjectInsurance/index.vue @@ -273,10 +273,7 @@ - + diff --git a/ruoyi-ui/src/views/project/surProjectInsurance/insuranceDrawer.vue b/ruoyi-ui/src/views/project/surProjectInsurance/insuranceDrawer.vue index 6d8ba807..26c10e25 100644 --- a/ruoyi-ui/src/views/project/surProjectInsurance/insuranceDrawer.vue +++ b/ruoyi-ui/src/views/project/surProjectInsurance/insuranceDrawer.vue @@ -144,11 +144,7 @@ - + diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/common/CommonController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/common/CommonController.java index 9605077c..3f398c4b 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/common/CommonController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/common/CommonController.java @@ -1,6 +1,7 @@ package com.ruoyi.web.common; import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.file.FileUploadUtils; @@ -9,11 +10,15 @@ import com.ruoyi.framework.config.ServerConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -115,4 +120,33 @@ public class CommonController } } + /** + * 本地资源通用下载 + */ + @GetMapping("/download/resource") + public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response) + throws Exception + { + try + { + if (!FileUtils.checkAllowDownload(resource)) + { + throw new Exception(StringUtils.format("资源文件({})非法，不允许下载。 ", resource)); + } + // 本地资源路径 + String localPath = RuoYiConfig.getProfile(); + // 数据库资源地址 + String downloadPath = localPath + StringUtils.substringAfter(resource, Constants.RESOURCE_PREFIX); + // 下载名称 + String downloadName = StringUtils.substringAfterLast(downloadPath, "/"); + response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); + FileUtils.setAttachmentResponseHeader(response, downloadName); + FileUtils.writeBytes(downloadPath, response.getOutputStream()); + } + catch (Exception e) + { + log.error("下载文件失败", e); + } + } + } diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectCheckingController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectCheckingController.java index 8dfc3b83..3c42a398 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectCheckingController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectCheckingController.java @@ -30,6 +30,9 @@ public class ProjectCheckingController extends BaseController { */ @GetMapping("/list") public AjaxResult list(SurProjectChecking surProjectChecking){ + if(surProjectChecking.getDeptId()==0){ + surProjectChecking.setDeptId(null); + } return success(surProjectCheckingService.selectSurProjectCheckingList(surProjectChecking)); } @@ -64,4 +67,13 @@ public class ProjectCheckingController extends BaseController { return toAjax(surProjectCheckingService.deleteSurProjectCheckingById(id)); } + /** + * 根据项目统计举牌验收 + * @param projectId + * @return + */ + @GetMapping("/findStatisticsByProjectId") + public AjaxResult findStatisticsByProjectId(Long projectId){ + return success(surProjectCheckingService.findStatisticsByProjectId(projectId)); + } } diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectDeptWroksController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectDeptWroksController.java new file mode 100644 index 00000000..fa102450 --- /dev/null +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectDeptWroksController.java @@ -0,0 +1,80 @@ +package com.ruoyi.web.project.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.yanzhu.jh.project.domain.SurProjectDeptWroks; +import com.yanzhu.jh.project.service.ISurProjectDeptWroksService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @version : V1.0 + * @ClassName: ProjectDeptWroksController + * @Description: 在岗人员 + * @Auther: JiangYuQi + * @Date: 2020/7/7 18:03 + */ +@RestController +@RequestMapping("/wechat/projectDeptWroks") +public class ProjectDeptWroksController extends BaseController { + + @Autowired + private ISurProjectDeptWroksService surProjectDeptWroksService; + + /** + * 查询项目在岗人员列表 + * @param surProjectDeptWroks + * @return + */ + @GetMapping("/list") + public AjaxResult list(SurProjectDeptWroks surProjectDeptWroks){ + if(surProjectDeptWroks.getDeptId()==0){ + surProjectDeptWroks.setDeptId(null); + } + return success(surProjectDeptWroksService.selectSurProjectDeptWroksList(surProjectDeptWroks)); + } + + /** + * 查询在岗人员详情 + * @param id + * @return + */ + @GetMapping("/info") + public AjaxResult info(Long id){ + return success(surProjectDeptWroksService.selectSurProjectDeptWroksById(id)); + } + + /** + * 新增在岗人员 + * @param surProjectDeptWroks + * @return + */ + @PostMapping("/add") + @Log(title = "在岗人员", businessType = BusinessType.INSERT) + public AjaxResult add(@RequestBody SurProjectDeptWroks surProjectDeptWroks){ + return success(surProjectDeptWroksService.deleteInsertProjectDeptWroks(surProjectDeptWroks)); + } + + /** + * 删除在岗人员 + */ + @Log(title = "在岗人员", businessType = BusinessType.DELETE) + @GetMapping("/remove") + public AjaxResult remove(@RequestParam Long id) + { + return toAjax(surProjectDeptWroksService.deleteSurProjectDeptWroksById(id)); + } + + /** + * 根据项目分组查询统计 + * @param projectId + * @return + */ + @GetMapping("/findSumByProjectId") + public AjaxResult findSumByProjectId(Long projectId){ + return success(surProjectDeptWroksService.findSumByProjectId(projectId)); + } + +} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectDetectionController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectDetectionController.java index 8e820423..8c911189 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectDetectionController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectDetectionController.java @@ -98,7 +98,7 @@ public class ProjectDetectionController extends BaseController { } /** - * 查询隐患类型 + * 查询复试类型 * @return */ @GetMapping("/queryType") @@ -108,4 +108,14 @@ public class ProjectDetectionController extends BaseController { dictData.setStatus(PublicStateEnum.OK.getCode()); return success(sysDictDataService.selectDictDataList(dictData)); } + + /** + * 根据项目分组查询统计 + * @param projectId + * @return + */ + @GetMapping("/selectGroupCountByProjectId") + public AjaxResult selectGroupCountByProjectId(Long projectId){ + return success(surProjectCheckDetectionService.findGroupCountByProjectId(projectId)); + } } diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectInsuranceController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectInsuranceController.java new file mode 100644 index 00000000..d75c3afc --- /dev/null +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectInsuranceController.java @@ -0,0 +1,97 @@ +package com.ruoyi.web.project.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysDictData; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.enums.PublicStateEnum; +import com.ruoyi.system.service.ISysDictDataService; +import com.yanzhu.jh.project.domain.SurProjectInsurance; +import com.yanzhu.jh.project.service.ISurProjectInsuranceService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @version : V1.0 + * @ClassName: ProjectInsuranceController + * @Description: 项目保险 + * @Auther: JiangYuQi + * @Date: 2020/7/7 18:03 + */ +@RestController +@RequestMapping("/wechat/projectInsurance") +public class ProjectInsuranceController extends BaseController { + + @Autowired + ISysDictDataService sysDictDataService; + + @Autowired + private ISurProjectInsuranceService surProjectInsuranceService; + + /** + * 查询项目项目保险列表 + * @param surProjectInsurance + * @return + */ + @GetMapping("/list") + public AjaxResult list(SurProjectInsurance surProjectInsurance){ + if(surProjectInsurance.getDeptId()==0){ + surProjectInsurance.setDeptId(null); + } + return success(surProjectInsuranceService.selectSurProjectInsuranceList(surProjectInsurance)); + } + + /** + * 查询项目保险详情 + * @param id + * @return + */ + @GetMapping("/info") + public AjaxResult info(Long id){ + return success(surProjectInsuranceService.selectSurProjectInsuranceById(id)); + } + + /** + * 新增项目保险 + * @param surProjectInsurance + * @return + */ + @PostMapping("/add") + @Log(title = "项目保险", businessType = BusinessType.INSERT) + public AjaxResult add(@RequestBody SurProjectInsurance surProjectInsurance){ + return success(surProjectInsuranceService.insertSurProjectInsurance(surProjectInsurance)); + } + + /** + * 删除项目保险 + */ + @Log(title = "项目保险", businessType = BusinessType.DELETE) + @GetMapping("/remove") + public AjaxResult remove(@RequestParam Long id) + { + return toAjax(surProjectInsuranceService.deleteSurProjectInsuranceById(id)); + } + + /** + * 根据项目分组查询统计 + * @param projectId + * @return + */ + @GetMapping("/selectGroupCountByProjectId") + public AjaxResult selectGroupCountByProjectId(Long projectId){ + return success(surProjectInsuranceService.findGroupCountByProjectId(projectId)); + } + + /** + * 查询项目保险类型 + * @return + */ + @GetMapping("/queryInsuranceType") + public AjaxResult queryInsuranceType(){ + SysDictData dictData = new SysDictData(); + dictData.setDictType("sur_project_insurance_type"); + dictData.setStatus(PublicStateEnum.OK.getCode()); + return success(sysDictDataService.selectDictDataList(dictData)); + } +} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMaterialSealController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMaterialSealController.java index f5602f6c..89f79cbd 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMaterialSealController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMaterialSealController.java @@ -67,4 +67,13 @@ public class ProjectMaterialSealController extends BaseController { return toAjax(surProjectMaterialSealService.deleteSurProjectMaterialSealById(id)); } + /** + * 根据使用部分查询统计材料封样 + * @param projectId + * @return + */ + @GetMapping("/selectGroupCountByProjectId") + public AjaxResult selectGroupCountByProjectId(Long projectId){ + return success(surProjectMaterialSealService.findGroupCountByProjectId(projectId)); + } } diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMeasureController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMeasureController.java index 889071fe..af7d90c0 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMeasureController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMeasureController.java @@ -59,7 +59,7 @@ public class ProjectMeasureController extends BaseController { */ @PostMapping("/add") @Log(title = "实测实量", businessType = BusinessType.INSERT) - public AjaxResult addTrain(@RequestBody SurProjectMeasure surProjectMeasure){ + public AjaxResult add(@RequestBody SurProjectMeasure surProjectMeasure){ return success(surProjectMeasureService.insertSurProjectMeasure(surProjectMeasure)); } @@ -85,4 +85,14 @@ public class ProjectMeasureController extends BaseController { return success(sysDictDataService.selectDictDataList(dictData)); } + /** + * 根据项目分组查询统计实测实量 + * @param projectId + * @return + */ + @GetMapping("/selectGroupCountByProjectId") + public AjaxResult selectGroupCountByProjectId(Long projectId){ + return success(surProjectMeasureService.findGroupCountByProjectId(projectId)); + } + } diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectProblemmodifyController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectProblemmodifyController.java index 4052039f..1729de29 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectProblemmodifyController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectProblemmodifyController.java @@ -13,7 +13,6 @@ import com.yanzhu.jh.trouble.domain.where.SmzSspProblemmodifyWhere; import com.yanzhu.jh.trouble.service.ISmzSspAuditinfoService; import com.yanzhu.jh.trouble.service.ISmzSspProblemmodifyService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; /** @@ -43,6 +42,8 @@ public class ProjectProblemmodifyController extends BaseController { */ @GetMapping("/list") public AjaxResult list(SmzSspProblemmodify smzSspProblemmodify){ + //启用分页 + startPage(); return success(smzSspProblemmodifyService.selectWechatSmzSspProblemmodifyList(smzSspProblemmodify)); } @@ -142,6 +143,15 @@ public class ProjectProblemmodifyController extends BaseController { return success(sysDictDataService.selectDictDataList(dictData)); } + /** + * 根据项目分组查询统计 + * @param smzSspProblemmodify + * @return + */ + @GetMapping("/selectGroupCountByProjectId") + public AjaxResult selectGroupCountByProjectId(SmzSspProblemmodify smzSspProblemmodify){ + return success(smzSspProblemmodifyService.findGroupCountByProjectId(smzSspProblemmodify)); + } } diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectSpecialController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectSpecialController.java index ca1cd0ca..1f128014 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectSpecialController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectSpecialController.java @@ -59,7 +59,7 @@ public class ProjectSpecialController extends BaseController { */ @PostMapping("/add") @Log(title = "特种人员", businessType = BusinessType.INSERT) - public AjaxResult addTrain(@RequestBody SurProjectWorkSpecial surProjectWorkSpecial){ + public AjaxResult add(@RequestBody SurProjectWorkSpecial surProjectWorkSpecial){ return success(surProjectWorkSpecialService.insertSurProjectWorkSpecial(surProjectWorkSpecial)); } @@ -84,4 +84,14 @@ public class ProjectSpecialController extends BaseController { dictData.setStatus(PublicStateEnum.OK.getCode()); return success(sysDictDataService.selectDictDataList(dictData)); } + + /** + * 根据项目分组查询统计特种人员 + * @param projectId + * @return + */ + @GetMapping("/selectGroupCountByProjectId") + public AjaxResult selectGroupCountByProjectId(Long projectId){ + return success(surProjectWorkSpecialService.findGroupCountByProjectId(projectId)); + } } diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectTrainController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectTrainController.java index e4a00888..76e534c0 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectTrainController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectTrainController.java @@ -101,4 +101,14 @@ public class ProjectTrainController extends BaseController { { return success(surProjectUnitInfoService.selectSurProjectUnitInfoList(surProjectUnitInfo)); } + + /** + * 根据项目分组查询统计 + * @param projectId + * @return + */ + @GetMapping("/selectGroupCountByProjectId") + public AjaxResult selectGroupCountByProjectId(Long projectId){ + return success(workTrainService.findGroupCountByProjectId(projectId)); + } } diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/controller/WechatUserLoginController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/controller/WechatUserLoginController.java index 1589b1fa..47cd08f5 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/controller/WechatUserLoginController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/controller/WechatUserLoginController.java @@ -102,12 +102,12 @@ public class WechatUserLoginController extends BaseController { /** * 根据用户查询菜单信息 - * @param username + * @param map * @return */ @GetMapping("/selectRoleMenuList") - public AjaxResult selectRoleMenuList(String username){ - return success(wechatUserLoginService.selectRoleMenuList(username)); + public AjaxResult selectRoleMenuList(@RequestParam Map map){ + return success(wechatUserLoginService.selectRoleMenuList(map)); } /** diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/mapper/WechatUserLoginMapper.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/mapper/WechatUserLoginMapper.java index 9e16b242..d05479ed 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/mapper/WechatUserLoginMapper.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/mapper/WechatUserLoginMapper.java @@ -70,9 +70,9 @@ public interface WechatUserLoginMapper { /** * 根据用户查询菜单信息 - * @param username + * @param map * @return */ - public List> selectRoleMenuList(String username); + public List> selectRoleMenuList(Map map); } diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/service/IWechatUserLoginService.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/service/IWechatUserLoginService.java index 0cc6e086..c5db2f7f 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/service/IWechatUserLoginService.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/service/IWechatUserLoginService.java @@ -43,10 +43,10 @@ public interface IWechatUserLoginService { /** * 根据用户查询菜单信息 - * @param username + * @param map * @return */ - public List> selectRoleMenuList(String username); + public List> selectRoleMenuList(Map map); /** * 查询用户的组织架构 diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/service/impl/WechatUserLoginServiceImpl.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/service/impl/WechatUserLoginServiceImpl.java index e70f5e68..75fda893 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/service/impl/WechatUserLoginServiceImpl.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/service/impl/WechatUserLoginServiceImpl.java @@ -180,12 +180,12 @@ public class WechatUserLoginServiceImpl implements IWechatUserLoginService { /** * 根据用户查询菜单信息 - * @param username + * @param map * @return */ @Override - public List> selectRoleMenuList(String username) { - return wechatUserLoginMapper.selectRoleMenuList(username); + public List> selectRoleMenuList(Map map) { + return wechatUserLoginMapper.selectRoleMenuList(map); } @Override diff --git a/ruoyi-wechat/src/main/resources/mapper/WechatUserLoginMapper.xml b/ruoyi-wechat/src/main/resources/mapper/WechatUserLoginMapper.xml index 1f48580e..6d19d8d2 100644 --- a/ruoyi-wechat/src/main/resources/mapper/WechatUserLoginMapper.xml +++ b/ruoyi-wechat/src/main/resources/mapper/WechatUserLoginMapper.xml @@ -128,6 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE smc.del_flag = 0 AND su.phonenumber = #{username} + and smc.menu_type=#{type} order by smc.menu_sort asc diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckDetectionMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckDetectionMapper.java index 5ed64b52..1f550763 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckDetectionMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckDetectionMapper.java @@ -77,4 +77,12 @@ public interface SurProjectCheckDetectionMapper */ public List> queryGroupCount(SurProjectCheckDetection surProjectCheckDetection); + /** + * 根据项目统计材料送检 + * + * @param projectId 项目主键 + * @return 结果 + */ + public List> findGroupCountByProjectId(Long projectId); + } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckingMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckingMapper.java index 75cc2ea1..2e2c723c 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckingMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckingMapper.java @@ -76,4 +76,12 @@ public interface SurProjectCheckingMapper * @return 结果 */ public int deleteSurProjectCheckingByIds(Long[] ids); + + /** + * 根据项目统计项目验收信息 + * + * @param projectId 项目主键 + * @return 结果 + */ + public List> findStatisticsByProjectId(Long projectId); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectDeptWroksMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectDeptWroksMapper.java index ae16e362..062972a0 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectDeptWroksMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectDeptWroksMapper.java @@ -1,6 +1,8 @@ package com.yanzhu.jh.project.mapper; import java.util.List; +import java.util.Map; + import com.yanzhu.jh.project.domain.SurProjectDeptWroks; /** @@ -84,6 +86,14 @@ public interface SurProjectDeptWroksMapper */ public int deleteSurProjectDeptWroksById(Long id); + /** + * 删除项目部门在册人员 + * + * @param surProjectDeptWroks 项目部门在册人员 + * @return 结果 + */ + public int deleteSurProjectDeptWroksByParam(SurProjectDeptWroks surProjectDeptWroks); + /** * 批量删除项目部门在册人员 * @@ -91,4 +101,12 @@ public interface SurProjectDeptWroksMapper * @return 结果 */ public int deleteSurProjectDeptWroksByIds(Long[] ids); + + /** + * 根据项目统计在岗人员 + * + * @param projectId 项目主键 + * @return 结果 + */ + public Map findSumByProjectId(Long projectId); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectInsuranceMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectInsuranceMapper.java index 1f505160..b1b7331a 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectInsuranceMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectInsuranceMapper.java @@ -91,4 +91,12 @@ public interface SurProjectInsuranceMapper * @return */ public List selectProjectInsuranceListByProjectId(Long projectId); + + /** + * 根据项目统计保险 + * + * @param projectId 项目主键 + * @return 结果 + */ + public List> findGroupCountByProjectId(Long projectId); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMaterialSealMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMaterialSealMapper.java index 38071d2a..7d080c23 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMaterialSealMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMaterialSealMapper.java @@ -1,6 +1,8 @@ package com.yanzhu.jh.project.mapper; import java.util.List; +import java.util.Map; + import com.yanzhu.jh.project.domain.SurProjectMaterialSeal; /** @@ -59,5 +61,13 @@ public interface SurProjectMaterialSealMapper */ public int deleteSurProjectMaterialSealByIds(Long[] ids); + /** + * 根据项目统计材料封样 + * + * @param projectId 项目主键 + * @return 结果 + */ + public List> findGroupCountByProjectId(Long projectId); + public List selectTop20(SurProjectMaterialSeal where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMeasureMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMeasureMapper.java index d65d8597..1b1ea64f 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMeasureMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMeasureMapper.java @@ -1,6 +1,8 @@ package com.yanzhu.jh.project.mapper; import java.util.List; +import java.util.Map; + import com.yanzhu.jh.project.domain.SurProjectMeasure; /** @@ -59,5 +61,13 @@ public interface SurProjectMeasureMapper */ public int deleteSurProjectMeasureByIds(Long[] ids); + /** + * 根据项目统计实测实量 + * + * @param projectId 项目主键 + * @return 结果 + */ + public List> findGroupCountByProjectId(Long projectId); + public List groupMeasureInfo(SurProjectMeasure where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectWorkSpecialMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectWorkSpecialMapper.java index fe6e8298..008c0161 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectWorkSpecialMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectWorkSpecialMapper.java @@ -84,4 +84,12 @@ public interface SurProjectWorkSpecialMapper * @return 结果 */ public int deleteSurProjectWorkSpecialByIds(Long[] ids); + + /** + * 根据项目统计特种人员 + * + * @param projectId 项目主键 + * @return 结果 + */ + public List> findGroupCountByProjectId(Long projectId); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckDetectionService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckDetectionService.java index 9338f8e3..ef026150 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckDetectionService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckDetectionService.java @@ -76,4 +76,12 @@ public interface ISurProjectCheckDetectionService * @return 材料送检集合 */ public Map queryGroupCount(SurProjectCheckDetection surProjectCheckDetection); + + /** + * 根据项目统计材料送检 + * + * @param projectId 项目主键 + * @return 结果 + */ + public List> findGroupCountByProjectId(Long projectId); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckingService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckingService.java index 644f81de..3b83c159 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckingService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckingService.java @@ -76,4 +76,12 @@ public interface ISurProjectCheckingService * @return 结果 */ public int deleteSurProjectCheckingById(Long id); + + /** + * 根据项目统计项目验收信息 + * + * @param projectId 项目主键 + * @return 结果 + */ + public List> findStatisticsByProjectId(Long projectId); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectDeptWroksService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectDeptWroksService.java index 05911b02..2c13d313 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectDeptWroksService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectDeptWroksService.java @@ -1,6 +1,8 @@ package com.yanzhu.jh.project.service; import java.util.List; +import java.util.Map; + import com.yanzhu.jh.project.domain.SurProjectDeptWroks; /** @@ -59,6 +61,14 @@ public interface ISurProjectDeptWroksService */ public int updateSurProjectDeptWroks(SurProjectDeptWroks surProjectDeptWroks); + /** + * 删除并新增部门在册人员 + * + * @param surProjectDeptWroks 项目部门在册人员 + * @return 结果 + */ + public int deleteInsertProjectDeptWroks(SurProjectDeptWroks surProjectDeptWroks); + /** * 批量删除项目部门在册人员 * @@ -74,4 +84,12 @@ public interface ISurProjectDeptWroksService * @return 结果 */ public int deleteSurProjectDeptWroksById(Long id); + + /** + * 根据项目统计在岗人员 + * + * @param projectId 项目主键 + * @return 结果 + */ + public Map findSumByProjectId(Long projectId); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectInsuranceService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectInsuranceService.java index 0ba3d949..5040e7be 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectInsuranceService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectInsuranceService.java @@ -83,4 +83,12 @@ public interface ISurProjectInsuranceService * @return */ public List selectProjectInsuranceListByProjectId(Long id); + + /** + * 根据项目统计保险 + * + * @param projectId 项目主键 + * @return 结果 + */ + public List> findGroupCountByProjectId(Long projectId); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMaterialSealService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMaterialSealService.java index 19ef0beb..783bcd3d 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMaterialSealService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMaterialSealService.java @@ -1,6 +1,8 @@ package com.yanzhu.jh.project.service; import java.util.List; +import java.util.Map; + import com.yanzhu.jh.project.domain.SurProjectMaterialSeal; /** @@ -59,5 +61,13 @@ public interface ISurProjectMaterialSealService */ public int deleteSurProjectMaterialSealById(Long id); + /** + * 根据项目统计材料封样 + * + * @param projectId 项目主键 + * @return 结果 + */ + public List> findGroupCountByProjectId(Long projectId); + public List selectTop20(SurProjectMaterialSeal where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMeasureService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMeasureService.java index 2d10bc2f..5209d3ff 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMeasureService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMeasureService.java @@ -1,6 +1,8 @@ package com.yanzhu.jh.project.service; import java.util.List; +import java.util.Map; + import com.yanzhu.jh.project.domain.SurProjectMeasure; /** @@ -59,5 +61,13 @@ public interface ISurProjectMeasureService */ public int deleteSurProjectMeasureById(Long id); + /** + * 根据项目统计实测实量 + * + * @param projectId 项目主键 + * @return 结果 + */ + public List> findGroupCountByProjectId(Long projectId); + public List groupMeasureInfo(SurProjectMeasure where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectWorkSpecialService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectWorkSpecialService.java index 406e77df..fa9ab0c2 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectWorkSpecialService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectWorkSpecialService.java @@ -75,4 +75,12 @@ public interface ISurProjectWorkSpecialService * @return 结果 */ public int deleteSurProjectWorkSpecialById(Long id); + + /** + * 根据项目统计特种人员 + * + * @param projectId 项目主键 + * @return 结果 + */ + public List> findGroupCountByProjectId(Long projectId); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckDetectionServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckDetectionServiceImpl.java index de283648..e28f386a 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckDetectionServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckDetectionServiceImpl.java @@ -123,6 +123,7 @@ public class SurProjectCheckDetectionServiceImpl implements ISurProjectCheckDete * @param surProjectCheckDetection 材料送检 * @return 材料送检集合 */ + @Override public Map queryGroupCount(SurProjectCheckDetection surProjectCheckDetection){ List> dataList = surProjectCheckDetectionMapper.queryGroupCount(surProjectCheckDetection); Map dataMap = new HashMap<>(); @@ -133,4 +134,15 @@ public class SurProjectCheckDetectionServiceImpl implements ISurProjectCheckDete } return dataMap; } + + /** + * 根据项目统计材料送检 + * + * @param projectId 项目主键 + * @return 结果 + */ + @Override + public List> findGroupCountByProjectId(Long projectId){ + return surProjectCheckDetectionMapper.findGroupCountByProjectId(projectId); + } } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java index 78a1c611..5cac9392 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java @@ -146,4 +146,15 @@ public class SurProjectCheckingServiceImpl implements ISurProjectCheckingService { return surProjectCheckingMapper.deleteSurProjectCheckingById(id); } + + /** + * 根据项目统计项目验收信息 + * + * @param projectId 项目主键 + * @return 结果 + */ + @Override + public List> findStatisticsByProjectId(Long projectId) { + return surProjectCheckingMapper.findStatisticsByProjectId(projectId); + } } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectDeptWroksServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectDeptWroksServiceImpl.java index 9668fda5..17d07d47 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectDeptWroksServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectDeptWroksServiceImpl.java @@ -1,6 +1,8 @@ package com.yanzhu.jh.project.service.impl; import java.util.List; +import java.util.Map; + import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -107,6 +109,24 @@ public class SurProjectDeptWroksServiceImpl implements ISurProjectDeptWroksServi } } + /** + * 修改项目部门在册人员 + * + * @param surProjectDeptWroks 项目部门在册人员 + * @return 结果 + */ + @Override + @Transactional + public int deleteInsertProjectDeptWroks(SurProjectDeptWroks surProjectDeptWroks) + { + surProjectDeptWroksMapper.deleteSurProjectDeptWroksByParam(surProjectDeptWroks); + if(surProjectDeptWroks.getCreateBy()==null){ + surProjectDeptWroks.setCreateBy(SecurityUtils.getUsername()); + } + surProjectDeptWroks.setCreateTime(DateUtils.getNowDate()); + return surProjectDeptWroksMapper.insertSurProjectDeptWroks(surProjectDeptWroks); + } + /** * 批量删除项目部门在册人员 * @@ -130,4 +150,14 @@ public class SurProjectDeptWroksServiceImpl implements ISurProjectDeptWroksServi { return surProjectDeptWroksMapper.deleteSurProjectDeptWroksById(id); } + + /** + * 根据项目统计在岗人员 + * + * @param projectId 项目主键 + * @return 结果 + */ + public Map findSumByProjectId(Long projectId) { + return surProjectDeptWroksMapper.findSumByProjectId(projectId); + } } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectInsuranceServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectInsuranceServiceImpl.java index b542f739..a3a9b664 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectInsuranceServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectInsuranceServiceImpl.java @@ -82,11 +82,12 @@ public class SurProjectInsuranceServiceImpl implements ISurProjectInsuranceServi @Transactional public int insertSurProjectInsurance(SurProjectInsurance surProjectInsurance) { - surProjectInsurance.setCreateBy(SecurityUtils.getUsername()); + if(surProjectInsurance.getCreateBy()==null){ + surProjectInsurance.setCreateBy(SecurityUtils.getUsername()); + } surProjectInsurance.setCreateTime(DateUtils.getNowDate()); surProjectInsurance.setInsuranceState(PublicStateEnum.YES.getCode()); surProjectInsurance.setIsDel(PublicStateEnum.OK.getCode()); - surProjectInsurance.setIsDel("0"); int res = -1; //效验保险是否已办理 int total = surProjectInsuranceMapper.findInsuranceByParams(surProjectInsurance); @@ -143,4 +144,15 @@ public class SurProjectInsuranceServiceImpl implements ISurProjectInsuranceServi public List selectProjectInsuranceListByProjectId(Long projectId) { return surProjectInsuranceMapper.selectProjectInsuranceListByProjectId(projectId); } + + /** + * 根据项目统计保险 + * + * @param projectId 项目主键 + * @return 结果 + */ + @Override + public List> findGroupCountByProjectId(Long projectId){ + return surProjectInsuranceMapper.findGroupCountByProjectId(projectId); + } } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMaterialSealServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMaterialSealServiceImpl.java index 2fc07199..64384460 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMaterialSealServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMaterialSealServiceImpl.java @@ -1,6 +1,7 @@ package com.yanzhu.jh.project.service.impl; import java.util.List; +import java.util.Map; import com.ruoyi.common.enums.PublicStateEnum; import com.ruoyi.common.utils.DateUtils; @@ -103,6 +104,17 @@ public class SurProjectMaterialSealServiceImpl implements ISurProjectMaterialSea return surProjectMaterialSealMapper.deleteSurProjectMaterialSealById(id); } + /** + * 根据项目统计材料封样 + * + * @param projectId 项目主键 + * @return 结果 + */ + @Override + public List> findGroupCountByProjectId(Long projectId) { + return surProjectMaterialSealMapper.findGroupCountByProjectId(projectId); + } + @Override public List selectTop20(SurProjectMaterialSeal where) { return surProjectMaterialSealMapper.selectTop20(where); diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMeasureServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMeasureServiceImpl.java index 794d82bd..53454035 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMeasureServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMeasureServiceImpl.java @@ -1,6 +1,7 @@ package com.yanzhu.jh.project.service.impl; import java.util.List; +import java.util.Map; import com.ruoyi.common.enums.PublicStateEnum; import com.ruoyi.common.utils.DateUtils; @@ -103,6 +104,16 @@ public class SurProjectMeasureServiceImpl implements ISurProjectMeasureService return surProjectMeasureMapper.deleteSurProjectMeasureById(id); } + /** + * 根据项目统计实测实量 + * + * @param projectId 项目主键 + * @return 结果 + */ + public List> findGroupCountByProjectId(Long projectId) { + return surProjectMeasureMapper.findGroupCountByProjectId(projectId); + } + @Override public List groupMeasureInfo(SurProjectMeasure where) { return surProjectMeasureMapper.groupMeasureInfo(where); diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectWorkSpecialServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectWorkSpecialServiceImpl.java index 732454bf..77e4ead5 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectWorkSpecialServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectWorkSpecialServiceImpl.java @@ -129,4 +129,15 @@ public class SurProjectWorkSpecialServiceImpl implements ISurProjectWorkSpecialS { return surProjectWorkSpecialMapper.deleteSurProjectWorkSpecialById(id); } + + /** + * 根据项目统计特种人员 + * + * @param projectId 项目主键 + * @return 结果 + */ + @Override + public List> findGroupCountByProjectId(Long projectId) { + return surProjectWorkSpecialMapper.findGroupCountByProjectId(projectId); + } } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodify.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodify.java index 10e6740a..ff6095ce 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodify.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodify.java @@ -112,6 +112,10 @@ public class SmzSspProblemmodify extends BaseEntity @Excel(name = "创建人") private String createUser; + /** 检查类型 */ + @Excel(name = "检查类型") + private String problemType; + private String createUserName; /** 修改人 */ @@ -426,6 +430,14 @@ public class SmzSspProblemmodify extends BaseEntity this.flag = flag; } + public String getProblemType() { + return problemType; + } + + public void setProblemType(String problemType) { + this.problemType = problemType; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java index bc7b47c2..bec7b0c5 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java @@ -113,6 +113,14 @@ public interface SmzSspProblemmodifyMapper */ public List countByDate(SmzSspProblemmodifyWhere where); + /** + * 根据项目统计隐患排查 + * + * @param smzSspProblemmodify 隐患排查 + * @return 结果 + */ + public List> findGroupCountByProjectId(SmzSspProblemmodify smzSspProblemmodify); + /** * 查询两个日期之间的预警数 * @param where startDate 开始日期 endDate 结束日期 diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java index 0e8d3d14..715e3f54 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java @@ -95,6 +95,14 @@ public interface ISmzSspProblemmodifyService */ public List selectSummary(SmzSspProblemmodifyWhere where); + /** + * 根据项目统计隐患排查 + * + * @param smzSspProblemmodify 隐患排查 + * @return 结果 + */ + public List> findGroupCountByProjectId(SmzSspProblemmodify smzSspProblemmodify); + /** * 分类汇总(按项目) * @param deptId 部门编号 0为全部 diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java index 6e6fb047..a32ec6d3 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java @@ -263,4 +263,14 @@ public class SmzSspProblemmodifyServiceImpl implements ISmzSspProblemmodifyServi } } + /** + * 根据项目统计隐患排查 + * + * @param smzSspProblemmodify 隐患排查 + * @return 结果 + */ + public List> findGroupCountByProjectId(SmzSspProblemmodify smzSspProblemmodify){ + return smzSspProblemmodifyMapper.findGroupCountByProjectId(smzSspProblemmodify); + } + } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkTrainMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkTrainMapper.java index 39122381..0109a139 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkTrainMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkTrainMapper.java @@ -1,6 +1,8 @@ package com.yanzhu.jh.work.mapper; import java.util.List; +import java.util.Map; + import com.yanzhu.jh.work.domain.WorkTrain; import com.yanzhu.jh.work.domain.WorkTrainDept; @@ -108,4 +110,12 @@ public interface WorkTrainMapper * @return 结果 */ public int deleteWorkTrainDeptByTrainId(Long id); + + /** + * 根据项目统计教育培训 + * + * @param projectId 项目主键 + * @return 结果 + */ + public List> findGroupCountByProjectId(Long projectId); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkTrainService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkTrainService.java index 1c82a055..e1f15c28 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkTrainService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkTrainService.java @@ -1,6 +1,8 @@ package com.yanzhu.jh.work.service; import java.util.List; +import java.util.Map; + import com.yanzhu.jh.work.domain.WorkTrain; /** @@ -82,4 +84,12 @@ public interface IWorkTrainService * @return 结果 */ public int deleteWorkTrainById(Long id); + + /** + * 根据项目统计教育培训 + * + * @param projectId 项目主键 + * @return 结果 + */ + public List> findGroupCountByProjectId(Long projectId); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkTrainServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkTrainServiceImpl.java index 714c231b..e5121153 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkTrainServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkTrainServiceImpl.java @@ -13,6 +13,8 @@ import com.yanzhu.jh.project.mapper.SurProjectMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Map; + import com.ruoyi.common.utils.StringUtils; import org.springframework.transaction.annotation.Transactional; import com.yanzhu.jh.work.domain.WorkTrainDept; @@ -207,4 +209,15 @@ public class WorkTrainServiceImpl implements IWorkTrainService } } } + + /** + * 根据项目统计教育培训 + * + * @param projectId 项目主键 + * @return 结果 + */ + @Override + public List> findGroupCountByProjectId(Long projectId) { + return workTrainMapper.findGroupCountByProjectId(projectId); + } } diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml index b49ff342..378fba18 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml @@ -111,6 +111,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + insert into sur_project_checking diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectDeptWroksMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectDeptWroksMapper.xml index d4d4a11c..52ffcf3c 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectDeptWroksMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectDeptWroksMapper.xml @@ -21,14 +21,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, project_id, dept_id, service_personnel, supervisor_personnel, contractor_personnel, create_by, create_time, update_by, update_time, remark from sur_project_dept_wroks + select dw.id, dw.project_id, dw.dept_id, d.dept_name, dw.service_personnel, dw.supervisor_personnel, dw.contractor_personnel, dw.create_by, dw.create_time, dw.update_by, dw.update_time, dw.remark from sur_project_dept_wroks dw + left join sys_dept d on d.dept_id=dw.dept_id @@ -58,6 +59,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - where id = #{id} + where dw.id = #{id} @@ -131,6 +146,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from sur_project_dept_wroks where id = #{id} + + delete from sur_project_dept_wroks where project_id = #{projectId} and dept_id = #{deptId} + + delete from sur_project_dept_wroks where id in diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml index ebaa48da..074aa56b 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml @@ -27,7 +27,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, project_id, dept_id, insurance_type, insurance_number, insurance_file, insurance_state, begin_date, end_date, company_name, is_del, create_by, create_time, update_by, update_time, remark from sur_project_insurance + select spi.id, spi.project_id, sp.projectName as project_name, spi.dept_id, d.dept_name, spi.insurance_type, sdd.dict_label as insurance_type_name, spi.insurance_number, spi.insurance_file, spi.insurance_state, spi.begin_date, spi.end_date, spi.company_name, spi.is_del, spi.create_by, spi.create_time, spi.update_by, spi.update_time, spi.remark from sur_project_insurance spi + left join sur_project sp on sp.id=spi.project_id + left JOIN sys_dict_data sdd ON sdd.dict_type = 'sur_project_insurance_type' AND spi.insurance_type = sdd.dict_value + left join sys_dept d on d.dept_id = spi.dept_id + + - where id = #{id} + where spi.id = #{id} diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml index f68db178..23419e9c 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml @@ -60,6 +60,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and spu.user_id = #{nowUser} and spu.is_del=0 + + + + + + - select ssp.id, ssp.projectId, ssp.infoType, ssp.problemArea, ssp.workParts, ssp.changeInfo, ssp.lordSent, ssp.lordSentUser, ssp.copySend, ssp.copySendUser, ssp.checkState, ssp.nickedArea, ssp.nickedTime, ssp.projectType, ssp.processName, ssp.projectName, ssp.nickedInfo, ssp.checkUser, ssp.checkUserPhone, ssp.isDel, ssp.createUser, ssp.createTime, ssp.updateUser, ssp.updateTime, ssp.marks_picture, ssp.marks_video, ssp.smark_url, ssp.danger_type, ssp.recheckSend, ssp.recheckSendUser, ssp.roleType,ssp.createBy, - CASE WHEN(ssp.createUser = #{nowUser} - or #{nowRole} in ('1','2','3','4') ) and ssp.checkState < 4 - THEN 0 ELSE 1 - END AS v_del + select ssp.id, ssp.projectId, ssp.infoType, ssp.problemArea, ssp.workParts, ssp.changeInfo, ssp.lordSent, ssp.lordSentUser, ssp.copySend, ssp.copySendUser, ssp.checkState, ssp.nickedArea, ssp.nickedTime, ssp.projectType, ssp.processName, ssp.projectName, ssp.nickedInfo, ssp.checkUser, ssp.checkUserPhone, ssp.isDel, ssp.createUser, ssp.createTime, ssp.updateUser, ssp.updateTime, ssp.marks_picture, ssp.marks_video, ssp.smark_url, ssp.danger_type, ssp.recheckSend, ssp.recheckSendUser, ssp.roleType, ssp.createBy from vw_smz_ssp_problemmodify_audit ssp left join sur_project sp on ssp.projectId = sp.id @@ -73,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and ssp.checkState = #{checkState} and nickedArea = #{nickedArea} and ssp.nickedTime = #{nickedTime} + and ssp.problemType = #{problemType} and ssp.projectType = #{projectType} and ssp.processName like concat('%', #{processName}, '%') and ssp.projectName like concat('%', #{projectName}, '%') @@ -105,13 +103,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select wt.id, wt.project_id, wt.project_name, wt.main_image, wt.train_type, wt.train_title, wt.train_nature, wt.train_participants, wt.begin_date, wt.end_date, wt.train_content, wt.train_file, wt.is_del, wt.create_by, wt.create_time, wt.update_by, wt.update_time, wt.remark, group_concat(sd.dept_id) as trainDeptIds, group_concat(sd.dept_name) as trainDeptNames, - CASE - WHEN ( - wt.create_by = #{nowUserName} - OR #{nowRole} IN ('1', '2', '3', '4') - ) - AND begin_date > NOW() THEN - 0 - ELSE - 1 - END v_del + select wt.id, wt.project_id, wt.project_name, wt.main_image, wt.train_type, wt.train_title, wt.train_nature, wt.train_participants, wt.begin_date, wt.end_date, wt.train_content, wt.train_file, wt.is_del, wt.create_by, wt.create_time, wt.update_by, wt.update_time, wt.remark, group_concat(sd.dept_id) as trainDeptIds, group_concat(sd.dept_name) as trainDeptNames from work_train wt left join work_train_dept wtd on wtd.train_id = wt.id left join sys_dept sd on sd.dept_id = wtd.dept_id @@ -141,6 +131,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_dept d on b.dept_id = d.dept_id where a.id = #{id} + + insert into work_train