终止修改&个贷模版修改

dao/src/main/resources/mapper/AssetsMapper.xml

@@ -452,7 +452,8 @@
         nodeInstance.business_min_id,
         nodeInstance.state AS state,
         record.id AS recordId,
-        nodeInstance.comment AS comment
+        nodeInstance.comment AS comment,
+        nodeInstance.modified
         FROM work_flow_node_instance AS nodeInstance,
         work_task_record AS record,
         user,
@@ -464,11 +465,6 @@
         AND record.instance_id = nodeInstance.id
         AND business_type = 'ASSET_BUSINESS') AS nodeInfo ON nodeInfo.businessId = assets.id
         WHERE assets.deleted = 0
-        AND #{assetsSelectDTO.handlerId} IN (SELECT record.handler_id
-        FROM work_flow_node_instance AS nodeInstance,
-        work_task_record AS record
-        WHERE business_id = assets.id
-        AND record.instance_id = nodeInstance.id)
         <if test="assetsSelectDTO != null and assetsSelectDTO.assetsBusinessGener != null and assetsSelectDTO.assetsBusinessGener != '' ">
             AND assets.assets_business_gener = #{assetsSelectDTO.assetsBusinessGener}
         </if>
@@ -490,7 +486,7 @@
         <if test="assetsSelectDTO != null and assetsSelectDTO.departmentId != null ">
             AND assets.department_id = #{assetsSelectDTO.departmentId}
         </if>
-        ORDER BY assets.created DESC
+        ORDER BY nodeInfo.modified DESC
     </select>
 
     <!--条件查询资产入库统计列表(分页查询)-->

dao/src/main/resources/mapper/FinanceRealFundMapper.xml

@@ -361,6 +361,7 @@
         <result property="evaluateDepartmentName" column="evaluateDepartmentName" />
         <result property="marketDepartmentName" column="marketDepartmentName" />
         <result property="payDateTime" column="pay_datetime" />
+        <result property="members" column="members" />
 <!--        <collection property="invoices" ofType="com.dayou.vo.SettleProInvoiceVo">-->
 <!--            <result property="invoiceDate" column="invoiceDate" />-->
 <!--            <result property="invoiceUser" column="invoiceUser" />-->
@@ -368,6 +369,7 @@
 <!--        </collection>-->
     </resultMap>
 
+
     <sql id="majorEvaluatorSettleSql">
         SELECT
         fc.id,
@@ -380,6 +382,7 @@
         ( fc.claim_datetime > mp.save_file_date, fc.claim_datetime, mp.save_file_date ) AS settleDate,
         mp.name,
         m.bailor,
+        m.members,
         mp.evaluate_amount,
         u.name AS principal,
         u1.name AS clientManager,
@@ -489,6 +492,7 @@
         ( fc.claim_datetime > mp.delivery_date, fc.claim_datetime, mp.delivery_date ) AS settleDate,
         mp.NAME,
         m.bailor,
+        m.members,
         mp.evaluate_amount,
         u.NAME AS principal,
         u1.NAME AS clientManager,

dao/src/main/resources/mapper/MajorMapper.xml

@@ -184,7 +184,8 @@
         wfni.OWNER,
         wfni.HANDLER,
         wfni.nodeCode,
-        wfni.currentNodeId
+        wfni.currentNodeId,
+        wfni.`comment`
         FROM
         major m
         LEFT JOIN user u ON u.id = m.client_manager_id
@@ -206,7 +207,9 @@
         mp.OWNER,
         u.NAME AS HANDLER,
         wn.CODE AS nodeCode,
-        mp.client_address
+        mp.client_address,
+        wf.modified,
+        wf.`comment`
         FROM
         work_flow_node_instance wf
         LEFT JOIN work_node wn ON wn.id = wf.node_id
@@ -222,7 +225,6 @@
         LEFT JOIN customer_company cc2 ON cc2.id = m.clientele_sub_id
         LEFT JOIN customer_linkman cl1 ON cl1.id = m.clientele_contact_id
         WHERE m.deleted = 0
-          AND (m.principal_id = #{currentUserId} OR m.client_manager_id = #{currentUserId})
         <if test="keyword!=null and keyword!='' ">
             and (
             m.name like concat ('%',#{keyword},'%')
@@ -272,7 +274,7 @@
         <if test="major!=null and major.departmentId!=null ">
             and m.department_id = #{major.departmentId}
         </if>
-        order by wfni.currentNodeId DESC
+        order by wfni.modified DESC
     </select>
 
     <select id="selectProduction" parameterType="java.lang.Long" resultType="com.dayou.vo.MajorProductionVO">

dao/src/main/resources/mapper/PersonalMapper.xml

@@ -204,7 +204,7 @@
             u4.name as handlerName,
             u4.id as handlerId,
             p.created,
-            c.comments
+            wf.comment as comments
         FROM
             work_flow_node_instance wf
                 LEFT JOIN work_node wn ON wn.id = wf.node_id
@@ -219,11 +219,6 @@
                 LEFT JOIN user u1 ON u1.id = p.outward_staff
                 LEFT JOIN user u2 ON u2.id = p.inward_staff
                 LEFT JOIN user u3 ON u3.id = p.pricing_staff
-                left join (
-                select business_id,comments from work_flow_log where concat(business_id,modified) in (
-                    select concat(business_id,max(modified)) from work_flow_log where business_type = 'PERSONAL_BUSINESS' and comments is not null  group BY business_id
-                )
-            ) c on p.id = c.business_id
         WHERE wf.business_type = 'PERSONAL_BUSINESS'
           AND wf.state = 'CLOSED'
           AND wf.deleted = 0
@@ -285,7 +280,7 @@
                 #{userId}
             </foreach>
         </if>
-        order by wf.modified DESC
+        order by wf.modified desc
     </select>
 
     <select id="getDetail" parameterType="java.lang.Long" resultType="com.dayou.vo.PersonalVO">

domain/src/main/java/com/dayou/vo/MajorVO.java

@@ -125,6 +125,7 @@ public class MajorVO extends Major {
     private Long currentNodeId;
 
     private Set<Long> userIds;
+    private String comment;
 
 
 }

domain/src/main/java/com/dayou/vo/SettleMajorProductionVO.java

@@ -65,6 +65,9 @@ public class SettleMajorProductionVO {
     @Excel(name = "负责人")
     private String principal;
 
+    @Excel(name = "参与人")
+    private String joiner;
+
     @Excel(name = "结算金额(元)")
     private BigDecimal claimAmount;
 
@@ -93,6 +96,10 @@ public class SettleMajorProductionVO {
 
     private String payEndDate;
 
+    private String members;
+
+
+
 
 
 }

service/src/main/java/com/dayou/service/impl/FinanceRealFundServiceImpl.java

@@ -1,14 +1,17 @@
 package com.dayou.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.dayou.common.BaseEntity;
 import com.dayou.dto.FinanceRealFundExportDTO;
 import com.dayou.dto.FinanceRealNotClaimDTO;
 import com.dayou.entity.FinanceClaim;
 import com.dayou.entity.FinanceRealFund;
+import com.dayou.entity.User;
 import com.dayou.exception.ErrorCode;
 import com.dayou.mapper.FinanceRealFundMapper;
+import com.dayou.mapper.UserMapper;
 import com.dayou.service.IFinanceClaimService;
 import com.dayou.service.IFinanceRealFundService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -35,6 +38,8 @@ import java.math.BigDecimal;
 import java.util.Collections;
 import java.util.List;
 import java.util.ArrayList;
+import java.util.stream.Collectors;
+
 import org.springframework.transaction.annotation.Transactional;
 import com.dayou.enums.BatchTaskTypeEnum;
 
@@ -55,6 +60,8 @@ public class FinanceRealFundServiceImpl extends ServiceImpl<FinanceRealFundMappe
 
     @Autowired
     private IFinanceClaimService financeClaimService;
+    @Autowired
+    private UserMapper userMapper;
 
     @Override
     @SuppressWarnings("unchecked")
@@ -140,23 +147,59 @@ public class FinanceRealFundServiceImpl extends ServiceImpl<FinanceRealFundMappe
     @Override
     public Page<SettleMajorProductionVO> majorEvaluatorSettleProd(SettleMajorProductionVO settleVO, Page page,String keyword) {
         Page<SettleMajorProductionVO> result = financeRealFundMapper.majorEvaluatorSettleProd(page,settleVO,keyword);
+        List<SettleMajorProductionVO> records = result.getRecords();
+        for (SettleMajorProductionVO record : records) {
+            List<Long> userIdS = JSON.parseArray(record.getMembers(), Long.class);
+            if (CollectionUtil.isNotEmpty(userIdS)){
+                List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().in(BaseEntity::getId, userIdS).select(User::getName).ne(BaseEntity::getId,1L));
+                List<String> names = users.stream().map(User::getName).collect(Collectors.toList());
+                record.setJoiner(String.join(",",names));
+            }
+        }
         return result;
     }
 
     @Override
     public Page<SettleMajorProductionVO> majorMarketSettleProd(SettleMajorProductionVO settleVO, Page page,String keyword) {
         Page<SettleMajorProductionVO> result = financeRealFundMapper.majorMarketerSettleProd(page,settleVO,keyword);
+        List<SettleMajorProductionVO> records = result.getRecords();
+        for (SettleMajorProductionVO record : records) {
+            List<Long> userIdS = JSON.parseArray(record.getMembers(), Long.class);
+            if (CollectionUtil.isNotEmpty(userIdS)){
+                List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().in(BaseEntity::getId, userIdS).select(User::getName).ne(BaseEntity::getId,1L));
+                List<String> names = users.stream().map(User::getName).collect(Collectors.toList());
+                record.setJoiner(String.join(",",names));
+            }
+        }
         return result;
     }
 
     @Override
     public List<SettleMajorProductionVO> majorMarketSettleExport(SettleMajorProductionVO production,Page page,String keyword) {
-        return financeRealFundMapper.majorMarketSettleExport(page,production,keyword);
+        List<SettleMajorProductionVO> settleMajorProductionVOS = financeRealFundMapper.majorMarketSettleExport(page, production, keyword);
+        for (SettleMajorProductionVO record : settleMajorProductionVOS) {
+            List<Long> userIdS = JSON.parseArray(record.getMembers(), Long.class);
+            if (CollectionUtil.isNotEmpty(userIdS)){
+                List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().in(BaseEntity::getId, userIdS).select(User::getName).ne(BaseEntity::getId,1L));
+                List<String> names = users.stream().map(User::getName).collect(Collectors.toList());
+                record.setJoiner(String.join(",",names));
+            }
+        }
+        return settleMajorProductionVOS;
     }
 
     @Override
     public List<SettleMajorProductionVO> majorEvaluatorSettleExport(SettleMajorProductionVO production,Page page,String keyword) {
-        return financeRealFundMapper.majorEvaluatorSettleExport(page,production,keyword);
+        List<SettleMajorProductionVO> settleMajorProductionVOS = financeRealFundMapper.majorEvaluatorSettleExport(page, production, keyword);
+        for (SettleMajorProductionVO record : settleMajorProductionVOS) {
+            List<Long> userIdS = JSON.parseArray(record.getMembers(), Long.class);
+            if (CollectionUtil.isNotEmpty(userIdS)){
+                List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().in(BaseEntity::getId, userIdS).select(User::getName).ne(BaseEntity::getId,1L));
+                List<String> names = users.stream().map(User::getName).collect(Collectors.toList());
+                record.setJoiner(String.join(",",names));
+            }
+        }
+        return settleMajorProductionVOS;
     }
 
     @Override