ljy121 il y a 1 an
Parent
commit
575e07d213

+ 1 - 0
zjugis-business/src/main/java/com/zjugis/business/bean/entity/Project.java

@@ -92,6 +92,7 @@ public class Project extends BaseEntity {
 //项目经理名称
     private String xmjl;
 //责任部门名称
+    @TableField(exist = false)
     private String zrbm;
 //销售人员名称
     private String xsry;

+ 4 - 0
zjugis-business/src/main/java/com/zjugis/business/service/impl/ProjectServiceImpl.java

@@ -20,6 +20,7 @@ import com.zjugis.business.service.ContractService;
 import com.zjugis.business.service.ProjectService;
 import com.zjugis.framework.common.exception.ServiceException;
 import com.zjugis.framework.workflow.rpc.remote.WorkflowClient;
+import com.zjugis.module.system.api.dept.DeptApi;
 import com.zjugis.module.system.api.user.AdminUserApi;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -49,6 +50,9 @@ public class ProjectServiceImpl implements ProjectService {
     @Autowired
     AdminUserApi adminUserApi;
 
+    @Autowired
+    DeptApi deptApi;
+
     @Autowired
     ProjectMapper projectMapper;
 

+ 7 - 5
zjugis-business/src/main/resources/mapper/oracle/ProjectMapper.xml

@@ -10,19 +10,20 @@
     </select>
 
     <select id="selectWithChildren" resultType="com.zjugis.business.bean.response.ProjectResponse">
-        SELECT * FROM PROJECT
-        WHERE ISVALID = 1
-        START WITH ID = (
+        SELECT P.*,D.NAME as zrbm FROM PROJECT P
+        LEFT JOIN ZJUGIS_OA.SYSTEM_DEPT D ON D.ID = P.ZRBM_ID
+        WHERE P.ISVALID = 1
+        START WITH P.ID = (
             SELECT ID FROM PROJECT
             WHERE ISVALID = 1 and PID is NULL
             START WITH ID = #{id}
             CONNECT BY PRIOR PID = ID
         )
-        CONNECT BY PRIOR ID = PID
+        CONNECT BY PRIOR P.ID = P.PID
     </select>
 
     <select id="page" resultType="com.zjugis.business.bean.entity.Project">
-        SELECT P.*
+        SELECT P.*,D.NAME as zrbm
         <if test="params != null and params.isRelContract != null and params.isRelContract == 1">
             ,
             (CASE WHEN (CH.ccount >0 or P.FLOW_STATUS = 99)  then P.OUTPUT_VALUE
@@ -31,6 +32,7 @@
             ,C.contractNumber as contractNumber
         </if>
         FROM PROJECT P
+        LEFT JOIN ZJUGIS_OA.SYSTEM_DEPT D ON D.ID = P.ZRBM_ID
         <if test="params != null and params.isRelContract != null and params.isRelContract == 1">
             LEFT JOIN (SELECT PID,count(1) as ccount FROM PROJECT WHERE FLOW_STATUS = 99 GROUP BY PID) CH ON CH.PID = P.ID
             LEFT JOIN(SELECT PROJECT_ID,NVL(SUM(NVL(CONTRACT_AMOUNT,0)),0) as contractAmount,max(CONTRACT_NUMBER) as contractNumber FROM  CONTRACT where FLOW_STATUS in (90,99) GROUP BY PROJECT_ID) C ON C.PROJECT_ID = P.ID