添加合同类型筛选

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workContractInfo/controller/JyWorkContractController.java

@@ -18,6 +18,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 //import com.jeeplus.sys.utils.TicketQueryUtils;
 
@@ -45,11 +46,12 @@ public class JyWorkContractController {
         String name=jyWorkContractInfo.getName();
         String createById=jyWorkContractInfo.getCreateById();
         String no=jyWorkContractInfo.getNo();
+        List contractTypeList = jyWorkContractInfo.getContractTypes();
         QueryWrapper<JyWorkContractInfo> workContractInfoQueryWrapper = QueryWrapperGenerator.buildQueryCondition(jyWorkContractInfo, JyWorkContractInfo.class);
         if (ObjectUtil.isNotEmpty(jyWorkContractInfo) && StringUtils.isNotBlank(jyWorkContractInfo.getCreateById())) {
             workContractInfoQueryWrapper.eq("a.create_by_id", jyWorkContractInfo.getCreateById());
         }
-        IPage<JyWorkContractInfo> list = jyWorkContractService.list(page, workContractInfoQueryWrapper, primaryLinkman, contractDates,createDates, contractAmount,name,createById, filedType,no);
+        IPage<JyWorkContractInfo> list = jyWorkContractService.list(page, workContractInfoQueryWrapper, primaryLinkman, contractDates,createDates, contractAmount,name,createById, filedType,no,contractTypeList);
         return ResponseEntity.ok (list);
     }
 

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workContractInfo/service/JyWorkContractService.java

@@ -54,7 +54,7 @@ public class JyWorkContractService {
      * @param
      * @return
      */
-    public IPage<JyWorkContractInfo> list(Page<JyWorkContractInfo> page, QueryWrapper<JyWorkContractInfo> queryWrapper, String primaryLinkman, String[] contractDates, String[] createDates, String contractAmount,String name,String createById,String filedType,String no) {
+    public IPage<JyWorkContractInfo> list(Page<JyWorkContractInfo> page, QueryWrapper<JyWorkContractInfo> queryWrapper, String primaryLinkman, String[] contractDates, String[] createDates, String contractAmount,String name,String createById,String filedType,String no,List contractTypeList) {
         queryWrapper.eq("a.del_flag","0");
         if (contractDates != null) {
             queryWrapper.between("a.contract_date", contractDates[0], contractDates[1]);
@@ -77,6 +77,13 @@ public class JyWorkContractService {
         if (StringUtils.isNotEmpty(createById)) {
             queryWrapper.eq("a.create_by_id", createById);
         }
+        if (null != contractTypeList && contractTypeList.size()>0) {
+            if(contractTypeList.size() == 1){
+                queryWrapper.eq("a.contract_type_first", contractTypeList.get(0));
+            }else {
+                queryWrapper.like("a.contract_type", contractTypeList.get(1));
+            }
+        }
         IPage<JyWorkContractInfo> pageList = jyWorkContractInfoMapper.findPageList(page, queryWrapper);
         pageList.getRecords().stream().forEach(i -> {
             // 合同归档