Explorar el Código

核算项目信息联查

lamphua hace 2 semanas
padre
commit
ada188d3e4

+ 11
- 0
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcCheck.java Ver fichero

@@ -272,6 +272,17 @@ public class CmcCheck extends BaseEntity
272 272
     {
273 273
         return checkUser;
274 274
     }
275
+    public void setProject(CmcProject project)
276
+    {
277
+        this.project = project;
278
+        this.projectNumber = project == null ? "" : project.getProjectNumber();
279
+        this.projectName = project == null ? "" : project.getProjectName();
280
+    }
281
+
282
+    public CmcProject getProject()
283
+    {
284
+        return project;
285
+    }
275 286
 
276 287
     @Override
277 288
     public String toString() {

+ 9
- 1
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcCheckMapper.xml Ver fichero

@@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
24 24
         <association property="cwUser"    javaType="SysUser"         resultMap="CwUserResult" />
25 25
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
26 26
         <association property="zjlUser"    javaType="SysUser"         resultMap="ZjlUserResult" />
27
+        <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
27 28
     </resultMap>
28 29
 
29 30
     <resultMap type="SysUser" id="CheckUserResult">
@@ -46,13 +47,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
46 47
         <result property="nickName"    column="zjl_nick_name"    />
47 48
     </resultMap>
48 49
 
50
+    <resultMap type="CmcProject" id="CmcProjectResult">
51
+        <result property="projectId"    column="project_id"    />
52
+        <result property="projectNumber"    column="project_number"    />
53
+        <result property="projectName"    column="project_name"    />
54
+    </resultMap>
55
+
49 56
     <sql id="selectCmcCheckVo">
50
-        select c.check_id, c.budget_id, c.project_id, c.checker, u.nick_name as check_nick_name, c.check_time, c.check_comment, c.cw_user_id, u1.nick_name as cw_nick_name, c.cw_time,
57
+        select c.check_id, c.budget_id, c.project_id, p.project_number, p.project_name, c.checker, u.nick_name as check_nick_name, c.check_time, c.check_comment, c.cw_user_id, u1.nick_name as cw_nick_name, c.cw_time,
51 58
                c.cw_comment, c.manager_user_id, u2.nick_name as manager_nick_name, c.manager_time, c.manager_comment, c.zjl_user_id, u3.nick_name as zjl_nick_name, c.zjl_time, c.zjl_comment from cmc_check as c
52 59
         left join sys_user as u on u.user_id = c.checker
53 60
         left join sys_user as u1 on u1.user_id = c.cw_user_id
54 61
         left join sys_user as u2 on u2.user_id = c.manager_user_id
55 62
         left join sys_user as u3 on u3.user_id = c.zjl_user_id
63
+        left join cmc_project as p on b.project_id = p.project_id
56 64
     </sql>
57 65
 
58 66
     <select id="selectCmcCheckList" parameterType="CmcCheck" resultMap="CmcCheckResult">

Loading…
Cancelar
Guardar