sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xds
姜玉琦 2023-11-19 23:49:26 +08:00
parent 866062f79f
commit 8139308f82
14 changed files with 155 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-system/src/main/resources/mapper/flowable/FlowDeployMapper.xml
View File

@ -32,7 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and rd.category_ = #{category}
</if>
</where>
GROUP BY rp.key_
<!-- GROUP BY rp.key_-->
group by rp.deployment_id_
order by rpr.SORT_
</select>

9
ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/controller/FlowableController.java → ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/controller/WcFlowableController.java
View File

@ -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;

2
ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectCheckingController.java
View File

@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
public class ProjectCheckingController extends BaseController {
@Autowired
ISurProjectCheckingService surProjectCheckingService;
private ISurProjectCheckingService surProjectCheckingService;
/**
* 查询当前用户举牌验收项目列表

2
ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectController.java
View File

@ -29,7 +29,7 @@ public class ProjectController extends BaseController {
private RedisCache redisCache;
@Autowired
WxIProjectInfoService IProjectInfoService;
private WxIProjectInfoService IProjectInfoService;
/**
* Methods

2
ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectDetectionController.java
View File

@ -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;

2
ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectInsuranceController.java
View File

@ -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;

2
ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMeasureController.java
View File

@ -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;

8
ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectProblemmodifyController.java
View File

@ -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;
/**
* 查询当前用户问题整改列表

2
ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectSpecialController.java
View File

@ -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;

2
ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectUserinfoController.java
View File

@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
public class ProjectUserinfoController extends BaseController {
@Autowired
ISurProjectUserinfoService surProjectUserinfoService;
private ISurProjectUserinfoService surProjectUserinfoService;
/**
* 根据项目查询项目人员信息

88
ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/WcProjectStandardController.java 100644
View File

@ -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));
}
}

28
yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectStandard.java
View File

@ -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)

4
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectStandardServiceImpl.java
View File

@ -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);
}

35
yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml
View File

@ -8,10 +8,13 @@
<result property="id" column="id" />
<result property="projectId" column="project_id" />
<result property="deptId" column="dept_id" />
<result property="deptName" column="dept_name" />
<result property="imageFile" column="image_file" />
<result property="standardDesc" column="standard_desc" />
<result property="ord" column="ord" />
<result property="standardType" column="standard_type" />
<result property="standardTypeName" column="standard_type_name" />
<result property="standardTypeRemark" column="standard_type_remark" />
<result property="isDel" column="is_del" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
@ -20,26 +23,28 @@
</resultMap>
<sql id="selectSurProjectStandardVo">
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
</sql>
<select id="selectSurProjectStandardList" parameterType="SurProjectStandard" resultMap="SurProjectStandardResult">
<include refid="selectSurProjectStandardVo"/>
<where>
<if test="projectId != null "> and project_id = #{projectId}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
<if test="imageFile != null and imageFile != ''"> and image_file = #{imageFile}</if>
<if test="standardDesc != null and standardDesc != ''"> and standard_desc = #{standardDesc}</if>
<if test="ord != null "> and ord = #{ord}</if>
<if test="standardType != null and standardType != ''"> and standard_type = #{standardType}</if>
<if test="isDel != null "> and is_del = #{isDel}</if>
<if test="projectId != null "> and sps.project_id = #{projectId}</if>
<if test="deptId != null "> and sps.dept_id = #{deptId}</if>
<if test="imageFile != null and imageFile != ''"> and sps.image_file = #{imageFile}</if>
<if test="standardDesc != null and standardDesc != ''"> and sps.standard_desc = #{standardDesc}</if>
<if test="ord != null "> and sps.ord = #{ord}</if>
<if test="standardType != null and standardType != ''"> and sps.standard_type = #{standardType}</if>
<if test="isDel != null "> and sps.is_del = #{isDel}</if>
</where>
order by standard_type,ord
order by sps.standard_type,sps.ord
</select>
<select id="selectSurProjectStandardById" parameterType="Long" resultMap="SurProjectStandardResult">
<include refid="selectSurProjectStandardVo"/>
where id = #{id}
where sps.id = #{id}
</select>
<insert id="insertSurProjectStandard" parameterType="SurProjectStandard" useGeneratedKeys="true" keyProperty="id">
@ -130,17 +135,17 @@
</select>
<select id="selectList" parameterType="SurProjectStandard" resultMap="SurProjectStandardResult">
<include refid="selectSurProjectStandardVo"/>
where is_del =0
<if test="projectId!=null and projectId>0"> and project_id=#{projectId}</if>
where sps.is_del =0
<if test="projectId!=null and projectId>0"> and sps.project_id=#{projectId}</if>
<if test="deptId!=null and deptId>0">
and project_id in (SELECT id FROM sur_project WHERE deptid= #{deptId})
and sps.project_id in (SELECT id FROM sur_project WHERE deptid= #{deptId})
</if>
<if test="prjIds !=null and prjIds.size()>0">
and project_id in
and sps.project_id in
<foreach collection="prjIds" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
<if test="standardType!=null and standardType>0"> and standard_type=#{standardType}</if>
<if test="standardType!=null and standardType>0"> and sps.standard_type=#{standardType}</if>
</select>
</mapper>