维修

platform-dao/src/main/java/com/platform/dao/dto/repair/RepairApplicationFormDTO.java

@@ -24,6 +24,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class RepairApplicationFormDTO extends BaseDTO implements Serializable {
+    private Integer exceptStatus;
 
     private String deptId;
 

platform-dao/src/main/java/com/platform/dao/entity/sb/SbUpdateLog.java

@@ -0,0 +1,58 @@
+package com.platform.dao.entity.sb;
+
+import com.platform.common.bean.DataScope;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * @Description 设备基础信息实体类
+ * @Author liuyu
+ * @Date 2020-04-21 21:05:46
+ * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Table(name = "t_sb_update_log")
+@Data
+public class SbUpdateLog implements Serializable {
+
+    @Id
+    private String id;
+
+    private String sbId;
+
+    /**
+     * 更改内容
+     */
+    private String content;
+
+    /**
+     * 创建人
+     */
+    private String createdUserId;
+    /**
+     * 修改人
+     */
+    private String updateUserId;
+    /**
+     * 创建日期
+     */
+    private LocalDateTime createdTime;
+    /**
+     * 更新日期
+     */
+    private LocalDateTime updateTime;
+    /**
+     * 创建人姓名
+     */
+    private String createdUserName;
+
+    private String updateUserName;
+
+
+}

platform-dao/src/main/java/com/platform/dao/mapper/sb/SbUpdateLogMapper.java

@@ -0,0 +1,29 @@
+package com.platform.dao.mapper.sb;
+
+import com.platform.dao.config.MyMapper;
+import com.platform.dao.dto.sb.SbInfoDTO;
+import com.platform.dao.entity.sb.SbInfo;
+import com.platform.dao.entity.sb.SbUpdateLog;
+import com.platform.dao.vo.report.SbInfoTypeReportVO2;
+import com.platform.dao.vo.sb.SbInfoScreenDetailVO;
+import com.platform.dao.vo.sb.SbInfoVO;
+import com.platform.dao.vo.sb.SbTreeVO;
+import com.platform.dao.vo.sb.SbUpdateLogVO;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @Description 设备基础信息 mapper
+ * @Author liuyu
+ * @Date 2020-04-21 21:05:46
+ * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Component
+public interface SbUpdateLogMapper extends MyMapper<SbUpdateLog> {
+    List<SbUpdateLogVO> selectList(SbUpdateLog sbUpdateLog);
+
+}

platform-dao/src/main/java/com/platform/dao/vo/sb/SbUpdateLogVO.java

@@ -0,0 +1,72 @@
+package com.platform.dao.vo.sb;
+
+import com.platform.common.bean.BaseVO;
+import com.platform.dao.entity.upms.SysFile;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Id;
+import javax.persistence.Transient;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author chenli
+ * @Date 2019/8/5
+ * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class SbUpdateLogVO extends BaseVO implements Serializable {
+
+    private String id;
+
+    private String sbId;
+
+    /**
+     * 更改内容
+     */
+    private String content;
+
+    /**
+     * 创建人
+     */
+    private String createdUserId;
+    /**
+     * 修改人
+     */
+    private String updateUserId;
+    /**
+     * 创建日期
+     */
+    private LocalDateTime createdTime;
+    /**
+     * 更新日期
+     */
+    private LocalDateTime updateTime;
+    /**
+     * 创建人姓名
+     */
+    private String createdUserName;
+
+    private String updateUserName;
+
+    private String sbName;
+
+    private String sbPositionNo;
+
+    private String sbPositionName;
+
+    private String typeName;
+
+    private String guige;
+
+
+
+}

platform-dao/src/main/resources/mapper/repair/RepairApplicationFormMapper.xml

@@ -123,6 +123,12 @@
             <if test="repairProfessor!=null and repairProfessor!=''">
                 and application.repair_professor=#{repairProfessor}
             </if>
+            <if test="repairFormType!=null and repairFormType!=''">
+                and application.repair_form_type=#{repairFormType}
+            </if>
+            <if test="exceptStatus!=null">
+                application.status!=#{exceptStatus}
+            </if>
         </where>
     </select>
     <select id="selectById" parameterType="java.lang.Object"

platform-dao/src/main/resources/mapper/sb/SbUpdateLogMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.platform.dao.mapper.sb.SbUpdateLogMapper">
+
+    <select id="selectList" parameterType="com.platform.dao.entity.sb.SbUpdateLog"
+            resultType="com.platform.dao.vo.sb.SbUpdateLogVO">
+        select log.*,type.name as typeName,info.positionNo as sbPositionNo,info.name as sbName,guige.name
+        as guige
+        from t_sb_update_log as log left join t_sb_info info
+        on log.sb_id = info.id
+        left join t_sb_type type on type.id = info.type_id
+        left join t_sb_position position on position.id = info.position
+        left join t_sb_guige guige on guige.id = info.guige_id
+        <where>
+            <if test="sbId!=null and sbId!=''">
+                and log.sb_id=#{sbId}
+            </if>
+        </where>
+    </select>
+
+
+</mapper>

platform-rest/src/main/java/com/platform/rest/controller/sb/SbMeasureLogController.java

@@ -8,9 +8,12 @@ import com.platform.common.validation.group.UpdateGroup;
 import com.platform.dao.dto.sb.BatchSbMeasureLog;
 import com.platform.dao.dto.sb.SbMeasureLogDTO;
 import com.platform.dao.entity.sb.SbMeasureLog;
+import com.platform.dao.entity.sb.SbUpdateLog;
+import com.platform.dao.mapper.sb.SbUpdateLogMapper;
 import com.platform.dao.util.ExcelUtil;
 import com.platform.dao.vo.export.sb.ExportSbMeasureLogVO;
 import com.platform.dao.vo.query.sb.SbMeasureLogVO;
+import com.platform.dao.vo.sb.SbUpdateLogVO;
 import com.platform.rest.log.annotation.SysLog;
 import com.platform.service.sb.SbMeasureLogService;
 import lombok.AllArgsConstructor;
@@ -19,7 +22,9 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 设备计量记录 控制器
@@ -34,6 +39,8 @@ public class SbMeasureLogController {
 
     private final SbMeasureLogService sbMeasureLogService;
 
+    private final SbUpdateLogMapper sbUpdateLogMapper;
+
     /**
      * 通过id查询标准
      *
@@ -162,4 +169,22 @@ public class SbMeasureLogController {
         return new R<>();
     }
 
+    /**
+     * 获取列表
+     *
+     * @param checkStandardDTO 设备计量记录DTO
+     * @return R
+     */
+    @GetMapping("/getLogBySbId")
+    public R getLogBySbId(SbMeasureLogDTO checkStandardDTO) {
+        SbUpdateLog log = new SbUpdateLog();
+        log.setSbId(checkStandardDTO.getSbId());
+        List<SbUpdateLogVO> updateLogs = sbUpdateLogMapper.selectList(log);
+        List<SbMeasureLogVO> measureLogVOS = sbMeasureLogService.selectList(checkStandardDTO);
+        Map<String,Object> map = new HashMap<>();
+        map.put("1",updateLogs);
+        map.put("2",measureLogVOS);
+        return new R<>(map);
+    }
+
 }

platform-rest/src/main/java/com/platform/rest/controller/sb/SbUpdateLogController.java

@@ -0,0 +1,73 @@
+package com.platform.rest.controller.sb;
+
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.common.model.OauthUser;
+import com.platform.common.model.UserInfo;
+import com.platform.common.util.BeanConverterUtil;
+import com.platform.common.util.IdGeneratorUtils;
+import com.platform.common.util.R;
+import com.platform.common.util.SecurityUtils;
+import com.platform.common.validation.group.AddGroup;
+import com.platform.common.validation.group.UpdateGroup;
+import com.platform.dao.dto.sb.BatchSbMeasureLog;
+import com.platform.dao.dto.sb.SbMeasureLogDTO;
+import com.platform.dao.entity.sb.SbMeasureLog;
+import com.platform.dao.entity.sb.SbUpdateLog;
+import com.platform.dao.mapper.sb.SbUpdateLogMapper;
+import com.platform.dao.util.ExcelUtil;
+import com.platform.dao.vo.export.sb.ExportSbMeasureLogVO;
+import com.platform.dao.vo.query.sb.SbMeasureLogVO;
+import com.platform.rest.log.annotation.SysLog;
+import com.platform.service.sb.SbMeasureLogService;
+import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description 设备计量记录 控制器
+ * @Author liuyu
+ * @Date 2020-05-28 17:23:30
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/sb/update-logs")
+public class SbUpdateLogController {
+
+
+    private final SbUpdateLogMapper sbUpdateLogMapper;
+
+
+    /**
+     * 新增记录
+     *
+     * @param checkStandardDTO 设备计量记录DTO
+     * @return R
+     */
+    @SysLog("新增设备计量记录")
+    @PostMapping
+    public R save(@Validated({AddGroup.class}) @RequestBody SbUpdateLog sbUpdateLog) {
+        setCreateUserInfo(sbUpdateLog);
+        sbUpdateLog.setId(IdGeneratorUtils.getObjectId());
+        return new R<>(sbUpdateLogMapper.insert(sbUpdateLog));
+    }
+
+    public void setCreateUserInfo(SbUpdateLog model) {
+        model.setCreatedTime(LocalDateTime.now());
+        model.setUpdateTime(LocalDateTime.now());
+        OauthUser user = SecurityUtils.getUser();
+        if (user != null) {
+            UserInfo userInfo = user.getUserInfo();
+            model.setCreatedUserId(userInfo.getUserId());
+            model.setCreatedUserName(userInfo.getRealName());
+        }
+    }
+
+}

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -518,6 +518,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
     @Override
     public MyVOPage<RepairApplicationFormVO> selectPageInfoVOByModelThree(RepairApplicationFormDTO record, int pageNum, int pageSize) {
         // 获取当前用户角色集合值
+        String repairDeptId = record.getRepairDeptId();
         UserInfo userInfo = SecurityUtils.getUserInfo();
         StringBuilder roleCodes = new StringBuilder();
         userInfo.getRoleCodes().forEach(item-> {
@@ -586,6 +587,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 }else if(record.getSearchType() == 6){ // 报修审批-生产--暂时废弃
                     statusList.add(RepairApplicationFormStatusEnum.NOT_ACCEPTANCE.getValue());
                 }else if(record.getSearchType() == -1){ // 全部工单
+                        record.setExceptStatus(RepairApplicationFormStatusEnum.CALLER_REPAIR_CANCEL.getValue());
                     if(record.getStatus() != null){
                         statusList.add(record.getStatus());
                     }
@@ -615,6 +617,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 record.setStatusList(statusList);
             }
         }
+        record.setRepairDeptId(repairDeptId);
         PageHelper.startPage(pageNum, pageSize);
         return new MyVOPage<>(mapper.selectPageList(record));
     }