完善

platform-dao/src/main/java/com/platform/dao/entity/sqarepartmanage/SparePartInfo.java

@@ -206,7 +206,7 @@ public class SparePartInfo implements Serializable{
      * 当前库存
      */
     @Transient
-    private Integer currentStock;
+    private BigDecimal  currentStock;
     /**
      * 生产商
      */

platform-dao/src/main/java/com/platform/dao/vo/export/repair/ExportRepairApplicationFormVO.java

@@ -100,70 +100,23 @@ public class ExportRepairApplicationFormVO implements Serializable {
     /**
      * 检查处理过程
      */
-    @Excel(name = "问题描述", orderNum = "16")
+    @Excel(name = "检查处理过程", orderNum = "16")
     private String checkProcess;
     /**
      * 原因分析
      */
     @Excel(name = "原因分析", orderNum = "17")
     private String reasonAnalysis;
-
     /**
      * 更新维修计划
      */
-    @Excel(name = "是否更新维修计划", orderNum = "18")
-    private Boolean changeRepairPlan;
+    @Excel(name = "改进类别", orderNum = "18")
+    private String changeRepairPlan;
 
     /**
      * 更新维修计划
      */
-    @Excel(name = "更新维修计划", orderNum = "19")
+    @Excel(name = "改进内容", orderNum = "19")
     private String changeRepairPlanContent;
 
-    /**
-     * 更新备件计划
-     */
-    @Excel(name = "是否更新备件计划", orderNum = "20")
-    private Boolean changeSparePlan;
-
-    /**
-     * 更新备件计划
-     */
-    @Excel(name = "更新备件计划", orderNum = "21")
-    private String changeSparePlanContent;
-
-    /**
-     * 人员培训
-     */
-    @Excel(name = "是否人员培训", orderNum = "22")
-    private Boolean userTeach;
-
-    /**
-     * 人员培训
-     */
-    @Excel(name = "人员培训", orderNum = "23")
-    private String userTeachContent;
-    /**
-     * 设备改造升级
-     */
-    @Excel(name = "是否设备改造升级", orderNum = "24")
-    private Boolean sbChange;
-
-    /**
-     * 设备改造升级
-     */
-    @Excel(name = "设备改造升级", orderNum = "25")
-    private String sbChangeContent;
-    /**
-     * 其他
-     */
-    @Excel(name = "是否其他", orderNum = "26")
-    private Boolean otherChange;
-
-    /**
-     * 其他
-     */
-    @Excel(name = "其他", orderNum = "27")
-    private String otherChangeContent;
-
 }

platform-dao/src/main/java/com/platform/dao/vo/export/sb/ExportSbInfoVO.java

@@ -134,7 +134,32 @@ public class ExportSbInfoVO implements Serializable {
     /**
      * 存放位置
      */
-    @Excel(name = "所属车间", orderNum = "23")
+    @Excel(name = "财务编码1", orderNum = "23")
     private String positionName;
+    /**
+     * 财务编码/固定资产编号
+     */
+    @Excel(name = "财务编码2", orderNum = "24")
+    private String financingNoTwo;
+    /**
+     * 财务编码/固定资产编号
+     */
+    @Excel(name = "财务编码3", orderNum = "25")
+    private String financingNoThird;
+    /**
+     * 财务编码/固定资产编号
+     */
+    @Excel(name = "财务编码4", orderNum = "26")
+    private String financingNoFour;
+    /**
+     * 财务编码/固定资产编号
+     */
+    @Excel(name = "财务编码5", orderNum = "27")
+    private String financingNoFive;
+    /**
+     * 自定义参数
+     */
+    @Excel(name = "财务编码5", orderNum = "28")
+    private String paramList;
 
 }

platform-dao/src/main/java/com/platform/dao/vo/export/sqarepartmanage/ExportSparePartInfoVO.java

@@ -21,69 +21,88 @@ import java.time.LocalDate;
 public class ExportSparePartInfoVO implements Serializable {
 
     /**
-   * 主键
-   */
-  @Excel(name = "主键", orderNum = "1")
-  private String id;
+     * 主键
+     */
+    @Excel(name = "主键", orderNum = "1")
+    private String id;
 
     /**
-   * 备件编码
-   */
-  @Excel(name = "编码", orderNum = "2")
-  private String no;
+     * 备件编码
+     */
+    @Excel(name = "编码", orderNum = "2")
+    private String no;
 
     /**
-   * 名称
-   */
-  @Excel(name = "名称", orderNum = "3")
-  private String name;
+     * 名称
+     */
+    @Excel(name = "名称", orderNum = "3")
+    private String name;
     /**
      * 大类编码名称
      */
-    @Excel(name = "一级类别", orderNum = "4")
-    private String parentName;
+    @Excel(name = "类别", orderNum = "4")
+    private String typeName;
     /**
-     * 子类编码名称
+     * 单价
      */
-    @Excel(name = "二级类别", orderNum = "5")
-    private String middleName;
+    @Excel(name = "单价", orderNum = "5")
+    private Double initialValue;
+
     /**
-     * 大类编码名称
+     * 计量单位: 1-件;2-台;3-条; 4-个
      */
-    @Excel(name = "三级类别", orderNum = "6")
-    private String childName;
-    /**
-   * 单价
-   */
-  @Excel(name = "单价", orderNum = "7")
-  private Double initialValue;
-
-  /**
-   * 计量单位: 1-件;2-台;3-条; 4-个
-   */
-  @Excel(name = "计量单位", orderNum = "8")
-  private String unit;
+    @Excel(name = "计量单位", orderNum = "6")
+    private String unit;
 
     /**
      * 规格型号：使用的sb_guige
      */
-    @Excel(name = "规格型号", orderNum = "9")
+    @Excel(name = "规格型号", orderNum = "7")
     private String ggxh;
 
     /**
      * 规格型号：使用的sb_guige
      */
-    @Excel(name = "原厂编号", orderNum = "10")
+    @Excel(name = "原厂编号", orderNum = "8")
     private String initNo;
-
     /**
-     * 型号名称
+     * 备件等级:1-一级; 2-二级;3-三级
+     */
+    @Excel(name = "备件等级", orderNum = "9", dicCode = "SPARE_PART_INFO_LEVEL")
+    private Integer level;
+    /**
+     * 使用周期:月
+     */
+    @Excel(name = "原厂编号", orderNum = "10")
+    private BigDecimal usePeriod;
+    /**
+     * 寿命周期:月
+     */
+    @Excel(name = "原厂编号", orderNum = "11")
+    private BigDecimal agePeriod;
+    /**
+     * 采购到货周期:天
+     */
+    @Excel(name = "原厂编号", orderNum = "12")
+    private BigDecimal purchasePeriod;
+    /**
+     * 生产商
+     */
+    @Excel(name = "生产商", orderNum = "13")
+    private String producerName;
+    /**
+     * 最高库存
+     */
+    @Excel(name = "最高库存", orderNum = "14")
+    private BigDecimal maxStock;
+    /**
+     * 最低库存
      */
-    @Excel(name = "型号名称", orderNum = "11")
-    private String modelName;
+    @Excel(name = "最低库存", orderNum = "15")
+    private BigDecimal minStock;
     /**
-     * 型号型号
+     * 当前库存
      */
-    @Excel(name = "型号", orderNum = "12")
-    private String modelModel;
+    @Excel(name = "当前库存", orderNum = "16")
+    private BigDecimal currentStock;
 }

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

@@ -24,7 +24,7 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class SbInfoVO extends BaseVO implements Serializable {
     /**
-     * 自定义参数列表
+     * 自定义参数列表:[{name:name1, content:content1},{name:name2, content:content2}]
      */
     private String paramList;
     /**

platform-dao/src/main/resources/mapper/sqarepartmanage/SparePartInfoMapper.xml

@@ -49,8 +49,6 @@
                      select="com.platform.dao.mapper.firm.FirmProducerMapper.selectNameById"/>
         <association column="supplier_id" javaType="string" property="supplierName"
                      select="com.platform.dao.mapper.purchase.SupplierMapper.selectNameById"/>
-        <association column="id" javaType="Integer" property="currentStock"
-                     select="com.platform.dao.mapper.store.SpareStoreMapper.selectTotalStock"/>
     </resultMap>
     <sql id="Base_Column_List">
         id, no, unite_no, gg_no, name_no, name, type_id, level, initial_value, producer_id,

platform-rest/src/main/java/com/platform/rest/controller/repair/RepairApplicationFormController.java

@@ -159,6 +159,20 @@ public class RepairApplicationFormController {
         return new R<>(repairApplicationFormService.getModelListByDTO(repairApplicationFormDTO));
     }
 
+    /**
+     * 修改维修单时间，给主管修改接收时间和完成时间的权限
+     *
+     * @param repairFormDTO 维修单DTO
+     * @return R
+     */
+    @SysLog("修改维修单时间")
+    @PutMapping("/change/{id}")
+    @PreAuthorize("@pms.hasPermission('repair-application-forms-edit')")
+    public R change(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody RepairApplicationFormDTO repairFormDTO) {
+        repairApplicationFormService.change(repairFormDTO);
+        return new R<>();
+    }
+
     /**
      * 完成维修单
      *
@@ -254,38 +268,33 @@ public class RepairApplicationFormController {
     @PreAuthorize("@pms.hasPermission('repair-application-forms-export')")
     public void export(HttpServletResponse response, RepairApplicationFormDTO repairApplicationFormDTO) {
         List<RepairApplicationFormVO> list = repairApplicationFormService.getVOListByDTO(repairApplicationFormDTO);
-        List<ExportRepairApplicationFormVO> excelList = BeanConverterUtil.copyListProperties(list, ExportRepairApplicationFormVO.class);
-        List<ExportRepairApplicationFormMergeVO> mergeVOList = new ArrayList<>();
-        for (ExportRepairApplicationFormVO vo : excelList) {
-            ExportRepairApplicationFormMergeVO mergeVO = BeanConverterUtil.copyObjectProperties(vo, ExportRepairApplicationFormMergeVO.class);
-
+        List<ExportRepairApplicationFormVO> excelList = new ArrayList<>();
+        for (RepairApplicationFormVO vo : list) {
+            ExportRepairApplicationFormVO excel =  BeanConverterUtil.copyObjectProperties(vo, ExportRepairApplicationFormVO.class);
+            excelList.add(excel);
             if(vo.getChangeRepairPlan() != null && vo.getChangeRepairPlan()){
-                mergeVO.setChangeRepairPlan("更新维修计划");
-                mergeVO.setChangeRepairPlanContent(vo.getChangeRepairPlanContent());
-                mergeVOList.add(mergeVO);
+                excel.setChangeRepairPlan("更新维修计划");
+                excel.setChangeRepairPlanContent(vo.getChangeRepairPlanContent());
             }
             if(vo.getChangeSparePlan() != null && vo.getChangeSparePlan()){
-                mergeVO.setChangeRepairPlan("更新备件计划");
-                mergeVO.setChangeRepairPlanContent(vo.getChangeSparePlanContent());
-                mergeVOList.add(mergeVO);
+                excel.setChangeRepairPlan("更新备件计划");
+                excel.setChangeRepairPlanContent(vo.getChangeSparePlanContent());
             }
             if(vo.getUserTeach() != null && vo.getUserTeach() ){
-                mergeVO.setChangeRepairPlan("人员培训");
-                mergeVO.setChangeRepairPlanContent(vo.getUserTeachContent());
-                mergeVOList.add(mergeVO);
+                excel.setChangeRepairPlan("人员培训");
+                excel.setChangeRepairPlanContent(vo.getUserTeachContent());
+
             }
             if(vo.getSbChange() != null && vo.getSbChange()){
-                mergeVO.setChangeRepairPlan("设备改造升级");
-                mergeVO.setChangeRepairPlanContent(vo.getSbChangeContent());
-                mergeVOList.add(mergeVO);
+                excel.setChangeRepairPlan("设备改造升级");
+                excel.setChangeRepairPlanContent(vo.getSbChangeContent());
             }
             if(vo.getOtherChange() != null && vo.getOtherChange()){
-                mergeVO.setChangeRepairPlan("其他");
-                mergeVO.setChangeRepairPlanContent(vo.getOtherChangeContent());
-                mergeVOList.add(mergeVO);
+                excel.setChangeRepairPlan("其他");
+                excel.setChangeRepairPlanContent(vo.getOtherChangeContent());
             }
         }
-        ExcelUtil.exportResponseDict(response, ExportRepairApplicationFormMergeVO.class, mergeVOList, "维修工单");
+        ExcelUtil.exportResponseDict(response, ExportRepairApplicationFormVO.class, excelList, "维修工单");
     }
 
 }

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

@@ -347,6 +347,7 @@ public class SbInfoController {
     @PreAuthorize("@pms.hasPermission('sb-infos-export')")
     public void export(HttpServletResponse response, SbInfoDTO sbInfoDTO) {
         List<SbInfoVO> list = sbInfoService.selectExportVOList(sbInfoDTO);
+
         ExcelUtil.exportResponseDict(response, ExportSbInfoVO.class, BeanConverterUtil.copyListProperties(list, ExportSbInfoVO.class), "设备基础信息");
     }
 

platform-service/src/main/java/com/platform/service/repair/RepairApplicationFormService.java

@@ -66,7 +66,12 @@ public interface RepairApplicationFormService extends IBaseService<RepairApplica
      * @param model
      */
     void dispatchModelByDTO(RepairApplicationFormDTO model);
-
+    /**
+     * 修改维修单时间
+     *
+     * @param dto
+     */
+    void change(RepairApplicationFormDTO dto);
 
     /**
      * 完成维修

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

@@ -872,6 +872,27 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         return result;
     }
 
+    /**
+     * 修改维修单时间
+     *  需要重新记录实际
+     *   1：接收时间=维修开始-报修开始
+     *  2：维修时间=维修结束-维修开始
+     *  3：停机时间=维修结束-报修开始
+     * @param dto
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void change(RepairApplicationFormDTO dto) {
+
+        RepairApplicationForm applicationForm = mapper.selectById(dto.getId());
+        applicationForm.setReceiveMinutes(DateUtils.getDurationHours(dto.getApplyTime(), dto.getRepairStartTime()));
+        applicationForm.setRepairMinutes(DateUtils.getDurationHours(dto.getRepairStartTime(), dto.getRepairEndTime()));
+        applicationForm.setDealMinutes(DateUtils.getDurationHours(dto.getApplyTime(), dto.getRepairEndTime()));
+        applicationForm.setCategory(dto.getCategory());
+        super.modModelByPrimaryKey(applicationForm);
+
+    }
+
     /**
      * 领导验收，进行数据项目的验收
      * 判断领导是否是牛工身份，如果是这关闭单子，

platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -2,6 +2,8 @@ package com.platform.service.sb.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.platform.activiti.bean.ActObj;
 import com.platform.activiti.enums.ActApplyEnum;
@@ -779,7 +781,19 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
     public List<SbInfoVO> selectExportVOList(SbInfoDTO model) {
         List<SbInfoVO> vos = mapper.selectVOList(model);
         List<SysDept> delDetailList = sysDeptService.getModelListByModel(new SysDept());
+
+        List<String> saveUserIds = vos.stream().map(SbInfoVO::getSaveUser).distinct().collect(Collectors.toList());
+        List<String> repairUserIds = vos.stream().map(SbInfoVO::getRepairUser).collect(Collectors.toList());
+        List<String> repairUserSecondIds = vos.stream().map(SbInfoVO::getRepairUserSecond).collect(Collectors.toList());
+        saveUserIds.addAll(repairUserIds);
+        saveUserIds.addAll(repairUserSecondIds);
+        saveUserIds = saveUserIds.stream().distinct().collect(Collectors.toList());
+        Weekend<SysUser> weekend = new Weekend<>(SysUser.class);
+        weekend.weekendCriteria().andIn(SysUser::getUserId, saveUserIds);
+        List<SysUser> userList = sysUserMapper.selectByExample(weekend);
         for (SbInfoVO sbInfo : vos) {
+
+            // 部门名称
             for (SysDept dept : delDetailList) {
                 if (sbInfo.getUseArea() != null && sbInfo.getUseArea().equals(dept.getDeptId())) {
                     sbInfo.setUseAreaName(dept.getName());
@@ -797,18 +811,8 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
                     sbInfo.setUseGroupName(dept.getName());
                 }
             }
-        }
 
-        List<String> saveUserIds = vos.stream().map(SbInfoVO::getSaveUser).distinct().collect(Collectors.toList());
-        List<String> repairUserIds = vos.stream().map(SbInfoVO::getRepairUser).collect(Collectors.toList());
-        List<String> repairUserSecondIds = vos.stream().map(SbInfoVO::getRepairUserSecond).collect(Collectors.toList());
-        saveUserIds.addAll(repairUserIds);
-        saveUserIds.addAll(repairUserSecondIds);
-        saveUserIds = saveUserIds.stream().distinct().collect(Collectors.toList());
-        Weekend<SysUser> weekend = new Weekend<>(SysUser.class);
-        weekend.weekendCriteria().andIn(SysUser::getUserId, saveUserIds);
-        List<SysUser> userList = sysUserMapper.selectByExample(weekend);
-        for (SbInfoVO sbInfo : vos) {
+            // 用户名称
             for (SysUser user : userList) {
                 if (sbInfo.getSaveUser() != null && sbInfo.getSaveUser().equals(user.getUserId())) {
                     sbInfo.setSaveUserName(user.getRealName());
@@ -820,6 +824,19 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
                     sbInfo.setRepairUserNameSecond(user.getRealName());
                 }
             }
+
+            // 自定义参数
+            if(StringUtils.isNotBlank(sbInfo.getParamList())){
+                JSONArray jsonArray = JSONArray.parseArray(sbInfo.getParamList());
+                StringBuffer sBuffer = new StringBuffer();
+                for(int i = 0; i < jsonArray.size(); i++) {
+                    JSONObject obj = jsonArray.getJSONObject(i);
+                    String name = (String) obj.get("name");
+                    String content = (String) obj.get("content");
+                    sBuffer.append("名称：" + name + ",内容：" + content + ";");
+                }
+                sbInfo.setParamList(sBuffer.toString());
+            }
         }
         return vos;
     }