修改 故障维修代码

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FailureDetailsDto.java

 package com.yeejoin.amos.boot.module.common.api.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
 import io.swagger.annotations.ApiModel;
@@ -36,6 +37,7 @@ public class FailureDetailsDto extends BaseDto {
     @ApiModelProperty(value = "故障设备")
     private String failureEquipment;
 
+    @JsonFormat(locale = "zh",timezone = "GMT+8",pattern = "YYYY-MM-dd")
     @ApiModelProperty(value = "故障时间")
     private Date faultTime;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FailureDetailsMapper.java

@@ -34,6 +34,9 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
     List<FailureDetails> selectAllPage(Long current, Long size, Long currentStatus,
                                        String startTime, String endTime, Integer submissionPid);
 
+    List<FailureDetailsDto> selectWebPage(Long current, Long size,Long currentStatus,
+                                       String startTime, String endTime, String submissionName, Long submissionBranchId,
+                                       Long sequenceNbr);
 
     /**
      * 查询我发起的 分页

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

@@ -31,6 +31,42 @@
         order by submission_time DESC limit #{current},#{size}
     </select>
 
+    <select id="selectWebPage" resultType="com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto">
+        SELECT
+        sequence_nbr,
+        current_status,
+        failure_equipment_id,
+        failure_equipment,
+        fault_time,
+        fault_phenomenon,
+        submission_name,
+        submission_pid,
+        biz_code,
+        submission_time,
+        submission_branch,
+        submission_branch_id
+        FROM
+        cb_failure_details
+        <where>
+            <if test="currentStatus!= null ">
+                and current_status = #{currentStatus}
+            </if>
+            <if test="startTime!= null and endTime != null">
+                and submission_time between #{startTime} and #{endTime}
+            </if>
+            <if test="submissionName != null ">
+                and submission_name = #{submissionName}
+            </if>
+            <if test="submissionBranchId!= null ">
+                and submission_branch_id = #{submissionBranchId}
+            </if>
+            <if test="sequenceNbr!= null ">
+                and  sequence_nbr = #{ sequenceNbr}
+            </if>
+        </where>
+        order by submission_time DESC limit #{current},#{size}
+    </select>
+
 
 
 
@@ -380,6 +416,7 @@
                 and submission_pid = #{userId}
             </if>
         </where>
+        order by submission_time DESC
                 limit #{current},#{size};
     </select>
 
@@ -407,6 +444,7 @@
                 and submission_pid = #{submissionPid}
             </if>
         </where>
+        order by submission_time DESC
             limit #{current},#{size};
     </select>
 
@@ -434,6 +472,7 @@
                 and submission_pid = #{submissionPid}
             </if>
         </where>
+        order by submission_time DESC
         limit #{current},#{size};
     </select>
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FailureDetailsController.java

@@ -241,12 +241,7 @@ public class FailureDetailsController extends BaseController {
                                                                     @RequestParam (required = false) Long  submissionBranchId,
                                                                     @RequestParam (required = false) Long sequenceNbr ) {
         Page<FailureDetailsDto> page = new Page<>();
-        if (current > 0) {
-            page.setCurrent((current - 1) * size);
-        } else {
-            page.setCurrent(current);
-        }
-
+        page.setCurrent(current * size);
         page.setSize(size);
         ReginParams userInfo = getSelectedOrgInfo();
         IPage<FailureDetailsDto> failureDetailDTOsIPage = new Page<>();

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

@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
 import org.apache.commons.lang3.ObjectUtils;
 import org.slf4j.Logger;
@@ -59,7 +60,9 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
         model.setAuditTime(new Date());
         model.setAuditDepartmentId(userInfo.getDepartment().getSequenceNbr());
         model.setAuditor(userInfo.getUserModel().getRealName());
-        model.setAuditDepartment(userInfo.getDepartment().getDepartmentName());
+        String parentId = iOrgUsrService.getParentId(userInfo.getUserModel().getUserId());
+        OrgUsr orgUsr = iOrgUsrService.getById(parentId);
+        model.setAuditDepartment(orgUsr.getBizOrgName());
 
         FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
 

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

@@ -140,9 +140,11 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
     public IPage<FailureDetailsDto> queryForPageList(Page<FailureDetailsDto> page, ReginParams userInfo, Long currentStatus,
                                                      String startTime, String endTime, String submissionName, Long submissionBranchId,
                                                      Long sequenceNbr) {
+        List<FailureDetailsDto> list = baseMapper.selectWebPage(page.getCurrent(), page.getSize(), currentStatus, startTime, endTime, submissionName, submissionBranchId, sequenceNbr);
 
-        return queryForPage(page, "", false, currentStatus, startTime, endTime, submissionName, submissionBranchId, sequenceNbr);
-
+        IPage<FailureDetailsDto> iPage = new Page<>();
+        iPage.setRecords(list);
+        return iPage;
     }
 
     /**

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

@@ -6,6 +6,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import org.apache.commons.lang3.ObjectUtils;
 
 
@@ -61,6 +62,10 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
 
     @Autowired
     WorkflowFeignService workflowFeignService;
+
+    @Autowired
+    OrgUsrServiceImpl iOrgUsrService;
+
     private static String RECORE_TYPE = "维修记录";
 
     private static String[] MAINTENANCE_STATUS = {"维修完成", "维修中"};
@@ -88,7 +93,9 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
             }
             failureMaintainDto.setMaintainMan(userInfo.getUserModel().getRealName());
             failureMaintainDto.setMaintainTime(new Date());
-            failureMaintainDto.setDepartment(userInfo.getDepartment().getDepartmentName());
+            String parentId = iOrgUsrService.getParentId(userInfo.getUserModel().getUserId());
+            OrgUsr orgUsr = iOrgUsrService.getById(parentId);
+            failureMaintainDto.setDepartment(orgUsr.getBizOrgName());
             failureMaintainDto.setBizId(userInfo.getDepartment().getSequenceNbr());
             failureMaintainDto.setRecoreType(RECORE_TYPE);
             this.createWithModel(failureMaintainDto);
@@ -135,7 +142,9 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
             }
             failureMaintainDto.setMaintainMan(userInfo.getUserModel().getUserName());
             failureMaintainDto.setMaintainTime(new Date());
-            failureMaintainDto.setDepartment(userInfo.getDepartment().getDepartmentName());
+            String parentId = iOrgUsrService.getParentId(userInfo.getUserModel().getUserId());
+            OrgUsr orgUsr = iOrgUsrService.getById(parentId);
+            failureMaintainDto.setDepartment(orgUsr.getBizOrgName());
             failureMaintainDto.setBizId(userInfo.getDepartment().getSequenceNbr());
             failureMaintainDto.setRecoreType(RECORE_TYPE);
             this.createWithModel(failureMaintainDto);

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

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.FailureVerifyDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureRepairlogDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FailureVerify;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.enums.AuditResultEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.FailureStatuEnum;
 import com.yeejoin.amos.boot.module.common.api.mapper.FailureVerifyMapper;
@@ -33,7 +34,8 @@ public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, Fail
     FailureDetailsServiceImpl failureDetailsService;
     @Autowired
     FailureRepairlogServiceImpl failureRepairlogService;
-
+    @Autowired
+    OrgUsrServiceImpl iOrgUsrService;
 
     @Transactional
     public Object savemodel(FailureVerifyDto model, ReginParams userInfo) throws Exception {
@@ -42,7 +44,9 @@ public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, Fail
         model.setVerifyTime(new Date());
         model.setVerifyDepartmentId(userInfo.getDepartment().getSequenceNbr());
         model.setAcceptor(userInfo.getUserModel().getRealName());
-        model.setVerifyDepartment(userInfo.getDepartment().getDepartmentName());
+        String parentId = iOrgUsrService.getParentId(userInfo.getUserModel().getUserId());
+        OrgUsr orgUsr = iOrgUsrService.getById(parentId);
+        model.setVerifyDepartment(orgUsr.getBizOrgName());
 
         FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
 
@@ -79,8 +83,6 @@ public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, Fail
     public Boolean updateStatus(FailureVerifyDto model, FailureStatuEnum status, ReginParams userInfo, int condition) throws Exception {
 
         FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
-        //当前角色部门id为应急指挥科的时候 并且同意时 不修改主表状态 依然为待验收
-        //当前角色部门id为维修部门的时候 修改状态
         List<FailureVerify> byfaultId = findByfaultId(failureDetailsDto.getSequenceNbr());
 
         if (byfaultId.size() != 0) {