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

提交代码

dev_xds
姜玉琦 2023-09-26 23:51:22 +08:00
parent 09b0a22862
commit a251af1189
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-common/src/main/java/com/ruoyi/common/enums/DeptTypeEnum.java
View File

@ -10,7 +10,7 @@ public enum DeptTypeEnum {
JTGSTYPE("3", "泾河产业发展集团"), JTGSTYPE("3", "泾河产业发展集团"),
ZGSTYPE("4", "发展集团子公司"), ZGSTYPE("4", "发展集团子公司"),
JFDBTYPE("5", "监理单位"), JFDBTYPE("5", "甲方代表"),
JLDWTYPE("6", "监理单位"), JLDWTYPE("6", "监理单位"),
ZBDWTYPE("7", "总包单位"), ZBDWTYPE("7", "总包单位"),
FBDWTYPE("8", "分包单位"), FBDWTYPE("8", "分包单位"),

1
yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectController.java
View File

@ -145,4 +145,5 @@ public class SurProjectController extends BaseController
{ {
return toAjax(surProjectService.updateSurProject(surProject)); return toAjax(surProjectService.updateSurProject(surProject));
} }
} }

2
yanzhu-jh/src/main/resources/mapper/project/ProjectViewMapper.xml
View File

@ -38,7 +38,7 @@
left JOIN sur_project_unit_info pui on sp.id=pui.projectId and pui.unitType=2 left JOIN sur_project_unit_info pui on sp.id=pui.projectId and pui.unitType=2
where pui.del_flag=0 where pui.del_flag=0
<if test="projectName != null and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if> <if test="projectName != null and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
<if test="projectDeptId != null "> and sp.deptId = #{projectDeptId}</if> <if test="deptId != null "> and sp.deptId = #{deptId}</if>
<if test="projectType != null and projectType != ''"> and sp.projectType = #{projectType}</if> <if test="projectType != null and projectType != ''"> and sp.projectType = #{projectType}</if>
<if test="projectNature != null and projectNature != ''"> and sp.projectNature = #{projectNature}</if> <if test="projectNature != null and projectNature != ''"> and sp.projectNature = #{projectNature}</if>
ORDER by sp.projectSort ORDER by sp.projectSort