diff --git a/ruoyi-system/src/main/resources/mapper/flowable/FlowDeployMapper.xml b/ruoyi-system/src/main/resources/mapper/flowable/FlowDeployMapper.xml
index 4f242ef2..c704ba04 100644
--- a/ruoyi-system/src/main/resources/mapper/flowable/FlowDeployMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/flowable/FlowDeployMapper.xml
@@ -32,7 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and rd.category_ = #{category}
- GROUP BY rp.key_
+
+ group by rp.deployment_id_
order by rpr.SORT_
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/controller/FlowableController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/controller/WcFlowableController.java
similarity index 96%
rename from ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/controller/FlowableController.java
rename to ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/controller/WcFlowableController.java
index 1feca2b9..280af876 100644
--- a/ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/controller/FlowableController.java
+++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/controller/WcFlowableController.java
@@ -6,9 +6,7 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.enums.SysRoleEnum;
import com.ruoyi.flowable.domain.dto.FlowTaskDto;
import com.ruoyi.flowable.domain.vo.FlowTaskVo;
import com.ruoyi.flowable.domain.vo.StartTaskVO;
@@ -24,7 +22,6 @@ import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@@ -37,7 +34,7 @@ import java.util.concurrent.TimeUnit;
*/
@RestController
@RequestMapping("/wechat/flowTask")
-public class FlowableController extends BaseController {
+public class WcFlowableController extends BaseController {
@Autowired
private RedisCache redisCache;
@@ -52,10 +49,10 @@ public class FlowableController extends BaseController {
private IFlowDefinitionService flowDefinitionService;
@Autowired
- IFlowInstanceService flowInstanceService;
+ private IFlowInstanceService flowInstanceService;
@Autowired
- ISurProjectAuditinfoService surProjectAuditinfoService;
+ private ISurProjectAuditinfoService surProjectAuditinfoService;
@Autowired
private IFlowBusinessKeyService flowBusinessKeyService;
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 61dd3d2f..02eafd9a 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
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
public class ProjectCheckingController extends BaseController {
@Autowired
- ISurProjectCheckingService surProjectCheckingService;
+ private ISurProjectCheckingService surProjectCheckingService;
/**
* 查询当前用户举牌验收项目列表
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectController.java
index 04cead30..84cbb94a 100644
--- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectController.java
+++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectController.java
@@ -29,7 +29,7 @@ public class ProjectController extends BaseController {
private RedisCache redisCache;
@Autowired
- WxIProjectInfoService IProjectInfoService;
+ private WxIProjectInfoService IProjectInfoService;
/**
* Methods
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 5eb3e8e5..884b33cd 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
@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
public class ProjectDetectionController extends BaseController {
@Autowired
- ISysDictDataService sysDictDataService;
+ private ISysDictDataService sysDictDataService;
@Autowired
private ISurProjectCheckDetectionService surProjectCheckDetectionService;
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 d75c3afc..4763ee2a 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
@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
public class ProjectInsuranceController extends BaseController {
@Autowired
- ISysDictDataService sysDictDataService;
+ private ISysDictDataService sysDictDataService;
@Autowired
private ISurProjectInsuranceService surProjectInsuranceService;
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 4f32fbe9..b316baa5 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
@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
public class ProjectMeasureController extends BaseController {
@Autowired
- ISysDictDataService sysDictDataService;
+ private ISysDictDataService sysDictDataService;
@Autowired
private ISurProjectMeasureService surProjectMeasureService;
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 27a48db2..409b97c3 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
@@ -31,16 +31,16 @@ import java.util.List;
public class ProjectProblemmodifyController extends BaseController {
@Autowired
- ISysDictDataService sysDictDataService;
+ private ISysDictDataService sysDictDataService;
@Autowired
- ISmzSspAuditinfoService smzSspAuditinfoService;
+ private ISmzSspAuditinfoService smzSspAuditinfoService;
@Autowired
- ISmzSspProblemmodifyService smzSspProblemmodifyService;
+ private ISmzSspProblemmodifyService smzSspProblemmodifyService;
@Autowired
- ISmzSspProblemmodifyDraftService smzSspProblemmodifyDraftService;
+ private ISmzSspProblemmodifyDraftService smzSspProblemmodifyDraftService;
/**
* 查询当前用户问题整改列表
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 1f128014..9f0844de 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
@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
public class ProjectSpecialController extends BaseController {
@Autowired
- ISysDictDataService sysDictDataService;
+ private ISysDictDataService sysDictDataService;
@Autowired
private ISurProjectWorkSpecialService surProjectWorkSpecialService;
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectUserinfoController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectUserinfoController.java
index 53a22b03..204d4f58 100644
--- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectUserinfoController.java
+++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectUserinfoController.java
@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
public class ProjectUserinfoController extends BaseController {
@Autowired
- ISurProjectUserinfoService surProjectUserinfoService;
+ private ISurProjectUserinfoService surProjectUserinfoService;
/**
* 根据项目查询项目人员信息
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
new file mode 100644
index 00000000..975c3b72
--- /dev/null
+++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/WcProjectStandardController.java
@@ -0,0 +1,88 @@
+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.SurProjectStandard;
+import com.yanzhu.jh.project.service.ISurProjectStandardService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @version : V1.0
+ * @ClassName: ProjectStandardController
+ * @Description: 项目标准管理
+ * @Auther: JiangYuQi
+ * @Date: 2020/7/7 18:03
+ */
+@RestController
+@RequestMapping("/wechat/projectStandard")
+public class WcProjectStandardController extends BaseController {
+
+ @Autowired
+ private ISysDictDataService sysDictDataService;
+
+ @Autowired
+ private ISurProjectStandardService surProjectStandardService;
+
+ /**
+ * 查询项目标准列表
+ * @param surProjectStandard
+ * @return
+ */
+ @GetMapping("/list")
+ public AjaxResult list(SurProjectStandard surProjectStandard){
+ if(surProjectStandard.getDeptId()==0){
+ surProjectStandard.setDeptId(null);
+ }
+ return success(surProjectStandardService.selectSurProjectStandardList(surProjectStandard));
+ }
+
+ /**
+ * 查询项目标准详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/info")
+ public AjaxResult info(Long id){
+ return success(surProjectStandardService.selectSurProjectStandardById(id));
+ }
+
+ /**
+ * 新增项目标准管理
+ * @param surProjectStandard
+ * @return
+ */
+ @PostMapping("/add")
+ @Log(title = "项目标准管理", businessType = BusinessType.INSERT)
+ public AjaxResult add(@RequestBody SurProjectStandard surProjectStandard){
+ return success(surProjectStandardService.insertSurProjectStandard(surProjectStandard));
+ }
+
+ /**
+ * 删除项目标准管理
+ */
+ @Log(title = "项目标准管理", businessType = BusinessType.DELETE)
+ @GetMapping("/remove")
+ public AjaxResult remove(@RequestParam Long id)
+ {
+ return toAjax(surProjectStandardService.deleteSurProjectStandardById(id));
+ }
+
+ /**
+ * 查询项目标准类型
+ * @return
+ */
+ @GetMapping("/queryStandardType")
+ public AjaxResult queryStandardType(){
+ SysDictData dictData = new SysDictData();
+ dictData.setDictType("prj_standard_type");
+ dictData.setStatus(PublicStateEnum.OK.getCode());
+ return success(sysDictDataService.selectDictDataList(dictData));
+ }
+
+}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectStandard.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectStandard.java
index ce6793e6..983c86d3 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectStandard.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectStandard.java
@@ -46,6 +46,10 @@ public class SurProjectStandard extends BaseEntity
@Excel(name = "")
private Long isDel;
+ private String deptName;
+ private String standardTypeName;
+ private String standardTypeRemark;
+
public void setId(Long id)
{
this.id = id;
@@ -119,6 +123,30 @@ public class SurProjectStandard extends BaseEntity
return isDel;
}
+ public String getStandardTypeName() {
+ return standardTypeName;
+ }
+
+ public void setStandardTypeName(String standardTypeName) {
+ this.standardTypeName = standardTypeName;
+ }
+
+ public String getDeptName() {
+ return deptName;
+ }
+
+ public void setDeptName(String deptName) {
+ this.deptName = deptName;
+ }
+
+ public String getStandardTypeRemark() {
+ return standardTypeRemark;
+ }
+
+ public void setStandardTypeRemark(String standardTypeRemark) {
+ this.standardTypeRemark = standardTypeRemark;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectStandardServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectStandardServiceImpl.java
index 01a74b41..be1657de 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectStandardServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectStandardServiceImpl.java
@@ -56,7 +56,9 @@ public class SurProjectStandardServiceImpl implements ISurProjectStandardService
@Override
public int insertSurProjectStandard(SurProjectStandard surProjectStandard)
{
- surProjectStandard.setCreateBy(SecurityUtils.getUsername());
+ if(surProjectStandard.getCreateBy()==null){
+ surProjectStandard.setCreateBy(SecurityUtils.getUsername());
+ }
surProjectStandard.setCreateTime(DateUtils.getNowDate());
return surProjectStandardMapper.insertSurProjectStandard(surProjectStandard);
}
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml
index 324d79bb..7db1e320 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml
@@ -8,10 +8,13 @@
+
+
+
@@ -20,26 +23,28 @@
- select id, project_id, dept_id, image_file, standard_desc, ord, standard_type, is_del, create_by, create_time, update_by, update_time from sur_project_standard
+ select sps.id, sps.project_id, sps.dept_id, sd.dept_name, sps.image_file, sps.standard_desc, sps.ord, sps.standard_type, sdd.dict_label as standard_type_name, sdd.remark as standard_type_remark, sps.is_del, sps.create_by, sps.create_time, sps.update_by, sps.update_time from sur_project_standard sps
+ left join sys_dict_data sdd on sps.standard_type = sdd.dict_value and sdd.dict_type='prj_standard_type'
+ left join sys_dept sd on sd.dept_id = sps.dept_id
@@ -130,17 +135,17 @@
\ No newline at end of file