From 64b66015aa1f87d1e95e3f1e423c48533a5be5cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Sun, 21 Jan 2024 20:09:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectCheckingController.java | 10 ++++++++++ .../controller/ProjectDetectionController.java | 12 ++---------- .../controller/ProjectInsuranceController.java | 12 ++---------- .../controller/ProjectMeasureController.java | 12 ++---------- .../ProjectProblemmodifyController.java | 12 ++---------- .../controller/ProjectSpecialController.java | 12 ++---------- .../controller/ProjectTrainController.java | 14 ++++++++++++++ .../WcProjectStandardController.java | 12 ++---------- .../jh/project/domain/SurProjectChecking.java | 18 ++++++++++++++++++ .../com/yanzhu/jh/work/domain/WorkTrain.java | 9 +++++++++ .../project/SurProjectCheckingMapper.xml | 14 +++++++++++--- .../resources/mapper/work/WorkTrainMapper.xml | 10 +++++++--- 12 files changed, 81 insertions(+), 66 deletions(-) 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 02eafd9a..cc4118fc 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 @@ -4,6 +4,7 @@ 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.ruoyi.common.utils.DictUtils; import com.yanzhu.jh.project.domain.SurProjectChecking; import com.yanzhu.jh.project.service.ISurProjectCheckingService; import org.springframework.beans.factory.annotation.Autowired; @@ -100,4 +101,13 @@ public class ProjectCheckingController extends BaseController { public AjaxResult findStatisticsByProjectId(Long projectId){ return success(surProjectCheckingService.findStatisticsByProjectId(projectId)); } + + /** + * 查询字段类型数据 + * @return + */ + @GetMapping("/queryDictType") + public AjaxResult queryDictType(String type){ + return success(DictUtils.getDictCache(type)); + } } 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 884b33cd..939830d7 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 @@ -3,10 +3,8 @@ 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.ruoyi.common.utils.DictUtils; import com.yanzhu.jh.project.domain.SurProjectCheckDetection; import com.yanzhu.jh.project.service.ISurProjectCheckDetectionService; import org.springframework.beans.factory.annotation.Autowired; @@ -23,9 +21,6 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("/wechat/projectDetection") public class ProjectDetectionController extends BaseController { - @Autowired - private ISysDictDataService sysDictDataService; - @Autowired private ISurProjectCheckDetectionService surProjectCheckDetectionService; @@ -103,10 +98,7 @@ public class ProjectDetectionController extends BaseController { */ @GetMapping("/queryType") public AjaxResult queryType(){ - SysDictData dictData = new SysDictData(); - dictData.setDictType("check_detection_check_type"); - dictData.setStatus(PublicStateEnum.OK.getCode()); - return success(sysDictDataService.selectDictDataList(dictData)); + return success(DictUtils.getDictCache("check_detection_check_type")); } /** 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 index 4763ee2a..fa7fc379 100644 --- 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 @@ -3,10 +3,8 @@ 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.ruoyi.common.utils.DictUtils; import com.yanzhu.jh.project.domain.SurProjectInsurance; import com.yanzhu.jh.project.service.ISurProjectInsuranceService; import org.springframework.beans.factory.annotation.Autowired; @@ -23,9 +21,6 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("/wechat/projectInsurance") public class ProjectInsuranceController extends BaseController { - @Autowired - private ISysDictDataService sysDictDataService; - @Autowired private ISurProjectInsuranceService surProjectInsuranceService; @@ -89,9 +84,6 @@ public class ProjectInsuranceController extends BaseController { */ @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)); + return success(DictUtils.getDictCache("sur_project_insurance_type")); } } 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 b316baa5..484a260b 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 @@ -3,10 +3,8 @@ 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.ruoyi.common.utils.DictUtils; import com.yanzhu.jh.project.domain.SurProjectMeasure; import com.yanzhu.jh.project.service.ISurProjectMeasureService; import org.springframework.beans.factory.annotation.Autowired; @@ -23,9 +21,6 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("/wechat/projectMeasure") public class ProjectMeasureController extends BaseController { - @Autowired - private ISysDictDataService sysDictDataService; - @Autowired private ISurProjectMeasureService surProjectMeasureService; @@ -103,10 +98,7 @@ public class ProjectMeasureController extends BaseController { */ @GetMapping("/queryDictType") public AjaxResult queryDictType(String type){ - SysDictData dictData = new SysDictData(); - dictData.setDictType(type); - dictData.setStatus(PublicStateEnum.OK.getCode()); - return success(sysDictDataService.selectDictDataList(dictData)); + return success(DictUtils.getDictCache(type)); } /** 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 409b97c3..d7d4f0db 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 @@ -3,10 +3,8 @@ 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.ruoyi.common.utils.DictUtils; import com.yanzhu.jh.trouble.domain.SmzSspAuditinfo; import com.yanzhu.jh.trouble.domain.SmzSspProblemmodify; import com.yanzhu.jh.trouble.domain.SmzSspProblemmodifyDraft; @@ -30,9 +28,6 @@ import java.util.List; @RequestMapping("/wechat/projectProblemmodify") public class ProjectProblemmodifyController extends BaseController { - @Autowired - private ISysDictDataService sysDictDataService; - @Autowired private ISmzSspAuditinfoService smzSspAuditinfoService; @@ -166,10 +161,7 @@ public class ProjectProblemmodifyController extends BaseController { */ @GetMapping("/queryDangerType") public AjaxResult queryDangerType(@RequestParam String type){ - SysDictData dictData = new SysDictData(); - dictData.setDictType(type); - dictData.setStatus(PublicStateEnum.OK.getCode()); - return success(sysDictDataService.selectDictDataList(dictData)); + return success(DictUtils.getDictCache(type)); } /** 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 9f0844de..29dee4f3 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 @@ -3,10 +3,8 @@ 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.ruoyi.common.utils.DictUtils; import com.yanzhu.jh.project.domain.SurProjectWorkSpecial; import com.yanzhu.jh.project.service.ISurProjectWorkSpecialService; import org.springframework.beans.factory.annotation.Autowired; @@ -23,9 +21,6 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("/wechat/projectSpecial") public class ProjectSpecialController extends BaseController { - @Autowired - private ISysDictDataService sysDictDataService; - @Autowired private ISurProjectWorkSpecialService surProjectWorkSpecialService; @@ -79,10 +74,7 @@ public class ProjectSpecialController extends BaseController { */ @GetMapping("/querySpecialType") public AjaxResult querySpecialType(){ - SysDictData dictData = new SysDictData(); - dictData.setDictType("project_special_type"); - dictData.setStatus(PublicStateEnum.OK.getCode()); - return success(sysDictDataService.selectDictDataList(dictData)); + return success(DictUtils.getDictCache("project_special_type")); } /** 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 76e534c0..5da8e6c9 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 @@ -4,6 +4,8 @@ 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.ruoyi.common.utils.DictUtils; +import com.ruoyi.system.service.ISysDictDataService; import com.yanzhu.jh.project.domain.SurProjectUnitInfo; import com.yanzhu.jh.project.service.ISurProjectUnitInfoService; import com.yanzhu.jh.work.domain.WorkTrain; @@ -22,6 +24,9 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("/wechat/projectTrain") public class ProjectTrainController extends BaseController { + @Autowired + private ISysDictDataService sysDictDataService; + @Autowired private IWorkTrainService workTrainService; @@ -111,4 +116,13 @@ public class ProjectTrainController extends BaseController { public AjaxResult selectGroupCountByProjectId(Long projectId){ return success(workTrainService.findGroupCountByProjectId(projectId)); } + + /** + * 查询演训类型 + * @return + */ + @GetMapping("/queryTrainDataType") + public AjaxResult queryTrainDataType(){ + return success(DictUtils.getDictCache("work_train_data_type")); + } } diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/WcProjectStandardController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/WcProjectStandardController.java index 975c3b72..76ee79ec 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/WcProjectStandardController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/WcProjectStandardController.java @@ -3,10 +3,8 @@ 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.ruoyi.common.utils.DictUtils; import com.yanzhu.jh.project.domain.SurProjectStandard; import com.yanzhu.jh.project.service.ISurProjectStandardService; import org.springframework.beans.factory.annotation.Autowired; @@ -23,9 +21,6 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("/wechat/projectStandard") public class WcProjectStandardController extends BaseController { - @Autowired - private ISysDictDataService sysDictDataService; - @Autowired private ISurProjectStandardService surProjectStandardService; @@ -79,10 +74,7 @@ public class WcProjectStandardController extends BaseController { */ @GetMapping("/queryStandardType") public AjaxResult queryStandardType(){ - SysDictData dictData = new SysDictData(); - dictData.setDictType("prj_standard_type"); - dictData.setStatus(PublicStateEnum.OK.getCode()); - return success(sysDictDataService.selectDictDataList(dictData)); + return success(DictUtils.getDictCache("prj_standard_type")); } } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java index 6963da14..baf6cd74 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java @@ -131,6 +131,8 @@ public class SurProjectChecking extends BaseEntity private String projectName; private String deptName; + private String dataTypeLvl1Name; + private String dataTypeLvl2Name; public void setId(Long id) { @@ -346,6 +348,22 @@ public class SurProjectChecking extends BaseEntity this.approveStatus = approveStatus; } + public String getDataTypeLvl1Name() { + return dataTypeLvl1Name; + } + + public void setDataTypeLvl1Name(String dataTypeLvl1Name) { + this.dataTypeLvl1Name = dataTypeLvl1Name; + } + + public String getDataTypeLvl2Name() { + return dataTypeLvl2Name; + } + + public void setDataTypeLvl2Name(String dataTypeLvl2Name) { + this.dataTypeLvl2Name = dataTypeLvl2Name; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java index b440ae20..ae210485 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java @@ -89,6 +89,7 @@ public class WorkTrain extends BaseEntity private String trainNatureName; private String vDel; private Long deptId;//子公司查询使用 + private String dataTypeName; public void setId(Long id) { @@ -253,6 +254,14 @@ public class WorkTrain extends BaseEntity this.trainFile = trainFile; } + public String getDataTypeName() { + return dataTypeName; + } + + public void setDataTypeName(String dataTypeName) { + this.dataTypeName = dataTypeName; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml index c17ef3c1..1db2f498 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml @@ -36,18 +36,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select spc.id, spc.project_id, spc.dept_id, spc.group_dept_id, spc.check_type, spc.main_image, spc.image_urls, spc.working_position_type, spc.check_working_position, spc.checking_num, spc.check_result, spc.intro, spc.quality_user, spc.quality_user_name, spc.supervise_user, spc.supervise_user_name, spc.group_dept_user, spc.group_dept_user_name, spc.checking_date, spc.checking_files, spc.is_del, spc.create_by, spc.create_time, spc.update_by, spc.update_time, spc.remark, spc.approve_status, spc.data_type_lvl1, spc.data_type_lvl2, sp.projectName, sd.dept_name from sur_project_checking spc + select spc.id, spc.project_id, spc.dept_id, spc.group_dept_id, spc.check_type, spc.main_image, spc.image_urls, spc.working_position_type, spc.check_working_position, spc.checking_num, spc.check_result, spc.intro, spc.quality_user, spc.quality_user_name, spc.supervise_user, spc.supervise_user_name, spc.group_dept_user, spc.group_dept_user_name, spc.checking_date, spc.checking_files, spc.is_del, spc.create_by, spc.create_time, spc.update_by, spc.update_time, spc.remark, spc.approve_status, spc.data_type_lvl1, spc.data_type_lvl2, sp.projectName, sd.dept_name, sdd1.dict_label as data_type_lvl1_name, sdd2.dict_label as data_type_lvl2_name from sur_project_checking spc left join sur_project sp on spc.project_id = sp.id left join sys_dept sd on sd.dept_id = spc.dept_id + left join sys_dict_data sdd1 on sdd1.dict_type='project_checking_data_type_lvl1' and sdd1.dict_value = spc.data_type_lvl1 + left join sys_dict_data sdd2 on sdd2.dict_type='project_checking_data_type_lvl2' and sdd2.dict_value = spc.data_type_lvl2 diff --git a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml index 987e0c36..d93b5939 100644 --- a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml @@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -44,11 +45,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"