Bug文档修改

jwtech-pc/src/main/java/com/kms/web/controller/system/SysXzqhController.java

@@ -1,6 +1,7 @@
 package com.kms.web.controller.system;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -111,7 +112,9 @@ public class SysXzqhController extends BaseController
             List<SysXzqh> list = sysXzqhService.list(queryWrapper);
             return AjaxResult.success(list);
         }else {
-            return AjaxResult.success(xzqh);
+            List<SysXzqh>list=new ArrayList<>();
+            list.add(xzqh);
+            return AjaxResult.success(list);
         }
     }
 

jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiAttendanceInformationController.java

@@ -1,5 +1,7 @@
 package com.kms.build.controller;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 import cn.hutool.core.collection.CollectionUtil;
@@ -151,7 +153,9 @@ public class BsSgcJsjdBuiAttendanceInformationController extends BaseController
                     // Excel 中的日期基准是1900年1月1日，但是Excel有一个bug会将1900年当成闰年
                     // 因此实际处理时需要针对这个bug进行修正
                     final long DAY_IN_MILLISECONDS = 24 * 60 * 60 * 1000;
-                    double javaDateValue = Double.valueOf(bsSgcJsjdBuiAttendanceInformationExcel.getAttendanceYear()) - 1 + 1; // 修正Excel会将1900年当成闰年的bug
+//                    DateTimeFormatter formatter = DateTimeFormatter.ofPattern("EEE MMM dd HH:mm:ss zzz yyyy", Locale.ENGLISH);
+//                    LocalDateTime dateTime = LocalDateTime.parse(bsSgcJsjdBuiAttendanceInformationExcel.getAttendanceYear(), formatter);
+                    double javaDateValue = Double.parseDouble(bsSgcJsjdBuiAttendanceInformationExcel.getAttendanceYear()) - 1 + 1; // 修正Excel会将1900年当成闰年的bug
                     long milliseconds = (long) ((javaDateValue - 25569) * DAY_IN_MILLISECONDS);
                     bsSgcJsjdBuiAttendanceInformation.setAttendanceYear(new Date(milliseconds));
                     BsSgcJsjdBuiRealName one = bsSgcJsjdBuiRealNameService.getOne(Wrappers.lambdaQuery(BsSgcJsjdBuiRealName.class)

jwtech-system/src/main/java/com/kms/build/domain/vo/BsSgcJsjdBuiAttendanceInformationExcel.java

@@ -16,11 +16,11 @@ public class BsSgcJsjdBuiAttendanceInformationExcel {
 
     /** 考勤所属年月 */
     @JsonFormat(pattern = "yyyy-MM")
-    @Excel(name = "考勤所属年月", width = 30, dateFormat = "yyyy-MM")
+    @Excel(name = "考勤所属年月 格式:xx年xx月", width = 40, dateFormat = "yyyy-MM")
     @ApiModelProperty("考勤所属年月")
     public String attendanceYear;
 
-    @Excel(name = "身份证",cellType = Excel.ColumnType.STRING)
+    @Excel(name = "身份证",cellType = Excel.ColumnType.STRING,width = 40)
     @ApiModelProperty("身份证")
     public String idNo;
 

jwtech-system/src/main/java/com/kms/earlyStage/mapper/ProjectBidNoticeMapper.java

@@ -19,7 +19,9 @@ import java.util.List;
 @Repository
 public interface ProjectBidNoticeMapper extends BaseMapper<ProjectBidNotice> {
 
-    IPage<ProjectBidNotice> getList(@Param("proNo") String proNo,
+    IPage<ProjectBidNotice> getList(
+                                    @Param("bidProjectName")String bidProjectName,
+                                    @Param("proNo") String proNo,
                                     @Param("projectCode") String projectCode,
                                     @Param("orderBy") String orderBy,
                                     Page page);

jwtech-system/src/main/java/com/kms/earlyStage/service/ProjectBidNoticeService.java

@@ -28,7 +28,8 @@ public class ProjectBidNoticeService extends BaseService<ProjectBidNoticeMapper,
         ProjectBidNotice data = sp.getData();
 
         Map<String, Object> params = sp.getParams();
-        IPage<ProjectBidNotice> list = projectBidNoticeMapper.getList(data.getProNo(),data.getProjectCode(),
+        String value = (String) sp.getCv().getValue();
+        IPage<ProjectBidNotice> list = projectBidNoticeMapper.getList(value,data.getProNo(),data.getProjectCode(),
                 (String) params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize()));
         return list;
 

jwtech-system/src/main/resources/mapper/earlyStage/ProjectBidNoticeMapper.xml

@@ -39,6 +39,9 @@
             <if test="projectCode!=null and projectCode!=''">
                 and bn.project_code like concat('%',#{projectCode},'%')
             </if>
+            <if test="bidProjectName != null and bidProjectName != ''">
+                and bn.BID_PROJECT_NAME like concat('%',#{bidProjectName},'%')
+            </if>
         </where>
         order by bn.${orderBy} desc
     </select>