Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -79,7 +79,8 @@
         cw_prs3.id as sid3,
         ifnull(cw_rev.review_status,'0') as reviewStatus,
         cw_rev.proc_ins_id as procInsId3,
-        new_line.report_no as reportNo
+        new_line.report_no as reportNo,
+        cwcb.name as servedUnitName
         FROM cw_project_report a
         left join cw_project_records b on a.project_id = b.id
         LEFT JOIN sys_office c on a.office_id = c.id
@@ -93,6 +94,7 @@
         left join cw_project_members cpm on b.id = cpm.project_id
         left join sys_user sub on cpm.user_id = sub.id
         left join sys_user_manage_office sumo on sumo.office_id = sub.office_id
+        left join cw_work_client_base cwcb on new_line.served_unit_id = cwcb.id
         ${ew.customSqlSegment}
         ORDER BY a.create_date DESC
     </select>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/service/CwProjectReportService.java

@@ -1867,7 +1867,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         QueryWrapper<CwWorkClientBase> queryWrapper = QueryWrapperGenerator.buildQueryCondition ( CwWorkClientBaseWrapper.INSTANCE.toEntity(cwWorkClientBaseDTO), CwWorkClientBase.class );
         queryWrapper.eq("cw_wcb.del_flag","0");
         queryWrapper.eq("cw_pro.id",projectId);
-        queryWrapper.orderByDesc("cw_wcb.create_date");
+
         if (ObjectUtil.isNotEmpty(cwWorkClientBaseDTO)) {
             if (ArrayUtil.isNotEmpty(cwWorkClientBaseDTO.getCreateDates())) {
                 queryWrapper.between("cw_wcb.create_date", cwWorkClientBaseDTO.getCreateDates()[0], cwWorkClientBaseDTO.getCreateDates()[1]);
@@ -1878,6 +1878,13 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                 }
             }
         }
+        if (StringUtils.isNotEmpty(cwWorkClientBaseDTO.getName())){
+            queryWrapper.eq("cw_wcb.name", cwWorkClientBaseDTO.getName());
+        }
+        if (StringUtils.isNotEmpty(cwWorkClientBaseDTO.getNo())){
+            queryWrapper.eq("cw_wcb.no", cwWorkClientBaseDTO.getNo());
+        }
+        queryWrapper.orderByDesc("cw_wcb.create_date");
         IPage<CwWorkClientBaseDTO> list = reportMapper.findClineList(page, queryWrapper);
         return list;
     }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reimbursementApproval/approvalType/service/CwReimbursementTypeService.java

@@ -2,6 +2,7 @@ package com.jeeplus.test.cw.reimbursementApproval.approvalType.service;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jeeplus.core.domain.BaseEntity;
 import com.jeeplus.flowable.common.handler.CollectionUtils;
 import com.jeeplus.sys.service.dto.OfficeDTO;
@@ -74,17 +75,17 @@ public class CwReimbursementTypeService {
     }
 
     public List<CwReimbursementTypeInfo> list(CwReimbursementTypeInfo info) {
-        LambdaQueryWrapper<CwReimbursementTypeInfo> wrapper = new LambdaQueryWrapper<>();
+        QueryWrapper<CwReimbursementTypeInfo> wrapper = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(info.getName())) {
-            wrapper.like(CwReimbursementTypeInfo::getName, info.getName());
+            wrapper.like("a.name", info.getName());
         }
         if (info.getSort() != null) {
-            wrapper.like(CwReimbursementTypeInfo::getSort, info.getSort());
+            wrapper.like("a.sort", info.getSort());
         }
 //        wrapper.eq(CwReimbursementTypeInfo::getBusinessType, "1");
 
-        wrapper.eq(BaseEntity::getDelFlag, 0);
-        wrapper.orderByAsc(CwReimbursementTypeInfo::getSort);
+        wrapper.eq("a.del_flag", 0);
+        wrapper.orderByAsc("a.sort");
         return mapper.findList(wrapper);
     }