bug 2884 2968 2408

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FailureDetailsMapper.xml

@@ -387,16 +387,6 @@
             *
         FROM
             cb_failure_details d
-        WHERE
-                d.sequence_nbr  in
-                (SELECT
-                     fault_id
-                 FROM
-                     cb_failure_audit
-                 where
-
-                ) and
-            submission_pid = #{userId}
         <where>
             d.sequence_nbr  in
             (SELECT

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertCalled.java

@@ -101,13 +101,16 @@ public class AlertCalled extends BaseEntity {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 
+
+    /*bug 2408 接警记录，按警情状态和接警时间筛选功能失效 陈召 2021-09-22 开始*/
     @ApiModelProperty(value = "接警时间开始---用于列表过滤")
     @TableField(exist=false)
-    private Date callTimeStart ;
+    private String callTimeStart ;
 
     @ApiModelProperty(value = "接警时间结束---用于列表过滤")
     @TableField(exist=false)
-    private Date callTimeEnd ;
+    private String callTimeEnd ;
+    /*bug 2408 接警记录，按警情状态和接警时间筛选功能失效 陈召 2021-09-22 结束*/
   
     @TableField(exist=false)
     @ApiModelProperty(value = "是否处警")

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureDetailsServiceImpl.java

@@ -274,7 +274,11 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
         // 发起主表流程 并添加至报修日志
         failureDetailsDto.setSubmissionTime(new Date());
         failureDetailsDto.setFailureCode(buildOrderNo());
-        failureDetailsDto.setBizCode(Long.valueOf(iOrgUsrService.getParentId(userInfo.getUserModel().getUserId())));
+
+        String parentId = iOrgUsrService.getParentId(userInfo.getUserModel().getUserId());
+        OrgUsr orgUsr = iOrgUsrService.getById(parentId);
+
+        failureDetailsDto.setBizCode(Long.valueOf(parentId));
         model = this.createWithModel(failureDetailsDto);
 
         if (ObjectUtils.isNotEmpty(failureDetailsDto.getAttachment())) {
@@ -285,11 +289,12 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
         Long faultId = model.getSequenceNbr();
         Integer processAuditorId = model.getSubmissionPid();
         String processResult = "提交报修单";
-        String processDepartment = userInfo.getDepartment().getDepartmentName();
+
+
+        String processDepartment = orgUsr.getBizOrgName();
         Long departmentId = failureDetailsDto.getBizCode();
         Date processTime = model.getSubmissionTime();
         String processAuditorName = failureDetailsDto.getSubmissionName();
-        System.out.println(System.currentTimeMillis());
         repairlog(faultId, processAuditorId, departmentId, processTime, processDepartment, processResult, processAuditorName);
 
         if (excuteTask(instance.getString("id"), userInfo, null)) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStatusEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -144,25 +145,29 @@ public class AlertCalledController extends BaseController {
     public ResponseModel<IPage<AlertCalled>> listPage(String pageNum, String pageSize, String sort, AlertCalled alertCalled, Integer alertStatus,
                                                       String alertTypeCode,
                                                       String alertSourceCode,
-                                                      String startTime,
-                                                      String endTime){
-        Page<AlertCalled> pageBean;
-        IPage<AlertCalled> page;
+                                                      String callTimeStart,
+                                                      String callTimeEnd){
+        //Page<AlertCalled> pageBean;
+       // IPage<AlertCalled> page;
         QueryWrapper<AlertCalled> alertCalledQueryWrapper = new QueryWrapper<>();
         /*  page = iAlertCalledService.page(pageBean, alertCalledQueryWrapper);
         return ResponseHelper.buildResponse(page);*/
         setQueryWrapper(alertCalledQueryWrapper, alertCalled,sort);
+        /*分页存在问题 修改分页参数 陈召 2021-09-22 开始*/
+        Page<AlertCalled> page = new Page<>();
         if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
-            pageBean = new Page<>(0, Long.MAX_VALUE);
+            page = new Page<>(0, Long.MAX_VALUE);
         } else {
-            pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+            page.setCurrent(Long.parseLong(pageNum) * Long.parseLong(pageSize));
+            page.setSize(Long.parseLong(pageSize));
         }
+        /*分页存在问题 修改分页参数 陈召 2021-09-22 结束*/
 
         /* bug2407 表头筛选失效 补充条件方法 XML中添加了排序条件判断  data代表排序条件 lift 升降序 陈召 2021-09-03 开始*/
         /* bug2408 筛选参数解析异常  修改筛选条件方法 修改入参分离筛选条件
         alertStatus 警情状态  alertTypeCode 报警类型code  alertSourceCode 警情来源code
         陈召 2021-08-21 开始*/
-        IPage<AlertCalled> alertCalledIPage = iAlertCalledService.queryForCalledList(pageBean, alertStatus, alertTypeCode, alertSourceCode, startTime, endTime,sort);
+        IPage<AlertCalled> alertCalledIPage = iAlertCalledService.queryForCalledList(page, alertStatus, alertTypeCode, alertSourceCode, callTimeStart, callTimeEnd,sort);
         /*  bug  2406   接警记录，列表缺少警情状态字段  by litw start*/
         alertCalledIPage.getRecords().stream().forEach(e->{
             if(e.getAlertStatus()) {