소스 검색

fix:
1.考勤打卡查询可查卡sop更改(通派单下查询异常)

caozixuan 1 년 전
부모
커밋
238c53c20b
2개의 변경된 파일3개의 추가작업 그리고 4개의 파일을 삭제
  1. 1 2
      sop-api/src/main/java/com/qmth/sop/server/api/TBDingController.java
  2. 2 2
      sop-business/src/main/resources/mapper/TBDingMapper.xml

+ 1 - 2
sop-api/src/main/java/com/qmth/sop/server/api/TBDingController.java

@@ -243,13 +243,13 @@ public class TBDingController {
                 cell.setServiceUnitName(service.getName());
                 List<TBCrm> crmInServiceList = tbCrmList.stream().filter(e -> serviceUnitId.equals(e.getServiceId()))
                         .distinct().collect(Collectors.toList());
+                List<SopInfoResult> sopInfo = new ArrayList<>();
                 for (TBCrm tbCrm : crmInServiceList) {
                     CrmProjectResult crmProjectResult = tbCrmService.findCrmProjectInfo(null, null, tbCrm.getCrmNo());
                     List<String> sopNoList = tbSopInfoService.findFlowPassageByCrmNo(tbCrm.getCrmNo());
                     if (CollectionUtils.isEmpty(sopNoList)) {
                         continue;
                     }
-                    List<SopInfoResult> sopInfo = new ArrayList<>();
                     for (String sopNo : sopNoList) {
                         TBCrmDetail tbCrmDetail = tbCrmDetailService.findBySopNo(sopNo);
                         SopInfoResult result = new SopInfoResult();
@@ -282,7 +282,6 @@ public class TBDingController {
     @RequestMapping(value = "/ding_find_all_sop", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = DingElementResult.class) })
     public Result findDingAllSop() {
-        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         List<DingSopInfo> resultList = new ArrayList<>();
         List<SopInfoResult> list = tbSopInfoService.findFlowByServiceId(null);
         List<Long> serviceUnitIdList = list.stream().map(SopInfoResult::getServiceId).distinct().collect(Collectors.toList());

+ 2 - 2
sop-business/src/main/resources/mapper/TBDingMapper.xml

@@ -208,12 +208,12 @@
             </if>
             <if test="startTime != null and startTime != '' ">
                 <![CDATA[
-               and a.sign_date >= #{startTime}
+               and a.sign_time >= #{startTime}
                ]]>
             </if>
             <if test="endTime != null and endTime != ''">
                 <![CDATA[
-                and a.sign_date <= #{endTime}
+                and a.sign_time <= #{endTime}
                 ]]>
             </if>
             <if test="supplierId != null and supplierId != ''">