经办人

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/finance/invoice/mapper/xml/FinanceInvoiceMapper.xml

@@ -40,6 +40,7 @@
             <result property="receivablesStatus" column="receivables_status" jdbcType="VARCHAR"/>
             <result property="invalidStatus" column="invalid_status" jdbcType="VARCHAR"/>
             <result property="receivablesDate" column="receivables_date" jdbcType="TIMESTAMP"/>
+            <result property="operator" column="operator" jdbcType="VARCHAR"/>
             <association property="financeInvoiceInvalidDTO" column="id" select="getFii" javaType="com.jeeplus.test.finance.invoice.service.dto.FinanceInvoiceInvalidDTO"></association>
             <collection property="financeInvoiceReceivablesDTOList" column="id" select="getFirList" ofType="com.jeeplus.test.finance.invoice.service.dto.FinanceInvoiceReceivablesDTO"></collection>
             <collection property="financeInvoiceBaseDTOList" column="id" select="getBaseList" ofType="com.jeeplus.test.finance.invoice.service.dto.FinanceInvoiceBaseDTO"></collection>
@@ -179,7 +180,8 @@
 
     <select id="findList" resultMap="BaseResultMap">
         select
-        <include refid="Base_Column_List"></include>
+        <include refid="Base_Column_List"></include>,
+        su.name as operator
         from finance_invoice fi
         left join sys_user su on fi.create_by = su.id and su.del_flag = '0'
         ${ew.customSqlSegment}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/finance/invoice/service/FinanceInvoiceService.java

@@ -11,6 +11,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.sys.domain.Office;
+import com.jeeplus.sys.domain.User;
+import com.jeeplus.sys.mapper.UserMapper;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.sys.utils.UserUtils;
@@ -61,6 +63,8 @@ public class FinanceInvoiceService extends ServiceImpl<FinanceInvoiceMapper, Fin
     private OssServiceMapper ossServiceMapper;
     @Resource
     private WorkContractInfoMapper workContractInfoMapper;
+    @Resource
+    private UserMapper userMapper;
 
     public List<String> getSearchList(ArrayList<String> searchIdList, List<String> ids) {
         List<String> newSearchIdList = searchIdList.stream().filter(item -> {
@@ -235,6 +239,18 @@ public class FinanceInvoiceService extends ServiceImpl<FinanceInvoiceMapper, Fin
                     }
                 }
             }
+            if (StringUtils.isNotBlank(financeInvoiceDTO.getOperator())){
+                queryWrapper.like("su.name",financeInvoiceDTO.getOperator());
+            }
+            if (StringUtils.isNotBlank(financeInvoiceDTO.getReconciliationPeopleName())) {
+                List<User> users = userMapper.selectList(new QueryWrapper<User>().lambda().like(User::getName, financeInvoiceDTO.getReconciliationPeopleName()));
+                List<String> userIdList = users.stream().distinct().map(User::getId).collect(Collectors.toList());
+                if (CollectionUtil.isNotEmpty(userIdList)) {
+                    queryWrapper.in("fi.reconciliation_people",userIdList);
+                } else {
+                    return new Page<FinanceInvoiceDTO>();
+                }
+            }
         }
         if (CollectionUtil.isNotEmpty(searchIdList)){
             List<String> ids = searchIdList.stream().distinct().collect(Collectors.toList());

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/finance/invoice/service/dto/FinanceInvoiceDTO.java

@@ -123,11 +123,16 @@ public class FinanceInvoiceDTO extends BaseDTO {
     private String billingPeopleReal;
 
     /**
-     * 对账人
+     * 对账人id
      */
     private String reconciliationPeople;
 
     /**
+     * 对账人姓名
+     */
+    private String reconciliationPeopleName;
+
+    /**
      * 对账地区
      */
     private String reconciliationArea;
@@ -244,5 +249,10 @@ public class FinanceInvoiceDTO extends BaseDTO {
      */
     private String programId;
 
+    /**
+     * 经办人
+     */
+    private String operator;
+
     private static final long serialVersionUID = 1L;
 }