八爪鱼增加删除企业的功能

签约模块 关于未签约的过滤选择器
合同模板修改

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/controller/OperationRecordController.java

@@ -45,7 +45,8 @@ public class OperationRecordController {
     public HttpRespMsg getList(String companyName,String startDate,String endDate,Integer pageIndex ,Integer pageSize,String projectName){
         HttpRespMsg httpRespMsg=new HttpRespMsg();
         List<Company> companyList = companyMapper.selectList(null);
-        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        DateTimeFormatter df1 = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         QueryWrapper<OperationRecord> queryWrapper=new QueryWrapper<>();
         if(companyName!=null&&companyName!=""){
             List<Integer> list = companyList.stream().filter(cl -> cl.getCompanyName().contains(companyName)).map(Company::getId).collect(Collectors.toList());
@@ -55,8 +56,8 @@ public class OperationRecordController {
             queryWrapper.in("company_id",list);
         }
         if(startDate!=null && endDate!=null){
-            LocalDateTime start = LocalDate.parse(startDate, df).atTime(LocalTime.MIN);
-            LocalDateTime end = LocalDate.parse(endDate, df).atTime(LocalTime.MAX);
+            LocalDateTime start = LocalDate.parse(startDate, df1).atTime(LocalTime.MIN);
+            LocalDateTime end = LocalDate.parse(endDate, df1).atTime(LocalTime.MAX);
             queryWrapper.ge("operation_time",df.format(start));
             queryWrapper.le("operation_time",df.format(end));
         }